Fix #926: Use system background color in window mode
[geeqie.git] / src / main.c
index fd3343e..c117f71 100644 (file)
 #include "filedata.h"
 #include "filefilter.h"
 #include "history_list.h"
+#include "image.h"
 #include "image-overlay.h"
+#include "img-view.h"
 #include "layout.h"
 #include "layout_image.h"
 #include "layout_util.h"
 #include "misc.h"
 #include "options.h"
+#include "rcfile.h"
 #include "remote.h"
 #include "secure_save.h"
 #include "similar.h"
@@ -57,6 +60,7 @@
 #include "histogram.h"
 #include "pixbuf_util.h"
 #include "glua.h"
+#include "whereami.h"
 
 #ifdef HAVE_CLUTTER
 #include <clutter-gtk/clutter-gtk.h>
 #include <X11/Xlib.h>
 #endif
 
+/**
+ * @page diagrams Diagrams
+ * @section options_overview Options Overview
+ * 
+ * #_ConfOptions  #_LayoutOptions
+ * 
+ * @startuml
+ * 
+ * object options.h
+ * object typedefs.h
+ * 
+ * options.h : ConfOptions
+ * options.h : \n
+ * options.h : Options applicable to **all** Layout Windows
+ * options.h : These are in the <global> section of geeqierc.xml
+ * options.h : Available to all modules via the global variable **options**
+ * typedefs.h : LayoutOptions
+ * typedefs.h : \n
+ * typedefs.h : Options applicable to **each** Layout Window
+ * typedefs.h : These are in the <layout> section of geeqierc.xml
+ * typedefs.h : There is one <layout> section for each Layout Window displayed
+ * typedefs.h : Available via **<layout_window>->options**
+ * 
+ * @enduml
+ */
+
+/**
+ * @page diagrams Diagrams
+ * @section options_diagrams_main Options - New Window From Main
+ * #main  
+ * #init_options  
+ * #layout_new_from_default  
+ * #load_config_from_file  
+ * #load_options  
+ * #setup_default_options
+ * 
+ * @startuml
+ * group main.c
+ * start
+ * group options.c
+ * : **init_options()**
+ * 
+ * Set **options** = ConfOptions from hard-coded init values;
+ * end group
+ * 
+ * group options.c
+ * : **setup_default_options()**
+ * 
+ * set hard-coded ConfOptions:
+ * 
+ * bookmarks:
+ * * dot dir
+ * * Home
+ * * Desktop
+ * * Collections
+ * safe delete path
+ * OSD template string
+ * sidecar extensions
+ * shell path and options
+ * marks tooltips
+ * help search engine;
+ * end group
+ * 
+ * if (first entry
+ * or
+ * --new-instance) then (yes)
+ * group options.c
+ * : **load_options()**
+ * ;
+ * 
+ * split
+ * : GQ_SYSTEM_WIDE_DIR
+ * /geeqierc.xml;
+ * split again
+ * : XDG_CONFIG_HOME
+ * /geeqierc.xml;
+ * split again
+ * : HOME
+ * /.geeqie/geeqierc.xml;
+ * end split
+ * 
+ * group rcfile.c
+ * : **load_config_from_file()**
+ * 
+ * set  **options** from file
+ * and all <layout window>->options  in file;
+ * end group
+ * 
+ * end group
+ * 
+ * if (broken config. file
+ * or no config file
+ * or no layout section loaded
+ * (i.e. session not saved)) then (yes)
+ * group layout.c
+ * : **layout_new_from_default()**;
+ * if (default.xml exists) then (yes)
+ * : Load user-saved
+ *  layout_window default options
+ *  from default.xml file;
+ * else (no)
+ * : Load hard-coded
+ *  layout_window default options;
+ * endif
+ * end group
+ * endif
+ * 
+ * else (no)
+ * : Send --new-window request to remote
+ *  No return to this point
+ *  This instance terminates;
+ * stop
+ * endif
+ * 
+ * : Enter gtk main loop;
+ * 
+ * end group
+ * @enduml
+ */
+
+/**
+ * @page diagrams Diagrams
+ * @section options_diagrams_remote Options - New Window From Remote
+ * #layout_new_from_default  
+ * @startuml
+ * 
+ * group remote.c
+ * start
+ * group layout.c
+ * : **layout_new_from_default()**;
+ * if (default.xml exists) then (yes)
+ * : Load user-saved
+ *  layout_window default options
+ *  from default.xml file;
+ * else (no)
+ * : Load hard-coded
+ *  layout_window default options;
+ * endif
+ * end group
+ * : set path from PWD;
+ * @enduml
+ */
+
+/**
+ * @page diagrams Diagrams
+ * @section options_diagrams_menu Options - New Window From Menu
+ * #layout_menu_new_window_cb  
+ * #layout_menu_window_from_current_cb  
+ * #layout_new_from_default  
+ * @startuml
+ * 
+ * group layout_util.c
+ * start
+ * 
+ * split
+ * : default;
+ * group layout.c
+ * : **layout_new_from_default()**;
+ * if (default.xml exists) then (yes)
+ * : Load user-saved
+ *  layout_window default options
+ *  from default.xml file;
+ * else (no)
+ * : Load hard-coded
+ *  layout_window default options;
+ * endif
+ * end group
+ * 
+ * split again
+ * : from current
+ * 
+ * **layout_menu_window_from_current_cb()**
+ * copy layout_window options
+ * from current window;
+ * 
+ * split again
+ * : named
+ * 
+ * **layout_menu_new_window_cb()**
+ * load layout_window options
+ * from saved xml file list;
+ * end split
+ * 
+ * end group
+ * @enduml
+ */
+  /**
+  * @file
+  * @ref options_overview Options Overview
+  */
+
+
 gboolean thumb_format_changed = FALSE;
 static RemoteConnection *remote_connection = NULL;
 
