From 65de7a0a92e3471a3c8b39d8ac1c67a21cb6eab4 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Tue, 24 Aug 2004 05:58:06 +0000
Subject: [PATCH] Try to stick to the standard.
(Old svn revision: 11918)
---
src/client.c | 16 ++++++++--------
src/client.h | 2 +-
src/events.c | 6 +++---
src/focus.c | 2 +-
src/netwm.c | 7 +------
src/session.c | 4 ++--
src/stacking.c | 2 +-
src/workspaces.c | 2 +-
8 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/client.c b/src/client.c
index 74eb0b596..39dcbf702 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1445,7 +1445,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
c->type = UNSET;
c->type_atom = None;
- FLAG_SET (c->flags, START_ICONIC (c) ? CLIENT_FLAG_HIDDEN : 0);
+ FLAG_SET (c->flags, START_ICONIC (c) ? CLIENT_FLAG_ICONIFIED : 0);
FLAG_SET (c->wm_flags, ACCEPT_INPUT (c->wmhints) ? WM_FLAG_INPUT : 0);
clientGetWMProtocols (c);
@@ -1570,7 +1570,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
clientGetUserTime (c);
clientRaise (c);
- if (!FLAG_TEST (c->flags, CLIENT_FLAG_HIDDEN))
+ if (!FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED))
{
if ((c->win_workspace == screen_info->current_ws) ||
FLAG_TEST(c->flags, CLIENT_FLAG_STICKY))
@@ -1842,7 +1842,7 @@ clientSetWorkspace (Client * c, int ws, gboolean manage_mapping)
TRACE ("setting client \"%s\" (0x%lx) to current_ws %d", c->name, c->window, ws);
clientSetWorkspaceSingle (c2, ws);
if (manage_mapping && !clientIsTransientOrModal (c2)
- && !FLAG_TEST (c2->flags, CLIENT_FLAG_HIDDEN))
+ && !FLAG_TEST (c2->flags, CLIENT_FLAG_ICONIFIED))
{
if (FLAG_TEST (c2->flags, CLIENT_FLAG_STICKY))
{
@@ -1886,12 +1886,12 @@ clientShowSingle (Client * c, gboolean change_state)
}
if (change_state)
{
- FLAG_UNSET (c->flags, CLIENT_FLAG_HIDDEN);
+ FLAG_UNSET (c->flags, CLIENT_FLAG_ICONIFIED);
setWMState (display_info->dpy, c->window, NormalState);
- clientSetNetState (c);
workspaceUpdateArea (screen_info);
}
myDisplayUngrabServer (display_info);
+ clientSetNetState (c);
}
void
@@ -1943,13 +1943,13 @@ clientHideSingle (Client * c, gboolean change_state)
}
if (change_state)
{
- FLAG_SET (c->flags, CLIENT_FLAG_HIDDEN);
+ FLAG_SET (c->flags, CLIENT_FLAG_ICONIFIED);
XUnmapWindow (display_info->dpy, c->window);
setWMState (display_info->dpy, c->window, IconicState);
- clientSetNetState (c);
workspaceUpdateArea (c->screen_info);
}
myDisplayUngrabServer (display_info);
+ clientSetNetState (c);
}
void
@@ -2033,7 +2033,7 @@ clientToggleShowDesktop (ScreenInfo *screen_info, gboolean show_desktop)
{
Client *c = (Client *) index->data;
if (CLIENT_CAN_HIDE_WINDOW (c)
- && FLAG_TEST_AND_NOT (c->flags, CLIENT_FLAG_HAS_BORDER, CLIENT_FLAG_HIDDEN))
+ && FLAG_TEST_AND_NOT (c->flags, CLIENT_FLAG_HAS_BORDER, CLIENT_FLAG_ICONIFIED))
{
{
FLAG_SET (c->flags, CLIENT_FLAG_WAS_SHOWN);
diff --git a/src/client.h b/src/client.h
index 09af71e72..daf34ca82 100644
--- a/src/client.h
+++ b/src/client.h
@@ -93,7 +93,7 @@
#define CLIENT_FLAG_IS_RESIZABLE (1L<<15)
#define CLIENT_FLAG_MAP_PENDING (1L<<16)
#define CLIENT_FLAG_VISIBLE (1L<<17)
-#define CLIENT_FLAG_HIDDEN (1L<<18)
+#define CLIENT_FLAG_ICONIFIED (1L<<18)
#define CLIENT_FLAG_MANAGED (1L<<19)
#define CLIENT_FLAG_MAXIMIZED_VERT (1L<<20)
#define CLIENT_FLAG_MAXIMIZED_HORIZ (1L<<21)
diff --git a/src/events.c b/src/events.c
index b05988ac8..16059bf92 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1204,7 +1204,7 @@ handleConfigureRequest (DisplayInfo *display_info, XConfigureRequestEvent * ev)
if ((c->win_workspace == screen_info->current_ws) ||
(FLAG_TEST (c->flags, CLIENT_FLAG_STICKY)))
{
- if (FLAG_TEST (c->flags, CLIENT_FLAG_HIDDEN))
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED))
{
clientShow (c, TRUE);
}
@@ -1554,7 +1554,7 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev)
if ((ev->message_type == wm_change_state) && (ev->format == 32) && (ev->data.l[0] == IconicState))
{
TRACE ("client \"%s\" (0x%lx) has received a wm_change_state event", c->name, c->window);
- if (!FLAG_TEST (c->flags, CLIENT_FLAG_HIDDEN) &&
+ if (!FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED) &&
CLIENT_CAN_HIDE_WINDOW (c))
{
clientHide (c, c->win_workspace, TRUE);
@@ -1935,7 +1935,7 @@ show_popup_cb (GtkWidget * widget, GdkEventButton * ev, gpointer data)
}
}
- if (FLAG_TEST (c->flags, CLIENT_FLAG_HIDDEN))
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED))
{
ops |= MENU_OP_UNMINIMIZE;
if (!CLIENT_CAN_HIDE_WINDOW (c))
diff --git a/src/focus.c b/src/focus.c
index 8074d6ccf..2b50a1149 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -173,7 +173,7 @@ clientSelectMask (Client * c, int mask, int type)
{
return FALSE;
}
- if (FLAG_TEST (c->flags, CLIENT_FLAG_HIDDEN) && !(mask & INCLUDE_HIDDEN))
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED) && !(mask & INCLUDE_HIDDEN))
{
return FALSE;
}
diff --git a/src/netwm.c b/src/netwm.c
index 4c2a1a1ea..425dd5b10 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -109,7 +109,7 @@ clientSetNetState (Client * c)
TRACE ("clientSetNetState : below");
data[i++] = net_wm_state_below;
}
- if (FLAG_TEST (c->flags, CLIENT_FLAG_HIDDEN))
+ if (!FLAG_TEST (c->flags, CLIENT_FLAG_VISIBLE))
{
TRACE ("clientSetNetState : hidden");
data[i++] = net_wm_state_hidden;
@@ -175,11 +175,6 @@ clientGetNetState (Client * c)
c->win_state |= WIN_STATE_SHADED;
FLAG_SET (c->flags, CLIENT_FLAG_SHADED);
}
- else if (atoms[i] == net_wm_state_hidden)
- {
- TRACE ("clientGetNetState : hidden");
- FLAG_SET (c->flags, CLIENT_FLAG_HIDDEN);
- }
else if ((atoms[i] == net_wm_state_sticky))
{
TRACE ("clientGetNetState : sticky");
diff --git a/src/session.c b/src/session.c
index 56ca6c8d7..337498a20 100644
--- a/src/session.c
+++ b/src/session.c
@@ -339,7 +339,7 @@ sessionSaveScreen (ScreenInfo *screen_info, FILE *f)
fprintf (f, " [SCREEN] %i\n", screen_info->screen);
fprintf (f, " [DESK] %i\n", c->win_workspace);
fprintf (f, " [FLAGS] 0x%lx\n", FLAG_TEST (c->flags,
- CLIENT_FLAG_STICKY | CLIENT_FLAG_HIDDEN |
+ CLIENT_FLAG_STICKY | CLIENT_FLAG_ICONIFIED |
CLIENT_FLAG_SHADED | CLIENT_FLAG_MAXIMIZED |
CLIENT_FLAG_NAME_CHANGED));
}
@@ -670,7 +670,7 @@ sessionMatchWinToSM (Client * c)
FLAG_SET (c->flags,
matches[i].
flags & (CLIENT_FLAG_STICKY | CLIENT_FLAG_SHADED |
- CLIENT_FLAG_MAXIMIZED | CLIENT_FLAG_HIDDEN));
+ CLIENT_FLAG_MAXIMIZED | CLIENT_FLAG_ICONIFIED));
FLAG_SET (c->flags, CLIENT_FLAG_WORKSPACE_SET);
return TRUE;
}
diff --git a/src/stacking.c b/src/stacking.c
index 7a733657b..2202338ee 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -88,7 +88,7 @@ clientTransientOrModalHasAncestor (Client * c, int ws)
c2 = (Client *) index->data;
if ((c2 != c) && !clientIsTransientOrModal (c2)
&& clientIsTransientOrModalFor (c, c2)
- && !FLAG_TEST (c2->flags, CLIENT_FLAG_HIDDEN)
+ && !FLAG_TEST (c2->flags, CLIENT_FLAG_ICONIFIED)
&& (c2->win_workspace == ws))
{
return TRUE;
diff --git a/src/workspaces.c b/src/workspaces.c
index e24c6e484..5ff532f44 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -127,7 +127,7 @@ workspaceSwitch (ScreenInfo *screen_info, int new_ws, Client * c2)
FLAG_UNSET (c->flags, CLIENT_FLAG_FOCUS);
}
else if ((c->win_workspace == new_ws)
- && !FLAG_TEST (c->flags, CLIENT_FLAG_HIDDEN))
+ && !FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED))
{
if (!clientIsTransientOrModal (c))
{
--
GitLab