mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-16 06:59:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/SirCmpwn/sway into new-command-aliases

Browse source
This commit is contained in:
Zandr Martin 2017-03-13 07:35:12 -04:00
commit b507462d1c
No known key found for this signature in database
GPG key ID: AA2BB8EF77F7BBDC
86 changed files with 147 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

38
include/client/registry.h
View file

@ -31,17 +31,17 @@ enum mask {
};
struct output_state {
struct wl_output *output;
uint32_t flags;
uint32_t width, height;
uint32_t scale;
struct wl_output *output;
uint32_t flags;
uint32_t width, height;
uint32_t scale;
};
struct xkb {
struct xkb_state *state;
struct xkb_context *context;
struct xkb_keymap *keymap;
xkb_mod_mask_t masks[MASK_LAST];
struct xkb_state *state;
struct xkb_context *context;
struct xkb_keymap *keymap;
xkb_mod_mask_t masks[MASK_LAST];
};
struct input {
@ -56,17 +56,17 @@ struct input {
};
struct registry {
struct wl_compositor *compositor;
struct wl_display *display;
struct wl_pointer *pointer;
struct wl_keyboard *keyboard;
struct wl_seat *seat;
struct wl_shell *shell;
struct wl_shm *shm;
struct desktop_shell *desktop_shell;
struct lock *swaylock;
struct input *input;
list_t *outputs;
struct wl_compositor *compositor;
struct wl_display *display;
struct wl_pointer *pointer;
struct wl_keyboard *keyboard;
struct wl_seat *seat;
struct wl_shell *shell;
struct wl_shm *shm;
struct desktop_shell *desktop_shell;
struct lock *swaylock;
struct input *input;
list_t *outputs;
};
struct registry *registry_poll(void);