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 | d72cc925416847adaf2636cea0773ef6d9a46461 (diff) | |
| parent | 1ac0c8cd47f734809c20bf6a6a0a7278680ed597 (diff) | |
| download | sway-51ab3c918030565cefbb82dc8e899f324e6c5a21.tar.xz | |
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 { struct output_config { char *name; + bool enabled; int width, height; int x, y; }; 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 @@ /* Keyboard state */ -typedef uint32_t keycode; - // returns true if key has been pressed, otherwise false -bool check_key(keycode key); +bool check_key(uint32_t key_sym, uint32_t key_code); // sets a key as pressed -void press_key(keycode key); +void press_key(uint32_t key_sym, uint32_t key_code); // unsets a key as pressed -void release_key(keycode key); +void release_key(uint32_t key_sym, uint32_t key_code); /* Pointer state */ |