]> Dogcows Code - chaz/openbox/blobdiff - openbox/config.c
projects / chaz / openbox / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'backport' into work
[chaz/openbox] / openbox / config.c
diff --git a/openbox/config.c b/openbox/config.c
index e0cb1819d7f6068788611ca596bc97dd2e5071e8..a268eb5b82e003144764f51c070fe389f363efd5 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,8 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    config.c for the Openbox window manager
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    config.c for the Openbox window manager
-   Copyright (c) 2004        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,36 +20,49 @@
 #include "config.h"
 #include "keyboard.h"
 #include "mouse.h"
 #include "config.h"
 #include "keyboard.h"
 #include "mouse.h"
-#include "prop.h"
+#include "actions.h"
 #include "translate.h"
 #include "client.h"
 #include "screen.h"
 #include "translate.h"
 #include "client.h"
 #include "screen.h"
-#include "parser/parse.h"
 #include "openbox.h"
 #include "openbox.h"
+#include "gettext.h"
+#include "obt/paths.h"
 
 gboolean config_focus_new;
 gboolean config_focus_follow;
 guint    config_focus_delay;
 gboolean config_focus_raise;
 gboolean config_focus_last;
 
 gboolean config_focus_new;
 gboolean config_focus_follow;
 guint    config_focus_delay;
 gboolean config_focus_raise;
 gboolean config_focus_last;
+gboolean config_focus_under_mouse;
 
 
-ObPlacePolicy config_place_policy;
+ObPlacePolicy  config_place_policy;
+gboolean       config_place_center;
+ObPlaceMonitor config_place_monitor;
+
+StrutPartial config_margins;
 
 gchar   *config_theme;
 gboolean config_theme_keepborder;
 
 gchar   *config_theme;
 gboolean config_theme_keepborder;
-gboolean config_theme_hidedisabled;
 
 gchar   *config_title_layout;
 
 gchar   *config_title_layout;
-gboolean config_title_number;
 
 
-gint    config_desktops_num;
+gboolean config_animate_iconify;
+
+RrFont *config_font_activewindow;
+RrFont *config_font_inactivewindow;
+RrFont *config_font_menuitem;
+RrFont *config_font_menutitle;
+RrFont *config_font_osd;
+
+guint   config_desktops_num;
 GSList *config_desktops_names;
 GSList *config_desktops_names;
-gint    config_screen_firstdesk;
+guint   config_screen_firstdesk;
+guint   config_desktop_popup_time;
 
 
-gboolean config_resize_redraw;
-gboolean config_resize_four_corners;
-gint     config_resize_popup_show;
-gint     config_resize_popup_pos;
+gboolean         config_resize_redraw;
+gint             config_resize_popup_show;
+ObResizePopupPos config_resize_popup_pos;
+GravityPoint     config_resize_popup_fixed;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
@@ -69,22 +82,83 @@ guint config_keyboard_reset_state;
 
 gint config_mouse_threshold;
 gint config_mouse_dclicktime;
 
 gint config_mouse_threshold;
 gint config_mouse_dclicktime;
+gint config_mouse_screenedgetime;
 
 
-gboolean config_menu_warppointer;
-gboolean config_menu_xorstyle;
 guint    config_menu_hide_delay;
 gboolean config_menu_middle;
 guint    config_submenu_show_delay;
 gboolean config_menu_client_list_icons;
 guint    config_menu_hide_delay;
 gboolean config_menu_middle;
 guint    config_submenu_show_delay;
 gboolean config_menu_client_list_icons;
+gboolean config_menu_manage_desktops;
 
 GSList *config_menu_files;
 
 gint     config_resist_win;
 gint     config_resist_edge;
 
 GSList *config_menu_files;
 
 gint     config_resist_win;
 gint     config_resist_edge;
-gboolean config_resist_layers_below;
 
 GSList *config_per_app_settings;
 
 
 GSList *config_per_app_settings;
 
+ObAppSettings* config_create_app_settings(void)
+{
+    ObAppSettings *settings = g_new0(ObAppSettings, 1);
+    settings->decor = -1;
+    settings->shade = -1;
+    settings->monitor = -1;
+    settings->focus = -1;
+    settings->desktop = 0;
+    settings->layer = -2;
+    settings->iconic = -1;
+    settings->skip_pager = -1;
+    settings->skip_taskbar = -1;
+    settings->fullscreen = -1;
+    settings->max_horz = -1;
+    settings->max_vert = -1;
+    return settings;
+}
+
+#define copy_if(setting, default) \
+  if (src->setting != default) dst->setting = src->setting
+void config_app_settings_copy_non_defaults(const ObAppSettings *src,
+                                           ObAppSettings *dst)
+{
+    g_assert(src != NULL);
+    g_assert(dst != NULL);
+
+    copy_if(decor, -1);
+    copy_if(shade, -1);
+    copy_if(focus, -1);
+    copy_if(desktop, 0);
+    copy_if(layer, -2);
+    copy_if(iconic, -1);
+    copy_if(skip_pager, -1);
+    copy_if(skip_taskbar, -1);
+    copy_if(fullscreen, -1);
+    copy_if(max_horz, -1);
+    copy_if(max_vert, -1);
+
+    if (src->pos_given) {
+        dst->pos_given = TRUE;
+        dst->pos_force = src->pos_force;
+        dst->position = src->position;
+        dst->monitor = src->monitor;
+    }
+}
+
+static void config_parse_gravity_coord(xmlNodePtr node, GravityCoord *c)
+{
+    gchar *s = obt_parse_node_string(node);
+    if (!g_ascii_strcasecmp(s, "center"))
+        c->center = TRUE;
+    else {
+        if (s[0] == '-')
+            c->opposite = TRUE;
+        if (s[0] == '-' || s[0] == '+')
+            c->pos = atoi(s+1);
+        else
+            c->pos = atoi(s);
+    }
+    g_free(s);
+}
+
 /*
   <applications>
     <application name="aterm">
 /*
   <applications>
     <application name="aterm">
@@ -95,163 +169,154 @@ GSList *config_per_app_settings;
       <position>
         <x>700</x>
         <y>0</y>
       <position>
         <x>700</x>
         <y>0</y>
+        <monitor>1</monitor>
       </position>
       </position>
-      <head>1</head>
+      .. there is a lot more settings available
     </application>
   </applications>
 */
 
 /* Manages settings for individual applications.
     </application>
   </applications>
 */
 
 /* Manages settings for individual applications.
-   Some notes: head is the screen number in a multi monitor
+   Some notes: monitor is the screen number in a multi monitor
    (Xinerama) setup (starting from 0) or mouse, meaning the
    (Xinerama) setup (starting from 0) or mouse, meaning the
-   head the pointer is on. Default: mouse.
+   monitor the pointer is on. Default: mouse.
    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
    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
-   center the window in the specified axis. Position is relative
-   from head, so <position><x>center</x></position><head>1</head>
-   will center the window on the second head.
+   center the window in the specified axis. Position is within
+   the monitor, so <position><x>center</x></position><monitor>2</monitor>
+   will center the window on the second monitor.
 */
 */
