diff options
| author |  Dominique Martinet <asmadeus@codewreck.org> | 2017-11-23 00:23:37 +0100 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2017-11-23 00:23:37 +0100 |
| commit | 977c1f6a30b9ef21be363ec9fca1d9044b2905c6 (patch) | |
| tree | 42d107f3033b6894308085af5807f1e4fdce5c57 /common | |
| parent | xdg_shell_v6: add _POSIX_C_SOURCE define for struct timespec (diff) | |
| download | sway-977c1f6a30b9ef21be363ec9fca1d9044b2905c6.tar.gz sway-977c1f6a30b9ef21be363ec9fca1d9044b2905c6.tar.zst sway-977c1f6a30b9ef21be363ec9fca1d9044b2905c6.zip | |
common/util: replace WLC_BIT_MOD_* by WLR_MODIFIER_*
This removes the last wlc/wlc.h include actually in use
Diffstat (limited to 'common')
| -rw-r--r-- | common/util.c | 22 |
1 files changed, 11 insertions, 11 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) { |