]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkfilechooserentry.c
Support old-style message contexts, too.
[~andy/gtk] / gtk / gtkfilechooserentry.c
index 2717187492a1b845b6c7372b2171d7f710edfda2..24bbc5f32e490d3e35da3cac88ffd2fa1358bdbf 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gtkfilechooserentry.h"
-
-#include <gtk/gtkentry.h>
-
+#include <config.h>
 #include <string.h>
 
+#include "gtkcelllayout.h"
+#include "gtkcellrenderertext.h"
+#include "gtkentry.h"
+#include "gtkfilechooserentry.h"
+#include "gtkmain.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+
 typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
 
 #define GTK_FILE_CHOOSER_ENTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_ENTRY, GtkFileChooserEntryClass))
@@ -39,87 +44,85 @@ struct _GtkFileChooserEntry
 {
   GtkEntry parent_instance;
 
+  GtkFileChooserAction action;
+
   GtkFileSystem *file_system;
   GtkFilePath *base_folder;
   GtkFilePath *current_folder_path;
   gchar *file_part;
-  GSource *completion_idle;
+  gint file_part_pos;
+  guint check_completion_idle;
+  guint load_directory_idle;
 
   GtkFileFolder *current_folder;
+  GtkFileSystemHandle *load_folder_handle;
+
+  GtkListStore *completion_store;
 
-  guint in_change : 1;
   guint has_completion : 1;
+  guint in_change      : 1;
+  guint eat_tabs       : 1;
+};
+
+enum
+{
+  DISPLAY_NAME_COLUMN,
+  PATH_COLUMN,
+  N_COLUMNS
 };
 
-static void gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class);
-static void gtk_file_chooser_entry_iface_init (GtkEditableClass         *iface);
-static void gtk_file_chooser_entry_init       (GtkFileChooserEntry      *chooser_entry);
+static void     gtk_file_chooser_entry_iface_init     (GtkEditableClass *iface);
 
 static void     gtk_file_chooser_entry_finalize       (GObject          *object);
+static void     gtk_file_chooser_entry_dispose        (GObject          *object);
 static gboolean gtk_file_chooser_entry_focus          (GtkWidget        *widget,
                                                       GtkDirectionType  direction);
+static void     gtk_file_chooser_entry_activate       (GtkEntry         *entry);
 static void     gtk_file_chooser_entry_changed        (GtkEditable      *editable);
-static void     gtk_file_chooser_entry_do_insert_text (GtkEditable      *editable,
-                                                      const gchar      *new_text,
-                                                      gint              new_text_length,
-                                                      gint             *position);
+static void     gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
+                                                      const gchar *new_text,
+                                                      gint         new_text_length,
+                                                      gint        *position);
 
-static void clear_completion_callback (GtkFileChooserEntry *chooser_entry,
-                                      GParamSpec          *pspec);
+static void     clear_completion_callback (GtkFileChooserEntry *chooser_entry,
+                                          GParamSpec          *pspec);
+static gboolean match_selected_callback   (GtkEntryCompletion  *completion,
+                                          GtkTreeModel        *model,
+                                          GtkTreeIter         *iter,
+                                          GtkFileChooserEntry *chooser_entry);
+static gboolean completion_match_func     (GtkEntryCompletion  *comp,
+                                          const char          *key,
+                                          GtkTreeIter         *iter,
+                                          gpointer             data);
+static void     files_added_cb            (GtkFileSystem       *file_system,
+                                          GSList              *added_uris,
+                                          GtkFileChooserEntry *chooser_entry);
+static void     files_deleted_cb          (GtkFileSystem       *file_system,
+                                          GSList              *deleted_uris,
+                                          GtkFileChooserEntry *chooser_entry);
+static char    *maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
+                                               GtkFilePath         *path,
+                                               gchar               *display_name);
 
-GObjectClass *parent_class;
-GtkEditableClass *parent_editable_iface;
+static GtkEditableClass *parent_editable_iface;
 
-GType
-_gtk_file_chooser_entry_get_type (void)
-{
-  static GType file_chooser_entry_type = 0;
-
-  if (!file_chooser_entry_type)
-    {
-      static const GTypeInfo file_chooser_entry_info =
-      {
-       sizeof (GtkFileChooserEntryClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_file_chooser_entry_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkFileChooserEntry),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_file_chooser_entry_init,
-      };
-
-      static const GInterfaceInfo editable_info =
-      {
-       (GInterfaceInitFunc) gtk_file_chooser_entry_iface_init, /* interface_init */
-       NULL,                                                 /* interface_finalize */
-       NULL                                                  /* interface_data */
-      };
-
-      
-      file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, "GtkFileChooserEntry",
-                                                       &file_chooser_entry_info, 0);
-      g_type_add_interface_static (file_chooser_entry_type,
-                                  GTK_TYPE_EDITABLE,
-                                  &editable_info);
-    }
-
-
-  return file_chooser_entry_type;
-}
+G_DEFINE_TYPE_WITH_CODE (GtkFileChooserEntry, _gtk_file_chooser_entry, GTK_TYPE_ENTRY,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+                                               gtk_file_chooser_entry_iface_init))
 
 static void
-gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
+_gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  parent_class = g_type_class_peek_parent (class);
+  GtkEntryClass *entry_class = GTK_ENTRY_CLASS (class);
 
   gobject_class->finalize = gtk_file_chooser_entry_finalize;
+  gobject_class->dispose = gtk_file_chooser_entry_dispose;
 
   widget_class->focus = gtk_file_chooser_entry_focus;
+
+  entry_class->activate = gtk_file_chooser_entry_activate;
 }
 
 static void
@@ -132,8 +135,34 @@ gtk_file_chooser_entry_iface_init (GtkEditableClass *iface)
 }
 
 static void
-gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
+_gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
 {
+  GtkEntryCompletion *comp;
+  GtkCellRenderer *cell;
+
+  g_object_set (chooser_entry, "truncate-multiline", TRUE, NULL);
+
+  comp = gtk_entry_completion_new ();
+  gtk_entry_completion_set_popup_single_match (comp, FALSE);
+
+  gtk_entry_completion_set_match_func (comp,
+                                      completion_match_func,
+                                      chooser_entry,
+                                      NULL);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comp),
+                              cell, TRUE);
+  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (comp),
+                                 cell,
+                                 "text", 0);
+
+  g_signal_connect (comp, "match_selected",
+                   G_CALLBACK (match_selected_callback), chooser_entry);
+
+  gtk_entry_set_completion (GTK_ENTRY (chooser_entry), comp);
+  g_object_unref (comp);
+
   g_signal_connect (chooser_entry, "notify::cursor-position",
                    G_CALLBACK (clear_completion_callback), NULL);
   g_signal_connect (chooser_entry, "notify::selection-bound",
@@ -145,142 +174,511 @@ gtk_file_chooser_entry_finalize (GObject *object)
 {
   GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
 
-  if (chooser_entry->current_folder)
-    g_object_unref (chooser_entry->current_folder);
-  
-  if (chooser_entry->file_system)
-    g_object_unref (chooser_entry->file_system);
-  
   gtk_file_path_free (chooser_entry->base_folder);
   gtk_file_path_free (chooser_entry->current_folder_path);
   g_free (chooser_entry->file_part);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->finalize (object);
 }
 
-static gboolean
-completion_idle_callback (GtkFileChooserEntry *chooser_entry)
+static void
+gtk_file_chooser_entry_dispose (GObject *object)
 {
-  GtkEditable *editable = GTK_EDITABLE (chooser_entry);
-  GSList *child_paths = NULL;
-  GSList *tmp_list;
-  gchar *common_prefix = NULL;
-  GtkFilePath *unique_path = NULL;
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
 
-  chooser_entry->completion_idle = NULL;
+  if (chooser_entry->completion_store)
+    {
+      g_object_unref (chooser_entry->completion_store);
+      chooser_entry->completion_store = NULL;
+    }
+
+  if (chooser_entry->load_folder_handle)
+    {
+      gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
+      chooser_entry->load_folder_handle = NULL;
+    }
 
-  if (strcmp (chooser_entry->file_part, "") == 0)
-    return FALSE;
-
-  if (!chooser_entry->current_folder &&
-      chooser_entry->file_system &&
-      chooser_entry->current_folder_path)
-    chooser_entry->current_folder = gtk_file_system_get_folder (chooser_entry->file_system,
-                                                               chooser_entry->current_folder_path,
-                                                               GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_FOLDER,
-                                                               NULL); /* NULL-GError */
   if (chooser_entry->current_folder)
-    gtk_file_folder_list_children (chooser_entry->current_folder,
-                                  &child_paths,
-                                  NULL); /* NULL-GError */
+    {
+      g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
+                                           G_CALLBACK (files_added_cb), chooser_entry);
+      g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
+                                           G_CALLBACK (files_deleted_cb), chooser_entry);
+      g_object_unref (chooser_entry->current_folder);
+      chooser_entry->current_folder = NULL;
+    }
 
