diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-29 10:43:10 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-29 10:43:10 -0400 |
| commit | c01248cf17b0556145d973449d0b12cad0b96a8c (patch) | |
| tree | 8b76fcdbf82ee92ef19504d4a9c0e3abc43f8e1c /include/rootston | |
| parent | ce72a687ce3b88b69b0d319800d2f466205a15f7 (diff) | |
| parent | 50e86a0efa43fa72bd7d8c2dfc2d124052f74823 (diff) | |
Merge branch 'master' into feature/xwm-rewrite
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/config.h | 4 | ||||
| -rw-r--r-- | include/rootston/input.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/rootston/config.h b/include/rootston/config.h index ecbdd88b..75c04619 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -9,6 +9,10 @@ struct output_config { enum wl_output_transform transform; int x, y; struct wl_list link; + struct { + int width, height; + float refresh_rate; + } mode; }; struct device_config { diff --git a/include/rootston/input.h b/include/rootston/input.h index b9af5028..5cd7509e 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -16,6 +16,7 @@ struct roots_keyboard { struct roots_input *input; struct wlr_input_device *device; struct wl_listener key; + struct wl_listener modifiers; struct wl_list link; xkb_keysym_t pressed_keysyms[ROOTS_KEYBOARD_PRESSED_KEYSYMS_CAP]; |