summaryrefslogtreecommitdiff
path: root/openbox/config.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2011-10-15 20:07:57 -0400
committerDana Jansens <danakj@orodu.net>2011-10-16 18:51:51 -0400
commit8a975cb10051e8da0420275a43f1b49d3cce2678 (patch)
tree9dbfb01d45ecded7712d8ad8852234c73bfdbd56 /openbox/config.c
parent4aade63604e9d29f01933b9bf0ac9228721411ef (diff)
respect the active/mouse options for monitor placement, and use ObMonitorPlace for per-app too
Diffstat (limited to 'openbox/config.c')
-rw-r--r--openbox/config.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/openbox/config.c b/openbox/config.c
index 9067011a..0d9eb689 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -111,7 +111,7 @@ ObAppSettings* config_create_app_settings(void)
settings->type = -1;
settings->decor = -1;
settings->shade = -1;
- settings->monitor_type = 0;
+ settings->monitor_type = OB_PLACE_MONITOR_ANY;
settings->monitor = -1;
settings->focus = -1;
settings->desktop = 0;
@@ -136,7 +136,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_type, 0);
+ copy_if(monitor_type, OB_PLACE_MONITOR_ANY);
copy_if(monitor, -1);
copy_if(focus, -1);
copy_if(desktop, 0);
@@ -297,13 +297,13 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d)
gchar *s = obt_xml_node_string(c);
if (!g_ascii_strcasecmp(s, "mouse"))
settings->monitor_type =
- OB_APP_SETTINGS_MONITOR_MOUSE;
+ OB_PLACE_MONITOR_MOUSE;
else if (!g_ascii_strcasecmp(s, "active"))
settings->monitor_type =
- OB_APP_SETTINGS_MONITOR_ACTIVE;
+ OB_PLACE_MONITOR_ACTIVE;
else if (!g_ascii_strcasecmp(s, "primary"))
settings->monitor_type =
- OB_APP_SETTINGS_MONITOR_PRIMARY;
+ OB_PLACE_MONITOR_PRIMARY;
else
settings->monitor = obt_xml_node_int(c);
g_free(s);