-  for (tmp_list = child_paths; tmp_list; tmp_list = tmp_list->next)
+  if (chooser_entry->file_system)
     {
-      GtkFileInfo *info;
-      
-      info = gtk_file_folder_get_info (chooser_entry->current_folder,
-                                      tmp_list->data,
-                                      NULL); /* NULL-GError */
-      if (info)
-       {
-         const gchar *display_name = gtk_file_info_get_display_name (info);
-         
-         if (g_str_has_prefix (display_name, chooser_entry->file_part))
-           {
-             if (!common_prefix)
-               {
-                 common_prefix = g_strdup (display_name);
-                 unique_path = gtk_file_path_copy (tmp_list->data);
-               }
-             else
-               {
-                 gchar *p = common_prefix;
-                 const gchar *q = display_name;
-                 
-                 while (*p && *p == *q)
-                   {
-                     p++;
-                     q++;
-                   }
-                 
-                 *p = '\0';
+      g_object_unref (chooser_entry->file_system);
+      chooser_entry->file_system = NULL;
+    }
 
-                 gtk_file_path_free (unique_path);
-                 unique_path = NULL;
-               }
-           }
-         
-         gtk_file_info_free (info);
-       }
+  if (chooser_entry->check_completion_idle)
+    {
+      g_source_remove (chooser_entry->check_completion_idle);
+      chooser_entry->check_completion_idle = 0;
     }
 
-  if (unique_path)
+  if (chooser_entry->load_directory_idle)
+    {
+      g_source_remove (chooser_entry->load_directory_idle);
+      chooser_entry->load_directory_idle = 0;
+    }
+
+  G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->dispose (object);
+}
+
+/* Match functions for the GtkEntryCompletion */
+static gboolean
+match_selected_callback (GtkEntryCompletion  *completion,
+                        GtkTreeModel        *model,
+                        GtkTreeIter         *iter,
+                        GtkFileChooserEntry *chooser_entry)
+{
+  char *display_name;
+  GtkFilePath *path;
+  gint pos;
+  
+  gtk_tree_model_get (model, iter,
+                     DISPLAY_NAME_COLUMN, &display_name,
+                     PATH_COLUMN, &path,
+                     -1);
+
+  if (!display_name || !path)
+    {
+      /* these shouldn't complain if passed NULL */
+      gtk_file_path_free (path);
+      g_free (display_name);
+      return FALSE;
+    }
+
+  display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
+
+  pos = chooser_entry->file_part_pos;
+
+  /* We don't set in_change here as we want to update the current_folder
+   * variable */
+  gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
+                           pos, -1);
+  gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
+                           display_name, -1, 
+                           &pos);
+  gtk_editable_set_position (GTK_EDITABLE (chooser_entry), -1);
+
+  gtk_file_path_free (path);
+  g_free (display_name);
+
+  return TRUE;
+}
+
+/* Match function for the GtkEntryCompletion */
+static gboolean
+completion_match_func (GtkEntryCompletion *comp,
+                      const char         *key_unused,
+                      GtkTreeIter        *iter,
+                      gpointer            data)
+{
+  GtkFileChooserEntry *chooser_entry;
+  char *name;
+  gboolean result;
+  char *norm_file_part;
+  char *norm_name;
+
+  chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
+
+  /* We ignore the key because it is the contents of the entry.  Instead, we
+   * just use our precomputed file_part.
+   */
+  if (!chooser_entry->file_part)
+    {
+      return FALSE;
+    }
+
+  gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store), iter, DISPLAY_NAME_COLUMN, &name, -1);
+  if (!name)
+    {
+      return FALSE; /* Uninitialized row, ugh */
+    }
+
+  /* If we have an empty file_part, then we're at the root of a directory.  In
+   * that case, we want to match all non-dot files.  We might want to match
+   * dot_files too if show_hidden is TRUE on the fileselector in the future.
+   */
+  /* Additionally, support for gnome .hidden files would be sweet, too */
+  if (chooser_entry->file_part[0] == '\000')
+    {
+      if (name[0] == '.')
+       result = FALSE;
+      else
+       result = TRUE;
+      g_free (name);
+
+      return result;
+    }
+
+
+  norm_file_part = g_utf8_normalize (chooser_entry->file_part, -1, G_NORMALIZE_ALL);
+  norm_name = g_utf8_normalize (name, -1, G_NORMALIZE_ALL);
+
+#ifdef G_PLATFORM_WIN32
+  {
+    gchar *temp;
+
+    temp = norm_file_part;
+    norm_file_part = g_utf8_casefold (norm_file_part, -1);
+    g_free (temp);
+
+    temp = norm_name;
+    norm_name = g_utf8_casefold (norm_name, -1);
+    g_free (temp);
+  }
+#endif
+
+  result = (strncmp (norm_file_part, norm_name, strlen (norm_file_part)) == 0);
+
+  g_free (norm_file_part);
+  g_free (norm_name);
+  g_free (name);
+  
+  return result;
+}
+
+/* This function will append a directory separator to paths to
+ * display_name iff the path associated with it is a directory.
+ * maybe_append_separator_to_path will g_free the display_name and
+ * return a new one if needed.  Otherwise, it will return the old one.
+ * You should be safe calling
+ *
+ * display_name = maybe_append_separator_to_path (entry, path, display_name);
+ * ...
+ * g_free (display_name);
+ */
+static char *
+maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
+                               GtkFilePath         *path,
+                               gchar               *display_name)
+{
+  if (!g_str_has_suffix (display_name, G_DIR_SEPARATOR_S) && path)
     {
       GtkFileInfo *info;
            
       info = gtk_file_folder_get_info (chooser_entry->current_folder,
-                                      unique_path,
-                                      NULL); /* NULL-GError */
+                                      path, NULL); /* NULL-GError */
 
       if (info)
        {
          if (gtk_file_info_get_is_folder (info))
            {
-             gchar *tmp = common_prefix;
-             common_prefix = g_strconcat (tmp, "/", NULL);
+             gchar *tmp = display_name;
+             display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);
              g_free (tmp);
            }
          
          gtk_file_info_free (info);
        }
