diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-01-04 09:47:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-04 09:47:36 -0500 |
commit | 91313d3847263f3a7cd2a576b333fb4a40d5a2c5 (patch) | |
tree | 667f3438ddf84d70d21f3efecfb68ccc902d835b /include | |
parent | Merge pull request #1543 from emersion/output-config-by-identifier (diff) | |
parent | Merge branch 'wlroots' into bindings (diff) | |
download | sway-91313d3847263f3a7cd2a576b333fb4a40d5a2c5.tar.gz sway-91313d3847263f3a7cd2a576b333fb4a40d5a2c5.tar.zst sway-91313d3847263f3a7cd2a576b333fb4a40d5a2c5.zip |
Merge pull request #1539 from acrisci/bindings
Bindings
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 3 | ||||
-rw-r--r-- | include/sway/input/keyboard.h | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index eecdde3a..405092e3 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -46,7 +46,8 @@ struct sway_mouse_binding { | |||
46 | */ | 46 | */ |
47 | struct sway_mode { | 47 | struct sway_mode { |
48 | char *name; | 48 | char *name; |
49 | list_t *bindings; | 49 | list_t *keysym_bindings; |
50 | list_t *keycode_bindings; | ||
50 | }; | 51 | }; |
51 | 52 | ||
52 | /** | 53 | /** |
diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h index d9251f4c..8ec3eb35 100644 --- a/include/sway/input/keyboard.h +++ b/include/sway/input/keyboard.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #include "sway/input/seat.h" | 4 | #include "sway/input/seat.h" |
5 | 5 | ||
6 | #define SWAY_KEYBOARD_PRESSED_KEYSYMS_CAP 32 | ||
7 | |||
6 | struct sway_keyboard { | 8 | struct sway_keyboard { |
7 | struct sway_seat_device *seat_device; | 9 | struct sway_seat_device *seat_device; |
8 | 10 | ||
@@ -10,6 +12,12 @@ struct sway_keyboard { | |||
10 | 12 | ||
11 | struct wl_listener keyboard_key; | 13 | struct wl_listener keyboard_key; |
12 | struct wl_listener keyboard_modifiers; | 14 | struct wl_listener keyboard_modifiers; |
15 | |||
16 | xkb_keysym_t pressed_keysyms_translated[SWAY_KEYBOARD_PRESSED_KEYSYMS_CAP]; | ||
17 | uint32_t modifiers_translated; | ||
18 | |||
19 | xkb_keysym_t pressed_keysyms_raw[SWAY_KEYBOARD_PRESSED_KEYSYMS_CAP]; | ||
20 | uint32_t modifiers_raw; | ||
13 | }; | 21 | }; |
14 | 22 | ||
15 | struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, | 23 | struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, |