[maemo-commits] [maemo-commits] r12473 - in projects/haf/trunk/gtk+: . gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Jun 26 15:14:44 EEST 2007
- Previous message: [maemo-commits] r12472 - projects/haf/trunk/gtk+
- Next message: [maemo-commits] r12474 - projects/haf/trunk/gtk+
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: xan Date: 2007-06-26 15:14:28 +0300 (Tue, 26 Jun 2007) New Revision: 12473 Modified: projects/haf/trunk/gtk+/ChangeLog projects/haf/trunk/gtk+/gtk/gtktextview.c projects/haf/trunk/gtk+/gtk/gtktextview.h projects/haf/trunk/gtk+/gtk/gtktoolbar.c projects/haf/trunk/gtk+/gtk/gtkwidget.c projects/haf/trunk/gtk+/gtk/gtkwindow.c projects/haf/trunk/gtk+/gtk/gtkwindow.h Log: 2007-06-26 Xan Lopez <xan at gnome.org> Take from upstream: 2007-06-04 Michael Natterer <mitch at imendio.com> Move "move-focus" signals from several widgets to GtkWidget to enable more flexible costomization of keyboard navigation via bindings. Fixes bug #414947. * gtk/gtkwidget.c: add "move-focus" binding signal, default to calling the toplevel GtkWindow's "move-focus" vfunc. * gtk/gtktextview.[ch] * gtk/gtkwindow.[ch]: remove "move-focus" signals and add compat code that makes sure that both emitting the signal on the widget and overriding the virtual functions keeps working as before. * gtk/gtktoolbar.c: remove "move-focus" signal here too and use GtkWidget's signal. This change slightly changes keyboard navigation in toolbars. I'll fix the behavior if somebody can explain me if and how exactly the new behavior is broken. Modified: projects/haf/trunk/gtk+/ChangeLog =================================================================== --- projects/haf/trunk/gtk+/ChangeLog 2007-06-26 12:03:43 UTC (rev 12472) +++ projects/haf/trunk/gtk+/ChangeLog 2007-06-26 12:14:28 UTC (rev 12473) @@ -1,3 +1,26 @@ +2007-06-26 Xan Lopez <xan at gnome.org> + + Take from upstream: + + 2007-06-04 Michael Natterer <mitch at imendio.com> + + Move "move-focus" signals from several widgets to GtkWidget to + enable more flexible costomization of keyboard navigation via + bindings. Fixes bug #414947. + + * gtk/gtkwidget.c: add "move-focus" binding signal, default to + calling the toplevel GtkWindow's "move-focus" vfunc. + + * gtk/gtktextview.[ch] + * gtk/gtkwindow.[ch]: remove "move-focus" signals and add compat + code that makes sure that both emitting the signal on the widget + and overriding the virtual functions keeps working as before. + + * gtk/gtktoolbar.c: remove "move-focus" signal here too and use + GtkWidget's signal. This change slightly changes keyboard + navigation in toolbars. I'll fix the behavior if somebody can + explain me if and how exactly the new behavior is broken. + 2007-06-26 Xan Lopez <xan at nokia.com> * gtk/gtkcombobox.c: (gtk_combo_box_set_popup_widget): Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtktextview.c 2007-06-26 12:03:43 UTC (rev 12472) +++ projects/haf/trunk/gtk+/gtk/gtktextview.c 2007-06-26 12:14:28 UTC (rev 12473) @@ -122,7 +122,6 @@ COPY_CLIPBOARD, PASTE_CLIPBOARD, TOGGLE_OVERWRITE, - MOVE_FOCUS, MOVE_VIEWPORT, SELECT_ALL, LAST_SIGNAL @@ -197,6 +196,8 @@ static void gtk_text_view_draw_focus (GtkWidget *widget); static gboolean gtk_text_view_focus (GtkWidget *widget, GtkDirectionType direction); +static void gtk_text_view_move_focus (GtkWidget *widget, + GtkDirectionType direction_type); static void gtk_text_view_select_all (GtkWidget *widget, gboolean select); @@ -268,7 +269,7 @@ static void gtk_text_view_copy_clipboard (GtkTextView *text_view); static void gtk_text_view_paste_clipboard (GtkTextView *text_view); static void gtk_text_view_toggle_overwrite (GtkTextView *text_view); -static void gtk_text_view_move_focus (GtkTextView *text_view, +static void gtk_text_view_compat_move_focus(GtkTextView *text_view, GtkDirectionType direction_type); static void gtk_text_view_unselect (GtkTextView *text_view); @@ -486,7 +487,16 @@ widget_class->motion_notify_event = gtk_text_view_motion_event; widget_class->expose_event = gtk_text_view_expose_event; widget_class->focus = gtk_text_view_focus; - + + /* need to override the base class function via override_class_closure, + * because the signal slot is not available in GtkWidgetCLass + */ + g_signal_override_class_closure (g_signal_lookup ("move-focus", + GTK_TYPE_WIDGET), + GTK_TYPE_TEXT_VIEW, + g_cclosure_new (G_CALLBACK (gtk_text_view_move_focus), + NULL, NULL)); + widget_class->drag_begin = gtk_text_view_drag_begin; widget_class->drag_end = gtk_text_view_drag_end; widget_class->drag_data_get = gtk_text_view_drag_data_get; @@ -513,7 +523,7 @@ klass->copy_clipboard = gtk_text_view_copy_clipboard; klass->paste_clipboard = gtk_text_view_paste_clipboard; klass->toggle_overwrite = gtk_text_view_toggle_overwrite; - klass->move_focus = gtk_text_view_move_focus; + klass->move_focus = gtk_text_view_compat_move_focus; klass->set_scroll_adjustments = gtk_text_view_set_scroll_adjustments; /* @@ -807,16 +817,6 @@ _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[MOVE_FOCUS] = - g_signal_new (I_("move_focus"), - G_OBJECT_CLASS_TYPE (gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkTextViewClass, move_focus), - NULL, NULL, - _gtk_marshal_VOID__ENUM, - G_TYPE_NONE, 1, - GTK_TYPE_DIRECTION_TYPE); - signals[SET_SCROLL_ADJUSTMENTS] = g_signal_new (I_("set_scroll_adjustments"), G_OBJECT_CLASS_TYPE (gobject_class), @@ -3971,9 +3971,9 @@ obscure = TRUE; } else - gtk_text_view_move_focus (text_view, - (event->state & GDK_SHIFT_MASK) ? - GTK_DIR_TAB_BACKWARD: GTK_DIR_TAB_FORWARD); + g_signal_emit_by_name (text_view, "move-focus", + (event->state & GDK_SHIFT_MASK) ? + GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD); retval = TRUE; } @@ -4445,6 +4445,17 @@ } } +static void +gtk_text_view_move_focus (GtkWidget *widget, + GtkDirectionType direction_type) +{ + GtkTextView *text_view = GTK_TEXT_VIEW (widget); + + if (GTK_TEXT_VIEW_GET_CLASS (text_view)->move_focus) + GTK_TEXT_VIEW_GET_CLASS (text_view)->move_focus (text_view, + direction_type); +} + /* * Container */ @@ -4922,7 +4933,7 @@ if (!gtk_widget_keynav_failed (GTK_WIDGET (text_view), leave_direction)) { - gtk_text_view_move_focus (text_view, leave_direction); + g_signal_emit_by_name (text_view, "move-focus", leave_direction); } } else @@ -5536,16 +5547,43 @@ } static void -gtk_text_view_move_focus (GtkTextView *text_view, - GtkDirectionType direction_type) +gtk_text_view_compat_move_focus (GtkTextView *text_view, + GtkDirectionType direction_type) { - GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (text_view)); + GSignalInvocationHint *hint = g_signal_get_invocation_hint (text_view); - if (!GTK_WIDGET_TOPLEVEL (toplevel)) - return; + /* as of GTK+ 2.12, the "move-focus" signal has been moved to GtkWidget, + * the evil code below makes sure that both emitting the signal and + * calling the virtual function directly continue to work as expetcted + */ - /* Propagate to toplevel */ - g_signal_emit_by_name (toplevel, "move_focus", direction_type); + if (hint->signal_id == g_signal_lookup ("move-focus", GTK_TYPE_WIDGET)) + { + /* if this is a signal emission, chain up */ + + GValue instance_and_params[2] = { { 0, }, { 0, } }; + GValue return_value = { 0, }; + + g_value_init (&instance_and_params[0], GTK_TYPE_WIDGET); + g_value_set_object (&instance_and_params[0], text_view); + + g_value_init (&instance_and_params[1], GTK_TYPE_DIRECTION_TYPE); + g_value_set_enum (&instance_and_params[1], direction_type); + + g_signal_chain_from_overridden (instance_and_params, &return_value); + + g_value_unset (&instance_and_params[0]); + g_value_unset (&instance_and_params[1]); + g_value_unset (&return_value); + } + else + { + /* otherwise emit the signal, since somebody called the virtual + * function directly + */ + + g_signal_emit_by_name (text_view, "move-focus", direction_type); + } } /* Modified: projects/haf/trunk/gtk+/gtk/gtktextview.h =================================================================== --- projects/haf/trunk/gtk+/gtk/gtktextview.h 2007-06-26 12:03:43 UTC (rev 12472) +++ projects/haf/trunk/gtk+/gtk/gtktextview.h 2007-06-26 12:14:28 UTC (rev 12473) @@ -195,11 +195,13 @@ /* overwrite */ void (* toggle_overwrite) (GtkTextView *text_view); - /* propagates to GtkWindow move_focus */ + /* as of GTK+ 2.12 the "move-focus" signal has been moved to GtkWidget, + * so this is merley a virtual function now. Overriding it in subclasses + * continues to work though. + */ void (* move_focus) (GtkTextView *text_view, - GtkDirectionType direction); - - + GtkDirectionType direction); + /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); Modified: projects/haf/trunk/gtk+/gtk/gtktoolbar.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtktoolbar.c 2007-06-26 12:03:43 UTC (rev 12472) +++ projects/haf/trunk/gtk+/gtk/gtktoolbar.c 2007-06-26 12:14:28 UTC (rev 12473) @@ -103,7 +103,6 @@ ORIENTATION_CHANGED, STYLE_CHANGED, POPUP_CONTEXT_MENU, - MOVE_FOCUS, FOCUS_HOME_OR_END, LAST_SIGNAL }; @@ -173,6 +172,8 @@ GtkStyle *prev_style); static gboolean gtk_toolbar_focus (GtkWidget *widget, GtkDirectionType dir); +static void gtk_toolbar_move_focus (GtkWidget *widget, + GtkDirectionType dir); static void gtk_toolbar_screen_changed (GtkWidget *widget, GdkScreen *previous_screen); static void gtk_toolbar_map (GtkWidget *widget); @@ -203,8 +204,6 @@ GtkOrientation orientation); static void gtk_toolbar_real_style_changed (GtkToolbar *toolbar, GtkToolbarStyle style); -static gboolean gtk_toolbar_move_focus (GtkToolbar *toolbar, - GtkDirectionType dir); static gboolean gtk_toolbar_focus_home_or_end (GtkToolbar *toolbar, gboolean focus_home); static gboolean gtk_toolbar_button_press (GtkWidget *toolbar, @@ -359,6 +358,16 @@ widget_class->size_allocate = gtk_toolbar_size_allocate; widget_class->style_set = gtk_toolbar_style_set; widget_class->focus = gtk_toolbar_focus; + + /* need to override the base class function via override_class_closure, + * because the signal slot is not available in GtkWidgetCLass + */ + g_signal_override_class_closure (g_signal_lookup ("move_focus", + GTK_TYPE_WIDGET), + GTK_TYPE_TOOLBAR, + g_cclosure_new (G_CALLBACK (gtk_toolbar_move_focus), + NULL, NULL)); + widget_class->screen_changed = gtk_toolbar_screen_changed; widget_class->realize = gtk_toolbar_realize; widget_class->unrealize = gtk_toolbar_unrealize; @@ -438,26 +447,8 @@ G_TYPE_BOOLEAN, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); + /** - * GtkToolbar::move-focus: - * @toolbar: the #GtkToolbar which emitted the signal - * @dir: a #GtkDirection - * - * A keybinding signal used internally by GTK+. This signal can't - * be used in application code. - * - * Return value: %TRUE if the signal was handled, %FALSE if not - */ - toolbar_signals[MOVE_FOCUS] = - _gtk_binding_signal_new (I_("move_focus"), - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_CALLBACK (gtk_toolbar_move_focus), - NULL, NULL, - _gtk_marshal_BOOLEAN__ENUM, - G_TYPE_BOOLEAN, 1, - GTK_TYPE_DIRECTION_TYPE); - /** * GtkToolbar::focus-home-or-end: * @toolbar: the #GtkToolbar which emitted the signal * @focus_home: %TRUE if the first item should be focused @@ -1915,19 +1906,20 @@ /* Keybinding handler. This function is called when the user presses * Ctrl TAB or an arrow key. */ -static gboolean -gtk_toolbar_move_focus (GtkToolbar *toolbar, +static void +gtk_toolbar_move_focus (GtkWidget *widget, GtkDirectionType dir) { + GtkToolbar *toolbar = GTK_TOOLBAR (widget); + GtkContainer *container = GTK_CONTAINER (toolbar); GList *list; gboolean try_focus = FALSE; GList *children; - GtkContainer *container = GTK_CONTAINER (toolbar); - + if (container->focus_child && gtk_widget_child_focus (container->focus_child, dir)) { - return TRUE; + return; } children = gtk_toolbar_list_children_in_focus_order (toolbar, dir); @@ -1944,8 +1936,6 @@ } g_list_free (children); - - return FALSE; } /* The focus handler for the toolbar. It called when the user presses Modified: projects/haf/trunk/gtk+/gtk/gtkwidget.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkwidget.c 2007-06-26 12:03:43 UTC (rev 12472) +++ projects/haf/trunk/gtk+/gtk/gtkwidget.c 2007-06-26 12:14:28 UTC (rev 12473) @@ -91,6 +91,7 @@ MNEMONIC_ACTIVATE, GRAB_FOCUS, FOCUS, + MOVE_FOCUS, EVENT, EVENT_AFTER, BUTTON_PRESS_EVENT, @@ -268,6 +269,8 @@ GdkEventFocus *event); static gboolean gtk_widget_real_focus (GtkWidget *widget, GtkDirectionType direction); +static void gtk_widget_real_move_focus (GtkWidget *widget, + GtkDirectionType direction); static gboolean gtk_widget_real_keynav_failed (GtkWidget *widget, GtkDirectionType direction); static PangoContext* gtk_widget_peek_pango_context (GtkWidget *widget); @@ -857,6 +860,16 @@ _gtk_marshal_BOOLEAN__ENUM, G_TYPE_BOOLEAN, 1, GTK_TYPE_DIRECTION_TYPE); + widget_signals[MOVE_FOCUS] = + _gtk_binding_signal_new (I_("move_focus"), + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_widget_real_move_focus), + NULL, NULL, + _gtk_marshal_VOID__ENUM, + G_TYPE_NONE, + 1, + GTK_TYPE_DIRECTION_TYPE); widget_signals[EVENT] = g_signal_new (I_("event"), G_TYPE_FROM_CLASS (gobject_class), @@ -4607,6 +4620,20 @@ return FALSE; } +static void +gtk_widget_real_move_focus (GtkWidget *widget, + GtkDirectionType direction) +{ + GtkWidget *toplevel = gtk_widget_get_toplevel (widget); + + if (GTK_IS_WINDOW (toplevel) && + GTK_WINDOW_GET_CLASS (toplevel)->move_focus) + { + GTK_WINDOW_GET_CLASS (toplevel)->move_focus (GTK_WINDOW (toplevel), + direction); + } +} + static gboolean gtk_widget_real_keynav_failed (GtkWidget *widget, GtkDirectionType direction) Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkwindow.c 2007-06-26 12:03:43 UTC (rev 12472) +++ projects/haf/trunk/gtk+/gtk/gtkwindow.c 2007-06-26 12:14:28 UTC (rev 12473) @@ -55,7 +55,6 @@ FRAME_EVENT, ACTIVATE_FOCUS, ACTIVATE_DEFAULT, - MOVE_FOCUS, KEYS_CHANGED, LAST_SIGNAL }; @@ -743,17 +742,6 @@ G_TYPE_NONE, 0); - window_signals[MOVE_FOCUS] = - g_signal_new (I_("move_focus"), - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkWindowClass, move_focus), - NULL, NULL, - _gtk_marshal_VOID__ENUM, - G_TYPE_NONE, - 1, - GTK_TYPE_DIRECTION_TYPE); - window_signals[KEYS_CHANGED] = g_signal_new (I_("keys_changed"), G_TYPE_FROM_CLASS (gobject_class), @@ -4298,6 +4286,11 @@ case GTK_WINDOW_POPUP: attributes.window_type = GDK_WINDOW_TEMP; break; +#ifdef MAEMO_CHANGES + case PROP_TEMPORARY: + gtk_window_set_temporary (window, g_value_get_boolean (value)); + break; +#endif default: g_warning (G_STRLOC": Unknown window type %d!", window->type); break; @@ -4568,6 +4561,11 @@ configure_event->height -= window->frame_top + window->frame_bottom; return gtk_window_configure_event (GTK_WIDGET (window), configure_event); break; +#ifdef MAEMO_CHANGES + case PROP_TEMPORARY: + g_value_set_boolean (value, gtk_window_is_temporary (window)); + break; +#endif default: break; } Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.h =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkwindow.h 2007-06-26 12:03:43 UTC (rev 12472) +++ projects/haf/trunk/gtk+/gtk/gtkwindow.h 2007-06-26 12:14:28 UTC (rev 12473) @@ -126,6 +126,11 @@ void (* activate_focus) (GtkWindow *window); void (* activate_default) (GtkWindow *window); + + /* as of GTK+ 2.12 the "move-focus" signal has been moved to GtkWidget, + * so this is merley a virtual function now. Overriding it in subclasses + * continues to work though. + */ void (* move_focus) (GtkWindow *window, GtkDirectionType direction);
- Previous message: [maemo-commits] r12472 - projects/haf/trunk/gtk+
- Next message: [maemo-commits] r12474 - projects/haf/trunk/gtk+
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]