+    }
+
+  return display_name;
+}
 
+/* Determines if the completion model has entries with a common prefix relative
+ * to the current contents of the entry.  Also, if there's one and only one such
+ * path, stores it in unique_path_ret.
+ */
+static void
+find_common_prefix (GtkFileChooserEntry *chooser_entry,
+                   gchar               **common_prefix_ret,
+                   GtkFilePath         **unique_path_ret)
+{
+  GtkTreeIter iter;
+  gboolean valid;
+
+  *common_prefix_ret = NULL;
+  *unique_path_ret = NULL;
+
+  if (chooser_entry->completion_store == NULL)
+    return;
+
+  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
+
+  while (valid)
+    {
+      gchar *display_name;
+      GtkFilePath *path;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store),
+                         &iter,
+                         DISPLAY_NAME_COLUMN, &display_name,
+                         PATH_COLUMN, &path,
+                         -1);
+
+      if (g_str_has_prefix (display_name, chooser_entry->file_part))
+       {
+         if (!*common_prefix_ret)
+           {
+             *common_prefix_ret = g_strdup (display_name);
+             *unique_path_ret = gtk_file_path_copy (path);
+           }
+         else
+           {
+             gchar *p = *common_prefix_ret;
+             const gchar *q = display_name;
+                 
+             while (*p && *p == *q)
+               {
+                 p++;
+                 q++;
+               }
+                 
+             *p = '\0';
+
+             gtk_file_path_free (*unique_path_ret);
+             *unique_path_ret = NULL;
+           }
+       }
+
+      g_free (display_name);
+      gtk_file_path_free (path);
+      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
+    }
+}
+
+/* Finds a common prefix based on the contents of the entry and mandatorily appends it */
+static void
+append_common_prefix (GtkFileChooserEntry *chooser_entry,
+                     gboolean             highlight)
+{
+  gchar *common_prefix;
+  GtkFilePath *unique_path;
+
+  find_common_prefix (chooser_entry, &common_prefix, &unique_path);
+
+  if (unique_path)
+    {
+      common_prefix = maybe_append_separator_to_path (chooser_entry,
+                                                     unique_path,
+                                                     common_prefix);
       gtk_file_path_free (unique_path);
     }
-  
-  gtk_file_paths_free (child_paths);
 
   if (common_prefix)
     {
-      gint total_len;
       gint file_part_len;
       gint common_prefix_len;
       gint pos;
 
-      total_len = g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (chooser_entry)), -1);
       file_part_len = g_utf8_strlen (chooser_entry->file_part, -1);
       common_prefix_len = g_utf8_strlen (common_prefix, -1);
 
       if (common_prefix_len > file_part_len)
        {
+         pos = chooser_entry->file_part_pos;
+
          chooser_entry->in_change = TRUE;
-         
-         pos = total_len - file_part_len;
-         gtk_editable_delete_text (editable,
+         gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
                                    pos, -1);
-         gtk_editable_insert_text (editable,
+         gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
                                    common_prefix, -1, 
                                    &pos);
-         gtk_editable_select_region (editable,
-                                     total_len,
-                                     total_len - file_part_len + common_prefix_len);
-         
          chooser_entry->in_change = FALSE;
-         chooser_entry->has_completion = TRUE;
+
+         if (highlight)
+           {
+             gtk_editable_select_region (GTK_EDITABLE (chooser_entry),
+                                         chooser_entry->file_part_pos + file_part_len,
+                                         chooser_entry->file_part_pos + common_prefix_len);
+             chooser_entry->has_completion = TRUE;
+           }
        }
-         
+
       g_free (common_prefix);
     }
