add --debug-focus

add --config-file: to specify a config file to use.

set OPENBOX_RC property on the root window containing the path of the RC file being the full path to the RC file being used by openbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 08360d4..f461e40 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -91,6 +91,7 @@ static KeyCode   keys[OB_NUM_KEYS];
 static gint      exitcode = 0;
 static guint     remote_control = 0;
 static gboolean  being_replaced = FALSE;
 static gint      exitcode = 0;
 static guint     remote_control = 0;
 static gboolean  being_replaced = FALSE;

+static gchar    *config_file = NULL;

 
 static void signal_handler(gint signal, gpointer data);
 static void parse_args(gint argc, gchar **argv);
 
 static void signal_handler(gint signal, gpointer data);
 static void parse_args(gint argc, gchar **argv);


@@ -100,9 +101,6 @@ gint main(gint argc, gchar **argv)
 {
 #ifdef DEBUG
     ob_debug_show_output(TRUE);
 {
 #ifdef DEBUG
     ob_debug_show_output(TRUE);

-#ifdef DEBUG_FOCUS
-    ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
-#endif

 #endif
 
     state = OB_STATE_STARTING;
 #endif
 
     state = OB_STATE_STARTING;


@@ -227,8 +225,12 @@ gint main(gint argc, gchar **argv)
 
                 config_startup(i);
                 /* parse/load user options */
 
                 config_startup(i);
                 /* parse/load user options */

-                if (parse_load_rc(&doc, &node))
+                if (parse_load_rc(config_file, &doc, &node, &config_file)) {
+                    PROP_SETS(RootWindow(ob_display, ob_screen),
+                              openbox_rc, config_file);

                     parse_tree(i, doc, node->xmlChildrenNode);
                     parse_tree(i, doc, node->xmlChildrenNode);

+                } else
+                    PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc);

                 /* we're done with parsing now, kill it */
                 parse_close(doc);
                 parse_shutdown(i);
                 /* we're done with parsing now, kill it */
                 parse_close(doc);
                 parse_shutdown(i);


@@ -322,6 +324,7 @@ gint main(gint argc, gchar **argv)
 
     XSync(ob_display, FALSE);
 
 
     XSync(ob_display, FALSE);
 

+    g_free(config_file); /* this is set by parse_load_rc */

     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
 
     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
 


@@ -383,7 +386,7 @@ static void print_version()
 {
     g_print("Openbox %s\n", PACKAGE_VERSION);
     g_print("Copyright (c) 2007 Mikael Magnusson\n");
 {
     g_print("Openbox %s\n", PACKAGE_VERSION);
     g_print("Copyright (c) 2007 Mikael Magnusson\n");

-    g_print("Copyright (c) 2007 Dana Jansens\n\n");
+    g_print("Copyright (c) 2003-2007 Dana Jansens\n\n");

     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
     g_print("This is free software, and you are welcome to redistribute it\n");
     g_print("under certain conditions. See the file COPYING for details.\n\n");
     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
     g_print("This is free software, and you are welcome to redistribute it\n");
     g_print("under certain conditions. See the file COPYING for details.\n\n");


@@ -396,6 +399,8 @@ static void print_help()
     g_print("  --reconfigure       Tell the currently running instance of "
             "Openbox to\n"
             "                      reconfigure (and then exit immediately)\n");
     g_print("  --reconfigure       Tell the currently running instance of "
             "Openbox to\n"
             "                      reconfigure (and then exit immediately)\n");

+    g_print("  --config-file FILE  Specify the file to load for the config "
+            "file\n");

 #ifdef USE_SM
     g_print("  --sm-disable        Disable connection to session manager\n");
     g_print("  --sm-client-id ID   Specify session management ID\n");
 #ifdef USE_SM
     g_print("  --sm-disable        Disable connection to session manager\n");
     g_print("  --sm-client-id ID   Specify session management ID\n");


@@ -410,6 +415,7 @@ static void print_help()
             "meant for\n"
             "                      debugging X routines)\n");
     g_print("  --debug             Display debugging output\n");
             "meant for\n"
             "                      debugging X routines)\n");
     g_print("  --debug             Display debugging output\n");

+    g_print("  --debug-focus       Display debugging output\n");

     g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT);
 }
 
     g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT);
 }
 


