diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-11-22 18:52:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 18:52:26 -0500 |
| commit | 68036018c8a19f1ec3536e8111899fe280aad38d (patch) | |
| tree | 42d107f3033b6894308085af5807f1e4fdce5c57 | |
| parent | c301b14a42c007bf3b69fef6053fa2466e201309 (diff) | |
| parent | 977c1f6a30b9ef21be363ec9fca1d9044b2905c6 (diff) | |
Merge pull request #1472 from martinetd/wlroots
Fix build with recent wlroots
| -rw-r--r-- | common/util.c | 22 | ||||
| -rw-r--r-- | include/sway/server.h | 2 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 1 | ||||
| -rw-r--r-- | sway/server.c | 1 |
4 files changed, 13 insertions, 13 deletions
diff --git a/common/util.c b/common/util.c index d6369853..83981160 100644 --- a/common/util.c +++ b/common/util.c @@ -8,8 +8,8 @@ #include <stdlib.h> #include <string.h> #include <strings.h> -#include <wlc/wlc.h> #include <xkbcommon/xkbcommon-names.h> +#include <wlr/types/wlr_keyboard.h> #include "log.h" #include "readline.h" #include "util.h" @@ -29,16 +29,16 @@ static struct modifier_key { char *name; uint32_t mod; } modifiers[] = { - { XKB_MOD_NAME_SHIFT, WLC_BIT_MOD_SHIFT }, - { XKB_MOD_NAME_CAPS, WLC_BIT_MOD_CAPS }, - { XKB_MOD_NAME_CTRL, WLC_BIT_MOD_CTRL }, - { "Ctrl", WLC_BIT_MOD_CTRL }, - { XKB_MOD_NAME_ALT, WLC_BIT_MOD_ALT }, - { "Alt", WLC_BIT_MOD_ALT }, - { XKB_MOD_NAME_NUM, WLC_BIT_MOD_MOD2 }, - { "Mod3", WLC_BIT_MOD_MOD3 }, - { XKB_MOD_NAME_LOGO, WLC_BIT_MOD_LOGO }, - { "Mod5", WLC_BIT_MOD_MOD5 }, + { XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT }, + { XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS }, + { XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL }, + { "Ctrl", WLR_MODIFIER_CTRL }, + { XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT }, + { "Alt", WLR_MODIFIER_ALT }, + { XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 }, + { "Mod3", WLR_MODIFIER_MOD3 }, + { XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO }, + { "Mod5", WLR_MODIFIER_MOD5 }, }; uint32_t get_modifier_mask_by_name(const char *name) { diff --git a/include/sway/server.h b/include/sway/server.h index 5a8a8d31..60f35190 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -4,7 +4,7 @@ #include <wayland-server.h> #include <wlr/backend.h> #include <wlr/backend/session.h> -#include <wlr/types/wlr_data_device_manager.h> +#include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/render.h> // TODO WLR: make Xwayland optional diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 04f3f42c..b3dbcfbe 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -1,3 +1,4 @@ +#define _POSIX_C_SOURCE 199309L #include <stdlib.h> #include <wayland-server.h> #include <wlr/types/wlr_xdg_shell_v6.h> diff --git a/sway/server.c b/sway/server.c index 8892b917..f78bcef1 100644 --- a/sway/server.c +++ b/sway/server.c @@ -4,7 +4,6 @@ #include <wayland-server.h> #include <wlr/backend.h> #include <wlr/backend/session.h> -#include <wlr/types/wlr_data_device_manager.h> #include <wlr/render.h> #include <wlr/render/gles2.h> // TODO WLR: make Xwayland optional |