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 | 6c1cd82e3244ba3cb5a248618580d19d0f5cfd3d (diff) | |
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 @@ #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) { |