From b7927078e9b2dec995eaec8240a87b683349aefb Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 23:26:31 +0200 Subject: x11 -> xwayland, window -> surface, fix some calloc sizes and wrong types --- xwayland/xwm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xwayland/xwm.h') diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 7fc6f3bf..869eb303 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -75,8 +75,8 @@ struct wlr_xwm { xcb_screen_t *screen; xcb_window_t window; - struct wl_list new_windows; - struct wl_list unpaired_windows; + struct wl_list new_surfaces; + struct wl_list unpaired_surfaces; }; void xwm_destroy(struct wlr_xwm *xwm); -- cgit v1.2.3 From f0a14a318cd3d8723b42d2889f0170bf211a844c Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 23:50:20 +0200 Subject: Fix segfault on startup --- xwayland/xwm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xwayland/xwm.h') diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 869eb303..7ff87ea0 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -56,13 +56,14 @@ enum atom_name { ATOM_LAST, }; -static const char * const atom_map[ATOM_LAST] = { +static const char *atom_map[ATOM_LAST] = { "WL_SURFACE_ID", "WM_PROTOCOLS", "WM_S0", "_NET_SUPPORTED", "_NET_WM_S0", "_NET_WM_STATE", + "WM_TAKE_FOCUS", }; struct wlr_xwm { -- cgit v1.2.3 From efadbf84249e419b52c3f4bca10f8cd5b7f3d942 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 28 Sep 2017 18:47:20 -0400 Subject: Fix atom_map usage --- xwayland/xwm.c | 10 ++++++++++ xwayland/xwm.h | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'xwayland/xwm.h') diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 1feb4bd0..862db70b 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -5,6 +5,16 @@ #include "wlr/xwayland.h" #include "xwm.h" +const char *atom_map[ATOM_LAST] = { + "WL_SURFACE_ID", + "WM_PROTOCOLS", + "WM_S0", + "_NET_SUPPORTED", + "_NET_WM_S0", + "_NET_WM_STATE", + "WM_TAKE_FOCUS", +}; + /* General helpers */ // TODO: replace this with hash table? static struct wlr_xwayland_surface *lookup_surface(struct wl_list *list, diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 7ff87ea0..ecbab535 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -56,15 +56,7 @@ enum atom_name { ATOM_LAST, }; -static const char *atom_map[ATOM_LAST] = { - "WL_SURFACE_ID", - "WM_PROTOCOLS", - "WM_S0", - "_NET_SUPPORTED", - "_NET_WM_S0", - "_NET_WM_STATE", - "WM_TAKE_FOCUS", -}; +extern const char *atom_map[ATOM_LAST]; struct wlr_xwm { struct wlr_xwayland *xwayland; -- cgit v1.2.3