diff options
author | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-10-29 18:02:02 +0100 |
---|---|---|
committer | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-10-29 18:02:02 +0100 |
commit | 5ba47d4a44b21500ed3af2670cb1c807b7fed850 (patch) | |
tree | 87858d863df950de9e799149bec84817f1dc3ecc | |
parent | commands: Learn mouse_warping. (diff) | |
download | sway-5ba47d4a44b21500ed3af2670cb1c807b7fed850.tar.gz sway-5ba47d4a44b21500ed3af2670cb1c807b7fed850.tar.zst sway-5ba47d4a44b21500ed3af2670cb1c807b7fed850.zip |
input_state: Remove mouse_origin (x&y). Query wlc instead.
-rw-r--r-- | include/input_state.h | 5 | ||||
-rw-r--r-- | sway/container.c | 8 | ||||
-rw-r--r-- | sway/handlers.c | 4 | ||||
-rw-r--r-- | sway/input_state.c | 20 |
4 files changed, 17 insertions, 20 deletions
diff --git a/include/input_state.h b/include/input_state.h index 52759052..a1f238e1 100644 --- a/include/input_state.h +++ b/include/input_state.h | |||
@@ -48,11 +48,6 @@ extern struct pointer_state { | |||
48 | struct pointer_button_state right; | 48 | struct pointer_button_state right; |
49 | struct pointer_button_state scroll; | 49 | struct pointer_button_state scroll; |
50 | 50 | ||
51 | // pointer position | ||
52 | struct mouse_origin{ | ||
53 | int x, y; | ||
54 | } origin; | ||
55 | |||
56 | // change in pointer position | 51 | // change in pointer position |
57 | struct { | 52 | struct { |
58 | int x, y; | 53 | int x, y; |
diff --git a/sway/container.c b/sway/container.c index 4f9e2b5e..f3e2b3ae 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -510,7 +510,7 @@ swayc_t *swayc_active_workspace_for(swayc_t *cont) { | |||
510 | } | 510 | } |
511 | 511 | ||
512 | static bool pointer_test(swayc_t *view, void *_origin) { | 512 | static bool pointer_test(swayc_t *view, void *_origin) { |
513 | const struct mouse_origin *origin = _origin; | 513 | const struct wlc_origin *origin = _origin; |
514 | // Determine the output that the view is under | 514 | // Determine the output that the view is under |
515 | swayc_t *parent = swayc_parent_by_type(view, C_OUTPUT); | 515 | swayc_t *parent = swayc_parent_by_type(view, C_OUTPUT); |
516 | if (origin->x >= view->x && origin->y >= view->y | 516 | if (origin->x >= view->x && origin->y >= view->y |
@@ -531,6 +531,8 @@ swayc_t *container_under_pointer(void) { | |||
531 | if (lookup->children == 0) { | 531 | if (lookup->children == 0) { |
532 | return NULL; | 532 | return NULL; |
533 | } | 533 | } |
534 | struct wlc_origin origin; | ||
535 | wlc_pointer_get_origin(&origin); | ||
534 | while (lookup->type != C_VIEW) { | 536 | while (lookup->type != C_VIEW) { |
535 | int i; | 537 | int i; |
536 | int len; | 538 | int len; |
@@ -545,7 +547,7 @@ swayc_t *container_under_pointer(void) { | |||
545 | i = len = lookup->floating->length; | 547 | i = len = lookup->floating->length; |
546 | bool got_floating = false; | 548 | bool got_floating = false; |
547 | while (--i > -1) { | 549 | while (--i > -1) { |
548 | if (pointer_test(lookup->floating->items[i], &pointer_state.origin)) { | 550 | if (pointer_test(lookup->floating->items[i], &origin)) { |
549 | lookup = lookup->floating->items[i]; | 551 | lookup = lookup->floating->items[i]; |
550 | got_floating = true; | 552 | got_floating = true; |
551 | break; | 553 | break; |
@@ -558,7 +560,7 @@ swayc_t *container_under_pointer(void) { | |||
558 | // search children | 560 | // search children |
559 | len = lookup->children->length; | 561 | len = lookup->children->length; |
560 | for (i = 0; i < len; ++i) { | 562 | for (i = 0; i < len; ++i) { |
561 | if (pointer_test(lookup->children->items[i], &pointer_state.origin)) { | 563 | if (pointer_test(lookup->children->items[i], &origin)) { |
562 | lookup = lookup->children->items[i]; | 564 | lookup = lookup->children->items[i]; |
563 | break; | 565 | break; |
564 | } | 566 | } |
diff --git a/sway/handlers.c b/sway/handlers.c index e1612dc1..510b4261 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -343,10 +343,6 @@ static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct w | |||
343 | // Update view pointer is on | 343 | // Update view pointer is on |
344 | pointer_state.view = container_under_pointer(); | 344 | pointer_state.view = container_under_pointer(); |
345 | 345 | ||
346 | // Update pointer origin | ||
347 | pointer_state.origin.x = origin->x; | ||
348 | pointer_state.origin.y = origin->y; | ||
349 | |||
350 | // Update pointer_state | 346 | // Update pointer_state |
351 | switch (button) { | 347 | switch (button) { |
352 | case M_LEFT_CLICK: | 348 | case M_LEFT_CLICK: |
diff --git a/sway/input_state.c b/sway/input_state.c index ee3dc7cf..9bd8ad4d 100644 --- a/sway/input_state.c +++ b/sway/input_state.c | |||
@@ -163,10 +163,10 @@ static void reset_initial_sibling(void) { | |||
163 | } | 163 | } |
164 | 164 | ||
165 | void pointer_position_set(struct wlc_origin *new_origin, bool force_focus) { | 165 | void pointer_position_set(struct wlc_origin *new_origin, bool force_focus) { |
166 | pointer_state.delta.x = new_origin->x - pointer_state.origin.x; | 166 | struct wlc_origin origin; |
167 | pointer_state.delta.y = new_origin->y - pointer_state.origin.y; | 167 | wlc_pointer_get_origin(&origin); |
168 | pointer_state.origin.x = new_origin->x; | 168 | pointer_state.delta.x = new_origin->x - origin.x; |
169 | pointer_state.origin.y = new_origin->y; | 169 | pointer_state.delta.y = new_origin->y - origin.y; |
170 | 170 | ||
171 | // Update view under pointer | 171 | // Update view under pointer |
172 | swayc_t *prev_view = pointer_state.view; | 172 | swayc_t *prev_view = pointer_state.view; |
@@ -214,8 +214,10 @@ static void pointer_mode_set_right(void) { | |||
214 | int midway_x = initial.ptr->x + initial.ptr->width/2; | 214 | int midway_x = initial.ptr->x + initial.ptr->width/2; |
215 | int midway_y = initial.ptr->y + initial.ptr->height/2; | 215 | int midway_y = initial.ptr->y + initial.ptr->height/2; |
216 | 216 | ||
217 | lock.left = pointer_state.origin.x > midway_x; | 217 | struct wlc_origin origin; |
218 | lock.top = pointer_state.origin.y > midway_y; | 218 | wlc_pointer_get_origin(&origin); |
219 | lock.left = origin.x > midway_x; | ||
220 | lock.top = origin.y > midway_y; | ||
219 | 221 | ||
220 | if (initial.ptr->is_floating) { | 222 | if (initial.ptr->is_floating) { |
221 | pointer_state.mode = M_RESIZING | M_FLOATING; | 223 | pointer_state.mode = M_RESIZING | M_FLOATING; |
@@ -277,8 +279,10 @@ void pointer_mode_update(void) { | |||
277 | pointer_state.mode = 0; | 279 | pointer_state.mode = 0; |
278 | return; | 280 | return; |
279 | } | 281 | } |
280 | int dx = pointer_state.origin.x; | 282 | struct wlc_origin origin; |
281 | int dy = pointer_state.origin.y; | 283 | wlc_pointer_get_origin(&origin); |
284 | int dx = origin.x; | ||
285 | int dy = origin.y; | ||
282 | 286 | ||
283 | switch (pointer_state.mode) { | 287 | switch (pointer_state.mode) { |
284 | case M_FLOATING | M_DRAGGING: | 288 | case M_FLOATING | M_DRAGGING: |