Author: olivier
Date: 2008-10-22 20:10:00 +0000 (Wed, 22 Oct 2008)
New Revision: 28365
Modified:
xfwm4/trunk/ChangeLog
xfwm4/trunk/NEWS
xfwm4/trunk/src/client.c
xfwm4/trunk/src/client.h
xfwm4/trunk/src/display.c
xfwm4/trunk/src/display.h
xfwm4/trunk/src/events.c
xfwm4/trunk/src/focus.c
xfwm4/trunk/src/focus.h
xfwm4/trunk/src/hints.c
xfwm4/trunk/src/hints.h
xfwm4/trunk/src/misc.c
xfwm4/trunk/src/misc.h
xfwm4/trunk/src/moveresize.c
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/netwm.h
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/screen.h
xfwm4/trunk/src/startup_notification.c
xfwm4/trunk/src/workspaces.c
xfwm4/trunk/src/workspaces.h
Log:
* src/client.c, src/client.h, src/display.c, src/display.h,
src/events.c, src/focus.c, src/focus.h, src/hints.c, src/hints.h,
src/misc.c, src/misc.h, src/moveresize.c, src/netwm.c, src/netwm.h,
src/screen.c, src/screen.h, src/startup_notification.c,
src/workspaces.c, src/workspaces.h: Use "guint32" instead of Xlib's
"Time".
Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/ChangeLog 2008-10-22 20:10:00 UTC (rev 28365)
@@ -1,3 +1,12 @@
+2008-10-22 olivier
+
+ * src/client.c, src/client.h, src/display.c, src/display.h,
+ src/events.c, src/focus.c, src/focus.h, src/hints.c, src/hints.h,
+ src/misc.c, src/misc.h, src/moveresize.c, src/netwm.c, src/netwm.h,
+ src/screen.c, src/screen.h, src/startup_notification.c,
+ src/workspaces.c, src/workspaces.h: Use "guint32" instead of Xlib's
+ "Time".
+
2008-10-21 olivier
* src/client.c: Trivial, advertise the correct function name in debug
Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/NEWS 2008-10-22 20:10:00 UTC (rev 28365)
@@ -3,6 +3,7 @@
- Add support for restart style SmRestartImmediately.
- Add support for NET_MOVERESIZE_WINDOW
+- Add client windows to save set to avoid loosing all windows in case of crash
4.5.91 (Xfce 4.6beta1)
======================
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/client.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -1452,14 +1452,14 @@
{
ScreenInfo *screen_info;
DisplayInfo *display_info;
-
+
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
screen_info = c->screen_info;
display_info = screen_info->display_info;
- if (getHint (display_info, c->window, NET_WM_USER_TIME, (long *)
&c->user_time) && (c->user_time != 0))
+ if (getNetWMUserTime (display_info, c->window, &c->user_time) &&
(c->user_time != 0))
{
FLAG_SET (c->flags, CLIENT_FLAG_HAS_USER_TIME);
myDisplayUpdateLastUserTime (display_info, c->user_time);
@@ -1822,6 +1822,7 @@
c->fullscreen_old_layer = c->win_layer;
/* net_wm_user_time standard */
+ c->user_time = 0;
c->user_time_win = getNetWMUserTimeWindow(display_info, c->window);
clientAddUserTimeWin (c);
clientGetUserTime (c);
@@ -2583,7 +2584,7 @@
}
void
-clientActivate (Client * c, Time timestamp)
+clientActivate (Client * c, guint32 timestamp)
{
ScreenInfo *screen_info;
Client *sibling;
@@ -2624,7 +2625,7 @@
{
ScreenInfo *screen_info;
DisplayInfo *display_info;
- Time timestamp;
+ guint32 timestamp;
g_return_if_fail (c != NULL);
Modified: xfwm4/trunk/src/client.h
===================================================================
--- xfwm4/trunk/src/client.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/client.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -295,9 +295,9 @@
int struts[STRUTS_SIZE];
gchar *hostname;
gchar *name;
- Time user_time;
+ guint32 user_time;
GPid pid;
- Time ping_time;
+ guint32 ping_time;
unsigned long flags;
unsigned long wm_flags;
unsigned long xfwm_flags;
@@ -392,7 +392,7 @@
void clientClearAllShowDesktop (ScreenInfo *);
void clientToggleShowDesktop (ScreenInfo *);
void clientActivate (Client *,
- Time);
+ guint32);
void clientClose (Client *);
void clientKill (Client *);
void clientTerminate (Client *);
Modified: xfwm4/trunk/src/display.c
===================================================================
--- xfwm4/trunk/src/display.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/display.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -674,85 +674,85 @@
return NULL;
}
-Time
+guint32
myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev)
{
- g_return_val_if_fail (display != NULL, (Time) CurrentTime);
+ g_return_val_if_fail (display != NULL, CurrentTime);
switch (ev->type)
{
case KeyPress:
case KeyRelease:
- display->current_time = (Time) ev->xkey.time;
+ display->current_time = (guint32) ev->xkey.time;
break;
case ButtonPress:
case ButtonRelease:
- display->current_time = (Time) ev->xbutton.time;
+ display->current_time = (guint32) ev->xbutton.time;
break;
case MotionNotify:
- display->current_time = (Time) ev->xmotion.time;
+ display->current_time = (guint32) ev->xmotion.time;
break;
case EnterNotify:
case LeaveNotify:
- display->current_time = (Time) ev->xcrossing.time;
+ display->current_time = (guint32) ev->xcrossing.time;
break;
case PropertyNotify:
- display->current_time = (Time) ev->xproperty.time;
+ display->current_time = (guint32) ev->xproperty.time;
break;
case SelectionClear:
- display->current_time = (Time) ev->xselectionclear.time;
+ display->current_time = (guint32) ev->xselectionclear.time;
break;
case SelectionRequest:
- display->current_time = (Time) ev->xselectionrequest.time;
+ display->current_time = (guint32) ev->xselectionrequest.time;
break;
case SelectionNotify:
- display->current_time = (Time) ev->xselection.time;
+ display->current_time = (guint32) ev->xselection.time;
break;
default:
- display->current_time = (Time) CurrentTime;
+ display->current_time = (guint32) CurrentTime;
break;
}
return display->current_time;
}
-Time
+guint32
myDisplayGetCurrentTime (DisplayInfo *display)
{
- g_return_val_if_fail (display != NULL, (Time) CurrentTime);
+ g_return_val_if_fail (display != NULL, CurrentTime);
- TRACE ("myDisplayGetCurrentTime gives timestamp=%u", (unsigned int)
display->current_time);
- return (Time) display->current_time;
+ TRACE ("myDisplayGetCurrentTime gives timestamp=%u", (guint32)
display->current_time);
+ return display->current_time;
}
-Time
-myDisplayGetTime (DisplayInfo * display, Time timestamp)
+guint32
+myDisplayGetTime (DisplayInfo * display, guint32 timestamp)
{
- Time time;
+ guint32 time;
time = timestamp;
- if (time == (Time) CurrentTime)
+ if (time == (guint32) CurrentTime)
{
time = getXServerTime (display);
}
- TRACE ("myDisplayGetTime gives timestamp=%u", (unsigned int) time);
- return (time);
+ TRACE ("myDisplayGetTime gives timestamp=%u", (guint32) time);
+ return time;
}
-Time
+guint32
myDisplayGetLastUserTime (DisplayInfo *display)
{
- g_return_val_if_fail (display != NULL, (Time) CurrentTime);
+ g_return_val_if_fail (display != NULL, CurrentTime);
- TRACE ("myDisplayGetLastUserTime gives timestamp=%u", (unsigned int)
display->last_user_time);
- return (Time) display->last_user_time;
+ TRACE ("myDisplayGetLastUserTime gives timestamp=%u", (guint32)
display->last_user_time);
+ return display->last_user_time;
}
void
-myDisplaySetLastUserTime (DisplayInfo *display, Time timestamp)
+myDisplaySetLastUserTime (DisplayInfo *display, guint32 timestamp)
{
g_return_if_fail (display != NULL);
- g_return_if_fail (timestamp != (Time) 0);
+ g_return_if_fail (timestamp != 0);
if (TIMESTAMP_IS_BEFORE(timestamp, display->last_user_time))
{
@@ -762,10 +762,10 @@
}
void
-myDisplayUpdateLastUserTime (DisplayInfo *display, Time timestamp)
+myDisplayUpdateLastUserTime (DisplayInfo *display, guint32 timestamp)
{
g_return_if_fail (display != NULL);
- g_return_if_fail (timestamp != (Time) 0);
+ g_return_if_fail (timestamp != 0);
if (TIMESTAMP_IS_BEFORE(display->last_user_time, timestamp))
{
Modified: xfwm4/trunk/src/display.h
===================================================================
--- xfwm4/trunk/src/display.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/display.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -316,8 +316,8 @@
gint nb_screens;
gchar* hostname;
- Time current_time;
- Time last_user_time;
+ guint32 current_time;
+ guint32 last_user_time;
gboolean enable_compositor;
#ifdef HAVE_RENDER
@@ -395,16 +395,16 @@
XSyncAlarm);
#endif /* HAVE_XSYNC */
ScreenInfo *myDisplayGetDefaultScreen (DisplayInfo
*);
-Time myDisplayUpdateCurrentTime (DisplayInfo *,
+guint32 myDisplayUpdateCurrentTime (DisplayInfo *,
XEvent *);
-Time myDisplayGetCurrentTime (DisplayInfo
*);
-Time myDisplayGetTime (DisplayInfo *,
- Time);
-Time myDisplayGetLastUserTime (DisplayInfo
*);
+guint32 myDisplayGetCurrentTime (DisplayInfo
*);
+guint32 myDisplayGetTime (DisplayInfo *,
+ guint32);
+guint32 myDisplayGetLastUserTime (DisplayInfo
*);
void myDisplaySetLastUserTime (DisplayInfo *,
- Time);
+ guint32);
void myDisplayUpdateLastUserTime (DisplayInfo *,
- Time);
+ guint32);
gboolean myDisplayTestXrender (DisplayInfo *,
gdouble);
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/events.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -262,7 +262,7 @@
static gboolean
check_button_time (XButtonEvent *ev)
{
- static Time last_button_time = (Time) CurrentTime;
+ static guint32 last_button_time = CurrentTime;
if (last_button_time > ev->time)
{
@@ -816,7 +816,7 @@
static void
rootScrollButton (DisplayInfo *display_info, XButtonEvent * ev)
{
- static Time lastscroll = (Time) CurrentTime;
+ static guint32 lastscroll = CurrentTime;
ScreenInfo *screen_info;
if ((ev->time - lastscroll) < 25) /* ms */
@@ -1314,7 +1314,7 @@
static eventFilterStatus
handleEnterNotify (DisplayInfo *display_info, XCrossingEvent * ev)
{
- static Time lastresist = (Time) CurrentTime;
+ static guint32 lastresist = CurrentTime;
ScreenInfo *screen_info;
Client *c;
int b;
@@ -1820,7 +1820,7 @@
else if (ev->atom == display_info->atoms[NET_WM_USER_TIME])
{
TRACE ("client \"%s\" (0x%lx) has received a NET_WM_USER_TIME
notify", c->name, c->window);
- if (getHint (display_info, c->window, NET_WM_USER_TIME, (long *)
&c->user_time) && (c->user_time != 0))
+ if (getNetWMUserTime (display_info, c->window, &c->user_time) &&
(c->user_time != 0))
{
myDisplaySetLastUserTime (display_info, c->user_time);
FLAG_SET (c->flags, CLIENT_FLAG_HAS_USER_TIME);
@@ -2020,17 +2020,17 @@
else if ((ev->message_type == display_info->atoms[NET_ACTIVE_WINDOW])
&& (ev->format == 32))
{
gboolean source_is_application;
- Time ev_time;
+ guint32 ev_time;
- ev_time = myDisplayGetTime (display_info, (Time) ev->data.l[1]);
+ ev_time = myDisplayGetTime (display_info, (guint32) ev->data.l[1]);
source_is_application = (ev->data.l[0] == 1);
TRACE ("client \"%s\" (0x%lx) has received a NET_ACTIVE_WINDOW
event", c->name, c->window);
if (source_is_application)
{
- Time current = myDisplayGetLastUserTime (display_info);
+ guint32 current = myDisplayGetLastUserTime (display_info);
- TRACE ("Time of event received is %u, current XServer time is
%u", (unsigned int) ev_time, (unsigned int) current);
+ TRACE ("Time of event received is %u, current XServer time is
%u", (guint32) ev_time, (guint32) current);
if ((screen_info->params->prevent_focus_stealing) &&
TIMESTAMP_IS_BEFORE(ev_time, current))
{
TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\"
(0x%lx)", c->name, c->window);
@@ -2072,7 +2072,7 @@
(ev->data.l[0] != screen_info->current_ws))
{
workspaceSwitch (screen_info, ev->data.l[0], NULL, TRUE,
- myDisplayGetTime (display_info, (Time)
ev->data.l[1]));
+ myDisplayGetTime (display_info, (guint32)
ev->data.l[1]));
}
}
else if (((ev->message_type ==
display_info->atoms[WIN_WORKSPACE_COUNT]) ||
@@ -2128,7 +2128,7 @@
if (ev->data.l[0] == display_info->atoms[NET_WM_PING])
{
TRACE ("root has received a NET_WM_PING (pong) event\n");
- clientReceiveNetWMPong (screen_info, (Time) ev->data.l[1]);
+ clientReceiveNetWMPong (screen_info, (guint32) ev->data.l[1]);
}
}
else
Modified: xfwm4/trunk/src/focus.c
===================================================================
--- xfwm4/trunk/src/focus.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/focus.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -119,7 +119,7 @@
}
void
-clientFocusTop (ScreenInfo *screen_info, int layer, Time timestamp)
+clientFocusTop (ScreenInfo *screen_info, int layer, guint32 timestamp)
{
ClientPair top_client;
DisplayInfo *display_info;
@@ -164,7 +164,7 @@
}
else if ((client_focus) && (prevent_focus_stealing))
{
- if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_STARTUP_TIME) &&
(c->user_time == (Time) CurrentTime))
+ if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_STARTUP_TIME) &&
(c->user_time == CurrentTime))
{
TRACE ("Given startup time is 0, not focusing");
give_focus = FALSE;
@@ -466,7 +466,7 @@
}
static void
-clientFocusNone (ScreenInfo *screen_info, Client *previous, Time timestamp)
+clientFocusNone (ScreenInfo *screen_info, Client *previous, guint32 timestamp)
{
TRACE ("setting focus to none");
@@ -549,7 +549,7 @@
}
void
-clientSetFocus (ScreenInfo *screen_info, Client *c, Time timestamp, unsigned
short flags)
+clientSetFocus (ScreenInfo *screen_info, Client *c, guint32 timestamp,
unsigned short flags)
{
DisplayInfo *display_info;
Client *c2;
Modified: xfwm4/trunk/src/focus.h
===================================================================
--- xfwm4/trunk/src/focus.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/focus.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -41,7 +41,7 @@
void clientFocusTop (ScreenInfo *,
int,
- Time);
+ guint32);
gboolean clientFocusNew (Client *);
gboolean clientSelectMask (Client *,
int,
@@ -61,7 +61,7 @@
unsigned
short);
void clientSetFocus (ScreenInfo *,
Client *,
- Time,
+ guint32,
unsigned
short);
void clientInitFocusFlag (Client *);
Client *clientGetFocus (void);
Modified: xfwm4/trunk/src/hints.c
===================================================================
--- xfwm4/trunk/src/hints.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/hints.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -963,6 +963,36 @@
return client_leader;
}
+gboolean
+getNetWMUserTime (DisplayInfo *display_info, Window window, guint32 *time)
+{
+ Atom actual_type;
+ int actual_format;
+ unsigned long nitems;
+ unsigned long bytes_after;
+ unsigned char *data = NULL;
+
+ TRACE ("entering getNetWMUserTime");
+
+ g_return_val_if_fail (window != None, FALSE);
+
+ if (XGetWindowProperty (display_info->dpy, window,
display_info->atoms[NET_WM_USER_TIME],
+ 0L, 1L, FALSE, XA_CARDINAL, &actual_type,
&actual_format, &nitems,
+ &bytes_after, (unsigned char **) &data) == Success)
+ {
+ if ((data) && (actual_type == XA_CARDINAL)
+ && (nitems == 1) && (bytes_after == 0))
+ {
+ *time = *((guint32 *) data);
+ XFree (data);
+ return TRUE;
+ }
+ }
+ *time = 0;
+
+ return FALSE;
+}
+
Window
getNetWMUserTimeWindow (DisplayInfo *display_info, Window window)
{
@@ -1130,7 +1160,7 @@
setXAtomManagerOwner (DisplayInfo *display_info, Atom atom, Window root,
Window w)
{
XClientMessageEvent ev;
- Time server_time;
+ guint32 server_time;
int status;
g_return_val_if_fail (root != None, FALSE);
@@ -1184,27 +1214,27 @@
8, PropModeReplace, (unsigned char *) &c, 1);
}
-Time
+guint32
getXServerTime (DisplayInfo *display_info)
{
ScreenInfo *screen_info;
XEvent xevent;
- Time timestamp;
+ guint32 timestamp;
- g_return_val_if_fail (display_info, (Time) CurrentTime);
+ g_return_val_if_fail (display_info, CurrentTime);
timestamp = myDisplayGetCurrentTime (display_info);
- if (timestamp == (Time) CurrentTime)
+ if (timestamp == CurrentTime)
{
screen_info = myDisplayGetDefaultScreen (display_info);
- g_return_val_if_fail (screen_info, (Time) CurrentTime);
+ g_return_val_if_fail (screen_info, CurrentTime);
TRACE ("getXServerTime: Using X server roundtrip");
updateXserverTime (display_info);
XWindowEvent (display_info->dpy, display_info->timestamp_win,
PropertyChangeMask, &xevent);
- timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
+ timestamp = myDisplayUpdateCurrentTime (display_info, &xevent);
}
- TRACE ("getXServerTime gives timestamp=%u", (unsigned int) timestamp);
+ TRACE ("getXServerTime gives timestamp=%u", (guint32) timestamp);
return timestamp;
}
Modified: xfwm4/trunk/src/hints.h
===================================================================
--- xfwm4/trunk/src/hints.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/hints.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -243,6 +243,9 @@
gchar **);
Window getClientLeader (DisplayInfo *,
Window);
+gboolean getNetWMUserTime (DisplayInfo
*,
+ Window,
+ guint32 *);
Window getNetWMUserTimeWindow (DisplayInfo *,
Window);
gboolean getClientID (DisplayInfo *,
@@ -274,7 +277,7 @@
Window ,
Window);
void updateXserverTime (DisplayInfo
*);
-Time getXServerTime (DisplayInfo
*);
+guint32 getXServerTime (DisplayInfo
*);
#ifdef ENABLE_KDE_SYSTRAY_PROXY
gboolean checkKdeSystrayWindow (DisplayInfo *,
Modified: xfwm4/trunk/src/misc.c
===================================================================
--- xfwm4/trunk/src/misc.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/misc.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -106,7 +106,7 @@
}
void
-sendClientMessage (ScreenInfo *screen_info, Window w, int atom_id, Time
timestamp)
+sendClientMessage (ScreenInfo *screen_info, Window w, int atom_id, guint32
timestamp)
{
DisplayInfo *display_info;
XClientMessageEvent ev;
@@ -126,7 +126,7 @@
}
void
-sendRootMessage (ScreenInfo *screen_info, int atom_id, long value, Time
timestamp)
+sendRootMessage (ScreenInfo *screen_info, int atom_id, long value, guint32
timestamp)
{
DisplayInfo *display_info;
XClientMessageEvent ev;
Modified: xfwm4/trunk/src/misc.h
===================================================================
--- xfwm4/trunk/src/misc.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/misc.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -61,11 +61,11 @@
void sendClientMessage (ScreenInfo *,
Window,
int,
- Time);
+ guint32);
void sendRootMessage (ScreenInfo *,
int,
long,
- Time);
+ guint32);
gboolean checkWindowOnRoot (ScreenInfo *,
Window);
void placeSidewalks (ScreenInfo *,
Modified: xfwm4/trunk/src/moveresize.c
===================================================================
--- xfwm4/trunk/src/moveresize.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/moveresize.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -537,7 +537,7 @@
static int edge_scroll_x = 0;
static int edge_scroll_y = 0;
static gboolean toggled_maximize = FALSE;
- static Time lastresist = (Time) 0;
+ static guint32 lastresist = 0;
unsigned long configure_flags;
ScreenInfo *screen_info;
DisplayInfo *display_info;
@@ -733,7 +733,7 @@
}
warp_pointer = TRUE;
}
- lastresist = (Time) 0;
+ lastresist = 0;
}
if (edge_scroll_y > screen_info->params->wrap_resistance)
{
@@ -756,7 +756,7 @@
}
warp_pointer = TRUE;
}
- lastresist = (Time) 0;
+ lastresist = 0;
}
if (warp_pointer)
Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/netwm.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -612,7 +612,7 @@
event->xbutton.button = button;
event->xbutton.x_root = event->xkey.x_root = x_root;
event->xbutton.y_root = event->xkey.y_root = y_root;
- event->xbutton.time = event->xkey.time = myDisplayGetCurrentTime
(display_info);
+ event->xbutton.time = event->xkey.time = (Time) myDisplayGetCurrentTime
(display_info);
switch (action)
{
@@ -1373,7 +1373,7 @@
}
void
-clientSetNetActiveWindow (ScreenInfo *screen_info, Client *c, Time timestamp)
+clientSetNetActiveWindow (ScreenInfo *screen_info, Client *c, guint32
timestamp)
{
DisplayInfo *display_info;
unsigned long data[2];
@@ -1425,7 +1425,7 @@
}
void
-clientReceiveNetWMPong (ScreenInfo *screen_info, Time timestamp)
+clientReceiveNetWMPong (ScreenInfo *screen_info, guint32 timestamp)
{
Client *c;
int i;
@@ -1445,7 +1445,7 @@
}
gboolean
-clientSendNetWMPing (Client *c, Time timestamp)
+clientSendNetWMPing (Client *c, guint32 timestamp)
{
ScreenInfo *screen_info;
DisplayInfo *display_info;
Modified: xfwm4/trunk/src/netwm.h
===================================================================
--- xfwm4/trunk/src/netwm.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/netwm.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -54,11 +54,11 @@
void clientUpdateLayerState (Client *);
void clientSetNetActiveWindow (ScreenInfo *,
Client *,
- Time);
+ guint32);
void clientRemoveNetWMPing (Client *);
gboolean clientSendNetWMPing (Client *,
- Time);
+ guint32);
void clientReceiveNetWMPong (ScreenInfo *,
- Time);
+ guint32);
#endif /* INC_NETWM_H */
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/screen.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -387,7 +387,7 @@
}
gboolean
-myScreenGrabKeyboard (ScreenInfo *screen_info, Time time)
+myScreenGrabKeyboard (ScreenInfo *screen_info, guint32 time)
{
gboolean grab;
@@ -402,7 +402,7 @@
screen_info->xfwm4_win,
FALSE,
GrabModeAsync, GrabModeAsync,
- time) == GrabSuccess);
+ (Time) time) == GrabSuccess);
}
screen_info->key_grabs++;
TRACE ("global key grabs %i", screen_info->key_grabs);
@@ -411,7 +411,7 @@
}
gboolean
-myScreenGrabPointer (ScreenInfo *screen_info, unsigned int event_mask, Cursor
cursor, Time time)
+myScreenGrabPointer (ScreenInfo *screen_info, unsigned int event_mask, Cursor
cursor, guint32 time)
{
gboolean grab;
@@ -427,7 +427,7 @@
GrabModeAsync, GrabModeAsync,
screen_info->xroot,
cursor,
- time) == GrabSuccess);
+ (Time) time) == GrabSuccess);
}
screen_info->pointer_grabs++;
TRACE ("global pointer grabs %i", screen_info->pointer_grabs);
@@ -436,7 +436,7 @@
}
gboolean
-myScreenChangeGrabPointer (ScreenInfo *screen_info, unsigned int event_mask,
Cursor cursor, Time time)
+myScreenChangeGrabPointer (ScreenInfo *screen_info, unsigned int event_mask,
Cursor cursor, guint32 time)
{
gboolean grab;
@@ -447,14 +447,14 @@
if (screen_info->pointer_grabs > 0)
{
grab = (XChangeActivePointerGrab (myScreenGetXDisplay (screen_info),
- event_mask, cursor, time) ==
GrabSuccess);
+ event_mask, cursor, (Time) time) ==
GrabSuccess);
}
return grab;
}
unsigned int
-myScreenUngrabKeyboard (ScreenInfo *screen_info, Time time)
+myScreenUngrabKeyboard (ScreenInfo *screen_info, guint32 time)
{
g_return_val_if_fail (screen_info, 0);
TRACE ("entering myScreenUngrabKeyboard");
@@ -466,7 +466,7 @@
}
if (screen_info->key_grabs == 0)
{
- XUngrabKeyboard (myScreenGetXDisplay (screen_info), time);
+ XUngrabKeyboard (myScreenGetXDisplay (screen_info), (Time) time);
}
TRACE ("global key grabs %i", screen_info->key_grabs);
@@ -474,7 +474,7 @@
}
unsigned int
-myScreenUngrabPointer (ScreenInfo *screen_info, Time time)
+myScreenUngrabPointer (ScreenInfo *screen_info, guint32 time)
{
g_return_val_if_fail (screen_info, 0);
TRACE ("entering myScreenUngrabPointer");
@@ -486,7 +486,7 @@
}
if (screen_info->pointer_grabs == 0)
{
- XUngrabPointer (myScreenGetXDisplay (screen_info), time);
+ XUngrabPointer (myScreenGetXDisplay (screen_info), (Time) time);
}
TRACE ("global pointer grabs %i", screen_info->pointer_grabs);
Modified: xfwm4/trunk/src/screen.h
===================================================================
--- xfwm4/trunk/src/screen.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/screen.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -179,19 +179,19 @@
GtkWidget *myScreenGetGtkWidget (ScreenInfo *);
GdkWindow *myScreenGetGdkWindow (ScreenInfo *);
gboolean myScreenGrabKeyboard (ScreenInfo *,
- Time);
+ guint32);
gboolean myScreenGrabPointer (ScreenInfo *,
unsigned int,
Cursor,
- Time);
+ guint32);
gboolean myScreenChangeGrabPointer (ScreenInfo *,
unsigned int,
Cursor,
- Time);
+ guint32);
unsigned int myScreenUngrabKeyboard (ScreenInfo *,
- Time);
+ guint32);
unsigned int myScreenUngrabPointer (ScreenInfo *,
- Time);
+ guint32);
void myScreenGrabKeys (ScreenInfo *);
void myScreenUngrabKeys (ScreenInfo *);
Client *myScreenGetClientFromWindow (ScreenInfo *,
Modified: xfwm4/trunk/src/startup_notification.c
===================================================================
--- xfwm4/trunk/src/startup_notification.c 2008-10-22 20:09:02 UTC (rev
28364)
+++ xfwm4/trunk/src/startup_notification.c 2008-10-22 20:10:00 UTC (rev
28365)
@@ -282,15 +282,15 @@
if (sequence != NULL)
{
int workspace;
- Time timestamp;
+ guint32 timestamp;
/* Set initial time */
timestamp = sn_startup_sequence_get_timestamp (sequence);
TRACE ("Given startup time: %u", (unsigned int) timestamp);
- if ((c->user_time == (Time) 0) || TIMESTAMP_IS_BEFORE(c->user_time,
timestamp))
+ if ((c->user_time == (guint32) 0) || TIMESTAMP_IS_BEFORE(c->user_time,
timestamp))
{
c->user_time = timestamp;
- if (c->user_time != (Time) 0)
+ if (c->user_time != (guint32) 0)
{
myDisplayUpdateLastUserTime (screen_info->display_info,
c->user_time);
}
Modified: xfwm4/trunk/src/workspaces.c
===================================================================
--- xfwm4/trunk/src/workspaces.c 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/workspaces.c 2008-10-22 20:10:00 UTC (rev 28365)
@@ -178,7 +178,7 @@
/* returns TRUE if the workspace was changed, FALSE otherwise */
gboolean
-workspaceMove (ScreenInfo *screen_info, int rowmod, int colmod, Client * c,
Time timestamp)
+workspaceMove (ScreenInfo *screen_info, int rowmod, int colmod, Client * c,
guint32 timestamp)
{
int row, col, newrow, newcol, previous_ws, n;
@@ -235,7 +235,7 @@
}
void
-workspaceSwitch (ScreenInfo *screen_info, int new_ws, Client * c2, gboolean
update_focus, Time timestamp)
+workspaceSwitch (ScreenInfo *screen_info, int new_ws, Client * c2, gboolean
update_focus, guint32 timestamp)
{
DisplayInfo *display_info;
Client *c, *new_focus;
Modified: xfwm4/trunk/src/workspaces.h
===================================================================
--- xfwm4/trunk/src/workspaces.h 2008-10-22 20:09:02 UTC (rev 28364)
+++ xfwm4/trunk/src/workspaces.h 2008-10-22 20:10:00 UTC (rev 28365)
@@ -41,12 +41,12 @@
int,
int,
Client *,
- Time);
+ guint32);
void workspaceSwitch (ScreenInfo *,
int,
Client *,
gboolean,
- Time);
+ guint32);
void workspaceSetNames (ScreenInfo *,
gchar **,
int);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
