Commit f04a7203 authored by Emmanuele Bassi's avatar Emmanuele Bassi

widget: Add send_focus_change()

Currently the only users of the GTK_HAS_FOCUS flag are setting it
before sending a focus change event. This is normally needed by
GtkWindow, but there are widgets that require controlling the focus
of widgets that are semantically their children even though they are
parented to another top-level. Case in point: the quick search entry
for GtkTreeView.

Over the years people have been hacking the focus change out of
gtkwindow.c and gtktreeview.c, thus leaking the direct access of the
GTK_HAS_FOCUS flag.

The simplest way to avoid that is to add a function that sends the
focus change event and controls the setting of the flag, thus removing
the need for external widgets to do the same.

https://bugzilla.gnome.org/show_bug.cgi?id=593671
parent 15482528
......@@ -5683,6 +5683,7 @@ gtk_widget_class_find_style_property
gtk_widget_class_list_style_properties
gtk_widget_region_intersect
gtk_widget_send_expose
gtk_widget_send_focus_change
gtk_widget_style_get
gtk_widget_style_get_property
gtk_widget_style_get_valist
......
......@@ -5196,6 +5196,7 @@ gtk_widget_reparent
gtk_widget_reset_rc_styles
gtk_widget_reset_shapes
gtk_widget_send_expose
gtk_widget_send_focus_change
gtk_widget_set_accel_path
gtk_widget_set_allocation
gtk_widget_set_app_paintable
......
......@@ -11284,5 +11284,71 @@ gtk_widget_get_window (GtkWidget *widget)
return widget->window;
}
static void
_gtk_widget_set_has_focus (GtkWidget *widget,
gboolean has_focus)
{
if (has_focus)
GTK_OBJECT_FLAGS (widget) |= GTK_HAS_FOCUS;
else
GTK_OBJECT_FLAGS (widget) &= ~(GTK_HAS_FOCUS);
}
/**
* gtk_widget_send_focus_change:
* @widget: a #GtkWidget
* @event: a #GdkEvent of type GDK_FOCUS_CHANGE
*
* Sends the focus change @event to @widget
*
* This function is not meant to be used by applications. The only time it
* should be used is when it is necessary for a #GtkWidget to assign focus
* to a widget that is semantically owned by the first widget even though
* it's not a direct child - for instance, a search entry in a floating
* window similar to the quick search in #GtkTreeView.
*
* An example of its usage is:
*
* |[
* GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
*
* fevent->focus_change.type = GDK_FOCUS_CHANGE;
* fevent->focus_change.in = TRUE;
* fevent->focus_change.window = gtk_widget_get_window (widget);
* if (fevent->focus_change.window != NULL)
* g_object_ref (fevent->focus_change.window);
*
* gtk_widget_send_focus_change (widget, fevent);
*
* gdk_event_free (event);
* ]|
*
* Return value: the return value from the event signal emission: %TRUE
* if the event was handled, and %FALSE otherwise
*
* Since: 2.20
*/
gboolean
gtk_widget_send_focus_change (GtkWidget *widget,
GdkEvent *event)
{
gboolean res;
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
g_return_val_if_fail (event != NULL && event->type == GDK_FOCUS_CHANGE, FALSE);
g_object_ref (widget);
_gtk_widget_set_has_focus (widget, event->focus_change.in);
res = gtk_widget_event (widget, event);
g_object_notify (G_OBJECT (widget), "has-focus");
g_object_unref (widget);
return res;
}
#define __GTK_WIDGET_C__
#include "gtkaliasdef.c"
......@@ -897,6 +897,8 @@ gboolean gtk_widget_event (GtkWidget *widget,
GdkEvent *event);
gint gtk_widget_send_expose (GtkWidget *widget,
GdkEvent *event);
gboolean gtk_widget_send_focus_change (GtkWidget *widget,
GdkEvent *event);
gboolean gtk_widget_activate (GtkWidget *widget);
gboolean gtk_widget_set_scroll_adjustments (GtkWidget *widget,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment