diff --git a/ChangeLog b/ChangeLog index efbe7bd2d7..a4acc7ec3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-19 Matthias Clasen + + * gdk/gdk.symbols: + * gdk/x11/gdkx.h: + * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): + Add a function to obtain the last user interaction + time. (#163119, Elijah Newren) + Tue Jan 18 13:56:09 2005 Manish Singh * gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index efbe7bd2d7..a4acc7ec3a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-01-19 Matthias Clasen + + * gdk/gdk.symbols: + * gdk/x11/gdkx.h: + * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): + Add a function to obtain the last user interaction + time. (#163119, Elijah Newren) + Tue Jan 18 13:56:09 2005 Manish Singh * gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index efbe7bd2d7..a4acc7ec3a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2005-01-19 Matthias Clasen + + * gdk/gdk.symbols: + * gdk/x11/gdkx.h: + * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_get_user_time): + Add a function to obtain the last user interaction + time. (#163119, Elijah Newren) + Tue Jan 18 13:56:09 2005 Manish Singh * gtk/gtkfilechooserdefault.c (pending_op_queue): Actually assign diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index a0924b68ad..7043eb1274 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +2005-01-19 Matthias Clasen + + * gdk/gdk-sections.txt: Add gdk_x11_display_get_user_time. + 2005-01-18 Matthias Clasen * gtk/gtk-docs.sgml: Add an index for 2.8 symbols. diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index 0ed10e2147..cbba5c3b23 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -1240,6 +1240,7 @@ gdk_x11_screen_supports_net_wm_hint gdk_x11_screen_get_window_manager_name gdk_x11_screen_lookup_visual gdk_x11_window_set_user_time +gdk_x11_display_get_user_time gdk_x11_colormap_foreign_new gdk_x11_colormap_get_xcolormap gdk_x11_colormap_get_xdisplay diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index c3e7a04079..e4f5cf3de8 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -605,6 +605,7 @@ gdk_x11_colormap_get_xcolormap gdk_x11_colormap_get_xdisplay gdk_x11_cursor_get_xcursor gdk_x11_cursor_get_xdisplay +gdk_x11_display_get_user_time gdk_x11_display_get_xdisplay gdk_x11_display_grab gdk_x11_display_ungrab diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 4f29331ec0..ba0883ce27 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1162,3 +1162,22 @@ gdk_display_store_clipboard (GdkDisplay *display, gdk_error_trap_pop (); } + +/** + * gdk_x11_display_get_user_time: + * @display: a #GdkDisplay + * + * Returns the timestamp of the last user interaction on + * @display. The timestamp is taken from events caused + * by user interaction such as key presses or pointer + * movements. See gdk_x11_window_set_user_time(). + * + * Returns: the timestamp of the last user interaction + * + * Since: 2.8 + */ +guint32 +gdk_x11_display_get_user_time (GdkDisplay *display) +{ + return GDK_DISPLAY_X11 (display)->user_time; +} diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 51646f4f96..2e933b7069 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -139,6 +139,7 @@ GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual, gpointer gdk_xid_table_lookup_for_display (GdkDisplay *display, XID xid); guint32 gdk_x11_get_server_time (GdkWindow *window); +guint32 gdk_x11_display_get_user_time (GdkDisplay *display); /* returns TRUE if we support the given WM spec feature */ gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,