@@ -76,7 +272,9 @@ gchar *gq_helpdir;
 gchar *gq_htmldir;
 gchar *gq_app_dir;
 gchar *gq_bin_dir;
+gchar *gq_executable_path;
 gchar *desktop_file_template;
+gchar *instance_identifier;
 
 /*
  *-----------------------------------------------------------------------------
@@ -412,7 +610,8 @@ static void parse_command_line(gint argc, gchar *argv[])
                                print_term(FALSE, _("  -o:<file>, --log-file:<file>     save log data to file\n"));
                                print_term(FALSE, _("  -v, --version                    print version info\n"));
                                print_term(FALSE, _("  -h, --help                       show this message\n"));
-                               print_term(FALSE, _("      --disable-clutter            disable use of Clutter library (i.e. GPU accel.)\n\n"));
+                               print_term(FALSE, _("      --disable-clutter            disable use of Clutter library (i.e. GPU accel.)\n"));
+                               print_term(FALSE, _("      --cache-maintenance <path>   run cache maintenance in non-GUI mode\n\n"));
 
 #if 0
                                /* these options are not officially supported!
@@ -606,6 +805,95 @@ static gboolean parse_command_line_for_clutter_option(gint argc, gchar *argv[])
 }
 #endif
 
+static gboolean parse_command_line_for_cache_maintenance_option(gint argc, gchar *argv[])
+{
+       const gchar *cache_maintenance_option = "--cache-maintenance";
+       gint len = strlen(cache_maintenance_option);
+       gboolean ret = FALSE;
+
+       if (argc >= 2)
+               {
+               const gchar *cmd_line = argv[1];
+               if (strncmp(cmd_line, cache_maintenance_option, len) == 0)
+                       {
+                       ret = TRUE;
+                       }
+               }
+
+       return ret;
+}
+
+static void process_command_line_for_cache_maintenance_option(gint argc, gchar *argv[])
+{
+       gchar *rc_path;
+       gchar *folder_path = NULL;
+       gsize size;
+       gsize i = 0;
+       gchar *buf_config_file;
+       gint diff_count;
+
+       if (argc >= 3)
+               {
+               folder_path = expand_tilde(argv[2]);
+
+               if (isdir(folder_path))
+                       {
+                       rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
+
+                       if (isfile(rc_path))
+                               {
+                               if (g_file_get_contents(rc_path, &buf_config_file, &size, NULL))
+                                       {
+                                       while (i < size)
+                                               {
+                                               diff_count = strncmp("</global>", &buf_config_file[i], 9);
+                                               if (diff_count == 0)
+                                                       {
+                                                       break;
+                                                       }
+                                               i++;
+                                               }
+                                       /* Load only the <global> section */
+                                       load_config_from_buf(buf_config_file, i + 9, FALSE);
+
+                                       if (options->thumbnails.enable_caching)
+                                               {
+                                               cache_maintenance(folder_path);
+                                               }
+                                       else
+                                               {
+                                               print_term(TRUE, "Caching not enabled\n");
+                                               exit(EXIT_FAILURE);
+                                               }
+                                       g_free(buf_config_file);
+                                       }
+                               else
+                                       {
+                                       print_term(TRUE, g_strconcat(_("Cannot load "), rc_path, "\n", NULL));
+                                       exit(EXIT_FAILURE);
+                                       }
+                               }
+                       else
+                               {
+                               print_term(TRUE, g_strconcat(_("Configuration file path "), rc_path, _(" is not a file\n"), NULL));
+                               exit(EXIT_FAILURE);
+                               }
+                       g_free(rc_path);
+                       }
+               else
+                       {
+                       print_term(TRUE, g_strconcat(argv[2], _(" is not a folder\n"), NULL));
+                       exit(EXIT_FAILURE);
+                       }
+               g_free(folder_path);
+               }
+       else
+               {
+               print_term(TRUE, _("No path parameter given\n"));
+               exit(EXIT_FAILURE);
+               }
+}
+
 /*
  *-----------------------------------------------------------------------------
  * startup, init, and exit
@@ -792,6 +1080,8 @@ static void exit_program_final(void)
        LayoutWindow *lw = NULL;
        GList *list;
        LayoutWindow *tmp_lw;
+       gchar *archive_dir;
+       GFile *archive_file;
 
         /* make sure that external editors are loaded, we would save incomplete configuration otherwise */
        layout_editors_reload_finish();
