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 /sway/container.c | |
| parent | 78ca6197697d4f07eddf0c544daff85603adab90 (diff) | |
input_state: Remove mouse_origin (x&y). Query wlc instead.
Diffstat (limited to 'sway/container.c')
| -rw-r--r-- | sway/container.c | 8 |
1 files changed, 5 insertions, 3 deletions
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) { } static bool pointer_test(swayc_t *view, void *_origin) { - const struct mouse_origin *origin = _origin; + const struct wlc_origin *origin = _origin; // Determine the output that the view is under swayc_t *parent = swayc_parent_by_type(view, C_OUTPUT); if (origin->x >= view->x && origin->y >= view->y @@ -531,6 +531,8 @@ swayc_t *container_under_pointer(void) { if (lookup->children == 0) { return NULL; } + struct wlc_origin origin; + wlc_pointer_get_origin(&origin); while (lookup->type != C_VIEW) { int i; int len; @@ -545,7 +547,7 @@ swayc_t *container_under_pointer(void) { i = len = lookup->floating->length; bool got_floating = false; while (--i > -1) { - if (pointer_test(lookup->floating->items[i], &pointer_state.origin)) { + if (pointer_test(lookup->floating->items[i], &origin)) { lookup = lookup->floating->items[i]; got_floating = true; break; @@ -558,7 +560,7 @@ swayc_t *container_under_pointer(void) { // search children len = lookup->children->length; for (i = 0; i < len; ++i) { - if (pointer_test(lookup->children->items[i], &pointer_state.origin)) { + if (pointer_test(lookup->children->items[i], &origin)) { lookup = lookup->children->items[i]; break; } |