+}
+
+static gboolean
+check_completion_callback (GtkFileChooserEntry *chooser_entry)
+{
+  GDK_THREADS_ENTER ();
+
+  g_assert (chooser_entry->file_part);
+
+  chooser_entry->check_completion_idle = 0;
+
+  if (strcmp (chooser_entry->file_part, "") == 0)
+    goto done;
+
+  /* We only insert the common prefix without requiring the user to hit Tab in
+   * the "open" modes.  For "save" modes, the user must hit Tab to cause the prefix
+   * to be inserted.  That happens in gtk_file_chooser_entry_focus().
+   */
+  if (chooser_entry->action == GTK_FILE_CHOOSER_ACTION_OPEN
+      || chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+    append_common_prefix (chooser_entry, TRUE);
+
+ done:
+
+  GDK_THREADS_LEAVE ();
+
+  return FALSE;
+}
+
+static guint
+idle_add (GtkFileChooserEntry *chooser_entry, 
+         GCallback            cb)
+{
+  GSource *source;
+  guint id;
+
+  source = g_idle_source_new ();
+  g_source_set_priority (source, G_PRIORITY_HIGH);
+  g_source_set_closure (source,
+                       g_cclosure_new_object (cb, G_OBJECT (chooser_entry)));
+  id = g_source_attach (source, NULL);
+  g_source_unref (source);
+
+  return id;
+}
+
+static void
+add_completion_idle (GtkFileChooserEntry *chooser_entry)
+{
+  /* idle to update the selection based on the file list */
+  if (chooser_entry->check_completion_idle == 0)
+    chooser_entry->check_completion_idle = 
+      idle_add (chooser_entry, G_CALLBACK (check_completion_callback));
+}
+
+
+static void
+update_current_folder_files (GtkFileChooserEntry *chooser_entry,
+                            GSList              *added_uris)
+{
+  GSList *tmp_list;
+
+  g_assert (chooser_entry->completion_store != NULL);
+
+  /* Bah.  Need to turn off sorting */
+  for (tmp_list = added_uris; tmp_list; tmp_list = tmp_list->next)
+    {
+      GtkFileInfo *info;
+      GtkFilePath *path;
+
+      path = tmp_list->data;
+
+      info = gtk_file_folder_get_info (chooser_entry->current_folder,
+                                      path,
+                                      NULL); /* NULL-GError */
+      if (info)
+       {
+         gchar *display_name = g_strdup (gtk_file_info_get_display_name (info));
+         GtkTreeIter iter;
+
+          display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
+
+         gtk_list_store_append (chooser_entry->completion_store, &iter);
+         gtk_list_store_set (chooser_entry->completion_store, &iter,
+                             DISPLAY_NAME_COLUMN, display_name,
+                             PATH_COLUMN, path,
+                             -1);
+
+         gtk_file_info_free (info);
+          g_free (display_name);
+       }
+    }
+
+  /* FIXME: we want to turn off sorting temporarily.  I suck... */
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (chooser_entry->completion_store),
+                                       DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
+
+  add_completion_idle (chooser_entry);
+}
+
+static void
+files_added_cb (GtkFileSystem       *file_system,
+               GSList              *added_uris,
+               GtkFileChooserEntry *chooser_entry)
+{
+  update_current_folder_files (chooser_entry, added_uris);
+}
+
+static void
+files_deleted_cb (GtkFileSystem       *file_system,
+                 GSList              *deleted_uris,
+                 GtkFileChooserEntry *chooser_entry)
+{
+  /* FIXME: gravy... */
+}
+
+static void
+load_directory_get_folder_callback (GtkFileSystemHandle *handle,
+                                   GtkFileFolder       *folder,
+                                   const GError        *error,
+                                   gpointer             data)
+{
+  gboolean cancelled = handle->cancelled;
+  GtkFileChooserEntry *chooser_entry = data;
+
+  if (handle != chooser_entry->load_folder_handle)
+    goto out;
+
+  chooser_entry->load_folder_handle = NULL;
+
+  if (cancelled || error)
+    goto out;
+
+  chooser_entry->current_folder = folder;
+  g_signal_connect (chooser_entry->current_folder, "files-added",
+                   G_CALLBACK (files_added_cb), chooser_entry);
+  g_signal_connect (chooser_entry->current_folder, "files-removed",
+                   G_CALLBACK (files_deleted_cb), chooser_entry);
   
+  chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
+                                                       G_TYPE_STRING,
+                                                       GTK_TYPE_FILE_PATH);
+
+  gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
+                                 GTK_TREE_MODEL (chooser_entry->completion_store));
+
+out:
+  g_object_unref (chooser_entry);
+  g_object_unref (handle);
+}
+
+static gboolean
+load_directory_callback (GtkFileChooserEntry *chooser_entry)
+{
+  GDK_THREADS_ENTER ();
+
+  chooser_entry->load_directory_idle = 0;
+
+  /* guard against bogus settings*/
+  if (chooser_entry->current_folder_path == NULL ||
+      chooser_entry->file_system == NULL)
+    goto done;
+
+  if (chooser_entry->current_folder != NULL)
+    {
+      g_warning ("idle activate multiple times without clearing the folder object first.");
+      goto done;
+    }
+  g_assert (chooser_entry->completion_store == NULL);
+
+  /* Load the folder */
+  if (chooser_entry->load_folder_handle)
+    gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
+
+  chooser_entry->load_folder_handle =
+    gtk_file_system_get_folder (chooser_entry->file_system,
+                               chooser_entry->current_folder_path,
+                               GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_FOLDER,
+                               load_directory_get_folder_callback,
+                               g_object_ref (chooser_entry));
+
+ done:
+  
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 
@@ -291,40 +689,130 @@ gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
                                       gint        *position)
 {
   GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
-  
+
   parent_editable_iface->do_insert_text (editable, new_text, new_text_length, position);
 
-  if (!chooser_entry->in_change &&
-      *position == GTK_ENTRY (editable)->text_length &&
-      !chooser_entry->completion_idle)
-    {
-      chooser_entry->completion_idle = g_idle_source_new ();
-      g_source_set_priority (chooser_entry->completion_idle, G_PRIORITY_HIGH);
-      g_source_set_closure (chooser_entry->completion_idle,
-                           g_cclosure_new_object (G_CALLBACK (completion_idle_callback),
-                                                  G_OBJECT (chooser_entry)));
-      g_source_attach (chooser_entry->completion_idle, NULL);
-    }
+  if (! chooser_entry->in_change)
+    add_completion_idle (GTK_FILE_CHOOSER_ENTRY (editable));
 }
 
 static gboolean
 gtk_file_chooser_entry_focus (GtkWidget        *widget,
                              GtkDirectionType  direction)
 {
-  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
-  
-  if (direction == GTK_DIR_TAB_FORWARD &&
-      GTK_WIDGET_HAS_FOCUS (widget) &&
-      chooser_entry->has_completion)
+  GtkFileChooserEntry *chooser_entry;
+  GtkEditable *editable;
+  GtkEntry *entry;
+  GdkModifierType state;
+  gboolean control_pressed;
+
+  chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
+  editable = GTK_EDITABLE (widget);
+  entry = GTK_ENTRY (widget);
+
+  if (!chooser_entry->eat_tabs)
+    return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
+
+  control_pressed = FALSE;
+
+  if (gtk_get_current_event_state (&state))
+    {
+      if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+       control_pressed = TRUE;
+    }
+
+  /* This is a bit evil -- it makes Tab never leave the entry. It basically
+   * makes it 'safe' for people to hit. */
+  if ((direction == GTK_DIR_TAB_FORWARD) &&
+      (GTK_WIDGET_HAS_FOCUS (widget)) &&
+      (! control_pressed))
     {
-      gtk_editable_set_position (GTK_EDITABLE (widget),
-                                GTK_ENTRY (widget)->text_length);
+      gint pos = 0;
+
+      if (!chooser_entry->has_completion
+         && gtk_editable_get_position (editable) == entry->text_length)
+       append_common_prefix (chooser_entry, FALSE);
+
+      gtk_editable_set_position (editable, entry->text_length);
+
+      /* Trigger the completion window to pop up again by a 
+       * zero-length insertion, a bit of a hack.
+       */
+      gtk_editable_insert_text (editable, "", -1, &pos);
+
       return TRUE;
     }
   else
-    return GTK_WIDGET_CLASS (parent_class)->focus (widget, direction);
+    return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
+}
+
+static void
+gtk_file_chooser_entry_activate (GtkEntry *entry)
+{
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (entry);
+
+  if (chooser_entry->has_completion)
+    {
+      gtk_editable_set_position (GTK_EDITABLE (entry),
+                                entry->text_length);
+    }
+  
+  GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (entry);
+}
+
+/* This will see if a path typed by the user is new, and installs the loading
+ * idle if it is.
+ */
+static void
+gtk_file_chooser_entry_maybe_update_directory (GtkFileChooserEntry *chooser_entry,
+                                              GtkFilePath         *folder_path,
+                                              gboolean             force_reload)
+{
+  gboolean queue_idle = FALSE;
+
+  if (chooser_entry->current_folder_path)
+    {
+      if (gtk_file_path_compare (folder_path, chooser_entry->current_folder_path) != 0 || force_reload)
+       {
+         /* We changed our current directory.  We need to clear out the old
+          * directory information.
+          */
+         if (chooser_entry->current_folder)
+           {
+             g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
+                                                   G_CALLBACK (files_added_cb), chooser_entry);
+             g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
+                                                   G_CALLBACK (files_deleted_cb), chooser_entry);
+
+             g_object_unref (chooser_entry->current_folder);
+             chooser_entry->current_folder = NULL;
+           }
+         if (chooser_entry->completion_store)
+           {
+             gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)), NULL);
+             g_object_unref (chooser_entry->completion_store);
+             chooser_entry->completion_store = NULL;
+           }
+
+         queue_idle = TRUE;
+       }
+
+      gtk_file_path_free (chooser_entry->current_folder_path);
+    }
+  else
+    {
+      queue_idle = TRUE;
+    }
+
+  chooser_entry->current_folder_path = folder_path;
+
+  if (queue_idle && chooser_entry->load_directory_idle == 0)
+    chooser_entry->load_directory_idle =
+      idle_add (chooser_entry, G_CALLBACK (load_directory_callback));
 }
 
