? api-of-115650.patch
? new-api-of-115650.patch
Index: docs/reference/gdk/gdk-sections.txt
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gdk/gdk-sections.txt,v
retrieving revision 1.41
diff -u -r1.41 gdk-sections.txt
--- docs/reference/gdk/gdk-sections.txt	16 Dec 2003 00:56:45 -0000	1.41
+++ docs/reference/gdk/gdk-sections.txt	29 Apr 2004 20:37:05 -0000
@@ -665,6 +665,7 @@
 gdk_window_set_user_data
 gdk_window_set_override_redirect
 gdk_window_set_accept_focus
+gdk_window_set_focus_on_map
 gdk_window_add_filter
 gdk_window_remove_filter
 GdkFilterFunc
Index: docs/reference/gdk/tmpl/windows.sgml
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gdk/tmpl/windows.sgml,v
retrieving revision 1.43
diff -u -r1.43 windows.sgml
--- docs/reference/gdk/tmpl/windows.sgml	21 Feb 2004 17:05:09 -0000	1.43
+++ docs/reference/gdk/tmpl/windows.sgml	29 Apr 2004 20:37:05 -0000
@@ -750,6 +750,15 @@
 @accept_focus: 
 
 
+<!-- ##### FUNCTION gdk_window_set_focus_on_map ##### -->
+<para>
+
+</para>
+
+@window: 
+@focus_on_map: 
+
+
 <!-- ##### FUNCTION gdk_window_add_filter ##### -->
 <para>
 
Index: docs/reference/gtk/gtk-sections.txt
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gtk/gtk-sections.txt,v
retrieving revision 1.128
diff -u -r1.128 gtk-sections.txt
--- docs/reference/gtk/gtk-sections.txt	21 Apr 2004 14:13:34 -0000	1.128
+++ docs/reference/gtk/gtk-sections.txt	29 Apr 2004 20:37:05 -0000
@@ -4419,6 +4419,7 @@
 gtk_window_set_skip_taskbar_hint
 gtk_window_set_skip_pager_hint
 gtk_window_set_accept_focus
+gtk_window_set_focus_on_map
 gtk_window_get_decorated
 gtk_window_get_default_icon_list
 gtk_window_get_default_size
@@ -4438,6 +4439,7 @@
 gtk_window_get_skip_taskbar_hint
 gtk_window_get_skip_pager_hint
 gtk_window_get_accept_focus
+gtk_window_get_focus_on_map
 gtk_window_move
 gtk_window_parse_geometry
 gtk_window_reshow_with_initial_size
Index: docs/reference/gtk/tmpl/gtkwindow.sgml
===================================================================
RCS file: /cvs/gnome/gtk+/docs/reference/gtk/tmpl/gtkwindow.sgml,v
retrieving revision 1.56
diff -u -r1.56 gtkwindow.sgml
--- docs/reference/gtk/tmpl/gtkwindow.sgml	2 Mar 2004 22:54:07 -0000	1.56
+++ docs/reference/gtk/tmpl/gtkwindow.sgml	29 Apr 2004 20:37:05 -0000
@@ -736,6 +736,15 @@
 @setting: 
 
 
+<!-- ##### FUNCTION gtk_window_set_focus_on_map ##### -->
+<para>
+
+</para>
+
+@window: 
+@setting: 
+
+
 <!-- ##### FUNCTION gtk_window_get_decorated ##### -->
 <para>
 
Index: gdk/gdkwindow.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.h,v
retrieving revision 1.49
diff -u -r1.49 gdkwindow.h
--- gdk/gdkwindow.h	26 Jan 2004 20:20:42 -0000	1.49
+++ gdk/gdkwindow.h	29 Apr 2004 20:37:05 -0000
@@ -262,6 +262,7 @@
   guint destroyed : 2;
 
   guint accept_focus : 1;
+  guint focus_on_map : 1;
   
   GdkEventMask event_mask;
 };
@@ -321,6 +322,8 @@
                                                 gboolean       override_redirect);
 void          gdk_window_set_accept_focus      (GdkWindow     *window,
 					        gboolean       accept_focus);
+void          gdk_window_set_focus_on_map      (GdkWindow     *window,
+					        gboolean       focus_on_map);
 void          gdk_window_add_filter            (GdkWindow     *window,
                                                 GdkFilterFunc  function,
                                                 gpointer       data);