@@ -824,6 +1114,27 @@ static void exit_program_final(void)
                layout_free(lw);
                }
 
+       /* Delete any files/folders in /tmp that have been created by the open archive function */
+       archive_dir = g_build_filename(g_get_tmp_dir(), GQ_ARCHIVE_DIR, instance_identifier, NULL);
+       if (isdir(archive_dir))
+               {
+               archive_file = g_file_new_for_path(archive_dir);
+               rmdir_recursive(archive_file, NULL, NULL);
+               g_free(archive_dir);
+               g_object_unref(archive_file);
+               }
+
+       /* If there are still sub-dirs created by another instance, this will fail
+        * but that does not matter */
+       archive_dir = g_build_filename(g_get_tmp_dir(), GQ_ARCHIVE_DIR, NULL);
+       if (isdir(archive_dir))
+               {
+               archive_file = g_file_new_for_path(archive_dir);
+               g_file_delete(archive_file, NULL, NULL);
+               g_free(archive_dir);
+               g_object_unref(archive_file);
+               }
+
        secure_close(command_line->ssi);
 
        gtk_main_quit();
@@ -930,6 +1241,46 @@ static void setup_sigbus_handler(void)
 #endif
 }
 
+static void set_theme_bg_color()
+{
+#if GTK_CHECK_VERSION(3,0,0)
+       GdkRGBA bg_color;
+       GdkColor theme_color;
+       GtkStyleContext *style_context;
+       GList *work;
+       LayoutWindow *lw;
+
+       if (!options->image.use_custom_border_color)
+               {
+               work = layout_window_list;
+               lw = work->data;
+
+               style_context = gtk_widget_get_style_context(lw->window);
+               gtk_style_context_get_background_color(style_context, GTK_STATE_FLAG_NORMAL, &bg_color);
+
+               theme_color.red = bg_color.red * 65535;
+               theme_color.green = bg_color.green * 65535;
+               theme_color.blue = bg_color.blue * 65535;
+
+               while (work)
+                       {
+                       lw = work->data;
+                       image_background_set_color(lw->image, &theme_color);
+                       work = work->next;
+                       }
+               }
+
+       view_window_colors_update();
+#endif
+}
+
+static gboolean theme_change_cb(GObject *gobject, GParamSpec *pspec, gpointer data)
+{
+       set_theme_bg_color();
+
+       return FALSE;
+}
+
 /**
  * @brief Set up the application paths
  * 
@@ -939,23 +1290,20 @@ static void setup_sigbus_handler(void)
  * They are now variables, all defined relative to one level above the
  * directory that the executable is run from.
  */
