isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-19 14:05:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues on 64-bit machines with timestamps by using guint32 (like gtk+

Browse Source 
2006-09-13  Elijah Newren  <newren gmail com>

	* src/common.h (MetaWindowMenuFunc):
	* src/core.[ch] (meta_core_user_lower_and_unfocus,
	  meta_core_user_focus, meta_core_show_window_menu,
	  meta_core_begin_grab_op, meta_core_end_grab_op):
	* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
	  meta_window_delete):
	* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
	  sanity_check_timestamps, meta_display_open, event_callback,
	  meta_spew_event, meta_display_set_grab_op_cursor,
	  meta_display_begin_grab_op, meta_display_end_grab_op,
	  meta_display_ping_timeout, meta_display_ping_window,
	  process_pong_message, timestamp_too_old,
	  meta_display_set_input_focus_window):
	* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
	  meta_screen_grab_all_keys, meta_window_grab_all_keys,
	  meta_window_ungrab_all_keys, error_on_generic_command,
	  error_on_command, error_on_terminal_command):
	* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
	  error_about_command, main):
	* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
	  meta_screen_show_desktop, meta_screen_apply_startup_properties):
	* src/session.c (warn_about_lame_clients_and_finish_interact):
	* src/window.[ch] (struct _MetaWindow,
	  intervening_user_event_occurred, window_activate,
	  meta_window_delete, meta_window_focus,
	  meta_window_send_icccm_message, meta_window_client_message,
	  menu_callback, meta_window_show_menu, struct EventScannerData,
	  check_use_this_motion_notify, meta_window_begin_grab_op,
	  meta_window_set_user_time):
	* src/workspace.[ch] (focus_ancestor_or_mru_window,
	  meta_workspace_activate_with_focus, meta_workspace_activate,
	  meta_workspace_focus_default_window,
	  focus_ancestor_or_mru_window):
	Fix issues on 64-bit machines with timestamps by using guint32
	(like gtk+ does) instead of Time.  #348305
This commit is contained in:
Elijah Newren 2006-09-13 16:32:33 +00:00 committed by Elijah Newren
parent c53538b1c2
commit 3b0478776d
17 changed files with 191 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -1,3 +1,41 @@
2006-09-13 Elijah Newren <newren gmail com>
* src/common.h (MetaWindowMenuFunc):
* src/core.[ch] (meta_core_user_lower_and_unfocus,
meta_core_user_focus, meta_core_show_window_menu,
meta_core_begin_grab_op, meta_core_end_grab_op):
* src/delete.c (delete_ping_reply_func, delete_ping_timeout_func,
meta_window_delete):
* src/display.[ch] (struct MetaDisplay, struct MetaPingData,
sanity_check_timestamps, meta_display_open, event_callback,
meta_spew_event, meta_display_set_grab_op_cursor,
meta_display_begin_grab_op, meta_display_end_grab_op,
meta_display_ping_timeout, meta_display_ping_window,
process_pong_message, timestamp_too_old,
meta_display_set_input_focus_window):
* src/keybindings.[ch] (grab_keyboard, ungrab_keyboard,
meta_screen_grab_all_keys, meta_window_grab_all_keys,
meta_window_ungrab_all_keys, error_on_generic_command,
error_on_command, error_on_terminal_command):
* src/metacity-dialog.c (on_realize, warn_about_no_sm_support,
error_about_command, main):
* src/screen.[ch] (struct _MetaScreen, meta_screen_new,
meta_screen_show_desktop, meta_screen_apply_startup_properties):
* src/session.c (warn_about_lame_clients_and_finish_interact):
* src/window.[ch] (struct _MetaWindow,
intervening_user_event_occurred, window_activate,
meta_window_delete, meta_window_focus,
meta_window_send_icccm_message, meta_window_client_message,
menu_callback, meta_window_show_menu, struct EventScannerData,
check_use_this_motion_notify, meta_window_begin_grab_op,
meta_window_set_user_time):
* src/workspace.[ch] (focus_ancestor_or_mru_window,
meta_workspace_activate_with_focus, meta_workspace_activate,
meta_workspace_focus_default_window,
focus_ancestor_or_mru_window):
Fix issues on 64-bit machines with timestamps by using guint32
(like gtk+ does) instead of Time. #348305
2006-09-12 Elijah Newren <newren gmail com> 2006-09-12 Elijah Newren <newren gmail com>
* src/theme.c (meta_gtk_arrow_from_string, * src/theme.c (meta_gtk_arrow_from_string,

2
src/common.h
View File

@ -74,7 +74,7 @@ typedef struct _MetaWindowMenu MetaWindowMenu;
typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu, typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
Display *xdisplay, Display *xdisplay,
Window client_xwindow, Window client_xwindow,
Time timestamp, guint32 timestamp,
MetaMenuOp op, MetaMenuOp op,
int workspace, int workspace,
gpointer data); gpointer data);

10
src/core.c
View File

