mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

common/util: replace WLC_BIT_MOD_* by WLR_MODIFIER_*

Browse source 
This removes the last wlc/wlc.h include actually in use
This commit is contained in:
Dominique Martinet 2017-11-23 00:23:37 +01:00
parent 6c1cd82e32
commit 977c1f6a30
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/util.c
View file

@ -8,8 +8,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <wlc/wlc.h>
#include <xkbcommon/xkbcommon-names.h> #include <xkbcommon/xkbcommon-names.h>
#include <wlr/types/wlr_keyboard.h>
#include "log.h" #include "log.h"
#include "readline.h" #include "readline.h"
#include "util.h" #include "util.h"
@ -29,16 +29,16 @@ static struct modifier_key {
char *name; char *name;
uint32_t mod; uint32_t mod;
} modifiers[] = { } modifiers[] = {
{ XKB_MOD_NAME_SHIFT, WLC_BIT_MOD_SHIFT }, { XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT },
{ XKB_MOD_NAME_CAPS, WLC_BIT_MOD_CAPS }, { XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS },
{ XKB_MOD_NAME_CTRL, WLC_BIT_MOD_CTRL }, { XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL },
{ "Ctrl", WLC_BIT_MOD_CTRL }, { "Ctrl", WLR_MODIFIER_CTRL },
{ XKB_MOD_NAME_ALT, WLC_BIT_MOD_ALT }, { XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT },
{ "Alt", WLC_BIT_MOD_ALT }, { "Alt", WLR_MODIFIER_ALT },
{ XKB_MOD_NAME_NUM, WLC_BIT_MOD_MOD2 }, { XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
{ "Mod3", WLC_BIT_MOD_MOD3 }, { "Mod3", WLR_MODIFIER_MOD3 },
{ XKB_MOD_NAME_LOGO, WLC_BIT_MOD_LOGO }, { XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
{ "Mod5", WLC_BIT_MOD_MOD5 }, { "Mod5", WLR_MODIFIER_MOD5 },
}; };
uint32_t get_modifier_mask_by_name(const char *name) { uint32_t get_modifier_mask_by_name(const char *name) {