-static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
-                                   xmlNodePtr node, gpointer d)
+static void parse_per_app_settings(xmlNodePtr node, gpointer d)
 {
 {
-    xmlNodePtr app = parse_find_node("application", node->children);
-    gchar *name, *class;
+    xmlNodePtr app = obt_parse_find_node(node->children, "application");
+    gchar *name = NULL, *class = NULL, *role = NULL;
     gboolean name_set, class_set;
     gboolean x_pos_given;
 
     while (app) {
         name_set = class_set = x_pos_given = FALSE;
 
     gboolean name_set, class_set;
     gboolean x_pos_given;
 
     while (app) {
         name_set = class_set = x_pos_given = FALSE;
 
-        class_set = parse_attr_string("class", app, &class);
-        name_set = parse_attr_string("name", app, &name);
+        class_set = obt_parse_attr_string(app, "class", &class);
+        name_set = obt_parse_attr_string(app, "name", &name);
         if (class_set || name_set) {
             xmlNodePtr n, c;
         if (class_set || name_set) {
             xmlNodePtr n, c;
-            ObAppSettings *settings = g_new0(ObAppSettings, 1);
-            
+            ObAppSettings *settings = config_create_app_settings();;
+
             if (name_set)
             if (name_set)
-                settings->name = name;
-            else
-                settings->name = NULL;
+                settings->name = g_pattern_spec_new(name);
 
             if (class_set)
 
             if (class_set)
-                settings->class = class;
-            else
-                settings->class = NULL;
-
-            if (!parse_attr_string("role", app, &settings->role))
-                settings->role = NULL;
-
-            settings->decor = -1;
-            if ((n = parse_find_node("decor", app->children)))
-                settings->decor = parse_bool(doc, n);
-
-            settings->shade = -1;
-            if ((n = parse_find_node("shade", app->children)))
-                settings->shade = parse_bool(doc, n);
-
-            settings->position.x = settings->position.y = 0;
-            settings->pos_given = FALSE;
-            if ((n = parse_find_node("position", app->children))) {
-                if ((c = parse_find_node("x", n->children))) {
-                    gchar *s = parse_string(doc, c);
-                    if (!strcmp(s, "center")) {
-                        settings->center_x = TRUE;
-                        x_pos_given = TRUE;
-                    } else {
-                        settings->position.x = parse_int(doc, c);
+                settings->class = g_pattern_spec_new(class);
+
+            if (obt_parse_attr_string(app, "role", &role))
+                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 ((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_parse_find_node(app->children, "position"))) {
+                if ((c = obt_parse_find_node(n->children, "x")))
+                    if (!obt_parse_node_contains(c, "default")) {
+                        config_parse_gravity_coord(c, &settings->position.x);
                         x_pos_given = TRUE;
                     }
                         x_pos_given = TRUE;
                     }
-                    g_free(s);
-                }
 
 
-                if (x_pos_given && (c = parse_find_node("y", n->children))) {
-                    gchar *s = parse_string(doc, c);
-                    if (!strcmp(s, "center")) {
-                        settings->center_y = TRUE;
-                        settings->pos_given = TRUE;
-                    } else {
-                        settings->position.y = parse_int(doc, c);
+                if (x_pos_given && (c = obt_parse_find_node(n->children, "y")))
+                    if (!obt_parse_node_contains(c, "default")) {
+                        config_parse_gravity_coord(c, &settings->position.y);
                         settings->pos_given = TRUE;
                     }
                         settings->pos_given = TRUE;
                     }
-                    g_free(s);
-                }
-            }
 
 
-            settings->focus = -1;
-            if ((n = parse_find_node("focus", app->children)))
-                settings->focus = parse_bool(doc, n);
-
-            if ((n = parse_find_node("desktop", app->children))) {
-                gchar *s = parse_string(doc, n);
-                if (!strcmp(s, "all"))
-                    settings->desktop = DESKTOP_ALL;
-                else
-                    settings->desktop = parse_int(doc, n);
-                g_free(s);
-            } else
-                settings->desktop = DESKTOP_ALL - 1; /* lets hope the user
-                                                      * doesn't have 2^32
-                                                      * desktops */
-
-            if ((n = parse_find_node("head", app->children))) {
-                gchar *s = parse_string(doc, n);
-                if (!strcmp(s, "mouse"))
-                    settings->head = -1;
-                else
-                    settings->head = parse_int(doc, n);
-                g_free(s);
-            }
+                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);
+                        if (!g_ascii_strcasecmp(s, "mouse"))
+                            settings->monitor = 0;
+                        else
+                            settings->monitor = obt_parse_node_int(c) + 1;
+                        g_free(s);
+                    }
 
 
-            settings->layer = -2;
-            if ((n = parse_find_node("layer", app->children))) {
-                gchar *s = parse_string(doc, n);
-                if (!strcmp(s, "above"))
-                    settings->layer = 1;
-                else if (!strcmp(s, "below"))
-                    settings->layer = -1;
-                else
-                    settings->layer = 0;
-                g_free(s);
+                obt_parse_attr_bool(n, "force", &settings->pos_force);
             }
 
             }
 
-            settings->iconic = -1;
-            if ((n = parse_find_node("iconic", app->children)))
-                settings->iconic = parse_bool(doc, n);
-
-            settings->skip_pager = -1;
-            if ((n = parse_find_node("skip_pager", app->children)))
-                settings->skip_pager = parse_bool(doc, n);
-
-            settings->skip_taskbar = -1;
-            if ((n = parse_find_node("skip_taskbar", app->children)))
-                settings->skip_taskbar = parse_bool(doc, n);
-
-            settings->fullscreen = -1;
-            if ((n = parse_find_node("fullscreen", app->children)))
-                settings->fullscreen = parse_bool(doc, n);
-
-            settings->max_horz = -1;
-            settings->max_vert = -1;
-            if ((n = parse_find_node("maximized", app->children))) {
-                gchar *s = parse_string(doc, n);
-                if (!strcmp(s, "horizontal")) {
-                    settings->max_horz = TRUE;
-                    settings->max_vert = FALSE;
-                } else if (!strcmp(s, "vertical")) {
-                    settings->max_horz = FALSE;
-                    settings->max_vert = TRUE;
-                } else
-                    settings->max_horz = settings->max_vert =
-                        parse_bool(doc, n);
-                g_free(s);
+            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_parse_find_node(app->children, "desktop"))) {
+                if (!obt_parse_node_contains(n, "default")) {
+                    gchar *s = obt_parse_node_string(n);
+                    if (!g_ascii_strcasecmp(s, "all"))
+                        settings->desktop = DESKTOP_ALL;
+                    else {
+                        gint i = obt_parse_node_int(n);
+                        if (i > 0)
+                            settings->desktop = i;
+                    }
+                    g_free(s);
+                }
             }
 
             }
 
+            if ((n = obt_parse_find_node(app->children, "layer")))
+                if (!obt_parse_node_contains(n, "default")) {
+                    gchar *s = obt_parse_node_string(n);
+                    if (!g_ascii_strcasecmp(s, "above"))
+                        settings->layer = 1;
+                    else if (!g_ascii_strcasecmp(s, "below"))
+                        settings->layer = -1;
+                    else
+                        settings->layer = 0;
+                    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_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_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_parse_find_node(app->children, "fullscreen")))
+                if (!obt_parse_node_contains(n, "default"))
+                    settings->fullscreen = obt_parse_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 (!g_ascii_strcasecmp(s, "horizontal")) {
+                        settings->max_horz = TRUE;
+                        settings->max_vert = FALSE;
+                    } else if (!g_ascii_strcasecmp(s, "vertical")) {
+                        settings->max_horz = FALSE;
+                        settings->max_vert = TRUE;
+                    } else
+                        settings->max_horz = settings->max_vert =
+                            obt_parse_node_bool(n);
+                    g_free(s);
+                }
+
             config_per_app_settings = g_slist_append(config_per_app_settings,
                                               (gpointer) settings);
             config_per_app_settings = g_slist_append(config_per_app_settings,
                                               (gpointer) settings);
