nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'backport' into work

Browse source 
Conflicts:
	openbox/config.c
This commit is contained in:
Mikael Magnusson 2009-02-20 17:44:16 +01:00
commit 6d0c4d7fad
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/rc.xml
View file

@ -692,7 +692,7 @@
<y>200</y> <y>200</y>
<monitor>1</monitor> <monitor>1</monitor>
# specifies the monitor in a xinerama setup. # 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> </position>
<focus>yes</focus> <focus>yes</focus>

3
openbox/config.c
View file

@ -129,6 +129,7 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src,
copy_if(type, (ObClientType)-1); copy_if(type, (ObClientType)-1);
copy_if(decor, -1); copy_if(decor, -1);
copy_if(shade, -1); copy_if(shade, -1);
copy_if(monitor, -1);
copy_if(focus, -1); copy_if(focus, -1);
copy_if(desktop, 0); copy_if(desktop, 0);
copy_if(layer, -2); copy_if(layer, -2);
@ -264,7 +265,7 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d)
if (!g_ascii_strcasecmp(s, "mouse")) if (!g_ascii_strcasecmp(s, "mouse"))
settings->monitor = 0; settings->monitor = 0;
else else
settings->monitor = obt_parse_node_int(c) + 1; settings->monitor = obt_parse_node_int(c);
g_free(s); g_free(s);
} }