diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-10 11:47:34 -0500 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-10 11:47:34 -0500 |
commit | aa1c838f9733f9b5e90e8267a10e455790cd2642 (patch) | |
tree | cf88e53cff1e0d49a52df4d5a38ad5d1e1d7e959 /sway | |
parent | Merge pull request #3400 from ianyfan/config-brace (diff) | |
download | sway-aa1c838f9733f9b5e90e8267a10e455790cd2642.tar.gz sway-aa1c838f9733f9b5e90e8267a10e455790cd2642.tar.zst sway-aa1c838f9733f9b5e90e8267a10e455790cd2642.zip |
seat_cmd_cursor: utilize mouse button helpers
This modifies `seat_cmd_cursor` to utilize `get_mouse_button` when
parsing mouse buttons for the `press` and `release` operations. All x11
buttons, button event names, and button event codes are supported.
For x11 axis buttons, `dispatch_cursor_axis` is used instead of
`dispatch_cursor_button`. However the `press`/`release` state is ignored
and the either axis event is processed. This also removes support for
`left` and `right` in favor of `BTN_LEFT` and `BTN_RIGHT`.
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/seat/cursor.c | 41 | ||||
-rw-r--r-- | sway/input/cursor.c | 11 | ||||
-rw-r--r-- | sway/sway-input.5.scd | 13 | ||||
-rw-r--r-- | sway/sway.5.scd | 9 |
4 files changed, 51 insertions, 23 deletions
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c index 1fbc68a1..8d9e426a 100644 --- a/sway/commands/seat/cursor.c +++ b/sway/commands/seat/cursor.c | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <strings.h> | 4 | #include <strings.h> |
5 | #include <wlr/types/wlr_cursor.h> | 5 | #include <wlr/types/wlr_cursor.h> |
6 | #include <wlr/types/wlr_pointer.h> | ||
6 | #include "sway/commands.h" | 7 | #include "sway/commands.h" |
7 | #include "sway/input/cursor.h" | 8 | #include "sway/input/cursor.h" |
8 | 9 | ||
@@ -11,7 +12,7 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor, | |||
11 | 12 | ||
12 | static const char *expected_syntax = "Expected 'cursor <move> <x> <y>' or " | 13 | static const char *expected_syntax = "Expected 'cursor <move> <x> <y>' or " |
13 | "'cursor <set> <x> <y>' or " | 14 | "'cursor <set> <x> <y>' or " |
14 | "'curor <press|release> <left|right|1|2|3...>'"; | 15 | "'curor <press|release> <button[1-9]|event-name-or-code>'"; |
15 | 16 | ||
16 | static struct cmd_results *handle_command(struct sway_cursor *cursor, | 17 | static struct cmd_results *handle_command(struct sway_cursor *cursor, |
17 | int argc, char **argv) { | 18 | int argc, char **argv) { |
@@ -91,15 +92,35 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor, | |||
91 | return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); | 92 | return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); |
92 | } | 93 | } |
93 | 94 | ||
94 | if (strcasecmp(button_str, "left") == 0) { | 95 | char *message = NULL; |
95 | button = BTN_LEFT; | 96 | button = get_mouse_button(button_str, &message); |
96 | } else if (strcasecmp(button_str, "right") == 0) { | 97 | if (message) { |
97 | button = BTN_RIGHT; | 98 | struct cmd_results *error = |
98 | } else { | 99 | cmd_results_new(CMD_INVALID, "cursor", message); |
99 | button = strtol(button_str, NULL, 10); | 100 | free(message); |
100 | if (button == 0) { | 101 | return error; |
101 | return cmd_results_new(CMD_INVALID, "cursor", expected_syntax); | 102 | } else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN |
102 | } | 103 | || button == SWAY_SCROLL_LEFT || button == SWAY_SCROLL_RIGHT) { |
104 | // Dispatch axis event | ||
105 | enum wlr_axis_orientation orientation = | ||
106 | (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN) | ||
107 | ? WLR_AXIS_ORIENTATION_VERTICAL | ||
108 | : WLR_AXIS_ORIENTATION_HORIZONTAL; | ||
109 | double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT) | ||
110 | ? -1 : 1; | ||
111 | struct wlr_event_pointer_axis event = { | ||
112 | .device = NULL, | ||
113 | .time_msec = 0, | ||
114 | .source = WLR_AXIS_SOURCE_WHEEL, | ||
115 | .orientation = orientation, | ||
116 | .delta = delta * 15, | ||
117 | .delta_discrete = delta | ||
118 | }; | ||
119 | dispatch_cursor_axis(cursor, &event); | ||
120 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
121 | } else if (!button) { | ||
122 | return cmd_results_new(CMD_INVALID, "curor", | ||
123 | "Unknown button %s", button_str); | ||
103 | } | 124 | } |
104 | dispatch_cursor_button(cursor, NULL, 0, button, state); | 125 | dispatch_cursor_button(cursor, NULL, 0, button, state); |
105 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 126 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 9af7ef57..c1c8b6bf 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -1082,11 +1082,13 @@ static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) { | |||
1082 | } | 1082 | } |
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | static void dispatch_cursor_axis(struct sway_cursor *cursor, | 1085 | void dispatch_cursor_axis(struct sway_cursor *cursor, |
1086 | struct wlr_event_pointer_axis *event) { | 1086 | struct wlr_event_pointer_axis *event) { |
1087 | struct sway_seat *seat = cursor->seat; | 1087 | struct sway_seat *seat = cursor->seat; |
1088 | struct sway_input_device *input_device = event->device->data; | 1088 | struct sway_input_device *input_device = |
1089 | struct input_config *ic = input_device_get_config(input_device); | 1089 | event->device ? event->device->data : NULL; |
1090 | struct input_config *ic = | ||
1091 | input_device ? input_device_get_config(input_device) : NULL; | ||
1090 | 1092 | ||
1091 | // Determine what's under the cursor | 1093 | // Determine what's under the cursor |
1092 | struct wlr_surface *surface = NULL; | 1094 | struct wlr_surface *surface = NULL; |
@@ -1109,7 +1111,8 @@ static void dispatch_cursor_axis(struct sway_cursor *cursor, | |||
1109 | // Gather information needed for mouse bindings | 1111 | // Gather information needed for mouse bindings |
1110 | struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat); | 1112 | struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat); |
1111 | uint32_t modifiers = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0; | 1113 | uint32_t modifiers = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0; |
1112 | struct wlr_input_device *device = input_device->wlr_device; | 1114 | struct wlr_input_device *device = |
1115 | input_device ? input_device->wlr_device : NULL; | ||
1113 | char *dev_id = device ? input_device_get_identifier(device) : strdup("*"); | 1116 | char *dev_id = device ? input_device_get_identifier(device) : strdup("*"); |
1114 | uint32_t button = wl_axis_to_button(event); | 1117 | uint32_t button = wl_axis_to_button(event); |
1115 | 1118 | ||
diff --git a/sway/sway-input.5.scd b/sway/sway-input.5.scd index 820194a9..044057f2 100644 --- a/sway/sway-input.5.scd +++ b/sway/sway-input.5.scd | |||
@@ -141,6 +141,19 @@ in their own "seat"). | |||
141 | Attach an input device to this seat by its input identifier. A special | 141 | Attach an input device to this seat by its input identifier. A special |
142 | value of "\*" will attach all devices to the seat. | 142 | value of "\*" will attach all devices to the seat. |
143 | 143 | ||
144 | *seat* <seat> cursor move|set <x> <y> | ||
145 | Move specified seat's cursor relative to current position or wrap to | ||
146 | absolute coordinates (with respect to the global coordinate space). | ||
147 | Specifying either value as 0 will not update that coordinate. | ||
148 | |||
149 | *seat* <seat> cursor press|release button[1-9]|<event-name-or-code> | ||
150 | Simulate pressing (or releasing) the specified mouse button on the | ||
151 | specified seat. The button can either be provided as a button event name or | ||
152 | event code, which can be obtained from `libinput debug-events`, or as an x11 | ||
153 | mouse button (button[1-9]). If using button[4-7], which map to axes, an axis | ||
154 | event will be simulated, however _press_ and _release_ will be ignored and | ||
155 | both will occur. | ||
156 | |||
144 | *seat* <name> fallback true|false | 157 | *seat* <name> fallback true|false |
145 | Set this seat as the fallback seat. A fallback seat will attach any device | 158 | Set this seat as the fallback seat. A fallback seat will attach any device |
146 | not explicitly attached to another seat (similar to a "default" seat). | 159 | not explicitly attached to another seat (similar to a "default" seat). |
diff --git a/sway/sway.5.scd b/sway/sway.5.scd index 3398ad58..a9f60c1b 100644 --- a/sway/sway.5.scd +++ b/sway/sway.5.scd | |||
@@ -491,15 +491,6 @@ The default colors are: | |||
491 | *seat* <seat> <seat-subcommands...> | 491 | *seat* <seat> <seat-subcommands...> |
492 | For details on seat subcommands, see *sway-input*(5). | 492 | For details on seat subcommands, see *sway-input*(5). |
493 | 493 | ||
494 | *seat* <seat> cursor move|set <x> <y> | ||
495 | Move specified seat's cursor relative to current position or wrap to | ||
496 | absolute coordinates (with respect to the global coordinate space). | ||
497 | Specifying either value as 0 will not update that coordinate. | ||
498 | |||
499 | *seat* <seat> cursor press|release left|right|1|2|3... | ||
500 | Simulate pressing (or releasing) the specified mouse button on the | ||
501 | specified seat. | ||
502 | |||
503 | *kill* | 494 | *kill* |
504 | Kills (closes) the currently focused container and all of its children. | 495 | Kills (closes) the currently focused container and all of its children. |
505 | 496 | ||