+            g_free(name);
+            g_free(class);
+            g_free(role);
+            name = class = role = NULL;
         }
         }
-        
-        app = parse_find_node("application", app->next);
+
+        app = obt_parse_find_node(app->next, "application");
     }
 }
 
     }
 }
 
@@ -265,56 +330,67 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
 
 */
 
 
 */
 
-static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                      GList *keylist)
+static void parse_key(xmlNodePtr node, GList *keylist)
 {
     gchar *key;
 {
     gchar *key;
-    ObAction *action;
-    xmlNodePtr n, nact;
-    GList *it;
+    xmlNodePtr n;
+    gboolean is_chroot = FALSE;
 
 
-    if ((n = parse_find_node("chainQuitKey", node))) {
-        key = parse_string(doc, n);
-        translate_key(key, &config_keyboard_reset_state,
-                      &config_keyboard_reset_keycode);
-        g_free(key);
-    }
+    if (!obt_parse_attr_string(node, "key", &key))
+        return;
 
 
-    n = parse_find_node("keybind", node);
-    while (n) {
-        if (parse_attr_string("key", n, &key)) {
-            keylist = g_list_append(keylist, key);
+    obt_parse_attr_bool(node, "chroot", &is_chroot);
 
 
-            parse_key(i, doc, n->children, keylist);
+    keylist = g_list_append(keylist, key);
 
 
-            it = g_list_last(keylist);
-            g_free(it->data);
-            keylist = g_list_delete_link(keylist, it);
+    if ((n = obt_parse_find_node(node->children, "keybind"))) {
+        while (n) {
+            parse_key(n, keylist);
+            n = obt_parse_find_node(n->next, "keybind");
         }
         }
-        n = parse_find_node("keybind", n->next);
     }
     }
-    if (keylist) {
-        nact = parse_find_node("action", node);
-        while (nact) {
-            if ((action = action_parse(i, doc, nact,
-                                       OB_USER_ACTION_KEYBOARD_KEY)))
+    else if ((n = obt_parse_find_node(node->children, "action"))) {
+        while (n) {
+            ObActionsAct *action;
+
+            action = actions_parse(n);
+            if (action)
                 keyboard_bind(keylist, action);
                 keyboard_bind(keylist, action);
-            nact = parse_find_node("action", nact->next);
+            n = obt_parse_find_node(n->next, "action");
         }
     }
         }
     }
+
+    if (is_chroot)
+        keyboard_chroot(keylist);
+
+    g_free(key);
+    keylist = g_list_delete_link(keylist, g_list_last(keylist));
 }
 
 }
 
