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 | |
parent | Merge pull request #2877 from RyanDwyer/warp-on-workspace-switch (diff) | |
parent | cmd_bind{sym,code}: Implement per-device bindings (diff) | |
download | sway-96e3686ae882818edc35a14c207dfd97c40366d9.tar.gz sway-96e3686ae882818edc35a14c207dfd97c40366d9.tar.zst sway-96e3686ae882818edc35a14c207dfd97c40366d9.zip |
Merge pull request #2875 from RedSoxFan/input-device-bindings
cmd_bind{sym,code}: Implement per-device bindings
Diffstat (limited to 'include')
-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 { | |||
43 | struct sway_binding { | 43 | struct sway_binding { |
44 | enum binding_input_type type; | 44 | enum binding_input_type type; |
45 | int order; | 45 | int order; |
46 | char *input; | ||
46 | uint32_t flags; | 47 | uint32_t flags; |
47 | list_t *keys; // sorted in ascending order | 48 | list_t *keys; // sorted in ascending order |
48 | uint32_t modifiers; | 49 | 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); | |||
42 | struct sway_cursor *sway_cursor_create(struct sway_seat *seat); | 42 | struct sway_cursor *sway_cursor_create(struct sway_seat *seat); |
43 | void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | 43 | void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, |
44 | bool allow_refocusing); | 44 | bool allow_refocusing); |
45 | void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec, | 45 | void dispatch_cursor_button(struct sway_cursor *cursor, |
46 | uint32_t button, enum wlr_button_state state); | 46 | struct wlr_input_device *device, uint32_t time_msec, uint32_t button, |
47 | enum wlr_button_state state); | ||
47 | 48 | ||
48 | void cursor_set_image(struct sway_cursor *cursor, const char *image, | 49 | void cursor_set_image(struct sway_cursor *cursor, const char *image, |
49 | struct wl_client *client); | 50 | 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); | |||
63 | 63 | ||
64 | struct input_config *input_device_get_config(struct sway_input_device *device); | 64 | struct input_config *input_device_get_config(struct sway_input_device *device); |
65 | 65 | ||
66 | char *input_device_get_identifier(struct wlr_input_device *device); | ||
66 | 67 | ||
67 | #endif | 68 | #endif |