@ -199,7 +199,7 @@ meta_core_user_raise (Display *xdisplay,
void void
meta_core_user_lower_and_unfocus (Display *xdisplay, meta_core_user_lower_and_unfocus (Display *xdisplay,
Window frame_xwindow, Window frame_xwindow,
Time timestamp) guint32 timestamp)
{ {
MetaWindow *window = get_window (xdisplay, frame_xwindow); MetaWindow *window = get_window (xdisplay, frame_xwindow);
@ -242,7 +242,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
void void
meta_core_user_focus (Display *xdisplay, meta_core_user_focus (Display *xdisplay,
Window frame_xwindow, Window frame_xwindow,
Time timestamp) guint32 timestamp)
{ {
MetaWindow *window = get_window (xdisplay, frame_xwindow); MetaWindow *window = get_window (xdisplay, frame_xwindow);
@ -441,7 +441,7 @@ meta_core_show_window_menu (Display *xdisplay,
int root_x, int root_x,
int root_y, int root_y,
int button, int button,
Time timestamp) guint32 timestamp)
{ {
MetaWindow *window = get_window (xdisplay, frame_xwindow); MetaWindow *window = get_window (xdisplay, frame_xwindow);
@ -587,7 +587,7 @@ meta_core_begin_grab_op (Display *xdisplay,
int event_serial, int event_serial,
int button, int button,
gulong modmask, gulong modmask,
Time timestamp, guint32 timestamp,
int root_x, int root_x,
int root_y) int root_y)
{ {
@ -609,7 +609,7 @@ meta_core_begin_grab_op (Display *xdisplay,
void void
meta_core_end_grab_op (Display *xdisplay, meta_core_end_grab_op (Display *xdisplay,
Time timestamp) guint32 timestamp)
{ {
MetaDisplay *display; MetaDisplay *display;

10
src/core.h
View File

@ -66,11 +66,11 @@ void meta_core_user_raise (Display *xdisplay,
Window frame_xwindow); Window frame_xwindow);
void meta_core_user_lower_and_unfocus (Display *xdisplay, void meta_core_user_lower_and_unfocus (Display *xdisplay,
Window frame_xwindow, Window frame_xwindow,
Time timestamp); guint32 timestamp);
void meta_core_user_focus (Display *xdisplay, void meta_core_user_focus (Display *xdisplay,
Window frame_xwindow, Window frame_xwindow,
Time timestamp); guint32 timestamp);
/* get position of client, same coord space expected by move */ /* get position of client, same coord space expected by move */
void meta_core_get_position (Display *xdisplay, void meta_core_get_position (Display *xdisplay,
@ -127,7 +127,7 @@ void meta_core_show_window_menu (Display *xdisplay,
int root_x, int root_x,
int root_y, int root_y,
int button, int button,
Time timestamp); guint32 timestamp);
void meta_core_get_menu_accelerator (MetaMenuOp menu_op, void meta_core_get_menu_accelerator (MetaMenuOp menu_op,
int workspace, int workspace,
@ -141,11 +141,11 @@ gboolean meta_core_begin_grab_op (Display *xdisplay,
int event_serial, int event_serial,
int button, int button,
gulong modmask, gulong modmask,
Time timestamp, guint32 timestamp,
int root_x, int root_x,
int root_y); int root_y);
void meta_core_end_grab_op (Display *xdisplay, void meta_core_end_grab_op (Display *xdisplay,
Time timestamp); guint32 timestamp);
MetaGrabOp meta_core_get_grab_op (Display *xdisplay); MetaGrabOp meta_core_get_grab_op (Display *xdisplay);
Window meta_core_get_grab_frame (Display *xdisplay); Window meta_core_get_grab_frame (Display *xdisplay);
int meta_core_get_grab_button (Display *xdisplay); int meta_core_get_grab_button (Display *xdisplay);

8
src/delete.c
View File

@ -39,7 +39,7 @@ static void meta_window_present_delete_dialog (MetaWindow *window);
static void static void
delete_ping_reply_func (MetaDisplay *display, delete_ping_reply_func (MetaDisplay *display,
Window xwindow, Window xwindow,
Time timestamp, guint32 timestamp,
void *user_data) void *user_data)
{ {
meta_topic (META_DEBUG_PING, meta_topic (META_DEBUG_PING,
@ -292,7 +292,7 @@ io_from_ping_dialog (GIOChannel *channel,
static void static void
delete_ping_timeout_func (MetaDisplay *display, delete_ping_timeout_func (MetaDisplay *display,
Window xwindow, Window xwindow,
Time timestamp, guint32 timestamp,
void *user_data) void *user_data)
{ {
MetaWindow *window = user_data; MetaWindow *window = user_data;
@ -318,7 +318,7 @@ delete_ping_timeout_func (MetaDisplay *display,
window_id_str = g_strdup_printf ("0x%lx", window->xwindow); window_id_str = g_strdup_printf ("0x%lx", window->xwindow);
sprintf (numbuf, "%d", window->screen->number); sprintf (numbuf, "%d", window->screen->number);
sprintf (timestampbuf, "%lu", timestamp); sprintf (timestampbuf, "%u", timestamp);
argv[0] = METACITY_LIBEXECDIR"/metacity-dialog"; argv[0] = METACITY_LIBEXECDIR"/metacity-dialog";
argv[1] = "--screen"; argv[1] = "--screen";
@ -364,7 +364,7 @@ delete_ping_timeout_func (MetaDisplay *display,
void void
meta_window_delete (MetaWindow *window, meta_window_delete (MetaWindow *window,
Time timestamp) guint32 timestamp)
{ {
meta_error_trap_push (window->display); meta_error_trap_push (window->display);
if (window->delete_window) if (window->delete_window)

87
src/display.c
View File

@ -76,12 +76,12 @@
typedef struct typedef struct
{ {
MetaDisplay *display; MetaDisplay *display;
Window xwindow; Window xwindow;
Time timestamp; guint32 timestamp;
MetaWindowPingFunc ping_reply_func; MetaWindowPingFunc ping_reply_func;
MetaWindowPingFunc ping_timeout_func; MetaWindowPingFunc ping_timeout_func;
void *user_data; void *user_data;
guint ping_timeout_id; guint ping_timeout_id;
} MetaPingData; } MetaPingData;
typedef struct typedef struct
@ -116,7 +116,7 @@ static void prefs_changed_callback (MetaPreference pref,
void *data); void *data);
static void sanity_check_timestamps (MetaDisplay *display, static void sanity_check_timestamps (MetaDisplay *display,
Time known_good_timestamp); guint32 known_good_timestamp);
MetaGroup* get_focussed_group (MetaDisplay *display); MetaGroup* get_focussed_group (MetaDisplay *display);
@ -233,7 +233,7 @@ meta_display_open (void)
GSList *screens; GSList *screens;
GSList *tmp; GSList *tmp;
int i; int i;
Time timestamp; guint32 timestamp;
/* Remember to edit code that assigns each atom to display struct /* Remember to edit code that assigns each atom to display struct
* when adding an atom name here. * when adding an atom name here.
*/ */
@ -1773,9 +1773,9 @@ event_callback (XEvent *event,
else else
mode = ReplayPointer; /* give event back */ mode = ReplayPointer; /* give event back */
meta_verbose ("Allowing events mode %s time %lu\n", meta_verbose ("Allowing events mode %s time %u\n",
mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer", mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
(unsigned long) event->xbutton.time); (unsigned int)event->xbutton.time);
XAllowEvents (display->xdisplay, XAllowEvents (display->xdisplay,
mode, event->xbutton.time); mode, event->xbutton.time);
@ -2247,8 +2247,8 @@ event_callback (XEvent *event,
time = event->xclient.data.l[1]; time = event->xclient.data.l[1];
meta_verbose ("Request to change current workspace to %d with " meta_verbose ("Request to change current workspace to %d with "
"specified timestamp of %lu\n", "specified timestamp of %u\n",
space, (unsigned long)time); space, time);
workspace = workspace =
meta_screen_get_workspace_by_index (screen, meta_screen_get_workspace_by_index (screen,
@ -2955,7 +2955,7 @@ meta_spew_event (MetaDisplay *display,
aevent->alarm, aevent->alarm,
(gint64) sync_value_to_64 (&aevent->counter_value), (gint64) sync_value_to_64 (&aevent->counter_value),
(gint64) sync_value_to_64 (&aevent->alarm_value), (gint64) sync_value_to_64 (&aevent->alarm_value),
(unsigned int) aevent->time, (unsigned int)aevent->time,
alarm_state_to_string (aevent->state)); alarm_state_to_string (aevent->state));
} }
else else
@ -3170,7 +3170,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaGrabOp op, MetaGrabOp op,
gboolean change_pointer, gboolean change_pointer,
Window grab_xwindow, Window grab_xwindow,
Time timestamp) guint32 timestamp)
{ {
Cursor cursor; Cursor cursor;
@ -3215,13 +3215,13 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
{ {
display->grab_have_pointer = TRUE; display->grab_have_pointer = TRUE;
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"XGrabPointer() returned GrabSuccess time 0x%lu\n", "XGrabPointer() returned GrabSuccess time %u\n",
timestamp); timestamp);
} }
else else
{ {
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"XGrabPointer() failed time 0x%lu\n", "XGrabPointer() failed time %u\n",
timestamp); timestamp);
} }
meta_error_trap_pop (display, TRUE); meta_error_trap_pop (display, TRUE);
@ -3242,7 +3242,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
int event_serial, int event_serial,
int button, int button,
gulong modmask, gulong modmask,
Time timestamp, guint32 timestamp,
int root_x, int root_x,
int root_y) int root_y)
{ {
@ -3519,11 +3519,10 @@ meta_display_begin_grab_op (MetaDisplay *display,
void void
meta_display_end_grab_op (MetaDisplay *display, meta_display_end_grab_op (MetaDisplay *display,
Time timestamp) guint32 timestamp)
{ {
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Ending grab op %u at time %lu\n", display->grab_op, "Ending grab op %u at time %u\n", display->grab_op, timestamp);
(unsigned long) timestamp);
if (display->grab_op == META_GRAB_OP_NONE) if (display->grab_op == META_GRAB_OP_NONE)
return; return;
@ -3610,15 +3609,14 @@ meta_display_end_grab_op (MetaDisplay *display,
if (display->grab_have_pointer) if (display->grab_have_pointer)
{ {
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Ungrabbing pointer with timestamp %lu\n", "Ungrabbing pointer with timestamp %u\n", timestamp);
timestamp);
XUngrabPointer (display->xdisplay, timestamp); XUngrabPointer (display->xdisplay, timestamp);
} }
if (display->grab_have_keyboard) if (display->grab_have_keyboard)
{ {
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Ungrabbing all keys timestamp %lu\n", timestamp); "Ungrabbing all keys timestamp %u\n", timestamp);
if (display->grab_window) if (display->grab_window)
meta_window_ungrab_all_keys (display->grab_window, timestamp); meta_window_ungrab_all_keys (display->grab_window, timestamp);
else else
@ -4027,7 +4025,7 @@ meta_display_ping_timeout (gpointer data)
ping_data->ping_timeout_id = 0; ping_data->ping_timeout_id = 0;
meta_topic (META_DEBUG_PING, meta_topic (META_DEBUG_PING,
"Ping %lu on window %lx timed out\n", "Ping %u on window %lx timed out\n",
ping_data->timestamp, ping_data->xwindow); ping_data->timestamp, ping_data->xwindow);
(* ping_data->ping_timeout_func) (ping_data->display, ping_data->xwindow, (* ping_data->ping_timeout_func) (ping_data->display, ping_data->xwindow,
@ -4044,7 +4042,7 @@ meta_display_ping_timeout (gpointer data)
void void
meta_display_ping_window (MetaDisplay *display, meta_display_ping_window (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
Time timestamp, guint32 timestamp,
MetaWindowPingFunc ping_reply_func, MetaWindowPingFunc ping_reply_func,
MetaWindowPingFunc ping_timeout_func, MetaWindowPingFunc ping_timeout_func,
gpointer user_data) gpointer user_data)
@ -4079,7 +4077,7 @@ meta_display_ping_window (MetaDisplay *display,
display->pending_pings = g_slist_prepend (display->pending_pings, ping_data); display->pending_pings = g_slist_prepend (display->pending_pings, ping_data);
meta_topic (META_DEBUG_PING, meta_topic (META_DEBUG_PING,
"Sending ping with timestamp %lu to window %s\n", "Sending ping with timestamp %u to window %s\n",
timestamp, window->desc); timestamp, window->desc);
meta_window_send_icccm_message (window, meta_window_send_icccm_message (window,
display->atom_net_wm_ping, display->atom_net_wm_ping,
@ -4160,18 +4158,19 @@ process_pong_message (MetaDisplay *display,
XEvent *event) XEvent *event)
{ {
GSList *tmp; GSList *tmp;
guint32 timestamp = event->xclient.data.l[1];
meta_topic (META_DEBUG_PING, "Received a pong with timestamp %lu\n", meta_topic (META_DEBUG_PING, "Received a pong with timestamp %u\n",
(Time) event->xclient.data.l[1]); timestamp);
for (tmp = display->pending_pings; tmp; tmp = tmp->next) for (tmp = display->pending_pings; tmp; tmp = tmp->next)
{ {
MetaPingData *ping_data = tmp->data; MetaPingData *ping_data = tmp->data;
if ((Time)event->xclient.data.l[1] == ping_data->timestamp) if (timestamp == ping_data->timestamp)
{ {
meta_topic (META_DEBUG_PING, meta_topic (META_DEBUG_PING,
"Matching ping found for pong %lu\n", "Matching ping found for pong %u\n",
ping_data->timestamp); ping_data->timestamp);
/* Remove the ping data from the list */ /* Remove the ping data from the list */
@ -4870,15 +4869,15 @@ meta_display_focus_sentinel_clear (MetaDisplay *display)
static void static void
sanity_check_timestamps (MetaDisplay *display, sanity_check_timestamps (MetaDisplay *display,
Time timestamp) guint32 timestamp)
{ {
if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time)) if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
{ {
meta_warning ("last_focus_time (%lu) is greater than comparison " meta_warning ("last_focus_time (%u) is greater than comparison "
"timestamp (%lu). This most likely represents a buggy " "timestamp (%u). This most likely represents a buggy "
"client sending inaccurate timestamps in messages such as " "client sending inaccurate timestamps in messages such as "
"_NET_ACTIVE_WINDOW. Trying to work around...\n", "_NET_ACTIVE_WINDOW. Trying to work around...\n",
display->last_focus_time, (unsigned long)timestamp); display->last_focus_time, timestamp);
display->last_focus_time = timestamp; display->last_focus_time = timestamp;
} }
if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_user_time)) if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_user_time))
@ -4886,11 +4885,11 @@ sanity_check_timestamps (MetaDisplay *display,
GSList *windows; GSList *windows;
GSList *tmp; GSList *tmp;
meta_warning ("last_user_time (%lu) is greater than comparison " meta_warning ("last_user_time (%u) is greater than comparison "
"timestamp (%lu). This most likely represents a buggy " "timestamp (%u). This most likely represents a buggy "
"client sending inaccurate timestamps in messages such as " "client sending inaccurate timestamps in messages such as "
"_NET_ACTIVE_WINDOW. Trying to work around...\n", "_NET_ACTIVE_WINDOW. Trying to work around...\n",
display->last_user_time, (unsigned long)timestamp); display->last_user_time, timestamp);
display->last_user_time = timestamp; display->last_user_time = timestamp;
windows = meta_display_list_windows (display); windows = meta_display_list_windows (display);
@ -4902,7 +4901,7 @@ sanity_check_timestamps (MetaDisplay *display,
if (XSERVER_TIME_IS_BEFORE (timestamp, window->net_wm_user_time)) if (XSERVER_TIME_IS_BEFORE (timestamp, window->net_wm_user_time))
{ {
meta_warning ("%s appears to be one of the offending windows " meta_warning ("%s appears to be one of the offending windows "
"with a timestamp of %lu. Working around...\n", "with a timestamp of %u. Working around...\n",
window->desc, window->net_wm_user_time); window->desc, window->net_wm_user_time);
window->net_wm_user_time = timestamp; window->net_wm_user_time = timestamp;
} }
@ -4917,7 +4916,7 @@ sanity_check_timestamps (MetaDisplay *display,
static gboolean static gboolean
timestamp_too_old (MetaDisplay *display, timestamp_too_old (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
Time *timestamp) guint32 *timestamp)
{ {
/* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow /* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow
* us to sanity check the timestamp here and ensure it doesn't correspond to * us to sanity check the timestamp here and ensure it doesn't correspond to
@ -4939,12 +4938,12 @@ timestamp_too_old (MetaDisplay *display,
if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_user_time)) if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_user_time))
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Ignoring focus request for %s since %lu " "Ignoring focus request for %s since %u "
"is less than %lu and %lu.\n", "is less than %u and %u.\n",
window ? window->desc : "the no_focus_window", window ? window->desc : "the no_focus_window",
*timestamp, *timestamp,
(unsigned long) display->last_user_time, display->last_user_time,
(unsigned long) display->last_focus_time); display->last_focus_time);
return TRUE; return TRUE;
} }
else else
@ -4952,7 +4951,7 @@ timestamp_too_old (MetaDisplay *display,
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Received focus request for %s which is newer than most " "Received focus request for %s which is newer than most "
"recent user_time, but less recent than " "recent user_time, but less recent than "
"last_focus_time (%lu < %lu < %lu); adjusting " "last_focus_time (%u < %u < %u); adjusting "
"accordingly. (See bug 167358)\n", "accordingly. (See bug 167358)\n",
window ? window->desc : "the no_focus_window", window ? window->desc : "the no_focus_window",
display->last_user_time, display->last_user_time,
@ -4970,7 +4969,7 @@ void
meta_display_set_input_focus_window (MetaDisplay *display, meta_display_set_input_focus_window (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
gboolean focus_frame, gboolean focus_frame,
Time timestamp) guint32 timestamp)
{ {
if (timestamp_too_old (display, window, &timestamp)) if (timestamp_too_old (display, window, &timestamp))
return; return;
@ -4990,7 +4989,7 @@ meta_display_set_input_focus_window (MetaDisplay *display,
void void
meta_display_focus_the_no_focus_window (MetaDisplay *display, meta_display_focus_the_no_focus_window (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
Time timestamp) guint32 timestamp)
{ {
if (timestamp_too_old (display, NULL, &timestamp)) if (timestamp_too_old (display, NULL, &timestamp))
return; return;

32
src/display.h
View File

@ -62,7 +62,7 @@ typedef struct MetaEdgeResistanceData MetaEdgeResistanceData;
typedef void (* MetaWindowPingFunc) (MetaDisplay *display, typedef void (* MetaWindowPingFunc) (MetaDisplay *display,
Window xwindow, Window xwindow,
Time timestamp, guint32 timestamp,
gpointer user_data); gpointer user_data);
@ -194,10 +194,10 @@ struct _MetaDisplay
MetaWindow *expected_focus_window; MetaWindow *expected_focus_window;
/* last timestamp passed to XSetInputFocus */ /* last timestamp passed to XSetInputFocus */
Time last_focus_time; guint32 last_focus_time;
/* last user interaction time in any app */ /* last user interaction time in any app */
Time last_user_time; guint32 last_user_time;
/* whether we're using mousenav (only relevant for sloppy&mouse focus modes; /* whether we're using mousenav (only relevant for sloppy&mouse focus modes;
* !mouse_mode means "keynav mode") * !mouse_mode means "keynav mode")
@ -269,7 +269,7 @@ struct _MetaDisplay
gboolean grab_threshold_movement_reached; /* raise_on_click == FALSE. */ gboolean grab_threshold_movement_reached; /* raise_on_click == FALSE. */
MetaResizePopup *grab_resize_popup; MetaResizePopup *grab_resize_popup;
GTimeVal grab_last_moveresize_time; GTimeVal grab_last_moveresize_time;
Time grab_motion_notify_time; guint32 grab_motion_notify_time;
int grab_wireframe_last_display_width; int grab_wireframe_last_display_width;
int grab_wireframe_last_display_height; int grab_wireframe_last_display_height;
GList* grab_old_window_stacking; GList* grab_old_window_stacking;
@ -283,7 +283,7 @@ struct _MetaDisplay
#ifdef HAVE_XKB #ifdef HAVE_XKB
int xkb_base_event_type; int xkb_base_event_type;
Time last_bell_time; guint32 last_bell_time;
#endif #endif
#ifdef HAVE_XSYNC #ifdef HAVE_XSYNC
/* alarm monitoring client's _NET_WM_SYNC_REQUEST_COUNTER */ /* alarm monitoring client's _NET_WM_SYNC_REQUEST_COUNTER */
@ -431,7 +431,7 @@ void meta_display_set_grab_op_cursor (MetaDisplay *display,
MetaGrabOp op, MetaGrabOp op,
gboolean change_pointer, gboolean change_pointer,
Window grab_xwindow, Window grab_xwindow,
Time timestamp); guint32 timestamp);
gboolean meta_display_begin_grab_op (MetaDisplay *display, gboolean meta_display_begin_grab_op (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
@ -441,11 +441,11 @@ gboolean meta_display_begin_grab_op (MetaDisplay *display,
int event_serial, int event_serial,
int button, int button,
gulong modmask, gulong modmask,
Time timestamp, guint32 timestamp,
int root_x, int root_x,
int root_y); int root_y);
void meta_display_end_grab_op (MetaDisplay *display, void meta_display_end_grab_op (MetaDisplay *display,
Time timestamp); guint32 timestamp);
void meta_display_check_threshold_reached (MetaDisplay *display, void meta_display_check_threshold_reached (MetaDisplay *display,
int x, int x,
@ -482,12 +482,12 @@ void meta_display_retheme_all (void);
void meta_display_set_cursor_theme (const char *theme, void meta_display_set_cursor_theme (const char *theme,
int size); int size);
void meta_display_ping_window (MetaDisplay *display, void meta_display_ping_window (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
Time timestamp, guint32 timestamp,
MetaWindowPingFunc ping_reply_func, MetaWindowPingFunc ping_reply_func,
MetaWindowPingFunc ping_timeout_func, MetaWindowPingFunc ping_timeout_func,
void *user_data); void *user_data);
gboolean meta_display_window_has_pending_pings (MetaDisplay *display, gboolean meta_display_window_has_pending_pings (MetaDisplay *display,
MetaWindow *window); MetaWindow *window);
@ -546,7 +546,7 @@ gboolean meta_display_focus_sentinel_clear (MetaDisplay *display);
void meta_display_set_input_focus_window (MetaDisplay *display, void meta_display_set_input_focus_window (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
gboolean focus_frame, gboolean focus_frame,
Time timestamp); guint32 timestamp);
/* meta_display_focus_the_no_focus_window is called when the /* meta_display_focus_the_no_focus_window is called when the
* designated no_focus_window should be focused, but is otherwise the * designated no_focus_window should be focused, but is otherwise the
@ -554,7 +554,7 @@ void meta_display_set_input_focus_window (MetaDisplay *display,
*/ */
void meta_display_focus_the_no_focus_window (MetaDisplay *display, void meta_display_focus_the_no_focus_window (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
Time timestamp); guint32 timestamp);
void meta_display_queue_autoraise_callback (MetaDisplay *display, void meta_display_queue_autoraise_callback (MetaDisplay *display,
MetaWindow *window); MetaWindow *window);

26
src/keybindings.c
View File

@ -1209,7 +1209,7 @@ grab_status_to_string (int status)
static gboolean static gboolean
grab_keyboard (MetaDisplay *display, grab_keyboard (MetaDisplay *display,
Window xwindow, Window xwindow,
Time timestamp) guint32 timestamp)
{ {
int result; int result;
int grab_status; int grab_status;
@ -1228,9 +1228,9 @@ grab_keyboard (MetaDisplay *display,
{ {
meta_error_trap_pop_with_return (display, TRUE); meta_error_trap_pop_with_return (display, TRUE);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"XGrabKeyboard() returned failure status %s time %lu\n", "XGrabKeyboard() returned failure status %s time %u\n",
grab_status_to_string (grab_status), grab_status_to_string (grab_status),
(unsigned long) timestamp); timestamp);
return FALSE; return FALSE;
} }
else else
@ -1250,19 +1250,19 @@ grab_keyboard (MetaDisplay *display,
} }
static void static void
ungrab_keyboard (MetaDisplay *display, Time timestamp) ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
{ {
meta_error_trap_push (display); meta_error_trap_push (display);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Ungrabbing keyboard with timestamp %lu\n", "Ungrabbing keyboard with timestamp %u\n",
timestamp); timestamp);
XUngrabKeyboard (display->xdisplay, timestamp); XUngrabKeyboard (display->xdisplay, timestamp);
meta_error_trap_pop (display, FALSE); meta_error_trap_pop (display, FALSE);
} }
gboolean gboolean
meta_screen_grab_all_keys (MetaScreen *screen, Time timestamp) meta_screen_grab_all_keys (MetaScreen *screen, guint32 timestamp)
{ {
gboolean retval; gboolean retval;
@ -1284,7 +1284,7 @@ meta_screen_grab_all_keys (MetaScreen *screen, Time timestamp)
} }
void void
meta_screen_ungrab_all_keys (MetaScreen *screen, Time timestamp) meta_screen_ungrab_all_keys (MetaScreen *screen, guint32 timestamp)
{ {
if (screen->all_keys_grabbed) if (screen->all_keys_grabbed)
{ {
@ -1300,7 +1300,7 @@ meta_screen_ungrab_all_keys (MetaScreen *screen, Time timestamp)
gboolean gboolean
meta_window_grab_all_keys (MetaWindow *window, meta_window_grab_all_keys (MetaWindow *window,
Time timestamp) guint32 timestamp)
{ {
Window grabwindow; Window grabwindow;
gboolean retval; gboolean retval;
@ -1335,7 +1335,7 @@ meta_window_grab_all_keys (MetaWindow *window,
} }
void void
meta_window_ungrab_all_keys (MetaWindow *window, Time timestamp) meta_window_ungrab_all_keys (MetaWindow *window, guint32 timestamp)
{ {
if (window->all_keys_grabbed) if (window->all_keys_grabbed)
{ {
@ -2627,7 +2627,7 @@ error_on_generic_command (const char *key,
const char *command, const char *command,
const char *message, const char *message,
int screen_number, int screen_number,
Time timestamp) guint32 timestamp)
{ {
GError *err; GError *err;
char *argv[10]; char *argv[10];
@ -2635,7 +2635,7 @@ error_on_generic_command (const char *key,
char timestampbuf[32]; char timestampbuf[32];
sprintf (numbuf, "%d", screen_number); sprintf (numbuf, "%d", screen_number);
sprintf (timestampbuf, "%lu", timestamp); sprintf (timestampbuf, "%u", timestamp);
argv[0] = METACITY_LIBEXECDIR"/metacity-dialog"; argv[0] = METACITY_LIBEXECDIR"/metacity-dialog";
argv[1] = "--screen"; argv[1] = "--screen";
@ -2671,7 +2671,7 @@ error_on_command (int command_index,
const char *command, const char *command,
const char *message, const char *message,
int screen_number, int screen_number,
Time timestamp) guint32 timestamp)
{ {
char *key; char *key;
@ -2689,7 +2689,7 @@ static void
error_on_terminal_command (const char *command, error_on_terminal_command (const char *command,
const char *message, const char *message,
int screen_number, int screen_number,
Time timestamp) guint32 timestamp)
{ {
const char *key; const char *key;

12
src/keybindings.h
View File

@ -29,16 +29,16 @@ void meta_display_init_keys (MetaDisplay *display);
void meta_display_shutdown_keys (MetaDisplay *display); void meta_display_shutdown_keys (MetaDisplay *display);
void meta_screen_grab_keys (MetaScreen *screen); void meta_screen_grab_keys (MetaScreen *screen);
void meta_screen_ungrab_keys (MetaScreen *screen); void meta_screen_ungrab_keys (MetaScreen *screen);
gboolean meta_screen_grab_all_keys (MetaScreen *screen, gboolean meta_screen_grab_all_keys (MetaScreen *screen,
Time timestamp); guint32 timestamp);
void meta_screen_ungrab_all_keys (MetaScreen *screen, void meta_screen_ungrab_all_keys (MetaScreen *screen,
Time timestamp); guint32 timestamp);
void meta_window_grab_keys (MetaWindow *window); void meta_window_grab_keys (MetaWindow *window);
void meta_window_ungrab_keys (MetaWindow *window); void meta_window_ungrab_keys (MetaWindow *window);
gboolean meta_window_grab_all_keys (MetaWindow *window, gboolean meta_window_grab_all_keys (MetaWindow *window,
Time timestamp); guint32 timestamp);
void meta_window_ungrab_all_keys (MetaWindow *window, void meta_window_ungrab_all_keys (MetaWindow *window,
Time timestamp); guint32 timestamp);
void meta_display_process_key_event (MetaDisplay *display, void meta_display_process_key_event (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
XEvent *event); XEvent *event);

10
src/metacity-dialog.c
View File

@ -79,7 +79,7 @@ on_realize (GtkWidget *dialog,
static int static int
kill_window_question (const char *window_name, kill_window_question (const char *window_name,
const char *parent_str, const char *parent_str,
Time timestamp) guint32 timestamp)
{ {
GtkWidget *dialog; GtkWidget *dialog;
char *str, *tmp; char *str, *tmp;
@ -227,8 +227,8 @@ create_lame_apps_list (char **lame_apps)
} }
static int static int
warn_about_no_sm_support (char **lame_apps, warn_about_no_sm_support (char **lame_apps,
Time timestamp) guint32 timestamp)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *list; GtkWidget *list;
@ -295,7 +295,7 @@ static int
error_about_command (const char *gconf_key, error_about_command (const char *gconf_key,
const char *command, const char *command,
const char *error, const char *error,
Time timestamp) guint32 timestamp)
{ {
GtkWidget *dialog; GtkWidget *dialog;
@ -350,7 +350,7 @@ int
main (int argc, char **argv) main (int argc, char **argv)
{ {
GOptionContext *ctx; GOptionContext *ctx;
Time timestamp = 0; guint32 timestamp = 0;
gint num_args = 0; gint num_args = 0;
bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);

10
src/screen.c
View File

@ -367,7 +367,7 @@ reload_xinerama_infos (MetaScreen *screen)
MetaScreen* MetaScreen*
meta_screen_new (MetaDisplay *display, meta_screen_new (MetaDisplay *display,
int number, int number,
Time timestamp) guint32 timestamp)
{ {
MetaScreen *screen; MetaScreen *screen;
Window xroot; Window xroot;
@ -378,7 +378,7 @@ meta_screen_new (MetaDisplay *display,
gboolean replace_current_wm; gboolean replace_current_wm;
Atom wm_sn_atom; Atom wm_sn_atom;
char buf[128]; char buf[128];
Time manager_timestamp; guint32 manager_timestamp;
gulong current_workspace; gulong current_workspace;
replace_current_wm = meta_get_replace_current_wm (); replace_current_wm = meta_get_replace_current_wm ();
@ -2287,7 +2287,7 @@ meta_screen_minimize_all_on_active_workspace_except (MetaScreen *screen,
void void
meta_screen_show_desktop (MetaScreen *screen, meta_screen_show_desktop (MetaScreen *screen,
Time timestamp) guint32 timestamp)
{ {
GList *windows; GList *windows;
@ -2604,7 +2604,7 @@ meta_screen_apply_startup_properties (MetaScreen *screen,
if (sequence != NULL) if (sequence != NULL)
{ {
int space; int space;
Time timestamp; guint32 timestamp;
meta_topic (META_DEBUG_STARTUP, meta_topic (META_DEBUG_STARTUP,
"Found startup sequence for window %s ID \"%s\"\n", "Found startup sequence for window %s ID \"%s\"\n",
@ -2628,7 +2628,7 @@ meta_screen_apply_startup_properties (MetaScreen *screen,
{ {
timestamp = sn_startup_sequence_get_timestamp (sequence); timestamp = sn_startup_sequence_get_timestamp (sequence);
meta_topic (META_DEBUG_STARTUP, meta_topic (META_DEBUG_STARTUP,
"Setting initial window timestamp to %lu based on startup info\n", "Setting initial window timestamp to %u based on startup info\n",
timestamp); timestamp);
window->initial_timestamp_set = TRUE; window->initial_timestamp_set = TRUE;

6
src/screen.h
View File

@ -87,7 +87,7 @@ struct _MetaScreen
Window wm_sn_selection_window; Window wm_sn_selection_window;
Atom wm_sn_atom; Atom wm_sn_atom;
Time wm_sn_timestamp; guint32 wm_sn_timestamp;
MetaXineramaScreenInfo *xinerama_infos; MetaXineramaScreenInfo *xinerama_infos;
int n_xinerama_infos; int n_xinerama_infos;
@ -122,7 +122,7 @@ struct _MetaScreen
MetaScreen* meta_screen_new (MetaDisplay *display, MetaScreen* meta_screen_new (MetaDisplay *display,
int number, int number,
Time timestamp); guint32 timestamp);
void meta_screen_free (MetaScreen *screen); void meta_screen_free (MetaScreen *screen);
void meta_screen_manage_all_windows (MetaScreen *screen); void meta_screen_manage_all_windows (MetaScreen *screen);
MetaScreen* meta_screen_for_x_screen (Screen *xscreen); MetaScreen* meta_screen_for_x_screen (Screen *xscreen);
@ -197,7 +197,7 @@ void meta_screen_minimize_all_on_active_workspace_except (MetaScreen *screen
/* Show/hide the desktop (temporarily hide all windows) */ /* Show/hide the desktop (temporarily hide all windows) */
void meta_screen_show_desktop (MetaScreen *screen, void meta_screen_show_desktop (MetaScreen *screen,
Time timestamp); guint32 timestamp);
void meta_screen_unshow_desktop (MetaScreen *screen); void meta_screen_unshow_desktop (MetaScreen *screen);
/* Update whether the destkop is being shown for the current active_workspace */ /* Update whether the destkop is being shown for the current active_workspace */

4
src/session.c
View File

@ -1790,7 +1790,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
GError *err; GError *err;
GIOChannel *channel; GIOChannel *channel;
LameClientsDialogData *d; LameClientsDialogData *d;
Time timestamp; guint32 timestamp;
char timestampbuf[32]; char timestampbuf[32];
lame = NULL; lame = NULL;
@ -1855,7 +1855,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
timestamp = property_event.xproperty.time; timestamp = property_event.xproperty.time;
} }
sprintf (timestampbuf, "%lu", timestamp); sprintf (timestampbuf, "%u", timestamp);
len = g_slist_length (lame); len = g_slist_length (lame);
len *= 2; /* titles and also classes */ len *= 2; /* titles and also classes */

58
src/window.c
View File

@ -1634,7 +1634,7 @@ meta_window_queue_calc_showing (MetaWindow *window)
static gboolean static gboolean
intervening_user_event_occurred (MetaWindow *window) intervening_user_event_occurred (MetaWindow *window)
{ {
Time compare; guint32 compare;
MetaWindow *focus_window; MetaWindow *focus_window;
focus_window = window->display->focus_window; focus_window = window->display->focus_window;
@ -1642,9 +1642,9 @@ intervening_user_event_occurred (MetaWindow *window)
meta_topic (META_DEBUG_STARTUP, meta_topic (META_DEBUG_STARTUP,
"COMPARISON:\n" "COMPARISON:\n"
" net_wm_user_time_set : %d\n" " net_wm_user_time_set : %d\n"
" net_wm_user_time : %lu\n" " net_wm_user_time : %u\n"
" initial_timestamp_set: %d\n" " initial_timestamp_set: %d\n"
" initial_timestamp : %lu\n", " initial_timestamp : %u\n",
window->net_wm_user_time_set, window->net_wm_user_time_set,
window->net_wm_user_time, window->net_wm_user_time,
window->initial_timestamp_set, window->initial_timestamp_set,
@ -1655,7 +1655,7 @@ intervening_user_event_occurred (MetaWindow *window)
"COMPARISON (continued):\n" "COMPARISON (continued):\n"
" focus_window : %s\n" " focus_window : %s\n"
" fw->net_wm_user_time_set : %d\n" " fw->net_wm_user_time_set : %d\n"
" fw->net_wm_user_time : %lu\n", " fw->net_wm_user_time : %u\n",
focus_window->desc, focus_window->desc,
focus_window->net_wm_user_time_set, focus_window->net_wm_user_time_set,
focus_window->net_wm_user_time); focus_window->net_wm_user_time);
@ -1710,8 +1710,9 @@ intervening_user_event_occurred (MetaWindow *window)
XSERVER_TIME_IS_BEFORE (compare, focus_window->net_wm_user_time)) XSERVER_TIME_IS_BEFORE (compare, focus_window->net_wm_user_time))
{ {
meta_topic (META_DEBUG_STARTUP, meta_topic (META_DEBUG_STARTUP,
"window %s focus prevented by other activity; %lu < %lu\n", "window %s focus prevented by other activity; %u < %u\n",
window->desc, compare, window->desc,
compare,
focus_window->net_wm_user_time); focus_window->net_wm_user_time);
return TRUE; return TRUE;
} }
@ -2521,9 +2522,9 @@ window_activate (MetaWindow *window,
{ {
gboolean can_ignore_outdated_timestamps; gboolean can_ignore_outdated_timestamps;
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"_NET_ACTIVE_WINDOW message sent for %s at time %lu " "_NET_ACTIVE_WINDOW message sent for %s at time %u "
"by client type %u.\n", "by client type %u.\n",
window->desc, (unsigned long)timestamp, source_indication); window->desc, timestamp, source_indication);
/* Older EWMH spec didn't specify a timestamp; we decide to honor these only /* Older EWMH spec didn't specify a timestamp; we decide to honor these only
* if the app specifies that it is a pager. * if the app specifies that it is a pager.
@ -2538,7 +2539,7 @@ window_activate (MetaWindow *window,
can_ignore_outdated_timestamps) can_ignore_outdated_timestamps)
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"last_user_time (%lu) is more recent; ignoring " "last_user_time (%u) is more recent; ignoring "
" _NET_ACTIVE_WINDOW message.\n", " _NET_ACTIVE_WINDOW message.\n",
window->display->last_user_time); window->display->last_user_time);
meta_window_set_demands_attention(window); meta_window_set_demands_attention(window);
@ -3737,7 +3738,7 @@ get_modal_transient (MetaWindow *window)
/* XXX META_EFFECT_FOCUS */ /* XXX META_EFFECT_FOCUS */
void void
meta_window_focus (MetaWindow *window, meta_window_focus (MetaWindow *window,
Time timestamp) guint32 timestamp)
{ {
MetaWindow *modal_transient; MetaWindow *modal_transient;
@ -4122,7 +4123,7 @@ meta_window_lower (MetaWindow *window)
void void
meta_window_send_icccm_message (MetaWindow *window, meta_window_send_icccm_message (MetaWindow *window,
Atom atom, Atom atom,
Time timestamp) guint32 timestamp)
{ {
/* This comment and code are from twm, copyright /* This comment and code are from twm, copyright
* Open Group, Evans & Sutherland, etc. * Open Group, Evans & Sutherland, etc.
@ -4351,8 +4352,8 @@ meta_window_configure_request (MetaWindow *window,
{ {
meta_topic (META_DEBUG_STACK, meta_topic (META_DEBUG_STACK,
"Ignoring xconfigure stacking request from %s (with " "Ignoring xconfigure stacking request from %s (with "
"user_time %lu); currently active application is %s (with " "user_time %u); currently active application is %s (with "
"user_time %lu).\n", "user_time %u).\n",
window->desc, window->desc,
window->net_wm_user_time, window->net_wm_user_time,
active_window->desc, active_window->desc,
@ -4411,7 +4412,7 @@ meta_window_client_message (MetaWindow *window,
if (event->xclient.message_type == if (event->xclient.message_type ==
display->atom_net_close_window) display->atom_net_close_window)
{ {
Time timestamp; guint32 timestamp;
if (event->xclient.data.l[0] != 0) if (event->xclient.data.l[0] != 0)
timestamp = event->xclient.data.l[0]; timestamp = event->xclient.data.l[0];
@ -6044,7 +6045,7 @@ static void
menu_callback (MetaWindowMenu *menu, menu_callback (MetaWindowMenu *menu,
Display *xdisplay, Display *xdisplay,
Window client_xwindow, Window client_xwindow,
Time timestamp, guint32 timestamp,
MetaMenuOp op, MetaMenuOp op,
int workspace_index, int workspace_index,
gpointer data) gpointer data)
@ -6187,7 +6188,7 @@ meta_window_show_menu (MetaWindow *window,
int root_x, int root_x,
int root_y, int root_y,
int button, int button,
Time timestamp) guint32 timestamp)
{ {
MetaMenuOp ops; MetaMenuOp ops;
MetaMenuOp insensitive; MetaMenuOp insensitive;
@ -6919,8 +6920,8 @@ update_resize (MetaWindow *window,
typedef struct typedef struct
{ {
const XEvent *current_event; const XEvent *current_event;
int count; int count;
Time last_time; guint32 last_time;
} EventScannerData; } EventScannerData;
static Bool static Bool
@ -6956,9 +6957,9 @@ check_use_this_motion_notify (MetaWindow *window,
event->xmotion.time) event->xmotion.time)
{ {
meta_topic (META_DEBUG_RESIZING, meta_topic (META_DEBUG_RESIZING,
"Arrived at event with time %lu (waiting for %lu), using it\n", "Arrived at event with time %u (waiting for %u), using it\n",
(unsigned long) event->xmotion.time, (unsigned int)event->xmotion.time,
(unsigned long) window->display->grab_motion_notify_time); window->display->grab_motion_notify_time);
window->display->grab_motion_notify_time = 0; window->display->grab_motion_notify_time = 0;
return TRUE; return TRUE;
} }
@ -6978,8 +6979,8 @@ check_use_this_motion_notify (MetaWindow *window,
if (esd.count > 0) if (esd.count > 0)
meta_topic (META_DEBUG_RESIZING, meta_topic (META_DEBUG_RESIZING,
"Will skip %d motion events and use the event with time %lu\n", "Will skip %d motion events and use the event with time %u\n",
esd.count, (unsigned long) esd.last_time); esd.count, (unsigned int) esd.last_time);
if (esd.last_time == 0) if (esd.last_time == 0)
return TRUE; return TRUE;
@ -7548,7 +7549,7 @@ warp_grab_pointer (MetaWindow *window,
void void
meta_window_begin_grab_op (MetaWindow *window, meta_window_begin_grab_op (MetaWindow *window,
MetaGrabOp op, MetaGrabOp op,
Time timestamp) guint32 timestamp)
{ {
int x, y; int x, y;
gulong grab_start_serial; gulong grab_start_serial;
@ -7689,7 +7690,7 @@ meta_window_stack_just_below (MetaWindow *window,
void void
meta_window_set_user_time (MetaWindow *window, meta_window_set_user_time (MetaWindow *window,
Time timestamp) guint32 timestamp)
{ {
/* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow /* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow
* us to sanity check the timestamp here and ensure it doesn't correspond to * us to sanity check the timestamp here and ensure it doesn't correspond to
@ -7701,15 +7702,14 @@ meta_window_set_user_time (MetaWindow *window,
XSERVER_TIME_IS_BEFORE (timestamp, window->net_wm_user_time)) XSERVER_TIME_IS_BEFORE (timestamp, window->net_wm_user_time))
{ {
meta_topic (META_DEBUG_STARTUP, meta_topic (META_DEBUG_STARTUP,
"Window %s _NET_WM_USER_TIME not updated to %lu, because it " "Window %s _NET_WM_USER_TIME not updated to %u, because it "
"is less than %lu\n", "is less than %u\n",
window->desc, timestamp, window->net_wm_user_time); window->desc, timestamp, window->net_wm_user_time);
} }
else else
{ {
meta_topic (META_DEBUG_STARTUP, meta_topic (META_DEBUG_STARTUP,
"Window %s has _NET_WM_USER_TIME of %lu\n", "Window %s has _NET_WM_USER_TIME of %u\n",
window->desc, timestamp); window->desc, timestamp);
window->net_wm_user_time_set = TRUE; window->net_wm_user_time_set = TRUE;
window->net_wm_user_time = timestamp; window->net_wm_user_time = timestamp;

16
src/window.h
View File

@ -118,7 +118,7 @@ struct _MetaWindow
int initial_workspace; int initial_workspace;
/* Initial timestamp property */ /* Initial timestamp property */
Time initial_timestamp; guint32 initial_timestamp;
/* Whether we're maximized */ /* Whether we're maximized */
guint maximized_horizontally : 1; guint maximized_horizontally : 1;
@ -312,7 +312,7 @@ struct _MetaWindow
/* set to the most recent user-interaction event timestamp that we /* set to the most recent user-interaction event timestamp that we
know about for this window */ know about for this window */
Time net_wm_user_time; guint32 net_wm_user_time;
/* The size we set the window to last (i.e. what we believe /* The size we set the window to last (i.e. what we believe
* to be its actual size on the server). The x, y are * to be its actual size on the server). The x, y are
@ -486,10 +486,10 @@ void meta_window_update_wireframe (MetaWindow *window,
void meta_window_end_wireframe (MetaWindow *window); void meta_window_end_wireframe (MetaWindow *window);
void meta_window_delete (MetaWindow *window, void meta_window_delete (MetaWindow *window,
Time timestamp); guint32 timestamp);
void meta_window_kill (MetaWindow *window); void meta_window_kill (MetaWindow *window);
void meta_window_focus (MetaWindow *window, void meta_window_focus (MetaWindow *window,
Time timestamp); guint32 timestamp);
void meta_window_raise (MetaWindow *window); void meta_window_raise (MetaWindow *window);
void meta_window_lower (MetaWindow *window); void meta_window_lower (MetaWindow *window);
@ -498,7 +498,7 @@ void meta_window_update_unfocused_button_grabs (MetaWindow *window);
/* Sends a client message */ /* Sends a client message */
void meta_window_send_icccm_message (MetaWindow *window, void meta_window_send_icccm_message (MetaWindow *window,
Atom atom, Atom atom,
Time timestamp); guint32 timestamp);
gboolean meta_window_configure_request (MetaWindow *window, gboolean meta_window_configure_request (MetaWindow *window,
@ -518,7 +518,7 @@ void meta_window_show_menu (MetaWindow *window,
int root_x, int root_x,
int root_y, int root_y,
int button, int button,
Time timestamp); guint32 timestamp);
gboolean meta_window_titlebar_is_onscreen (MetaWindow *window); gboolean meta_window_titlebar_is_onscreen (MetaWindow *window);
void meta_window_shove_titlebar_onscreen (MetaWindow *window); void meta_window_shove_titlebar_onscreen (MetaWindow *window);
@ -572,7 +572,7 @@ MetaWindow* meta_window_find_root_ancestor (MetaWindow *window);
void meta_window_begin_grab_op (MetaWindow *window, void meta_window_begin_grab_op (MetaWindow *window,
MetaGrabOp op, MetaGrabOp op,
Time timestamp); guint32 timestamp);
void meta_window_update_keyboard_resize (MetaWindow *window, void meta_window_update_keyboard_resize (MetaWindow *window,
gboolean update_cursor); gboolean update_cursor);
@ -594,7 +594,7 @@ void meta_window_stack_just_below (MetaWindow *window,
MetaWindow *below_this_one); MetaWindow *below_this_one);
void meta_window_set_user_time (MetaWindow *window, void meta_window_set_user_time (MetaWindow *window,
Time timestamp); guint32 timestamp);
void meta_window_set_demands_attention (MetaWindow *window); void meta_window_set_demands_attention (MetaWindow *window);

10
src/workspace.c
View File

@ -32,7 +32,7 @@ void meta_workspace_queue_calc_showing (MetaWorkspace *workspace);
static void set_active_space_hint (MetaScreen *screen); static void set_active_space_hint (MetaScreen *screen);
static void focus_ancestor_or_mru_window (MetaWorkspace *workspace, static void focus_ancestor_or_mru_window (MetaWorkspace *workspace,
MetaWindow *not_this_one, MetaWindow *not_this_one,
Time timestamp); guint32 timestamp);
static void static void
maybe_add_to_list (MetaScreen *screen, MetaWindow *window, gpointer data) maybe_add_to_list (MetaScreen *screen, MetaWindow *window, gpointer data)
@ -274,7 +274,7 @@ meta_workspace_queue_calc_showing (MetaWorkspace *workspace)
void void
meta_workspace_activate_with_focus (MetaWorkspace *workspace, meta_workspace_activate_with_focus (MetaWorkspace *workspace,
MetaWindow *focus_this, MetaWindow *focus_this,
Time timestamp) guint32 timestamp)
{ {
MetaWorkspace *old; MetaWorkspace *old;
MetaWindow *move_window; MetaWindow *move_window;
@ -350,7 +350,7 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
void void
meta_workspace_activate (MetaWorkspace *workspace, meta_workspace_activate (MetaWorkspace *workspace,
Time timestamp) guint32 timestamp)
{ {
meta_workspace_activate_with_focus (workspace, NULL, timestamp); meta_workspace_activate_with_focus (workspace, NULL, timestamp);
} }
@ -872,7 +872,7 @@ meta_workspace_get_name (MetaWorkspace *workspace)
void void
meta_workspace_focus_default_window (MetaWorkspace *workspace, meta_workspace_focus_default_window (MetaWorkspace *workspace,
MetaWindow *not_this_one, MetaWindow *not_this_one,
Time timestamp) guint32 timestamp)
{ {
if (timestamp == CurrentTime) if (timestamp == CurrentTime)
{ {
@ -949,7 +949,7 @@ record_ancestor (MetaWindow *window,
static void static void
focus_ancestor_or_mru_window (MetaWorkspace *workspace, focus_ancestor_or_mru_window (MetaWorkspace *workspace,
MetaWindow *not_this_one, MetaWindow *not_this_one,
Time timestamp) guint32 timestamp)
{ {
MetaWindow *window = NULL; MetaWindow *window = NULL;
MetaWindow *desktop_window = NULL; MetaWindow *desktop_window = NULL;

6
src/workspace.h
View File

@ -67,9 +67,9 @@ void meta_workspace_relocate_windows (MetaWorkspace *workspace,
MetaWorkspace *new_home); MetaWorkspace *new_home);
void meta_workspace_activate_with_focus (MetaWorkspace *workspace, void meta_workspace_activate_with_focus (MetaWorkspace *workspace,
MetaWindow *focus_this, MetaWindow *focus_this,
Time timestamp); guint32 timestamp);
void meta_workspace_activate (MetaWorkspace *workspace, void meta_workspace_activate (MetaWorkspace *workspace,
Time timestamp); guint32 timestamp);
int meta_workspace_index (MetaWorkspace *workspace); int meta_workspace_index (MetaWorkspace *workspace);
GList* meta_workspace_list_windows (MetaWorkspace *workspace); GList* meta_workspace_list_windows (MetaWorkspace *workspace);
@ -89,7 +89,7 @@ void meta_workspace_get_work_area_all_xineramas (MetaWorkspace *workspace,
void meta_workspace_focus_default_window (MetaWorkspace *workspace, void meta_workspace_focus_default_window (MetaWorkspace *workspace,
MetaWindow *not_this_one, MetaWindow *not_this_one,
Time timestamp); guint32 timestamp);
MetaWorkspace* meta_workspace_get_neighbor (MetaWorkspace *workspace, MetaWorkspace* meta_workspace_get_neighbor (MetaWorkspace *workspace,
MetaMotionDirection direction); MetaMotionDirection direction);