blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: use ICCCM state defines from xcb-icccm

This commit is contained in:
Simon Ser 2021-03-29 12:11:53 +02:00 committed by Kenny Levinsen
parent de5347d0f2
commit a2535b80ce
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xwayland/xwm.c
View File

@ -924,10 +924,6 @@ static void xwm_handle_configure_notify(struct wlr_xwm *xwm,
} }
} }
#define ICCCM_WITHDRAWN_STATE 0
#define ICCCM_NORMAL_STATE 1
#define ICCCM_ICONIC_STATE 3
static void xsurface_set_wm_state(struct wlr_xwayland_surface *xsurface, static void xsurface_set_wm_state(struct wlr_xwayland_surface *xsurface,
int32_t state) { int32_t state) {
struct wlr_xwm *xwm = xsurface->xwm; struct wlr_xwm *xwm = xsurface->xwm;
@ -949,7 +945,7 @@ static void xwm_handle_map_request(struct wlr_xwm *xwm,
return; return;
} }
xsurface_set_wm_state(xsurface, ICCCM_NORMAL_STATE); xsurface_set_wm_state(xsurface, XCB_ICCCM_WM_STATE_NORMAL);
xsurface_set_net_wm_state(xsurface); xsurface_set_net_wm_state(xsurface);
uint32_t values[1]; uint32_t values[1];
@ -981,7 +977,7 @@ static void xwm_handle_unmap_notify(struct wlr_xwm *xwm,
} }
xsurface_unmap(xsurface); xsurface_unmap(xsurface);
xsurface_set_wm_state(xsurface, ICCCM_WITHDRAWN_STATE); xsurface_set_wm_state(xsurface, XCB_ICCCM_WM_STATE_WITHDRAWN);
} }
static void xwm_handle_property_notify(struct wlr_xwm *xwm, static void xwm_handle_property_notify(struct wlr_xwm *xwm,
@ -1254,9 +1250,9 @@ static void xwm_handle_wm_change_state_message(struct wlr_xwm *xwm,
} }
bool minimize; bool minimize;
if (detail == ICCCM_ICONIC_STATE) { if (detail == XCB_ICCCM_WM_STATE_ICONIC) {
minimize = true; minimize = true;
} else if (detail == ICCCM_NORMAL_STATE) { } else if (detail == XCB_ICCCM_WM_STATE_NORMAL) {
minimize = false; minimize = false;
} else { } else {
wlr_log(WLR_DEBUG, "unhandled wm_change_state event %u", detail); wlr_log(WLR_DEBUG, "unhandled wm_change_state event %u", detail);
@ -1928,9 +1924,9 @@ void wlr_xwayland_surface_set_minimized(struct wlr_xwayland_surface *surface,
surface->minimized = minimized; surface->minimized = minimized;
if (minimized) { if (minimized) {
xsurface_set_wm_state(surface, ICCCM_ICONIC_STATE); xsurface_set_wm_state(surface, XCB_ICCCM_WM_STATE_ICONIC);
} else { } else {
xsurface_set_wm_state(surface, ICCCM_NORMAL_STATE); xsurface_set_wm_state(surface, XCB_ICCCM_WM_STATE_NORMAL);
} }
xsurface_set_net_wm_state(surface); xsurface_set_net_wm_state(surface);