From 3afc5a723e10313f956234cfd4251ba7a5a7e99c Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 2 Jan 2021 23:00:54 +0100 Subject: selection: use selection_start() to initialize word/row-based selection This removes the selection_mark_word() and selection_mark_row() functions. To start a word/row-based selection, use selection_start() with SELECTION_SEMANTIC_{WORD,ROW} --- input.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 0b45c5ad..d046bb4a 100644 --- a/input.c +++ b/input.c @@ -276,7 +276,7 @@ execute_binding(struct seat *seat, struct terminal *term, if (selection_enabled(term, seat) && cursor_is_on_grid) { selection_start( term, seat->mouse.col, seat->mouse.row, - SELECTION_NORMAL, SELECTION_SEMANTIC_NONE); + SELECTION_NORMAL, SELECTION_SEMANTIC_NONE, false); return true; } return false; @@ -285,7 +285,7 @@ execute_binding(struct seat *seat, struct terminal *term, if (selection_enabled(term, seat) && cursor_is_on_grid) { selection_start( term, seat->mouse.col, seat->mouse.row, - SELECTION_BLOCK, SELECTION_SEMANTIC_NONE); + SELECTION_BLOCK, SELECTION_SEMANTIC_NONE, false); return true; } return false; @@ -300,23 +300,26 @@ execute_binding(struct seat *seat, struct terminal *term, case BIND_ACTION_SELECT_WORD: if (selection_enabled(term, seat) && cursor_is_on_grid) { - selection_mark_word( - seat, term, seat->mouse.col, seat->mouse.row, false, serial); + selection_start( + term, seat->mouse.col, seat->mouse.row, + SELECTION_NORMAL, SELECTION_SEMANTIC_WORD, false); return true; } return false; case BIND_ACTION_SELECT_WORD_WS: if (selection_enabled(term, seat) && cursor_is_on_grid) { - selection_mark_word( - seat, term, seat->mouse.col, seat->mouse.row, true, serial); + selection_start( + term, seat->mouse.col, seat->mouse.row, + SELECTION_NORMAL, SELECTION_SEMANTIC_WORD, true); return true; } return false; case BIND_ACTION_SELECT_ROW: if (selection_enabled(term, seat) && cursor_is_on_grid) { - selection_mark_row(seat, term, seat->mouse.row, serial); + selection_start(term, seat->mouse.col, seat->mouse.row, + SELECTION_NORMAL, SELECTION_SEMANTIC_ROW, false); return true; } return false; -- cgit v1.3