File gtk2-bnc171077-bgo314873-filechooser-tab-in-the-middle-of-entry.diff of Package gtk2
commit 1872d83d78cef1db765d4543df56d7f5ce9de348
Author: Federico Mena Quintero <federico@gnu.org>
Date: Wed Mar 26 14:35:24 2008 -0600
gtk2-bgo314873-filechooser-tab-in-the-middle-of-entry.diff
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index e68248d..aef6d31 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -21,11 +21,14 @@
#include <config.h>
#include <string.h>
+#include "gtkalignment.h"
#include "gtkcelllayout.h"
#include "gtkcellrenderertext.h"
#include "gtkentry.h"
#include "gtkfilechooserentry.h"
+#include "gtklabel.h"
#include "gtkmain.h"
+#include "gtkwindow.h"
#include "gtkintl.h"
#include "gtkalias.h"
@@ -40,6 +43,13 @@ struct _GtkFileChooserEntryClass
GtkEntryClass parent_class;
};
+/* Action to take when the current folder finishes loading (for explicit or automatic completion) */
+typedef enum {
+ LOAD_COMPLETE_NOTHING,
+ LOAD_COMPLETE_AUTOCOMPLETE,
+ LOAD_COMPLETE_EXPLICIT_COMPLETION
+} LoadCompleteAction;
+
struct _GtkFileChooserEntry
{
GtkEntry parent_instance;
@@ -48,17 +58,24 @@ struct _GtkFileChooserEntry
GtkFileSystem *file_system;
GtkFilePath *base_folder;
- GtkFilePath *current_folder_path;
gchar *file_part;
gint file_part_pos;
- guint check_completion_idle;
- guint load_directory_idle;
+ /* Folder being loaded or already loaded */
+ GtkFilePath *current_folder_path;
GtkFileFolder *current_folder;
GtkFileSystemHandle *load_folder_handle;
+ LoadCompleteAction load_complete_action;
+
GtkListStore *completion_store;
+ guint start_autocompletion_idle_id;
+
+ GtkWidget *completion_feedback_window;
+ GtkWidget *completion_feedback_label;
+ guint completion_feedback_timeout_id;
+
guint has_completion : 1;
guint in_change : 1;
guint eat_tabs : 1;
@@ -71,22 +88,31 @@ enum
N_COLUMNS
};
+#define COMPLETION_FEEDBACK_TIMEOUT_MS 2000
+
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 void gtk_file_chooser_entry_grab_focus (GtkWidget *widget);
+static void gtk_file_chooser_entry_unmap (GtkWidget *widget);
static gboolean gtk_file_chooser_entry_focus (GtkWidget *widget,
GtkDirectionType direction);
+static gboolean gtk_file_chooser_entry_focus_out_event (GtkWidget *widget,
+ GdkEventFocus *event);
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 clear_completion_callback (GtkFileChooserEntry *chooser_entry,
- GParamSpec *pspec);
+static void gtk_file_chooser_entry_do_delete_text (GtkEditable *editable,
+ gint start_pos,
+ gint end_pos);
+static void gtk_file_chooser_entry_set_position (GtkEditable *editable,
+ gint position);
+static void gtk_file_chooser_entry_set_selection_bounds (GtkEditable *editable,
+ gint start_pos,
+ gint end_pos);
#ifdef G_OS_WIN32
static gint insert_text_callback (GtkFileChooserEntry *widget,
@@ -108,16 +134,25 @@ 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);
+typedef enum {
+ REFRESH_UP_TO_CURSOR_POSITION,
+ REFRESH_WHOLE_TEXT
+} RefreshMode;
+
+static void refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
+ RefreshMode refresh_mode);
+static void finished_loading_cb (GtkFileFolder *folder,
+ gpointer data);
+static void autocomplete (GtkFileChooserEntry *chooser_entry);
+static void install_start_autocompletion_idle (GtkFileChooserEntry *chooser_entry);
+static void remove_completion_feedback (GtkFileChooserEntry *chooser_entry);
+static void pop_up_completion_feedback (GtkFileChooserEntry *chooser_entry,
+ const gchar *feedback);
+
static GtkEditableClass *parent_editable_iface;
G_DEFINE_TYPE_WITH_CODE (GtkFileChooserEntry, _gtk_file_chooser_entry, GTK_TYPE_ENTRY,
@@ -135,7 +170,9 @@ _gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
gobject_class->dispose = gtk_file_chooser_entry_dispose;
widget_class->grab_focus = gtk_file_chooser_entry_grab_focus;
+ widget_class->unmap = gtk_file_chooser_entry_unmap;
widget_class->focus = gtk_file_chooser_entry_focus;
+ widget_class->focus_out_event = gtk_file_chooser_entry_focus_out_event;
entry_class->activate = gtk_file_chooser_entry_activate;
}
@@ -146,7 +183,9 @@ gtk_file_chooser_entry_iface_init (GtkEditableClass *iface)
parent_editable_iface = g_type_interface_peek_parent (iface);
iface->do_insert_text = gtk_file_chooser_entry_do_insert_text;
- iface->changed = gtk_file_chooser_entry_changed;
+ iface->do_delete_text = gtk_file_chooser_entry_do_delete_text;
+ iface->set_position = gtk_file_chooser_entry_set_position;
+ iface->set_selection_bounds = gtk_file_chooser_entry_set_selection_bounds;
}
static void
@@ -178,11 +217,6 @@ _gtk_file_chooser_entry_init (GtkFileChooserEntry *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",
- G_CALLBACK (clear_completion_callback), NULL);
-
#ifdef G_OS_WIN32
g_signal_connect (chooser_entry, "insert_text",
G_CALLBACK (insert_text_callback), NULL);
@@ -208,6 +242,14 @@ gtk_file_chooser_entry_dispose (GObject *object)
{
GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
+ remove_completion_feedback (chooser_entry);
+
+ if (chooser_entry->start_autocompletion_idle_id != 0)
+ {
+ g_source_remove (chooser_entry->start_autocompletion_idle_id);
+ chooser_entry->start_autocompletion_idle_id = 0;
+ }
+
if (chooser_entry->completion_store)
{
g_object_unref (chooser_entry->completion_store);
@@ -223,9 +265,7 @@ gtk_file_chooser_entry_dispose (GObject *object)
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_CALLBACK (finished_loading_cb), chooser_entry);
g_object_unref (chooser_entry->current_folder);
chooser_entry->current_folder = NULL;
}
@@ -236,18 +276,6 @@ gtk_file_chooser_entry_dispose (GObject *object)
chooser_entry->file_system = NULL;
}
- if (chooser_entry->check_completion_idle)
- {
- g_source_remove (chooser_entry->check_completion_idle);
- chooser_entry->check_completion_idle = 0;
- }
-
- 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);
}
@@ -366,6 +394,21 @@ completion_match_func (GtkEntryCompletion *comp,
return result;
}
+static void
+clear_completions (GtkFileChooserEntry *chooser_entry)
+{
+ chooser_entry->has_completion = FALSE;
+ chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+
+ remove_completion_feedback (chooser_entry);
+}
+
+static void
+beep (GtkFileChooserEntry *chooser_entry)
+{
+ gtk_widget_error_bell (GTK_WIDGET (chooser_entry));
+}
+
/* 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
@@ -404,23 +447,66 @@ maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
return display_name;
}
+static char *
+trim_dir_separator_suffix (const char *str)
+{
+ int len;
+
+ len = strlen (str);
+ if (len > 0 && G_IS_DIR_SEPARATOR (str[len - 1]))
+ return g_strndup (str, len - 1);
+ else
+ return g_strdup (str);
+}
+
/* 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
+static gboolean
find_common_prefix (GtkFileChooserEntry *chooser_entry,
gchar **common_prefix_ret,
- GtkFilePath **unique_path_ret)
+ GtkFilePath **unique_path_ret,
+ gboolean *is_complete_not_unique_ret,
+ gboolean *prefix_expands_the_file_part_ret,
+ GError **error)
{
+ GtkEditable *editable;
GtkTreeIter iter;
+ gboolean parsed;
gboolean valid;
+ char *text_up_to_cursor;
+ GtkFilePath *parsed_folder_path;
+ char *parsed_file_part;
*common_prefix_ret = NULL;
*unique_path_ret = NULL;
+ *is_complete_not_unique_ret = FALSE;
+ *prefix_expands_the_file_part_ret = FALSE;
- if (chooser_entry->completion_store == NULL)
- return;
+ editable = GTK_EDITABLE (chooser_entry);
+
+ text_up_to_cursor = gtk_editable_get_chars (editable, 0, gtk_editable_get_position (editable));
+
+ parsed = gtk_file_system_parse (chooser_entry->file_system,
+ chooser_entry->base_folder,
+ text_up_to_cursor,
+ &parsed_folder_path,
+ &parsed_file_part,
+ error);
+
+ g_free (text_up_to_cursor);
+
+ if (!parsed)
+ return FALSE;
+
+ g_assert (parsed_folder_path != NULL
+ && chooser_entry->current_folder_path != NULL
+ && gtk_file_path_compare (parsed_folder_path, chooser_entry->current_folder_path) == 0);
+
+ gtk_file_path_free (parsed_folder_path);
+
+ /* First pass: find the common prefix */
valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
@@ -435,24 +521,24 @@ find_common_prefix (GtkFileChooserEntry *chooser_entry,
PATH_COLUMN, &path,
-1);
- if (g_str_has_prefix (display_name, chooser_entry->file_part))
+ if (g_str_has_prefix (display_name, parsed_file_part))
{
if (!*common_prefix_ret)
{
- *common_prefix_ret = g_strdup (display_name);
+ *common_prefix_ret = trim_dir_separator_suffix (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);
@@ -464,42 +550,159 @@ find_common_prefix (GtkFileChooserEntry *chooser_entry,
gtk_file_path_free (path);
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
}
+
+ /* Second pass: see if the prefix we found is a complete match */
+
+ if (*common_prefix_ret != NULL)
+ {
+ valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
+
+ while (valid)
+ {
+ gchar *display_name;
+ int len;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store),
+ &iter,
+ DISPLAY_NAME_COLUMN, &display_name,
+ -1);
+ len = strlen (display_name);
+ g_assert (len > 0);
+
+ if (G_IS_DIR_SEPARATOR (display_name[len - 1]))
+ len--;
+
+ if (strncmp (*common_prefix_ret, display_name, len) == 0)
+ *is_complete_not_unique_ret = TRUE;
+
+ g_free (display_name);
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
+ }
+
+ /* Finally: Did we generate a new completion, or was the user's input already completed as far as it could go? */
+
+ *prefix_expands_the_file_part_ret = g_utf8_strlen (*common_prefix_ret, -1) > g_utf8_strlen (parsed_file_part, -1);
+ }
+
+ g_free (parsed_file_part);
+
+ return TRUE;
}
+static gboolean
+char_after_cursor_is_directory_separator (GtkFileChooserEntry *chooser_entry)
+{
+ int cursor_pos;
+ gboolean result;
+
+ result = FALSE;
+
+ cursor_pos = gtk_editable_get_position (GTK_EDITABLE (chooser_entry));
+ if (cursor_pos < GTK_ENTRY (chooser_entry)->text_length)
+ {
+ char *next_char_str;
+
+ next_char_str = gtk_editable_get_chars (GTK_EDITABLE (chooser_entry), cursor_pos, cursor_pos + 1);
+ if (G_IS_DIR_SEPARATOR (*next_char_str))
+ result = TRUE;
+
+ g_free (next_char_str);
+ }
+
+ return result;
+}
+
+typedef enum {
+ INVALID_INPUT, /* what the user typed is bogus */
+ NO_MATCH, /* no matches based on what the user typed */
+ NOTHING_INSERTED_COMPLETE, /* what the user typed is already completed as far as it will go */
+ NOTHING_INSERTED_UNIQUE, /* what the user typed is already completed, and is a unique match */
+ COMPLETED, /* completion inserted (ambiguous suffix) */
+ COMPLETED_UNIQUE, /* completion inserted, and it is a complete name and a unique match */
+ COMPLETE_BUT_NOT_UNIQUE /* completion inserted, it is a complete name but not unique */
+} CommonPrefixResult;
+
/* Finds a common prefix based on the contents of the entry and mandatorily appends it */
-static void
+static CommonPrefixResult
append_common_prefix (GtkFileChooserEntry *chooser_entry,
- gboolean highlight)
+ gboolean highlight,
+ gboolean show_errors)
{
gchar *common_prefix;
GtkFilePath *unique_path;
+ gboolean is_complete_not_unique;
+ gboolean prefix_expands_the_file_part;
+ GError *error;
+ CommonPrefixResult result;
+ gboolean have_result;
+
+ clear_completions (chooser_entry);
+
+ if (chooser_entry->completion_store == NULL)
+ return NO_MATCH;
+
+ error = NULL;
+ if (!find_common_prefix (chooser_entry, &common_prefix, &unique_path, &is_complete_not_unique, &prefix_expands_the_file_part, &error))
+ {
+ if (show_errors)
+ {
+ beep (chooser_entry);
+ pop_up_completion_feedback (chooser_entry, _("Invalid path"));
+ }
- find_common_prefix (chooser_entry, &common_prefix, &unique_path);
+ g_error_free (error);
+
+ return INVALID_INPUT;
+ }
+
+ have_result = FALSE;
if (unique_path)
{
- common_prefix = maybe_append_separator_to_path (chooser_entry,
- unique_path,
- common_prefix);
+ if (!char_after_cursor_is_directory_separator (chooser_entry))
+ common_prefix = maybe_append_separator_to_path (chooser_entry,
+ unique_path,
+ common_prefix);
+
gtk_file_path_free (unique_path);
+
+ if (common_prefix)
+ {
+ if (prefix_expands_the_file_part)
+ result = COMPLETED_UNIQUE;
+ else
+ result = NOTHING_INSERTED_UNIQUE;
+ }
+ else
+ result = INVALID_INPUT;
+
+ have_result = TRUE;
+ }
+ else
+ {
+ if (is_complete_not_unique)
+ {
+ result = COMPLETE_BUT_NOT_UNIQUE;
+ have_result = TRUE;
+ }
}
if (common_prefix)
{
- gint file_part_len;
+ gint cursor_pos;
gint common_prefix_len;
gint pos;
- file_part_len = g_utf8_strlen (chooser_entry->file_part, -1);
+ cursor_pos = gtk_editable_get_position (GTK_EDITABLE (chooser_entry));
common_prefix_len = g_utf8_strlen (common_prefix, -1);
- if (common_prefix_len > file_part_len)
- {
- pos = chooser_entry->file_part_pos;
+ pos = chooser_entry->file_part_pos;
+ if (prefix_expands_the_file_part)
+ {
chooser_entry->in_change = TRUE;
gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
- pos, -1);
+ pos, cursor_pos);
gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
common_prefix, -1,
&pos);
@@ -508,221 +711,404 @@ append_common_prefix (GtkFileChooserEntry *chooser_entry,
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);
+ cursor_pos,
+ pos); /* equivalent to cursor_pos + common_prefix_len); */
chooser_entry->has_completion = TRUE;
}
+ else
+ gtk_editable_set_position (GTK_EDITABLE (chooser_entry), pos);
+ }
+ else if (!have_result)
+ {
+ result = NOTHING_INSERTED_COMPLETE;
+ have_result = TRUE;
}
g_free (common_prefix);
+
+ if (have_result)
+ return result;
+ else
+ return COMPLETED;
+ }
+ else
+ {
+ if (have_result)
+ return result;
+ else
+ return NO_MATCH;
}
}
-static gboolean
-check_completion_callback (GtkFileChooserEntry *chooser_entry)
+static void
+gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
+ const gchar *new_text,
+ gint new_text_length,
+ gint *position)
{
- GDK_THREADS_ENTER ();
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
+ gint old_text_len;
+ gint insert_pos;
- g_assert (chooser_entry->file_part);
+ old_text_len = GTK_ENTRY (chooser_entry)->text_length;
+ insert_pos = *position;
- chooser_entry->check_completion_idle = 0;
+ parent_editable_iface->do_insert_text (editable, new_text, new_text_length, position);
- if (strcmp (chooser_entry->file_part, "") == 0)
- goto done;
+ if (chooser_entry->in_change)
+ return;
- /* 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);
+ remove_completion_feedback (chooser_entry);
- done:
+ if ((chooser_entry->action == GTK_FILE_CHOOSER_ACTION_OPEN
+ || chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+ && insert_pos == old_text_len)
+ install_start_autocompletion_idle (chooser_entry);
+}
- GDK_THREADS_LEAVE ();
+static void
+clear_completions_if_not_in_change (GtkFileChooserEntry *chooser_entry)
+{
+ if (chooser_entry->in_change)
+ return;
- return FALSE;
+ clear_completions (chooser_entry);
}
-static guint
-idle_add (GtkFileChooserEntry *chooser_entry,
- GCallback cb)
+static void
+gtk_file_chooser_entry_do_delete_text (GtkEditable *editable,
+ gint start_pos,
+ gint end_pos)
{
- GSource *source;
- guint id;
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
- 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);
+ parent_editable_iface->do_delete_text (editable, start_pos, end_pos);
- return id;
+ clear_completions_if_not_in_change (chooser_entry);
}
static void
-add_completion_idle (GtkFileChooserEntry *chooser_entry)
+gtk_file_chooser_entry_set_position (GtkEditable *editable,
+ gint position)
{
- /* 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));
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
+
+ parent_editable_iface->set_position (editable, position);
+
+ clear_completions_if_not_in_change (chooser_entry);
}
+static void
+gtk_file_chooser_entry_set_selection_bounds (GtkEditable *editable,
+ gint start_pos,
+ gint end_pos)
+{
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
+
+ parent_editable_iface->set_selection_bounds (editable, start_pos, end_pos);
+
+ clear_completions_if_not_in_change (chooser_entry);
+}
static void
-update_current_folder_files (GtkFileChooserEntry *chooser_entry,
- GSList *added_uris)
+gtk_file_chooser_entry_grab_focus (GtkWidget *widget)
{
- GSList *tmp_list;
+ GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->grab_focus (widget);
+ _gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (widget));
+}
- g_assert (chooser_entry->completion_store != NULL);
+static void
+gtk_file_chooser_entry_unmap (GtkWidget *widget)
+{
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
- /* Bah. Need to turn off sorting */
- for (tmp_list = added_uris; tmp_list; tmp_list = tmp_list->next)
- {
- GtkFileInfo *info;
- GtkFilePath *path;
+ remove_completion_feedback (chooser_entry);
- path = tmp_list->data;
+ GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->unmap (widget);
+}
- 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;
+static gboolean
+completion_feedback_window_expose_event_cb (GtkWidget *widget,
+ GdkEventExpose *event,
+ gpointer data)
+{
+ /* Stolen from gtk_tooltip_paint_window() */
- display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
- 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_paint_flat_box (chooser_entry->completion_feedback_window->style,
+ chooser_entry->completion_feedback_window->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ NULL,
+ chooser_entry->completion_feedback_window,
+ "tooltip",
+ 0, 0,
+ chooser_entry->completion_feedback_window->allocation.width,
+ chooser_entry->completion_feedback_window->allocation.height);
- gtk_file_info_free (info);
- g_free (display_name);
- }
- }
+ return FALSE;
+}
- /* 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);
+static void
+set_invisible_mouse_cursor (GdkWindow *window)
+{
+ /* Stolen from gtkentry.c:set_invisible_cursor() */
+ /* FIXME: implement a stupid public gdk_window_set_invisible_mouse_cursor() */
- add_completion_idle (chooser_entry);
+ GdkBitmap *empty_bitmap;
+ GdkCursor *cursor;
+ GdkColor useless;
+ char invisible_cursor_bits[] = { 0x0 };
+
+ useless.red = useless.green = useless.blue = 0;
+ useless.pixel = 0;
+
+ empty_bitmap = gdk_bitmap_create_from_data (window,
+ invisible_cursor_bits,
+ 1, 1);
+
+ cursor = gdk_cursor_new_from_pixmap (empty_bitmap,
+ empty_bitmap,
+ &useless,
+ &useless, 0, 0);
+
+ gdk_window_set_cursor (window, cursor);
+
+ gdk_cursor_unref (cursor);
+
+ g_object_unref (empty_bitmap);
}
static void
-files_added_cb (GtkFileSystem *file_system,
- GSList *added_uris,
- GtkFileChooserEntry *chooser_entry)
+completion_feedback_window_realize_cb (GtkWidget *widget,
+ gpointer data)
{
- update_current_folder_files (chooser_entry, added_uris);
+ /* We hide the mouse cursor inside the completion feedback window, since
+ * GtkEntry hides the cursor when the user types. We don't want the cursor to
+ * come back if the completion feedback ends up where the mouse is.
+ */
+ set_invisible_mouse_cursor (widget->window);
}
static void
-files_deleted_cb (GtkFileSystem *file_system,
- GSList *deleted_uris,
- GtkFileChooserEntry *chooser_entry)
+create_completion_feedback_window (GtkFileChooserEntry *chooser_entry)
+{
+ /* Stolen from gtk_tooltip_init() */
+
+ GtkWidget *alignment;
+
+ chooser_entry->completion_feedback_window = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_window_set_type_hint (GTK_WINDOW (chooser_entry->completion_feedback_window),
+ GDK_WINDOW_TYPE_HINT_TOOLTIP);
+ gtk_widget_set_app_paintable (chooser_entry->completion_feedback_window, TRUE);
+ gtk_window_set_resizable (GTK_WINDOW (chooser_entry->completion_feedback_window), FALSE);
+ gtk_widget_set_name (chooser_entry->completion_feedback_window, "gtk-tooltip");
+
+ alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
+ chooser_entry->completion_feedback_window->style->ythickness,
+ chooser_entry->completion_feedback_window->style->ythickness,
+ chooser_entry->completion_feedback_window->style->xthickness,
+ chooser_entry->completion_feedback_window->style->xthickness);
+ gtk_container_add (GTK_CONTAINER (chooser_entry->completion_feedback_window), alignment);
+ gtk_widget_show (alignment);
+
+ g_signal_connect (chooser_entry->completion_feedback_window, "expose_event",
+ G_CALLBACK (completion_feedback_window_expose_event_cb), chooser_entry);
+ g_signal_connect (chooser_entry->completion_feedback_window, "realize",
+ G_CALLBACK (completion_feedback_window_realize_cb), chooser_entry);
+ /* FIXME: connect to motion-notify-event, and *show* the cursor when the mouse moves */
+
+ chooser_entry->completion_feedback_label = gtk_label_new (NULL);
+ gtk_container_add (GTK_CONTAINER (alignment), chooser_entry->completion_feedback_label);
+ gtk_widget_show (chooser_entry->completion_feedback_label);
+}
+
+static gboolean
+completion_feedback_timeout_cb (gpointer data)
{
- /* FIXME: gravy... */
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
+
+ chooser_entry->completion_feedback_timeout_id = 0;
+
+ remove_completion_feedback (chooser_entry);
+ return FALSE;
}
static void
-load_directory_get_folder_callback (GtkFileSystemHandle *handle,
- GtkFileFolder *folder,
- const GError *error,
- gpointer data)
+install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry)
{
- gboolean cancelled = handle->cancelled;
- GtkFileChooserEntry *chooser_entry = data;
+ g_assert (chooser_entry->completion_feedback_timeout_id == 0);
- if (handle != chooser_entry->load_folder_handle)
- goto out;
+ chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS,
+ completion_feedback_timeout_cb,
+ chooser_entry);
+}
- chooser_entry->load_folder_handle = NULL;
+/* Gets the x position of the text cursor in the entry, in widget coordinates */
+static void
+get_entry_cursor_x (GtkFileChooserEntry *chooser_entry,
+ gint *x_ret)
+{
+ /* FIXME: see the docs for gtk_entry_get_layout_offsets(). As an exercise for
+ * the reader, you have to implement support for the entry's scroll offset and
+ * RTL layouts and all the fancy Pango stuff.
+ */
- if (cancelled || error)
- goto out;
+ PangoLayout *layout;
+ gint layout_x, layout_y;
+ gint layout_index;
+ PangoRectangle strong_pos;
- 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);
+ layout = gtk_entry_get_layout (GTK_ENTRY (chooser_entry));
- gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
- GTK_TREE_MODEL (chooser_entry->completion_store));
+ gtk_entry_get_layout_offsets (GTK_ENTRY (chooser_entry), &layout_x, &layout_y);
-out:
- g_object_unref (chooser_entry);
- g_object_unref (handle);
+ layout_index = gtk_entry_text_index_to_layout_index (GTK_ENTRY (chooser_entry),
+ GTK_ENTRY (chooser_entry)->current_pos);
+
+ pango_layout_get_cursor_pos (layout, layout_index, &strong_pos, NULL);
+
+ *x_ret = layout_x + strong_pos.x / PANGO_SCALE;
}
-static gboolean
-load_directory_callback (GtkFileChooserEntry *chooser_entry)
+static void
+show_completion_feedback_window (GtkFileChooserEntry *chooser_entry)
{
- GDK_THREADS_ENTER ();
+ /* More or less stolen from gtk_tooltip_position() */
- chooser_entry->load_directory_idle = 0;
+ GtkRequisition feedback_req;
+ gint entry_x, entry_y;
+ gint cursor_x;
+ GtkAllocation *entry_allocation;
+ int feedback_x, feedback_y;
- /* guard against bogus settings*/
- if (chooser_entry->current_folder_path == NULL ||
- chooser_entry->file_system == NULL)
- goto done;
+ gtk_widget_size_request (chooser_entry->completion_feedback_window, &feedback_req);
- 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);
+ gdk_window_get_origin (GTK_WIDGET (chooser_entry)->window, &entry_x, &entry_y);
+ entry_allocation = &(GTK_WIDGET (chooser_entry)->allocation);
- /* Load the folder */
- if (chooser_entry->load_folder_handle)
- gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
+ get_entry_cursor_x (chooser_entry, &cursor_x);
- 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));
+ /* FIXME: fit to the screen if we bump on the screen's edge */
+ feedback_x = entry_x + cursor_x + entry_allocation->height / 2; /* cheap "half M-width" */
+ feedback_y = entry_y + (entry_allocation->height - feedback_req.height) / 2;
- done:
-
- GDK_THREADS_LEAVE ();
+ gtk_window_move (GTK_WINDOW (chooser_entry->completion_feedback_window), feedback_x, feedback_y);
+ gtk_widget_show (chooser_entry->completion_feedback_window);
- return FALSE;
+ install_completion_feedback_timer (chooser_entry);
}
static void
-gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position)
+pop_up_completion_feedback (GtkFileChooserEntry *chooser_entry,
+ const gchar *feedback)
{
- GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
+ if (chooser_entry->completion_feedback_window == NULL)
+ create_completion_feedback_window (chooser_entry);
- parent_editable_iface->do_insert_text (editable, new_text, new_text_length, position);
+ gtk_label_set_text (GTK_LABEL (chooser_entry->completion_feedback_label), feedback);
- if (! chooser_entry->in_change)
- add_completion_idle (GTK_FILE_CHOOSER_ENTRY (editable));
+ show_completion_feedback_window (chooser_entry);
}
static void
-gtk_file_chooser_entry_grab_focus (GtkWidget *widget)
+remove_completion_feedback (GtkFileChooserEntry *chooser_entry)
{
- GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->grab_focus (widget);
- _gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (widget));
+ if (chooser_entry->completion_feedback_window)
+ gtk_widget_destroy (chooser_entry->completion_feedback_window);
+
+ chooser_entry->completion_feedback_window = NULL;
+ chooser_entry->completion_feedback_label = NULL;
+
+ if (chooser_entry->completion_feedback_timeout_id != 0)
+ {
+ g_source_remove (chooser_entry->completion_feedback_timeout_id);
+ chooser_entry->completion_feedback_timeout_id = 0;
+ }
+}
+
+static void
+explicitly_complete (GtkFileChooserEntry *chooser_entry)
+{
+ CommonPrefixResult result;
+
+ g_assert (chooser_entry->current_folder != NULL);
+ g_assert (gtk_file_folder_is_finished_loading (chooser_entry->current_folder));
+
+ /* FIXME: see what Emacs does in case there is no common prefix, or there is more than one match:
+ *
+ * - If there is a common prefix, insert it (done)
+ * - If there is no common prefix, pop up the suggestion window
+ * - If there are no matches at all, beep and bring up a tooltip (done)
+ * - If the suggestion window is already up, scroll it
+ */
+ result = append_common_prefix (chooser_entry, FALSE, TRUE);
+
+ switch (result)
+ {
+ case INVALID_INPUT:
+ /* We already beeped in append_common_prefix(); do nothing here */
+ break;
+
+ case NO_MATCH:
+ beep (chooser_entry);
+ pop_up_completion_feedback (chooser_entry, _("No match"));
+ break;
+
+ case NOTHING_INSERTED_COMPLETE:
+ /* FIXME: pop up the suggestion window or scroll it */
+ break;
+
+ case NOTHING_INSERTED_UNIQUE:
+ pop_up_completion_feedback (chooser_entry, _("Sole completion"));
+ break;
+
+ case COMPLETED:
+ /* Nothing to do */
+ break;
+
+ case COMPLETED_UNIQUE:
+ /* Nothing to do */
+ break;
+
+ case COMPLETE_BUT_NOT_UNIQUE:
+ pop_up_completion_feedback (chooser_entry, _("Complete, but not unique"));
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+}
+
+static void
+start_explicit_completion (GtkFileChooserEntry *chooser_entry)
+{
+ refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
+
+ if (!chooser_entry->current_folder_path)
+ {
+ /* Here, no folder path means we couldn't parse what the user typed. */
+
+ beep (chooser_entry);
+ pop_up_completion_feedback (chooser_entry, _("Invalid path"));
+
+ chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+ return;
+ }
+
+ if (chooser_entry->current_folder
+ && gtk_file_folder_is_finished_loading (chooser_entry->current_folder))
+ {
+ explicitly_complete (chooser_entry);
+ }
+ else
+ {
+ chooser_entry->load_complete_action = LOAD_COMPLETE_EXPLICIT_COMPLETION;
+
+ pop_up_completion_feedback (chooser_entry, _("Completing..."));
+ }
}
static gboolean
@@ -756,18 +1142,10 @@ gtk_file_chooser_entry_focus (GtkWidget *widget,
(GTK_WIDGET_HAS_FOCUS (widget)) &&
(! control_pressed))
{
- 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);
+ if (chooser_entry->has_completion)
+ gtk_editable_set_position (editable, entry->text_length);
+ else
+ start_explicit_completion (chooser_entry);
return TRUE;
}
@@ -775,87 +1153,292 @@ gtk_file_chooser_entry_focus (GtkWidget *widget,
return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
}
+static gboolean
+gtk_file_chooser_entry_focus_out_event (GtkWidget *widget,
+ GdkEventFocus *event)
+{
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
+
+ chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+
+ return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus_out_event (widget, event);
+}
+
+static void
+commit_completion_and_refresh (GtkFileChooserEntry *chooser_entry)
+{
+ if (chooser_entry->has_completion)
+ {
+ gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
+ GTK_ENTRY (chooser_entry)->text_length);
+ }
+
+ refresh_current_folder_and_file_part (chooser_entry, REFRESH_WHOLE_TEXT);
+}
+
static void
gtk_file_chooser_entry_activate (GtkEntry *entry)
{
GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (entry);
- if (chooser_entry->has_completion)
+ commit_completion_and_refresh (chooser_entry);
+ GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (entry);
+}
+
+static void
+discard_completion_store (GtkFileChooserEntry *chooser_entry)
+{
+ if (!chooser_entry->completion_store)
+ return;
+
+ 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;
+}
+
+/* Fills the completion store from the contents of the current folder */
+static void
+populate_completion_store (GtkFileChooserEntry *chooser_entry)
+{
+ GSList *paths;
+ GSList *tmp_list;
+
+ discard_completion_store (chooser_entry);
+
+ if (!gtk_file_folder_list_children (chooser_entry->current_folder, &paths, NULL)) /* NULL-GError */
+ return;
+
+ chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
+ G_TYPE_STRING,
+ GTK_TYPE_FILE_PATH);
+
+ for (tmp_list = paths; tmp_list; tmp_list = tmp_list->next)
{
- gtk_editable_set_position (GTK_EDITABLE (entry),
- entry->text_length);
+ 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);
+ }
}
-
- GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (entry);
+
+ gtk_file_paths_free (paths);
+
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (chooser_entry->completion_store),
+ DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
+
+ gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
+ GTK_TREE_MODEL (chooser_entry->completion_store));
}
-/* This will see if a path typed by the user is new, and installs the loading
- * idle if it is.
+/* When we finish loading the current folder, this function should get called to
+ * perform the deferred autocompletion or explicit completion.
*/
static void
-gtk_file_chooser_entry_maybe_update_directory (GtkFileChooserEntry *chooser_entry,
- GtkFilePath *folder_path,
- gboolean force_reload)
+perform_load_complete_action (GtkFileChooserEntry *chooser_entry)
{
- gboolean queue_idle = FALSE;
+ switch (chooser_entry->load_complete_action)
+ {
+ case LOAD_COMPLETE_NOTHING:
+ break;
+
+ case LOAD_COMPLETE_AUTOCOMPLETE:
+ autocomplete (chooser_entry);
+ break;
+
+ case LOAD_COMPLETE_EXPLICIT_COMPLETION:
+ explicitly_complete (chooser_entry);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+}
+
+static void
+finish_folder_load (GtkFileChooserEntry *chooser_entry)
+{
+ populate_completion_store (chooser_entry);
+ perform_load_complete_action (chooser_entry);
+
+ gtk_widget_set_tooltip_text (GTK_WIDGET (chooser_entry), NULL);
+}
+
+/* Callback when the current folder finishes loading */
+static void
+finished_loading_cb (GtkFileFolder *folder,
+ gpointer data)
+{
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
+
+ finish_folder_load (chooser_entry);
+}
+
+/* Callback when the current folder's handle gets obtained (not necessarily loaded completely) */
+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 (error)
+ {
+ LoadCompleteAction old_load_complete_action;
+
+ old_load_complete_action = chooser_entry->load_complete_action;
+
+ clear_completions (chooser_entry);
+
+ if (old_load_complete_action == LOAD_COMPLETE_EXPLICIT_COMPLETION)
+ {
+ /* Since this came from explicit user action (Tab completion), we'll present errors visually */
+
+ beep (chooser_entry);
+ pop_up_completion_feedback (chooser_entry, error->message);
+ }
+
+ gtk_file_path_free (chooser_entry->current_folder_path);
+ chooser_entry->current_folder_path = NULL;
+ }
+
+ if (cancelled || error)
+ goto out;
+
+ g_assert (folder != NULL);
+ chooser_entry->current_folder = folder;
+
+ discard_completion_store (chooser_entry);
+
+ if (gtk_file_folder_is_finished_loading (chooser_entry->current_folder))
+ finish_folder_load (chooser_entry);
+ else
+ g_signal_connect (chooser_entry->current_folder, "finished-loading",
+ G_CALLBACK (finished_loading_cb), chooser_entry);
+
+out:
+ g_object_unref (chooser_entry);
+ g_object_unref (handle);
+}
+
+static void
+start_loading_current_folder (GtkFileChooserEntry *chooser_entry)
+{
+ if (chooser_entry->current_folder_path == NULL ||
+ chooser_entry->file_system == NULL)
+ return;
+
+ g_assert (chooser_entry->current_folder == NULL);
+ g_assert (chooser_entry->load_folder_handle == NULL);
+
+ 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));
+}
+
+static void
+reload_current_folder (GtkFileChooserEntry *chooser_entry,
+ GtkFilePath *folder_path,
+ gboolean force_reload)
+{
+ gboolean reload = FALSE;
if (chooser_entry->current_folder_path)
{
- if (gtk_file_path_compare (folder_path, chooser_entry->current_folder_path) != 0 || force_reload)
+ if ((folder_path && gtk_file_path_compare (folder_path, chooser_entry->current_folder_path) != 0)
+ || force_reload)
{
+ reload = TRUE;
+
/* 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);
+ if (chooser_entry->load_folder_handle)
+ {
+ gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
+ chooser_entry->load_folder_handle = NULL;
+ }
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);
+ chooser_entry->current_folder_path = gtk_file_path_copy (folder_path);
}
-
- gtk_file_path_free (chooser_entry->current_folder_path);
}
else
{
- queue_idle = TRUE;
+ chooser_entry->current_folder_path = gtk_file_path_copy (folder_path);
+ reload = 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));
+ if (reload)
+ start_loading_current_folder (chooser_entry);
}
-
-
static void
-gtk_file_chooser_entry_changed (GtkEditable *editable)
+refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
+ RefreshMode refresh_mode)
{
- GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
- const gchar *text;
+ GtkEditable *editable;
+ gint end_pos;
+ gchar *text;
GtkFilePath *folder_path;
gchar *file_part;
gsize total_len, file_part_len;
gint file_part_pos;
- if (chooser_entry->in_change)
- return;
+ editable = GTK_EDITABLE (chooser_entry);
- text = gtk_entry_get_text (GTK_ENTRY (editable));
+ switch (refresh_mode)
+ {
+ case REFRESH_UP_TO_CURSOR_POSITION:
+ end_pos = gtk_editable_get_position (editable);
+ break;
+
+ case REFRESH_WHOLE_TEXT:
+ end_pos = GTK_ENTRY (chooser_entry)->text_length;
+ break;
+
+ default:
+ g_assert_not_reached ();
+ return;
+ }
+
+ text = gtk_editable_get_chars (editable, 0, end_pos);
if (!chooser_entry->file_system ||
!chooser_entry->base_folder ||
@@ -877,23 +1460,65 @@ gtk_file_chooser_entry_changed (GtkEditable *editable)
file_part_pos = 0;
}
+ g_free (text);
+
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);
+ reload_current_folder (chooser_entry, folder_path, file_part_pos == -1);
+ gtk_file_path_free (folder_path);
}
static void
-clear_completion_callback (GtkFileChooserEntry *chooser_entry,
- GParamSpec *pspec)
+autocomplete (GtkFileChooserEntry *chooser_entry)
{
- if (chooser_entry->has_completion)
+ g_assert (chooser_entry->current_folder != NULL);
+ g_assert (gtk_file_folder_is_finished_loading (chooser_entry->current_folder));
+ g_assert (gtk_editable_get_position (GTK_EDITABLE (chooser_entry)) == GTK_ENTRY (chooser_entry)->text_length);
+
+ append_common_prefix (chooser_entry, TRUE, FALSE);
+}
+
+static void
+start_autocompletion (GtkFileChooserEntry *chooser_entry)
+{
+ refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
+
+ if (!chooser_entry->current_folder)
{
- chooser_entry->has_completion = FALSE;
- gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
+ /* We don't beep or anything, since this is autocompletion - the user
+ * didn't request any action explicitly.
+ */
+ return;
}
+
+ if (gtk_file_folder_is_finished_loading (chooser_entry->current_folder))
+ autocomplete (chooser_entry);
+ else
+ chooser_entry->load_complete_action = LOAD_COMPLETE_AUTOCOMPLETE;
+}
+
+static gboolean
+start_autocompletion_idle_handler (gpointer data)
+{
+ GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
+
+ start_autocompletion (chooser_entry);
+
+ chooser_entry->start_autocompletion_idle_id = 0;
+
+ return FALSE;
+}
+
+static void
+install_start_autocompletion_idle (GtkFileChooserEntry *chooser_entry)
+{
+ if (chooser_entry->start_autocompletion_idle_id != 0)
+ return;
+
+ chooser_entry->start_autocompletion_idle_id = g_idle_add (start_autocompletion_idle_handler, chooser_entry);
}
#ifdef G_OS_WIN32
@@ -1021,7 +1646,7 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
chooser_entry->base_folder = gtk_file_path_copy (path);
- gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
+ clear_completions (chooser_entry);
_gtk_file_chooser_entry_select_filename (chooser_entry);
}
@@ -1043,11 +1668,7 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
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);
- }
+ commit_completion_and_refresh (chooser_entry);
return chooser_entry->current_folder_path;
}
@@ -1066,11 +1687,7 @@ _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
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);
- }
+ commit_completion_and_refresh (chooser_entry);
return chooser_entry->file_part;
}
@@ -1087,7 +1704,10 @@ _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;
+ clear_completions (chooser_entry);
gtk_entry_set_text (GTK_ENTRY (chooser_entry), file_part);
+ chooser_entry->in_change = FALSE;
}
@@ -1114,6 +1734,8 @@ _gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry,
comp = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
+ /* FIXME: do we need to actually set the following? */
+
switch (action)
{
case GTK_FILE_CHOOSER_ACTION_OPEN:
