diff options
| author | Simon Ser <contact@emersion.fr> | 2021-01-26 23:11:29 +0100 |
|---|---|---|
| committer | Ilia Bozhinov <ammen99@gmail.com> | 2021-01-28 12:03:50 +0100 |
| commit | f8a66072e77edd79d26588b6e3fcf4dfc9230a6a (patch) | |
| tree | 3767c6e711ea2790253a8d03a4bf9475b6bb6b03 | |
| parent | a406f1947978e5db32615aeea095eab6a5bc19b1 (diff) | |
xwayland: fix extraneous NET_WM_STATE log messages
wlroots would log "Unhandled NET_WM_STATE property change" log
messages for atoms we know about. Simplify the code structure
and remove these extra messages.
| -rw-r--r-- | xwayland/xwm.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 10424f47..732882f7 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -579,7 +579,7 @@ static void read_surface_hints(struct wlr_xwm *xwm, if (xsurface->hints == NULL) { return; } - + memcpy(xsurface->hints, &hints, sizeof(struct wlr_xwayland_surface_hints)); xsurface->hints_urgency = xcb_icccm_wm_hints_get_urgency(&hints); @@ -1165,27 +1165,27 @@ static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm, for (size_t i = 0; i < 2; ++i) { xcb_atom_t property = client_message->data.data32[1 + i]; - if (property == xwm->atoms[NET_WM_STATE_MODAL] && - update_state(action, &xsurface->modal)) { - xsurface_set_net_wm_state(xsurface); - } else if (property == xwm->atoms[NET_WM_STATE_FULLSCREEN] && - update_state(action, &xsurface->fullscreen)) { - xsurface_set_net_wm_state(xsurface); - } else if (property == xwm->atoms[NET_WM_STATE_MAXIMIZED_VERT] && - update_state(action, &xsurface->maximized_vert)) { - xsurface_set_net_wm_state(xsurface); - } else if (property == xwm->atoms[NET_WM_STATE_MAXIMIZED_HORZ] && - update_state(action, &xsurface->maximized_horz)) { - xsurface_set_net_wm_state(xsurface); - } else if (property == xwm->atoms[NET_WM_STATE_HIDDEN] && - update_state(action, &xsurface->minimized)) { - xsurface_set_net_wm_state(xsurface); + bool changed = false; + if (property == xwm->atoms[NET_WM_STATE_MODAL]) { + changed = update_state(action, &xsurface->modal); + } else if (property == xwm->atoms[NET_WM_STATE_FULLSCREEN]) { + changed = update_state(action, &xsurface->fullscreen); + } else if (property == xwm->atoms[NET_WM_STATE_MAXIMIZED_VERT]) { + changed = update_state(action, &xsurface->maximized_vert); + } else if (property == xwm->atoms[NET_WM_STATE_MAXIMIZED_HORZ]) { + changed = update_state(action, &xsurface->maximized_horz); + } else if (property == xwm->atoms[NET_WM_STATE_HIDDEN]) { + changed = update_state(action, &xsurface->minimized); } else if (property != XCB_ATOM_NONE) { char *prop_name = xwm_get_atom_name(xwm, property); wlr_log(WLR_DEBUG, "Unhandled NET_WM_STATE property change " "%"PRIu32" (%s)", property, prop_name ? prop_name : "(null)"); free(prop_name); } + + if (changed) { + xsurface_set_net_wm_state(xsurface); + } } // client_message->data.data32[3] is the source indication // all other values are set to 0 |