-static void create_application_paths()
+static void create_application_paths(gchar *argv[])
 {
-       gchar buf[1024];
        gchar *dirname;
-       gchar *basename;
        gchar *tmp;
+       gint length;
+       gchar *path;
 
-       memset(buf, 0, sizeof(buf));
-       if (readlink("/proc/self/exe", buf, sizeof(buf) - 1) < 0)
-               {
-               /* There was an error. Perhaps the path does not exist
-                * or the buffer is not big enough. */
-               log_printf("Can't get path from /proc/self/exe");
-               exit(1);
-               }
+       length = wai_getExecutablePath(NULL, 0, NULL);
+       path = (gchar *)malloc(length + 1);
+       wai_getExecutablePath(path, length, NULL);
+       path[length] = '\0';
 
-       dirname = g_path_get_dirname(buf); // default is /usr/bin/
+       gq_executable_path = g_strdup(path);
+       dirname = g_path_get_dirname(gq_executable_path); // default is /usr/bin/
        gq_prefix = g_path_get_dirname(dirname);
 
        gq_localedir = g_build_filename(gq_prefix, "share", "locale", NULL);
@@ -968,6 +1316,7 @@ static void create_application_paths()
 
        g_free(tmp);
        g_free(dirname);
+       g_free(path);
 }
 
 gint main(gint argc, gchar *argv[])
@@ -978,6 +1327,7 @@ gint main(gint argc, gchar *argv[])
        gboolean disable_clutter = FALSE;
        gboolean single_dir = TRUE;
        LayoutWindow *lw;
+       GtkSettings *default_settings;
 
 #ifdef HAVE_GTHREAD
 #if !GLIB_CHECK_VERSION(2,32,0)
@@ -991,7 +1341,7 @@ gint main(gint argc, gchar *argv[])
        /* init execution time counter (debug only) */
        init_exec_time();
 
-       create_application_paths();
+       create_application_paths(argv);
 
        /* setup locale, i18n */
        setlocale(LC_ALL, "");
@@ -1065,8 +1415,8 @@ gint main(gint argc, gchar *argv[])
                options->disable_gpu = TRUE;
                }
 
-       DEBUG_1("%s main: parse_command_line", get_exec_time());
-       parse_command_line(argc, argv);
+       /* Generate a unique identifier used by the open archive function */
+       instance_identifier = g_strdup_printf("%x", g_random_int());
 
        DEBUG_1("%s main: mkdir_if_not_exists", get_exec_time());
        /* these functions don't depend on config file */
@@ -1078,185 +1428,199 @@ gint main(gint argc, gchar *argv[])
 
        setup_env_path();
 
-       keys_load();
-       accel_map_load();
+       if (parse_command_line_for_cache_maintenance_option(argc, argv))
+               {
+               process_command_line_for_cache_maintenance_option(argc, argv);
+               }
+       else
+               {
+               DEBUG_1("%s main: parse_command_line", get_exec_time());
+               parse_command_line(argc, argv);
 
-       /* restore session from the config file */
+               keys_load();
+               accel_map_load();
 
+               /* restore session from the config file */
 
-       DEBUG_1("%s main: load_options", get_exec_time());
-       if (!load_options(options))
-               {
-               /* load_options calls these functions after it parses global options, we have to call it here if it fails */
-               filter_add_defaults();
-               filter_rebuild();
-               }
 
-#ifdef HAVE_CLUTTER
-/** @FIXME For the background of this see:
- * https://github.com/BestImageViewer/geeqie/issues/397
- * The feature CLUTTER_FEATURE_SWAP_EVENTS indictates if the
- * system is liable to exhibit this problem.
- * The user is provided with an override in Preferences/Behavior
- */
-       if (!options->override_disable_gpu && !options->disable_gpu)
-               {
-               DEBUG_1("CLUTTER_FEATURE_SWAP_EVENTS %d",clutter_feature_available(CLUTTER_FEATURE_SWAP_EVENTS));
-               if (clutter_feature_available(CLUTTER_FEATURE_SWAP_EVENTS) != 0)
+               DEBUG_1("%s main: load_options", get_exec_time());
+               if (!load_options(options))
                        {
-                       options->disable_gpu = TRUE;
+                       /* load_options calls these functions after it parses global options, we have to call it here if it fails */
+                       filter_add_defaults();
+                       filter_rebuild();
                        }
-               }
-#endif
-
-       /* handle missing config file and commandline additions*/
-       if (!layout_window_list)
-               {
-               /* broken or no config file */
-               layout_new_from_config(NULL, NULL, TRUE);
-               }
 
-       layout_editors_reload_start();
-
-       /* If no --list option, open a separate collection window for each
-        * .gqv file on the command line
+       #ifdef HAVE_CLUTTER
+       /** @FIXME For the background of this see:
+        * https://github.com/BestImageViewer/geeqie/issues/397
+        * The feature CLUTTER_FEATURE_SWAP_EVENTS indictates if the
+        * system is liable to exhibit this problem.
+        * The user is provided with an override in Preferences/Behavior
         */
-       if (command_line->collection_list && !command_line->startup_command_line_collection)
-               {
-               GList *work;
+               if (!options->override_disable_gpu && !options->disable_gpu)
+                       {
+                       DEBUG_1("CLUTTER_FEATURE_SWAP_EVENTS %d",clutter_feature_available(CLUTTER_FEATURE_SWAP_EVENTS));
+                       if (clutter_feature_available(CLUTTER_FEATURE_SWAP_EVENTS) != 0)
+                               {
+                               options->disable_gpu = TRUE;
+                               }
+                       }
+       #endif
 
-               work = command_line->collection_list;
-               while (work)
+               /* handle missing config file and commandline additions*/
+               if (!layout_window_list)
                        {
-                       CollectWindow *cw;
-                       const gchar *path;
+                       /* broken or no config file or no <layout> section */
+                       layout_new_from_default();
+                       }
 
-                       path = work->data;
-                       work = work->next;
+               layout_editors_reload_start();
 
-                       cw = collection_window_new(path);
-                       if (!first_collection && cw) first_collection = cw->cd;
-                       }
-               }
+               /* If no --list option, open a separate collection window for each
+                * .gqv file on the command line
+                */
+               if (command_line->collection_list && !command_line->startup_command_line_collection)
+                       {
+                       GList *work;
 
-       if (command_line->log_file)
-               {
-               gchar *pathl;
-               gchar *path = g_strdup(command_line->log_file);
+                       work = command_line->collection_list;
+                       while (work)
+                               {
+                               CollectWindow *cw;
+                               const gchar *path;
 
-               pathl = path_from_utf8(path);
-               command_line->ssi = secure_open(pathl);
-               }
+                               path = work->data;
+                               work = work->next;
 
-       /* If there is a files list on the command line and no --list option,
-        * check if they are all in the same folder
-        */
-       if (command_line->cmd_list && !(command_line->startup_command_line_collection))
-               {
-               GList *work;
-               gchar *path = NULL;
+                               cw = collection_window_new(path);
+                               if (!first_collection && cw) first_collection = cw->cd;
+                               }
+                       }
 
-               work = command_line->cmd_list;
+               if (command_line->log_file)
+                       {
+                       gchar *pathl;
+                       gchar *path = g_strdup(command_line->log_file);
+
+                       pathl = path_from_utf8(path);
+                       command_line->ssi = secure_open(pathl);
+                       }
 
-               while (work && single_dir)
+               /* If there is a files list on the command line and no --list option,
+                * check if they are all in the same folder
+                */
+               if (command_line->cmd_list && !(command_line->startup_command_line_collection))
                        {
-                       gchar *dirname;
+                       GList *work;
+                       gchar *path = NULL;
 
-                       dirname = g_path_get_dirname(work->data);
-                       if (!path)
-                               {
-                               path = g_strdup(dirname);
-                               }
-                       else
+                       work = command_line->cmd_list;
+
+                       while (work && single_dir)
                                {
-                               if (g_strcmp0(path, dirname) != 0)
+                               gchar *dirname;
+
+                               dirname = g_path_get_dirname(work->data);
+                               if (!path)
                                        {
-                                       single_dir = FALSE;
+                                       path = g_strdup(dirname);
                                        }
+                               else
+                                       {
+                                       if (g_strcmp0(path, dirname) != 0)
+                                               {
+                                               single_dir = FALSE;
+                                               }
+                                       }
+                               g_free(dirname);
+                               work = work->next;
                                }
-                       g_free(dirname);
-                       work = work->next;
+                       g_free(path);
                        }
-               g_free(path);
-               }
 
