p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: p:3bc07e00d9031c908031ef3fcfe325789c5e7594
Branches Tags
p:master
p:v1.0.0
..
compare: p:411f0b3e91e25cf896d745fc783f93a64e720ba0
Branches Tags
p:master
p:v1.0.0

No commits in common. "3bc07e00d9031c908031ef3fcfe325789c5e7594" and "411f0b3e91e25cf896d745fc783f93a64e720ba0" have entirely different histories.
3bc07e00d9 ... 411f0b3e91

1 changed files with 16 additions and 47 deletions
Show Stats Expand all files Collapse all files

63
fastiv.c
View File

@ -270,26 +270,13 @@ on_item_activated(G_GNUC_UNUSED FastivBrowser *browser, const char *path,
open(path);
}
static void
spawn_path(const char *path)
{
char *argv[] = {PROJECT_NAME, (char *) path, NULL};
GError *error = NULL;
g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
NULL, &error);
g_clear_error(&error);
}
static void
on_open_location(G_GNUC_UNUSED GtkPlacesSidebar *sidebar, GFile *location,
G_GNUC_UNUSED GtkPlacesOpenFlags flags, G_GNUC_UNUSED gpointer user_data)
{
gchar *path = g_file_get_path(location);
if (path) {
if (flags & GTK_PLACES_OPEN_NEW_WINDOW)
spawn_path(path);
else
load_directory(path);
load_directory(path);
g_free(path);
}
}
@ -315,10 +302,15 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
case GDK_KEY_o:
on_open();
return TRUE;
case GDK_KEY_n:
spawn_path(g.directory);
case GDK_KEY_n: {
char *argv[] = {PROJECT_NAME, g.directory, NULL};
GError *error = NULL;
g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
NULL, &error);
g_clear_error(&error);
return TRUE;
}
}
break;
case 0:
switch (event->keyval) {
@ -346,13 +338,13 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
gtk_widget_show(g.browser_sidebar);
return TRUE;
case GDK_KEY_F11:
case GDK_KEY_f:
if (gdk_window_get_state(gtk_widget_get_window(g.window)) &
GDK_WINDOW_STATE_FULLSCREEN)
gtk_window_unfullscreen(GTK_WINDOW(g.window));
else
gtk_window_fullscreen(GTK_WINDOW(g.window));
case GDK_KEY_Tab:
case GDK_KEY_Return:
gtk_stack_set_visible_child(GTK_STACK(g.stack),
gtk_stack_get_visible_child(GTK_STACK(g.stack)) ==
g.view_scroller
? g.browser_paned
: g.view_scroller);
return TRUE;
}
}
@ -379,11 +371,6 @@ on_key_press_view(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
on_next();
return TRUE;
}
case GDK_KEY_Tab:
case GDK_KEY_Return:
gtk_stack_set_visible_child(GTK_STACK(g.stack), g.browser_paned);
return TRUE;
}
return FALSE;
}
@ -514,8 +501,6 @@ main(int argc, char *argv[])
GTK_PLACES_SIDEBAR(g.browser_sidebar), FALSE);
gtk_places_sidebar_set_show_trash(
GTK_PLACES_SIDEBAR(g.browser_sidebar), FALSE);
gtk_places_sidebar_set_open_flags(GTK_PLACES_SIDEBAR(g.browser_sidebar),
GTK_PLACES_OPEN_NORMAL | GTK_PLACES_OPEN_NEW_WINDOW);
g_signal_connect(g.browser_sidebar, "open-location",
G_CALLBACK(on_open_location), NULL);
@ -533,6 +518,7 @@ main(int argc, char *argv[])
gtk_container_add(GTK_CONTAINER(g.stack), g.browser_paned);
g.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (g.window), 800, 600);
g_signal_connect(g.window, "destroy",
G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(g.window, "key-press-event",
@ -569,23 +555,6 @@ main(int argc, char *argv[])
gtk_widget_grab_focus(g.browser_scroller);
}
// Try to get half of the screen vertically, in 4:3 aspect ratio.
//
// We need the GdkMonitor before the GtkWindow has a GdkWindow (i.e.,
// before it is realized). Take the smallest dimensions, out of desperation.
GdkDisplay *display = gtk_widget_get_display(g.window);
int unit = G_MAXINT;
for (int i = gdk_display_get_n_monitors(display); i--; ) {
GdkRectangle geometry = {};
gdk_monitor_get_geometry(
gdk_display_get_monitor(display, i), &geometry);
unit = MIN(unit, MIN(geometry.width, geometry.height) / 6);
}
// Ask for at least 800x600, to cover ridiculously heterogenous setups.
unit = MAX(200, unit);
gtk_window_set_default_size(GTK_WINDOW(g.window), 4 * unit, 3 * unit);
gtk_widget_show_all(g.window);
gtk_main();
return 0;