X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=78b5322373021c7e6267be94059a133c15089dda;hb=382d37553d9dc7679464cf71aecf8590cc06a2cb;hp=0f2ba9237cf150c7619f781feb99dd0d26688ae2;hpb=334f9df7aadd4a136dc9411df1cb24a9eba6b6c8;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 0f2ba923..78b53223 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -89,7 +89,7 @@ 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;
 static gboolean  xsync = FALSE;
@@ -212,7 +212,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);
 
@@ -237,15 +237,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);
@@ -408,10 +410,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 */
@@ -420,7 +418,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;
@@ -474,6 +471,7 @@ static void print_help()
     g_print(_("  --sync              Run in synchronous mode\n"));
     g_print(_("  --debug             Display debugging output\n"));
     g_print(_("  --debug-focus       Display debugging output for focus handling\n"));
+    g_print(_("  --debug-xinerama    Split the display into fake xinerama screens\n"));
     g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
 }
 
@@ -492,9 +490,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)
@@ -532,6 +527,9 @@ static void parse_args(gint *argc, gchar **argv)
             ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
             ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
         }
+        else if (!strcmp(argv[i], "--debug-xinerama")) {
+            ob_debug_xinerama = TRUE;
+        }
         else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;
 /* don't make this do anything if it's not in --help ..
@@ -539,18 +537,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 */