-       /* Files from multiple folders, or --list option given
-        * then open an unnamed collection and insert all files
-        */
-       if ((command_line->cmd_list && !single_dir) || (command_line->startup_command_line_collection && command_line->cmd_list))
-               {
-               GList *work;
-               CollectWindow *cw;
-
-               cw = collection_window_new(NULL);
-               cd = cw->cd;
+               /* Files from multiple folders, or --list option given
+                * then open an unnamed collection and insert all files
+                */
+               if ((command_line->cmd_list && !single_dir) || (command_line->startup_command_line_collection && command_line->cmd_list))
+                       {
+                       GList *work;
+                       CollectWindow *cw;
 
-               collection_path_changed(cd);
+                       cw = collection_window_new(NULL);
+                       cd = cw->cd;
 
-               work = command_line->cmd_list;
-               while (work)
-                       {
-                       FileData *fd;
+                       collection_path_changed(cd);
 
-                       fd = file_data_new_simple(work->data);
-                       collection_add(cd, fd, FALSE);
-                       file_data_unref(fd);
-                       work = work->next;
-                       }
+                       work = command_line->cmd_list;
+                       while (work)
+                               {
+                               FileData *fd;
 
-               work = command_line->collection_list;
-               while (work)
-                       {
-                       collection_load(cd, (gchar *)work->data, COLLECTION_LOAD_APPEND);
-                       work = work->next;
-                       }
+                               fd = file_data_new_simple(work->data);
+                               collection_add(cd, fd, FALSE);
+                               file_data_unref(fd);
+                               work = work->next;
+                               }
 
-               if (cd->list) layout_image_set_collection(NULL, cd, cd->list->data);
+                       work = command_line->collection_list;
+                       while (work)
+                               {
+                               collection_load(cd, (gchar *)work->data, COLLECTION_LOAD_APPEND);
+                               work = work->next;
+                               }
 
-               /* mem leak, we never unref this collection when !startup_command_line_collection
-                * (the image view of the main window does not hold a ref to the collection)
-                * this is sort of unavoidable, for if it did hold a ref, next/back
-                * may not work as expected when closing collection windows.
-                *
-                * collection_unref(cd);
-                */
+                       if (cd->list) layout_image_set_collection(NULL, cd, cd->list->data);
 
-               }
-       else if (first_collection)
-               {
-               layout_image_set_collection(NULL, first_collection,
-                                           collection_get_first(first_collection));
-               }
+                       /* mem leak, we never unref this collection when !startup_command_line_collection
+                        * (the image view of the main window does not hold a ref to the collection)
+                        * this is sort of unavoidable, for if it did hold a ref, next/back
+                        * may not work as expected when closing collection windows.
+                        *
+                        * collection_unref(cd);
+                        */
 
-       /* If the files on the command line are from one folder, select those files
-        * unless it is a command line collection - then leave focus on collection window
-        */
-       lw = NULL;
-       layout_valid(&lw);
+                       }
+               else if (first_collection)
+                       {
+                       layout_image_set_collection(NULL, first_collection,
+                                                   collection_get_first(first_collection));
+                       }
 
-       if (single_dir && command_line->cmd_list && !command_line->startup_command_line_collection)
-               {
-               GList *work;
-               GList *selected;
-               FileData *fd;
+               /* If the files on the command line are from one folder, select those files
+                * unless it is a command line collection - then leave focus on collection window
+                */
+               lw = NULL;
+               layout_valid(&lw);
 
-               selected = NULL;
-               work = command_line->cmd_list;
-               while (work)
+               if (single_dir && command_line->cmd_list && !command_line->startup_command_line_collection)
                        {
-                       fd = file_data_new_simple((gchar *)work->data);
-                       selected = g_list_append(selected, fd);
-                       file_data_unref(fd);
-                       work = work->next;
+                       GList *work;
+                       GList *selected;
+                       FileData *fd;
+
+                       selected = NULL;
+                       work = command_line->cmd_list;
+                       while (work)
+                               {
+                               fd = file_data_new_simple((gchar *)work->data);
+                               selected = g_list_append(selected, fd);
+                               file_data_unref(fd);
+                               work = work->next;
+                               }
+                       layout_select_list(lw, selected);
                        }
-               layout_select_list(lw, selected);
-               }
 
-       buf = g_build_filename(get_rc_dir(), ".command", NULL);
-       remote_connection = remote_server_init(buf, cd);
-       g_free(buf);
+               buf = g_build_filename(get_rc_dir(), ".command", NULL);
+               remote_connection = remote_server_init(buf, cd);
+               g_free(buf);
+
+               marks_load();
+       }
 
-       marks_load();
+       default_settings = gtk_settings_get_default();
+       g_signal_connect(default_settings, "notify::gtk-theme-name", G_CALLBACK(theme_change_cb), NULL);
+       set_theme_bg_color();
 
        DEBUG_1("%s main: gtk_main", get_exec_time());
        gtk_main();