mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-18 22:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1472 from martinetd/wlroots

Browse source 
Fix build with recent wlroots
This commit is contained in:
Drew DeVault 2017-11-22 18:52:26 -05:00 committed by GitHub
parent c301b14a42 977c1f6a30
commit 68036018c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 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) {

2
include/sway/server.h
View file

@ -4,7 +4,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.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/types/wlr_xdg_shell_v6.h>
#include <wlr/render.h> #include <wlr/render.h>
// TODO WLR: make Xwayland optional // TODO WLR: make Xwayland optional

1
sway/desktop/xdg_shell_v6.c
View file

@ -1,3 +1,4 @@
#define _POSIX_C_SOURCE 199309L
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/types/wlr_xdg_shell_v6.h> #include <wlr/types/wlr_xdg_shell_v6.h>

1
sway/server.c
View file

@ -4,7 +4,6 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/types/wlr_data_device_manager.h>
#include <wlr/render.h> #include <wlr/render.h>
#include <wlr/render/gles2.h> #include <wlr/render/gles2.h>
// TODO WLR: make Xwayland optional // TODO WLR: make Xwayland optional