aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-11 07:17:13 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-11 15:38:01 +0000
commit1c861e5d692b2cdd5cd2c1b3b2d5930f2cc6f394 (patch)
tree3d19b64313038c0f39a8142432bc164927cc0458 /input.c
parentselection: selections can be made, and are rendered (diff)
selection: only left button can be used for selection
Diffstat (limited to 'input.c')
-rw-r--r--input.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/input.c b/input.c
index 5032c748..a6369a51 100644
--- a/input.c
+++ b/input.c
@@ -312,7 +312,7 @@ wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
term->mouse.col = col;
term->mouse.row = row;
- if (term->mouse.button != 0) {
+ if (term->mouse.button == BTN_LEFT) {
/* Update selection */
term->selection.end = (struct coord){col, term->grid->view + row};
term_damage_view(term);
@@ -335,10 +335,18 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
switch (state) {
case WL_POINTER_BUTTON_STATE_PRESSED:
- /* Start selection */
- term->selection.start = (struct coord){
- term->mouse.col, term->grid->view + term->mouse.row};
- term->selection.end = (struct coord){-1, -1};
+ if (button == BTN_LEFT) {
+ /* Start selection */
+ term->selection.start = (struct coord){
+ term->mouse.col, term->grid->view + term->mouse.row};
+ term->selection.end = (struct coord){-1, -1};
+ } else {
+ term->selection.start = (struct coord){-1, -1};
+ term->selection.end = (struct coord){-1, -1};
+ term_damage_view(term);
+ if (term->frame_callback == NULL)
+ grid_render(term);
+ }
term->mouse.button = button; /* For motion events */
term_mouse_down(term, button, term->mouse.row, term->mouse.col,
@@ -346,7 +354,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
break;
case WL_POINTER_BUTTON_STATE_RELEASED:
- if (term->selection.end.col == -1) {
+ if (button == BTN_LEFT && term->selection.end.col == -1) {
/* No selection made - cancel */
term->selection.start = (struct coord){-1, -1};
term_damage_view(term);