all repos — openbox @ 6d0c4d7fadd2d67760ef62e11385fd261ba6a3c4

openbox fork - make it a bit more like ryudo 

Merge branch 'backport' into work

Conflicts:
	openbox/config.c
Mikael Magnusson mikachu@gmail.com
commit

6d0c4d7fadd2d67760ef62e11385fd261ba6a3c4

parent

4145468a1984e1055a947ad957075ae51f70ca9c

2 files changed, 3 insertions(+), 2 deletions(-)

jump to
M data/rc.xml → data/rc.xml 
@@ -692,7 +692,7 @@ # right edge (or bottom).
       <y>200</y>
       <monitor>1</monitor>
       # specifies the monitor in a xinerama setup.
-      # 0 is the first head, or 'mouse' for wherever the mouse is
+      # 1 is the first head, or 'mouse' for wherever the mouse is
     </position>
 
     <focus>yes</focus>
M openbox/config.c → openbox/config.c 
@@ -129,6 +129,7 @@ 
     copy_if(type, (ObClientType)-1);
     copy_if(decor, -1);
     copy_if(shade, -1);
+    copy_if(monitor, -1);
     copy_if(focus, -1);
     copy_if(desktop, 0);
     copy_if(layer, -2);

@@ -264,7 +265,7 @@ gchar *s = obt_parse_node_string(c);
                         if (!g_ascii_strcasecmp(s, "mouse"))
                             settings->monitor = 0;
                         else
-                            settings->monitor = obt_parse_node_int(c) + 1;
+                            settings->monitor = obt_parse_node_int(c);
                         g_free(s);
                     }