Author: olivier
Date: 2006-10-13 17:35:24 +0000 (Fri, 13 Oct 2006)
New Revision: 23403
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/display.c
xfwm4/trunk/src/display.h
xfwm4/trunk/src/events.c
xfwm4/trunk/src/frame.c
xfwm4/trunk/src/hints.c
xfwm4/trunk/src/misc.c
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/settings.c
xfwm4/trunk/src/settings.h
Log:
Code cleanup to ease future mantainance.
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/client.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -570,7 +570,7 @@
if ((minx * h1 > miny * w1) &&
(miny) &&
- ((corner == 4 + SIDE_TOP) || (corner == 4 + SIDE_BOTTOM)))
+ ((corner == CORNER_COUNT + SIDE_TOP) || (corner == CORNER_COUNT +
SIDE_BOTTOM)))
{
/* Change width to match */
delta = MAKE_MULT (minx * h1 / miny - w1, xinc);
@@ -600,7 +600,7 @@
if ((maxx * h1 < maxy * w1) &&
(maxx) &&
- ((corner == 4 + SIDE_LEFT) || (corner == 4 + SIDE_RIGHT)))
+ ((corner == CORNER_COUNT + SIDE_LEFT) || (corner == CORNER_COUNT +
SIDE_RIGHT)))
{
delta = MAKE_MULT (w1 * maxy / maxx - h1, yinc);
if (!(c->size->flags & PMaxSize) ||
@@ -1543,7 +1543,7 @@
FLAG_SET (c->xfwm_flags, XFWM_FLAG_IS_RESIZABLE);
}
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
c->button_pressed[i] = FALSE;
}
@@ -1718,13 +1718,13 @@
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->sides[SIDE_LEFT],
- myDisplayGetCursorResize(screen_info->display_info, 4 + SIDE_LEFT));
+ myDisplayGetCursorResize(screen_info->display_info, CORNER_COUNT +
SIDE_LEFT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->sides[SIDE_RIGHT],
- myDisplayGetCursorResize(screen_info->display_info, 4 + SIDE_RIGHT));
+ myDisplayGetCursorResize(screen_info->display_info, CORNER_COUNT +
SIDE_RIGHT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->sides[SIDE_BOTTOM],
- myDisplayGetCursorResize(screen_info->display_info, 4 + SIDE_BOTTOM));
+ myDisplayGetCursorResize(screen_info->display_info, CORNER_COUNT +
SIDE_BOTTOM));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->corners[CORNER_BOTTOM_LEFT],
myDisplayGetCursorResize(screen_info->display_info,
CORNER_BOTTOM_LEFT));
@@ -1739,7 +1739,7 @@
myDisplayGetCursorResize(screen_info->display_info, CORNER_TOP_RIGHT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->title, None);
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->buttons[i], None);
@@ -1889,7 +1889,7 @@
xfwmPixmapFree (&c->appmenu[INACTIVE]);
xfwmPixmapFree (&c->appmenu[PRESSED]);
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
xfwmWindowDelete (&c->buttons[i]);
}
@@ -3671,7 +3671,6 @@
DisplayInfo *display_info;
XWindowChanges wc;
MoveResizeData passdata;
- Cursor cursor;
int changes;
gboolean g1, g2;
@@ -3697,25 +3696,24 @@
if (ev->type == KeyPress)
{
- cursor = None;
passdata.released = passdata.use_keys = TRUE;
passdata.mx = ev->xkey.x_root;
passdata.my = ev->xkey.y_root;
}
else if (ev->type == ButtonPress)
{
- cursor = None;
passdata.mx = ev->xbutton.x_root;
passdata.my = ev->xbutton.y_root;
}
else
{
- cursor = myDisplayGetCursorMove(display_info);
getMouseXY (screen_info, screen_info->xroot, &passdata.mx,
&passdata.my);
}
+
g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
g2 = myScreenGrabPointer (screen_info, ButtonMotionMask |
ButtonReleaseMask,
- cursor, myDisplayGetCurrentTime (display_info));
+ myDisplayGetCursorMove (display_info),
+ myDisplayGetCurrentTime (display_info));
if (!g1 || !g2)
{
TRACE ("grab failed in clientMove");
@@ -3844,19 +3842,19 @@
move_top = ((passdata->corner == CORNER_TOP_RIGHT)
|| (passdata->corner == CORNER_TOP_LEFT)
- || (passdata->corner == 4 + SIDE_TOP)) ?
+ || (passdata->corner == CORNER_COUNT + SIDE_TOP)) ?
1 : 0;
move_bottom = ((passdata->corner == CORNER_BOTTOM_RIGHT)
|| (passdata->corner == CORNER_BOTTOM_LEFT)
- || (passdata->corner == 4 + SIDE_BOTTOM)) ?
+ || (passdata->corner == CORNER_COUNT + SIDE_BOTTOM)) ?
1 : 0;
move_right = ((passdata->corner == CORNER_TOP_RIGHT)
|| (passdata->corner == CORNER_BOTTOM_RIGHT)
- || (passdata->corner == 4 + SIDE_RIGHT)) ?
+ || (passdata->corner == CORNER_COUNT + SIDE_RIGHT)) ?
1 : 0;
move_left = ((passdata->corner == CORNER_TOP_LEFT)
|| (passdata->corner == CORNER_BOTTOM_LEFT)
- || (passdata->corner == 4 + SIDE_LEFT)) ?
+ || (passdata->corner == CORNER_COUNT + SIDE_LEFT)) ?
1 : 0;
monitor_nbr = find_monitor_at_point (screen_info->gscr, cx, cy);
@@ -3912,23 +3910,23 @@
&& (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_UP].keycode))
{
c->height = c->height - key_height_inc;
- corner = 4 + SIDE_BOTTOM;
+ corner = CORNER_COUNT + SIDE_BOTTOM;
}
else if (!FLAG_TEST (c->flags, CLIENT_FLAG_SHADED)
&& (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_DOWN].keycode))
{
c->height = c->height + key_height_inc;
- corner = 4 + SIDE_BOTTOM;
+ corner = CORNER_COUNT + SIDE_BOTTOM;
}
else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_LEFT].keycode)
{
c->width = c->width - key_width_inc;
- corner = 4 + SIDE_RIGHT;
+ corner = CORNER_COUNT + SIDE_RIGHT;
}
else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_RIGHT].keycode)
{
c->width = c->width + key_width_inc;
- corner = 4 + SIDE_RIGHT;
+ corner = CORNER_COUNT + SIDE_RIGHT;
}
if (corner >= 0)
{
@@ -4618,7 +4616,7 @@
g_return_if_fail (c != NULL);
TRACE ("entering clientButtonPress");
- for (b = 0; b < BUTTON_COUNT; b++)
+ for (b = 0; b < BUTTON_LAST; b++)
{
if (MYWINDOW_XWINDOW (c->buttons[b]) == w)
{
Modified: xfwm4/trunk/src/display.c
===================================================================
--- xfwm4/trunk/src/display.c 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/display.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -48,6 +48,14 @@
#define MAX_HOSTNAME_LENGTH 32
#endif /* MAX_HOSTNAME_LENGTH */
+#ifndef CURSOR_ROOT
+#define CURSOR_ROOT XC_left_ptr
+#endif
+
+#ifndef CURSOR_MOVE
+#define CURSOR_MOVE XC_fleur
+#endif
+
static int
handleXError (Display * dpy, XErrorEvent * err)
{
@@ -162,10 +170,10 @@
"_XSETROOT_ID"
};
- g_assert (NB_ATOMS == G_N_ELEMENTS (atom_names));
+ g_assert (ATOM_COUNT == G_N_ELEMENTS (atom_names));
return (XInternAtoms (display_info->dpy,
(char **) atom_names,
- NB_ATOMS,
+ ATOM_COUNT,
FALSE, display_info->atoms) != 0);
}
@@ -243,9 +251,9 @@
#endif
display->root_cursor =
- XCreateFontCursor (display->dpy, XC_left_ptr);
+ XCreateFontCursor (display->dpy, CURSOR_ROOT);
display->move_cursor =
- XCreateFontCursor (display->dpy, XC_fleur);
+ XCreateFontCursor (display->dpy, CURSOR_MOVE);
display->busy_cursor =
cursorCreateSpinning (display->dpy);
display->resize_cursor[CORNER_TOP_LEFT] =
@@ -256,13 +264,13 @@
XCreateFontCursor (display->dpy, XC_bottom_left_corner);
display->resize_cursor[CORNER_BOTTOM_RIGHT] =
XCreateFontCursor (display->dpy, XC_bottom_right_corner);
- display->resize_cursor[4 + SIDE_LEFT] =
+ display->resize_cursor[CORNER_COUNT + SIDE_LEFT] =
XCreateFontCursor (display->dpy, XC_left_side);
- display->resize_cursor[4 + SIDE_RIGHT] =
+ display->resize_cursor[CORNER_COUNT + SIDE_RIGHT] =
XCreateFontCursor (display->dpy, XC_right_side);
- display->resize_cursor[4 + SIDE_TOP] =
+ display->resize_cursor[CORNER_COUNT + SIDE_TOP] =
XCreateFontCursor (display->dpy, XC_top_side);
- display->resize_cursor[4 + SIDE_BOTTOM] =
+ display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
XCreateFontCursor (display->dpy, XC_bottom_side);
display->xfilter = NULL;
Modified: xfwm4/trunk/src/display.h
===================================================================
--- xfwm4/trunk/src/display.h 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/display.h 2006-10-13 17:35:24 UTC (rev 23403)
@@ -51,20 +51,6 @@
#include "event_filter.h"
-#define CORNER_TOP_LEFT 0
-#define CORNER_TOP_RIGHT 1
-#define CORNER_BOTTOM_LEFT 2
-#define CORNER_BOTTOM_RIGHT 3
-
-#define SIDE_LEFT 0
-#define SIDE_RIGHT 1
-#define SIDE_BOTTOM 2
-#define SIDE_TOP 3
-
-#define ANY 0
-#define WINDOW 1
-#define FRAME 2
-
/*
* The following macro is taken straight from metacity,
* if that needs some explanation, please refer to metacity's
@@ -78,6 +64,31 @@
enum
{
+ CORNER_TOP_LEFT = 0,
+ CORNER_TOP_RIGHT,
+ CORNER_BOTTOM_LEFT,
+ CORNER_BOTTOM_RIGHT,
+ CORNER_COUNT
+};
+
+enum
+{
+ SIDE_LEFT = 0,
+ SIDE_RIGHT,
+ SIDE_BOTTOM,
+ SIDE_TOP,
+ SIDE_COUNT
+};
+
+enum
+{
+ ANY,
+ WINDOW,
+ FRAME
+};
+
+enum
+{
COMPOSITING_MANAGER = 0,
GNOME_PANEL_DESKTOP_AREA,
KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR,
@@ -172,7 +183,7 @@
XFWM4_COMPOSITING_MANAGER,
XROOTPMAP,
XSETROOT,
- NB_ATOMS
+ ATOM_COUNT
};
typedef struct _Client Client;
@@ -197,7 +208,7 @@
Cursor root_cursor;
Cursor resize_cursor[8];
- Atom atoms[NB_ATOMS];
+ Atom atoms[ATOM_COUNT];
eventFilterSetup *xfilter;
GSList *screens;
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/events.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -352,7 +352,7 @@
int key, state;
state = ev->state & MODIFIER_MASK;
- for (key = 0; key < KEY_COUNT; key++)
+ for (key = 0; key < KEY_LAST; key++)
{
if ((screen_info->params->keys[key].keycode == ev->keycode)
&& (screen_info->params->keys[key].modifier == state))
@@ -870,11 +870,11 @@
/* Left or right side */
if (ev->x < c->width / 2)
{
- part = 4 + SIDE_LEFT;
+ part = CORNER_COUNT + SIDE_LEFT;
}
else
{
- part = 4 + SIDE_RIGHT;
+ part = CORNER_COUNT + SIDE_RIGHT;
}
}
else
@@ -882,11 +882,11 @@
/* Top or bottom side */
if (ev->y < c->height / 2)
{
- part = 4 + SIDE_TOP;
+ part = CORNER_COUNT + SIDE_TOP;
}
else
{
- part = 4 + SIDE_BOTTOM;
+ part = CORNER_COUNT + SIDE_BOTTOM;
}
}
}
@@ -979,17 +979,17 @@
else if ((win == MYWINDOW_XWINDOW (c->sides[SIDE_BOTTOM]))
&& (state == 0))
{
- edgeButton (c, 4 + SIDE_BOTTOM, ev);
+ edgeButton (c, CORNER_COUNT + SIDE_BOTTOM, ev);
}
else if ((win == MYWINDOW_XWINDOW (c->sides[SIDE_LEFT]))
&& (state == 0))
{
- edgeButton (c, 4 + SIDE_LEFT, ev);
+ edgeButton (c, CORNER_COUNT + SIDE_LEFT, ev);
}
else if ((win == MYWINDOW_XWINDOW (c->sides[SIDE_RIGHT]))
&& (state == 0))
{
- edgeButton (c, 4 + SIDE_RIGHT, ev);
+ edgeButton (c, CORNER_COUNT + SIDE_RIGHT, ev);
}
else if (ev->window == c->window)
{
Modified: xfwm4/trunk/src/frame.c
===================================================================
--- xfwm4/trunk/src/frame.c 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/frame.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -666,7 +666,7 @@
ShapeBounding, 0, 0,
screen_info->corners[CORNER_TOP_RIGHT][state].mask, ShapeSet);
}
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
if (xfwmWindowVisible (&c->buttons[i]))
{
@@ -783,7 +783,7 @@
0, MYWINDOW_XWINDOW
(c->corners[CORNER_TOP_RIGHT]), ShapeBounding, ShapeUnion);
}
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
if (xfwmWindowVisible (&c->buttons[i]))
{
@@ -889,7 +889,7 @@
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
{
/* First, hide the buttons that we don't have... */
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
char b = getLetterFromButton (i, c);
if ((!b) || !strchr (screen_info->params->button_layout, b))
@@ -1114,7 +1114,7 @@
xfwmWindowHide (&c->corners[i]);
}
}
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
if (MYWINDOW_XWINDOW (c->buttons[i]) && xfwmWindowVisible
(&c->buttons[i]))
{
Modified: xfwm4/trunk/src/hints.c
===================================================================
--- xfwm4/trunk/src/hints.c 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/hints.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -238,7 +238,7 @@
int real_format;
gboolean success;
- g_return_val_if_fail (((atom_id >= 0) && (atom_id < NB_ATOMS)), FALSE);
+ g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
TRACE ("entering getHint");
success = FALSE;
@@ -262,7 +262,7 @@
void
setHint (DisplayInfo *display_info, Window w, int atom_id, long value)
{
- g_return_if_fail ((atom_id >= 0) && (atom_id < NB_ATOMS));
+ g_return_if_fail ((atom_id >= 0) && (atom_id < ATOM_COUNT));
TRACE ("entering setHint");
XChangeProperty (display_info->dpy, w, display_info->atoms[atom_id],
XA_CARDINAL,
@@ -479,7 +479,7 @@
*atoms_p = NULL;
*n_atoms_p = 0;
- g_return_val_if_fail (((atom_id >= 0) && (atom_id < NB_ATOMS)), FALSE);
+ g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
TRACE ("entering getAtomList()");
if ((XGetWindowProperty (display_info->dpy, w,
display_info->atoms[atom_id],
@@ -519,7 +519,7 @@
*cardinals_p = NULL;
*n_cardinals_p = 0;
- g_return_val_if_fail (((atom_id >= 0) && (atom_id < NB_ATOMS)), FALSE);
+ g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
TRACE ("entering getCardinalList()");
if ((XGetWindowProperty (display_info->dpy, w,
display_info->atoms[atom_id],
@@ -599,7 +599,7 @@
void
setUTF8StringHint (DisplayInfo *display_info, Window w, int atom_id, const
gchar *val)
{
- g_return_if_fail ((atom_id >= 0) && (atom_id < NB_ATOMS));
+ g_return_if_fail ((atom_id >= 0) && (atom_id < ATOM_COUNT));
TRACE ("entering setUTF8StringHint");
XChangeProperty (display_info->dpy, w, display_info->atoms[atom_id],
@@ -695,7 +695,7 @@
unsigned char *str;
unsigned long n_items;
- g_return_val_if_fail (((atom_id >= 0) && (atom_id < NB_ATOMS)), FALSE);
+ g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
TRACE ("entering getUTF8StringData");
*str_p = NULL;
@@ -728,7 +728,7 @@
{
char *xstr;
- g_return_val_if_fail (((atom_id >= 0) && (atom_id < NB_ATOMS)), FALSE);
+ g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
TRACE ("entering getUTF8String");
if (!getUTF8StringData (display_info, w, atom_id, &xstr, length))
@@ -769,7 +769,7 @@
guint i;
int length;
- g_return_val_if_fail (((atom_id >= 0) && (atom_id < NB_ATOMS)), FALSE);
+ g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
TRACE ("entering getUTF8StringList");
@@ -1154,7 +1154,7 @@
gboolean
setAtomIdManagerOwner (DisplayInfo *display_info, int atom_id, Window root,
Window w)
{
- g_return_val_if_fail (((atom_id >= 0) && (atom_id < NB_ATOMS)), FALSE);
+ g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
return setXAtomManagerOwner(display_info, display_info->atoms[atom_id],
root, w);
}
Modified: xfwm4/trunk/src/misc.c
===================================================================
--- xfwm4/trunk/src/misc.c 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/misc.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -108,7 +108,7 @@
DisplayInfo *display_info;
XClientMessageEvent ev;
- g_return_if_fail ((atom_id > 0) && (atom_id < NB_ATOMS));
+ g_return_if_fail ((atom_id > 0) && (atom_id < ATOM_COUNT));
TRACE ("entering sendClientMessage");
display_info = screen_info->display_info;
@@ -127,7 +127,7 @@
DisplayInfo *display_info;
XClientMessageEvent ev;
- g_return_if_fail ((atom_id > 0) && (atom_id < NB_ATOMS));
+ g_return_if_fail ((atom_id > 0) && (atom_id < ATOM_COUNT));
TRACE ("entering sendClientMessage");
display_info = screen_info->display_info;
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/screen.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -199,7 +199,7 @@
screen_info->title_shadow_colors[INACTIVE].gc = NULL;
screen_info->title_shadow_colors[INACTIVE].allocated = FALSE;
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; 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 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/settings.c 2006-10-13 17:35:24 UTC (rev 23403)
@@ -1561,7 +1561,7 @@
xfwmPixmapFree (&screen_info->corners[i][ACTIVE]);
xfwmPixmapFree (&screen_info->corners[i][INACTIVE]);
}
- for (i = 0; i < BUTTON_COUNT; i++)
+ for (i = 0; i < BUTTON_LAST; i++)
{
xfwmPixmapFree (&screen_info->buttons[i][ACTIVE]);
xfwmPixmapFree (&screen_info->buttons[i][INACTIVE]);
Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h 2006-10-13 14:28:31 UTC (rev 23402)
+++ xfwm4/trunk/src/settings.h 2006-10-13 17:35:24 UTC (rev 23403)
@@ -33,102 +33,125 @@
#ifndef INC_SETTINGS_H
#define INC_SETTINGS_H
-#define TITLE_1 0
-#define TITLE_2 1
-#define TITLE_3 2
-#define TITLE_4 3
-#define TITLE_5 4
+enum
+{
+ TITLE_1,
+ TITLE_2,
+ TITLE_3,
+ TITLE_4,
+ TITLE_5
+};
-#define TITLE_SHADOW_NONE 0
-#define TITLE_SHADOW_UNDER 1
-#define TITLE_SHADOW_FRAME 2
+enum
+{
+ TITLE_SHADOW_NONE,
+ TITLE_SHADOW_UNDER,
+ TITLE_SHADOW_FRAME
+};
-#define MENU_BUTTON 0
-#define STICK_BUTTON 1
-#define SHADE_BUTTON 2
-#define HIDE_BUTTON 3
-#define MAXIMIZE_BUTTON 4
-#define CLOSE_BUTTON 5
-#define TITLE_SEPARATOR 6
-#define BUTTON_COUNT 6
+enum
+{
+ MENU_BUTTON,
+ STICK_BUTTON,
+ SHADE_BUTTON,
+ HIDE_BUTTON,
+ MAXIMIZE_BUTTON,
+ CLOSE_BUTTON,
+ TITLE_SEPARATOR,
+ BUTTON_COUNT
+};
+#define BUTTON_LAST (BUTTON_COUNT - 1)
-#define ACTIVE 0
-#define INACTIVE 1
-#define PRESSED 2
-#define T_ACTIVE 3
-#define T_INACTIVE 4
-#define T_PRESSED 5
+enum
+{
+ ACTIVE,
+ INACTIVE,
+ PRESSED,
+ T_ACTIVE,
+ T_INACTIVE,
+ T_PRESSED
+};
-#define KEY_ADD_WORKSPACE 0
-#define KEY_CANCEL 1
-#define KEY_CLOSE_WINDOW 2
-#define KEY_CYCLE_WINDOWS 3
-#define KEY_DEL_WORKSPACE 4
-#define KEY_DOWN_WORKSPACE 5
-#define KEY_HIDE_WINDOW 6
-#define KEY_LEFT_WORKSPACE 7
-#define KEY_LOWER_WINDOW 8
-#define KEY_MAXIMIZE_HORIZ 9
-#define KEY_MAXIMIZE_VERT 10
-#define KEY_MAXIMIZE_WINDOW 11
-#define KEY_MOVE_DOWN 12
-#define KEY_MOVE_DOWN_WORKSPACE 13
-#define KEY_MOVE_LEFT 14
-#define KEY_MOVE_LEFT_WORKSPACE 15
-#define KEY_MOVE_NEXT_WORKSPACE 16
-#define KEY_MOVE_PREV_WORKSPACE 17
-#define KEY_MOVE_RIGHT 18
-#define KEY_MOVE_RIGHT_WORKSPACE 19
-#define KEY_MOVE_UP 20
-#define KEY_MOVE_UP_WORKSPACE 21
-#define KEY_MOVE_WORKSPACE_1 22
-#define KEY_MOVE_WORKSPACE_2 23
-#define KEY_MOVE_WORKSPACE_3 24
-#define KEY_MOVE_WORKSPACE_4 25
-#define KEY_MOVE_WORKSPACE_5 26
-#define KEY_MOVE_WORKSPACE_6 27
-#define KEY_MOVE_WORKSPACE_7 28
-#define KEY_MOVE_WORKSPACE_8 29
-#define KEY_MOVE_WORKSPACE_9 30
-#define KEY_MOVE_WORKSPACE_10 31
-#define KEY_MOVE_WORKSPACE_11 32
-#define KEY_MOVE_WORKSPACE_12 33
-#define KEY_NEXT_WORKSPACE 34
-#define KEY_POPUP_MENU 35
-#define KEY_PREV_WORKSPACE 36
-#define KEY_RAISE_WINDOW 37
-#define KEY_RESIZE_DOWN 38
-#define KEY_RESIZE_LEFT 39
-#define KEY_RESIZE_RIGHT 40
-#define KEY_RESIZE_UP 41
-#define KEY_RIGHT_WORKSPACE 42
-#define KEY_SHADE_WINDOW 43
-#define KEY_SHOW_DESKTOP 44
-#define KEY_STICK_WINDOW 45
-#define KEY_TOGGLE_FULLSCREEN 58
-#define KEY_UP_WORKSPACE 59
-#define KEY_WORKSPACE_1 60
-#define KEY_WORKSPACE_2 61
-#define KEY_WORKSPACE_3 62
-#define KEY_WORKSPACE_4 63
-#define KEY_WORKSPACE_5 64
-#define KEY_WORKSPACE_6 65
-#define KEY_WORKSPACE_7 66
-#define KEY_WORKSPACE_8 67
-#define KEY_WORKSPACE_9 68
-#define KEY_WORKSPACE_10 69
-#define KEY_WORKSPACE_11 70
-#define KEY_WORKSPACE_12 71
-#define KEY_COUNT 72
+enum
+{
+ KEY_ADD_WORKSPACE,
+ KEY_CANCEL,
+ KEY_CLOSE_WINDOW,
+ KEY_CYCLE_WINDOWS,
+ KEY_DEL_WORKSPACE,
+ KEY_DOWN_WORKSPACE,
+ KEY_HIDE_WINDOW,
+ KEY_LEFT_WORKSPACE,
+ KEY_LOWER_WINDOW,
+ KEY_MAXIMIZE_HORIZ,
+ KEY_MAXIMIZE_VERT,
+ KEY_MAXIMIZE_WINDOW,
+ KEY_MOVE_DOWN,
+ KEY_MOVE_DOWN_WORKSPACE,
+ KEY_MOVE_LEFT,
+ KEY_MOVE_LEFT_WORKSPACE,
+ KEY_MOVE_NEXT_WORKSPACE,
+ KEY_MOVE_PREV_WORKSPACE,
+ KEY_MOVE_RIGHT,
+ KEY_MOVE_RIGHT_WORKSPACE,
+ KEY_MOVE_UP,
+ KEY_MOVE_UP_WORKSPACE,
+ KEY_MOVE_WORKSPACE_1,
+ KEY_MOVE_WORKSPACE_2,
+ KEY_MOVE_WORKSPACE_3,
+ KEY_MOVE_WORKSPACE_4,
+ KEY_MOVE_WORKSPACE_5,
+ KEY_MOVE_WORKSPACE_6,
+ KEY_MOVE_WORKSPACE_7,
+ KEY_MOVE_WORKSPACE_8,
+ KEY_MOVE_WORKSPACE_9,
+ KEY_MOVE_WORKSPACE_10,
+ KEY_MOVE_WORKSPACE_11,
+ KEY_MOVE_WORKSPACE_12,
+ KEY_NEXT_WORKSPACE,
+ KEY_POPUP_MENU,
+ KEY_PREV_WORKSPACE,
+ KEY_RAISE_WINDOW,
+ KEY_RESIZE_DOWN,
+ KEY_RESIZE_LEFT,
+ KEY_RESIZE_RIGHT,
+ KEY_RESIZE_UP,
+ KEY_RIGHT_WORKSPACE,
+ KEY_SHADE_WINDOW,
+ KEY_SHOW_DESKTOP,
+ KEY_STICK_WINDOW,
+ KEY_TOGGLE_FULLSCREEN,
+ KEY_UP_WORKSPACE,
+ KEY_WORKSPACE_1,
+ KEY_WORKSPACE_2,
+ KEY_WORKSPACE_3,
+ KEY_WORKSPACE_4,
+ KEY_WORKSPACE_5,
+ KEY_WORKSPACE_6,
+ KEY_WORKSPACE_7,
+ KEY_WORKSPACE_8,
+ KEY_WORKSPACE_9,
+ KEY_WORKSPACE_10,
+ KEY_WORKSPACE_11,
+ KEY_WORKSPACE_12,
+ KEY_COUNT
+};
+#define KEY_LAST (KEY_COUNT - 1)
-#define ALIGN_LEFT 0
-#define ALIGN_RIGHT 1
-#define ALIGN_CENTER 2
+enum
+{
+ ALIGN_LEFT,
+ ALIGN_RIGHT,
+ ALIGN_CENTER
+};
-#define ACTION_NONE 0
-#define ACTION_MAXIMIZE 1
-#define ACTION_SHADE 2
-#define ACTION_HIDE 3
+enum
+{
+ ACTION_NONE,
+ ACTION_MAXIMIZE,
+ ACTION_SHADE,
+ ACTION_HIDE
+};
struct _XfwmColor
{
@@ -147,7 +170,7 @@
struct _XfwmParams
{
MyKey keys[KEY_COUNT];
- gchar button_layout[8];
+ gchar button_layout[BUTTON_COUNT + 1];
unsigned int xfwm_margins[4];
int button_offset;
int button_spacing;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