-static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                           gpointer d)
+static void parse_keyboard(xmlNodePtr node, gpointer d)
 {
 {
+    xmlNodePtr n;
+    gchar *key;
+
     keyboard_unbind_all();
 
     keyboard_unbind_all();
 
-    parse_key(i, doc, node->children, NULL);
+    if ((n = obt_parse_find_node(node->children, "chainQuitKey"))) {
+        key = obt_parse_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")))
+        while (n) {
+            parse_key(n, NULL);
+            n = obt_parse_find_node(n->next, "keybind");
+        }
 }
 
 /*
 
 }
 
 /*
 
-<context name="Titlebar"> 
+<context name="Titlebar">
   <mousebind button="Left" action="Press">
     <action name="Raise"></action>
   </mousebind>
   <mousebind button="Left" action="Press">
     <action name="Raise"></action>
   </mousebind>
@@ -322,142 +398,216 @@ static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
 */
 
 
 */
 
-static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                        gpointer d)
+static void parse_mouse(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n, nbut, nact;
     gchar *buttonstr;
     gchar *contextstr;
 {
     xmlNodePtr n, nbut, nact;
     gchar *buttonstr;
     gchar *contextstr;
-    ObUserAction uact;
     ObMouseAction mact;
     ObMouseAction mact;
-    ObAction *action;
 
     mouse_unbind_all();
 
     node = node->children;
 
     mouse_unbind_all();
 
     node = node->children;
-    
-    if ((n = parse_find_node("dragThreshold", node)))
-        config_mouse_threshold = parse_int(doc, n);
-    if ((n = parse_find_node("doubleClickTime", node)))
-        config_mouse_dclicktime = parse_int(doc, n);
 
 
-    n = parse_find_node("context", node);
+    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);
+
+    n = obt_parse_find_node(node, "context");
     while (n) {
     while (n) {
-        if (!parse_attr_string("name", n, &contextstr))
+        if (!obt_parse_attr_string(n, "name", &contextstr))
             goto next_n;
             goto next_n;
-        nbut = parse_find_node("mousebind", n->children);
+        nbut = obt_parse_find_node(n->children, "mousebind");
         while (nbut) {
         while (nbut) {
-            if (!parse_attr_string("button", nbut, &buttonstr))
+            if (!obt_parse_attr_string(nbut, "button", &buttonstr))
                 goto next_nbut;
                 goto next_nbut;
-            if (parse_attr_contains("press", nbut, "action")) {
-                uact = OB_USER_ACTION_MOUSE_PRESS;
+            if (obt_parse_attr_contains(nbut, "action", "press")) {
                 mact = OB_MOUSE_ACTION_PRESS;
                 mact = OB_MOUSE_ACTION_PRESS;
-            } else if (parse_attr_contains("release", nbut, "action")) {
-                uact = OB_USER_ACTION_MOUSE_RELEASE;
+            } else if (obt_parse_attr_contains(nbut, "action", "release")) {
                 mact = OB_MOUSE_ACTION_RELEASE;
                 mact = OB_MOUSE_ACTION_RELEASE;
-            } else if (parse_attr_contains("click", nbut, "action")) {
-                uact = OB_USER_ACTION_MOUSE_CLICK;
+            } else if (obt_parse_attr_contains(nbut, "action", "click")) {
                 mact = OB_MOUSE_ACTION_CLICK;
                 mact = OB_MOUSE_ACTION_CLICK;
-            } else if (parse_attr_contains("doubleclick", nbut,"action")) {
-                uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK;
+            } else if (obt_parse_attr_contains(nbut, "action","doubleclick")) {
                 mact = OB_MOUSE_ACTION_DOUBLE_CLICK;
                 mact = OB_MOUSE_ACTION_DOUBLE_CLICK;
-            } else if (parse_attr_contains("drag", nbut, "action")) {
-                uact = OB_USER_ACTION_MOUSE_MOTION;
+            } else if (obt_parse_attr_contains(nbut, "action", "drag")) {
                 mact = OB_MOUSE_ACTION_MOTION;
             } else
                 goto next_nbut;
                 mact = OB_MOUSE_ACTION_MOTION;
             } else
                 goto next_nbut;
-            nact = parse_find_node("action", nbut->children);
+            nact = obt_parse_find_node(nbut->children, "action");
             while (nact) {
             while (nact) {
-                if ((action = action_parse(i, doc, nact, uact)))
+                ObActionsAct *action;
+
+                if ((action = actions_parse(nact)))
                     mouse_bind(buttonstr, contextstr, mact, action);
                     mouse_bind(buttonstr, contextstr, mact, action);
-                nact = parse_find_node("action", nact->next);
+                nact = obt_parse_find_node(nact->next, "action");
             }
             g_free(buttonstr);
         next_nbut:
             }
             g_free(buttonstr);
         next_nbut:
-            nbut = parse_find_node("mousebind", nbut->next);
+            nbut = obt_parse_find_node(nbut->next, "mousebind");
         }
         g_free(contextstr);
     next_n:
         }
         g_free(contextstr);
     next_n:
-        n = parse_find_node("context", n->next);
+        n = obt_parse_find_node(n->next, "context");
     }
 }
 
     }
 }
 
-static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                        gpointer d)
+static void parse_focus(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
 {
     xmlNodePtr n;
 
     node = node->children;
-    
-    if ((n = parse_find_node("focusNew", node)))
-        config_focus_new = parse_bool(doc, n);
-    if ((n = parse_find_node("followMouse", node)))
-        config_focus_follow = parse_bool(doc, n);
-    if ((n = parse_find_node("focusDelay", node)))
-        config_focus_delay = parse_int(doc, n) * 1000;
-    if ((n = parse_find_node("raiseOnFocus", node)))
-        config_focus_raise = parse_bool(doc, n);
-    if ((n = parse_find_node("focusLast", node)))
-        config_focus_last = parse_bool(doc, n);
+
+    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);
 }
 
 }
 
-static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                            gpointer d)
+static void parse_placement(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
 {
     xmlNodePtr n;
 
     node = node->children;
-    
-    if ((n = parse_find_node("policy", node)))
-        if (parse_contains("UnderMouse", doc, n))
+
+    if ((n = obt_parse_find_node(node, "policy")))
+        if (obt_parse_node_contains(n, "UnderMouse"))
             config_place_policy = OB_PLACE_POLICY_MOUSE;
             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"))
+            config_place_monitor = OB_PLACE_MONITOR_ACTIVE;
+        else if (obt_parse_node_contains(n, "mouse"))
+            config_place_monitor = OB_PLACE_MONITOR_MOUSE;
+    }
+}
+
+static void parse_margins(xmlNodePtr node, gpointer d)
+{
+    xmlNodePtr n;
+
+    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));
 }
 
 }
 
