diff options
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/xwm.c | 7 | ||||
| -rw-r--r-- | xwayland/xwm.h | 45 |
2 files changed, 6 insertions, 46 deletions
diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 90801d99..5d349253 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -750,9 +750,9 @@ static void xwm_get_resources(struct wlr_xwm *xwm) { if (reply && !error) { xwm->atoms[i] = reply->atom; } - if (reply) { - free(reply); - } + + free(reply); + if (error) { wlr_log(L_ERROR, "could not resolve atom %s, x11 error code %d", atom_map[i], error->error_code); @@ -789,6 +789,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) { wl_event_source_check(xwm->event_source); xcb_prefetch_extension_data(xwm->xcb_conn, &xcb_xfixes_id); + xwm_get_resources(xwm); xcb_screen_iterator_t screen_iterator = diff --git a/xwayland/xwm.h b/xwayland/xwm.h index a04b1065..bc43134e 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -3,48 +3,6 @@ #include <wayland-server-core.h> #include <wlr/xwayland.h> -/* wlc's atom list: - WL_SURFACE_ID, - WM_DELETE_WINDOW, - WM_TAKE_FOCUS, - WM_PROTOCOLS, - WM_NORMAL_HINTS, - MOTIF_WM_HINTS, - TEXT, - UTF8_STRING, - CLIPBOARD, - CLIPBOARD_MANAGER, - TARGETS, - PRIMARY, - WM_S0, - STRING, - WLC_SELECTION, - NET_WM_S0, - NET_WM_PID, - NET_WM_NAME, - NET_WM_STATE, - NET_WM_STATE_FULLSCREEN, - NET_WM_STATE_MODAL, - NET_WM_STATE_ABOVE, - NET_SUPPORTED, - NET_SUPPORTING_WM_CHECK, - NET_WM_WINDOW_TYPE, - NET_WM_WINDOW_TYPE_DESKTOP, - NET_WM_WINDOW_TYPE_DOCK, - NET_WM_WINDOW_TYPE_TOOLBAR, - NET_WM_WINDOW_TYPE_MENU, - NET_WM_WINDOW_TYPE_UTILITY, - NET_WM_WINDOW_TYPE_SPLASH, - NET_WM_WINDOW_TYPE_DIALOG, - NET_WM_WINDOW_TYPE_DROPDOWN_MENU, - NET_WM_WINDOW_TYPE_POPUP_MENU, - NET_WM_WINDOW_TYPE_TOOLTIP, - NET_WM_WINDOW_TYPE_NOTIFICATION, - NET_WM_WINDOW_TYPE_COMBO, - NET_WM_WINDOW_TYPE_DND, - NET_WM_WINDOW_TYPE_NORMAL, - */ - enum atom_name { WL_SURFACE_ID, WM_DELETE_WINDOW, @@ -69,7 +27,7 @@ extern const char *atom_map[ATOM_LAST]; enum net_wm_state_action { NET_WM_STATE_REMOVE = 0, - NET_WM_STATE_ADD = 1, + NET_WM_STATE_ADD = 1, NET_WM_STATE_TOGGLE = 2, }; @@ -90,6 +48,7 @@ struct wlr_xwm { }; void xwm_destroy(struct wlr_xwm *xwm); + struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland); #endif |