diff options
Diffstat (limited to 'siv.c')
| -rw-r--r-- | siv.c | 90 |
1 files changed, 45 insertions, 45 deletions
@@ -20,7 +20,7 @@ struct App SivWindow **windows; GHashTable *meta_data; -}; +}; void app_show_warning (GtkWidget *parent_window, @@ -31,11 +31,11 @@ app_show_warning (GtkWidget *parent_window, va_list args; char *message; GtkWidget *dialog; - + va_start (args, format); g_vasprintf (&message, format, args); va_end (args); - + dialog = gtk_message_dialog_new_with_markup ( parent_window ? GTK_WINDOW (parent_window) : NULL, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -47,11 +47,11 @@ app_show_warning (GtkWidget *parent_window, gtk_message_dialog_format_secondary_markup ( GTK_MESSAGE_DIALOG (dialog), "%s", secondary); } - + g_free (message); - + gtk_window_set_title (GTK_WINDOW (dialog), APPLICATION_NAME " Warning"); - + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -71,14 +71,14 @@ app_show_could_not_open (GtkWidget *parent_window, header = "<b>Could not open this file:</b>"; else header = "<b>Could not open these files:</b>"; - + text = g_string_new (header); - + for (i = 0; i < n_files; ++i) g_string_append_printf (text, "\n%s", files[i]); - + app_show_warning (NULL, NULL, "%s", text->str); - + g_string_free (text, TRUE); } @@ -174,7 +174,7 @@ encode (const char *filename) for (i = 0; filename[i] != '\0'; ++i) { char c = filename[i]; - + if (!g_ascii_isprint (c) || c == '@' || c == '[' || c == ']') g_string_append_printf (result, "@%x", c); else @@ -215,7 +215,7 @@ load_meta_data (void) filename = make_filename(); result = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - + if (g_key_file_load_from_file (keyfile, filename, G_KEY_FILE_NONE, NULL)) { gsize n_groups; @@ -227,30 +227,30 @@ load_meta_data (void) MetaData *data = g_new0 (MetaData, 1); char *group = groups[i]; int b; - + if (!get_int (keyfile, group, "window_x", &(data->window_x))) data->window_x = 0; - + if (!get_int (keyfile, group, "window_y", &(data->window_y))) data->window_y = 0; - + if (!get_int (keyfile, group, "window_width", &(data->window_width))) data->window_width = 0; - + if (!get_int (keyfile, group, "window_height", &(data->window_height))) data->window_height = 0; - + if (!get_int (keyfile, group, "background", &b)) data->background = BG_NONE; else data->background = b; - + if (data->background >= BG_LAST || data->background < BG_FIRST) data->background = BG_NONE; - + if (!get_int (keyfile, group, "smooth_image", &(data->smooth_image))) data->smooth_image = TRUE; - + if (!get_int (keyfile, group, "zoom_level", &(data->zoom_level))) data->zoom_level = 0; @@ -268,13 +268,13 @@ load_meta_data (void) g_hash_table_insert (result, g_strdup (group), data); } - + g_strfreev (groups); } - g_free (filename); + g_free (filename); g_key_file_free (keyfile); - + return result; } @@ -286,12 +286,12 @@ app_get_meta_data (App *app, char *encoded = encode (file); gboolean result = FALSE; MetaData *d = g_hash_table_lookup (app->meta_data, encoded); - + if (d) { if (data) *data = *d; - + result = TRUE; } @@ -313,7 +313,7 @@ app_set_meta_data (App *app, int vadj, int hadj, gboolean show_toolbar, - gboolean show_status_bar) + gboolean show_status_bar) { char *encoded = encode (filename); MetaData *data = g_hash_table_lookup (app->meta_data, encoded); @@ -355,7 +355,7 @@ process_options (int argc, char **argv) strcmp (option, "-v") == 0) { g_print ("%s %s\n", APPLICATION_NAME, PACKAGE_VERSION); - + exit (1); return NULL; } @@ -404,13 +404,13 @@ open_file (App *app, { if (err_files) *err_files = nul_array_append (*err_files, g_strdup (filename)); - + window_free (window); return FALSE; } - + window_show (window, startup_id); - + return TRUE; } @@ -441,7 +441,7 @@ on_open (App *app, const char *startup_id, const char *filename) startup_id = NULL; app_begin_load (app); - + if (!open_file (app, startup_id, filename, NULL)) { /* FIXME: it would be better if we could show @@ -472,7 +472,7 @@ app_new (int argc, char **argv) app->meta_data = load_meta_data (); app_begin_load (app); - + if (filenames[0]) { for (i = 0; filenames[i] != NULL; ++i) @@ -484,7 +484,7 @@ app_new (int argc, char **argv) } nul_array_free (filenames); - + app_show_could_not_open (NULL, nul_array_len (err_files), err_files); for (i = 0; err_files[i] != NULL; ++i) @@ -508,10 +508,10 @@ make_service (void) nul_dbus_object ( "/app", NULL, - + nul_dbus_interface ( "dk.au.daimi.sandmann.siv", - + nul_dbus_method ( "open", (nul_dbus_function_t)on_open, /* on_open,*/ @@ -519,9 +519,9 @@ make_service (void) nul_dbus_parameter_in ("filename", nul_dbus_type_string()), nul_dbus_parameter_out ("result", nul_dbus_type_int32()), NULL), - + NULL), - + NULL), NULL); @@ -547,7 +547,7 @@ main (int argc, char **argv) { nul_dbus_service_t *service; - + /* Disable gslice, since it * * - confuses valgrind @@ -567,9 +567,9 @@ main (int argc, lack of dbus daemon */) { App *app; - + gtk_init (&argc, &argv); - + if (!g_file_test (GLADE_FILE, G_FILE_TEST_EXISTS)) { app_show_warning ( @@ -577,16 +577,16 @@ main (int argc, "<i>Running \"make install\" may solve this problem.</i>", "<b>"APPLICATION_NAME " was not compiled or installed correctly.</b>"); - + return FALSE; } app = app_new (argc, argv); nul_dbus_service_set_object_data (service, "/app", app); - + nul_signal_set_handler (SIGINT, on_sigint, app, NULL); - + gtk_main (); } else @@ -599,7 +599,7 @@ main (int argc, gtk_init (&argc, &argv); files = process_options (argc, argv); - + for (i = 0; files[i] != NULL; ++i) { nul_dbus_invoke (service, "/app/dk.au.daimi.sandmann.siv.open", @@ -608,6 +608,6 @@ main (int argc, files[i]); } } - + return 0; } |