+2004-05-05 Elijah Newren <newren@math.utah.edu>
+
+ Changes to support do-not-focus-on-map hint in conjunction with
+ _NET_WM_USER_TIME (#115650):
+
+ * gdk/gdkwindow.h (struct _GdkWindowObject): Add a new boolean
+ field focus_on_map
+
+ * gdk/gdkwindow.h (gdk_window_set_accept_focus): New function to
+ set it.
+
+ * gtk/gtkwindow.[hc]: Add a boolean property "focus_on_map"
+ and gtk_window_get_focus_on_map() and gtk_window_set_focus_on_map().
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_new):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new):
+ Initialize the focus_on_map field to TRUE.
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_set_focus_on_map):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (setup_toplevel_window):
+ Implementations for the various backends. The Win32 and linux-fb
+ implementations set the focus_on_map field, but don't use it yet
+ to actually implement noinput windows. The X implementation sets
+ _NET_WM_USER_TIME to 0 if focus_on_map is FALSE (see the EWMH).
+
+ * gdk/x11/gdkwindow-x11.h:
+ * gdk/x11/gdkevents-x11.c (set_user_time):
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time):
+ s/_gdk_x11_window_set_user_time/gdk_x11_window_set_user_time/,
+ since we want that function to be part of the public API.
+
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
+2004-05-05 Elijah Newren <newren@math.utah.edu>
+
+ Changes to support do-not-focus-on-map hint in conjunction with
+ _NET_WM_USER_TIME (#115650):
+
+ * gdk/gdkwindow.h (struct _GdkWindowObject): Add a new boolean
+ field focus_on_map
+
+ * gdk/gdkwindow.h (gdk_window_set_accept_focus): New function to
+ set it.
+
+ * gtk/gtkwindow.[hc]: Add a boolean property "focus_on_map"
+ and gtk_window_get_focus_on_map() and gtk_window_set_focus_on_map().
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_new):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new):
+ Initialize the focus_on_map field to TRUE.
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_set_focus_on_map):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (setup_toplevel_window):
+ Implementations for the various backends. The Win32 and linux-fb
+ implementations set the focus_on_map field, but don't use it yet
+ to actually implement noinput windows. The X implementation sets
+ _NET_WM_USER_TIME to 0 if focus_on_map is FALSE (see the EWMH).
+
+ * gdk/x11/gdkwindow-x11.h:
+ * gdk/x11/gdkevents-x11.c (set_user_time):
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time):
+ s/_gdk_x11_window_set_user_time/gdk_x11_window_set_user_time/,
+ since we want that function to be part of the public API.
+
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
+2004-05-05 Elijah Newren <newren@math.utah.edu>
+
+ Changes to support do-not-focus-on-map hint in conjunction with
+ _NET_WM_USER_TIME (#115650):
+
+ * gdk/gdkwindow.h (struct _GdkWindowObject): Add a new boolean
+ field focus_on_map
+
+ * gdk/gdkwindow.h (gdk_window_set_accept_focus): New function to
+ set it.
+
+ * gtk/gtkwindow.[hc]: Add a boolean property "focus_on_map"
+ and gtk_window_get_focus_on_map() and gtk_window_set_focus_on_map().
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_new):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new):
+ Initialize the focus_on_map field to TRUE.
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_set_focus_on_map):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (setup_toplevel_window):
+ Implementations for the various backends. The Win32 and linux-fb
+ implementations set the focus_on_map field, but don't use it yet
+ to actually implement noinput windows. The X implementation sets
+ _NET_WM_USER_TIME to 0 if focus_on_map is FALSE (see the EWMH).
+
+ * gdk/x11/gdkwindow-x11.h:
+ * gdk/x11/gdkevents-x11.c (set_user_time):
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time):
+ s/_gdk_x11_window_set_user_time/gdk_x11_window_set_user_time/,
+ since we want that function to be part of the public API.
+
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
+2004-05-05 Elijah Newren <newren@math.utah.edu>
+
+ Changes to support do-not-focus-on-map hint in conjunction with
+ _NET_WM_USER_TIME (#115650):
+
+ * gdk/gdkwindow.h (struct _GdkWindowObject): Add a new boolean
+ field focus_on_map
+
+ * gdk/gdkwindow.h (gdk_window_set_accept_focus): New function to
+ set it.
+
+ * gtk/gtkwindow.[hc]: Add a boolean property "focus_on_map"
+ and gtk_window_get_focus_on_map() and gtk_window_set_focus_on_map().
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_new):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_new):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new):
+ Initialize the focus_on_map field to TRUE.
+
+ * gdk/win32/gdkwindow-win32.c (gdk_window_set_focus_on_map):
+ * gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (gdk_window_set_focus_on_map):
+ * gdk/x11/gdkwindow-x11.c (setup_toplevel_window):
+ Implementations for the various backends. The Win32 and linux-fb
+ implementations set the focus_on_map field, but don't use it yet
+ to actually implement noinput windows. The X implementation sets
+ _NET_WM_USER_TIME to 0 if focus_on_map is FALSE (see the EWMH).
+
+ * gdk/x11/gdkwindow-x11.h:
+ * gdk/x11/gdkevents-x11.c (set_user_time):
+ * gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event):
+ * gdk/x11/gdkwindow-x11.c (gdk_x11_window_set_user_time):
+ s/_gdk_x11_window_set_user_time/gdk_x11_window_set_user_time/,
+ since we want that function to be part of the public API.
+
Wed May 5 22:20:21 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
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
@accept_focus:
+<!-- ##### FUNCTION gdk_window_set_focus_on_map ##### -->
+<para>
+
+</para>
+
+@window:
+@focus_on_map:
+
+
<!-- ##### FUNCTION gdk_window_add_filter ##### -->
<para>
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
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
@setting:
+<!-- ##### FUNCTION gtk_window_set_focus_on_map ##### -->
+<para>
+
+</para>
+
+@window:
+@setting:
+
+
<!-- ##### FUNCTION gtk_window_get_decorated ##### -->
<para>
guint destroyed : 2;
guint accept_focus : 1;
+ guint focus_on_map : 1;
GdkEventMask event_mask;
};
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);
private->parent = parent_private;
private->accept_focus = TRUE;
+ private->focus_on_map = TRUE;
if (attributes_mask & GDK_WA_X)
x = attributes->x;
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
gdk_window_set_icon (GdkWindow *window,
GdkWindow *icon_window,
private->parent = (GdkWindowObject *)parent;
private->accept_focus = TRUE;
+ private->focus_on_map = TRUE;
if (attributes_mask & GDK_WA_X)
private->x = attributes->x;
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
pixbuf_to_hicon_alpha_winxp (GdkWindow *window,
GdkPixbuf *pixbuf)
* 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
* 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;
}
* 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;
}
* 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;
}
* 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;
}
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);
}
/**
private->parent = (GdkWindowObject *)parent;
private->accept_focus = TRUE;
+ private->focus_on_map = TRUE;
xattributes_mask = 0;
}
/**
- * _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
*
* 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;
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
PROP_SKIP_TASKBAR_HINT,
PROP_SKIP_PAGER_HINT,
PROP_ACCEPT_FOCUS,
+ PROP_FOCUS_ON_MAP,
PROP_DECORATED,
PROP_GRAVITY,
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);
TRUE,
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:
*
window->screen = gdk_screen_get_default ();
priv->accept_focus = TRUE;
+ priv->focus_on_map = TRUE;
colormap = _gtk_widget_peek_colormap ();
if (colormap)
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;
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;
return priv->accept_focus;
}
+/**
+ * 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
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);
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);
projects / ~andy / gtk / commitdiff