-static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                        gpointer d)
+static void parse_theme(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
 
 {
     xmlNodePtr n;
 
     node = node->children;
 
-    if ((n = parse_find_node("name", node))) {
+    if ((n = obt_parse_find_node(node, "name"))) {
         gchar *c;
 
         g_free(config_theme);
         gchar *c;
 
         g_free(config_theme);
-        c = parse_string(doc, n);
-        config_theme = parse_expand_tilde(c);
+        c = obt_parse_node_string(n);
+        config_theme = obt_paths_expand_tilde(c);
         g_free(c);
     }
         g_free(c);
     }
-    if ((n = parse_find_node("titleLayout", node))) {
+    if ((n = obt_parse_find_node(node, "titleLayout"))) {
+        gchar *c, *d;
+
         g_free(config_title_layout);
         g_free(config_title_layout);
-        config_title_layout = parse_string(doc, n);
+        config_title_layout = obt_parse_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);
+
+    n = obt_parse_find_node(node, "font");
+    while (n) {
+        xmlNodePtr   fnode;
+        RrFont     **font;
+        gchar       *name = g_strdup(RrDefaultFontFamily);
+        gint         size = RrDefaultFontSize;
+        RrFontWeight weight = RrDefaultFontWeight;
+        RrFontSlant  slant = RrDefaultFontSlant;
+
+        if (obt_parse_attr_contains(n, "place", "ActiveWindow"))
+            font = &config_font_activewindow;
+        else if (obt_parse_attr_contains(n, "place", "InactiveWindow"))
+            font = &config_font_inactivewindow;
+        else if (obt_parse_attr_contains(n, "place", "MenuHeader"))
+            font = &config_font_menutitle;
+        else if (obt_parse_attr_contains(n, "place", "MenuItem"))
+            font = &config_font_menuitem;
+        else if (obt_parse_attr_contains(n, "place", "OnScreenDisplay"))
+            font = &config_font_osd;
+        else
+            goto next_font;
+
+        if ((fnode = obt_parse_find_node(n->children, "name"))) {
+            g_free(name);
+            name = obt_parse_node_string(fnode);
+        }
+        if ((fnode = obt_parse_find_node(n->children, "size"))) {
+            int s = obt_parse_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 (!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 (!g_ascii_strcasecmp(s, "Italic"))
+                slant = RR_FONTSLANT_ITALIC;
+            if (!g_ascii_strcasecmp(s, "Oblique"))
+                slant = RR_FONTSLANT_OBLIQUE;
+            g_free(s);
+        }
+
+        *font = RrFontOpen(ob_rr_inst, name, size, weight, slant);
+        g_free(name);
+    next_font:
+        n = obt_parse_find_node(n->next, "font");
     }
     }
-    if ((n = parse_find_node("titleNumber", node)))
-        config_title_number = parse_bool(doc, n);
-    if ((n = parse_find_node("keepBorder", node)))
-        config_theme_keepborder = parse_bool(doc, n);
-    if ((n = parse_find_node("hideDisabled", node)))
-        config_theme_hidedisabled = parse_bool(doc, n);
 }
 
 }
 
-static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                           gpointer d)
+static void parse_desktops(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
 {
     xmlNodePtr n;
 
     node = node->children;
-    
-    if ((n = parse_find_node("number", node))) {
-        gint d = parse_int(doc, n);
+
+    if ((n = obt_parse_find_node(node, "number"))) {
+        gint d = obt_parse_node_int(n);
         if (d > 0)
         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);
+    if ((n = obt_parse_find_node(node, "firstdesk"))) {
+        gint d = obt_parse_node_int(n);
         if (d > 0)
         if (d > 0)
-            config_screen_firstdesk = d;
+            config_screen_firstdesk = (unsigned) d;
     }
     }
-    if ((n = parse_find_node("names", node))) {
+    if ((n = obt_parse_find_node(node, "names"))) {
         GSList *it;
         xmlNodePtr nname;
 
         GSList *it;
         xmlNodePtr nname;
 
@@ -466,161 +616,167 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         g_slist_free(config_desktops_names);
         config_desktops_names = NULL;
 
         g_slist_free(config_desktops_names);
         config_desktops_names = NULL;
 
-        nname = parse_find_node("name", n->children);
+        nname = obt_parse_find_node(n->children, "name");
         while (nname) {
         while (nname) {
-            config_desktops_names = g_slist_append(config_desktops_names,
-                                                   parse_string(doc, nname));
-            nname = parse_find_node("name", nname->next);
+            config_desktops_names =
+                g_slist_append(config_desktops_names,
+                               obt_parse_node_string(nname));
+            nname = obt_parse_find_node(nname->next, "name");
         }
     }
         }
     }
+    if ((n = obt_parse_find_node(node, "popupTime")))
+        config_desktop_popup_time = obt_parse_node_int(n);
 }
 
 }
 
-static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                         gpointer d)
+static void parse_resize(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
 {
     xmlNodePtr n;
 
     node = node->children;
-    
-    if ((n = parse_find_node("drawContents", node)))
-        config_resize_redraw = parse_bool(doc, n);
-    if ((n = parse_find_node("fourCorner", node)))
-        config_resize_four_corners = parse_bool(doc, n);
-    if ((n = parse_find_node("popupShow", node))) {
-        config_resize_popup_show = parse_int(doc, n);
-        if (parse_contains("Always", doc, n))
+
+    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"))
             config_resize_popup_show = 2;
             config_resize_popup_show = 2;
-        else if (parse_contains("Never", doc, n))
+        else if (obt_parse_node_contains(n, "Never"))
             config_resize_popup_show = 0;
             config_resize_popup_show = 0;
-        else if (parse_contains("Nonpixel", doc, n))
+        else if (obt_parse_node_contains(n, "Nonpixel"))
             config_resize_popup_show = 1;
     }
             config_resize_popup_show = 1;
     }
-    if ((n = parse_find_node("popupPosition", node))) {
-        config_resize_popup_pos = parse_int(doc, n);
-        if (parse_contains("Top", doc, n))
-            config_resize_popup_pos = 1;
-        else if (parse_contains("Center", doc, n))
-            config_resize_popup_pos = 0;
+    if ((n = obt_parse_find_node(node, "popupPosition"))) {
+        if (obt_parse_node_contains(n, "Top"))
+            config_resize_popup_pos = OB_RESIZE_POS_TOP;
+        else if (obt_parse_node_contains(n, "Center"))
+            config_resize_popup_pos = OB_RESIZE_POS_CENTER;
+        else if (obt_parse_node_contains(n, "Fixed")) {
+            config_resize_popup_pos = OB_RESIZE_POS_FIXED;
+
+            if ((n = obt_parse_find_node(node, "popupFixedPosition"))) {
+                xmlNodePtr n2;
+
+                if ((n2 = obt_parse_find_node(n->children, "x")))
+                    config_parse_gravity_coord(n2,
+                                               &config_resize_popup_fixed.x);
+                if ((n2 = obt_parse_find_node(n->children, "y")))
+                    config_parse_gravity_coord(n2,
+                                               &config_resize_popup_fixed.y);
+            }
+        }
     }
 }
 
     }
 }
 
