diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2009-02-20 17:44:16 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2009-02-20 17:44:16 +0100 |
| commit | 6d0c4d7fadd2d67760ef62e11385fd261ba6a3c4 (patch) | |
| tree | 525d8e465ad96fcf6f16400ece60678d559eeb23 | |
| parent | 4145468a1984e1055a947ad957075ae51f70ca9c (diff) | |
| parent | 271e0fd9c87a97bb066b35f537a052235413fe5f (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
| -rw-r--r-- | data/rc.xml | 2 | ||||
| -rw-r--r-- | openbox/config.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/data/rc.xml b/data/rc.xml index 04447f34..f223f678 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -692,7 +692,7 @@ <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> diff --git a/openbox/config.c b/openbox/config.c index 790b03ba..e3be728e 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -129,6 +129,7 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src, 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 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) 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); } |