add signals and binding set, so keybindings are configurable

2001-04-18  Havoc Pennington  <hp@redhat.com>

	* gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
	set, so keybindings are configurable
	(gtk_window_activate_default): Change to activate the focus widget
	instead if there's a focus widget, to be consistent with the
	behavior that previously existed in key_press_event

diff --git a/ChangeLog b/ChangeLog
index 34f886e814de4d24f0a326bcd8cc09bc91199afa..9c1eb12fe50448aa2d97d3f4fc1e5023ed467872 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-18  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
+       set, so keybindings are configurable    
+       (gtk_window_activate_default): Change to activate the focus widget
+       instead if there's a focus widget, to be consistent with the
+       behavior that previously existed in key_press_event
+
 2001-04-18  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkkeyuni.c: Handle numeric keypad keysyms; bug #50201

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 34f886e814de4d24f0a326bcd8cc09bc91199afa..9c1eb12fe50448aa2d97d3f4fc1e5023ed467872 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-04-18  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
+       set, so keybindings are configurable    
+       (gtk_window_activate_default): Change to activate the focus widget
+       instead if there's a focus widget, to be consistent with the
+       behavior that previously existed in key_press_event
+
 2001-04-18  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkkeyuni.c: Handle numeric keypad keysyms; bug #50201

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 34f886e814de4d24f0a326bcd8cc09bc91199afa..9c1eb12fe50448aa2d97d3f4fc1e5023ed467872 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-04-18  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
+       set, so keybindings are configurable    
+       (gtk_window_activate_default): Change to activate the focus widget
+       instead if there's a focus widget, to be consistent with the
+       behavior that previously existed in key_press_event
+
 2001-04-18  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkkeyuni.c: Handle numeric keypad keysyms; bug #50201

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 34f886e814de4d24f0a326bcd8cc09bc91199afa..9c1eb12fe50448aa2d97d3f4fc1e5023ed467872 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-04-18  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
+       set, so keybindings are configurable    
+       (gtk_window_activate_default): Change to activate the focus widget
+       instead if there's a focus widget, to be consistent with the
+       behavior that previously existed in key_press_event
+
 2001-04-18  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkkeyuni.c: Handle numeric keypad keysyms; bug #50201

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 34f886e814de4d24f0a326bcd8cc09bc91199afa..9c1eb12fe50448aa2d97d3f4fc1e5023ed467872 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-04-18  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
+       set, so keybindings are configurable    
+       (gtk_window_activate_default): Change to activate the focus widget
+       instead if there's a focus widget, to be consistent with the
+       behavior that previously existed in key_press_event
+
 2001-04-18  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkkeyuni.c: Handle numeric keypad keysyms; bug #50201

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 34f886e814de4d24f0a326bcd8cc09bc91199afa..9c1eb12fe50448aa2d97d3f4fc1e5023ed467872 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-04-18  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
+       set, so keybindings are configurable    
+       (gtk_window_activate_default): Change to activate the focus widget
+       instead if there's a focus widget, to be consistent with the
+       behavior that previously existed in key_press_event
+
 2001-04-18  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkkeyuni.c: Handle numeric keypad keysyms; bug #50201

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 34f886e814de4d24f0a326bcd8cc09bc91199afa..9c1eb12fe50448aa2d97d3f4fc1e5023ed467872 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-04-18  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): add signals and binding
+       set, so keybindings are configurable    
+       (gtk_window_activate_default): Change to activate the focus widget
+       instead if there's a focus widget, to be consistent with the
+       behavior that previously existed in key_press_event
+
 2001-04-18  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkkeyuni.c: Handle numeric keypad keysyms; bug #50201

diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index 4f1cae30f6f05521b2e436c7e8465e3347d9f2e0..adab57e9f5c7c41a0231df54f83f65ed1da3eb00 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -495,6 +495,20 @@ it's larger
 @height: 
 
 
+<!-- ##### SIGNAL GtkWindow::activate-default ##### -->
+<para>
+
+</para>
+
+@window: the object which received the signal.
+
+<!-- ##### SIGNAL GtkWindow::activate-focus ##### -->
+<para>
+
+</para>
+
+@window: the object which received the signal.
+
 <!-- ##### SIGNAL GtkWindow::frame-event ##### -->
 <para>
 
@@ -504,6 +518,14 @@ it's larger
 @event: 
 @Returns: 
 
+<!-- ##### SIGNAL GtkWindow::move-focus ##### -->
+<para>
+
+</para>
+
+@window: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL GtkWindow::set-focus ##### -->
 <para>
 

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 115b2ddea6dee956d9cd3ad6d661d071a232b8c8..e03cc71fd38204a6ae40b2993f7d32af8c1dc051 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -52,6 +52,9 @@
 enum {
   SET_FOCUS,
   FRAME_EVENT,
+  ACTIVATE_FOCUS,
+  ACTIVATE_DEFAULT,
+  MOVE_FOCUS,
   LAST_SIGNAL
 };
 
