[Xfce4-commits] r25777 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-06-03 09:44:36 +0000 (Sun, 03 Jun 2007)
New Revision: 25777

Modified:
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/display.h
   xfwm4/trunk/src/frame.c
   xfwm4/trunk/src/screen.c
   xfwm4/trunk/src/settings.c
   xfwm4/trunk/src/settings.h
Log:
Try to make things less confusing

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2007-06-03 08:21:35 UTC (rev 25776)
+++ xfwm4/trunk/src/client.c	2007-06-03 09:44:36 UTC (rev 25777)
@@ -1797,7 +1797,7 @@
         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 @@
     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 @@
     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 @@
     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)
         {

Modified: xfwm4/trunk/src/display.h
===================================================================
--- xfwm4/trunk/src/display.h	2007-06-03 08:21:35 UTC (rev 25776)
+++ xfwm4/trunk/src/display.h	2007-06-03 09:44:36 UTC (rev 25777)
@@ -104,9 +104,9 @@
     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
 {

Modified: xfwm4/trunk/src/frame.c
===================================================================
--- xfwm4/trunk/src/frame.c	2007-06-03 08:21:35 UTC (rev 25776)
+++ xfwm4/trunk/src/frame.c	2007-06-03 09:44:36 UTC (rev 25777)
@@ -730,7 +730,7 @@
                                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 @@
                                 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 @@
         && !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 @@
                 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]))
             {

Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c	2007-06-03 08:21:35 UTC (rev 25776)
+++ xfwm4/trunk/src/screen.c	2007-06-03 09:44:36 UTC (rev 25777)
@@ -201,7 +201,7 @@
     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]);

Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c	2007-06-03 08:21:35 UTC (rev 25776)
+++ xfwm4/trunk/src/settings.c	2007-06-03 09:44:36 UTC (rev 25777)
@@ -1220,7 +1220,7 @@
     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));

Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h	2007-06-03 08:21:35 UTC (rev 25776)
+++ xfwm4/trunk/src/settings.h	2007-06-03 09:44:36 UTC (rev 25777)
@@ -151,7 +151,7 @@
 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;