+2004-04-22 Tor Lillqvist <tml@iki.fi>
+
+ Fix the file chooser on Windows. I can't make it misbehave or
+ crash any more now. But presumably there are still corner cases
+ not handled. I haven't really checked behaviour of UNC paths, for
+ instance.
+
+ * gtk/gtkfilesystemwin32.c: Accept both backslash and slash in
+ several places. Use G_IS_DIR_SEPARATOR macro (which could be added
+ to GLib in 2.6).
+
+ (gtk_file_system_win32_get_parent): Like the Unix version, assert
+ filename is absolute, and avoid one unnecessary string allocation
+ and freeing.
+
+ (canonicalize_filename,gtk_file_system_win32_parse): Handle drive
+ letters more correctly.
+
+ (gtk_file_system_win32_render_icon): Assure correct syntax is used
+ for root folder of a drive. (#137962, Morten Welinder)
+
+ (filename_is_some_root): New function that accepts also root
+ without any drive specified.
+
+ (filename_is_drive_root): Rename from filename_is_root.
+
+ * gtk/gtkfilechooserentry.c (completion_match_func): Casefold on
+ Windows.
+
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the
+2004-04-22 Tor Lillqvist <tml@iki.fi>
+
+ Fix the file chooser on Windows. I can't make it misbehave or
+ crash any more now. But presumably there are still corner cases
+ not handled. I haven't really checked behaviour of UNC paths, for
+ instance.
+
+ * gtk/gtkfilesystemwin32.c: Accept both backslash and slash in
+ several places. Use G_IS_DIR_SEPARATOR macro (which could be added
+ to GLib in 2.6).
+
+ (gtk_file_system_win32_get_parent): Like the Unix version, assert
+ filename is absolute, and avoid one unnecessary string allocation
+ and freeing.
+
+ (canonicalize_filename,gtk_file_system_win32_parse): Handle drive
+ letters more correctly.
+
+ (gtk_file_system_win32_render_icon): Assure correct syntax is used
+ for root folder of a drive. (#137962, Morten Welinder)
+
+ (filename_is_some_root): New function that accepts also root
+ without any drive specified.
+
+ (filename_is_drive_root): Rename from filename_is_root.
+
+ * gtk/gtkfilechooserentry.c (completion_match_func): Casefold on
+ Windows.
+
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the
+2004-04-22 Tor Lillqvist <tml@iki.fi>
+
+ Fix the file chooser on Windows. I can't make it misbehave or
+ crash any more now. But presumably there are still corner cases
+ not handled. I haven't really checked behaviour of UNC paths, for
+ instance.
+
+ * gtk/gtkfilesystemwin32.c: Accept both backslash and slash in
+ several places. Use G_IS_DIR_SEPARATOR macro (which could be added
+ to GLib in 2.6).
+
+ (gtk_file_system_win32_get_parent): Like the Unix version, assert
+ filename is absolute, and avoid one unnecessary string allocation
+ and freeing.
+
+ (canonicalize_filename,gtk_file_system_win32_parse): Handle drive
+ letters more correctly.
+
+ (gtk_file_system_win32_render_icon): Assure correct syntax is used
+ for root folder of a drive. (#137962, Morten Welinder)
+
+ (filename_is_some_root): New function that accepts also root
+ without any drive specified.
+
+ (filename_is_drive_root): Rename from filename_is_root.
+
+ * gtk/gtkfilechooserentry.c (completion_match_func): Casefold on
+ Windows.
+
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the
+2004-04-22 Tor Lillqvist <tml@iki.fi>
+
+ Fix the file chooser on Windows. I can't make it misbehave or
+ crash any more now. But presumably there are still corner cases
+ not handled. I haven't really checked behaviour of UNC paths, for
+ instance.
+
+ * gtk/gtkfilesystemwin32.c: Accept both backslash and slash in
+ several places. Use G_IS_DIR_SEPARATOR macro (which could be added
+ to GLib in 2.6).
+
+ (gtk_file_system_win32_get_parent): Like the Unix version, assert
+ filename is absolute, and avoid one unnecessary string allocation
+ and freeing.
+
+ (canonicalize_filename,gtk_file_system_win32_parse): Handle drive
+ letters more correctly.
+
+ (gtk_file_system_win32_render_icon): Assure correct syntax is used
+ for root folder of a drive. (#137962, Morten Welinder)
+
+ (filename_is_some_root): New function that accepts also root
+ without any drive specified.
+
+ (filename_is_drive_root): Rename from filename_is_root.
+
+ * gtk/gtkfilechooserentry.c (completion_match_func): Casefold on
+ Windows.
+
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the
+2004-04-22 Tor Lillqvist <tml@iki.fi>
+
+ Fix the file chooser on Windows. I can't make it misbehave or
+ crash any more now. But presumably there are still corner cases
+ not handled. I haven't really checked behaviour of UNC paths, for
+ instance.
+
+ * gtk/gtkfilesystemwin32.c: Accept both backslash and slash in
+ several places. Use G_IS_DIR_SEPARATOR macro (which could be added
+ to GLib in 2.6).
+
+ (gtk_file_system_win32_get_parent): Like the Unix version, assert
+ filename is absolute, and avoid one unnecessary string allocation
+ and freeing.
+
+ (canonicalize_filename,gtk_file_system_win32_parse): Handle drive
+ letters more correctly.
+
+ (gtk_file_system_win32_render_icon): Assure correct syntax is used
+ for root folder of a drive. (#137962, Morten Welinder)
+
+ (filename_is_some_root): New function that accepts also root
+ without any drive specified.
+
+ (filename_is_drive_root): Rename from filename_is_root.
+
+ * gtk/gtkfilechooserentry.c (completion_match_func): Casefold on
+ Windows.
+
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the
GtkFilePath *path,
gchar *display_name);
-
static GObjectClass *parent_class;
static GtkEditableClass *parent_editable_iface;
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);
return result;
}
-/* This function will append a '/' character 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
+/* 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);
* ...
if (gtk_file_info_get_is_folder (info))
{
gchar *tmp = display_name;
- display_name = g_strconcat (tmp, "/", NULL);
+ display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);
g_free (tmp);
}
#error "The implementation is win32 only."
#endif /* G_OS_WIN32 */
+#ifndef G_IS_DIR_SEPARATOR
+#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
+#endif
+
typedef struct _GtkFileSystemWin32Class GtkFileSystemWin32Class;
#define GTK_FILE_SYSTEM_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_SYSTEM_WIN32, GtkFileSystemWin32Class))
static gchar * filename_from_path (const GtkFilePath *path);
static GtkFilePath * filename_to_path (const gchar *filename);
-static gboolean filename_is_root (const char *filename);
+static gboolean filename_is_drive_root (const char *filename);
+static gboolean filename_is_some_root (const char *filename);
static GtkFileInfo * filename_get_info (const gchar *filename,
GtkFileInfoType types,
GError **error);
g_strerror (errno));
g_free (filename_utf8);
}
- else if (!filename_is_root (filename))
+ else if (!filename_is_drive_root (filename))
{
parent = g_path_get_dirname (filename);
if (parent)
GtkFilePath **parent,
GError **error)
{
- gchar *filename = filename_from_path (path);
+ const char *filename;
+
+ filename = gtk_file_path_get_string (path);
g_return_val_if_fail (filename != NULL, FALSE);
+ g_return_val_if_fail (g_path_is_absolute (filename), FALSE);
- if (filename_is_root (filename))
+ if (filename_is_some_root (filename))
{
*parent = NULL;
}
g_free (parent_filename);
}
- g_free (filename);
-
return TRUE;
}
canonicalize_filename (gchar *filename)
{
gchar *p, *q;
+ gchar *past_root;
gboolean last_was_slash = FALSE;
+#if 0
+ printf("canonicalize_filename: %s ", filename);
+#endif
+
p = filename;
q = filename;
+ if (g_ascii_isalpha (*filename) &&
+ filename[1] == ':' &&
+ G_IS_DIR_SEPARATOR (filename[2]))
+ past_root = filename + 3;
+ else
+ past_root = filename + 1;
+
+
while (*p)
{
- if (*p == G_DIR_SEPARATOR)
+ if (G_IS_DIR_SEPARATOR (*p))
{
if (!last_was_slash)
*q++ = G_DIR_SEPARATOR;
{
if (last_was_slash && *p == '.')
{
- if (*(p + 1) == G_DIR_SEPARATOR ||
+ if (G_IS_DIR_SEPARATOR (*(p + 1)) ||
*(p + 1) == '\0')
{
if (*(p + 1) == '\0')
p += 1;
}
else if (*(p + 1) == '.' &&
- (*(p + 2) == G_DIR_SEPARATOR ||
+ (G_IS_DIR_SEPARATOR (*(p + 2)) ||
*(p + 2) == '\0'))
{
- if (q > filename + 1)
+ if (q > past_root)
{
q--;
- while (q > filename + 1 &&
- *(q - 1) != G_DIR_SEPARATOR)
+ while (q > past_root &&
+ !G_IS_DIR_SEPARATOR (*(q - 1)))
q--;
}
p++;
}
- if (q > filename + 1 && *(q - 1) == G_DIR_SEPARATOR)
+ if (q > past_root && G_IS_DIR_SEPARATOR (*(q - 1)))
q--;
*q = '\0';
+#if 0
+ printf(" => %s\n", filename);
+#endif
}
static gboolean
GError **error)
{
const char *base_filename;
- gchar *last_slash;
+ gchar *last_backslash, *last_slash;
gboolean result = FALSE;
+#if 0
+ printf("gtk_file_system_win32_parse: base_path=%s str=%s\n",(char*)base_path,str);
+#endif
+
base_filename = gtk_file_path_get_string (base_path);
g_return_val_if_fail (base_filename != NULL, FALSE);
g_return_val_if_fail (g_path_is_absolute (base_filename), FALSE);
- last_slash = strrchr (str, G_DIR_SEPARATOR);
+ last_backslash = strrchr (str, G_DIR_SEPARATOR);
+ last_slash = strrchr (str, '/');
+ if (last_slash == NULL ||
+ (last_backslash != NULL && last_backslash > last_slash))
+ last_slash = last_backslash;
+
if (!last_slash)
{
*folder = gtk_file_path_copy (base_path);
GError *tmp_error = NULL;
if (last_slash == str)
- folder_part = g_strdup ("/");
+ {
+ if (g_ascii_isalpha (base_filename[0]) &&
+ base_filename[1] == ':')
+ folder_part = g_strdup_printf ("%c:%c", base_filename[0],
+ G_DIR_SEPARATOR);
+ else
+ folder_part = g_strdup (G_DIR_SEPARATOR_S);
+ }
+ else if (g_ascii_isalpha (str[0]) &&
+ str[1] == ':' &&
+ G_IS_DIR_SEPARATOR (str[2]))
+ folder_part = g_filename_from_utf8 (str, last_slash - str + 1,
+ NULL, NULL, &tmp_error);
else
folder_part = g_filename_from_utf8 (str, last_slash - str,
NULL, NULL, &tmp_error);
}
else
{
- if (folder_part[1] == ':')
+ if (g_path_is_absolute (folder_part))
folder_path = folder_part;
else
{
}
}
+#if 0
+ printf("gtk_file_system_win32_parse:returning folder=%s file_part=%s\n",(*folder?(char*)*folder:"NULL"),*file_part);
+#endif
+
return result;
}
const char* filename = gtk_file_path_get_string (path);
/* handle drives with stock icons */
- if (filename_is_root (filename))
+ if (filename_is_drive_root (filename))
{
- gchar *filename2 = g_strconcat(filename, "\\", NULL);
- DWORD dt = GetDriveType (filename2);
+ gchar filename2[] = "?:\\";
+ DWORD dt;
+
+ filename2[0] = filename[0];
+ dt = GetDriveType (filename2);
switch (dt)
{
default :
break;
}
- g_free (filename2);
}
else if (g_file_test (filename, G_FILE_TEST_IS_DIR))
{
if (!path)
{
- g_return_val_if_fail (filename_is_root (folder_win32->filename), NULL);
+ g_return_val_if_fail (filename_is_some_root (folder_win32->filename), NULL);
/* ??? */
info = filename_get_info (folder_win32->filename, folder_win32->types, error);
info = gtk_file_info_new ();
- if (filename_is_root (filename))
+ if (filename_is_some_root (filename))
{
if (types & GTK_FILE_INFO_DISPLAY_NAME)
gtk_file_info_set_display_name (info, filename);
}
static gboolean
-filename_is_root (const char *filename)
+filename_is_drive_root (const char *filename)
{
- guint len = strlen(filename);
+ guint len = strlen (filename);
/* accept both forms */
- return (len == 3 && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'));
+ return (len == 3 && filename[1] == ':' && G_IS_DIR_SEPARATOR (filename[2]));
}
+static gboolean
+filename_is_some_root (const char *filename)
+{
+ return (G_IS_DIR_SEPARATOR (filename[0]) && filename[1] == '\0') ||
+ filename_is_drive_root (filename);
+}
projects / ~andy / gtk / commitdiff