diff options
author | Zandr Martin <zandrmartin@gmail.com> | 2017-03-13 07:35:12 -0400 |
---|---|---|
committer | Zandr Martin <zandrmartin@gmail.com> | 2017-03-13 07:35:12 -0400 |
commit | b507462d1c66e11cce76e069a508621dc9599f07 (patch) | |
tree | 52cc52fb0ec42085c37bee5f4f2e5c5f10cf2631 /include | |
parent | deprecate new_window and new_float commands (diff) | |
parent | Merge pull request #1113 from johnchen902/patch-1 (diff) | |
download | sway-b507462d1c66e11cce76e069a508621dc9599f07.tar.gz sway-b507462d1c66e11cce76e069a508621dc9599f07.tar.zst sway-b507462d1c66e11cce76e069a508621dc9599f07.zip |
Merge branch 'master' of git://github.com/SirCmpwn/sway into new-command-aliases
Diffstat (limited to 'include')
-rw-r--r-- | include/client/registry.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/include/client/registry.h b/include/client/registry.h index 24b4d358..9dfbd835 100644 --- a/include/client/registry.h +++ b/include/client/registry.h | |||
@@ -31,17 +31,17 @@ enum mask { | |||
31 | }; | 31 | }; |
32 | 32 | ||
33 | struct output_state { | 33 | struct output_state { |
34 | struct wl_output *output; | 34 | struct wl_output *output; |
35 | uint32_t flags; | 35 | uint32_t flags; |
36 | uint32_t width, height; | 36 | uint32_t width, height; |
37 | uint32_t scale; | 37 | uint32_t scale; |
38 | }; | 38 | }; |
39 | 39 | ||
40 | struct xkb { | 40 | struct xkb { |
41 | struct xkb_state *state; | 41 | struct xkb_state *state; |
42 | struct xkb_context *context; | 42 | struct xkb_context *context; |
43 | struct xkb_keymap *keymap; | 43 | struct xkb_keymap *keymap; |
44 | xkb_mod_mask_t masks[MASK_LAST]; | 44 | xkb_mod_mask_t masks[MASK_LAST]; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | struct input { | 47 | struct input { |
@@ -56,17 +56,17 @@ struct input { | |||
56 | }; | 56 | }; |
57 | 57 | ||
58 | struct registry { | 58 | struct registry { |
59 | struct wl_compositor *compositor; | 59 | struct wl_compositor *compositor; |
60 | struct wl_display *display; | 60 | struct wl_display *display; |
61 | struct wl_pointer *pointer; | 61 | struct wl_pointer *pointer; |
62 | struct wl_keyboard *keyboard; | 62 | struct wl_keyboard *keyboard; |
63 | struct wl_seat *seat; | 63 | struct wl_seat *seat; |
64 | struct wl_shell *shell; | 64 | struct wl_shell *shell; |
65 | struct wl_shm *shm; | 65 | struct wl_shm *shm; |
66 | struct desktop_shell *desktop_shell; | 66 | struct desktop_shell *desktop_shell; |
67 | struct lock *swaylock; | 67 | struct lock *swaylock; |
68 | struct input *input; | 68 | struct input *input; |
69 | list_t *outputs; | 69 | list_t *outputs; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | struct registry *registry_poll(void); | 72 | struct registry *registry_poll(void); |