From f476442531061fb6d36e3cc79decac10b985db35 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 22 Jan 2008 12:54:53 -0500 Subject: print a warning when the session has a different number of desktops than the openbox config --- openbox/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openbox/config.c') diff --git a/openbox/config.c b/openbox/config.c index 867dfb51..56e625d4 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -55,7 +55,7 @@ RrFont *config_font_menuitem; RrFont *config_font_menutitle; RrFont *config_font_osd; -gint config_desktops_num; +guint config_desktops_num; GSList *config_desktops_names; guint config_screen_firstdesk; guint config_desktop_popup_time; @@ -605,7 +605,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if ((n = parse_find_node("number", node))) { gint d = parse_int(doc, n); if (d > 0) - config_desktops_num = d; + config_desktops_num = (unsigned) d; } if ((n = parse_find_node("firstdesk", node))) { gint d = parse_int(doc, n); -- cgit v1.2.3 From 1d9991a0cd9b04dfa96a19bc73b40f01651de478 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 25 Jan 2008 12:53:43 +0100 Subject: Fix some memleaks. missing RrFontClose for osd_font in two places. missing a g_free(area); --- openbox/config.c | 1 + 1 file changed, 1 insertion(+) (limited to 'openbox/config.c') diff --git a/openbox/config.c b/openbox/config.c index 56e625d4..50f6aef6 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -982,6 +982,7 @@ void config_shutdown(void) RrFontClose(config_font_inactivewindow); RrFontClose(config_font_menuitem); RrFontClose(config_font_menutitle); + RrFontClose(config_font_osd); for (it = config_desktops_names; it; it = g_slist_next(it)) g_free(it->data); -- cgit v1.2.3 From dd740b5562806a6b4692c938ad0e903ad89b6193 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 27 Jan 2008 11:31:23 -0500 Subject: replace the placement option with active/mouse/any --- openbox/config.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'openbox/config.c') diff --git a/openbox/config.c b/openbox/config.c index 50f6aef6..5e6387bc 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -36,9 +36,9 @@ gboolean config_focus_raise; gboolean config_focus_last; gboolean config_focus_under_mouse; -ObPlacePolicy config_place_policy; -gboolean config_place_center; -gboolean config_place_active; +ObPlacePolicy config_place_policy; +gboolean config_place_center; +ObPlaceMonitor config_place_monitor; StrutPartial config_margins; @@ -491,8 +491,12 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_place_policy = OB_PLACE_POLICY_MOUSE; if ((n = parse_find_node("center", node))) config_place_center = parse_bool(doc, n); - if ((n = parse_find_node("active", node))) - config_place_active = parse_bool(doc, n); + if ((n = parse_find_node("placeOn", node))) { + if (parse_contains("active", doc, n)) + config_place_monitor = OB_PLACE_MONITOR_ACTIVE; + else if (parse_contains("mouse", doc, n)) + config_place_monitor = OB_PLACE_MONITOR_MOUSE; + } } static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -886,7 +890,7 @@ void config_startup(ObParseInst *i) config_place_policy = OB_PLACE_POLICY_SMART; config_place_center = TRUE; - config_place_active = FALSE; + config_place_monitor = OB_PLACE_MONITOR_ANY; parse_register(i, "placement", parse_placement, NULL); -- cgit v1.2.3 From d7837051412b03ef167744d26043c0413614f85b Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 27 Jan 2008 21:03:55 +0100 Subject: Change to . --- openbox/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openbox/config.c') diff --git a/openbox/config.c b/openbox/config.c index 5e6387bc..69904d85 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -491,7 +491,7 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_place_policy = OB_PLACE_POLICY_MOUSE; if ((n = parse_find_node("center", node))) config_place_center = parse_bool(doc, n); - if ((n = parse_find_node("placeOn", node))) { + if ((n = parse_find_node("monitor", node))) { if (parse_contains("active", doc, n)) config_place_monitor = OB_PLACE_MONITOR_ACTIVE; else if (parse_contains("mouse", doc, n)) -- cgit v1.2.3