add setting <desktops><firstdesk>num<//> to set which desktop to start on, also fix...

diff --git a/openbox/config.c b/openbox/config.c
index a3c0034a70428bd08fa36b0ebba0754d00463f05..d362324c867a31235f27cedd19b26e09e5e6fece 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -37,6 +37,7 @@ gchar *config_title_layout;
 
 gint    config_desktops_num;
 GSList *config_desktops_names;
+gint    config_screen_firstdesk;
 
 gboolean config_redraw_resize;
 
@@ -247,10 +248,15 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     node = node->children;
     
     if ((n = parse_find_node("number", node))) {
-        guint d = parse_int(doc, n);
+        gint d = parse_int(doc, n);
         if (d > 0)
             config_desktops_num = d;
     }
+    if ((n = parse_find_node("firstdesk", node))) {
+        gint d = parse_int(doc, n);
+        if (d > 0)
+            config_screen_firstdesk = d;
+    }
     if ((n = parse_find_node("names", node))) {
         GSList *it;
         xmlNodePtr nname;
@@ -502,6 +508,7 @@ void config_startup(ObParseInst *i)
     parse_register(i, "theme", parse_theme, NULL);
 
     config_desktops_num = 4;
+    config_screen_firstdesk = 1;
     config_desktops_names = NULL;
 
     parse_register(i, "desktops", parse_desktops, NULL);

diff --git a/openbox/config.h b/openbox/config.h
index 881276269d74e2d1b3df961b0dc690a93ca61d69..4d3f3e5eac3fe9392400420d1e37a72bbb31ea99 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -74,6 +74,8 @@ extern gchar *config_title_layout;
 
 /*! The number of desktops */
 extern gint config_desktops_num;
+/*! Desktop to start on, put 5 to start in the center of a 3x3 grid */
+extern gint config_screen_firstdesk;
 /*! Names for the desktops */
 extern GSList *config_desktops_names;
 

diff --git a/openbox/screen.c b/openbox/screen.c
index 810d66b1e086df33f341db9a98362f949559a1b1..ef791bad6d2efb26ea915949bdf13f4decd3a000 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -295,7 +295,7 @@ void screen_startup(gboolean reconfig)
         screen_num_desktops = 0;
     screen_set_num_desktops(config_desktops_num);
     if (!reconfig) {
-        screen_set_desktop(0);
+        screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops) - 1);
 
         /* don't start in showing-desktop mode */
         screen_showing_desktop = FALSE;