Index: gdk/linux-fb/gdkwindow-fb.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/linux-fb/gdkwindow-fb.c,v
retrieving revision 1.57
diff -u -r1.57 gdkwindow-fb.c
--- gdk/linux-fb/gdkwindow-fb.c	6 Mar 2004 04:00:07 -0000	1.57
+++ gdk/linux-fb/gdkwindow-fb.c	29 Apr 2004 20:37:05 -0000
@@ -189,6 +189,7 @@
   private->parent = parent_private;
 
   private->accept_focus = TRUE;
+  private->focus_on_map = TRUE;
 
   if (attributes_mask & GDK_WA_X)
     x = attributes->x;
@@ -2006,6 +2007,22 @@
 
   if (private->accept_focus != accept_focus)
     private->accept_focus = accept_focus;
+}
+
+void
+gdk_window_set_focus_on_map (GdkWindow *window,
+			     gboolean focus_on_map)
+{
+  GdkWindowObject *private;
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  private = (GdkWindowObject *)window;  
+  
+  focus_on_map = focus_on_map != FALSE;
+
+  if (private->focus_on_map != focus_on_map)
+    private->focus_on_map = focus_on_map;
 }
 
 void          
Index: gdk/win32/gdkwindow-win32.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/win32/gdkwindow-win32.c,v
retrieving revision 1.115
diff -u -r1.115 gdkwindow-win32.c
--- gdk/win32/gdkwindow-win32.c	13 Mar 2004 18:27:55 -0000	1.115
+++ gdk/win32/gdkwindow-win32.c	29 Apr 2004 20:37:06 -0000
@@ -508,6 +508,7 @@
   private->parent = (GdkWindowObject *)parent;
 
   private->accept_focus = TRUE;
+  private->focus_on_map = TRUE;
 
   if (attributes_mask & GDK_WA_X)
     private->x = attributes->x;
@@ -2221,6 +2222,22 @@
 
   if (private->accept_focus != accept_focus)
     private->accept_focus = accept_focus;
+}
+
+void
+gdk_window_set_focus_on_map (GdkWindow *window,
+			     gboolean focus_on_map)
+{
+  GdkWindowObject *private;
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  private = (GdkWindowObject *)window;  
+  
+  focus_on_map = focus_on_map != FALSE;
+
+  if (private->focus_on_map != focus_on_map)
+    private->focus_on_map = focus_on_map;
 }
 
 static HICON
Index: gdk/x11/gdkevents-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkevents-x11.c,v
retrieving revision 1.130
diff -u -r1.130 gdkevents-x11.c
--- gdk/x11/gdkevents-x11.c	23 Apr 2004 13:03:56 -0000	1.130
+++ gdk/x11/gdkevents-x11.c	29 Apr 2004 20:37:06 -0000
@@ -815,8 +815,8 @@
    * to update the latest user interaction time.
    */
   if (gdk_event_get_time (event) != GDK_CURRENT_TIME)
-    _gdk_x11_window_set_user_time (gdk_window_get_toplevel (window),
-				   gdk_event_get_time (event));
+    gdk_x11_window_set_user_time (gdk_window_get_toplevel (window),
+                                  gdk_event_get_time (event));
 }
 
 static gboolean
Index: gdk/x11/gdkinput-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkinput-x11.c,v
retrieving revision 1.36
diff -u -r1.36 gdkinput-x11.c
--- gdk/x11/gdkinput-x11.c	23 Apr 2004 13:03:56 -0000	1.36
+++ gdk/x11/gdkinput-x11.c	29 Apr 2004 20:37:06 -0000
@@ -588,8 +588,8 @@
        * a valid timestamp.
        */
       if (gdk_event_get_time (event) != GDK_CURRENT_TIME)
-        _gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
-				       gdk_event_get_time (event));
+        gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
+                                      gdk_event_get_time (event));
       return TRUE;
   }
 
@@ -654,8 +654,8 @@
        * a valid timestamp.
        */
       if (gdk_event_get_time (event) != GDK_CURRENT_TIME)
-        _gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
-				       gdk_event_get_time (event));
+        gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
+                                      gdk_event_get_time (event));
       return TRUE;
     }
 
@@ -690,8 +690,8 @@
        * a valid timestamp.
        */
       if (gdk_event_get_time (event) != GDK_CURRENT_TIME)
-        _gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
-				       gdk_event_get_time (event));
+        gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
+                                      gdk_event_get_time (event));
       return TRUE;
     }
 
@@ -710,8 +710,8 @@
        * a valid timestamp.
        */
       if (gdk_event_get_time (event) != GDK_CURRENT_TIME)
-        _gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
-				       gdk_event_get_time (event));
+        gdk_x11_window_set_user_time (gdk_window_get_toplevel (input_window->window),
+                                      gdk_event_get_time (event));
       return TRUE;
   }
 
