move focus cycling into its own file

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 1b8aef43f119266ca712329294bbfb51f6e0ac9d..0acb486d0284f182b842d556b43598b1344e17a1 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -30,6 +30,7 @@
 #include "screen.h"
 #include "startupnotify.h"
 #include "focus.h"
+#include "focus_cycle.h"
 #include "moveresize.h"
 #include "frame.h"
 #include "keyboard.h"
@@ -89,7 +90,6 @@ gboolean    ob_replace_wm = FALSE;
 gboolean    ob_sm_use = TRUE;
 gchar      *ob_sm_id = NULL;
 gchar      *ob_sm_save_file = NULL;
-gchar      *ob_config_type = NULL;
 gboolean    ob_debug_xinerama = FALSE;
 
 static ObState   state;
@@ -213,7 +213,7 @@ gint main(gint argc, gchar **argv)
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
-    if (screen_annex(program_name)) { /* it will be ours! */
+    if (screen_annex()) { /* it will be ours! */
         do {
             modkeys_startup(reconfigure);
 
@@ -238,15 +238,17 @@ gint main(gint argc, gchar **argv)
                 config_startup(i);
 
                 /* parse/load user options */
-                if (parse_load_rc(ob_config_type, &doc, &node)) {
+                if (parse_load_rc(NULL, &doc, &node)) {
                     parse_tree(i, doc, node->xmlChildrenNode);
                     parse_close(doc);
                 } else
                     g_message(_("Unable to find a valid config file, using some simple defaults"));
 
-                if (ob_config_type != NULL)
+/*
+                if (config_type != NULL)
                     PROP_SETS(RootWindow(ob_display, ob_screen),
-                              ob_config, ob_config_type);
+                              ob_config, config_type);
+*/
 
                 /* we're done with parsing now, kill it */
                 parse_shutdown(i);
@@ -282,6 +284,7 @@ gint main(gint argc, gchar **argv)
             /* focus_backup is used for stacking, so this needs to come before
                anything that calls stacking_add */
             focus_startup(reconfigure);
+            focus_cycle_startup(reconfigure);
             window_startup(reconfigure);
             sn_startup(reconfigure);
             screen_startup(reconfigure);
@@ -347,6 +350,7 @@ gint main(gint argc, gchar **argv)
             propwin_shutdown(reconfigure);
             grab_shutdown(reconfigure);
             screen_shutdown(reconfigure);
+            focus_cycle_shutdown(reconfigure);
             focus_shutdown(reconfigure);
             sn_shutdown(reconfigure);
             window_shutdown(reconfigure);
@@ -409,10 +413,6 @@ gint main(gint argc, gchar **argv)
             argv = nargv;
         }
 
-        /* we also remove some environment variables, so put them back */
-        if (ob_config_type)
-            setenv("OPENBOX_CONFIG_NAMESPACE", ob_config_type, 1);
-
         /* re-run me */
         execvp(argv[0], argv); /* try how we were run */
         execlp(argv[0], program_name, (gchar*)NULL); /* last resort */
@@ -421,7 +421,6 @@ gint main(gint argc, gchar **argv)
     /* free stuff passed in from the command line or environment */
     g_free(ob_sm_save_file);
     g_free(ob_sm_id);
-    g_free(ob_config_type);
     g_free(program_name);
      
     return exitcode;
@@ -494,9 +493,6 @@ static void parse_env()
 {
     /* unset this so we don't pass it on unknowingly */
     unsetenv("DESKTOP_STARTUP_ID");
-
-    if (getenv("OPENBOX_CONFIG_NAMESPACE"))
-        ob_config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
 }
 
 static void parse_args(gint *argc, gchar **argv)
@@ -544,18 +540,6 @@ static void parse_args(gint *argc, gchar **argv)
             remote_control = 2;
 */
         }
-        else if (!strcmp(argv[i], "--config-namespace")) {
-            if (i == *argc - 1) /* no args left */
-                /* not translated cuz it's sekret */
-                g_printerr("--config-namespace requires an argument\n");
-            else {
-                ob_config_type = g_strdup(argv[i+1]);
-                remove_args(argc, argv, i, 2);
-                --i; /* this arg was removed so go back */
-                ob_debug_type(OB_DEBUG_SM, "--config-namespace %s\n",
-                              ob_sm_save_file);
-            }
-        }
         else if (!strcmp(argv[i], "--sm-save-file")) {
             if (i == *argc - 1) /* no args left */
                 /* not translated cuz it's sekret */