diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-01-13 20:40:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 20:40:42 -0500 |
| commit | 9f9ef761753e11235c85c232e7521506cfea512d (patch) | |
| tree | 1f391e6a4a1d7d6d8eef0dc894d4c165ba7fbdbd /sway/input | |
| parent | db1631b67dd463f6516275ac4387712e39f9a384 (diff) | |
| parent | aa1c838f9733f9b5e90e8267a10e455790cd2642 (diff) | |
| download | sway-9f9ef761753e11235c85c232e7521506cfea512d.tar.xz | |
Merge pull request #3343 from RedSoxFan/seat-cursor-buttons-improved
Improve mouse button parsing: seat cursor buttons
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/cursor.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index c65548c3..08222494 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -716,11 +716,13 @@ static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) { } } -static void dispatch_cursor_axis(struct sway_cursor *cursor, +void dispatch_cursor_axis(struct sway_cursor *cursor, struct wlr_event_pointer_axis *event) { struct sway_seat *seat = cursor->seat; - struct sway_input_device *input_device = event->device->data; - struct input_config *ic = input_device_get_config(input_device); + struct sway_input_device *input_device = + event->device ? event->device->data : NULL; + struct input_config *ic = + input_device ? input_device_get_config(input_device) : NULL; // Determine what's under the cursor struct wlr_surface *surface = NULL; @@ -743,7 +745,8 @@ static void dispatch_cursor_axis(struct sway_cursor *cursor, // Gather information needed for mouse bindings struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat); uint32_t modifiers = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0; - struct wlr_input_device *device = input_device->wlr_device; + struct wlr_input_device *device = + input_device ? input_device->wlr_device : NULL; char *dev_id = device ? input_device_get_identifier(device) : strdup("*"); uint32_t button = wl_axis_to_button(event); |