diff options
| -rw-r--r-- | src/screen.c | 2 | ||||
| -rw-r--r-- | src/window.c | 4 | ||||
| -rw-r--r-- | src/xevent.c | 8 | ||||
| -rw-r--r-- | src/xwindow.c | 8 | ||||
| -rw-r--r-- | src/xwindow.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/screen.c b/src/screen.c index 600d969..7ccfd55 100644 --- a/src/screen.c +++ b/src/screen.c @@ -143,7 +143,7 @@ int vwm_screen_is_empty(vwm_t *vwm, const vwm_screen_t *scr) int is_empty = 1; list_for_each_entry(xwin, &vwm->xwindows, xwindows) { - if (!xwin->mapped) + if (!xwin->client_mapped) continue; if (!xwin->managed || (xwin->managed->desktop == vwm->focused_desktop && !xwin->managed->shelved && !xwin->managed->configuring)) { diff --git a/src/window.c b/src/window.c index a66c448..b90b0ae 100644 --- a/src/window.c +++ b/src/window.c @@ -31,7 +31,7 @@ /* unmap the specified window and set the unmapping-in-progress flag so we can discard vwm-generated UnmapNotify events */ void vwm_win_unmap(vwm_t *vwm, vwm_window_t *vwin) { - if (!vwin->xwindow->mapped) { + if (!vwin->xwindow->client_mapped) { VWM_TRACE("inhibited unmap of \"%s\", not mapped by client", vwin->xwindow->name); return; } @@ -45,7 +45,7 @@ void vwm_win_unmap(vwm_t *vwm, vwm_window_t *vwin) /* map the specified window and set the mapping-in-progress flag so we can discard vwm-generated MapNotify events */ void vwm_win_map(vwm_t *vwm, vwm_window_t *vwin) { - if (!vwin->xwindow->mapped) { + if (!vwin->xwindow->client_mapped) { VWM_TRACE("inhibited map of \"%s\", not mapped by client", vwin->xwindow->name); return; } 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, diff --git a/src/xwindow.c b/src/xwindow.c index 552d9aa..1564cfe 100644 --- a/src/xwindow.c +++ b/src/xwindow.c @@ -68,8 +68,8 @@ int vwm_xwin_is_mapped(vwm_t *vwm, vwm_xwindow_t *xwin) vwm_window_t *vwin = xwin->managed; int ret = 0; - if (!xwin->mapped || !vwin) - return xwin->mapped; + if (!xwin->client_mapped || !vwin) + return xwin->client_mapped; switch (vwm->focused_context) { case VWM_CONTEXT_SHELF: @@ -166,14 +166,14 @@ vwm_xwindow_t * vwm_xwin_create(vwm_t *vwm, Window win, vwm_grab_mode_t grabbed) * in the case of override_redirect windows they may be unmapped (invisible) or mapped (visible) like menus without being managed. * otherwise we could just use !xwin.managed to indicate unmapped, which is more vwm2-like, but insufficient when compositing. */ - xwin->mapped = (attrs.map_state != IsUnmapped); + xwin->client_mapped = (attrs.map_state != IsUnmapped); vwm_xwin_setup_overlay(vwm, xwin); vwm_composite_xwin_create(vwm, xwin); list_add_tail(&xwin->xwindows, &vwm->xwindows); /* created windows are always placed on the top of the stacking order */ - if (!attrs.override_redirect && xwin->mapped) + if (!attrs.override_redirect && xwin->client_mapped) vwm_win_manage_xwin(vwm, xwin); _out_grabbed: diff --git a/src/xwindow.h b/src/xwindow.h index 7c77692..0d2b322 100644 --- a/src/xwindow.h +++ b/src/xwindow.h @@ -24,7 +24,7 @@ typedef struct _vwm_xwindow_t { vwm_overlay_t *overlay; /* monitoring overlay state */ char *name; /* client name */ - unsigned int mapped:1; /* is the window currently mapped (by client) */ + unsigned int client_mapped:1; /* is the window currently mapped (by client) */ unsigned int occluded:1; /* is the window occluded entirely by another window? (used and valid only during paint_all()) */ /* if only Xorg could send VisibilityNotify events when requested for redirected windows :( */ vwm_window_t *managed; /* is the window "managed"? NULL or this points to the managed context of the window */ |