From 70f8f1a110c183243780699e5fdda1c57de6ee0e Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sun, 3 Jun 2007 09:44:36 +0000
Subject: [PATCH] Try to make things less confusing
(Old svn revision: 25777)
---
src/client.c | 8 ++++----
src/display.h | 4 ++--
src/frame.c | 8 ++++----
src/screen.c | 2 +-
src/settings.c | 2 +-
src/settings.h | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/client.c b/src/client.c
index 84bfd9b3e..179bd7170 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1797,7 +1797,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
FLAG_SET (c->xfwm_flags, XFWM_FLAG_IS_RESIZABLE);
}
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
c->button_pressed[i] = FALSE;
}
@@ -2022,7 +2022,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->sides[SIDE_TOP],
myDisplayGetCursorResize(screen_info->display_info, CORNER_COUNT + SIDE_TOP));
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->buttons[i], None);
@@ -2168,7 +2168,7 @@ clientUnframe (Client * c, gboolean remap)
xfwmPixmapFree (&c->appmenu[INACTIVE]);
xfwmPixmapFree (&c->appmenu[PRESSED]);
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
xfwmWindowDelete (&c->buttons[i]);
}
@@ -4996,7 +4996,7 @@ clientButtonPress (Client * c, Window w, XButtonEvent * bev)
g_return_if_fail (c != NULL);
TRACE ("entering clientButtonPress");
- for (b = 0; b < BUTTON_LAST; b++)
+ for (b = 0; b < BUTTON_COUNT; b++)
{
if (MYWINDOW_XWINDOW (c->buttons[b]) == w)
{
diff --git a/src/display.h b/src/display.h
index 85d58c640..b3f3ead92 100644
--- a/src/display.h
+++ b/src/display.h
@@ -104,9 +104,9 @@ enum
MAXIMIZE_BUTTON,
CLOSE_BUTTON,
TITLE_SEPARATOR,
- BUTTON_COUNT
+ BUTTON_STRING_COUNT
};
-#define BUTTON_LAST (BUTTON_COUNT - 1)
+#define BUTTON_COUNT (BUTTON_STRING_COUNT - 1)
enum
{
diff --git a/src/frame.c b/src/frame.c
index e3b25afd3..813575198 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -730,7 +730,7 @@ frameSetShape (Client * c, int state, FramePixmap * frame_pix, int button_x[BUTT
ShapeBounding, 0, 0, screen_info->corners[CORNER_TOP_RIGHT][state].mask, ShapeSet);
}
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
if (xfwmWindowVisible (&c->buttons[i]))
{
@@ -855,7 +855,7 @@ frameSetShape (Client * c, int state, FramePixmap * frame_pix, int button_x[BUTT
0, MYWINDOW_XWINDOW (c->corners[CORNER_TOP_RIGHT]), ShapeBounding, ShapeUnion);
}
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
if (xfwmWindowVisible (&c->buttons[i]))
{
@@ -974,7 +974,7 @@ frameDraw (Client * c, gboolean clear_all)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
{
/* First, hide the buttons that we don't have... */
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
char b = getLetterFromButton (i, c);
if ((!b) || !strchr (screen_info->params->button_layout, b))
@@ -1215,7 +1215,7 @@ frameDraw (Client * c, gboolean clear_all)
xfwmWindowHide (&c->corners[i]);
}
}
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
if (MYWINDOW_XWINDOW (c->buttons[i]) && xfwmWindowVisible (&c->buttons[i]))
{
diff --git a/src/screen.c b/src/screen.c
index 2c36028d8..9eeb44afa 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -201,7 +201,7 @@ myScreenInit (DisplayInfo *display_info, GdkScreen *gscr, unsigned long event_ma
screen_info->title_shadow_colors[INACTIVE].gc = NULL;
screen_info->title_shadow_colors[INACTIVE].allocated = FALSE;
- for (i = 0; i < BUTTON_LAST; i++)
+ for (i = 0; i < BUTTON_COUNT; i++)
{
xfwmPixmapInit (screen_info, &screen_info->buttons[i][ACTIVE]);
xfwmPixmapInit (screen_info, &screen_info->buttons[i][INACTIVE]);
diff --git a/src/settings.c b/src/settings.c
index a61f4389c..cc2334f90 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1220,7 +1220,7 @@ loadTheme (ScreenInfo *screen_info, Settings *rc)
screen_info->params->title_shadow[ACTIVE] = getTitleShadow (rc, "title_shadow_active");
screen_info->params->title_shadow[INACTIVE] = getTitleShadow (rc, "title_shadow_inactive");
- strncpy (screen_info->params->button_layout, getValue ("button_layout", rc), BUTTON_COUNT + 1);
+ strncpy (screen_info->params->button_layout, getValue ("button_layout", rc), BUTTON_STRING_COUNT);
screen_info->params->button_spacing = TOINT (getValue ("button_spacing", rc));
screen_info->params->button_offset = TOINT (getValue ("button_offset", rc));
screen_info->params->maximized_offset = TOINT (getValue ("maximized_offset", rc));
diff --git a/src/settings.h b/src/settings.h
index 4cd219227..0a1009c4a 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -151,7 +151,7 @@ struct _Settings
struct _XfwmParams
{
MyKey keys[KEY_COUNT];
- gchar button_layout[BUTTON_COUNT + 1];
+ gchar button_layout[BUTTON_STRING_COUNT + 1];
unsigned int xfwm_margins[4];
int activate_action;
int button_offset;
--
GitLab