[Xfce4-commits] r23704 - xfwm4/trunk/src
Olivier Fourdan
olivier at xfce.org
Sat Nov 4 23:36:56 CET 2006
Author: olivier
Date: 2006-11-04 22:36:42 +0000 (Sat, 04 Nov 2006)
New Revision: 23704
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/client.h
xfwm4/trunk/src/compositor.h
xfwm4/trunk/src/display.c
xfwm4/trunk/src/display.h
xfwm4/trunk/src/event_filter.h
xfwm4/trunk/src/events.c
xfwm4/trunk/src/events.h
xfwm4/trunk/src/focus.h
xfwm4/trunk/src/frame.h
xfwm4/trunk/src/hints.c
xfwm4/trunk/src/hints.h
xfwm4/trunk/src/icons.h
xfwm4/trunk/src/keyboard.h
xfwm4/trunk/src/menu.h
xfwm4/trunk/src/misc.h
xfwm4/trunk/src/mypixmap.h
xfwm4/trunk/src/mywindow.h
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/netwm.h
xfwm4/trunk/src/parserc.h
xfwm4/trunk/src/placement.c
xfwm4/trunk/src/placement.h
xfwm4/trunk/src/poswin.h
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/screen.h
xfwm4/trunk/src/session.h
xfwm4/trunk/src/settings.c
xfwm4/trunk/src/settings.h
xfwm4/trunk/src/spinning_cursor.h
xfwm4/trunk/src/stacking.h
xfwm4/trunk/src/startup_notification.h
xfwm4/trunk/src/tabwin.h
xfwm4/trunk/src/transients.h
xfwm4/trunk/src/ui_style.h
xfwm4/trunk/src/wireframe.h
xfwm4/trunk/src/workspaces.c
xfwm4/trunk/src/workspaces.h
Log:
Use X server time to restore focus when sent to the root window (bug #2472), a bit of code cleanup and some refactoring.
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/client.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -2938,11 +2938,11 @@
monitor_nbr = find_monitor_at_point (screen_info->gscr, cx, cy);
gdk_screen_get_monitor_geometry (screen_info->gscr, monitor_nbr, &rect);
- full_x = MAX (screen_info->params->xfwm_margins[LEFT], rect.x);
- full_y = MAX (screen_info->params->xfwm_margins[TOP], rect.y);
- full_w = MIN (screen_info->width - screen_info->params->xfwm_margins[RIGHT],
+ full_x = MAX (screen_info->params->xfwm_margins[STRUTS_LEFT], rect.x);
+ full_y = MAX (screen_info->params->xfwm_margins[STRUTS_TOP], rect.y);
+ full_w = MIN (screen_info->width - screen_info->params->xfwm_margins[STRUTS_RIGHT],
rect.x + rect.width) - full_x;
- full_h = MIN (screen_info->height - screen_info->params->xfwm_margins[BOTTOM],
+ full_h = MIN (screen_info->height - screen_info->params->xfwm_margins[STRUTS_BOTTOM],
rect.y + rect.height) - full_y;
if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED))
@@ -4167,12 +4167,12 @@
else
{
if ((c->x + c->width < disp_x + min_visible)
- || (c->x + c->width < screen_info->margins [LEFT] + min_visible))
+ || (c->x + c->width < screen_info->margins [STRUTS_LEFT] + min_visible))
{
c->width = prev_width;
}
if ((c->y + c->height < disp_y + min_visible)
- || (c->y + c->height < screen_info->margins [TOP] + min_visible))
+ || (c->y + c->height < screen_info->margins [STRUTS_TOP] + min_visible))
{
c->height = prev_height;
}
@@ -4304,7 +4304,7 @@
{
if ((c->y > disp_max_y - min_visible)
|| (c->y > screen_info->height
- - screen_info->margins [BOTTOM] - min_visible))
+ - screen_info->margins [STRUTS_BOTTOM] - min_visible))
{
c->y = prev_y;
c->height = prev_height;
@@ -4313,7 +4313,7 @@
else if (move_bottom)
{
if ((c->y + c->height < disp_y + min_visible)
- || (c->y + c->height < screen_info->margins [TOP] + min_visible))
+ || (c->y + c->height < screen_info->margins [STRUTS_TOP] + min_visible))
{
c->height = prev_height;
}
@@ -4322,7 +4322,7 @@
{
if ((c->x > disp_max_x - min_visible)
|| (c->x > screen_info->width
- - screen_info->margins [RIGHT] - min_visible))
+ - screen_info->margins [STRUTS_RIGHT] - min_visible))
{
c->x = prev_x;
c->width = prev_width;
@@ -4331,7 +4331,7 @@
else if (move_right)
{
if ((c->x + c->width < disp_x + min_visible)
- || (c->x + c->width < screen_info->margins [LEFT] + min_visible))
+ || (c->x + c->width < screen_info->margins [STRUTS_LEFT] + min_visible))
{
c->width = prev_width;
}
Modified: xfwm4/trunk/src/client.h
===================================================================
--- xfwm4/trunk/src/client.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/client.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -294,63 +294,100 @@
extern Client *clients;
extern unsigned int client_count;
-Display *clientGetXDisplay (Client *);
-void clientClearLastOpTime (Client *);
-void clientUpdateWinState (Client *, XClientMessageEvent *);
-void clientUpdateUrgency (Client *);
-void clientCoordGravitate (Client *, int, int *, int *);
-void clientGravitate (Client *, int);
-void clientConfigure (Client *, XWindowChanges *, unsigned long, unsigned short);
-void clientGetMWMHints (Client *, gboolean);
-void clientGetWMNormalHints (Client *, gboolean);
-void clientGetWMProtocols (Client *);
-void clientUpdateIcon (Client * c);
-Client *clientFrame (DisplayInfo *, Window, gboolean);
-void clientUnframe (Client *, gboolean);
-void clientFrameAll (ScreenInfo *);
-void clientUnframeAll (ScreenInfo *);
-void clientInstallColormaps (Client *);
-void clientUpdateColormaps (Client *);
-void clientUpdateAllFrames (ScreenInfo *, gboolean);
-void clientGrabButtons (Client *);
-void clientUngrabButtons (Client *);
-Client *clientGetFromWindow (ScreenInfo *, Window, int);
-void clientShow (Client *, gboolean);
-void clientHide (Client *, int, gboolean);
-void clientHideAll (Client *, int);
-void clientClearAllShowDesktop (ScreenInfo *);
-void clientToggleShowDesktop (ScreenInfo *);
-void clientClose (Client *);
-void clientKill (Client *);
-void clientEnterContextMenuState (Client *);
-void clientSetLayer (Client *, int);
-void clientSetWorkspace (Client *, int, gboolean);
-void clientShade (Client *);
-void clientUnshade (Client *);
-void clientToggleShaded (Client *);
-void clientStick (Client *, gboolean);
-void clientUnstick (Client *, gboolean);
-void clientToggleSticky (Client *, gboolean);
-void clientToggleFullscreen (Client *);
-void clientToggleAbove (Client *);
-void clientToggleBelow (Client *);
-void clientRemoveMaximizeFlag (Client *);
-void clientToggleMaximized (Client *, int, gboolean);
-void clientUpdateOpacity (ScreenInfo *, Client *);
-void clientSetOpacity (Client *, guint opacity, guint clear, guint xor);
-void clientIncOpacity (Client *);
-void clientDecOpacity (Client *);
-void clientScreenResize(ScreenInfo *);
-void clientMove (Client *, XEvent *);
-void clientResize (Client *, int, XEvent *);
-void clientCycle (Client *, XEvent *);
-void clientButtonPress (Client *, Window, XButtonEvent *);
-Client *clientGetLeader (Client *);
+Display *clientGetXDisplay (Client *);
+void clientClearLastOpTime (Client *);
+void clientUpdateWinState (Client *,
+ XClientMessageEvent *);
+void clientUpdateUrgency (Client *);
+void clientCoordGravitate (Client *,
+ int,
+ int *,
+ int *);
+void clientGravitate (Client *,
+ int);
+void clientConfigure (Client *,
+ XWindowChanges *,
+ unsigned long,
+ unsigned short);
+void clientGetMWMHints (Client *,
+ gboolean);
+void clientGetWMNormalHints (Client *,
+ gboolean);
+void clientGetWMProtocols (Client *);
+void clientUpdateIcon (Client * c);
+Client *clientFrame (DisplayInfo *,
+ Window,
+ gboolean);
+void clientUnframe (Client *,
+ gboolean);
+void clientFrameAll (ScreenInfo *);
+void clientUnframeAll (ScreenInfo *);
+void clientInstallColormaps (Client *);
+void clientUpdateColormaps (Client *);
+void clientUpdateAllFrames (ScreenInfo *,
+ gboolean);
+void clientGrabButtons (Client *);
+void clientUngrabButtons (Client *);
+Client *clientGetFromWindow (ScreenInfo *,
+ Window,
+ int);
+void clientShow (Client *,
+ gboolean);
+void clientHide (Client *,
+ int,
+ gboolean);
+void clientHideAll (Client *,
+ int);
+void clientClearAllShowDesktop (ScreenInfo *);
+void clientToggleShowDesktop (ScreenInfo *);
+void clientClose (Client *);
+void clientKill (Client *);
+void clientEnterContextMenuState (Client *);
+void clientSetLayer (Client *,
+ int);
+void clientSetWorkspace (Client *,
+ int,
+ gboolean);
+void clientShade (Client *);
+void clientUnshade (Client *);
+void clientToggleShaded (Client *);
+void clientStick (Client *,
+ gboolean);
+void clientUnstick (Client *,
+ gboolean);
+void clientToggleSticky (Client *,
+ gboolean);
+void clientToggleFullscreen (Client *);
+void clientToggleAbove (Client *);
+void clientToggleBelow (Client *);
+void clientRemoveMaximizeFlag (Client *);
+void clientToggleMaximized (Client *,
+ int,
+ gboolean);
+void clientUpdateOpacity (ScreenInfo *,
+ Client *);
+void clientSetOpacity (Client *,
+ guint,
+ guint, guint);
+void clientIncOpacity (Client *);
+void clientDecOpacity (Client *);
+void clientScreenResize (ScreenInfo *);
+void clientMove (Client *,
+ XEvent *);
+void clientResize (Client *,
+ int,
+ XEvent *);
+void clientCycle (Client *,
+ XEvent *);
+void clientButtonPress (Client *,
+ Window,
+ XButtonEvent *);
+Client *clientGetLeader (Client *);
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
-char *clientGetStartupId (Client *);
+char *clientGetStartupId (Client *);
#endif /* HAVE_LIBSTARTUP_NOTIFICATION */
#ifdef HAVE_XSYNC
-void clientXSyncRequest (Client *);
+void clientXSyncRequest (Client *);
#endif /* HAVE_XSYNC */
#endif /* INC_CLIENT_H */
Modified: xfwm4/trunk/src/compositor.h
===================================================================
--- xfwm4/trunk/src/compositor.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/compositor.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -32,34 +32,34 @@
#include "screen.h"
#include "client.h"
-gboolean compositorIsUsable (DisplayInfo *);
-void compositorAddWindow (DisplayInfo *,
- Window,
- Client *);
-gboolean compositorSetClient (DisplayInfo *,
- Window,
- Client *);
-void compositorRemoveWindow (DisplayInfo *,
- Window);
-void compositorDamageWindow (DisplayInfo *,
- Window);
-void compositorHandleEvent (DisplayInfo *,
- XEvent *);
-void compositorInitDisplay (DisplayInfo *);
-void compositorSetCompositeMode (DisplayInfo *,
- gboolean);
+gboolean compositorIsUsable (DisplayInfo *);
+void compositorAddWindow (DisplayInfo *,
+ Window,
+ Client *);
+gboolean compositorSetClient (DisplayInfo *,
+ Window,
+ Client *);
+void compositorRemoveWindow (DisplayInfo *,
+ Window);
+void compositorDamageWindow (DisplayInfo *,
+ Window);
+void compositorHandleEvent (DisplayInfo *,
+ XEvent *);
+void compositorInitDisplay (DisplayInfo *);
+void compositorSetCompositeMode (DisplayInfo *,
+ gboolean);
-gboolean compositorManageScreen (ScreenInfo *);
-void compositorUnmanageScreen (ScreenInfo *);
-void compositorAddAllWindows (ScreenInfo *);
-gboolean compositorActivateScreen (ScreenInfo *,
- gboolean);
-void compositorUpdateScreenSize (ScreenInfo *);
+gboolean compositorManageScreen (ScreenInfo *);
+void compositorUnmanageScreen (ScreenInfo *);
+void compositorAddAllWindows (ScreenInfo *);
+gboolean compositorActivateScreen (ScreenInfo *,
+ gboolean);
+void compositorUpdateScreenSize (ScreenInfo *);
-void compositorWindowSetOpacity (DisplayInfo *,
- Window,
- guint);
-void compositorRebuildScreen (ScreenInfo *);
-gboolean compositorTestServer (DisplayInfo *);
+void compositorWindowSetOpacity (DisplayInfo *,
+ Window,
+ guint);
+void compositorRebuildScreen (ScreenInfo *);
+gboolean compositorTestServer (DisplayInfo *);
#endif /* INC_COMPOSITOR_H */
Modified: xfwm4/trunk/src/display.c
===================================================================
--- xfwm4/trunk/src/display.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/display.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -22,9 +22,6 @@
# include "config.h"
#endif
-#include <sys/time.h>
-#include <time.h>
-
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
@@ -168,6 +165,7 @@
"WM_TRANSIENT_FOR",
"WM_WINDOW_ROLE",
"XFWM4_COMPOSITING_MANAGER",
+ "XFWM4_TIMESTAMP_PROP",
"_XROOTPMAP_ID",
"_XSETROOT_ID"
};
@@ -711,9 +709,6 @@
return (Time) display->current_time;
}
-Time myDisplayGetLastUserTime (DisplayInfo *);
-void myDisplaySetLastUserTime (DisplayInfo *,
- Time);
Time
myDisplayGetLastUserTime (DisplayInfo *display)
{
Modified: xfwm4/trunk/src/display.h
===================================================================
--- xfwm4/trunk/src/display.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/display.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -25,6 +25,9 @@
# include "config.h"
#endif
+#include <sys/time.h>
+#include <time.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
@@ -202,6 +205,7 @@
WM_TRANSIENT_FOR,
WM_WINDOW_ROLE,
XFWM4_COMPOSITING_MANAGER,
+ XFWM4_TIMESTAMP_PROP,
XROOTPMAP,
XSETROOT,
ATOM_COUNT
@@ -284,52 +288,52 @@
#endif /* HAVE_COMPOSITOR */
};
-DisplayInfo * myDisplayInit (GdkDisplay *);
-DisplayInfo * myDisplayClose (DisplayInfo *);
-gboolean myDisplayHaveShape (DisplayInfo *);
-gboolean myDisplayHaveRender (DisplayInfo *);
-Cursor myDisplayGetCursorBusy (DisplayInfo *);
-Cursor myDisplayGetCursorMove (DisplayInfo *);
-Cursor myDisplayGetCursorRoot (DisplayInfo *);
-Cursor myDisplayGetCursorResize (DisplayInfo *,
- guint);
-void myDisplayGrabServer (DisplayInfo *);
-void myDisplayUngrabServer (DisplayInfo *);
-void myDisplayAddClient (DisplayInfo *,
- Client *);
-void myDisplayRemoveClient (DisplayInfo *,
- Client *);
-Client * myDisplayGetClientFromWindow (DisplayInfo *,
- Window,
- int);
-void myDisplayAddScreen (DisplayInfo *,
- ScreenInfo *);
-void myDisplayRemoveScreen (DisplayInfo *,
- ScreenInfo *);
-ScreenInfo * myDisplayGetScreenFromRoot (DisplayInfo *,
- Window);
-ScreenInfo * myDisplayGetScreenFromNum (DisplayInfo *,
- int);
-Window myDisplayGetRootFromWindow (DisplayInfo *,
- Window w);
-ScreenInfo * myDisplayGetScreenFromWindow (DisplayInfo *,
- Window w);
+DisplayInfo *myDisplayInit (GdkDisplay *);
+DisplayInfo *myDisplayClose (DisplayInfo *);
+gboolean myDisplayHaveShape (DisplayInfo *);
+gboolean myDisplayHaveRender (DisplayInfo *);
+Cursor myDisplayGetCursorBusy (DisplayInfo *);
+Cursor myDisplayGetCursorMove (DisplayInfo *);
+Cursor myDisplayGetCursorRoot (DisplayInfo *);
+Cursor myDisplayGetCursorResize (DisplayInfo *,
+ guint);
+void myDisplayGrabServer (DisplayInfo *);
+void myDisplayUngrabServer (DisplayInfo *);
+void myDisplayAddClient (DisplayInfo *,
+ Client *);
+void myDisplayRemoveClient (DisplayInfo *,
+ Client *);
+Client *myDisplayGetClientFromWindow (DisplayInfo *,
+ Window,
+ int);
+void myDisplayAddScreen (DisplayInfo *,
+ ScreenInfo *);
+void myDisplayRemoveScreen (DisplayInfo *,
+ ScreenInfo *);
+ScreenInfo *myDisplayGetScreenFromRoot (DisplayInfo *,
+ Window);
+ScreenInfo *myDisplayGetScreenFromNum (DisplayInfo *,
+ int);
+Window myDisplayGetRootFromWindow (DisplayInfo *,
+ Window w);
+ScreenInfo *myDisplayGetScreenFromWindow (DisplayInfo *,
+ Window w);
#ifdef ENABLE_KDE_SYSTRAY_PROXY
-ScreenInfo * myDisplayGetScreenFromSystray (DisplayInfo *,
- Window);
+ScreenInfo *myDisplayGetScreenFromSystray (DisplayInfo *,
+ Window);
#endif /* ENABLE_KDE_SYSTRAY_PROXY */
#ifdef HAVE_XSYNC
-Client * myDisplayGetClientFromXSyncAlarm (DisplayInfo *,
- XSyncAlarm);
+Client *myDisplayGetClientFromXSyncAlarm (DisplayInfo *,
+ XSyncAlarm);
#endif /* HAVE_XSYNC */
-ScreenInfo * myDisplayGetDefaultScreen (DisplayInfo *);
-Time myDisplayUpdateCurrentTime (DisplayInfo *,
- XEvent *);
-Time myDisplayGetCurrentTime (DisplayInfo *);
-Time myDisplayGetLastUserTime (DisplayInfo *);
-void myDisplaySetLastUserTime (DisplayInfo *,
- Time);
-gboolean myDisplayTestXrender (DisplayInfo *,
- gdouble);
+ScreenInfo *myDisplayGetDefaultScreen (DisplayInfo *);
+Time myDisplayUpdateCurrentTime (DisplayInfo *,
+ XEvent *);
+Time myDisplayGetCurrentTime (DisplayInfo *);
+Time myDisplayGetLastUserTime (DisplayInfo *);
+void myDisplaySetLastUserTime (DisplayInfo *,
+ Time);
+gboolean myDisplayTestXrender (DisplayInfo *,
+ gdouble);
#endif /* INC_DISPLAY_H */
Modified: xfwm4/trunk/src/event_filter.h
===================================================================
--- xfwm4/trunk/src/event_filter.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/event_filter.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -48,13 +48,13 @@
}
eventFilterSetup;
-GdkWindow * eventFilterAddWin (GdkScreen *gscr,
- long event_mask);
-eventFilterStack * eventFilterPush (eventFilterSetup *setup,
- XfwmFilter filter,
- gpointer data);
-eventFilterStack * eventFilterPop (eventFilterSetup *setup);
-eventFilterSetup * eventFilterInit (gpointer data);
-void eventFilterClose (eventFilterSetup *setup);
+GdkWindow *eventFilterAddWin (GdkScreen *,
+ long);
+eventFilterStack *eventFilterPush (eventFilterSetup *,
+ XfwmFilter,
+ gpointer );
+eventFilterStack *eventFilterPop (eventFilterSetup *);
+eventFilterSetup *eventFilterInit (gpointer);
+void eventFilterClose (eventFilterSetup *);
#endif /* __EVENT_FILTER_H__ */
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/events.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -1661,10 +1661,7 @@
window has vanished and the focus is returned to the root).
*/
c = clientGetFocus ();
- if (c)
- {
- clientSetFocus (screen_info, c, myDisplayGetCurrentTime (display_info), FOCUS_FORCE);
- }
+ clientSetFocus (screen_info, c, getXServerTime (display_info), FOCUS_FORCE);
return;
}
@@ -1695,12 +1692,6 @@
}
return;
}
-
- if (ev->window == screen_info->xroot)
- {
- /* "Normal" focus transition to root, should not happen though */
- clientPassFocus (screen_info, NULL, NULL);
- }
}
static void
Modified: xfwm4/trunk/src/events.h
===================================================================
--- xfwm4/trunk/src/events.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/events.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -36,8 +36,9 @@
#include "screen.h"
#include "event_filter.h"
-void initMenuEventWin (void);
-eventFilterStatus xfwm4_event_filter (XEvent * xevent, gpointer data);
-void initGtkCallbacks (ScreenInfo *);
+void initMenuEventWin (void);
+eventFilterStatus xfwm4_event_filter (XEvent *,
+ gpointer);
+void initGtkCallbacks (ScreenInfo *);
#endif /* INC_EVENTS_H */
Modified: xfwm4/trunk/src/focus.h
===================================================================
--- xfwm4/trunk/src/focus.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/focus.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -27,6 +27,8 @@
#include <glib.h>
#include <sys/time.h>
+#include <time.h>
+
#include "screen.h"
#include "client.h"
@@ -35,26 +37,38 @@
#define FOCUS_IGNORE_MODAL (1<<1)
#define FOCUS_FORCE (1<<2)
-void clientFocusTop (ScreenInfo *, int);
-gboolean clientFocusNew(Client *);
-gboolean clientSelectMask (Client *, int, int);
-Client *clientGetNext (Client *, int);
-Client *clientGetPrevious (Client *, int);
-void clientPassFocus (ScreenInfo *, Client *, Client *);
-gboolean clientAcceptFocus (Client *);
-void clientSortRing(Client *);
-void clientUpdateFocus (ScreenInfo *, Client *, unsigned short);
-void clientSetFocus (ScreenInfo *, Client *, Time, unsigned short);
-void clientInitFocusFlag (Client *);
-void clientClearFocus (void);
-Client *clientGetFocus (void);
-void clientGrabMouseButton (Client *);
-void clientUngrabMouseButton (Client *);
-void clientGrabMouseButtonForAll (ScreenInfo *);
-void clientUngrabMouseButtonForAll (ScreenInfo *);
-void clientPassGrabMouseButton (Client *);
-Client *clientGetLastUngrab (void);
-void clientClearLastUngrab (void);
+void clientFocusTop (ScreenInfo *,
+ int);
+gboolean clientFocusNew (Client *);
+gboolean clientSelectMask (Client *,
+ int,
+ int);
+Client *clientGetNext (Client *,
+ int);
+Client *clientGetPrevious (Client *,
+ int);
+void clientPassFocus (ScreenInfo *,
+ Client *,
+ Client *);
+gboolean clientAcceptFocus (Client *);
+void clientSortRing (Client *);
+void clientUpdateFocus (ScreenInfo *,
+ Client *,
+ unsigned short);
+void clientSetFocus (ScreenInfo *,
+ Client *,
+ Time,
+ unsigned short);
+void clientInitFocusFlag (Client *);
+void clientClearFocus (void);
+Client *clientGetFocus (void);
+void clientGrabMouseButton (Client *);
+void clientUngrabMouseButton (Client *);
+void clientGrabMouseButtonForAll (ScreenInfo *);
+void clientUngrabMouseButtonForAll (ScreenInfo *);
+void clientPassGrabMouseButton (Client *);
+Client *clientGetLastUngrab (void);
+void clientClearLastUngrab (void);
#endif /* INC_FOCUS_H */
Modified: xfwm4/trunk/src/frame.h
===================================================================
--- xfwm4/trunk/src/frame.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/frame.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -37,18 +37,19 @@
};
typedef struct _FramePixmap FramePixmap;
-int frameDecorationLeft (ScreenInfo *);
-int frameDecorationRight (ScreenInfo *);
-int frameDecorationTop (ScreenInfo *);
-int frameDecorationBottom (ScreenInfo *);
-int frameLeft (Client *);
-int frameRight (Client *);
-int frameTop (Client *);
-int frameBottom (Client *);
-int frameX (Client *);
-int frameY (Client *);
-int frameWidth (Client *);
-int frameHeight (Client *);
-void frameDraw (Client *, gboolean);
+int frameDecorationLeft (ScreenInfo *);
+int frameDecorationRight (ScreenInfo *);
+int frameDecorationTop (ScreenInfo *);
+int frameDecorationBottom (ScreenInfo *);
+int frameLeft (Client *);
+int frameRight (Client *);
+int frameTop (Client *);
+int frameBottom (Client *);
+int frameX (Client *);
+int frameY (Client *);
+int frameWidth (Client *);
+int frameHeight (Client *);
+void frameDraw (Client *,
+ gboolean);
#endif /* INC_FRAME_H */
Modified: xfwm4/trunk/src/hints.c
===================================================================
--- xfwm4/trunk/src/hints.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/hints.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -37,6 +37,7 @@
#include <stdlib.h>
#include <libxfce4util/libxfce4util.h>
#include "display.h"
+#include "screen.h"
#include "hints.h"
static gboolean
@@ -557,10 +558,10 @@
ptr = data;
for (i = 0; i < j; i++)
{
- *ptr++ = (unsigned long) m[LEFT];
- *ptr++ = (unsigned long) m[TOP];
- *ptr++ = (unsigned long) (width - (m[LEFT] + m[RIGHT]));
- *ptr++ = (unsigned long) (height - (m[TOP] + m[BOTTOM]));
+ *ptr++ = (unsigned long) m[STRUTS_LEFT];
+ *ptr++ = (unsigned long) m[STRUTS_TOP];
+ *ptr++ = (unsigned long) (width - (m[STRUTS_LEFT] + m[STRUTS_RIGHT]));
+ *ptr++ = (unsigned long) (height - (m[STRUTS_TOP] + m[STRUTS_BOTTOM]));
}
XChangeProperty (display_info->dpy, root, display_info->atoms[NET_WORKAREA],
XA_CARDINAL, 32, PropModeReplace, (unsigned char *) data, j * 4);
@@ -1162,6 +1163,55 @@
return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
}
+
+static Bool
+checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
+{
+ DisplayInfo *display_info;
+ ScreenInfo *screen_info;
+
+ display_info = (DisplayInfo *) arg;
+ g_return_val_if_fail (display_info, FALSE);
+
+ screen_info = myDisplayGetDefaultScreen (display_info);
+ g_return_val_if_fail (screen_info, FALSE);
+
+ if ((xevent->type == PropertyNotify) &&
+ (xevent->xproperty.window == screen_info->xfwm4_win) &&
+ (xevent->xproperty.atom == display_info->atoms[XFWM4_TIMESTAMP_PROP]))
+ {
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+Time
+getXServerTime (DisplayInfo *display_info)
+{
+ ScreenInfo *screen_info;
+ XEvent xevent;
+ Time timestamp;
+ char c = '\0';
+
+ g_return_val_if_fail (display_info, (Time) CurrentTime);
+ timestamp = myDisplayGetCurrentTime (display_info);
+ if (timestamp == CurrentTime)
+ {
+ screen_info = myDisplayGetDefaultScreen (display_info);
+ g_return_val_if_fail (screen_info, (Time) CurrentTime);
+
+ XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
+ display_info->atoms[XFWM4_TIMESTAMP_PROP],
+ display_info->atoms[XFWM4_TIMESTAMP_PROP],
+ 8, PropModeReplace, (unsigned char *) &c, 1);
+ XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
+
+ timestamp = (Time) xevent.xproperty.time;
+ }
+ return timestamp;
+}
+
#ifdef ENABLE_KDE_SYSTRAY_PROXY
gboolean
checkKdeSystrayWindow(DisplayInfo *display_info, Window window)
Modified: xfwm4/trunk/src/hints.h
===================================================================
--- xfwm4/trunk/src/hints.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/hints.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -27,6 +27,9 @@
# include "config.h"
#endif
+#include <sys/time.h>
+#include <time.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xmd.h>
@@ -112,6 +115,19 @@
#define NET_WM_OPAQUE 0xffffffff
+#define STRUTS_LEFT 0
+#define STRUTS_RIGHT 1
+#define STRUTS_TOP 2
+#define STRUTS_BOTTOM 3
+#define STRUTS_LEFT_START_Y 4
+#define STRUTS_LEFT_END_Y 5
+#define STRUTS_RIGHT_START_Y 6
+#define STRUTS_RIGHT_END_Y 7
+#define STRUTS_TOP_START_X 8
+#define STRUTS_TOP_END_X 9
+#define STRUTS_BOTTOM_START_X 10
+#define STRUTS_BOTTOM_END_X 11
+
/* Convenient macro */
#define HINTS_ACCEPT_INPUT(wmhints) (!(wmhints) || \
((wmhints) && !(wmhints->flags & InputHint)) || \
@@ -126,18 +142,6 @@
}
NetWmDesktopLayout;
-#define LEFT 0
-#define RIGHT 1
-#define TOP 2
-#define BOTTOM 3
-#define LEFT_START_Y 4
-#define LEFT_END_Y 5
-#define RIGHT_START_Y 6
-#define RIGHT_END_Y 7
-#define TOP_START_X 8
-#define TOP_END_X 9
-#define BOTTOM_START_X 10
-#define BOTTOM_END_X 11
typedef struct
{
@@ -147,53 +151,151 @@
}
PropMwmHints;
-unsigned long getWMState (DisplayInfo *, Window);
-void setWMState (DisplayInfo *, Window, unsigned long);
-PropMwmHints *getMotifHints (DisplayInfo *, Window);
-unsigned int getWMProtocols (DisplayInfo *, Window);
-gboolean getHint (DisplayInfo *, Window, int, long *);
-void setHint (DisplayInfo *, Window, int, long);
-void getDesktopLayout (DisplayInfo *, Window, int, NetWmDesktopLayout *);
-void getGnomeDesktopMargins (DisplayInfo *, Window, int *);
-void setGnomeProtocols (DisplayInfo *, Window, Window);
-void setNetSupportedHint (DisplayInfo *, Window, Window);
-gboolean getAtomList (DisplayInfo *, Window, int, Atom **, int *);
-gboolean getCardinalList (DisplayInfo *, Window, int, unsigned long **, int *);
-void setNetWorkarea (DisplayInfo *, Window, int, int, int, int *);
-void setNetFrameExtents (DisplayInfo *, Window, int, int, int, int);
-void initNetDesktopInfo (DisplayInfo *, Window, int, int, int);
-void setUTF8StringHint (DisplayInfo *, Window, int, const gchar *);
-void getTransientFor (DisplayInfo *, Window, Window, Window *);
-gboolean getWindowName (DisplayInfo *, Window, gchar **);
-gboolean getUTF8String (DisplayInfo *, Window, int, gchar **, int *);
-gboolean getUTF8StringList (DisplayInfo *, Window, int, gchar ***, int *);
-gboolean getClientMachine (DisplayInfo *, Window, gchar **);
-gboolean getClientMachine (DisplayInfo *, Window, gchar **);
-gboolean getWindowRole (DisplayInfo *, Window, gchar **);
-Window getClientLeader (DisplayInfo *, Window);
-gboolean getNetWMUserTime (DisplayInfo *, Window, Time *);
-gboolean getClientID (DisplayInfo *, Window, gchar **);
-gboolean getWindowCommand (DisplayInfo *, Window, char ***, int *);
-gboolean getKDEIcon (DisplayInfo *, Window, Pixmap *, Pixmap *);
-gboolean getRGBIconData (DisplayInfo *, Window, unsigned long **, unsigned long *);
-gboolean getOpacity (DisplayInfo *, Window, guint *);
-gboolean getOpacityLock (DisplayInfo *, Window);
-gboolean setXAtomManagerOwner (DisplayInfo *, Atom, Window , Window);
-gboolean setAtomIdManagerOwner (DisplayInfo *, int, Window , Window);
+unsigned long getWMState (DisplayInfo *,
+ Window);
+void setWMState (DisplayInfo *,
+ Window,
+ unsigned long);
+PropMwmHints *getMotifHints (DisplayInfo *,
+ Window);
+unsigned int getWMProtocols (DisplayInfo *,
+ Window);
+gboolean getHint (DisplayInfo *,
+ Window,
+ int,
+ long *);
+void setHint (DisplayInfo *,
+ Window,
+ int,
+ long);
+void getDesktopLayout (DisplayInfo *,
+ Window,
+ int,
+ NetWmDesktopLayout *);
+void getGnomeDesktopMargins (DisplayInfo *,
+ Window,
+ int *);
+void setGnomeProtocols (DisplayInfo *,
+ Window,
+ Window);
+void setNetSupportedHint (DisplayInfo *,
+ Window,
+ Window);
+gboolean getAtomList (DisplayInfo *,
+ Window,
+ int,
+ Atom **,
+ int *);
+gboolean getCardinalList (DisplayInfo *,
+ Window,
+ int,
+ unsigned long **,
+ int *);
+void setNetWorkarea (DisplayInfo *,
+ Window,
+ int,
+ int,
+ int,
+ int *);
+void setNetFrameExtents (DisplayInfo *,
+ Window,
+ int,
+ int,
+ int,
+ int);
+void initNetDesktopInfo (DisplayInfo *,
+ Window,
+ int,
+ int,
+ int);
+void setUTF8StringHint (DisplayInfo *,
+ Window,
+ int,
+ const gchar *);
+void getTransientFor (DisplayInfo *,
+ Window,
+ Window,
+ Window *);
+gboolean getWindowName (DisplayInfo *,
+ Window,
+ gchar **);
+gboolean getUTF8String (DisplayInfo *,
+ Window,
+ int,
+ gchar **,
+ int *);
+gboolean getUTF8StringList (DisplayInfo *,
+ Window,
+ int,
+ gchar ***,
+ int *);
+gboolean getClientMachine (DisplayInfo *,
+ Window,
+ gchar **);
+gboolean getClientMachine (DisplayInfo *,
+ Window,
+ gchar **);
+gboolean getWindowRole (DisplayInfo *,
+ Window,
+ gchar **);
+Window getClientLeader (DisplayInfo *,
+ Window);
+gboolean getNetWMUserTime (DisplayInfo *,
+ Window,
+ Time *);
+gboolean getClientID (DisplayInfo *,
+ Window,
+ gchar **);
+gboolean getWindowCommand (DisplayInfo *,
+ Window,
+ char ***,
+ int *);
+gboolean getKDEIcon (DisplayInfo *,
+ Window,
+ Pixmap *,
+ Pixmap *);
+gboolean getRGBIconData (DisplayInfo *,
+ Window,
+ unsigned long **,
+ unsigned long *);
+gboolean getOpacity (DisplayInfo *,
+ Window,
+ guint *);
+gboolean getOpacityLock (DisplayInfo *,
+ Window);
+gboolean setXAtomManagerOwner (DisplayInfo *,
+ Atom,
+ Window,
+ Window);
+gboolean setAtomIdManagerOwner (DisplayInfo *,
+ int,
+ Window ,
+ Window);
+Time getXServerTime (DisplayInfo *);
#ifdef ENABLE_KDE_SYSTRAY_PROXY
-gboolean checkKdeSystrayWindow(DisplayInfo *, Window);
-void sendSystrayReqDock(DisplayInfo *, Window, Window);
-Window getSystrayWindow (DisplayInfo *, Atom);
+gboolean checkKdeSystrayWindow (DisplayInfo *,
+ Window);
+void sendSystrayReqDock (DisplayInfo *,
+ Window,
+ Window);
+Window getSystrayWindow (DisplayInfo *,
+ Atom);
#endif
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
-gboolean getWindowStartupId (DisplayInfo *, Window, char **);
+gboolean getWindowStartupId (DisplayInfo *,
+ Window,
+ char **);
#endif
#ifdef HAVE_XSYNC
-gboolean getXSyncCounter (DisplayInfo *, Window, XSyncCounter *);
-void sendXSyncRequest (DisplayInfo *, Window, XSyncValue);
+gboolean getXSyncCounter (DisplayInfo *,
+ Window,
+ XSyncCounter *);
+void sendXSyncRequest (DisplayInfo *,
+ Window,
+ XSyncValue);
#endif /* HAVE_XSYNC */
#endif /* INC_HINTS_H */
Modified: xfwm4/trunk/src/icons.h
===================================================================
--- xfwm4/trunk/src/icons.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/icons.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -32,9 +32,9 @@
#include "display.h"
-GdkPixbuf * getAppIcon (DisplayInfo *,
- Window,
- int,
- int);
+GdkPixbuf *getAppIcon (DisplayInfo *,
+ Window,
+ int,
+ int);
#endif /* INC_ICONS_H */
Modified: xfwm4/trunk/src/keyboard.h
===================================================================
--- xfwm4/trunk/src/keyboard.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/keyboard.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -28,7 +28,7 @@
#include <X11/keysym.h>
-typedef struct _MyKey MyKey;
+typedef struct _MyKey MyKey;
struct _MyKey
{
KeyCode keycode;
@@ -42,12 +42,23 @@
extern unsigned int SuperMask;
extern unsigned int HyperMask;
-int getModifierMap (char *);
-void parseKeyString (Display *, MyKey *, char *);
-void grabKey (Display *, MyKey *, Window);
-void ungrabKeys (Display *, Window);
-void grabButton (Display *, int, int, Window);
-void ungrabButton (Display *, int, int, Window);
-void initModifiers (Display *);
+int getModifierMap (char *);
+void parseKeyString (Display *,
+ MyKey *,
+ char *);
+void grabKey (Display *,
+ MyKey *,
+ Window);
+void ungrabKeys (Display *,
+ Window);
+void grabButton (Display *,
+ int,
+ int,
+ Window);
+void ungrabButton (Display *,
+ int,
+ int,
+ Window);
+void initModifiers (Display *);
#endif /* INC_KEYBOARD_H */
Modified: xfwm4/trunk/src/menu.h
===================================================================
--- xfwm4/trunk/src/menu.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/menu.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -89,27 +89,27 @@
gpointer data;
};
-Menu *menu_default (GdkScreen *,
- Window,
- MenuOp,
- MenuOp,
- MenuFunc,
- gint,
- gint,
- gchar **,
- gint,
- eventFilterSetup*,
- gpointer);
-Menu *menu_connect (Menu * menu);
-GtkWidget *menu_item_connect (GtkWidget *,
- MenuData *);
-gboolean menu_is_opened (void);
-gboolean menu_check_and_close (void);
-gboolean menu_popup (Menu *,
- int,
- int,
- int,
- guint32);
-void menu_free (Menu *);
+Menu *menu_default (GdkScreen *,
+ Window,
+ MenuOp,
+ MenuOp,
+ MenuFunc,
+ gint,
+ gint,
+ gchar **,
+ gint,
+ eventFilterSetup*,
+ gpointer);
+Menu *menu_connect (Menu *);
+GtkWidget *menu_item_connect (GtkWidget *,
+ MenuData *);
+gboolean menu_is_opened (void);
+gboolean menu_check_and_close (void);
+gboolean menu_popup (Menu *,
+ int,
+ int,
+ int,
+ guint32);
+void menu_free (Menu *);
#endif /* INC_MENU_H */
Modified: xfwm4/trunk/src/misc.h
===================================================================
--- xfwm4/trunk/src/misc.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/misc.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -24,6 +24,9 @@
#endif
#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
#include <X11/Xlib.h>
#include <glib.h>
#include "screen.h"
@@ -43,13 +46,32 @@
#define Button7 7
#endif
-unsigned int getMouseXY (ScreenInfo *, Window, int *, int *);
-Window getMouseWindow (ScreenInfo *, Window);
-GC createGC (ScreenInfo *, char *, int, XFontStruct *, int, gboolean);
-void sendClientMessage (ScreenInfo *, Window, int, Time);
-void sendRootMessage (ScreenInfo *, int, long, Time);
-gboolean checkWindowOnRoot (ScreenInfo *, Window);
-void placeSidewalks(ScreenInfo *, gboolean);
-gint find_monitor_at_point (GdkScreen *screen, gint x, gint y);
+unsigned int getMouseXY (ScreenInfo *,
+ Window,
+ int *,
+ int *);
+Window getMouseWindow (ScreenInfo *,
+ Window);
+GC createGC (ScreenInfo *,
+ char *,
+ int,
+ XFontStruct *,
+ int,
+ gboolean);
+void sendClientMessage (ScreenInfo *,
+ Window,
+ int,
+ Time);
+void sendRootMessage (ScreenInfo *,
+ int,
+ long,
+ Time);
+gboolean checkWindowOnRoot (ScreenInfo *,
+ Window);
+void placeSidewalks (ScreenInfo *,
+ gboolean);
+gint find_monitor_at_point (GdkScreen *,
+ gint,
+ gint);
#endif /* INC_MISC_H */
Modified: xfwm4/trunk/src/mypixmap.h
===================================================================
--- xfwm4/trunk/src/mypixmap.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/mypixmap.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -53,26 +53,26 @@
gint width, height;
};
-gboolean xfwmPixmapRenderGdkPixbuf (xfwmPixmap *,
- GdkPixbuf *);
-gboolean xfwmPixmapLoad (ScreenInfo *,
- xfwmPixmap *,
- gchar *,
- gchar *,
- xfwmColorSymbol *);
-void xfwmPixmapCreate (ScreenInfo *,
- xfwmPixmap *,
- gint,
- gint);
-void xfwmPixmapInit (ScreenInfo *,
- xfwmPixmap *);
-void xfwmPixmapFree (xfwmPixmap *);
-void xfwmPixmapFill (xfwmPixmap *,
- xfwmPixmap *,
- gint,
- gint,
- gint,
- gint);
-void xfwmPixmapDuplicate (xfwmPixmap *,
- xfwmPixmap *);
+gboolean xfwmPixmapRenderGdkPixbuf (xfwmPixmap *,
+ GdkPixbuf *);
+gboolean xfwmPixmapLoad (ScreenInfo *,
+ xfwmPixmap *,
+ gchar *,
+ gchar *,
+ xfwmColorSymbol *);
+void xfwmPixmapCreate (ScreenInfo *,
+ xfwmPixmap *,
+ gint,
+ gint);
+void xfwmPixmapInit (ScreenInfo *,
+ xfwmPixmap *);
+void xfwmPixmapFree (xfwmPixmap *);
+void xfwmPixmapFill (xfwmPixmap *,
+ xfwmPixmap *,
+ gint,
+ gint,
+ gint,
+ gint);
+void xfwmPixmapDuplicate (xfwmPixmap *,
+ xfwmPixmap *);
#endif /* INC_MYPIXMAP_H */
Modified: xfwm4/trunk/src/mywindow.h
===================================================================
--- xfwm4/trunk/src/mywindow.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/mywindow.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -52,34 +52,35 @@
gboolean map;
};
-void xfwmWindowInit (xfwmWindow *);
-void xfwmWindowCreate (ScreenInfo *,
- Visual *,
- gint,
- Window,
- xfwmWindow *,
- Cursor);
-void xfwmWindowTemp (ScreenInfo *,
- Visual *,
- gint,
- Window,
- xfwmWindow *,
- int,
- int,
- int,
- int,
- long,
- gboolean);
-void xfwmWindowDelete (xfwmWindow *);
-void xfwmWindowShow (xfwmWindow *,
- int,
- int,
- int,
- int,
- gboolean);
-void xfwmWindowHide (xfwmWindow *);
-gboolean xfwmWindowVisible (xfwmWindow *);
-gboolean xfwmWindowDeleted (xfwmWindow *);
-void xfwmWindowSetBG (xfwmWindow *, xfwmPixmap *);
+void xfwmWindowInit (xfwmWindow *);
+void xfwmWindowCreate (ScreenInfo *,
+ Visual *,
+ gint,
+ Window,
+ xfwmWindow *,
+ Cursor);
+void xfwmWindowTemp (ScreenInfo *,
+ Visual *,
+ gint,
+ Window,
+ xfwmWindow *,
+ int,
+ int,
+ int,
+ int,
+ long,
+ gboolean);
+void xfwmWindowDelete (xfwmWindow *);
+void xfwmWindowShow (xfwmWindow *,
+ int,
+ int,
+ int,
+ int,
+ gboolean);
+void xfwmWindowHide (xfwmWindow *);
+gboolean xfwmWindowVisible (xfwmWindow *);
+gboolean xfwmWindowDeleted (xfwmWindow *);
+void xfwmWindowSetBG (xfwmWindow *,
+ xfwmPixmap *);
#endif /* INC_MYWINDOW_H */
Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/netwm.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -987,11 +987,11 @@
c->struts[i] = 0;
}
/* Fill(in values as for partial struts */
- c->struts[TOP_START_X] = c->struts[BOTTOM_START_X] = 0;
- c->struts[TOP_END_X] = c->struts[BOTTOM_END_X] =
+ c->struts[STRUTS_TOP_START_X] = c->struts[STRUTS_BOTTOM_START_X] = 0;
+ c->struts[STRUTS_TOP_END_X] = c->struts[STRUTS_BOTTOM_END_X] =
c->screen_info->width;
- c->struts[LEFT_START_Y] = c->struts[RIGHT_START_Y] = 0;
- c->struts[LEFT_END_Y] = c->struts[RIGHT_END_Y] =
+ c->struts[STRUTS_LEFT_START_Y] = c->struts[STRUTS_RIGHT_START_Y] = 0;
+ c->struts[STRUTS_LEFT_END_Y] = c->struts[STRUTS_RIGHT_END_Y] =
c->screen_info->height;
XFree (struts);
Modified: xfwm4/trunk/src/netwm.h
===================================================================
--- xfwm4/trunk/src/netwm.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/netwm.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -31,18 +31,22 @@
#include "screen.h"
#include "client.h"
-void clientSetNetState (Client *);
-void clientGetNetState (Client *);
-void clientUpdateNetState (Client *, XClientMessageEvent *);
-void clientNetMoveResize (Client *, XClientMessageEvent *);
-void clientUpdateFullscreenState (Client *);
-void clientGetNetWmType (Client *);
-void clientGetInitialNetWmDesktop (Client *);
-void clientSetNetClientList (ScreenInfo *, Atom, GList *);
-void clientGetNetStruts (Client *);
-void clientSetNetActions (Client *);
-void clientWindowType (Client *);
-void clientUpdateAboveState (Client *);
-void clientUpdateBelowState (Client *);
+void clientSetNetState (Client *);
+void clientGetNetState (Client *);
+void clientUpdateNetState (Client *,
+ XClientMessageEvent *);
+void clientNetMoveResize (Client *,
+ XClientMessageEvent *);
+void clientUpdateFullscreenState (Client *);
+void clientGetNetWmType (Client *);
+void clientGetInitialNetWmDesktop (Client *);
+void clientSetNetClientList (ScreenInfo *,
+ Atom,
+ GList *);
+void clientGetNetStruts (Client *);
+void clientSetNetActions (Client *);
+void clientWindowType (Client *);
+void clientUpdateAboveState (Client *);
+void clientUpdateBelowState (Client *);
#endif /* INC_NETWM_H */
Modified: xfwm4/trunk/src/parserc.h
===================================================================
--- xfwm4/trunk/src/parserc.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/parserc.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -29,14 +29,24 @@
#include <glib.h>
#include "settings.h"
-gboolean parseRc (const gchar *, const gchar *, Settings *);
-gboolean checkRc (Settings *);
-gchar *getValue (const gchar *, Settings *);
-gboolean setValue (const gchar *, const gchar *, Settings *);
-gboolean setBooleanValueFromInt (const gchar *, int, Settings *);
-gboolean setIntValueFromInt (const gchar *, int, Settings *);
-gchar *getSystemThemeDir (void);
-gchar *getThemeDir (const gchar *, const gchar *);
-void freeRc (Settings *);
+gboolean parseRc (const gchar *,
+ const gchar *,
+ Settings *);
+gboolean checkRc (Settings *);
+gchar *getValue (const gchar *,
+ Settings *);
+gboolean setValue (const gchar *,
+ const gchar *,
+ Settings *);
+gboolean setBooleanValueFromInt (const gchar *,
+ int,
+ Settings *);
+gboolean setIntValueFromInt (const gchar *,
+ int,
+ Settings *);
+gchar *getSystemThemeDir (void);
+gchar *getThemeDir (const gchar *,
+ const gchar *);
+void freeRc (Settings *);
#endif /* INC_PARSERC_H */
Modified: xfwm4/trunk/src/placement.c
===================================================================
--- xfwm4/trunk/src/placement.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/placement.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -50,21 +50,21 @@
&& FLAG_TEST (c->xfwm_flags, XFWM_FLAG_VISIBLE))
{
sigma = overlap (x, y, x + w, y + h,
- 0, c->struts[LEFT_START_Y],
- c->struts[LEFT],
- c->struts[LEFT_END_Y])
+ 0, c->struts[STRUTS_LEFT_START_Y],
+ c->struts[STRUTS_LEFT],
+ c->struts[STRUTS_LEFT_END_Y])
+ overlap (x, y, x + w, y + h,
- c->screen_info->width - c->struts[RIGHT],
- c->struts[RIGHT_START_Y],
- c->screen_info->width, c->struts[RIGHT_END_Y])
+ c->screen_info->width - c->struts[STRUTS_RIGHT],
+ c->struts[STRUTS_RIGHT_START_Y],
+ c->screen_info->width, c->struts[STRUTS_RIGHT_END_Y])
+ overlap (x, y, x + w, y + h,
- c->struts[TOP_START_X], 0,
- c->struts[TOP_END_X],
- c->struts[TOP])
+ c->struts[STRUTS_TOP_START_X], 0,
+ c->struts[STRUTS_TOP_END_X],
+ c->struts[STRUTS_TOP])
+ overlap (x, y, x + w, y + h,
- c->struts[BOTTOM_START_X],
- c->screen_info->height - c->struts[BOTTOM],
- c->struts[BOTTOM_END_X],
+ c->struts[STRUTS_BOTTOM_START_X],
+ c->screen_info->height - c->struts[STRUTS_BOTTOM],
+ c->struts[STRUTS_BOTTOM_END_X],
c->screen_info->height);
}
return sigma;
@@ -140,37 +140,37 @@
/* Left */
if (overlap (*x, *y, *x + *w, *y + *h,
- 0, c2->struts[LEFT_START_Y], c2->struts[LEFT], c2->struts[LEFT_END_Y]))
+ 0, c2->struts[STRUTS_LEFT_START_Y], c2->struts[STRUTS_LEFT], c2->struts[STRUTS_LEFT_END_Y]))
{
- delta = c2->struts[LEFT] - *x;
+ delta = c2->struts[STRUTS_LEFT] - *x;
*x = *x + delta;
*w = *w - delta;
}
/* Right */
if (overlap (*x, *y, *x + *w, *y + *h,
- screen_width - c2->struts[RIGHT], c2->struts[RIGHT_START_Y],
- screen_width, c2->struts[RIGHT_END_Y]))
+ screen_width - c2->struts[STRUTS_RIGHT], c2->struts[STRUTS_RIGHT_START_Y],
+ screen_width, c2->struts[STRUTS_RIGHT_END_Y]))
{
- delta = (*x + *w) - screen_width + c2->struts[RIGHT];
+ delta = (*x + *w) - screen_width + c2->struts[STRUTS_RIGHT];
*w = *w - delta;
}
/* Top */
if (overlap (*x, *y, *x + *w, *y + *h,
- c2->struts[TOP_START_X], 0, c2->struts[TOP_END_X], c2->struts[TOP]))
+ c2->struts[STRUTS_TOP_START_X], 0, c2->struts[STRUTS_TOP_END_X], c2->struts[STRUTS_TOP]))
{
- delta = c2->struts[TOP] - *y;
+ delta = c2->struts[STRUTS_TOP] - *y;
*y = *y + delta;
*h = *h - delta;
}
/* Bottom */
if (overlap (*x, *y, *x + *w, *y + *h,
- c2->struts[BOTTOM_START_X], screen_height - c2->struts[BOTTOM],
- c2->struts[BOTTOM_END_X], screen_height))
+ c2->struts[STRUTS_BOTTOM_START_X], screen_height - c2->struts[STRUTS_BOTTOM],
+ c2->struts[STRUTS_BOTTOM_END_X], screen_height))
{
- delta = (*y + *h) - screen_height + c2->struts[BOTTOM];
+ delta = (*y + *h) - screen_height + c2->struts[STRUTS_BOTTOM];
*h = *h - delta;
}
}
@@ -274,13 +274,13 @@
{
/* Right */
if (overlapY (frame_y, frame_y + frame_height,
- c2->struts[RIGHT_START_Y], c2->struts[RIGHT_END_Y]))
+ c2->struts[STRUTS_RIGHT_START_Y], c2->struts[STRUTS_RIGHT_END_Y]))
{
if (overlapX (frame_x, frame_x + frame_width,
- screen_width - c2->struts[RIGHT],
+ screen_width - c2->struts[STRUTS_RIGHT],
screen_width))
{
- c->x = screen_width - c2->struts[RIGHT] - frame_width + frame_left;
+ c->x = screen_width - c2->struts[STRUTS_RIGHT] - frame_width + frame_left;
frame_x = frameX (c);
ret |= CLIENT_CONSTRAINED_RIGHT;
}
@@ -288,13 +288,13 @@
/* Bottom */
if (overlapX (frame_x, frame_x + frame_width,
- c2->struts[BOTTOM_START_X], c2->struts[BOTTOM_END_X]))
+ c2->struts[STRUTS_BOTTOM_START_X], c2->struts[STRUTS_BOTTOM_END_X]))
{
if (overlapY (frame_y, frame_y + frame_height,
- screen_height - c2->struts[BOTTOM],
+ screen_height - c2->struts[STRUTS_BOTTOM],
screen_height))
{
- c->y = screen_height - c2->struts[BOTTOM] - frame_height + frame_top;
+ c->y = screen_height - c2->struts[STRUTS_BOTTOM] - frame_height + frame_top;
frame_y = frameY (c);
ret |= CLIENT_CONSTRAINED_BOTTOM;
@@ -336,12 +336,12 @@
{
/* Left */
if (overlapY (frame_y, frame_y + frame_height,
- c2->struts[LEFT_START_Y], c2->struts[LEFT_END_Y]))
+ c2->struts[STRUTS_LEFT_START_Y], c2->struts[STRUTS_LEFT_END_Y]))
{
if (overlapX (frame_x, frame_x + frame_width,
- 0, c2->struts[LEFT]))
+ 0, c2->struts[STRUTS_LEFT]))
{
- c->x = c2->struts[LEFT] + frame_left;
+ c->x = c2->struts[STRUTS_LEFT] + frame_left;
frame_x = frameX (c);
ret |= CLIENT_CONSTRAINED_LEFT;
}
@@ -350,13 +350,13 @@
/* Top */
if (overlapX (frame_x,
frame_x + frame_width,
- c2->struts[TOP_START_X],
- c2->struts[TOP_END_X]))
+ c2->struts[STRUTS_TOP_START_X],
+ c2->struts[STRUTS_TOP_END_X]))
{
if (overlapY (frame_y, frame_y + frame_height,
- 0, c2->struts[TOP]))
+ 0, c2->struts[STRUTS_TOP]))
{
- c->y = c2->struts[TOP] + frame_top;
+ c->y = c2->struts[STRUTS_TOP] + frame_top;
frame_y = frameY (c);
ret |= CLIENT_CONSTRAINED_TOP;
}
@@ -405,11 +405,11 @@
{
/* Right */
if (overlapY (frame_y, frame_y + frame_height,
- c2->struts[RIGHT_START_Y], c2->struts[RIGHT_END_Y]))
+ c2->struts[STRUTS_RIGHT_START_Y], c2->struts[STRUTS_RIGHT_END_Y]))
{
- if (frame_x >= screen_width - c2->struts[RIGHT] - min_visible)
+ if (frame_x >= screen_width - c2->struts[STRUTS_RIGHT] - min_visible)
{
- c->x = screen_width - c2->struts[RIGHT] - min_visible + frame_left;
+ c->x = screen_width - c2->struts[STRUTS_RIGHT] - min_visible + frame_left;
frame_x = frameX (c);
ret |= CLIENT_CONSTRAINED_RIGHT;
}
@@ -417,11 +417,11 @@
/* Left */
if (overlapY (frame_y, frame_y + frame_height,
- c2->struts[LEFT_START_Y], c2->struts[LEFT_END_Y]))
+ c2->struts[STRUTS_LEFT_START_Y], c2->struts[STRUTS_LEFT_END_Y]))
{
- if (frame_x + frame_width <= c2->struts[LEFT] + min_visible)
+ if (frame_x + frame_width <= c2->struts[STRUTS_LEFT] + min_visible)
{
- c->x = c2->struts[LEFT] + min_visible - frame_width + frame_left;
+ c->x = c2->struts[STRUTS_LEFT] + min_visible - frame_width + frame_left;
frame_x = frameX (c);
ret |= CLIENT_CONSTRAINED_LEFT;
}
@@ -429,11 +429,11 @@
/* Bottom */
if (overlapX (frame_x, frame_x + frame_width,
- c2->struts[BOTTOM_START_X], c2->struts[BOTTOM_END_X]))
+ c2->struts[STRUTS_BOTTOM_START_X], c2->struts[STRUTS_BOTTOM_END_X]))
{
- if (frame_y >= screen_height - c2->struts[BOTTOM] - min_visible)
+ if (frame_y >= screen_height - c2->struts[STRUTS_BOTTOM] - min_visible)
{
- c->y = screen_height - c2->struts[BOTTOM] - min_visible + frame_top;
+ c->y = screen_height - c2->struts[STRUTS_BOTTOM] - min_visible + frame_top;
frame_y = frameY (c);
ret |= CLIENT_CONSTRAINED_BOTTOM;
}
@@ -441,17 +441,17 @@
/* Top */
if (overlapX (frame_x, frame_x + frame_width,
- c2->struts[TOP_START_X], c2->struts[TOP_END_X]))
+ c2->struts[STRUTS_TOP_START_X], c2->struts[STRUTS_TOP_END_X]))
{
- if (overlapY (frame_y, frame_y + frame_visible, 0, c2->struts[TOP]))
+ if (overlapY (frame_y, frame_y + frame_visible, 0, c2->struts[STRUTS_TOP]))
{
- c->y = c2->struts[TOP] + frame_top;
+ c->y = c2->struts[STRUTS_TOP] + frame_top;
frame_y = frameY (c);
ret |= CLIENT_CONSTRAINED_TOP;
}
- if (frame_y + frame_height <= c2->struts[TOP] + min_visible)
+ if (frame_y + frame_height <= c2->struts[STRUTS_TOP] + min_visible)
{
- c->y = c2->struts[TOP] + min_visible - frame_height + frame_top;
+ c->y = c2->struts[STRUTS_TOP] + min_visible - frame_height + frame_top;
frame_y = frameY (c);
ret |= CLIENT_CONSTRAINED_TOP;
}
@@ -671,11 +671,11 @@
monitor_nbr = find_monitor_at_point (screen_info->gscr, msx, msy);
gdk_screen_get_monitor_geometry (screen_info->gscr, monitor_nbr, &rect);
- full_x = MAX (screen_info->params->xfwm_margins[LEFT], rect.x);
- full_y = MAX (screen_info->params->xfwm_margins[TOP], rect.y);
- full_w = MIN (screen_info->width - screen_info->params->xfwm_margins[RIGHT],
+ full_x = MAX (screen_info->params->xfwm_margins[STRUTS_LEFT], rect.x);
+ full_y = MAX (screen_info->params->xfwm_margins[STRUTS_TOP], rect.y);
+ full_w = MIN (screen_info->width - screen_info->params->xfwm_margins[STRUTS_RIGHT],
rect.x + rect.width) - full_x;
- full_h = MIN (screen_info->height - screen_info->params->xfwm_margins[BOTTOM],
+ full_h = MIN (screen_info->height - screen_info->params->xfwm_margins[STRUTS_BOTTOM],
rect.y + rect.height) - full_y;
/* Adjust size to the widest size available, not covering struts */
Modified: xfwm4/trunk/src/placement.h
===================================================================
--- xfwm4/trunk/src/placement.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/placement.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -34,10 +34,15 @@
#define CLIENT_CONSTRAINED_LEFT 1<<2
#define CLIENT_CONSTRAINED_RIGHT 1<<3
-void clientMaxSpace (ScreenInfo *, int *, int *, int *, int *h);
-gboolean clientCkeckTitle (Client *);
-unsigned int clientConstrainPos (Client *, gboolean);
-void clientKeepVisible (Client *);
-void clientInitPosition (Client *);
+void clientMaxSpace (ScreenInfo *,
+ int *,
+ int *,
+ int *,
+ int *);
+gboolean clientCkeckTitle (Client *);
+unsigned int clientConstrainPos (Client *,
+ gboolean);
+void clientKeepVisible (Client *);
+void clientInitPosition (Client *);
#endif /* INC_PLACEMENT_H */
Modified: xfwm4/trunk/src/poswin.h
===================================================================
--- xfwm4/trunk/src/poswin.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/poswin.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -38,10 +38,11 @@
GtkWidget *label;
};
-Poswin *poswinCreate (GdkScreen *);
-void poswinSetPosition (Poswin * poswin, Client *c);
-void poswinDestroy (Poswin * poswin);
-void poswinShow (Poswin * poswin);
-void poswinHide(Poswin * poswin);
+Poswin *poswinCreate (GdkScreen *);
+void poswinSetPosition (Poswin *,
+ Client *);
+void poswinDestroy (Poswin *);
+void poswinShow (Poswin *);
+void poswinHide (Poswin *);
#endif /* INC_POSWIN_H */
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/screen.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -111,10 +111,10 @@
screen_info->current_ws = 0;
screen_info->previous_ws = 0;
- screen_info->margins[TOP] = screen_info->gnome_margins[TOP] = 0;
- screen_info->margins[LEFT] = screen_info->gnome_margins[LEFT] = 0;
- screen_info->margins[RIGHT] = screen_info->gnome_margins[RIGHT] = 0;
- screen_info->margins[BOTTOM] = screen_info->gnome_margins[BOTTOM] = 0;
+ screen_info->margins[STRUTS_TOP] = screen_info->gnome_margins[STRUTS_TOP] = 0;
+ screen_info->margins[STRUTS_LEFT] = screen_info->gnome_margins[STRUTS_LEFT] = 0;
+ screen_info->margins[STRUTS_RIGHT] = screen_info->gnome_margins[STRUTS_RIGHT] = 0;
+ screen_info->margins[STRUTS_BOTTOM] = screen_info->gnome_margins[STRUTS_BOTTOM] = 0;
screen_info->workspace_count = -1;
screen_info->workspace_names = NULL;
Modified: xfwm4/trunk/src/screen.h
===================================================================
--- xfwm4/trunk/src/screen.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/screen.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -152,24 +152,24 @@
#endif /* HAVE_COMPOSITOR */
};
-ScreenInfo * myScreenInit (DisplayInfo *,
- GdkScreen *,
- unsigned long);
-ScreenInfo * myScreenClose (ScreenInfo *);
-Display * myScreenGetXDisplay (ScreenInfo *);
-GtkWidget * myScreenGetGtkWidget (ScreenInfo *);
-GtkWidget * myScreenGetGtkWidget (ScreenInfo *);
-GdkWindow * myScreenGetGdkWindow (ScreenInfo *);
-gboolean myScreenGrabKeyboard (ScreenInfo *,
- Time);
-gboolean myScreenGrabPointer (ScreenInfo *,
- unsigned int,
- Cursor,
- Time);
-unsigned int myScreenUngrabKeyboard (ScreenInfo *,
- Time);
-unsigned int myScreenUngrabPointer (ScreenInfo *,
- Time);
-void myScreenGrabKeys (ScreenInfo *);
-void myScreenUngrabKeys (ScreenInfo *);
+ScreenInfo *myScreenInit (DisplayInfo *,
+ GdkScreen *,
+ unsigned long);
+ScreenInfo *myScreenClose (ScreenInfo *);
+Display *myScreenGetXDisplay (ScreenInfo *);
+GtkWidget *myScreenGetGtkWidget (ScreenInfo *);
+GtkWidget *myScreenGetGtkWidget (ScreenInfo *);
+GdkWindow *myScreenGetGdkWindow (ScreenInfo *);
+gboolean myScreenGrabKeyboard (ScreenInfo *,
+ Time);
+gboolean myScreenGrabPointer (ScreenInfo *,
+ unsigned int,
+ Cursor,
+ Time);
+unsigned int myScreenUngrabKeyboard (ScreenInfo *,
+ Time);
+unsigned int myScreenUngrabPointer (ScreenInfo *,
+ Time);
+void myScreenGrabKeys (ScreenInfo *);
+void myScreenUngrabKeys (ScreenInfo *);
#endif /* INC_SCREEN_H */
Modified: xfwm4/trunk/src/session.h
===================================================================
--- xfwm4/trunk/src/session.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/session.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -29,36 +29,31 @@
/*
* Save window states to file which name is given in argument.
*/
-gboolean
-sessionSaveWindowStates (DisplayInfo *,
- gchar *);
+gboolean sessionSaveWindowStates (DisplayInfo *,
+ gchar *);
/*
* Load window states to file which name is given in argument.
*/
-gboolean
-sessionLoadWindowStates (gchar *);
+gboolean sessionLoadWindowStates (gchar *);
/*
* Free allocated structure. Should be called before xfwm4 dies
*/
-void
-sessionFreeWindowStates (void);
+void sessionFreeWindowStates (void);
/*
* Search for existing client in saved session and update
* relevant client fields if found.
*/
-gboolean
-sessionMatchWinToSM (Client *);
+gboolean sessionMatchWinToSM (Client *);
/*
* Initiate session, connect to session manager and
* load saved states if the connection succeeds.
*/
-int
-sessionStart (int,
- char **,
- DisplayInfo *);
+int sessionStart (int,
+ char **,
+ DisplayInfo *);
#endif /* INC_CLIENT_H */
Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/settings.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -103,8 +103,8 @@
switch (idx)
{
- case LEFT:
- case RIGHT:
+ case STRUTS_LEFT:
+ case STRUTS_RIGHT:
if (value < 0)
{
val = 0;
@@ -119,8 +119,8 @@
}
screen_info->params->xfwm_margins[idx] = val;
break;
- case TOP:
- case BOTTOM:
+ case STRUTS_TOP:
+ case STRUTS_BOTTOM:
if (value < 0)
{
val = 0;
@@ -277,19 +277,19 @@
{
if (!strcmp (name, "Xfwm/LeftMargin"))
{
- set_settings_margin (screen_info, LEFT, setting->data.v_int);
+ set_settings_margin (screen_info, STRUTS_LEFT, setting->data.v_int);
}
else if (!strcmp (name, "Xfwm/RightMargin"))
{
- set_settings_margin (screen_info, RIGHT, setting->data.v_int);
+ set_settings_margin (screen_info, STRUTS_RIGHT, setting->data.v_int);
}
else if (!strcmp (name, "Xfwm/BottomMargin"))
{
- set_settings_margin (screen_info, BOTTOM, setting->data.v_int);
+ set_settings_margin (screen_info, STRUTS_BOTTOM, setting->data.v_int);
}
else if (!strcmp (name, "Xfwm/TopMargin"))
{
- set_settings_margin (screen_info, TOP, setting->data.v_int);
+ set_settings_margin (screen_info, STRUTS_TOP, setting->data.v_int);
}
}
break;
@@ -1486,10 +1486,10 @@
screen_info->params->snap_width =
abs (TOINT (getValue ("snap_width", rc)));
- set_settings_margin (screen_info, LEFT, TOINT (getValue ("margin_left", rc)));
- set_settings_margin (screen_info, RIGHT, TOINT (getValue ("margin_right", rc)));
- set_settings_margin (screen_info, BOTTOM, TOINT (getValue ("margin_bottom", rc)));
- set_settings_margin (screen_info, TOP, TOINT (getValue ("margin_top", rc)));
+ set_settings_margin (screen_info, STRUTS_LEFT, TOINT (getValue ("margin_left", rc)));
+ set_settings_margin (screen_info, STRUTS_RIGHT, TOINT (getValue ("margin_right", rc)));
+ set_settings_margin (screen_info, STRUTS_BOTTOM, TOINT (getValue ("margin_bottom", rc)));
+ set_settings_margin (screen_info, STRUTS_TOP, TOINT (getValue ("margin_top", rc)));
set_easy_click (screen_info, getValue ("easy_click", rc));
Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/settings.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -226,10 +226,10 @@
gboolean wrap_workspaces;
};
-gboolean loadSettings (ScreenInfo *);
-gboolean reloadSettings (DisplayInfo *,
- int);
-gboolean initSettings (ScreenInfo *);
-void closeSettings (ScreenInfo *);
+gboolean loadSettings (ScreenInfo *);
+gboolean reloadSettings (DisplayInfo *,
+ int);
+gboolean initSettings (ScreenInfo *);
+void closeSettings (ScreenInfo *);
#endif /* INC_SETTINGS_H */
Modified: xfwm4/trunk/src/spinning_cursor.h
===================================================================
--- xfwm4/trunk/src/spinning_cursor.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/spinning_cursor.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -28,6 +28,6 @@
#include <X11/Xlib.h>
-Cursor cursorCreateSpinning (Display * dpy);
+Cursor cursorCreateSpinning (Display *);
#endif /* INC_SPINNING_CURSOR_H */
Modified: xfwm4/trunk/src/stacking.h
===================================================================
--- xfwm4/trunk/src/stacking.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/stacking.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -29,22 +29,32 @@
#include "screen.h"
#include "client.h"
-void clientApplyStackList (ScreenInfo *);
-Client *clientGetLowestTransient (Client *);
-Client *clientGetHighestTransientOrModalFor (Client *);
-gboolean clientIsTopMost (Client *);
-Client *clientGetTopMostForGroup (Client *);
-Client *clientGetNextTopMost (ScreenInfo *, int, Client *);
-Client *clientGetBottomMost (ScreenInfo *, int, Client *);
-Client *clientAtPosition (ScreenInfo *, int, int, Client *);
-void clientRaise (Client *, Window);
-void clientLower (Client *, Window);
-gboolean clientAdjustFullscreenLayer (Client *, gboolean);
-void clientAddToList (Client *);
-void clientRemoveFromList (Client *);
-GList *clientGetStackList (ScreenInfo *);
-void clientSetLastRaise (Client *);
-Client *clientGetLastRaise (ScreenInfo *);
-void clientClearLastRaise (ScreenInfo *);
+void clientApplyStackList (ScreenInfo *);
+Client *clientGetLowestTransient (Client *);
+Client *clientGetHighestTransientOrModalFor (Client *);
+gboolean clientIsTopMost (Client *);
+Client *clientGetTopMostForGroup (Client *);
+Client *clientGetNextTopMost (ScreenInfo *,
+ int,
+ Client *);
+Client *clientGetBottomMost (ScreenInfo *,
+ int,
+ Client *);
+Client *clientAtPosition (ScreenInfo *,
+ int,
+ int,
+ Client *);
+void clientRaise (Client *,
+ Window);
+void clientLower (Client *,
+ Window);
+gboolean clientAdjustFullscreenLayer (Client *,
+ gboolean);
+void clientAddToList (Client *);
+void clientRemoveFromList (Client *);
+GList *clientGetStackList (ScreenInfo *);
+void clientSetLastRaise (Client *);
+Client *clientGetLastRaise (ScreenInfo *);
+void clientClearLastRaise (ScreenInfo *);
#endif /* INC_STACKING_H */
Modified: xfwm4/trunk/src/startup_notification.h
===================================================================
--- xfwm4/trunk/src/startup_notification.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/startup_notification.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -34,17 +34,17 @@
#include "screen.h"
#include "client.h"
-void sn_client_startup_properties (Client *);
-void sn_init_display (ScreenInfo *);
-void sn_close_display (void);
-void sn_process_event (XEvent *);
+void sn_client_startup_properties (Client *);
+void sn_init_display (ScreenInfo *);
+void sn_close_display (void);
+void sn_process_event (XEvent *);
#else /* HAVE_LIBSTARTUP_NOTIFICATION */
-#define sn_client_startup_properties(c) ;
-#define sn_init_display(d) ;
-#define sn_close_display() ;
-#define sn_process_event(e) ;
+#define sn_client_startup_properties(c) ;
+#define sn_init_display(d) ;
+#define sn_close_display() ;
+#define sn_process_event(e) ;
#endif /* HAVE_LIBSTARTUP_NOTIFICATION */
#endif /* INC_STARTUP_NOTIFICATION_H */
Modified: xfwm4/trunk/src/tabwin.h
===================================================================
--- xfwm4/trunk/src/tabwin.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/tabwin.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -48,17 +48,17 @@
int grid_rows;
};
-Tabwin *tabwinCreate (GdkScreen *,
- Client *,
- Client *,
- unsigned int,
- gboolean);
-Client *tabwinGetSelected (Tabwin *);
-Client *tabwinSelectNext (Tabwin *);
-Client *tabwinSelectPrev (Tabwin *);
-Client *tabwinGetHead (Tabwin *);
-Client *tabwinRemoveClient (Tabwin *,
- Client *);
-void tabwinDestroy (Tabwin *);
+Tabwin *tabwinCreate (GdkScreen *,
+ Client *,
+ Client *,
+ unsigned int,
+ gboolean);
+Client *tabwinGetSelected (Tabwin *);
+Client *tabwinSelectNext (Tabwin *);
+Client *tabwinSelectPrev (Tabwin *);
+Client *tabwinGetHead (Tabwin *);
+Client *tabwinRemoveClient (Tabwin *,
+ Client *);
+void tabwinDestroy (Tabwin *);
#endif /* INC_TABWIN_H */
Modified: xfwm4/trunk/src/transients.h
===================================================================
--- xfwm4/trunk/src/transients.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/transients.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -28,23 +28,29 @@
#include <glib.h>
#include "client.h"
-Client *clientGetTransient (Client *);
-gboolean clientIsTransient (Client *);
-gboolean clientIsModal (Client *);
-gboolean clientIsTransientOrModal (Client *);
-gboolean clientIsValidTransientOrModal (Client *);
-gboolean clientSameGroup (Client *, Client *);
-gboolean clientIsTransientFor (Client *, Client *);
-gboolean clientIsModalFor (Client *, Client *);
-gboolean clientIsTransientOrModalFor (Client *, Client *);
-gboolean clientIsTransientForGroup (Client *);
-gboolean clientIsModalForGroup (Client *);
-gboolean clientIsTransientOrModalForGroup (Client *);
-gboolean clientTransientOrModalHasAncestor (Client *, int);
-Client *clientGetModalFor (Client *);
-GList *clientListTransient (Client *);
-GList *clientListTransientOrModal (Client *);
-gboolean clientCheckTransientWindow (Client *, Window);
+Client *clientGetTransient (Client *);
+gboolean clientIsTransient (Client *);
+gboolean clientIsModal (Client *);
+gboolean clientIsTransientOrModal (Client *);
+gboolean clientIsValidTransientOrModal (Client *);
+gboolean clientSameGroup (Client *,
+ Client *);
+gboolean clientIsTransientFor (Client *,
+ Client *);
+gboolean clientIsModalFor (Client *,
+ Client *);
+gboolean clientIsTransientOrModalFor (Client *,
+ Client *);
+gboolean clientIsTransientForGroup (Client *);
+gboolean clientIsModalForGroup (Client *);
+gboolean clientIsTransientOrModalForGroup (Client *);
+gboolean clientTransientOrModalHasAncestor (Client *,
+ int);
+Client *clientGetModalFor (Client *);
+GList *clientListTransient (Client *);
+GList *clientListTransientOrModal (Client *);
+gboolean clientCheckTransientWindow (Client *,
+ Window);
#endif /* INC_TRANSIENTS_H */
Modified: xfwm4/trunk/src/ui_style.h
===================================================================
--- xfwm4/trunk/src/ui_style.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/ui_style.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -25,13 +25,13 @@
#include <gtk/gtk.h>
#include <pango/pango-font.h>
-gchar * getUIStyle (GtkWidget * widget,
- const gchar * name,
- const gchar * state);
-GdkGC * getUIStyle_gc (GtkWidget * widget,
- const gchar * state,
- const gchar * style);
-PangoFontDescription * getUIPangoFontDesc (GtkWidget * widget);
-PangoContext * getUIPangoContext (GtkWidget * widget);
+gchar *getUIStyle (GtkWidget *,
+ const gchar *,
+ const gchar *);
+GdkGC *getUIStyle_gc (GtkWidget *,
+ const gchar *,
+ const gchar *);
+PangoFontDescription *getUIPangoFontDesc (GtkWidget *);
+PangoContext *getUIPangoContext (GtkWidget *);
#endif /* __UI_STYLE_H__ */
Modified: xfwm4/trunk/src/wireframe.h
===================================================================
--- xfwm4/trunk/src/wireframe.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/wireframe.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -30,8 +30,10 @@
#include "screen.h"
#include "client.h"
-void wireframeUpdate (Client *c, Window xwindow);
-Window wireframeCreate (Client *c);
-void wireframeDelete (ScreenInfo *screen_info, Window xwindow);
+void wireframeUpdate (Client *c,
+ Window);
+Window wireframeCreate (Client *c);
+void wireframeDelete (ScreenInfo *,
+ Window);
#endif /* INC_WIREFRAME_H */
Modified: xfwm4/trunk/src/workspaces.c
===================================================================
--- xfwm4/trunk/src/workspaces.c 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/workspaces.c 2006-11-04 22:36:42 UTC (rev 23704)
@@ -463,10 +463,10 @@
TRACE ("entering workspaceUpdateArea");
display_info = screen_info->display_info;
- prev_top = screen_info->margins[TOP];
- prev_left = screen_info->margins[LEFT];
- prev_right = screen_info->margins[RIGHT];
- prev_bottom = screen_info->margins[BOTTOM];
+ prev_top = screen_info->margins[STRUTS_TOP];
+ prev_left = screen_info->margins[STRUTS_LEFT];
+ prev_right = screen_info->margins[STRUTS_RIGHT];
+ prev_bottom = screen_info->margins[STRUTS_BOTTOM];
for (i = 0; i < 4; i++)
{
@@ -478,16 +478,16 @@
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_STRUT)
&& FLAG_TEST (c->xfwm_flags, XFWM_FLAG_VISIBLE))
{
- screen_info->margins[TOP] = MAX (screen_info->margins[TOP], c->struts[TOP]);
- screen_info->margins[LEFT] = MAX (screen_info->margins[LEFT], c->struts[LEFT]);
- screen_info->margins[RIGHT] = MAX (screen_info->margins[RIGHT], c->struts[RIGHT]);
- screen_info->margins[BOTTOM] = MAX (screen_info->margins[BOTTOM], c->struts[BOTTOM]);
+ screen_info->margins[STRUTS_TOP] = MAX (screen_info->margins[STRUTS_TOP], c->struts[STRUTS_TOP]);
+ screen_info->margins[STRUTS_LEFT] = MAX (screen_info->margins[STRUTS_LEFT], c->struts[STRUTS_LEFT]);
+ screen_info->margins[STRUTS_RIGHT] = MAX (screen_info->margins[STRUTS_RIGHT], c->struts[STRUTS_RIGHT]);
+ screen_info->margins[STRUTS_BOTTOM] = MAX (screen_info->margins[STRUTS_BOTTOM], c->struts[STRUTS_BOTTOM]);
}
}
- if ((prev_top != screen_info->margins[TOP]) || (prev_left != screen_info->margins[LEFT])
- || (prev_right != screen_info->margins[RIGHT])
- || (prev_bottom != screen_info->margins[BOTTOM]))
+ if ((prev_top != screen_info->margins[STRUTS_TOP]) || (prev_left != screen_info->margins[STRUTS_LEFT])
+ || (prev_right != screen_info->margins[STRUTS_RIGHT])
+ || (prev_bottom != screen_info->margins[STRUTS_BOTTOM]))
{
TRACE ("Margins have changed, updating net_workarea");
setNetWorkarea (display_info, screen_info->xroot, screen_info->workspace_count,
Modified: xfwm4/trunk/src/workspaces.h
===================================================================
--- xfwm4/trunk/src/workspaces.h 2006-11-04 21:42:20 UTC (rev 23703)
+++ xfwm4/trunk/src/workspaces.h 2006-11-04 22:36:42 UTC (rev 23704)
@@ -33,10 +33,19 @@
#include "screen.h"
#include "client.h"
-gboolean workspaceMove (ScreenInfo *, int, int, Client *);
-void workspaceSwitch (ScreenInfo *, int, Client *, gboolean);
-void workspaceSetNames (ScreenInfo *, gchar **, int);
-void workspaceSetCount (ScreenInfo *, int);
-void workspaceUpdateArea (ScreenInfo *);
+gboolean workspaceMove (ScreenInfo *,
+ int,
+ int,
+ Client *);
+void workspaceSwitch (ScreenInfo *,
+ int,
+ Client *,
+ gboolean);
+void workspaceSetNames (ScreenInfo *,
+ gchar **,
+ int);
+void workspaceSetCount (ScreenInfo *,
+ int);
+void workspaceUpdateArea (ScreenInfo *);
#endif /* INC_WORKSPACES_H */
More information about the Xfce4-commits
mailing list