diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-10 13:44:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 13:44:55 +0200 |
commit | 155e863ead0edca244e4c961ca80418edde81838 (patch) | |
tree | c141eefc59a8d3f925d9f195d3fbe1e9db888510 | |
parent | Merge pull request #2812 from RyanDwyer/fix-version-messages (diff) | |
parent | Fix floating click events (diff) | |
download | sway-155e863ead0edca244e4c961ca80418edde81838.tar.gz sway-155e863ead0edca244e4c961ca80418edde81838.tar.zst sway-155e863ead0edca244e4c961ca80418edde81838.zip |
Merge pull request #2811 from RyanDwyer/fix-floating-click-events
Fix floating click events
-rw-r--r-- | sway/input/cursor.c | 1 | ||||
-rw-r--r-- | sway/input/seat.c | 13 | ||||
-rw-r--r-- | sway/tree/container.c | 12 |
3 files changed, 17 insertions, 9 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 6d57c45f..5c446299 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -877,6 +877,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor, | |||
877 | while (cont->parent) { | 877 | while (cont->parent) { |
878 | cont = cont->parent; | 878 | cont = cont->parent; |
879 | } | 879 | } |
880 | seat_set_focus_container(seat, cont); | ||
880 | seat_begin_move_floating(seat, cont, button); | 881 | seat_begin_move_floating(seat, cont, button); |
881 | return; | 882 | return; |
882 | } | 883 | } |
diff --git a/sway/input/seat.c b/sway/input/seat.c index f418785d..daf5b160 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -1038,7 +1038,7 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con, | |||
1038 | seat->op_moved = false; | 1038 | seat->op_moved = false; |
1039 | 1039 | ||
1040 | // In case the container was not raised by gaining focus, raise on click | 1040 | // In case the container was not raised by gaining focus, raise on click |
1041 | if (con && !config->raise_floating) { | 1041 | if (!config->raise_floating) { |
1042 | container_raise_floating(con); | 1042 | container_raise_floating(con); |
1043 | } | 1043 | } |
1044 | } | 1044 | } |
@@ -1052,6 +1052,12 @@ void seat_begin_move_floating(struct sway_seat *seat, | |||
1052 | seat->operation = OP_MOVE_FLOATING; | 1052 | seat->operation = OP_MOVE_FLOATING; |
1053 | seat->op_container = con; | 1053 | seat->op_container = con; |
1054 | seat->op_button = button; | 1054 | seat->op_button = button; |
1055 | |||
1056 | // In case the container was not raised by gaining focus, raise on click | ||
1057 | if (!config->raise_floating) { | ||
1058 | container_raise_floating(con); | ||
1059 | } | ||
1060 | |||
1055 | cursor_set_image(seat->cursor, "grab", NULL); | 1061 | cursor_set_image(seat->cursor, "grab", NULL); |
1056 | } | 1062 | } |
1057 | 1063 | ||
@@ -1085,6 +1091,11 @@ void seat_begin_resize_floating(struct sway_seat *seat, | |||
1085 | seat->op_ref_con_ly = con->y; | 1091 | seat->op_ref_con_ly = con->y; |
1086 | seat->op_ref_width = con->width; | 1092 | seat->op_ref_width = con->width; |
1087 | seat->op_ref_height = con->height; | 1093 | seat->op_ref_height = con->height; |
1094 | // | ||
1095 | // In case the container was not raised by gaining focus, raise on click | ||
1096 | if (!config->raise_floating) { | ||
1097 | container_raise_floating(con); | ||
1098 | } | ||
1088 | 1099 | ||
1089 | const char *image = edge == WLR_EDGE_NONE ? | 1100 | const char *image = edge == WLR_EDGE_NONE ? |
1090 | "se-resize" : wlr_xcursor_get_resize_name(edge); | 1101 | "se-resize" : wlr_xcursor_get_resize_name(edge); |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 1664514a..f36fe4b0 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -358,7 +358,6 @@ struct sway_container *container_at(struct sway_workspace *workspace, | |||
358 | struct wlr_surface **surface, double *sx, double *sy) { | 358 | struct wlr_surface **surface, double *sx, double *sy) { |
359 | struct sway_container *c; | 359 | struct sway_container *c; |
360 | 360 | ||
361 | // Focused view's popups | ||
362 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 361 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
363 | struct sway_container *focus = seat_get_focused_container(seat); | 362 | struct sway_container *focus = seat_get_focused_container(seat); |
364 | bool is_floating = focus && container_is_floating_or_child(focus); | 363 | bool is_floating = focus && container_is_floating_or_child(focus); |
@@ -370,14 +369,11 @@ struct sway_container *container_at(struct sway_workspace *workspace, | |||
370 | } | 369 | } |
371 | *surface = NULL; | 370 | *surface = NULL; |
372 | } | 371 | } |
373 | // Cast a ray to handle floating windows | 372 | // Floating |
374 | for (int i = workspace->floating->length - 1; i >= 0; --i) { | 373 | if ((c = floating_container_at(lx, ly, surface ,sx ,sy))) { |
375 | struct sway_container *cn = workspace->floating->items[i]; | 374 | return c; |
376 | if (cn->view && (c = surface_at_view(cn, lx, ly, surface, sx, sy))) { | ||
377 | return c; | ||
378 | } | ||
379 | } | 375 | } |
380 | // If focused is tiling, focused view's non-popups | 376 | // Tiling (focused) |
381 | if (focus && focus->view && !is_floating) { | 377 | if (focus && focus->view && !is_floating) { |
382 | if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) { | 378 | if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) { |
383 | return c; | 379 | return c; |