summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2021-01-14 20:29:17 -0600
committerGitHub <noreply@github.com>2021-01-14 20:29:17 -0600
commit264be4ebbafaa9dd0d166841f64ab5167e3fa8da (patch)
treead9c2f01518a44b559e1bca9c3783a29ab977c36
parent1d7c756107912cc2340f565e421a1c63c6a22067 (diff)
parent3d696dfb7deb26d87d71a61af52192800e0d56a1 (diff)
Merge pull request #80 from sam-barr/dwl_upstream
Fix Initialization of NetWM Atoms
-rw-r--r--dwl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/dwl.c b/dwl.c
index d6bcf39..eeb1210 100644
--- a/dwl.c
+++ b/dwl.c
@@ -319,8 +319,10 @@ static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr;
static struct wlr_cursor *cursor;
static struct wlr_xcursor_manager *cursor_mgr;
+#ifdef XWAYLAND
static struct wlr_xcursor *xcursor;
static struct wlr_xcursor_manager *xcursor_mgr;
+#endif
static struct wlr_seat *seat;
static struct wl_list keyboards;
@@ -2504,8 +2506,8 @@ xwaylandready(struct wl_listener *listener, void *data)
* not detect that window type. */
netatom[NetWMWindowTypeDialog] = getatom(xc, "_NET_WM_WINDOW_TYPE_DIALOG");
netatom[NetWMWindowTypeSplash] = getatom(xc, "_NET_WM_WINDOW_TYPE_SPLASH");
- netatom[NetWMWindowTypeUtility] = getatom(xc, "_NET_WM_WINDOW_TYPE_TOOLBAR");
- netatom[NetWMWindowTypeToolbar] = getatom(xc, "_NET_WM_WINDOW_TYPE_UTILITY");
+ netatom[NetWMWindowTypeToolbar] = getatom(xc, "_NET_WM_WINDOW_TYPE_TOOLBAR");
+ netatom[NetWMWindowTypeUtility] = getatom(xc, "_NET_WM_WINDOW_TYPE_UTILITY");
/* assign the one and only seat */
wlr_xwayland_set_seat(xwayland, seat);