From 58aa58b6a7b641f851335ae2af28315ac2de2c50 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sat, 25 Mar 2017 01:28:51 -0700 Subject: xwindow: s/xwindow->mapped/xwindow->client_mapped/ This member reflects if the window is mapped from the client's perspective, not necessarily if the window is currently mapped (since vwm maps and unmaps windows the client has mapped in the course of providing virtual desktops) Changing the name for better clarity, since it's a bit ambiguous as-is. --- src/xevent.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/xevent.c') diff --git a/src/xevent.c b/src/xevent.c index d082f9a..cc946bd 100644 --- a/src/xevent.c +++ b/src/xevent.c @@ -131,11 +131,11 @@ void vwm_xevent_handle_unmap_notify(vwm_t *vwm, XUnmapEvent *ev) } else { /* client requested unmap, demote the window and note the unmapped state */ vwm_win_unmanage(vwm, xwin->managed); - xwin->mapped = 0; + xwin->client_mapped = 0; } } else { /* if it's not managed, we can't have caused the map */ - xwin->mapped = 0; + xwin->client_mapped = 0; } vwm_composite_damage_win(vwm, xwin); @@ -162,7 +162,7 @@ void vwm_xevent_handle_map_notify(vwm_t *vwm, XMapEvent *ev) xwin->managed->mapping = 0; } else { /* some windows like popup dialog boxes bypass MapRequest */ - xwin->mapped = 1; + xwin->client_mapped = 1; } vwm_composite_handle_map(vwm, xwin); @@ -178,7 +178,7 @@ void vwm_xevent_handle_map_request(vwm_t *vwm, XMapRequestEvent *ev) xwin = vwm_xwin_lookup(vwm, ev->window); if (xwin) { - xwin->mapped = 1; + xwin->client_mapped = 1; if (!(vwin = xwin->managed)) { /* Basically all managed windows become managed on the map request, -- cgit v1.2.3