diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-02-18 05:16:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 05:16:20 +0100 |
| commit | e625c0b18ce9fe7474821c7a88a50b65c9c320f3 (patch) | |
| tree | 98ad97cbeac9c87f49385fb33338a81b49d84441 | |
| parent | faf15ee733681f14797d8b47078854a00f03f8fc (diff) | |
| parent | 041594d2ab4fb6f8de2055d3704da5f54146c44e (diff) | |
Merge pull request #3713 from RedSoxFan/fix-mouse-bindings
Use container under cursor for mouse bindings
| -rw-r--r-- | sway/commands/bind.c | 20 | ||||
| -rw-r--r-- | sway/sway.5.scd | 13 |
2 files changed, 24 insertions, 9 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 59116d67..172e6b8a 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -1,10 +1,11 @@ #define _POSIX_C_SOURCE 200809L #include <libevdev/libevdev.h> #include <linux/input-event-codes.h> -#include <xkbcommon/xkbcommon.h> -#include <xkbcommon/xkbcommon-names.h> #include <string.h> #include <strings.h> +#include <xkbcommon/xkbcommon.h> +#include <xkbcommon/xkbcommon-names.h> +#include <wlr/types/wlr_cursor.h> #include "sway/commands.h" #include "sway/config.h" #include "sway/input/cursor.h" @@ -330,7 +331,20 @@ struct cmd_results *cmd_bindcode(int argc, char **argv) { void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding) { sway_log(SWAY_DEBUG, "running command for binding: %s", binding->command); - list_t *res_list = execute_command(binding->command, seat, NULL); + struct sway_container *con = NULL; + if (binding->type == BINDING_MOUSESYM + || binding->type == BINDING_MOUSECODE) { + struct wlr_surface *surface = NULL; + double sx, sy; + struct sway_node *node = node_at_coords(seat, + seat->cursor->cursor->x, seat->cursor->cursor->y, + &surface, &sx, &sy); + if (node && node->type == N_CONTAINER) { + con = node->sway_container; + } + } + + list_t *res_list = execute_command(binding->command, seat, con); bool success = true; for (int i = 0; i < res_list->length; ++i) { struct cmd_results *results = res_list->items[i]; diff --git a/sway/sway.5.scd b/sway/sway.5.scd index b6955acd..76467d23 100644 --- a/sway/sway.5.scd +++ b/sway/sway.5.scd @@ -293,12 +293,13 @@ runtime. overwrite a binding, swaynag will give you a warning. To silence this, use the _--no-warn_ flag. - Mouse buttons can either be specified in the form _button[1-9]_ or by using - the name of the event code (ex _BTN\_LEFT_ or _BTN\_RIGHT_). For the former - option, the buttons will be mapped to their values in X11 (1=left, 2=middle, - 3=right, 4=scroll up, 5=scroll down, 6=scroll left, 7=scroll right, 8=back, - 9=forward). For the latter option, you can find the event names using - _libinput debug-events_. + Mouse bindings operate on the container under the cursor instead of the + container that has focus. Mouse buttons can either be specified in the form + _button[1-9]_ or by using the name of the event code (ex _BTN\_LEFT_ or + _BTN\_RIGHT_). For the former option, the buttons will be mapped to their + values in X11 (1=left, 2=middle, 3=right, 4=scroll up, 5=scroll down, + 6=scroll left, 7=scroll right, 8=back, 9=forward). For the latter option, + you can find the event names using _libinput debug-events_. _--whole-window_, _--border_, and _--exclude-titlebar_ are mouse-only options which affect the region in which the mouse bindings can be triggered. By |