-static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                       gpointer d)
+static void parse_dock(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
 
 {
     xmlNodePtr n;
 
     node = node->children;
 
-    if ((n = parse_find_node("position", node))) {
-        if (parse_contains("TopLeft", doc, n))
+    if ((n = obt_parse_find_node(node, "position"))) {
+        if (obt_parse_node_contains(n, "TopLeft"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_NORTHWEST;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_NORTHWEST;
-        else if (parse_contains("Top", doc, n))
+        else if (obt_parse_node_contains(n, "Top"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_NORTH;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_NORTH;
-        else if (parse_contains("TopRight", doc, n))
+        else if (obt_parse_node_contains(n, "TopRight"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_NORTHEAST;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_NORTHEAST;
-        else if (parse_contains("Right", doc, n))
+        else if (obt_parse_node_contains(n, "Right"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_EAST;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_EAST;
-        else if (parse_contains("BottomRight", doc, n))
+        else if (obt_parse_node_contains(n, "BottomRight"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_SOUTHEAST;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_SOUTHEAST;
-        else if (parse_contains("Bottom", doc, n))
+        else if (obt_parse_node_contains(n, "Bottom"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_SOUTH;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_SOUTH;
-        else if (parse_contains("BottomLeft", doc, n))
+        else if (obt_parse_node_contains(n, "BottomLeft"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_SOUTHWEST;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_SOUTHWEST;
-        else if (parse_contains("Left", doc, n))
+        else if (obt_parse_node_contains(n, "Left"))
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_WEST;
             config_dock_floating = FALSE,
             config_dock_pos = OB_DIRECTION_WEST;
-        else if (parse_contains("Floating", doc, n))
+        else if (obt_parse_node_contains(n, "Floating"))
             config_dock_floating = TRUE;
     }
     if (config_dock_floating) {
             config_dock_floating = TRUE;
     }
     if (config_dock_floating) {
-        if ((n = parse_find_node("floatingX", node)))
-            config_dock_x = parse_int(doc, n);
-        if ((n = parse_find_node("floatingY", node)))
-            config_dock_y = parse_int(doc, n);
+        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);
     } else {
     } else {
-        if ((n = parse_find_node("noStrut", node)))
-            config_dock_nostrut = parse_bool(doc, n);
+        if ((n = obt_parse_find_node(node, "noStrut")))
+            config_dock_nostrut = obt_parse_node_bool(n);
     }
     }
-    if ((n = parse_find_node("stacking", node))) {
-        if (parse_contains("top", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_ABOVE;
-        else if (parse_contains("normal", doc, n))
+    if ((n = obt_parse_find_node(node, "stacking"))) {
+        if (obt_parse_node_contains(n, "normal"))
             config_dock_layer = OB_STACKING_LAYER_NORMAL;
             config_dock_layer = OB_STACKING_LAYER_NORMAL;
-        else if (parse_contains("bottom", doc, n))
+        else if (obt_parse_node_contains(n, "below"))
             config_dock_layer = OB_STACKING_LAYER_BELOW;
             config_dock_layer = OB_STACKING_LAYER_BELOW;
+        else if (obt_parse_node_contains(n, "above"))
+            config_dock_layer = OB_STACKING_LAYER_ABOVE;
     }
     }
-    if ((n = parse_find_node("direction", node))) {
-        if (parse_contains("horizontal", doc, n))
+    if ((n = obt_parse_find_node(node, "direction"))) {
+        if (obt_parse_node_contains(n, "horizontal"))
             config_dock_orient = OB_ORIENTATION_HORZ;
             config_dock_orient = OB_ORIENTATION_HORZ;
-        else if (parse_contains("vertical", doc, n))
+        else if (obt_parse_node_contains(n, "vertical"))
             config_dock_orient = OB_ORIENTATION_VERT;
     }
             config_dock_orient = OB_ORIENTATION_VERT;
     }
-    if ((n = parse_find_node("autoHide", node)))
-        config_dock_hide = parse_bool(doc, n);
-    if ((n = parse_find_node("hideDelay", node)))
-        config_dock_hide_delay = parse_int(doc, n) * 1000;
-    if ((n = parse_find_node("showDelay", node)))
-        config_dock_show_delay = parse_int(doc, n) * 1000;
-    if ((n = parse_find_node("moveButton", node))) {
-        gchar *str = parse_string(doc, n);
+    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);
         guint b, s;
         if (translate_button(str, &s, &b)) {
             config_dock_app_move_button = b;
             config_dock_app_move_modifiers = s;
         } else {
         guint b, s;
         if (translate_button(str, &s, &b)) {
             config_dock_app_move_button = b;
             config_dock_app_move_modifiers = s;
         } else {
-            g_warning("invalid button '%s'", str);
+            g_message(_("Invalid button '%s' specified in config file"), str);
         }
         g_free(str);
     }
 }
 
         }
         g_free(str);
     }
 }
 
-static void parse_menu(ObParseInst *i, xmlDocPtr doc, 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;
 
 {
     xmlNodePtr n;
     for (node = node->children; node; node = node->next) {
         if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
             gchar *c;
 
-            c = parse_string(doc, node);
+            c = obt_parse_node_string(node);
             config_menu_files = g_slist_append(config_menu_files,
             config_menu_files = g_slist_append(config_menu_files,
-                                               parse_expand_tilde(c));
+                                               obt_paths_expand_tilde(c));
             g_free(c);
         }
             g_free(c);
         }
-        if ((n = parse_find_node("warpPointer", node)))
-            config_menu_warppointer = parse_bool(doc, n);
-        if ((n = parse_find_node("xorStyle", node)))
-            config_menu_xorstyle = parse_bool(doc, n);
-        if ((n = parse_find_node("hideDelay", node)))
-            config_menu_hide_delay = parse_int(doc, n);
-        if ((n = parse_find_node("middle", node)))
-            config_menu_middle = parse_bool(doc, n);
-        if ((n = parse_find_node("submenuShowDelay", node)))
-            config_submenu_show_delay = parse_int(doc, n);
-        if ((n = parse_find_node("desktopMenuIcons", node)))
-            config_menu_client_list_icons = parse_bool(doc, n);
+        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);
     }
 }
     }
 }
-   
-static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 
-                             gpointer d)
+
+static void parse_resistance(xmlNodePtr node, gpointer d)
 {
     xmlNodePtr n;
 
     node = node->children;
 {
     xmlNodePtr n;
 
     node = node->children;
-    if ((n = parse_find_node("strength", node)))
-        config_resist_win = parse_int(doc, n);
-    if ((n = parse_find_node("screen_edge_strength", node)))
-        config_resist_edge = parse_int(doc, n);
-    if ((n = parse_find_node("edges_hit_layers_below", node)))
-        config_resist_layers_below = parse_bool(doc, n);
+    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);
 }
 
 typedef struct
 }
 
 typedef struct
@@ -629,7 +785,7 @@ typedef struct
     const gchar *actname;
 } ObDefKeyBind;
 
     const gchar *actname;
 } ObDefKeyBind;
 
-static void bind_default_keyboard()
+static void bind_default_keyboard(void)
 {
     ObDefKeyBind *it;
     ObDefKeyBind binds[] = {
 {
     ObDefKeyBind *it;
     ObDefKeyBind binds[] = {
@@ -638,11 +794,9 @@ static void bind_default_keyboard()
         { "A-F4", "Close" },
         { NULL, NULL }
     };
         { "A-F4", "Close" },
         { NULL, NULL }
     };
-
     for (it = binds; it->key; ++it) {
         GList *l = g_list_append(NULL, g_strdup(it->key));
     for (it = binds; it->key; ++it) {
         GList *l = g_list_append(NULL, g_strdup(it->key));
-        keyboard_bind(l, action_from_string(it->actname,
-                                            OB_USER_ACTION_KEYBOARD_KEY));
+        keyboard_bind(l, actions_parse_string(it->actname));
     }
 }
 
     }
 }
 
@@ -654,7 +808,7 @@ typedef struct
     const gchar *actname;
 } ObDefMouseBind;
 
     const gchar *actname;
 } ObDefMouseBind;
 
-static void bind_default_mouse()
+static void bind_default_mouse(void)
 {
     ObDefMouseBind *it;
     ObDefMouseBind binds[] = {
 {
     ObDefMouseBind *it;
     ObDefMouseBind binds[] = {
@@ -665,7 +819,7 @@ static void bind_default_mouse()
         { "Middle", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Right", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "Titlebar", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Middle", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Right", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "Titlebar", OB_MOUSE_ACTION_PRESS, "Focus" },
-        { "Left", "Handle", OB_MOUSE_ACTION_PRESS, "Focus" },
+        { "Left", "Bottom", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "BLCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "BRCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "TLCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "BLCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "BRCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Left", "TLCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
@@ -679,7 +833,6 @@ static void bind_default_mouse()
         { "Left", "Client", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Titlebar", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Middle", "Titlebar", OB_MOUSE_ACTION_CLICK, "Lower" },
         { "Left", "Client", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Titlebar", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Middle", "Titlebar", OB_MOUSE_ACTION_CLICK, "Lower" },
-        { "Left", "Handle", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "BLCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "BRCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "TLCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "BLCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "BRCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "TLCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
@@ -691,7 +844,7 @@ static void bind_default_mouse()
         { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" },
         { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" },
         { "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" },
-        { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "ToggleMaximizeFull" },
+        { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "ToggleMaximize" },
         { "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" },
         { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "ToggleOmnipresent" },
         { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "ToggleShade" },
         { "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" },
         { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "ToggleOmnipresent" },
         { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "ToggleShade" },
@@ -699,68 +852,69 @@ static void bind_default_mouse()
         { "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "BRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "BRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
+        { "Left", "Top", OB_MOUSE_ACTION_MOTION, "Resize" },
+        { "Left", "Bottom", OB_MOUSE_ACTION_MOTION, "Resize" },
+        { "Left", "Left", OB_MOUSE_ACTION_MOTION, "Resize" },
+        { "Left", "Right", OB_MOUSE_ACTION_MOTION, "Resize" },
         { "Left", "Titlebar", OB_MOUSE_ACTION_MOTION, "Move" },
         { "A-Left", "Frame", OB_MOUSE_ACTION_MOTION, "Move" },
         { "A-Middle", "Frame", OB_MOUSE_ACTION_MOTION, "Resize" },
         { NULL, NULL, 0, NULL }
     };
 
         { "Left", "Titlebar", OB_MOUSE_ACTION_MOTION, "Move" },
         { "A-Left", "Frame", OB_MOUSE_ACTION_MOTION, "Move" },
         { "A-Middle", "Frame", OB_MOUSE_ACTION_MOTION, "Resize" },
         { NULL, NULL, 0, NULL }
     };
 
-    for (it = binds; it->button; ++it) {
-        ObUserAction uact;
-        switch (it->mact) {
-        case OB_MOUSE_ACTION_PRESS:
-            uact = OB_USER_ACTION_MOUSE_PRESS; break;
-        case OB_MOUSE_ACTION_RELEASE:
-            uact = OB_USER_ACTION_MOUSE_RELEASE; break;
-        case OB_MOUSE_ACTION_CLICK:
-            uact = OB_USER_ACTION_MOUSE_CLICK; break;
-        case OB_MOUSE_ACTION_DOUBLE_CLICK:
-            uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK; break;
-        case OB_MOUSE_ACTION_MOTION:
-            uact = OB_USER_ACTION_MOUSE_MOTION; break;
-        case OB_NUM_MOUSE_ACTIONS:
-            g_assert_not_reached();
-        }
+    for (it = binds; it->button; ++it)
         mouse_bind(it->button, it->context, it->mact,
         mouse_bind(it->button, it->context, it->mact,
-                   action_from_string(it->actname, uact));
-    }
+                   actions_parse_string(it->actname));
 }
 
 }
 
-void config_startup(ObParseInst *i)
+void config_startup(ObtParseInst *i)
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
     config_focus_delay = 0;
     config_focus_raise = FALSE;
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
     config_focus_delay = 0;
     config_focus_raise = FALSE;
-    config_focus_last = FALSE;
+    config_focus_last = TRUE;
+    config_focus_under_mouse = FALSE;
 
 
-    parse_register(i, "focus", parse_focus, NULL);
+    obt_parse_register(i, "focus", parse_focus, NULL);
 
     config_place_policy = OB_PLACE_POLICY_SMART;
 
     config_place_policy = OB_PLACE_POLICY_SMART;
+    config_place_center = TRUE;
+    config_place_monitor = OB_PLACE_MONITOR_ANY;
+
+    obt_parse_register(i, "placement", parse_placement, NULL);
+
+    STRUT_PARTIAL_SET(config_margins, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
 
-    parse_register(i, "placement", parse_placement, NULL);
+    obt_parse_register(i, "margins", parse_margins, NULL);
 
     config_theme = NULL;
 
 
     config_theme = NULL;
 
+    config_animate_iconify = TRUE;
     config_title_layout = g_strdup("NLIMC");
     config_title_layout = g_strdup("NLIMC");
-    config_title_number = TRUE;
     config_theme_keepborder = TRUE;
     config_theme_keepborder = TRUE;
-    config_theme_hidedisabled = FALSE;
 
 
-    parse_register(i, "theme", parse_theme, NULL);
+    config_font_activewindow = NULL;
+    config_font_inactivewindow = NULL;
+    config_font_menuitem = NULL;
+    config_font_menutitle = NULL;
+
+    obt_parse_register(i, "theme", parse_theme, NULL);
 
     config_desktops_num = 4;
     config_screen_firstdesk = 1;
     config_desktops_names = NULL;
 
     config_desktops_num = 4;
     config_screen_firstdesk = 1;
     config_desktops_names = NULL;
+    config_desktop_popup_time = 875;
 
 
-    parse_register(i, "desktops", parse_desktops, NULL);
+    obt_parse_register(i, "desktops", parse_desktops, NULL);
 
     config_resize_redraw = TRUE;
 
     config_resize_redraw = TRUE;
-    config_resize_four_corners = FALSE;
     config_resize_popup_show = 1; /* nonpixel increments */
     config_resize_popup_show = 1; /* nonpixel increments */
-    config_resize_popup_pos = 0;  /* center of client */
+    config_resize_popup_pos = OB_RESIZE_POS_CENTER;
+    GRAVITY_COORD_SET(config_resize_popup_fixed.x, 0, FALSE, FALSE);
+    GRAVITY_COORD_SET(config_resize_popup_fixed.y, 0, FALSE, FALSE);
 
 
-    parse_register(i, "resize", parse_resize, NULL);
+    obt_parse_register(i, "resize", parse_resize, NULL);
 
     config_dock_layer = OB_STACKING_LAYER_ABOVE;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
 
     config_dock_layer = OB_STACKING_LAYER_ABOVE;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
@@ -775,44 +929,43 @@ void config_startup(ObParseInst *i)
     config_dock_app_move_button = 2; /* middle */
     config_dock_app_move_modifiers = 0;
 
     config_dock_app_move_button = 2; /* middle */
     config_dock_app_move_modifiers = 0;
 
-    parse_register(i, "dock", parse_dock, NULL);
+    obt_parse_register(i, "dock", parse_dock, NULL);
 
     translate_key("C-g", &config_keyboard_reset_state,
                   &config_keyboard_reset_keycode);
 
     bind_default_keyboard();
 
 
     translate_key("C-g", &config_keyboard_reset_state,
                   &config_keyboard_reset_keycode);
 
     bind_default_keyboard();
 
-    parse_register(i, "keyboard", parse_keyboard, NULL);
+    obt_parse_register(i, "keyboard", parse_keyboard, NULL);
 
 
-    config_mouse_threshold = 3;
+    config_mouse_threshold = 8;
     config_mouse_dclicktime = 200;
     config_mouse_dclicktime = 200;
+    config_mouse_screenedgetime = 400;
 
     bind_default_mouse();
 
 
     bind_default_mouse();
 
-    parse_register(i, "mouse", parse_mouse, NULL);
+    obt_parse_register(i, "mouse", parse_mouse, NULL);
 
     config_resist_win = 10;
     config_resist_edge = 20;
 
     config_resist_win = 10;
     config_resist_edge = 20;
-    config_resist_layers_below = FALSE;
 
 
-    parse_register(i, "resistance", parse_resistance, NULL);
+    obt_parse_register(i, "resistance", parse_resistance, NULL);
 
 
-    config_menu_warppointer = TRUE;
-    config_menu_xorstyle = TRUE;
     config_menu_hide_delay = 250;
     config_menu_middle = FALSE;
     config_submenu_show_delay = 0;
     config_menu_client_list_icons = TRUE;
     config_menu_hide_delay = 250;
     config_menu_middle = FALSE;
     config_submenu_show_delay = 0;
     config_menu_client_list_icons = TRUE;
+    config_menu_manage_desktops = TRUE;
     config_menu_files = NULL;
 
     config_menu_files = NULL;
 
-    parse_register(i, "menu", parse_menu, NULL);
+    obt_parse_register(i, "menu", parse_menu, NULL);
 
     config_per_app_settings = NULL;
 
 
     config_per_app_settings = NULL;
 
-    parse_register(i, "applications", parse_per_app_settings, NULL);
+    obt_parse_register(i, "applications", parse_per_app_settings, NULL);
 }
 
 }
 
-void config_shutdown()
+void config_shutdown(void)
 {
     GSList *it;
 
 {
     GSList *it;
 
@@ -820,6 +973,12 @@ void config_shutdown()
 
     g_free(config_title_layout);
 
 
     g_free(config_title_layout);
 
+    RrFontClose(config_font_activewindow);
+    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);
     g_slist_free(config_desktops_names);
     for (it = config_desktops_names; it; it = g_slist_next(it))
         g_free(it->data);
     g_slist_free(config_desktops_names);
@@ -830,9 +989,9 @@ void config_shutdown()
 
     for (it = config_per_app_settings; it; it = g_slist_next(it)) {
         ObAppSettings *itd = (ObAppSettings *)it->data;
 
     for (it = config_per_app_settings; it; it = g_slist_next(it)) {
         ObAppSettings *itd = (ObAppSettings *)it->data;
-        g_free(itd->name);
-        g_free(itd->role);
-        g_free(itd->class);
+        if (itd->name)  g_pattern_spec_free(itd->name);
+        if (itd->role)  g_pattern_spec_free(itd->role);
+        if (itd->class) g_pattern_spec_free(itd->class);
         g_free(it->data);
     }
     g_slist_free(config_per_app_settings);
         g_free(it->data);
     }
     g_slist_free(config_per_app_settings);
my patches for the openbox window manager
This page took 0.054202 seconds and 4 git commands to generate.