@@ -432,10 +438,20 @@ static void parse_args(gint argc, gchar **argv)
             xsync = TRUE;
         } else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);
             xsync = TRUE;
         } else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);

+        } else if (!strcmp(argv[i], "--debug-focus")) {
+            ob_debug_show_output(TRUE);
+            ob_debug_enable(OB_DEBUG_FOCUS, TRUE);

         } else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;
         } else if (!strcmp(argv[i], "--restart")) {
             remote_control = 2;
         } else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;
         } else if (!strcmp(argv[i], "--restart")) {
             remote_control = 2;

+        } else if (!strcmp(argv[i], "--config-file")) {
+            if (i == argc - 1) /* no args left */
+                g_printerr(_("--config-file requires an argument\n"));
+            else {
+                config_file = g_strdup(argv[i+1]);
+                ++i;
+            }

         }
     }
 }
         }
     }
 }

diff --git a/openbox/prop.c b/openbox/prop.c
index 3b73b8f..b3c65d3 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -2,7 +2,7 @@
 
    prop.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
 
    prop.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson

-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -154,6 +154,7 @@ void prop_startup()
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 
     CREATE(openbox_pid, "_OPENBOX_PID");
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 
     CREATE(openbox_pid, "_OPENBOX_PID");

+    CREATE(openbox_rc, "_OPENBOX_RC");

     CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
     CREATE(ob_control, "_OB_CONTROL");
 }
     CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
     CREATE(ob_control, "_OB_CONTROL");
 }

diff --git a/openbox/prop.h b/openbox/prop.h
index 1819366..386b7a8 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -2,7 +2,7 @@
 
    prop.h for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
 
    prop.h for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson

-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -168,6 +168,7 @@ typedef struct Atoms {
     /* Openbox specific atoms */
      
     Atom openbox_pid;
     /* Openbox specific atoms */
      
     Atom openbox_pid;

+    Atom openbox_rc;

     Atom ob_wm_state_undecorated;
     Atom ob_control;
 } Atoms;
     Atom ob_wm_state_undecorated;
     Atom ob_control;
 } Atoms;

diff --git a/parser/parse.c b/parser/parse.c
index 33f8054..552221c 100644 (file)
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -79,16 +79,27 @@ void parse_register(ObParseInst *i, const gchar *tag,
     g_hash_table_insert(i->callbacks, c->tag, c);
 }
 
     g_hash_table_insert(i->callbacks, c->tag, c);
 }
 

-gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root)
+gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
+                       gchar **fileused)

 {
     GSList *it;
 {
     GSList *it;

-    gchar *path;

     gboolean r = FALSE;
 
     gboolean r = FALSE;
 

+    *fileused = NULL;
+

     for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {
     for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {

-        path = g_build_filename(it->data, "openbox", "rc.xml", NULL);
-        r = parse_load(path, "openbox_config", doc, root);
-        g_free(path);
+        if (file) {
+            if ((r = parse_load(file, "openbox_config", doc, root)))
+                *fileused = g_strdup(file);
+        } else {
+            gchar *path;
+
+            path = g_build_filename(it->data, "openbox", "rc.xml", NULL);
+            if ((r = parse_load(path, "openbox_config", doc, root)))
+                *fileused = path;
+            else
+                g_free(path);
+        }

     }
     if (!r)
         g_warning("Unable to find a valid config file, using defaults");
     }
     if (!r)
         g_warning("Unable to find a valid config file, using defaults");

diff --git a/parser/parse.h b/parser/parse.h
index d2a6606..7039d8c 100644 (file)
--- a/parser/parse.h
+++ b/parser/parse.h
@@ -35,7 +35,8 @@ ObParseInst* parse_startup();
 void parse_shutdown(ObParseInst *inst);
 
 /* Loads Openbox's rc, from the normal paths */
 void parse_shutdown(ObParseInst *inst);
 
 /* Loads Openbox's rc, from the normal paths */

-gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root);
+gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
+                       gchar **fileused);

 /* Loads an Openbox menu, from the normal paths */
 gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root);
 /* Loads an Openbox menu, from the normal paths */
 /* Loads an Openbox menu, from the normal paths */
 gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root);
 /* Loads an Openbox menu, from the normal paths */