@@ -145,6 +148,11 @@ static gint gtk_window_focus              (GtkContainer     *container,
 static void gtk_window_real_set_focus     (GtkWindow         *window,
                                           GtkWidget         *focus);
 
+static void gtk_window_real_activate_default (GtkWindow         *window);
+static void gtk_window_real_activate_focus   (GtkWindow         *window);
+static void gtk_window_move_focus            (GtkWindow         *window,
+                                              GtkDirectionType   dir);
+
 static void gtk_window_move_resize        (GtkWindow         *window);
 static gboolean gtk_window_compare_hints  (GdkGeometry       *geometry_a,
                                           guint              flags_a,
@@ -261,11 +269,12 @@ gtk_window_class_init (GtkWindowClass *klass)
   GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
-
+  GtkBindingSet *binding_set;
+  
   object_class = (GtkObjectClass*) klass;
   widget_class = (GtkWidgetClass*) klass;
   container_class = (GtkContainerClass*) klass;
-
+  
   parent_class = gtk_type_class (gtk_bin_get_type ());
 
   gobject_class->shutdown = gtk_window_shutdown;
@@ -301,6 +310,10 @@ gtk_window_class_init (GtkWindowClass *klass)
   klass->set_focus = gtk_window_real_set_focus;
   klass->frame_event = gtk_window_frame_event;
 
+  klass->activate_default = gtk_window_real_activate_default;
+  klass->activate_focus = gtk_window_real_activate_focus;
+  klass->move_focus = gtk_window_move_focus;
+  
   /* Construct */
   g_object_class_install_property (gobject_class,
                                    PROP_TYPE,
@@ -392,13 +405,14 @@ gtk_window_class_init (GtkWindowClass *klass)
   /* Style props are set or not */
 
   window_signals[SET_FOCUS] =
-    gtk_signal_new ("set_focus",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkWindowClass, set_focus),
-                    gtk_marshal_VOID__OBJECT,
-                   GTK_TYPE_NONE, 1,
-                    GTK_TYPE_WIDGET);
+    g_signal_newc ("set_focus",
+                   G_TYPE_FROM_CLASS (object_class),
+                   G_SIGNAL_RUN_LAST,
+                   G_STRUCT_OFFSET (GtkWindowClass, set_focus),
+                   NULL, NULL,
+                   gtk_marshal_VOID__OBJECT,
+                   G_TYPE_NONE, 1,
+                   GTK_TYPE_WIDGET);
   
   window_signals[FRAME_EVENT] =
     g_signal_newc ("frame_event",
@@ -410,9 +424,97 @@ gtk_window_class_init (GtkWindowClass *klass)
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT);
 
+  window_signals[ACTIVATE_FOCUS] =
+    g_signal_newc ("activate_focus",
+                   G_OBJECT_CLASS_TYPE (object_class),
+                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                   GTK_SIGNAL_OFFSET (GtkWindowClass, activate_focus),
+                  NULL, NULL,
+                  gtk_marshal_VOID__VOID,
+                   G_TYPE_NONE,
+                   0);
+
+  window_signals[ACTIVATE_DEFAULT] =
+    g_signal_newc ("activate_default",
+                   G_OBJECT_CLASS_TYPE (object_class),
+                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                   GTK_SIGNAL_OFFSET (GtkWindowClass, activate_default),
+                  NULL, NULL,
+                  gtk_marshal_VOID__VOID,
+                   G_TYPE_NONE,
+                   0);
+
+  window_signals[MOVE_FOCUS] =
+    g_signal_newc ("move_focus",
+                   G_OBJECT_CLASS_TYPE (object_class),
+                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                   GTK_SIGNAL_OFFSET (GtkWindowClass, move_focus),
+                  NULL, NULL,
+                  gtk_marshal_VOID__ENUM,
+                   G_TYPE_NONE,
+                   1,
+                   GTK_TYPE_DIRECTION_TYPE);
+  
   if (!mnemonic_hash_table)
     mnemonic_hash_table = g_hash_table_new (mnemonic_hash,
                                            mnemonic_equal);
+
+  /*
+   * Key bindings
+   */
+
+  binding_set = gtk_binding_set_by_class (klass);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
+                                "activate_focus", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
+                                "activate_default", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
+                                "activate_default", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_UP);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_UP);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_DOWN);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_DOWN);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_LEFT);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_LEFT);  
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_RIGHT);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_RIGHT);  
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Tab, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, GDK_SHIFT_MASK,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
 }
 
 static void
@@ -954,7 +1056,7 @@ gtk_window_set_position (GtkWindow         *window,
 }
 
 gboolean 
-gtk_window_activate_focus (GtkWindow      *window)
+gtk_window_activate_focus (GtkWindow *window)
 {
   g_return_val_if_fail (window != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
@@ -962,7 +1064,7 @@ gtk_window_activate_focus (GtkWindow      *window)
   if (window->focus_widget)
     {
       if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-       gtk_widget_activate (window->focus_widget);
+        gtk_widget_activate (window->focus_widget);
       return TRUE;
     }
 
@@ -970,16 +1072,23 @@ gtk_window_activate_focus (GtkWindow      *window)
 }
 
 gboolean
-gtk_window_activate_default (GtkWindow      *window)
+gtk_window_activate_default (GtkWindow *window)
 {
   g_return_val_if_fail (window != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget))
+  if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) &&
+      (!window->focus_widget || !GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget)))
     {
       gtk_widget_activate (window->default_widget);
       return TRUE;
     }
