Compare commits
3 Commits
411f0b3e91
...
3bc07e00d9
Author | SHA1 | Date | |
---|---|---|---|
3bc07e00d9 | |||
9e45ba249e | |||
b23198f675 |
61
fastiv.c
61
fastiv.c
@ -270,12 +270,25 @@ 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);
|
||||
g_free(path);
|
||||
}
|
||||
@ -302,15 +315,10 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
|
||||
case GDK_KEY_o:
|
||||
on_open();
|
||||
return TRUE;
|
||||
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);
|
||||
case GDK_KEY_n:
|
||||
spawn_path(g.directory);
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 0:
|
||||
switch (event->keyval) {
|
||||
@ -338,13 +346,13 @@ on_key_press(G_GNUC_UNUSED GtkWidget *widget, GdkEventKey *event,
|
||||
gtk_widget_show(g.browser_sidebar);
|
||||
return TRUE;
|
||||
|
||||
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);
|
||||
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));
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
@ -371,6 +379,11 @@ 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;
|
||||
}
|
||||
@ -501,6 +514,8 @@ 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);
|
||||
|
||||
@ -518,7 +533,6 @@ 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",
|
||||
@ -555,6 +569,23 @@ 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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user