diff options
author | taiyu <taiyu.len@gmail.com> | 2015-08-23 12:34:18 -0700 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2015-08-23 12:34:18 -0700 |
commit | 51ab3c918030565cefbb82dc8e899f324e6c5a21 (patch) | |
tree | 1a9e633ead0ff50f55987310621dab39531d2305 /include | |
parent | style (diff) | |
parent | Refactor keyboard to consider modified keysyms (diff) | |
download | sway-51ab3c918030565cefbb82dc8e899f324e6c5a21.tar.gz sway-51ab3c918030565cefbb82dc8e899f324e6c5a21.tar.zst sway-51ab3c918030565cefbb82dc8e899f324e6c5a21.zip |
merge
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 1 | ||||
-rw-r--r-- | include/input_state.h | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/config.h b/include/config.h index c896b423..6d36eb41 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -24,6 +24,7 @@ struct sway_mode { | |||
24 | 24 | ||
25 | struct output_config { | 25 | struct output_config { |
26 | char *name; | 26 | char *name; |
27 | bool enabled; | ||
27 | int width, height; | 28 | int width, height; |
28 | int x, y; | 29 | int x, y; |
29 | }; | 30 | }; |
diff --git a/include/input_state.h b/include/input_state.h index 4ab93cd6..d87ae18c 100644 --- a/include/input_state.h +++ b/include/input_state.h | |||
@@ -6,16 +6,14 @@ | |||
6 | 6 | ||
7 | /* Keyboard state */ | 7 | /* Keyboard state */ |
8 | 8 | ||
9 | typedef uint32_t keycode; | ||
10 | |||
11 | // returns true if key has been pressed, otherwise false | 9 | // returns true if key has been pressed, otherwise false |
12 | bool check_key(keycode key); | 10 | bool check_key(uint32_t key_sym, uint32_t key_code); |
13 | 11 | ||
14 | // sets a key as pressed | 12 | // sets a key as pressed |
15 | void press_key(keycode key); | 13 | void press_key(uint32_t key_sym, uint32_t key_code); |
16 | 14 | ||
17 | // unsets a key as pressed | 15 | // unsets a key as pressed |
18 | void release_key(keycode key); | 16 | void release_key(uint32_t key_sym, uint32_t key_code); |
19 | 17 | ||
20 | 18 | ||
21 | /* Pointer state */ | 19 | /* Pointer state */ |