Index: gdk/x11/gdkwindow-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.c,v
retrieving revision 1.205
diff -u -r1.205 gdkwindow-x11.c
--- gdk/x11/gdkwindow-x11.c	18 Apr 2004 14:33:07 -0000	1.205
+++ gdk/x11/gdkwindow-x11.c	29 Apr 2004 20:37:06 -0000
@@ -458,8 +458,10 @@
 		   XA_WINDOW, 32, PropModeReplace,
 		   (guchar *) &GDK_DISPLAY_X11 (screen_x11->display)->leader_window, 1);
 
-  if (GDK_DISPLAY_X11 (screen_x11->display)->user_time != 0)
-    _gdk_x11_window_set_user_time (window, GDK_DISPLAY_X11 (screen_x11->display)->user_time);
+  if (!obj->focus_on_map)
+    gdk_x11_window_set_user_time(window, 0);
+  else if (GDK_DISPLAY_X11 (screen_x11->display)->user_time != 0)
+    gdk_x11_window_set_user_time(window, GDK_DISPLAY_X11 (screen_x11->display)->user_time);
 }
 
 /**
@@ -543,6 +545,7 @@
   private->parent = (GdkWindowObject *)parent;
 
   private->accept_focus = TRUE;
+  private->focus_on_map = TRUE;
 
   xattributes_mask = 0;
   
@@ -3312,7 +3315,44 @@
 }
 
 /**
- * _gdk_x11_window_set_user_time:
+ * gdk_window_set_focus_on_map:
+ * @window: a toplevel #GdkWindow
+ * @focus_on_map: %TRUE if the window should receive input focus when mapped
+ *
+ * Setting @focus_on_map to %FALSE hints the desktop environment that the
+ * window doesn't want to receive input focus when it is mapped.  
+ * focus_on_map should be turned off for windows that aren't triggered
+ * interactively (such as popups from network activity).
+ *
+ * On X, it is the responsibility of the window manager to interpret
+ * this hint. Window managers following the freedesktop.org window
+ * manager extension specification should respect it.
+ *
+ * Since: 2.6 
+ **/
+void
+gdk_window_set_focus_on_map (GdkWindow *window,
+			     gboolean focus_on_map)
+{
+  GdkWindowObject *private;
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  private = (GdkWindowObject *)window;  
+  
+  focus_on_map = focus_on_map != FALSE;
+
+  if (private->focus_on_map != focus_on_map)
+    {
+      private->focus_on_map = focus_on_map;
+
+      if ((!GDK_WINDOW_DESTROYED (window)) && (!private->focus_on_map))
+	gdk_x11_window_set_user_time (window, 0);
+    }
+}
+
+/**
+ * gdk_x11_window_set_user_time:
  * @window: A toplevel #GdkWindow
  * @timestamp: An XServer timestamp to which the property should be set
  *
@@ -3328,10 +3368,12 @@
  * Note that this property is automatically updated by GDK, so this
  * function should only be used by applications which handle input
  * events bypassing GDK.
+ *
+ * Since: 2.6
  **/
 void
