X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=1a3e6ddf5af908977d7fe55834a4f6fbe6f3c365;hb=4d2ccf19168a4089a6a0de0109610479ec6d5507;hp=cc86ce7cfa748fbc0da12148485a25ce2f396d05;hpb=c70379fa8f771e499a4d47e84af06d71838b780d;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index cc86ce7c..1a3e6ddf 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -22,7 +22,6 @@ #include "mouse.h" #include "actions.h" #include "translate.h" -#include "hooks.h" #include "client.h" #include "screen.h" #include "openbox.h" @@ -35,15 +34,20 @@ guint config_focus_delay; gboolean config_focus_raise; gboolean config_focus_last; gboolean config_focus_under_mouse; +gboolean config_unfocus_leave; ObPlacePolicy config_place_policy; gboolean config_place_center; ObPlaceMonitor config_place_monitor; +guint config_primary_monitor_index; +ObPlaceMonitor config_primary_monitor; + StrutPartial config_margins; gchar *config_theme; gboolean config_theme_keepborder; +guint config_theme_window_list_icon_size; gchar *config_title_layout; @@ -53,7 +57,8 @@ RrFont *config_font_activewindow; RrFont *config_font_inactivewindow; RrFont *config_font_menuitem; RrFont *config_font_menutitle; -RrFont *config_font_osd; +RrFont *config_font_activeosd; +RrFont *config_font_inactiveosd; guint config_desktops_num; GSList *config_desktops_names; @@ -81,15 +86,17 @@ guint config_dock_app_move_modifiers; guint config_keyboard_reset_keycode; guint config_keyboard_reset_state; -gint config_mouse_threshold; -gint config_mouse_dclicktime; -gint config_mouse_screenedgetime; +gint config_mouse_threshold; +gint config_mouse_dclicktime; +gint config_mouse_screenedgetime; +gboolean config_mouse_screenedgewarp; guint config_menu_hide_delay; gboolean config_menu_middle; guint config_submenu_show_delay; -gboolean config_menu_client_list_icons; +guint config_submenu_hide_delay; gboolean config_menu_manage_desktops; +gboolean config_menu_show_icons; GSList *config_menu_files; @@ -100,10 +107,11 @@ GSList *config_per_app_settings; ObAppSettings* config_create_app_settings(void) { - ObAppSettings *settings = g_new0(ObAppSettings, 1); + ObAppSettings *settings = g_slice_new0(ObAppSettings); settings->type = -1; settings->decor = -1; settings->shade = -1; + settings->monitor_type = OB_PLACE_MONITOR_ANY; settings->monitor = -1; settings->focus = -1; settings->desktop = 0; @@ -128,6 +136,8 @@ 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, OB_PLACE_MONITOR_ANY); + copy_if(monitor, -1); copy_if(focus, -1); copy_if(desktop, 0); copy_if(layer, -2); @@ -142,22 +152,33 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src, dst->pos_given = TRUE; dst->pos_force = src->pos_force; dst->position = src->position; - dst->monitor = src->monitor; + /* monitor is copied above */ } } -static void config_parse_gravity_coord(xmlNodePtr node, GravityCoord *c) +void config_parse_relative_number(gchar *s, gint *num, gint *denom) { - gchar *s = obt_parse_node_string(node); + *num = strtol(s, &s, 10); + + if (*s == '%') { + *denom = 100; + } else if (*s == '/') { + *denom = atoi(s+1); + } +} + +void config_parse_gravity_coord(xmlNodePtr node, GravityCoord *c) +{ + gchar *s = obt_xml_node_string(node); if (!g_ascii_strcasecmp(s, "center")) c->center = TRUE; else { + gchar *ps = s; if (s[0] == '-') c->opposite = TRUE; if (s[0] == '-' || s[0] == '+') - c->pos = atoi(s+1); - else - c->pos = atoi(s); + ps++; + config_parse_relative_number(ps, &c->pos, &c->denom); } g_free(s); } @@ -181,8 +202,8 @@ static void config_parse_gravity_coord(xmlNodePtr node, GravityCoord *c) /* Manages settings for individual applications. Some notes: monitor is the screen number in a multi monitor - (Xinerama) setup (starting from 0) or mouse, meaning the - monitor the pointer is on. Default: mouse. + (Xinerama) setup (starting from 0), or mouse: the monitor the pointer + is on, active: the active monitor, primary: the primary monitor. Layer can be three values, above (Always on top), below (Always on bottom) and everything else (normal behaviour). Positions can be an integer value or center, which will @@ -192,20 +213,47 @@ static void config_parse_gravity_coord(xmlNodePtr node, GravityCoord *c) */ static void parse_per_app_settings(xmlNodePtr node, gpointer d) { - xmlNodePtr app = obt_parse_find_node(node->children, "application"); - gchar *name = NULL, *class = NULL, *role = NULL, *type = NULL; - gboolean name_set, class_set, type_set; + xmlNodePtr app = obt_xml_find_node(node->children, "application"); + gchar *name = NULL, *class = NULL, *role = NULL, *title = NULL, + *type_str = NULL; + gboolean name_set, class_set, type_set, role_set, title_set; + ObClientType type; gboolean x_pos_given; while (app) { - name_set = class_set = type_set = x_pos_given = FALSE; + x_pos_given = FALSE; + + class_set = obt_xml_attr_string(app, "class", &class); + name_set = obt_xml_attr_string(app, "name", &name); + type_set = obt_xml_attr_string(app, "type", &type_str); + role_set = obt_xml_attr_string(app, "role", &role); + title_set = obt_xml_attr_string(app, "title", &title); + + /* validate the type tho */ + if (type_set) { + if (!g_ascii_strcasecmp(type_str, "normal")) + type = OB_CLIENT_TYPE_NORMAL; + else if (!g_ascii_strcasecmp(type_str, "dialog")) + type = OB_CLIENT_TYPE_DIALOG; + else if (!g_ascii_strcasecmp(type_str, "splash")) + type = OB_CLIENT_TYPE_SPLASH; + else if (!g_ascii_strcasecmp(type_str, "utility")) + type = OB_CLIENT_TYPE_UTILITY; + else if (!g_ascii_strcasecmp(type_str, "menu")) + type = OB_CLIENT_TYPE_MENU; + else if (!g_ascii_strcasecmp(type_str, "toolbar")) + type = OB_CLIENT_TYPE_TOOLBAR; + else if (!g_ascii_strcasecmp(type_str, "dock")) + type = OB_CLIENT_TYPE_DOCK; + else if (!g_ascii_strcasecmp(type_str, "desktop")) + type = OB_CLIENT_TYPE_DESKTOP; + else + type_set = FALSE; /* not valid! */ + } - class_set = obt_parse_attr_string(app, "class", &class); - name_set = obt_parse_attr_string(app, "name", &name); - type_set = obt_parse_attr_string(app, "type", &type); - if (class_set || name_set) { + if (class_set || name_set || role_set || title_set || type_set) { xmlNodePtr n, c; - ObAppSettings *settings = config_create_app_settings();; + ObAppSettings *settings = config_create_app_settings(); if (name_set) settings->name = g_pattern_spec_new(name); @@ -213,74 +261,68 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) if (class_set) settings->class = g_pattern_spec_new(class); - if (type_set) { - if (!g_ascii_strcasecmp(type, "normal")) - settings->type = OB_CLIENT_TYPE_NORMAL; - else if (!g_ascii_strcasecmp(type, "dialog")) - settings->type = OB_CLIENT_TYPE_DIALOG; - else if (!g_ascii_strcasecmp(type, "splash")) - settings->type = OB_CLIENT_TYPE_SPLASH; - else if (!g_ascii_strcasecmp(type, "utility")) - settings->type = OB_CLIENT_TYPE_UTILITY; - else if (!g_ascii_strcasecmp(type, "menu")) - settings->type = OB_CLIENT_TYPE_MENU; - else if (!g_ascii_strcasecmp(type, "toolbar")) - settings->type = OB_CLIENT_TYPE_TOOLBAR; - else if (!g_ascii_strcasecmp(type, "dock")) - settings->type = OB_CLIENT_TYPE_DOCK; - else if (!g_ascii_strcasecmp(type, "desktop")) - settings->type = OB_CLIENT_TYPE_DESKTOP; - } - - if (obt_parse_attr_string(app, "role", &role)) + if (role_set) settings->role = g_pattern_spec_new(role); - if ((n = obt_parse_find_node(app->children, "decor"))) - if (!obt_parse_node_contains(n, "default")) - settings->decor = obt_parse_node_bool(n); + if (title_set) + settings->title = g_pattern_spec_new(title); + + if (type_set) + settings->type = type; + + if ((n = obt_xml_find_node(app->children, "decor"))) + if (!obt_xml_node_contains(n, "default")) + settings->decor = obt_xml_node_bool(n); - if ((n = obt_parse_find_node(app->children, "shade"))) - if (!obt_parse_node_contains(n, "default")) - settings->shade = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(app->children, "shade"))) + if (!obt_xml_node_contains(n, "default")) + settings->shade = obt_xml_node_bool(n); - if ((n = obt_parse_find_node(app->children, "position"))) { - if ((c = obt_parse_find_node(n->children, "x"))) - if (!obt_parse_node_contains(c, "default")) { + if ((n = obt_xml_find_node(app->children, "position"))) { + if ((c = obt_xml_find_node(n->children, "x"))) + if (!obt_xml_node_contains(c, "default")) { config_parse_gravity_coord(c, &settings->position.x); x_pos_given = TRUE; } - if (x_pos_given && (c = obt_parse_find_node(n->children, "y"))) - if (!obt_parse_node_contains(c, "default")) { + if (x_pos_given && (c = obt_xml_find_node(n->children, "y"))) + if (!obt_xml_node_contains(c, "default")) { config_parse_gravity_coord(c, &settings->position.y); settings->pos_given = TRUE; } - if (settings->pos_given && - (c = obt_parse_find_node(n->children, "monitor"))) - if (!obt_parse_node_contains(c, "default")) { - gchar *s = obt_parse_node_string(c); + /* monitor can be set without setting x or y */ + if ((c = obt_xml_find_node(n->children, "monitor"))) + if (!obt_xml_node_contains(c, "default")) { + gchar *s = obt_xml_node_string(c); if (!g_ascii_strcasecmp(s, "mouse")) - settings->monitor = 0; + settings->monitor_type = + OB_PLACE_MONITOR_MOUSE; + else if (!g_ascii_strcasecmp(s, "active")) + settings->monitor_type = + OB_PLACE_MONITOR_ACTIVE; + else if (!g_ascii_strcasecmp(s, "primary")) + settings->monitor_type = + OB_PLACE_MONITOR_PRIMARY; else - settings->monitor = obt_parse_node_int(c) + 1; + settings->monitor = obt_xml_node_int(c); g_free(s); } - obt_parse_attr_bool(n, "force", &settings->pos_force); + obt_xml_attr_bool(n, "force", &settings->pos_force); } - if ((n = obt_parse_find_node(app->children, "focus"))) - if (!obt_parse_node_contains(n, "default")) - settings->focus = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(app->children, "focus"))) + if (!obt_xml_node_contains(n, "default")) + settings->focus = obt_xml_node_bool(n); - if ((n = obt_parse_find_node(app->children, "desktop"))) { - if (!obt_parse_node_contains(n, "default")) { - gchar *s = obt_parse_node_string(n); + if ((n = obt_xml_find_node(app->children, "desktop"))) { + if (!obt_xml_node_contains(n, "default")) { + gchar *s = obt_xml_node_string(n); if (!g_ascii_strcasecmp(s, "all")) settings->desktop = DESKTOP_ALL; else { - gint i = obt_parse_node_int(n); + gint i = obt_xml_node_int(n); if (i > 0) settings->desktop = i; } @@ -288,9 +330,9 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) } } - if ((n = obt_parse_find_node(app->children, "layer"))) - if (!obt_parse_node_contains(n, "default")) { - gchar *s = obt_parse_node_string(n); + if ((n = obt_xml_find_node(app->children, "layer"))) + if (!obt_xml_node_contains(n, "default")) { + gchar *s = obt_xml_node_string(n); if (!g_ascii_strcasecmp(s, "above")) settings->layer = 1; else if (!g_ascii_strcasecmp(s, "below")) @@ -300,25 +342,25 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) g_free(s); } - if ((n = obt_parse_find_node(app->children, "iconic"))) - if (!obt_parse_node_contains(n, "default")) - settings->iconic = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(app->children, "iconic"))) + if (!obt_xml_node_contains(n, "default")) + settings->iconic = obt_xml_node_bool(n); - if ((n = obt_parse_find_node(app->children, "skip_pager"))) - if (!obt_parse_node_contains(n, "default")) - settings->skip_pager = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(app->children, "skip_pager"))) + if (!obt_xml_node_contains(n, "default")) + settings->skip_pager = obt_xml_node_bool(n); - if ((n = obt_parse_find_node(app->children, "skip_taskbar"))) - if (!obt_parse_node_contains(n, "default")) - settings->skip_taskbar = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(app->children, "skip_taskbar"))) + if (!obt_xml_node_contains(n, "default")) + settings->skip_taskbar = obt_xml_node_bool(n); - if ((n = obt_parse_find_node(app->children, "fullscreen"))) - if (!obt_parse_node_contains(n, "default")) - settings->fullscreen = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(app->children, "fullscreen"))) + if (!obt_xml_node_contains(n, "default")) + settings->fullscreen = obt_xml_node_bool(n); - if ((n = obt_parse_find_node(app->children, "maximized"))) - if (!obt_parse_node_contains(n, "default")) { - gchar *s = obt_parse_node_string(n); + if ((n = obt_xml_find_node(app->children, "maximized"))) + if (!obt_xml_node_contains(n, "default")) { + gchar *s = obt_xml_node_string(n); if (!g_ascii_strcasecmp(s, "horizontal")) { settings->max_horz = TRUE; settings->max_vert = FALSE; @@ -327,63 +369,24 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) settings->max_vert = TRUE; } else settings->max_horz = settings->max_vert = - obt_parse_node_bool(n); + obt_xml_node_bool(n); g_free(s); } config_per_app_settings = g_slist_append(config_per_app_settings, - (gpointer) settings); + (gpointer) settings); g_free(name); g_free(class); g_free(role); - name = class = role = NULL; + g_free(title); + g_free(type_str); + name = class = role = title = type_str = NULL; } - app = obt_parse_find_node(app->next, "application"); + app = obt_xml_find_node(app->next, "application"); } } -static void parse_hook(xmlNodePtr node, gpointer d) -{ - gchar *name; - ObHook hook; - xmlNodePtr n; - - - if (!obt_parse_attr_string(node, "name", &name)) { - g_message(_("Hook in config file is missing a name")); - return; - } - - hook = hooks_hook_from_name(name); - if (!hook) - g_message(_("Unknown hook \"%s\" in config file"), name); - else { - if ((n = obt_parse_find_node(node->children, "action"))) - while (n) { - ObActionsAct *action; - - action = actions_parse(n); - if (action) - hooks_add(hook, action); - n = obt_parse_find_node(n->next, "action"); - } - } - - g_free(name); -} - -static void parse_hooks(xmlNodePtr node, gpointer d) -{ - xmlNodePtr n; - - if ((n = obt_parse_find_node(node->children, "hook"))) - while (n) { - parse_hook(n, NULL); - n = obt_parse_find_node(n->next, "hook"); - } -} - /* @@ -396,39 +399,44 @@ static void parse_hooks(xmlNodePtr node, gpointer d) static void parse_key(xmlNodePtr node, GList *keylist) { - gchar *key; + gchar *keystring, **keys, **key; xmlNodePtr n; gboolean is_chroot = FALSE; - if (!obt_parse_attr_string(node, "key", &key)) + if (!obt_xml_attr_string(node, "key", &keystring)) return; - obt_parse_attr_bool(node, "chroot", &is_chroot); + obt_xml_attr_bool(node, "chroot", &is_chroot); - keylist = g_list_append(keylist, key); + keys = g_strsplit(keystring, " ", 0); + for (key = keys; *key; ++key) { + keylist = g_list_append(keylist, *key); - if ((n = obt_parse_find_node(node->children, "keybind"))) { - while (n) { - parse_key(n, keylist); - n = obt_parse_find_node(n->next, "keybind"); + if ((n = obt_xml_find_node(node->children, "keybind"))) { + while (n) { + parse_key(n, keylist); + n = obt_xml_find_node(n->next, "keybind"); + } } - } - else if ((n = obt_parse_find_node(node->children, "action"))) { - while (n) { - ObActionsAct *action; + else if ((n = obt_xml_find_node(node->children, "action"))) { + while (n) { + ObActionsAct *action; - action = actions_parse(n); - if (action) - keyboard_bind(keylist, action); - n = obt_parse_find_node(n->next, "action"); + action = actions_parse(n); + if (action) + keyboard_bind(keylist, action); + n = obt_xml_find_node(n->next, "action"); + } } - } - if (is_chroot) - keyboard_chroot(keylist); - g_free(key); - keylist = g_list_delete_link(keylist, g_list_last(keylist)); + if (is_chroot) + keyboard_chroot(keylist); + keylist = g_list_delete_link(keylist, g_list_last(keylist)); + } + + g_strfreev(keys); + g_free(keystring); } static void parse_keyboard(xmlNodePtr node, gpointer d) @@ -438,17 +446,17 @@ static void parse_keyboard(xmlNodePtr node, gpointer d) keyboard_unbind_all(); - if ((n = obt_parse_find_node(node->children, "chainQuitKey"))) { - key = obt_parse_node_string(n); + if ((n = obt_xml_find_node(node->children, "chainQuitKey"))) { + key = obt_xml_node_string(n); translate_key(key, &config_keyboard_reset_state, &config_keyboard_reset_keycode); g_free(key); } - if ((n = obt_parse_find_node(node->children, "keybind"))) + if ((n = obt_xml_find_node(node->children, "keybind"))) while (n) { parse_key(n, NULL); - n = obt_parse_find_node(n->next, "keybind"); + n = obt_xml_find_node(n->next, "keybind"); } } @@ -466,55 +474,82 @@ static void parse_mouse(xmlNodePtr node, gpointer d) { xmlNodePtr n, nbut, nact; gchar *buttonstr; - gchar *contextstr; + gchar *cxstr; ObMouseAction mact; mouse_unbind_all(); node = node->children; - if ((n = obt_parse_find_node(node, "dragThreshold"))) - config_mouse_threshold = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "doubleClickTime"))) - config_mouse_dclicktime = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "screenEdgeWarpTime"))) - config_mouse_screenedgetime = obt_parse_node_int(n); + if ((n = obt_xml_find_node(node, "dragThreshold"))) + config_mouse_threshold = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "doubleClickTime"))) + config_mouse_dclicktime = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "screenEdgeWarpTime"))) { + config_mouse_screenedgetime = obt_xml_node_int(n); + /* minimum value of 25 for this property, when it is 1 and you hit the + edge it basically never stops */ + if (config_mouse_screenedgetime && config_mouse_screenedgetime < 25) + config_mouse_screenedgetime = 25; + } + if ((n = obt_xml_find_node(node, "screenEdgeWarpMouse"))) + config_mouse_screenedgewarp = obt_xml_node_bool(n); - n = obt_parse_find_node(node, "context"); + n = obt_xml_find_node(node, "context"); while (n) { - if (!obt_parse_attr_string(n, "name", &contextstr)) + gchar *modcxstr; + ObFrameContext cx; + + if (!obt_xml_attr_string(n, "name", &cxstr)) goto next_n; - nbut = obt_parse_find_node(n->children, "mousebind"); - while (nbut) { - if (!obt_parse_attr_string(nbut, "button", &buttonstr)) - goto next_nbut; - if (obt_parse_attr_contains(nbut, "action", "press")) { - mact = OB_MOUSE_ACTION_PRESS; - } else if (obt_parse_attr_contains(nbut, "action", "release")) { - mact = OB_MOUSE_ACTION_RELEASE; - } else if (obt_parse_attr_contains(nbut, "action", "click")) { - mact = OB_MOUSE_ACTION_CLICK; - } else if (obt_parse_attr_contains(nbut, "action","doubleclick")) { - mact = OB_MOUSE_ACTION_DOUBLE_CLICK; - } else if (obt_parse_attr_contains(nbut, "action", "drag")) { - mact = OB_MOUSE_ACTION_MOTION; - } else - goto next_nbut; - nact = obt_parse_find_node(nbut->children, "action"); - while (nact) { - ObActionsAct *action; - if ((action = actions_parse(nact))) - mouse_bind(buttonstr, contextstr, mact, action); - nact = obt_parse_find_node(nact->next, "action"); + modcxstr = g_strdup(cxstr); /* make a copy to mutilate */ + while (frame_next_context_from_string(modcxstr, &cx)) { + if (!cx) { + gchar *s = strchr(modcxstr, ' '); + if (s) { + *s = '\0'; + g_message(_("Invalid context \"%s\" in mouse binding"), + modcxstr); + *s = ' '; + } + continue; } + + nbut = obt_xml_find_node(n->children, "mousebind"); + while (nbut) { + if (!obt_xml_attr_string(nbut, "button", &buttonstr)) + goto next_nbut; + if (obt_xml_attr_contains(nbut, "action", "press")) + mact = OB_MOUSE_ACTION_PRESS; + else if (obt_xml_attr_contains(nbut, "action", "release")) + mact = OB_MOUSE_ACTION_RELEASE; + else if (obt_xml_attr_contains(nbut, "action", "click")) + mact = OB_MOUSE_ACTION_CLICK; + else if (obt_xml_attr_contains(nbut, "action","doubleclick")) + mact = OB_MOUSE_ACTION_DOUBLE_CLICK; + else if (obt_xml_attr_contains(nbut, "action", "drag")) + mact = OB_MOUSE_ACTION_MOTION; + else + goto next_nbut; + + nact = obt_xml_find_node(nbut->children, "action"); + while (nact) { + ObActionsAct *action; + + if ((action = actions_parse(nact))) + mouse_bind(buttonstr, cx, mact, action); + nact = obt_xml_find_node(nact->next, "action"); + } g_free(buttonstr); - next_nbut: - nbut = obt_parse_find_node(nbut->next, "mousebind"); + next_nbut: + nbut = obt_xml_find_node(nbut->next, "mousebind"); + } } - g_free(contextstr); + g_free(modcxstr); + g_free(cxstr); next_n: - n = obt_parse_find_node(n->next, "context"); + n = obt_xml_find_node(n->next, "context"); } } @@ -524,18 +559,20 @@ static void parse_focus(xmlNodePtr node, gpointer d) node = node->children; - if ((n = obt_parse_find_node(node, "focusNew"))) - config_focus_new = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "followMouse"))) - config_focus_follow = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "focusDelay"))) - config_focus_delay = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "raiseOnFocus"))) - config_focus_raise = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "focusLast"))) - config_focus_last = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "underMouse"))) - config_focus_under_mouse = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(node, "focusNew"))) + config_focus_new = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "followMouse"))) + config_focus_follow = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "focusDelay"))) + config_focus_delay = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "raiseOnFocus"))) + config_focus_raise = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "focusLast"))) + config_focus_last = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "underMouse"))) + config_focus_under_mouse = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "unfocusOnLeave"))) + config_unfocus_leave = obt_xml_node_bool(n); } static void parse_placement(xmlNodePtr node, gpointer d) @@ -544,16 +581,29 @@ static void parse_placement(xmlNodePtr node, gpointer d) node = node->children; - if ((n = obt_parse_find_node(node, "policy"))) - if (obt_parse_node_contains(n, "UnderMouse")) + if ((n = obt_xml_find_node(node, "policy"))) { + if (obt_xml_node_contains(n, "UnderMouse")) config_place_policy = OB_PLACE_POLICY_MOUSE; - if ((n = obt_parse_find_node(node, "center"))) - config_place_center = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "monitor"))) { - if (obt_parse_node_contains(n, "active")) + else if (obt_xml_node_contains(n, "LeastOverlap")) + config_place_policy = OB_PLACE_POLICY_LEASTOVERLAP; + + } + if ((n = obt_xml_find_node(node, "center"))) + config_place_center = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "monitor"))) { + if (obt_xml_node_contains(n, "active")) config_place_monitor = OB_PLACE_MONITOR_ACTIVE; - else if (obt_parse_node_contains(n, "mouse")) + else if (obt_xml_node_contains(n, "mouse")) config_place_monitor = OB_PLACE_MONITOR_MOUSE; + else if (obt_xml_node_contains(n, "any")) + config_place_monitor = OB_PLACE_MONITOR_ANY; + } + if ((n = obt_xml_find_node(node, "primaryMonitor"))) { + config_primary_monitor_index = obt_xml_node_int(n); + if (!config_primary_monitor_index) { + if (obt_xml_node_contains(n, "mouse")) + config_primary_monitor = OB_PLACE_MONITOR_MOUSE; + } } } @@ -563,14 +613,14 @@ static void parse_margins(xmlNodePtr node, gpointer d) node = node->children; - if ((n = obt_parse_find_node(node, "top"))) - config_margins.top = MAX(0, obt_parse_node_int(n)); - if ((n = obt_parse_find_node(node, "left"))) - config_margins.left = MAX(0, obt_parse_node_int(n)); - if ((n = obt_parse_find_node(node, "right"))) - config_margins.right = MAX(0, obt_parse_node_int(n)); - if ((n = obt_parse_find_node(node, "bottom"))) - config_margins.bottom = MAX(0, obt_parse_node_int(n)); + if ((n = obt_xml_find_node(node, "top"))) + config_margins.top = MAX(0, obt_xml_node_int(n)); + if ((n = obt_xml_find_node(node, "left"))) + config_margins.left = MAX(0, obt_xml_node_int(n)); + if ((n = obt_xml_find_node(node, "right"))) + config_margins.right = MAX(0, obt_xml_node_int(n)); + if ((n = obt_xml_find_node(node, "bottom"))) + config_margins.bottom = MAX(0, obt_xml_node_int(n)); } static void parse_theme(xmlNodePtr node, gpointer d) @@ -579,31 +629,38 @@ static void parse_theme(xmlNodePtr node, gpointer d) node = node->children; - if ((n = obt_parse_find_node(node, "name"))) { + if ((n = obt_xml_find_node(node, "name"))) { gchar *c; g_free(config_theme); - c = obt_parse_node_string(n); + c = obt_xml_node_string(n); config_theme = obt_paths_expand_tilde(c); g_free(c); } - if ((n = obt_parse_find_node(node, "titleLayout"))) { + if ((n = obt_xml_find_node(node, "titleLayout"))) { gchar *c, *d; g_free(config_title_layout); - config_title_layout = obt_parse_node_string(n); + config_title_layout = obt_xml_node_string(n); /* replace duplicates with spaces */ for (c = config_title_layout; *c != '\0'; ++c) for (d = c+1; *d != '\0'; ++d) if (*c == *d) *d = ' '; } - if ((n = obt_parse_find_node(node, "keepBorder"))) - config_theme_keepborder = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "animateIconify"))) - config_animate_iconify = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(node, "keepBorder"))) + config_theme_keepborder = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "animateIconify"))) + config_animate_iconify = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "windowListIconSize"))) { + config_theme_window_list_icon_size = obt_xml_node_int(n); + if (config_theme_window_list_icon_size < 16) + config_theme_window_list_icon_size = 16; + else if (config_theme_window_list_icon_size > 96) + config_theme_window_list_icon_size = 96; + } - n = obt_parse_find_node(node, "font"); + n = obt_xml_find_node(node, "font"); while (n) { xmlNodePtr fnode; RrFont **font; @@ -612,35 +669,39 @@ static void parse_theme(xmlNodePtr node, gpointer d) RrFontWeight weight = RrDefaultFontWeight; RrFontSlant slant = RrDefaultFontSlant; - if (obt_parse_attr_contains(n, "place", "ActiveWindow")) + if (obt_xml_attr_contains(n, "place", "ActiveWindow")) font = &config_font_activewindow; - else if (obt_parse_attr_contains(n, "place", "InactiveWindow")) + else if (obt_xml_attr_contains(n, "place", "InactiveWindow")) font = &config_font_inactivewindow; - else if (obt_parse_attr_contains(n, "place", "MenuHeader")) + else if (obt_xml_attr_contains(n, "place", "MenuHeader")) font = &config_font_menutitle; - else if (obt_parse_attr_contains(n, "place", "MenuItem")) + else if (obt_xml_attr_contains(n, "place", "MenuItem")) font = &config_font_menuitem; - else if (obt_parse_attr_contains(n, "place", "OnScreenDisplay")) - font = &config_font_osd; + else if (obt_xml_attr_contains(n, "place", "ActiveOnScreenDisplay")) + font = &config_font_activeosd; + else if (obt_xml_attr_contains(n, "place", "OnScreenDisplay")) + font = &config_font_activeosd; + else if (obt_xml_attr_contains(n, "place","InactiveOnScreenDisplay")) + font = &config_font_inactiveosd; else goto next_font; - if ((fnode = obt_parse_find_node(n->children, "name"))) { + if ((fnode = obt_xml_find_node(n->children, "name"))) { g_free(name); - name = obt_parse_node_string(fnode); + name = obt_xml_node_string(fnode); } - if ((fnode = obt_parse_find_node(n->children, "size"))) { - int s = obt_parse_node_int(fnode); + if ((fnode = obt_xml_find_node(n->children, "size"))) { + int s = obt_xml_node_int(fnode); if (s > 0) size = s; } - if ((fnode = obt_parse_find_node(n->children, "weight"))) { - gchar *w = obt_parse_node_string(fnode); + if ((fnode = obt_xml_find_node(n->children, "weight"))) { + gchar *w = obt_xml_node_string(fnode); if (!g_ascii_strcasecmp(w, "Bold")) weight = RR_FONTWEIGHT_BOLD; g_free(w); } - if ((fnode = obt_parse_find_node(n->children, "slant"))) { - gchar *s = obt_parse_node_string(fnode); + if ((fnode = obt_xml_find_node(n->children, "slant"))) { + gchar *s = obt_xml_node_string(fnode); if (!g_ascii_strcasecmp(s, "Italic")) slant = RR_FONTSLANT_ITALIC; if (!g_ascii_strcasecmp(s, "Oblique")) @@ -651,7 +712,7 @@ static void parse_theme(xmlNodePtr node, gpointer d) *font = RrFontOpen(ob_rr_inst, name, size, weight, slant); g_free(name); next_font: - n = obt_parse_find_node(n->next, "font"); + n = obt_xml_find_node(n->next, "font"); } } @@ -661,17 +722,17 @@ static void parse_desktops(xmlNodePtr node, gpointer d) node = node->children; - if ((n = obt_parse_find_node(node, "number"))) { - gint d = obt_parse_node_int(n); + if ((n = obt_xml_find_node(node, "number"))) { + gint d = obt_xml_node_int(n); if (d > 0) config_desktops_num = (unsigned) d; } - if ((n = obt_parse_find_node(node, "firstdesk"))) { - gint d = obt_parse_node_int(n); + if ((n = obt_xml_find_node(node, "firstdesk"))) { + gint d = obt_xml_node_int(n); if (d > 0) config_screen_firstdesk = (unsigned) d; } - if ((n = obt_parse_find_node(node, "names"))) { + if ((n = obt_xml_find_node(node, "names"))) { GSList *it; xmlNodePtr nname; @@ -680,16 +741,16 @@ static void parse_desktops(xmlNodePtr node, gpointer d) g_slist_free(config_desktops_names); config_desktops_names = NULL; - nname = obt_parse_find_node(n->children, "name"); + nname = obt_xml_find_node(n->children, "name"); while (nname) { config_desktops_names = g_slist_append(config_desktops_names, - obt_parse_node_string(nname)); - nname = obt_parse_find_node(nname->next, "name"); + obt_xml_node_string(nname)); + nname = obt_xml_find_node(nname->next, "name"); } } - if ((n = obt_parse_find_node(node, "popupTime"))) - config_desktop_popup_time = obt_parse_node_int(n); + if ((n = obt_xml_find_node(node, "popupTime"))) + config_desktop_popup_time = obt_xml_node_int(n); } static void parse_resize(xmlNodePtr node, gpointer d) @@ -698,32 +759,32 @@ static void parse_resize(xmlNodePtr node, gpointer d) node = node->children; - if ((n = obt_parse_find_node(node, "drawContents"))) - config_resize_redraw = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "popupShow"))) { - config_resize_popup_show = obt_parse_node_int(n); - if (obt_parse_node_contains(n, "Always")) + if ((n = obt_xml_find_node(node, "drawContents"))) + config_resize_redraw = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "popupShow"))) { + config_resize_popup_show = obt_xml_node_int(n); + if (obt_xml_node_contains(n, "Always")) config_resize_popup_show = 2; - else if (obt_parse_node_contains(n, "Never")) + else if (obt_xml_node_contains(n, "Never")) config_resize_popup_show = 0; - else if (obt_parse_node_contains(n, "Nonpixel")) + else if (obt_xml_node_contains(n, "Nonpixel")) config_resize_popup_show = 1; } - if ((n = obt_parse_find_node(node, "popupPosition"))) { - if (obt_parse_node_contains(n, "Top")) + if ((n = obt_xml_find_node(node, "popupPosition"))) { + if (obt_xml_node_contains(n, "Top")) config_resize_popup_pos = OB_RESIZE_POS_TOP; - else if (obt_parse_node_contains(n, "Center")) + else if (obt_xml_node_contains(n, "Center")) config_resize_popup_pos = OB_RESIZE_POS_CENTER; - else if (obt_parse_node_contains(n, "Fixed")) { + else if (obt_xml_node_contains(n, "Fixed")) { config_resize_popup_pos = OB_RESIZE_POS_FIXED; - if ((n = obt_parse_find_node(node, "popupFixedPosition"))) { + if ((n = obt_xml_find_node(node, "popupFixedPosition"))) { xmlNodePtr n2; - if ((n2 = obt_parse_find_node(n->children, "x"))) + if ((n2 = obt_xml_find_node(n->children, "x"))) config_parse_gravity_coord(n2, &config_resize_popup_fixed.x); - if ((n2 = obt_parse_find_node(n->children, "y"))) + if ((n2 = obt_xml_find_node(n->children, "y"))) config_parse_gravity_coord(n2, &config_resize_popup_fixed.y); @@ -742,65 +803,65 @@ static void parse_dock(xmlNodePtr node, gpointer d) node = node->children; - if ((n = obt_parse_find_node(node, "position"))) { - if (obt_parse_node_contains(n, "TopLeft")) + if ((n = obt_xml_find_node(node, "position"))) { + if (obt_xml_node_contains(n, "TopLeft")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_NORTHWEST; - else if (obt_parse_node_contains(n, "Top")) + else if (obt_xml_node_contains(n, "Top")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_NORTH; - else if (obt_parse_node_contains(n, "TopRight")) + else if (obt_xml_node_contains(n, "TopRight")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_NORTHEAST; - else if (obt_parse_node_contains(n, "Right")) + else if (obt_xml_node_contains(n, "Right")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_EAST; - else if (obt_parse_node_contains(n, "BottomRight")) + else if (obt_xml_node_contains(n, "BottomRight")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_SOUTHEAST; - else if (obt_parse_node_contains(n, "Bottom")) + else if (obt_xml_node_contains(n, "Bottom")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_SOUTH; - else if (obt_parse_node_contains(n, "BottomLeft")) + else if (obt_xml_node_contains(n, "BottomLeft")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_SOUTHWEST; - else if (obt_parse_node_contains(n, "Left")) + else if (obt_xml_node_contains(n, "Left")) config_dock_floating = FALSE, config_dock_pos = OB_DIRECTION_WEST; - else if (obt_parse_node_contains(n, "Floating")) + else if (obt_xml_node_contains(n, "Floating")) config_dock_floating = TRUE; } if (config_dock_floating) { - if ((n = obt_parse_find_node(node, "floatingX"))) - config_dock_x = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "floatingY"))) - config_dock_y = obt_parse_node_int(n); + if ((n = obt_xml_find_node(node, "floatingX"))) + config_dock_x = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "floatingY"))) + config_dock_y = obt_xml_node_int(n); } else { - if ((n = obt_parse_find_node(node, "noStrut"))) - config_dock_nostrut = obt_parse_node_bool(n); + if ((n = obt_xml_find_node(node, "noStrut"))) + config_dock_nostrut = obt_xml_node_bool(n); } - if ((n = obt_parse_find_node(node, "stacking"))) { - if (obt_parse_node_contains(n, "normal")) + if ((n = obt_xml_find_node(node, "stacking"))) { + if (obt_xml_node_contains(n, "normal")) config_dock_layer = OB_STACKING_LAYER_NORMAL; - else if (obt_parse_node_contains(n, "below")) + else if (obt_xml_node_contains(n, "below")) config_dock_layer = OB_STACKING_LAYER_BELOW; - else if (obt_parse_node_contains(n, "above")) + else if (obt_xml_node_contains(n, "above")) config_dock_layer = OB_STACKING_LAYER_ABOVE; } - if ((n = obt_parse_find_node(node, "direction"))) { - if (obt_parse_node_contains(n, "horizontal")) + if ((n = obt_xml_find_node(node, "direction"))) { + if (obt_xml_node_contains(n, "horizontal")) config_dock_orient = OB_ORIENTATION_HORZ; - else if (obt_parse_node_contains(n, "vertical")) + else if (obt_xml_node_contains(n, "vertical")) config_dock_orient = OB_ORIENTATION_VERT; } - if ((n = obt_parse_find_node(node, "autoHide"))) - config_dock_hide = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "hideDelay"))) - config_dock_hide_delay = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "showDelay"))) - config_dock_show_delay = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "moveButton"))) { - gchar *str = obt_parse_node_string(n); + if ((n = obt_xml_find_node(node, "autoHide"))) + config_dock_hide = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "hideDelay"))) + config_dock_hide_delay = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "showDelay"))) + config_dock_show_delay = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "moveButton"))) { + gchar *str = obt_xml_node_string(n); guint b, s; if (translate_button(str, &s, &b)) { config_dock_app_move_button = b; @@ -815,25 +876,32 @@ static void parse_dock(xmlNodePtr node, gpointer d) static void parse_menu(xmlNodePtr node, gpointer d) { xmlNodePtr n; - for (node = node->children; node; node = node->next) { - if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) { - gchar *c; + node = node->children; + + if ((n = obt_xml_find_node(node, "hideDelay"))) + config_menu_hide_delay = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "middle"))) + config_menu_middle = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "submenuShowDelay"))) + config_submenu_show_delay = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "submenuHideDelay"))) + config_submenu_hide_delay = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "manageDesktops"))) + config_menu_manage_desktops = obt_xml_node_bool(n); + if ((n = obt_xml_find_node(node, "showIcons"))) { + config_menu_show_icons = obt_xml_node_bool(n); +#ifndef USE_IMLIB2 + if (config_menu_show_icons) + g_message(_("Openbox was compiled without Imlib2 image loading support. Icons in menus will not be loaded.")); +#endif + } - c = obt_parse_node_string(node); + while ((node = obt_xml_find_node(node, "file"))) { + gchar *c = obt_xml_node_string(node); config_menu_files = g_slist_append(config_menu_files, obt_paths_expand_tilde(c)); g_free(c); - } - if ((n = obt_parse_find_node(node, "hideDelay"))) - config_menu_hide_delay = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "middle"))) - config_menu_middle = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "submenuShowDelay"))) - config_submenu_show_delay = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "applicationIcons"))) - config_menu_client_list_icons = obt_parse_node_bool(n); - if ((n = obt_parse_find_node(node, "manageDesktops"))) - config_menu_manage_desktops = obt_parse_node_bool(n); + node = node->next; } } @@ -842,10 +910,10 @@ static void parse_resistance(xmlNodePtr node, gpointer d) xmlNodePtr n; node = node->children; - if ((n = obt_parse_find_node(node, "strength"))) - config_resist_win = obt_parse_node_int(n); - if ((n = obt_parse_find_node(node, "screen_edge_strength"))) - config_resist_edge = obt_parse_node_int(n); + if ((n = obt_xml_find_node(node, "strength"))) + config_resist_win = obt_xml_node_int(n); + if ((n = obt_xml_find_node(node, "screen_edge_strength"))) + config_resist_edge = obt_xml_node_int(n); } typedef struct @@ -932,11 +1000,11 @@ static void bind_default_mouse(void) }; for (it = binds; it->button; ++it) - mouse_bind(it->button, it->context, it->mact, - actions_parse_string(it->actname)); + mouse_bind(it->button, frame_context_from_string(it->context), + it->mact, actions_parse_string(it->actname)); } -void config_startup(ObtParseInst *i) +void config_startup(ObtXmlInst *i) { config_focus_new = TRUE; config_focus_follow = FALSE; @@ -944,38 +1012,45 @@ void config_startup(ObtParseInst *i) config_focus_raise = FALSE; config_focus_last = TRUE; config_focus_under_mouse = FALSE; + config_unfocus_leave = FALSE; - obt_parse_register(i, "focus", parse_focus, NULL); + obt_xml_register(i, "focus", parse_focus, NULL); config_place_policy = OB_PLACE_POLICY_SMART; config_place_center = TRUE; - config_place_monitor = OB_PLACE_MONITOR_ANY; + config_place_monitor = OB_PLACE_MONITOR_PRIMARY; + + config_primary_monitor_index = 1; + config_primary_monitor = OB_PLACE_MONITOR_ACTIVE; - obt_parse_register(i, "placement", parse_placement, NULL); + obt_xml_register(i, "placement", parse_placement, NULL); STRUT_PARTIAL_SET(config_margins, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - obt_parse_register(i, "margins", parse_margins, NULL); + obt_xml_register(i, "margins", parse_margins, NULL); config_theme = NULL; config_animate_iconify = TRUE; config_title_layout = g_strdup("NLIMC"); config_theme_keepborder = TRUE; + config_theme_window_list_icon_size = 36; config_font_activewindow = NULL; config_font_inactivewindow = NULL; config_font_menuitem = NULL; config_font_menutitle = NULL; + config_font_activeosd = NULL; + config_font_inactiveosd = NULL; - obt_parse_register(i, "theme", parse_theme, NULL); + obt_xml_register(i, "theme", parse_theme, NULL); config_desktops_num = 4; config_screen_firstdesk = 1; config_desktops_names = NULL; config_desktop_popup_time = 875; - obt_parse_register(i, "desktops", parse_desktops, NULL); + obt_xml_register(i, "desktops", parse_desktops, NULL); config_resize_redraw = TRUE; config_resize_popup_show = 1; /* nonpixel increments */ @@ -983,7 +1058,7 @@ void config_startup(ObtParseInst *i) GRAVITY_COORD_SET(config_resize_popup_fixed.x, 0, FALSE, FALSE); GRAVITY_COORD_SET(config_resize_popup_fixed.y, 0, FALSE, FALSE); - obt_parse_register(i, "resize", parse_resize, NULL); + obt_xml_register(i, "resize", parse_resize, NULL); config_dock_layer = OB_STACKING_LAYER_ABOVE; config_dock_pos = OB_DIRECTION_NORTHEAST; @@ -998,42 +1073,42 @@ void config_startup(ObtParseInst *i) config_dock_app_move_button = 2; /* middle */ config_dock_app_move_modifiers = 0; - obt_parse_register(i, "dock", parse_dock, NULL); + obt_xml_register(i, "dock", parse_dock, NULL); translate_key("C-g", &config_keyboard_reset_state, &config_keyboard_reset_keycode); bind_default_keyboard(); - obt_parse_register(i, "keyboard", parse_keyboard, NULL); + obt_xml_register(i, "keyboard", parse_keyboard, NULL); config_mouse_threshold = 8; - config_mouse_dclicktime = 200; + config_mouse_dclicktime = 500; config_mouse_screenedgetime = 400; + config_mouse_screenedgewarp = FALSE; bind_default_mouse(); - obt_parse_register(i, "mouse", parse_mouse, NULL); + obt_xml_register(i, "mouse", parse_mouse, NULL); config_resist_win = 10; config_resist_edge = 20; - obt_parse_register(i, "resistance", parse_resistance, NULL); + obt_xml_register(i, "resistance", parse_resistance, NULL); config_menu_hide_delay = 250; config_menu_middle = FALSE; - config_submenu_show_delay = 0; - config_menu_client_list_icons = TRUE; + config_submenu_show_delay = 100; + config_submenu_hide_delay = 400; config_menu_manage_desktops = TRUE; config_menu_files = NULL; + config_menu_show_icons = TRUE; - obt_parse_register(i, "menu", parse_menu, NULL); - - obt_parse_register(i, "hooks", parse_hooks, NULL); + obt_xml_register(i, "menu", parse_menu, NULL); config_per_app_settings = NULL; - obt_parse_register(i, "applications", parse_per_app_settings, NULL); + obt_xml_register(i, "applications", parse_per_app_settings, NULL); } void config_shutdown(void) @@ -1048,7 +1123,8 @@ void config_shutdown(void) RrFontClose(config_font_inactivewindow); RrFontClose(config_font_menuitem); RrFontClose(config_font_menutitle); - RrFontClose(config_font_osd); + RrFontClose(config_font_activeosd); + RrFontClose(config_font_inactiveosd); for (it = config_desktops_names; it; it = g_slist_next(it)) g_free(it->data); @@ -1062,8 +1138,9 @@ void config_shutdown(void) ObAppSettings *itd = (ObAppSettings *)it->data; if (itd->name) g_pattern_spec_free(itd->name); if (itd->role) g_pattern_spec_free(itd->role); + if (itd->title) g_pattern_spec_free(itd->title); if (itd->class) g_pattern_spec_free(itd->class); - g_free(it->data); + g_slice_free(ObAppSettings, it->data); } g_slist_free(config_per_app_settings); }