diff options
author | Ian Fan <ianfan0@gmail.com> | 2019-01-10 10:55:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-10 10:55:22 +0000 |
commit | 15ac580b28a2906d799fd709e83cb75e0efc3f45 (patch) | |
tree | 9a1f67d98e90d12eb83ffc99b6cac659f8f3f533 /include | |
parent | Merge pull request #3394 from RedSoxFan/bar-block-render (diff) | |
parent | bind{code,sym}: utilize mouse button helpers (diff) | |
download | sway-15ac580b28a2906d799fd709e83cb75e0efc3f45.tar.gz sway-15ac580b28a2906d799fd709e83cb75e0efc3f45.tar.zst sway-15ac580b28a2906d799fd709e83cb75e0efc3f45.zip |
Merge pull request #3341 from RedSoxFan/mouse-bindings-improved
Improve mouse button parsing: helpers and bind{code/sym}
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 3 | ||||
-rw-r--r-- | include/sway/input/cursor.h | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index ebf16e6a..29c21afe 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -27,7 +27,8 @@ struct sway_variable { | |||
27 | enum binding_input_type { | 27 | enum binding_input_type { |
28 | BINDING_KEYCODE, | 28 | BINDING_KEYCODE, |
29 | BINDING_KEYSYM, | 29 | BINDING_KEYSYM, |
30 | BINDING_MOUSE, | 30 | BINDING_MOUSECODE, |
31 | BINDING_MOUSESYM, | ||
31 | }; | 32 | }; |
32 | 33 | ||
33 | enum binding_flags { | 34 | enum binding_flags { |
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 22e278b0..4636bf6b 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -86,4 +86,12 @@ void cursor_warp_to_container(struct sway_cursor *cursor, | |||
86 | 86 | ||
87 | void cursor_warp_to_workspace(struct sway_cursor *cursor, | 87 | void cursor_warp_to_workspace(struct sway_cursor *cursor, |
88 | struct sway_workspace *workspace); | 88 | struct sway_workspace *workspace); |
89 | |||
90 | uint32_t get_mouse_bindsym(const char *name, char **error); | ||
91 | |||
92 | uint32_t get_mouse_bindcode(const char *name, char **error); | ||
93 | |||
94 | // Considers both bindsym and bindcode | ||
95 | uint32_t get_mouse_button(const char *name, char **error); | ||
96 | |||
89 | #endif | 97 | #endif |