Author: olivier
Date: 2007-06-12 23:03:09 +0000 (Tue, 12 Jun 2007)
New Revision: 25807
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/client.h
xfwm4/trunk/src/compositor.c
xfwm4/trunk/src/compositor.h
xfwm4/trunk/src/display.c
xfwm4/trunk/src/display.h
xfwm4/trunk/src/event_filter.c
xfwm4/trunk/src/event_filter.h
xfwm4/trunk/src/events.c
xfwm4/trunk/src/events.h
xfwm4/trunk/src/focus.c
xfwm4/trunk/src/focus.h
xfwm4/trunk/src/frame.c
xfwm4/trunk/src/frame.h
xfwm4/trunk/src/hints.c
xfwm4/trunk/src/hints.h
xfwm4/trunk/src/icons.c
xfwm4/trunk/src/icons.h
xfwm4/trunk/src/keyboard.c
xfwm4/trunk/src/keyboard.h
xfwm4/trunk/src/main.c
xfwm4/trunk/src/menu.c
xfwm4/trunk/src/menu.h
xfwm4/trunk/src/misc.c
xfwm4/trunk/src/misc.h
xfwm4/trunk/src/mypixmap.c
xfwm4/trunk/src/mypixmap.h
xfwm4/trunk/src/mywindow.c
xfwm4/trunk/src/mywindow.h
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/netwm.h
xfwm4/trunk/src/parserc.c
xfwm4/trunk/src/parserc.h
xfwm4/trunk/src/placement.c
xfwm4/trunk/src/placement.h
xfwm4/trunk/src/poswin.c
xfwm4/trunk/src/poswin.h
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/screen.h
xfwm4/trunk/src/session.c
xfwm4/trunk/src/session.h
xfwm4/trunk/src/settings.c
xfwm4/trunk/src/settings.h
xfwm4/trunk/src/spinning_cursor.c
xfwm4/trunk/src/spinning_cursor.h
xfwm4/trunk/src/stacking.c
xfwm4/trunk/src/stacking.h
xfwm4/trunk/src/startup_notification.c
xfwm4/trunk/src/startup_notification.h
xfwm4/trunk/src/tabwin.c
xfwm4/trunk/src/tabwin.h
xfwm4/trunk/src/transients.c
xfwm4/trunk/src/transients.h
xfwm4/trunk/src/ui_style.c
xfwm4/trunk/src/ui_style.h
xfwm4/trunk/src/wireframe.c
xfwm4/trunk/src/wireframe.h
xfwm4/trunk/src/workspaces.c
xfwm4/trunk/src/workspaces.h
Log:
Rework a bit the code for hilight and frame drawing
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/client.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
@@ -1580,6 +1580,7 @@
DisplayInfo *display_info;
gint size;
GdkPixbuf *icon;
+ int i;
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
@@ -1589,26 +1590,24 @@
screen_info = c->screen_info;
display_info = screen_info->display_info;
- xfwmPixmapFree (&c->appmenu[ACTIVE]);
- xfwmPixmapFree (&c->appmenu[INACTIVE]);
- xfwmPixmapFree (&c->appmenu[PRESSED]);
- xfwmPixmapFree (&c->appmenu[PRELIGHT]);
+ for (i = 0; i < STATE_TOGGLED; i++)
+ {
+ xfwmPixmapFree (&c->appmenu[i]);
+ }
- if (screen_info->buttons[MENU_BUTTON][ACTIVE].pixmap == None)
+ if (xfwmPixmapNone(&screen_info->buttons[MENU_BUTTON][ACTIVE]))
{
/* The current theme has no menu button */
return;
}
- xfwmPixmapDuplicate (&screen_info->buttons[MENU_BUTTON][ACTIVE],
- &c->appmenu[ACTIVE]);
- xfwmPixmapDuplicate (&screen_info->buttons[MENU_BUTTON][INACTIVE],
- &c->appmenu[INACTIVE]);
- xfwmPixmapDuplicate (&screen_info->buttons[MENU_BUTTON][PRESSED],
- &c->appmenu[PRESSED]);
- xfwmPixmapDuplicate (&screen_info->buttons[MENU_BUTTON][PRELIGHT],
- &c->appmenu[PRELIGHT]);
-
+ for (i = 0; i < STATE_TOGGLED; i++)
+ {
+ if (!xfwmPixmapNone(&screen_info->buttons[MENU_BUTTON][i]))
+ {
+ xfwmPixmapDuplicate (&screen_info->buttons[MENU_BUTTON][i],
&c->appmenu[i]);
+ }
+ }
size = MIN (screen_info->buttons[MENU_BUTTON][ACTIVE].width,
screen_info->buttons[MENU_BUTTON][ACTIVE].height);
@@ -1616,11 +1615,13 @@
{
icon = getAppIcon (display_info, c->window, size, size);
- xfwmPixmapRenderGdkPixbuf (&c->appmenu[ACTIVE], icon);
- xfwmPixmapRenderGdkPixbuf (&c->appmenu[INACTIVE], icon);
- xfwmPixmapRenderGdkPixbuf (&c->appmenu[PRESSED], icon);
- xfwmPixmapRenderGdkPixbuf (&c->appmenu[PRELIGHT], icon);
-
+ for (i = 0; i < STATE_TOGGLED; i++)
+ {
+ if (!xfwmPixmapNone(&c->appmenu[i]))
+ {
+ xfwmPixmapRenderGdkPixbuf (&c->appmenu[i], icon);
+ }
+ }
g_object_unref (icon);
}
}
@@ -2005,39 +2006,39 @@
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->sides[SIDE_LEFT], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_COUNT + SIDE_LEFT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
- &c->sides[SIDE_RIGHT], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ &c->sides[SIDE_RIGHT], NoEventMask,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_COUNT + SIDE_RIGHT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
- &c->sides[SIDE_BOTTOM], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ &c->sides[SIDE_BOTTOM], NoEventMask,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_COUNT + SIDE_BOTTOM));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
- &c->corners[CORNER_BOTTOM_LEFT], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ &c->corners[CORNER_BOTTOM_LEFT], NoEventMask,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_BOTTOM_LEFT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
- &c->corners[CORNER_BOTTOM_RIGHT], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ &c->corners[CORNER_BOTTOM_RIGHT], NoEventMask,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_BOTTOM_RIGHT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
- &c->corners[CORNER_TOP_LEFT], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ &c->corners[CORNER_TOP_LEFT], NoEventMask,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_TOP_LEFT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
- &c->corners[CORNER_TOP_RIGHT], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ &c->corners[CORNER_TOP_RIGHT], NoEventMask,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_TOP_RIGHT));
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
&c->title, NoEventMask, None);
/* create the top side window AFTER the title window since they overlap
and the top side window should be on top */
xfwmWindowCreate (screen_info, c->visual, c->depth, c->frame,
- &c->sides[SIDE_TOP], NoEventMask,
- myDisplayGetCursorResize(screen_info->display_info,
+ &c->sides[SIDE_TOP], NoEventMask,
+ myDisplayGetCursorResize(screen_info->display_info,
CORNER_COUNT + SIDE_TOP));
for (i = 0; i < BUTTON_COUNT; i++)
{
@@ -5059,11 +5060,19 @@
if (c->button_status[b] == BUTTON_STATE_PRESSED)
{
- /*
- * Button was pressed at the time, means the pointer was still within
- * the button, so return to prelight.
+ /*
+ * Button was pressed at the time, means the pointer was still within
+ * the button, so return to prelight if available, normal otherwise.
*/
- c->button_status[b] = BUTTON_STATE_PRELIGHT;
+ if (!xfwmPixmapNone(clientGetButtonPixmap(c, b, PRELIGHT)))
+ {
+ c->button_status[b] = BUTTON_STATE_PRELIGHT;
+ }
+ else
+ {
+ c->button_status[b] = BUTTON_STATE_NORMAL;
+ }
+
switch (b)
{
case HIDE_BUTTON:
@@ -5105,6 +5114,79 @@
}
}
+xfwmPixmap *
+clientGetButtonPixmap (Client * c, int button, int state)
+{
+ ScreenInfo *screen_info;
+
+ screen_info = c->screen_info;
+ switch (button)
+ {
+ case MENU_BUTTON:
+ if ((screen_info->params->show_app_icon)
+ && (!xfwmPixmapNone(&c->appmenu[state])))
+ {
+ return &c->appmenu[state];
+ }
+ break;
+ case SHADE_BUTTON:
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED)
+ && (!xfwmPixmapNone(&screen_info->buttons[SHADE_BUTTON][state
+ STATE_TOGGLED])))
+ {
+ return &screen_info->buttons[SHADE_BUTTON][state +
STATE_TOGGLED];
+ }
+ return &screen_info->buttons[SHADE_BUTTON][state];
+ break;
+ case STICK_BUTTON:
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY)
+ && (!xfwmPixmapNone(&screen_info->buttons[STICK_BUTTON][state
+ STATE_TOGGLED])))
+ {
+ return &screen_info->buttons[STICK_BUTTON][state +
STATE_TOGGLED];
+ }
+ return &screen_info->buttons[STICK_BUTTON][state];
+ break;
+ case MAXIMIZE_BUTTON:
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
+ &&
(!xfwmPixmapNone(&screen_info->buttons[MAXIMIZE_BUTTON][state +
STATE_TOGGLED])))
+ {
+ return &screen_info->buttons[MAXIMIZE_BUTTON][state +
STATE_TOGGLED];
+ }
+ return &screen_info->buttons[MAXIMIZE_BUTTON][state];
+ break;
+ default:
+ break;
+ }
+ return &screen_info->buttons[button][state];
+}
+
+int
+clientGetButtonState (Client *c, int button, int state)
+{
+ ScreenInfo *screen_info;
+
+ screen_info = c->screen_info;
+
+ if (state == INACTIVE)
+ {
+ return (state);
+ }
+
+ if ((c->button_status[button] == BUTTON_STATE_PRESSED) &&
+ clientGetButtonPixmap (c, button, PRESSED))
+ {
+ return (PRESSED);
+ }
+
+ if ((c->button_status[button] == BUTTON_STATE_PRELIGHT) &&
+ clientGetButtonPixmap (c, button, PRELIGHT))
+ {
+ return (PRELIGHT);
+ }
+
+ return (ACTIVE);
+}
+
+
Client *
clientGetLeader (Client * c)
{
Modified: xfwm4/trunk/src/client.h
===================================================================
--- xfwm4/trunk/src/client.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/client.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
@@ -392,6 +392,12 @@
void clientButtonPress (Client *,
Window,
XButtonEvent
*);
+xfwmPixmap * clientGetButtonPixmap (Client *,
+ int,
+ int);
+int clientGetButtonState (Client *,
+ int,
+ int);
Client *clientGetLeader (Client *);
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
char *clientGetStartupId (Client *);
Modified: xfwm4/trunk/src/compositor.c
===================================================================
--- xfwm4/trunk/src/compositor.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/compositor.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -16,7 +16,7 @@
xcompmgr - (c) 2003 Keith Packard
metacity - (c) 2003, 2004 Red Hat, Inc.
- xfwm4 - (c) 2005-2006 Olivier Fourdan
+ xfwm4 - (c) 2005-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/compositor.h
===================================================================
--- xfwm4/trunk/src/compositor.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/compositor.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xcompmgr - (c) 2003 Keith Packard
- xfwm4 - (c) 2005-2006 Olivier Fourdan
+ xfwm4 - (c) 2005-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/display.c
===================================================================
--- xfwm4/trunk/src/display.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/display.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/display.h
===================================================================
--- xfwm4/trunk/src/display.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/display.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
@@ -118,13 +118,6 @@
enum
{
- BUTTON_NORMAL = 0,
- BUTTON_PRELIGHT,
- BUTTON_PRESSED
-};
-
-enum
-{
ACTIVE = 0,
INACTIVE,
PRELIGHT,
@@ -135,6 +128,7 @@
T_PRESSED,
STATE_COUNT
};
+#define STATE_TOGGLED (STATE_COUNT >> 1)
enum
{
Modified: xfwm4/trunk/src/event_filter.c
===================================================================
--- xfwm4/trunk/src/event_filter.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/event_filter.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/event_filter.h
===================================================================
--- xfwm4/trunk/src/event_filter.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/event_filter.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/events.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
@@ -1483,7 +1483,7 @@
ScreenInfo *screen_info;
Client *c;
int b;
- gboolean warp_pointer, button;
+ gboolean warp_pointer, need_redraw;
/* See http://rfc-ref.org/RFC-TEXTS/1013/chapter12.html for details */
@@ -1499,6 +1499,7 @@
TRACE ("EnterNotify on window (0x%lx)", ev->window);
warp_pointer = FALSE;
+ need_redraw = FALSE;
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_FRAME |
SEARCH_BUTTON);
if (c)
{
@@ -1525,20 +1526,18 @@
}
if (c == clientGetFocus ())
{
- button = FALSE;
for (b = 0; b < BUTTON_COUNT; b++)
{
if (MYWINDOW_XWINDOW(c->buttons[b]) == ev->window)
{
- c->button_status[b] = BUTTON_STATE_PRELIGHT;
- button = TRUE;
+ if (!xfwmPixmapNone(clientGetButtonPixmap(c, b, PRELIGHT)))
+ {
+ c->button_status[b] = BUTTON_STATE_PRELIGHT;
+ need_redraw = TRUE;
+ }
}
- else
- {
- c->button_status[b] = BUTTON_STATE_NORMAL;
- }
}
- if (button)
+ if (need_redraw)
{
frameDraw (c, FALSE);
}
@@ -1673,26 +1672,26 @@
{
Client *c;
int b;
- gboolean warp_pointer, button;
+ gboolean warp_pointer, need_redraw;
TRACE ("entering handleLeaveNotify");
+ need_redraw = FALSE;
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_FRAME |
SEARCH_BUTTON);
if (c)
{
- button = FALSE;
for (b = 0; b < BUTTON_COUNT; b++)
{
- if (c->button_status[b] != BUTTON_STATE_PRESSED)
+ if (c->button_status[b] == BUTTON_STATE_PRELIGHT)
{
if (MYWINDOW_XWINDOW(c->buttons[b]) == ev->window)
{
c->button_status[b] = BUTTON_STATE_NORMAL;
- button = TRUE;
+ need_redraw = TRUE;
}
}
}
- if (button)
+ if (need_redraw)
{
frameDraw (c, FALSE);
}
Modified: xfwm4/trunk/src/events.h
===================================================================
--- xfwm4/trunk/src/events.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/events.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/focus.c
===================================================================
--- xfwm4/trunk/src/focus.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/focus.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/focus.h
===================================================================
--- xfwm4/trunk/src/focus.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/focus.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/frame.c
===================================================================
--- xfwm4/trunk/src/frame.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/frame.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
@@ -261,7 +261,7 @@
screen_info = c->screen_info;
- if (screen_info->top[part][state].pixmap)
+ if (!xfwmPixmapNone(&screen_info->top[part][state]))
{
xfwmPixmapFill (&screen_info->top[part][state], top_pm, x, 0, w, h);
}
@@ -355,7 +355,7 @@
title_y = MAX (0, frameTop (c) - logical_rect.height);
}
- if (screen_info->top[3][ACTIVE].pixmap)
+ if (!xfwmPixmapNone(&screen_info->top[3][ACTIVE]))
{
top_height = screen_info->top[3][ACTIVE].height;
}
@@ -586,76 +586,6 @@
return chr;
}
-static int
-frameGetButtonState (Client *c, int button, int state)
-{
- ScreenInfo *screen_info;
-
- if (state == INACTIVE)
- {
- return (state);
- }
- screen_info = c->screen_info;
- if ((c->button_status[button] == BUTTON_STATE_PRESSED) &&
- (screen_info->buttons[button][PRESSED].pixmap))
- {
- return (PRESSED);
- }
-
- if ((c->button_status[button] == BUTTON_STATE_PRELIGHT) &&
- (screen_info->buttons[button][PRELIGHT].pixmap))
- {
- return (PRELIGHT);
- }
-
- return (ACTIVE);
-}
-
-static xfwmPixmap *
-frameGetPixmap (Client * c, int button, int state)
-{
- ScreenInfo *screen_info;
-
- screen_info = c->screen_info;
- switch (button)
- {
- case MENU_BUTTON:
- if (screen_info->params->show_app_icon)
- {
- return &c->appmenu[state];
- }
- break;
- case SHADE_BUTTON:
- if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED)
- && screen_info->buttons[SHADE_BUTTON][state + 4].pixmap)
- {
- return &screen_info->buttons[SHADE_BUTTON][state + 4];
- }
- return &screen_info->buttons[SHADE_BUTTON][state];
- break;
- case STICK_BUTTON:
- if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY)
- && screen_info->buttons[STICK_BUTTON][state + 4].pixmap)
- {
- return &screen_info->buttons[STICK_BUTTON][state + 4];
- }
- return &screen_info->buttons[STICK_BUTTON][state];
- break;
- case MAXIMIZE_BUTTON:
- if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)
- && screen_info->buttons[MAXIMIZE_BUTTON][state + 4].pixmap)
- {
- return &screen_info->buttons[MAXIMIZE_BUTTON][state + 4];
- }
- return &screen_info->buttons[MAXIMIZE_BUTTON][state];
- break;
- default:
- break;
- }
- return &screen_info->buttons[button][state];
-}
-
-
static void
frameSetShape (Client * c, int state, FramePixmap * frame_pix, int
button_x[BUTTON_COUNT])
{
@@ -759,7 +689,7 @@
{
if (xfwmWindowVisible (&c->buttons[i]))
{
- my_pixmap = frameGetPixmap (c, i, frameGetButtonState (c, i,
state));
+ my_pixmap = clientGetButtonPixmap (c, i, clientGetButtonState
(c, i, state));
XShapeCombineMask (display_info->dpy, MYWINDOW_XWINDOW
(c->buttons[i]),
ShapeBounding, 0, 0, my_pixmap->mask,
ShapeSet);
}
@@ -1026,7 +956,7 @@
{
if (x + screen_info->buttons[button][state].width +
screen_info->params->button_spacing < right)
{
- my_pixmap = frameGetPixmap (c, button, frameGetButtonState
(c, button, state));
+ my_pixmap = clientGetButtonPixmap (c, button,
clientGetButtonState (c, button, state));
if (my_pixmap->pixmap)
{
xfwmWindowSetBG (&c->buttons[button], my_pixmap);
@@ -1061,7 +991,7 @@
{
if (x - screen_info->buttons[button][state].width -
screen_info->params->button_spacing > left)
{
- my_pixmap = frameGetPixmap (c, button, frameGetButtonState
(c, button, state));
+ my_pixmap = clientGetButtonPixmap (c, button,
clientGetButtonState (c, button, state));
if (my_pixmap->pixmap)
{
xfwmWindowSetBG (&c->buttons[button], my_pixmap);
@@ -1173,7 +1103,7 @@
frameHeight (c) - frameBottom (c), bottom_width, frameBottom
(c),
(requires_clearing | width_changed));
- if (frame_pix.pm_sides[SIDE_TOP].pixmap)
+ if (!xfwmPixmapNone(&frame_pix.pm_sides[SIDE_TOP]))
{
xfwmWindowSetBG (&c->sides[SIDE_TOP],
&frame_pix.pm_sides[SIDE_TOP]);
xfwmWindowShow (&c->sides[SIDE_TOP],
Modified: xfwm4/trunk/src/frame.h
===================================================================
--- xfwm4/trunk/src/frame.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/frame.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/hints.c
===================================================================
--- xfwm4/trunk/src/hints.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/hints.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -16,7 +16,7 @@
oroborus - (c) 2001 Ken Lynch
Metacity - (c) 2001 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/hints.h
===================================================================
--- xfwm4/trunk/src/hints.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/hints.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -16,7 +16,7 @@
oroborus - (c) 2001 Ken Lynch
Metacity - (c) 2001 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/icons.c
===================================================================
--- xfwm4/trunk/src/icons.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/icons.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -16,7 +16,7 @@
Metacity - (c) 2001 Havoc Pennington
libwnck - (c) 2001 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
#ifdef HAVE_CONFIG_H
Modified: xfwm4/trunk/src/icons.h
===================================================================
--- xfwm4/trunk/src/icons.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/icons.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -16,7 +16,7 @@
Metacity - (c) 2001 Havoc Pennington
libwnck - (c) 2001 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
#ifndef INC_ICONS_H
Modified: xfwm4/trunk/src/keyboard.c
===================================================================
--- xfwm4/trunk/src/keyboard.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/keyboard.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/keyboard.h
===================================================================
--- xfwm4/trunk/src/keyboard.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/keyboard.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/main.c
===================================================================
--- xfwm4/trunk/src/main.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/main.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/menu.c
===================================================================
--- xfwm4/trunk/src/menu.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/menu.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Metacity - (c) 2001 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/menu.h
===================================================================
--- xfwm4/trunk/src/menu.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/menu.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Metacity - (c) 2001 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/misc.c
===================================================================
--- xfwm4/trunk/src/misc.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/misc.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/misc.h
===================================================================
--- xfwm4/trunk/src/misc.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/misc.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/mypixmap.c
===================================================================
--- xfwm4/trunk/src/mypixmap.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/mypixmap.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -26,7 +26,7 @@
XPM color substitution used by the themes to apply gtk+ colors.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
@@ -1052,6 +1052,15 @@
#endif
}
+gboolean
+xfwmPixmapNone (xfwmPixmap * pm)
+{
+ TRACE ("entering xfwmPixmapEmpty");
+
+ g_return_val_if_fail (pm != NULL, FALSE);
+ return (pm->pixmap == None);
+}
+
static void
xfwmPixmapFillRectangle (Display *dpy, int screen, Pixmap pm, Drawable d,
int x, int y, int width, int height)
Modified: xfwm4/trunk/src/mypixmap.h
===================================================================
--- xfwm4/trunk/src/mypixmap.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/mypixmap.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
@@ -67,6 +67,7 @@
void xfwmPixmapInit (ScreenInfo *,
xfwmPixmap *);
void xfwmPixmapFree (xfwmPixmap *);
+gboolean xfwmPixmapNone (xfwmPixmap *);
void xfwmPixmapFill (xfwmPixmap *,
xfwmPixmap *,
gint,
Modified: xfwm4/trunk/src/mywindow.c
===================================================================
--- xfwm4/trunk/src/mywindow.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/mywindow.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/mywindow.h
===================================================================
--- xfwm4/trunk/src/mywindow.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/mywindow.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/netwm.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/netwm.h
===================================================================
--- xfwm4/trunk/src/netwm.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/netwm.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/parserc.c
===================================================================
--- xfwm4/trunk/src/parserc.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/parserc.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/parserc.h
===================================================================
--- xfwm4/trunk/src/parserc.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/parserc.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/placement.c
===================================================================
--- xfwm4/trunk/src/placement.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/placement.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/placement.h
===================================================================
--- xfwm4/trunk/src/placement.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/placement.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/poswin.c
===================================================================
--- xfwm4/trunk/src/poswin.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/poswin.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
based on a patch from Joshua Blanton <[EMAIL PROTECTED]>
*/
Modified: xfwm4/trunk/src/poswin.h
===================================================================
--- xfwm4/trunk/src/poswin.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/poswin.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
based on a patch from Joshua Blanton <[EMAIL PROTECTED]>
*/
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/screen.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/screen.h
===================================================================
--- xfwm4/trunk/src/screen.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/screen.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/session.c
===================================================================
--- xfwm4/trunk/src/session.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/session.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
/* Initially inspired by xfwm, fvwm2, enlightment and twm implementations */
Modified: xfwm4/trunk/src/session.h
===================================================================
--- xfwm4/trunk/src/session.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/session.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/settings.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
#ifdef HAVE_CONFIG_H
Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/settings.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/spinning_cursor.c
===================================================================
--- xfwm4/trunk/src/spinning_cursor.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/spinning_cursor.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
mozilla - (c) 1998 mozilla.org
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/spinning_cursor.h
===================================================================
--- xfwm4/trunk/src/spinning_cursor.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/spinning_cursor.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
mozilla - (c) 1998 mozilla.org
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/stacking.c
===================================================================
--- xfwm4/trunk/src/stacking.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/stacking.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/stacking.h
===================================================================
--- xfwm4/trunk/src/stacking.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/stacking.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/startup_notification.c
===================================================================
--- xfwm4/trunk/src/startup_notification.c 2007-06-12 19:47:31 UTC (rev
25806)
+++ xfwm4/trunk/src/startup_notification.c 2007-06-12 23:03:09 UTC (rev
25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Metacity - (c) 2003 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/startup_notification.h
===================================================================
--- xfwm4/trunk/src/startup_notification.h 2007-06-12 19:47:31 UTC (rev
25806)
+++ xfwm4/trunk/src/startup_notification.h 2007-06-12 23:03:09 UTC (rev
25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Metacity - (c) 2003 Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/tabwin.c
===================================================================
--- xfwm4/trunk/src/tabwin.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/tabwin.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/tabwin.h
===================================================================
--- xfwm4/trunk/src/tabwin.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/tabwin.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/transients.c
===================================================================
--- xfwm4/trunk/src/transients.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/transients.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/transients.h
===================================================================
--- xfwm4/trunk/src/transients.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/transients.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/ui_style.c
===================================================================
--- xfwm4/trunk/src/ui_style.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/ui_style.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/ui_style.h
===================================================================
--- xfwm4/trunk/src/ui_style.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/ui_style.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/wireframe.c
===================================================================
--- xfwm4/trunk/src/wireframe.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/wireframe.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
metacity - (c) 2001 Anders Carlsson, Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/wireframe.h
===================================================================
--- xfwm4/trunk/src/wireframe.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/wireframe.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
metacity - (c) 2001 Anders Carlsson, Havoc Pennington
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/workspaces.c
===================================================================
--- xfwm4/trunk/src/workspaces.c 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/workspaces.c 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
Modified: xfwm4/trunk/src/workspaces.h
===================================================================
--- xfwm4/trunk/src/workspaces.h 2007-06-12 19:47:31 UTC (rev 25806)
+++ xfwm4/trunk/src/workspaces.h 2007-06-12 23:03:09 UTC (rev 25807)
@@ -15,7 +15,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2006 Olivier Fourdan
+ xfwm4 - (c) 2002-2007 Olivier Fourdan
*/
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