-_gdk_x11_window_set_user_time (GdkWindow *window,
-			       guint32    timestamp)
+gdk_x11_window_set_user_time (GdkWindow *window,
+                              guint32    timestamp)
 {
   GdkDisplay *display;
   GdkDisplayX11 *display_x11;
Index: gdk/x11/gdkwindow-x11.h
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.h,v
retrieving revision 1.11
diff -u -r1.11 gdkwindow-x11.h
--- gdk/x11/gdkwindow-x11.h	18 Apr 2004 14:33:07 -0000	1.11
+++ gdk/x11/gdkwindow-x11.h	29 Apr 2004 20:37:06 -0000
@@ -124,7 +124,7 @@
 GType gdk_window_impl_x11_get_type (void);
 
 GdkToplevelX11 *_gdk_x11_window_get_toplevel  (GdkWindow *window);
-void            _gdk_x11_window_set_user_time (GdkWindow *window,
+void             gdk_x11_window_set_user_time (GdkWindow *window,
                                                guint32    timestamp);
 
 G_END_DECLS
Index: gtk/gtkwindow.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.c,v
retrieving revision 1.264
diff -u -r1.264 gtkwindow.c
--- gtk/gtkwindow.c	13 Mar 2004 20:45:15 -0000	1.264
+++ gtk/gtkwindow.c	29 Apr 2004 20:37:06 -0000
@@ -75,6 +75,7 @@
   PROP_SKIP_TASKBAR_HINT,
   PROP_SKIP_PAGER_HINT,
   PROP_ACCEPT_FOCUS,
+  PROP_FOCUS_ON_MAP,
   PROP_DECORATED,
   PROP_GRAVITY,
   
@@ -162,6 +163,7 @@
   guint skips_taskbar : 1;
   guint skips_pager : 1;
   guint accept_focus : 1;
+  guint focus_on_map : 1;
 };
 
 static void gtk_window_class_init         (GtkWindowClass    *klass);
@@ -602,6 +604,21 @@
                                                          G_PARAM_READWRITE));  
 
   /**
+   * GtkWindow:focus-on-map-hint:
+   *
+   * Whether the window should receive the input focus when mapped.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_FOCUS_ON_MAP,
+				   g_param_spec_boolean ("focus_on_map",
+                                                         P_("Focus on map"),
+                                                         P_("TRUE if the window should receive the input focus when mapped."),
+                                                         TRUE,
+                                                         G_PARAM_READWRITE));  
+
+  /**
    * GtkWindow:decorated:
    *
    * Whether the window should be decorated by the window manager.
@@ -764,6 +781,7 @@
   window->screen = gdk_screen_get_default ();
 
   priv->accept_focus = TRUE;
+  priv->focus_on_map = TRUE;
 
   colormap = _gtk_widget_peek_colormap ();
   if (colormap)
@@ -859,6 +877,10 @@
       gtk_window_set_accept_focus (window,
 				   g_value_get_boolean (value));
       break;
+    case PROP_FOCUS_ON_MAP:
+      gtk_window_set_focus_on_map (window,
+				   g_value_get_boolean (value));
+      break;
     case PROP_DECORATED:
       gtk_window_set_decorated (window, g_value_get_boolean (value));
       break;
@@ -952,6 +974,10 @@
       g_value_set_boolean (value,
                            gtk_window_get_accept_focus (window));
       break;
+    case PROP_FOCUS_ON_MAP:
+      g_value_set_boolean (value,
+                           gtk_window_get_focus_on_map (window));
+      break;
     case PROP_DECORATED:
       g_value_set_boolean (value, gtk_window_get_decorated (window));
       break;
@@ -2148,6 +2174,62 @@
 }
 
 /**
+ * gtk_window_set_focus_on_map:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to let this window receive input focus on map
+ * 
+ * Windows may set a hint asking the desktop environment not to receive
+ * the input focus when the window is mapped.  This function sets this
+ * hint.
+ * 
+ * Since: 2.6
+ **/
+void
+gtk_window_set_focus_on_map (GtkWindow *window,
+			     gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->focus_on_map != setting)
+    {
+      priv->focus_on_map = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_focus_on_map (GTK_WIDGET (window)->window,
+				     priv->focus_on_map);
+      g_object_notify (G_OBJECT (window), "focus_on_map");
+    }
+}
+
+/**
+ * gtk_window_get_focus_on_map:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_focus_on_map().
+ * 
+ * Return value: %TRUE if window should receive the input focus when
+ * mapped.
+ * 
+ * Since: 2.6
+ **/
+gboolean
+gtk_window_get_focus_on_map (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->focus_on_map;
+}
+
+/**
  * gtk_window_set_destroy_with_parent:
  * @window: a #GtkWindow
  * @setting: whether to destroy @window with its transient parent
@@ -3915,6 +3997,11 @@
     gdk_window_set_accept_focus (widget->window, TRUE);
   else
     gdk_window_set_accept_focus (widget->window, FALSE);
+
+  if (gtk_window_get_focus_on_map (window))
+    gdk_window_set_focus_on_map (widget->window, TRUE);
+  else
+    gdk_window_set_focus_on_map (widget->window, FALSE);
   
   if (window->modal)
     gdk_window_set_modal_hint (widget->window, TRUE);
Index: gtk/gtkwindow.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.h,v
retrieving revision 1.75
diff -u -r1.75 gtkwindow.h
--- gtk/gtkwindow.h	2 Mar 2004 00:04:36 -0000	1.75
+++ gtk/gtkwindow.h	29 Apr 2004 20:37:06 -0000
@@ -204,6 +204,9 @@
 void       gtk_window_set_accept_focus         (GtkWindow           *window,
                                                 gboolean             setting);
 gboolean   gtk_window_get_accept_focus         (GtkWindow           *window);
+void       gtk_window_set_focus_on_map         (GtkWindow           *window,
+                                                gboolean             setting);
+gboolean   gtk_window_get_focus_on_map         (GtkWindow           *window);
 void       gtk_window_set_destroy_with_parent  (GtkWindow           *window,
                                                 gboolean             setting);
 gboolean   gtk_window_get_destroy_with_parent  (GtkWindow           *window);
