Use GFile a bit more
This commit is contained in:
parent
b97ac26cfb
commit
085f2d7eef
GPG Key ID:
A0420B94F92B9493
@ -64,7 +64,7 @@ static const double g_permitted_width_multiplier = 2;
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
struct entry {
|
||||
char *filename; ///< Absolute path
|
||||
char *uri; ///< GIO URI
|
||||
cairo_surface_t *thumbnail; ///< Prescaled thumbnail
|
||||
GIcon *icon; ///< If no thumbnail, use this icon
|
||||
};
|
||||
@ -72,7 +72,7 @@ struct entry {
|
||||
static void
|
||||
entry_free(Entry *self)
|
||||
{
|
||||
g_free(self->filename);
|
||||
g_free(self->uri);
|
||||
g_clear_pointer(&self->thumbnail, cairo_surface_destroy);
|
||||
g_clear_object(&self->icon);
|
||||
}
|
||||
@ -351,15 +351,15 @@ entry_add_thumbnail(gpointer data, gpointer user_data)
|
||||
g_clear_pointer(&self->thumbnail, cairo_surface_destroy);
|
||||
|
||||
FastivBrowser *browser = FASTIV_BROWSER(user_data);
|
||||
GFile *file = g_file_new_for_uri(self->uri);
|
||||
self->thumbnail = rescale_thumbnail(
|
||||
fastiv_io_lookup_thumbnail(self->filename, browser->item_size),
|
||||
fastiv_io_lookup_thumbnail(file, browser->item_size),
|
||||
browser->item_height);
|
||||
if (self->thumbnail)
|
||||
return;
|
||||
goto out;
|
||||
|
||||
// Fall back to symbolic icons, though there's only so much we can do
|
||||
// in parallel--GTK+ isn't thread-safe.
|
||||
GFile *file = g_file_new_for_path(self->filename);
|
||||
GFileInfo *info = g_file_query_info(file,
|
||||
G_FILE_ATTRIBUTE_STANDARD_NAME
|
||||
"," G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON,
|
||||
@ -371,6 +371,8 @@ entry_add_thumbnail(gpointer data, gpointer user_data)
|
||||
self->icon = g_object_ref(icon);
|
||||
g_object_unref(info);
|
||||
}
|
||||
out:
|
||||
g_object_unref(file);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -521,9 +523,9 @@ destroy_widget_idle_source_func(GtkWidget *widget)
|
||||
}
|
||||
|
||||
static void
|
||||
show_context_menu(GtkWidget *widget, const char *filename)
|
||||
show_context_menu(GtkWidget *widget, const char *uri)
|
||||
{
|
||||
GFile *file = g_file_new_for_path(filename);
|
||||
GFile *file = g_file_new_for_uri(uri);
|
||||
GFileInfo *info = g_file_query_info(file,
|
||||
G_FILE_ATTRIBUTE_STANDARD_NAME
|
||||
"," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
|
||||
@ -778,8 +780,10 @@ fastiv_browser_draw(GtkWidget *widget, cairo_t *cr)
|
||||
static gboolean
|
||||
open_entry(GtkWidget *self, const Entry *entry, gboolean new_window)
|
||||
{
|
||||
g_signal_emit(self, browser_signals[ITEM_ACTIVATED], 0, entry->filename,
|
||||
GFile *location = g_file_new_for_uri(entry->uri);
|
||||
g_signal_emit(self, browser_signals[ITEM_ACTIVATED], 0, location,
|
||||
new_window ? GTK_PLACES_OPEN_NEW_WINDOW : GTK_PLACES_OPEN_NORMAL);
|
||||
g_object_unref(location);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -817,7 +821,7 @@ fastiv_browser_button_press_event(GtkWidget *widget, GdkEventButton *event)
|
||||
// On X11, after closing the menu, the pointer otherwise remains,
|
||||
// no matter what its new location is.
|
||||
gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
|
||||
show_context_menu(widget, entry->filename);
|
||||
show_context_menu(widget, entry->uri);
|
||||
return TRUE;
|
||||
default:
|
||||
return FALSE;
|
||||
@ -871,7 +875,7 @@ fastiv_browser_query_tooltip(GtkWidget *widget, gint x, gint y,
|
||||
if (!entry)
|
||||
return FALSE;
|
||||
|
||||
GFile *file = g_file_new_for_path(entry->filename);
|
||||
GFile *file = g_file_new_for_uri(entry->uri);
|
||||
GFileInfo *info = g_file_query_info(file,
|
||||
G_FILE_ATTRIBUTE_STANDARD_NAME
|
||||
"," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
|
||||
@ -967,7 +971,7 @@ fastiv_browser_class_init(FastivBrowserClass *klass)
|
||||
|
||||
browser_signals[ITEM_ACTIVATED] = g_signal_new("item-activated",
|
||||
G_TYPE_FROM_CLASS(klass), 0, 0, NULL, NULL, NULL,
|
||||
G_TYPE_NONE, 2, G_TYPE_STRING, GTK_TYPE_PLACES_OPEN_FLAGS);
|
||||
G_TYPE_NONE, 2, G_TYPE_FILE, GTK_TYPE_PLACES_OPEN_FLAGS);
|
||||
|
||||
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
|
||||
widget_class->get_request_mode = fastiv_browser_get_request_mode;
|
||||
@ -1020,8 +1024,8 @@ entry_compare(gconstpointer a, gconstpointer b)
|
||||
{
|
||||
const Entry *entry1 = a;
|
||||
const Entry *entry2 = b;
|
||||
GFile *location1 = g_file_new_for_path(entry1->filename);
|
||||
GFile *location2 = g_file_new_for_path(entry2->filename);
|
||||
GFile *location1 = g_file_new_for_uri(entry1->uri);
|
||||
GFile *location2 = g_file_new_for_uri(entry2->uri);
|
||||
gint result = fastiv_io_filecmp(location1, location2);
|
||||
g_object_unref(location1);
|
||||
g_object_unref(location2);
|
||||
@ -1055,7 +1059,7 @@ fastiv_browser_load(
|
||||
continue;
|
||||
|
||||
g_array_append_val(self->entries,
|
||||
((Entry) {.thumbnail = NULL, .filename = g_file_get_path(child)}));
|
||||
((Entry) {.thumbnail = NULL, .uri = g_file_get_uri(child)}));
|
||||
}
|
||||
g_object_unref(enumerator);
|
||||
|
||||
|
||||
16
fastiv-io.c
16
fastiv-io.c
@ -1365,21 +1365,23 @@ fail_init:
|
||||
}
|
||||
|
||||
cairo_surface_t *
|
||||
fastiv_io_lookup_thumbnail(const gchar *target, FastivIoThumbnailSize size)
|
||||
fastiv_io_lookup_thumbnail(GFile *target, FastivIoThumbnailSize size)
|
||||
{
|
||||
g_return_val_if_fail(size >= FASTIV_IO_THUMBNAIL_SIZE_MIN &&
|
||||
size <= FASTIV_IO_THUMBNAIL_SIZE_MAX, NULL);
|
||||
|
||||
GStatBuf st;
|
||||
if (g_stat(target, &st))
|
||||
// Local files only, at least for now.
|
||||
gchar *path = g_file_get_path(target);
|
||||
if (!path)
|
||||
return NULL;
|
||||
|
||||
// TODO(p): Consider making the `target` an absolute path, if it isn't.
|
||||
// Or maybe let it fail, and document the requirement.
|
||||
gchar *uri = g_filename_to_uri(target, NULL, NULL);
|
||||
if (!uri)
|
||||
GStatBuf st = {};
|
||||
int err = g_stat(path, &st);
|
||||
g_free(path);
|
||||
if (err)
|
||||
return NULL;
|
||||
|
||||
gchar *uri = g_file_get_uri(target);
|
||||
gchar *sum = g_compute_checksum_for_string(G_CHECKSUM_MD5, uri, -1);
|
||||
gchar *cache_dir = get_xdg_home_dir("XDG_CACHE_HOME", ".cache");
|
||||
|
||||
|
||||
@ -99,4 +99,4 @@ extern FastivIoThumbnailSizeInfo
|
||||
fastiv_io_thumbnail_sizes[FASTIV_IO_THUMBNAIL_SIZE_COUNT];
|
||||
|
||||
cairo_surface_t *fastiv_io_lookup_thumbnail(
|
||||
const gchar *target, FastivIoThumbnailSize size);
|
||||
GFile *target, FastivIoThumbnailSize size);
|
||||
|
||||
14
fastiv.c
14
fastiv.c
@ -311,13 +311,17 @@ spawn_path(const char *path)
|
||||
}
|
||||
|
||||
static void
|
||||
on_item_activated(G_GNUC_UNUSED FastivBrowser *browser, const char *path,
|
||||
on_item_activated(G_GNUC_UNUSED FastivBrowser *browser, GFile *location,
|
||||
GtkPlacesOpenFlags flags, G_GNUC_UNUSED gpointer data)
|
||||
{
|
||||
if (flags == GTK_PLACES_OPEN_NEW_WINDOW)
|
||||
spawn_path(path);
|
||||
else
|
||||
open(path);
|
||||
gchar *path = g_file_get_path(location);
|
||||
if (path) {
|
||||
if (flags == GTK_PLACES_OPEN_NEW_WINDOW)
|
||||
spawn_path(path);
|
||||
else
|
||||
open(path);
|
||||
g_free(path);
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
||||
Loading…
Reference in New Issue
Block a user