Conflicts:
openbox/config.c
<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>
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);
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);
}