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 | Remove wlc dependency (diff) | |
parent | common/util: replace WLC_BIT_MOD_* by WLR_MODIFIER_* (diff) | |
download | sway-68036018c8a19f1ec3536e8111899fe280aad38d.tar.gz sway-68036018c8a19f1ec3536e8111899fe280aad38d.tar.zst sway-68036018c8a19f1ec3536e8111899fe280aad38d.zip |
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 @@ | |||
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <string.h> | 9 | #include <string.h> |
10 | #include <strings.h> | 10 | #include <strings.h> |
11 | #include <wlc/wlc.h> | ||
12 | #include <xkbcommon/xkbcommon-names.h> | 11 | #include <xkbcommon/xkbcommon-names.h> |
12 | #include <wlr/types/wlr_keyboard.h> | ||
13 | #include "log.h" | 13 | #include "log.h" |
14 | #include "readline.h" | 14 | #include "readline.h" |
15 | #include "util.h" | 15 | #include "util.h" |
@@ -29,16 +29,16 @@ static struct modifier_key { | |||
29 | char *name; | 29 | char *name; |
30 | uint32_t mod; | 30 | uint32_t mod; |
31 | } modifiers[] = { | 31 | } modifiers[] = { |
32 | { XKB_MOD_NAME_SHIFT, WLC_BIT_MOD_SHIFT }, | 32 | { XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT }, |
33 | { XKB_MOD_NAME_CAPS, WLC_BIT_MOD_CAPS }, | 33 | { XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS }, |
34 | { XKB_MOD_NAME_CTRL, WLC_BIT_MOD_CTRL }, | 34 | { XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL }, |
35 | { "Ctrl", WLC_BIT_MOD_CTRL }, | 35 | { "Ctrl", WLR_MODIFIER_CTRL }, |
36 | { XKB_MOD_NAME_ALT, WLC_BIT_MOD_ALT }, | 36 | { XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT }, |
37 | { "Alt", WLC_BIT_MOD_ALT }, | 37 | { "Alt", WLR_MODIFIER_ALT }, |
38 | { XKB_MOD_NAME_NUM, WLC_BIT_MOD_MOD2 }, | 38 | { XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 }, |
39 | { "Mod3", WLC_BIT_MOD_MOD3 }, | 39 | { "Mod3", WLR_MODIFIER_MOD3 }, |
40 | { XKB_MOD_NAME_LOGO, WLC_BIT_MOD_LOGO }, | 40 | { XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO }, |
41 | { "Mod5", WLC_BIT_MOD_MOD5 }, | 41 | { "Mod5", WLR_MODIFIER_MOD5 }, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | uint32_t get_modifier_mask_by_name(const char *name) { | 44 | 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 @@ | |||
4 | #include <wayland-server.h> | 4 | #include <wayland-server.h> |
5 | #include <wlr/backend.h> | 5 | #include <wlr/backend.h> |
6 | #include <wlr/backend/session.h> | 6 | #include <wlr/backend/session.h> |
7 | #include <wlr/types/wlr_data_device_manager.h> | 7 | #include <wlr/types/wlr_data_device.h> |
8 | #include <wlr/types/wlr_xdg_shell_v6.h> | 8 | #include <wlr/types/wlr_xdg_shell_v6.h> |
9 | #include <wlr/render.h> | 9 | #include <wlr/render.h> |
10 | // TODO WLR: make Xwayland optional | 10 | // 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 @@ | |||
1 | #define _POSIX_C_SOURCE 199309L | ||
1 | #include <stdlib.h> | 2 | #include <stdlib.h> |
2 | #include <wayland-server.h> | 3 | #include <wayland-server.h> |
3 | #include <wlr/types/wlr_xdg_shell_v6.h> | 4 | #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 @@ | |||
4 | #include <wayland-server.h> | 4 | #include <wayland-server.h> |
5 | #include <wlr/backend.h> | 5 | #include <wlr/backend.h> |
6 | #include <wlr/backend/session.h> | 6 | #include <wlr/backend/session.h> |
7 | #include <wlr/types/wlr_data_device_manager.h> | ||
8 | #include <wlr/render.h> | 7 | #include <wlr/render.h> |
9 | #include <wlr/render/gles2.h> | 8 | #include <wlr/render/gles2.h> |
10 | // TODO WLR: make Xwayland optional | 9 | // TODO WLR: make Xwayland optional |