diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-19 14:00:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 14:00:03 +0200 |
| commit | 96e3686ae882818edc35a14c207dfd97c40366d9 (patch) | |
| tree | 2b898904e8c1e43417bfa92568bff23545ff642d /include/sway | |
| parent | 19adc3ff2dc262ade0bc1a87895e49696224d5d0 (diff) | |
| parent | 2e637b7368de565a85f77fbd03408f33b763dd7b (diff) | |
| download | sway-96e3686ae882818edc35a14c207dfd97c40366d9.tar.xz | |
Merge pull request #2875 from RedSoxFan/input-device-bindings
cmd_bind{sym,code}: Implement per-device bindings
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/config.h | 1 | ||||
| -rw-r--r-- | include/sway/input/cursor.h | 5 | ||||
| -rw-r--r-- | include/sway/input/input-manager.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index be5a00b5..fef3a60a 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -43,6 +43,7 @@ enum binding_flags { struct sway_binding { enum binding_input_type type; int order; + char *input; uint32_t flags; list_t *keys; // sorted in ascending order uint32_t modifiers; diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 5556ea11..299721f0 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h @@ -42,8 +42,9 @@ void sway_cursor_destroy(struct sway_cursor *cursor); struct sway_cursor *sway_cursor_create(struct sway_seat *seat); void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, bool allow_refocusing); -void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec, - uint32_t button, enum wlr_button_state state); +void dispatch_cursor_button(struct sway_cursor *cursor, + struct wlr_input_device *device, uint32_t time_msec, uint32_t button, + enum wlr_button_state state); void cursor_set_image(struct sway_cursor *cursor, const char *image, struct wl_client *client); diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h index bde3cf46..b7073006 100644 --- a/include/sway/input/input-manager.h +++ b/include/sway/input/input-manager.h @@ -63,5 +63,6 @@ struct sway_seat *input_manager_current_seat(struct sway_input_manager *input); struct input_config *input_device_get_config(struct sway_input_device *device); +char *input_device_get_identifier(struct wlr_input_device *device); #endif |