+
+
 static void
 gtk_file_chooser_entry_changed (GtkEditable *editable)
 {
@@ -332,9 +820,14 @@ gtk_file_chooser_entry_changed (GtkEditable *editable)
   const gchar *text;
   GtkFilePath *folder_path;
   gchar *file_part;
+  gsize total_len, file_part_len;
+  gint file_part_pos;
 
-  text = gtk_entry_get_text (GTK_ENTRY (editable));
+  if (chooser_entry->in_change)
+    return;
 
+  text = gtk_entry_get_text (GTK_ENTRY (editable));
+  
   if (!chooser_entry->file_system ||
       !chooser_entry->base_folder ||
       !gtk_file_system_parse (chooser_entry->file_system,
@@ -343,58 +836,64 @@ gtk_file_chooser_entry_changed (GtkEditable *editable)
     {
       folder_path = gtk_file_path_copy (chooser_entry->base_folder);
       file_part = g_strdup ("");
+      file_part_pos = -1;
     }
-
-  if (chooser_entry->current_folder_path)
+  else
     {
-      if (gtk_file_path_compare (folder_path, chooser_entry->current_folder_path) != 0)
-       {
-         if (chooser_entry->current_folder)
-           {
-             g_object_unref (chooser_entry->current_folder);
-             chooser_entry->current_folder = NULL;
-           }
-       }
-      
-      gtk_file_path_free (chooser_entry->current_folder_path);
+      file_part_len = strlen (file_part);
+      total_len = strlen (text);
+      if (total_len > file_part_len)
+       file_part_pos = g_utf8_strlen (text, total_len - file_part_len);
+      else
+       file_part_pos = 0;
     }
-  
-  chooser_entry->current_folder_path = folder_path;
 
-  if (chooser_entry->file_part)
-    g_free (chooser_entry->file_part);
+  g_free (chooser_entry->file_part);
 
   chooser_entry->file_part = file_part;
+  chooser_entry->file_part_pos = file_part_pos;
+
+  gtk_file_chooser_entry_maybe_update_directory (chooser_entry, folder_path, file_part_pos == -1);
 }
 
 static void
 clear_completion_callback (GtkFileChooserEntry *chooser_entry,
                           GParamSpec          *pspec)
 {
-  chooser_entry->has_completion = FALSE;
+  if (chooser_entry->has_completion)
+    {
+      chooser_entry->has_completion = FALSE;
+      gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
+    }
 }
 
 /**
  * _gtk_file_chooser_entry_new:
- * 
+ * @eat_tabs: If %FALSE, allow focus navigation with the tab key.
+ *
  * Creates a new #GtkFileChooserEntry object. #GtkFileChooserEntry
  * is an internal implementation widget for the GTK+ file chooser
  * which is an entry with completion with respect to a
  * #GtkFileSystem object.
- * 
+ *
  * Return value: the newly created #GtkFileChooserEntry
  **/
 GtkWidget *
-_gtk_file_chooser_entry_new (void)
+_gtk_file_chooser_entry_new (gboolean eat_tabs)
 {
-  return g_object_new (GTK_TYPE_FILE_CHOOSER_ENTRY, NULL);
+  GtkFileChooserEntry *chooser_entry;
+
+  chooser_entry = g_object_new (GTK_TYPE_FILE_CHOOSER_ENTRY, NULL);
+  chooser_entry->eat_tabs = (eat_tabs != FALSE);
+
+  return GTK_WIDGET (chooser_entry);
 }
 
 /**
  * _gtk_file_chooser_entry_set_file_system:
  * @chooser_entry: a #GtkFileChooser
  * @file_system: an object implementing #GtkFileSystem
- * 
+ *
  * Sets the file system for @chooser_entry.
  **/
 void
@@ -403,7 +902,7 @@ _gtk_file_chooser_entry_set_file_system (GtkFileChooserEntry *chooser_entry,
 {
   g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
   g_return_if_fail (GTK_IS_FILE_SYSTEM (file_system));
-  
+
   if (file_system != chooser_entry->file_system)
     {
       if (chooser_entry->file_system)
@@ -428,13 +927,15 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
     gtk_file_path_free (chooser_entry->base_folder);
 
   chooser_entry->base_folder = gtk_file_path_copy (path);
+
   gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
+  gtk_editable_select_region (GTK_EDITABLE (chooser_entry), 0, -1);
 }
 
 /**
  * _gtk_file_chooser_entry_get_current_folder:
  * @chooser_entry: a #GtkFileChooserEntry
- * 
+ *
  * Gets the current folder for the #GtkFileChooserEntry. If the
  * user has only entered a filename, this will be the base folder
  * (see _gtk_file_chooser_entry_set_base_folder()), but if the
@@ -442,31 +943,41 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
  * be different. If the user has entered a relative or absolute
  * path that doesn't point to a folder in the file system, it will
  * be %NULL.
- * 
+ *
  * Return value: the path of current folder - this value is owned by the
  *  chooser entry and must not be modified or freed.
  **/
 const GtkFilePath *
 _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
 {
+  if (chooser_entry->has_completion)
+    {
+      gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
+                                GTK_ENTRY (chooser_entry)->text_length);
+    }
   return chooser_entry->current_folder_path;
 }
 
 /**
  * _gtk_file_chooser_entry_get_file_part:
  * @chooser_entry: a #GtkFileChooserEntry
- * 
+ *
  * Gets the non-folder portion of whatever the user has entered
  * into the file selector. What is returned is a UTF-8 string,
  * and if a filename path is needed, gtk_file_system_make_path()
  * must be used
-  * 
+  *
  * Return value: the entered filename - this value is owned by the
  *  chooser entry and must not be modified or freed.
  **/
 const gchar *
 _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry)
 {
+  if (chooser_entry->has_completion)
+    {
+      gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
+                                GTK_ENTRY (chooser_entry)->text_length);
+    }
   return chooser_entry->file_part;
 }
 
@@ -474,7 +985,7 @@ _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry)
  * _gtk_file_chooser_entry_set_file_part:
  * @chooser_entry: a #GtkFileChooserEntry
  * @file_part: text to display in the entry, in UTF-8