+  else if (window->focus_widget)
+    {
+      if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
+        gtk_widget_activate (window->focus_widget);
+      return TRUE;
+    }
 
   return FALSE;
 }
@@ -2035,7 +2144,6 @@ gtk_window_key_press_event (GtkWidget   *widget,
                            GdkEventKey *event)
 {
   GtkWindow *window;
-  GtkDirectionType direction = 0;
   gboolean handled;
 
   g_return_val_if_fail (widget != NULL, FALSE);
@@ -2058,88 +2166,36 @@ gtk_window_key_press_event (GtkWidget   *widget,
   if (!handled)
     handled = gtk_accel_groups_activate (GTK_OBJECT (window), event->keyval, event->state);
 
-  if (!handled)
-    {
-      switch (event->keyval)
-       {
-       case GDK_space:
-         if (window->focus_widget)
-           {
-             if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-               gtk_widget_activate (window->focus_widget);
-             handled = TRUE;
-           }
-         break;
-       case GDK_Return:
-       case GDK_KP_Enter:
-         if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) &&
-             (!window->focus_widget || !GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget)))
-           {
-             gtk_widget_activate (window->default_widget);
-             handled = TRUE;
-           }
-          else if (window->focus_widget)
-           {
-             if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-               gtk_widget_activate (window->focus_widget);
-             handled = TRUE;
-           }
-         break;
-       case GDK_Up:
-       case GDK_Down:
-       case GDK_Left:
-       case GDK_Right:
-       case GDK_KP_Up:
-       case GDK_KP_Down:
-       case GDK_KP_Left:
-       case GDK_KP_Right:
-       case GDK_Tab:
-       case GDK_ISO_Left_Tab:
-         switch (event->keyval)
-           {
-           case GDK_Up:
-           case GDK_KP_Up:
-             direction = GTK_DIR_UP;
-             break;
-           case GDK_Down:
-           case GDK_KP_Down:
-             direction = GTK_DIR_DOWN;
-             break;
-           case GDK_Left:
-           case GDK_KP_Left:
-             direction = GTK_DIR_LEFT;
-             break;
-           case GDK_Right:
-           case GDK_KP_Right:
-             direction = GTK_DIR_RIGHT;
-             break;
-           case GDK_Tab:
-           case GDK_ISO_Left_Tab:
-             if (event->state & GDK_SHIFT_MASK)
-               direction = GTK_DIR_TAB_BACKWARD;
-             else
-               direction = GTK_DIR_TAB_FORWARD;
-              break;
-            default :
-              direction = GTK_DIR_UP; /* never reached, but makes compiler happy */
-           }
-
-         gtk_container_focus (GTK_CONTAINER (widget), direction);
-
-         if (!GTK_CONTAINER (window)->focus_child)
-           gtk_window_set_focus (GTK_WINDOW (widget), NULL);
-         else
-           handled = TRUE;
-         break;
-       }
-    }
-
+  /* Chain up, invokes binding set */
   if (!handled && GTK_WIDGET_CLASS (parent_class)->key_press_event)
     handled = GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
 
   return handled;
 }
 
+
+static void
+gtk_window_real_activate_default (GtkWindow *window)
+{
+  gtk_window_activate_default (window);
+}
+
+static void
+gtk_window_real_activate_focus (GtkWindow *window)
+{
+  gtk_window_activate_focus (window);
+}
+
+static void
+gtk_window_move_focus (GtkWindow       *window,
+                       GtkDirectionType dir)
+{
+  gtk_container_focus (GTK_CONTAINER (window), dir);
+  
+  if (!GTK_CONTAINER (window)->focus_child)
+    gtk_window_set_focus (window, NULL);
+}
+
 static gint
 gtk_window_key_release_event (GtkWidget   *widget,
                              GdkEventKey *event)
@@ -2444,6 +2500,8 @@ gtk_window_real_set_focus (GtkWindow *window,
     gtk_widget_queue_draw (window->default_widget);
 }
 
+
+
 /*********************************
  * Functions related to resizing *
  *********************************/

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 5264ccd47682a855fbc5f7782727bc50ad340753..8688917297795e887038db1aa90dbc4f00aa854e 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -113,6 +113,13 @@ struct _GtkWindowClass
                            GtkWidget *focus);
   gboolean (* frame_event) (GtkWidget *widget,
                            GdkEvent  *event);
+
+  /* G_SIGNAL_ACTION signals for keybindings */
+
+  void     (* activate_focus)          (GtkWindow       *window);
+  void     (* activate_default)        (GtkWindow       *window);
+  void     (* move_focus)              (GtkWindow       *window,
+                                        GtkDirectionType direction);  
 };