Unify the handling of various "Enter" keysyms all over the place.

2008-02-12  Matthias Clasen  <mclasen@redhat.com>

        * gtk/*.c: Unify the handling of various "Enter" keysyms
        all over the place.  (#515047, Christian Persch)

svn path=/trunk/; revision=19528

diff --git a/ChangeLog b/ChangeLog
index 65d5ba01d4ef6bfaaebc78df0c920ac02f145f99..520d1331d1758927eea70d437b38a3348e135663 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/*.c: Unify the handling of various "Enter" keysyms
+       all over the place.  (#515047, Christian Persch)
+
 2008-02-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystemmodel.c:

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index f57a474e572c10b971d8abb7eb74d72b8583510d..0430d01735b93c9b2053515b6e1542f6431d5da9 100644 (file)
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -1718,7 +1718,8 @@ credits_key_press_event (GtkWidget      *text_view,
 
   switch (event->keyval)
     {
-      case GDK_Return: 
+      case GDK_Return:
+      case GDK_ISO_Enter:
       case GDK_KP_Enter:
         buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
         gtk_text_buffer_get_iter_at_mark (buffer, &iter, 

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 29d828189e488938d7f1f4d09739d87b71708b4f..859d55fae47cdd53968304bd912347037b7dd48d 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1066,6 +1066,7 @@ palette_activate (GtkWidget   *widget,
   /* should have a drawing area subclass with an activate signal */
   if ((event->keyval == GDK_space) ||
       (event->keyval == GDK_Return) ||
+      (event->keyval == GDK_ISO_Enter) ||
       (event->keyval == GDK_KP_Enter) ||
       (event->keyval == GDK_KP_Space))
     {
@@ -1327,6 +1328,7 @@ key_press (GtkWidget   *invisible,
     {
     case GDK_space:
     case GDK_Return:
+    case GDK_ISO_Enter:
     case GDK_KP_Enter:
     case GDK_KP_Space:
       grab_color_at_mouse (screen, x, y, data);

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index b3f2fd59c43979de4ad33ace7db1bbc3134fc991..552b738bb6b60c31be102af5b0a35fa0c00b7976 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -293,7 +293,9 @@ gtk_combo_window_key_press (GtkWidget   *window,
 {
   guint state = event->state & gtk_accelerator_get_default_mod_mask ();
 
-  if ((event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) &&
+  if ((event->keyval == GDK_Return ||
+       event->keyval == GDK_ISO_Enter ||
+       event->keyval == GDK_KP_Enter) &&
       state == 0)
     {
       gtk_combo_popdown_list (combo);

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index b8d16f3c2d489b955144e99b40267873793d38ac..a43a0c9234e6d41fc6ea68d613710fc90771e782 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3865,7 +3865,7 @@ gtk_combo_box_list_key_press (GtkWidget   *widget,
   GtkComboBox *combo_box = GTK_COMBO_BOX (data);
   GtkTreeIter iter;
 
-  if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter ||
+  if (event->keyval == GDK_Return || event->keyval == GDK_ISO_Enter || event->keyval == GDK_KP_Enter ||
       event->keyval == GDK_space || event->keyval == GDK_KP_Space) 
   {
     GtkTreeModel *model = NULL;
@@ -5344,7 +5344,9 @@ gtk_cell_editable_key_press (GtkWidget   *widget,
       
       return TRUE;
     }
-  else if (event->keyval == GDK_Return)
+  else if (event->keyval == GDK_Return ||
+           event->keyval == GDK_ISO_Enter ||
+           event->keyval == GDK_KP_Enter)
     {
       gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (combo_box));
       gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (combo_box));

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 49000f3b63f3375a3f816f6931a2ef0463f3459d..87f4db43f161964a955e4c64b6ed495d360a1279 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -4077,6 +4077,7 @@ gtk_drag_key_cb (GtkWidget         *widget,
 
        case GDK_space:
        case GDK_Return:
+        case GDK_ISO_Enter:
        case GDK_KP_Enter:
        case GDK_KP_Space:
          gtk_drag_end (info, event->time);

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 2ccdfad3d0276f7ec7d17e3f63c2584667d83ae3..c8b71e5316223a934214eea5dfb4139f8283a5a4 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -820,6 +820,8 @@ gtk_entry_class_init (GtkEntryClass *class)
    */
   gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
                                "activate", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
+                               "activate", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
                                "activate", 0);
   

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index de809d0106dbf538a0936e09ab0f30df0336ea0b..08971f8b9db11bec65ad79df3f82ac3cb55324c8 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4078,7 +4078,8 @@ trap_activate_cb (GtkWidget   *widget,
   if ((event->keyval == GDK_Return
        || event->keyval == GDK_ISO_Enter
        || event->keyval == GDK_KP_Enter
-       || event->keyval == GDK_space)
+       || event->keyval == GDK_space
+       || event->keyval == GDK_KP_Space)
       && ((event->state & modifiers) == 0)
       && !(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
           impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 6ad5f05ea7ea0575b83e6373539e6407f61fad9b..cc2c241fd319ae728c3b076f4e8ddf2ae1819180 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -870,9 +870,13 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                "unselect_all", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, 
                                "toggle_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK,
+                               "toggle_cursor_item", 0);
 
   gtk_binding_entry_add_signal (binding_set, GDK_space, 0, 
                                "activate_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
+                               "activate_cursor_item", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, 
                                "activate_cursor_item", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, 

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index f6d10a49ce9d14fd2126d1d3e2ea55e49fb1f1e3..603eb6048f7dd370232661b149f8c074ed7d9d05 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -324,6 +324,11 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                                "activate_current", 1,
                                G_TYPE_BOOLEAN,
                                TRUE);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_ISO_Enter, 0,
+                               "activate_current", 1,
+                               G_TYPE_BOOLEAN,
+                               TRUE);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Enter, 0,
                                "activate_current", 1,

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 30053da25ad1dd50f518244dedc66cd26e00d3d1..2961dafb8c60c18845bf6a45c06522fbf1b773b9 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -478,6 +478,9 @@ gtk_paned_class_init (GtkPanedClass *class)
   gtk_binding_entry_add_signal (binding_set,
                                GDK_Return, 0,
                                "accept_position", 0);
+  gtk_binding_entry_add_signal (binding_set,
+                               GDK_ISO_Enter, 0,
+                               "accept_position", 0);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_KP_Enter, 0,
                                "accept_position", 0);

diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 28f6c0101bc866efddeb796fa304f9efb76f514c..99cc4c8bfc2c883b0a6539e3ee8547e920a2c2ca 100644 (file)
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -297,6 +297,8 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
 
   gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
                                "popup", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0,
+                               "popup", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
                                "popup", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 4cb62fe4ce441839a0bc6b729f771a909f29d72f..704a04bfdeed9a0027be2aa63f8a121c99cc4491 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1909,6 +1909,7 @@ gtk_text_key_press (GtkWidget   *widget,
         case GDK_KP_Down:
        case GDK_Down:      scroll_int (text, +KEY_SCROLL_PIXELS); break;
        case GDK_Return:
+        case GDK_ISO_Enter:
         case GDK_KP_Enter:
          if (event->state & GDK_CONTROL_MASK)
            gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
@@ -2028,6 +2029,7 @@ gtk_text_key_press (GtkWidget   *widget,
          gtk_editable_insert_text (GTK_EDITABLE (old_editable), "\t", 1, &position);
          break;
         case GDK_KP_Enter:
+        case GDK_ISO_Enter:
        case GDK_Return:
          if (event->state & GDK_CONTROL_MASK)
            gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 593467282b794ebf357492d56fade8eca5a9e635..05bec7ddc58c94b36e046716f1d9311716cbfbd9 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4094,6 +4094,7 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
   /* use overall editability not can_insert, more predictable for users */
   else if (text_view->editable &&
            (event->keyval == GDK_Return ||
+            event->keyval == GDK_ISO_Enter ||
             event->keyval == GDK_KP_Enter))
     {
       /* this won't actually insert the newline if the cursor isn't

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 070d5fc2b1e694f71ae7a442ea3f73eb9e334647..06a4a77b22730b1c393a59cbbf27145393761bd6 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1165,6 +1165,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                G_TYPE_INT, -1);
 
   gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle_cursor_row", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_CONTROL_MASK, "toggle_cursor_row", 0);
 
   gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, "select_all", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK, "select_all", 0);
@@ -1174,9 +1175,13 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
 
   gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_SHIFT_MASK, "select_cursor_row", 1,
                                G_TYPE_BOOLEAN, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, GDK_SHIFT_MASK, "select_cursor_row", 1,
+                               G_TYPE_BOOLEAN, TRUE);
 
   gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "select_cursor_row", 1,
                                G_TYPE_BOOLEAN, TRUE);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0, "select_cursor_row", 1,
+                               G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "select_cursor_row", 1,
                                G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, "select_cursor_row", 1,

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index f31f5c9e8056de7d7306575d98dbbd9a7ea4ed5b..04dc992f3bf7a6e0e359d2caea3b907ccefd69e8 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -826,7 +826,8 @@ gtk_window_class_init (GtkWindowClass *klass)
   
   gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
                                 "activate_default", 0);
-
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
+                                "activate_default", 0);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
                                 "activate_default", 0);
 
@@ -4877,7 +4878,7 @@ _gtk_window_query_nonaccels (GtkWindow      *window,
   if (!accel_mods)
     {
       static const guint bindings[] = {
-       GDK_space, GDK_KP_Space, GDK_Return, GDK_KP_Enter, GDK_Up, GDK_KP_Up, GDK_Down, GDK_KP_Down,
+       GDK_space, GDK_KP_Space, GDK_Return, GDK_ISO_Enter, GDK_KP_Enter, GDK_Up, GDK_KP_Up, GDK_Down, GDK_KP_Down,
        GDK_Left, GDK_KP_Left, GDK_Right, GDK_KP_Right, GDK_Tab, GDK_KP_Tab, GDK_ISO_Left_Tab,
       };
       guint i;