[gtk/shortcuts-rebased-again: 83/91] filechooser: Trigger the location popup via bindings

[Matthias Clasen <matthiasc src gnome org>]

commit 92040d65e322b1ca174905569c03a6125dbf73d7
Author: Benjamin Otte <otte redhat com>
Date:   Sun Aug 26 18:39:51 2018 +0200

    filechooser: Trigger the location popup via bindings
    
    Simplifies code quite a bit.

 gtk/gtkfilechooserwidget.c | 85 ++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 55 deletions(-)
---
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index e630b645c1..6b55bd1bee 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -1245,41 +1245,22 @@ places_sidebar_show_error_message_cb (GtkPlacesSidebar *sidebar,
 }
 
 static gboolean
-should_trigger_location_entry (GtkFileChooserWidget *impl,
-                               guint                 keyval,
-                               GdkModifierType       state,
-                               const char          **string)
+trigger_location_entry (GtkWidget *widget,
+                        GVariant  *arguments,
+                        gpointer   unused)
 {
+  GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (widget);
   GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
-  GdkModifierType no_text_input_mask;
 
   if (priv->operation_mode == OPERATION_MODE_SEARCH)
     return FALSE;
 
-  no_text_input_mask =
-    gtk_widget_get_modifier_mask (GTK_WIDGET (impl), GDK_MODIFIER_INTENT_NO_TEXT_INPUT);
-
-  if (state & no_text_input_mask)
+  if (priv->action != GTK_FILE_CHOOSER_ACTION_OPEN &&
+      priv->action != GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
     return FALSE;
 
-  switch (keyval)
-    {
-    case GDK_KEY_slash:
-    case GDK_KEY_KP_Divide:
-      *string = "/";
-      return TRUE;
-
-    case GDK_KEY_period:
-      *string = ".";
-      return TRUE;
-
-    case GDK_KEY_asciitilde:
-      *string = "~";
-      return TRUE;
-
-    default:
-      return FALSE;
-    }
+  location_popup_handler (impl, g_variant_get_string (arguments, NULL));
+  return TRUE;
 }
 
 /* Handles key press events on the file list, so that we can trap Enter to
@@ -1295,15 +1276,6 @@ key_press_cb (GtkEventControllerKey *controller,
 {
   GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
   GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
-  const char *string;
-
-  if (should_trigger_location_entry (impl, keyval, state, &string) &&
-      (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
-       priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER))
-    {
-      location_popup_handler (impl, string);
-      return GDK_EVENT_STOP;
-    }
 
   if ((keyval == GDK_KEY_Return
        || keyval == GDK_KEY_ISO_Enter
@@ -1338,28 +1310,15 @@ widget_key_press_cb (GtkEventControllerKey *controller,
   GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
   GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
   gboolean handled = FALSE;
-  const char *string;
 
-  if (should_trigger_location_entry (impl, keyval, state, &string))
+  priv->starting_search = TRUE;
+  if (gtk_event_controller_key_forward (controller, priv->search_entry))
     {
-      if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
-          priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
-        {
-          location_popup_handler (impl, string);
-          handled = TRUE;
-        }
-    }
-  else
-    {
-      priv->starting_search = TRUE;
-      if (gtk_event_controller_key_forward (controller, priv->search_entry))
-        {
-          if (priv->operation_mode != OPERATION_MODE_SEARCH &&
-              priv->starting_search)
-            operation_mode_set (impl, OPERATION_MODE_SEARCH);
+      if (priv->operation_mode != OPERATION_MODE_SEARCH &&
+          priv->starting_search)
+        operation_mode_set (impl, OPERATION_MODE_SEARCH);
 
-          handled = TRUE;
-        }
+      handled = TRUE;
     }
 
   return handled;
@@ -8217,6 +8176,22 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
                                        GDK_KEY_p, GDK_MOD1_MASK,
                                        "places-shortcut",
                                        NULL);
+  gtk_widget_class_add_binding (widget_class,
+                                GDK_KEY_slash, 0,
+                                trigger_location_entry,
+                                "s", "/");
+  gtk_widget_class_add_binding (widget_class,
+                                GDK_KEY_KP_Divide, 0,
+                                trigger_location_entry,
+                                "s", "/");
+  gtk_widget_class_add_binding (widget_class,
+                                GDK_KEY_period, 0,
+                                trigger_location_entry,
+                                "s", ".");
+  gtk_widget_class_add_binding (widget_class,
+                                GDK_KEY_asciitilde, 0,
+                                trigger_location_entry,
+                                "s", "~");
 
   for (i = 0; i < G_N_ELEMENTS (quick_bookmark_keyvals); i++)
     gtk_widget_class_add_binding_signal (widget_class,