- * 
+ *
  * Sets the current text shown in the file chooser entry.
  **/
 void
@@ -483,7 +994,83 @@ _gtk_file_chooser_entry_set_file_part (GtkFileChooserEntry *chooser_entry,
 {
   g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
 
-  chooser_entry->in_change = TRUE;
   gtk_entry_set_text (GTK_ENTRY (chooser_entry), file_part);
-  chooser_entry->in_change = FALSE;
+}
+
+
+/**
+ * _gtk_file_chooser_entry_set_action:
+ * @chooser_entry: a #GtkFileChooserEntry
+ * @action: the action which is performed by the file selector using this entry
+ *
+ * Sets action which is performed by the file selector using this entry. 
+ * The #GtkFileChooserEntry will use different completion strategies for 
+ * different actions.
+ **/
+void
+_gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry,
+                                   GtkFileChooserAction action)
+{
+  g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
+  
+  if (chooser_entry->action != action)
+    {
+      GtkEntryCompletion *comp;
+
+      chooser_entry->action = action;
+
+      comp = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
+
+      switch (action)
+       {
+       case GTK_FILE_CHOOSER_ACTION_OPEN:
+       case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
+         gtk_entry_completion_set_popup_single_match (comp, FALSE);
+         break;
+       case GTK_FILE_CHOOSER_ACTION_SAVE:
+       case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER:
+         gtk_entry_completion_set_popup_single_match (comp, TRUE);
+         break;
+       }
+    }
+}
+
+
+/**
+ * _gtk_file_chooser_entry_get_action:
+ * @chooser_entry: a #GtkFileChooserEntry
+ *
+ * Gets the action for this entry. 
+ *
+ * Returns: the action
+ **/
+GtkFileChooserAction
+_gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry)
+{
+  g_return_val_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry),
+                       GTK_FILE_CHOOSER_ACTION_OPEN);
+  
+  return chooser_entry->action;
+}
+
+gboolean
+_gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,
+                                      const GtkFilePath   *path)
+{
+  gboolean retval = FALSE;
+
+  if (chooser_entry->current_folder)
+    {
+      GtkFileInfo *file_info;
+
+      file_info = gtk_file_folder_get_info (chooser_entry->current_folder,
+                                           path, NULL);
+      if (file_info)
+        {
+         retval = gtk_file_info_get_is_folder (file_info);
+         gtk_file_info_free (file_info);
+       }
+    }
+
+  return retval;
 }