X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=54ae4c33dbdf060b03931a28ce718fa7ce995c94;hb=ec9dd7fdd7531d2ca951a0b812bf8e63b6e9a377;hp=e751f32b6baa267e693899914e9354a8f24f41d8;hpb=b77e40e1c7710323aa59a778338d8e18b591f718;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index e751f32b..54ae4c33 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,207 +1,373 @@
 #include "config.h"
-#include "parse.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "prop.h"
+#include "translate.h"
+#include "parser/parse.h"
 
 gboolean config_focus_new;
 gboolean config_focus_follow;
 gboolean config_focus_last;
 gboolean config_focus_last_on_desktop;
 gboolean config_focus_popup;
+gboolean config_desktop_popup;
 
 char *config_theme;
 
+gchar *config_title_layout;
+
 int     config_desktops_num;
 GSList *config_desktops_names;
 
-gboolean config_opaque_move;
-gboolean config_opaque_resize;
+gboolean config_redraw_resize;
 
-StackLayer   config_dock_layer;
-DockPosition config_dock_pos;
-int          config_dock_x;
-int          config_dock_y;
-gboolean     config_dock_horz;
-gboolean     config_dock_hide;
-guint        config_dock_hide_timeout;
+ObStackingLayer config_dock_layer;
+gboolean        config_dock_floating;
+ObDirection     config_dock_pos;
+gint            config_dock_x;
+gint            config_dock_y;
+ObOrientation   config_dock_orient;
+gboolean        config_dock_hide;
+guint           config_dock_hide_timeout;
 
-static void parse_focus(char *name, ParseToken *value)
-{
-    if (!g_ascii_strcasecmp(name, "focusnew")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_focus_new = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "followmouse")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_focus_follow = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "focuslast")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_focus_last = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_focus_last_on_desktop = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "cyclingdialog")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_focus_popup = value->data.bool;
-        }
-    } else
-        yyerror("invalid option");
-    parse_free_token(value);
-}
+guint config_keyboard_reset_keycode;
+guint config_keyboard_reset_state;
+
+gint config_mouse_threshold;
+gint config_mouse_dclicktime;
+
+GSList *config_menu_files;
 
-static void parse_theme(char *name, ParseToken *value)
+gint config_resist_win;
+gint config_resist_edge;
+
+gchar *expand_tilde(const gchar *f)
 {
-    if (!g_ascii_strcasecmp(name, "theme")) {
-        if (value->type != TOKEN_STRING)
-            yyerror("invalid value");
-        else {
-            g_free(config_theme);
-            config_theme = g_strdup(value->data.string);
-        }
-    } else
-        yyerror("invalid option");
-    parse_free_token(value);
+    if (!f)
+        return NULL;
+    else if (f[0] != '~')
+        return g_strdup(f);
+    else
+        return g_strconcat(g_get_home_dir(), f+1, NULL);
 }
 
-static void parse_desktops(char *name, ParseToken *value)
+/*
+
+<keybind key="C-x">
+  <action name="ChangeDesktop">
+    <desktop>3</desktop>
+  </action>
+</keybind>
+
+*/
+
+static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                      GList *keylist)
 {
+    char *key;
+    ObAction *action;
+    xmlNodePtr n, nact;
     GList *it;
 
-    if (!g_ascii_strcasecmp(name, "number")) {
-        if (value->type != TOKEN_INTEGER)
-            yyerror("invalid value");
-        else {
-            config_desktops_num = value->data.integer;
+    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);
+    }
+
+    n = parse_find_node("keybind", node);
+    while (n) {
+        if (parse_attr_string("key", n, &key)) {
+            keylist = g_list_append(keylist, key);
+
+            parse_key(i, doc, n->xmlChildrenNode, keylist);
+
+            it = g_list_last(keylist);
+            g_free(it->data);
+            keylist = g_list_delete_link(keylist, it);
         }
-    } else if (!g_ascii_strcasecmp(name, "names")) {
-        if (value->type == TOKEN_LIST) {
-            for (it = value->data.list; it; it = it->next)
-                if (((ParseToken*)it->data)->type != TOKEN_STRING) break;
-            if (it == NULL) {
-                /* build a string list */
-                g_free(config_desktops_names);
-                for (it = value->data.list; it; it = it->next)
-                    config_desktops_names =
-                        g_slist_append(config_desktops_names,
-                                       g_strdup
-                                       (((ParseToken*)it->data)->data.string));
-            } else {
-                yyerror("invalid string in names list");
+        n = parse_find_node("keybind", n->next);
+    }
+    if (keylist) {
+        nact = parse_find_node("action", node);
+        while (nact) {
+            if ((action = action_parse(i, doc, nact))) {
+                /* validate that its okay for a key binding */
+                if (action->func == action_moveresize &&
+                    action->data.moveresize.corner !=
+                    prop_atoms.net_wm_moveresize_move_keyboard &&
+                    action->data.moveresize.corner !=
+                    prop_atoms.net_wm_moveresize_size_keyboard) {
+                    action_free(action);
+                    action = NULL;
+                }
+
+                if (action)
+                    keyboard_bind(keylist, action);
             }
-        } else {
-            yyerror("syntax error (expected list of strings)");
+            nact = parse_find_node("action", nact->next);
         }
-    } else
-        yyerror("invalid option");
-    parse_free_token(value);
+    }
 }
 
-static void parse_moveresize(char *name, ParseToken *value)
+static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                           void *d)
 {
-    if (!g_ascii_strcasecmp(name, "opaque_move")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_opaque_move = value->data.integer;
-        }
-    } else if (!g_ascii_strcasecmp(name, "opaque_resize")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_opaque_resize = value->data.integer;
-        }
-    } else
-        yyerror("invalid option");
-    parse_free_token(value);
+    parse_key(i, doc, node->xmlChildrenNode, NULL);
 }
 
-static void parse_dock(char *name, ParseToken *value)
+/*
+
+<context name="Titlebar"> 
+  <mousebind button="Left" action="Press">
+    <action name="Raise"></action>
+  </mousebind>
+</context>
+
+*/
+
+static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                        void *d)
 {
-    if (!g_ascii_strcasecmp(name, "stacking")) {
-        if (value->type != TOKEN_STRING)
-            yyerror("invalid value");
-        else {
-            if (!g_ascii_strcasecmp(value->data.string, "bottom"))
-                config_dock_layer = Layer_Below;
-            else if (!g_ascii_strcasecmp(value->data.string, "normal"))
-                config_dock_layer = Layer_Normal;
-            else if (!g_ascii_strcasecmp(value->data.string, "top"))
-                config_dock_layer = Layer_Top;
-            else
-                yyerror("invalid layer");
-        }
-    } else if (!g_ascii_strcasecmp(name, "position")) {
-        if (value->type != TOKEN_STRING)
-            yyerror("invalid value");
-        else {
-            if (!g_ascii_strcasecmp(value->data.string, "topleft"))
-                config_dock_pos = DockPos_TopLeft;
-            else if (!g_ascii_strcasecmp(value->data.string, "top"))
-                config_dock_pos = DockPos_Top;
-            else if (!g_ascii_strcasecmp(value->data.string, "topright"))
-                config_dock_pos = DockPos_TopRight;
-            else if (!g_ascii_strcasecmp(value->data.string, "right"))
-                config_dock_pos = DockPos_Right;
-            else if (!g_ascii_strcasecmp(value->data.string, "bottomright"))
-                config_dock_pos = DockPos_BottomRight;
-            else if (!g_ascii_strcasecmp(value->data.string, "bottom"))
-                config_dock_pos = DockPos_Bottom;
-            else if (!g_ascii_strcasecmp(value->data.string, "bottomleft"))
-                config_dock_pos = DockPos_BottomLeft;
-            else if (!g_ascii_strcasecmp(value->data.string, "left"))
-                config_dock_pos = DockPos_Left;
-            else if (!g_ascii_strcasecmp(value->data.string, "floating"))
-                config_dock_pos = DockPos_Floating;
+    xmlNodePtr n, nbut, nact;
+    char *buttonstr;
+    char *contextstr;
+    ObMouseAction mact;
+    ObAction *action;
+
+    node = node->xmlChildrenNode;
+    
+    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);
+    while (n) {
+        if (!parse_attr_string("name", n, &contextstr))
+            goto next_n;
+        nbut = parse_find_node("mousebind", n->xmlChildrenNode);
+        while (nbut) {
+            if (!parse_attr_string("button", nbut, &buttonstr))
+                goto next_nbut;
+            if (parse_attr_contains("press", nbut, "action"))
+                mact = OB_MOUSE_ACTION_PRESS;
+            else if (parse_attr_contains("release", nbut, "action"))
+                mact = OB_MOUSE_ACTION_RELEASE;
+            else if (parse_attr_contains("click", nbut, "action"))
+                mact = OB_MOUSE_ACTION_CLICK;
+            else if (parse_attr_contains("doubleclick", nbut,"action"))
+                mact = OB_MOUSE_ACTION_DOUBLE_CLICK;
+            else if (parse_attr_contains("drag", nbut, "action"))
+                mact = OB_MOUSE_ACTION_MOTION;
             else
-                yyerror("invalid position");
-        }
-    } else if (!g_ascii_strcasecmp(name, "floatingx")) {
-        if (value->type != TOKEN_INTEGER)
-            yyerror("invalid value");
-        else {
-            config_dock_x = value->data.integer;
-        }
-    } else if (!g_ascii_strcasecmp(name, "floatingy")) {
-        if (value->type != TOKEN_INTEGER)
-            yyerror("invalid value");
-        else {
-            config_dock_y = value->data.integer;
-        }
-    } else if (!g_ascii_strcasecmp(name, "horizontal")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_dock_horz = value->data.bool;
+                goto next_nbut;
+            nact = parse_find_node("action", nbut->xmlChildrenNode);
+            while (nact) {
+                if ((action = action_parse(i, doc, nact))) {
+                    /* validate that its okay for a mouse binding*/
+                    if (mact == OB_MOUSE_ACTION_MOTION) {
+                        if (action->func != action_moveresize ||
+                            action->data.moveresize.corner ==
+                            prop_atoms.net_wm_moveresize_move_keyboard ||
+                            action->data.moveresize.corner ==
+                            prop_atoms.net_wm_moveresize_size_keyboard) {
+                            action_free(action);
+                            action = NULL;
+                        }
+                    } else {
+                        if (action->func == action_moveresize &&
+                            action->data.moveresize.corner !=
+                            prop_atoms.net_wm_moveresize_move_keyboard &&
+                            action->data.moveresize.corner !=
+                            prop_atoms.net_wm_moveresize_size_keyboard) {
+                            action_free(action);
+                            action = NULL;
+                        }
+                    }
+                    if (action)
+                        mouse_bind(buttonstr, contextstr, mact, action);
+                }
+                nact = parse_find_node("action", nact->next);
+            }
+            g_free(buttonstr);
+        next_nbut:
+            nbut = parse_find_node("mousebind", nbut->next);
         }
-    } else if (!g_ascii_strcasecmp(name, "autohide")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_dock_hide = value->data.bool;
+        g_free(contextstr);
+    next_n:
+        n = parse_find_node("context", n->next);
+    }
+}
+
+static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                        void *d)
+{
+    xmlNodePtr n;
+
+    node = node->xmlChildrenNode;
+    
+    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("focusLast", node)))
+        config_focus_last = parse_bool(doc, n);
+    if ((n = parse_find_node("focusLastOnDesktop", node)))
+        config_focus_last_on_desktop = parse_bool(doc, n);
+    if ((n = parse_find_node("cyclingDialog", node)))
+        config_focus_popup = parse_bool(doc, n);
+}
+
+static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                        void *d)
+{
+    xmlNodePtr n;
+
+    node = node->xmlChildrenNode;
+
+    if ((n = parse_find_node("theme", node))) {
+        gchar *c;
+
+        g_free(config_theme);
+        c = parse_string(doc, n);
+        config_theme = expand_tilde(c);
+        g_free(c);
+    }
+    if ((n = parse_find_node("titleLayout", node))) {
+        g_free(config_title_layout);
+        config_title_layout = parse_string(doc, n);
+    }
+}
+
+static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                           void *d)
+{
+    xmlNodePtr n;
+
+    node = node->xmlChildrenNode;
+    
+    if ((n = parse_find_node("number", node)))
+        config_desktops_num = parse_int(doc, n);
+    if ((n = parse_find_node("names", node))) {
+        GSList *it;
+        xmlNodePtr nname;
+
+        for (it = config_desktops_names; it; it = it->next)
+            g_free(it->data);
+        g_slist_free(config_desktops_names);
+        config_desktops_names = NULL;
+
+        nname = parse_find_node("name", n->xmlChildrenNode);
+        while (nname) {
+            config_desktops_names = g_slist_append(config_desktops_names,
+                                                   parse_string(doc, nname));
+            nname = parse_find_node("name", nname->next);
         }
-    } else if (!g_ascii_strcasecmp(name, "hidetimeout")) {
-        if (value->type != TOKEN_INTEGER)
-            yyerror("invalid value");
-        else {
-            config_dock_hide_timeout = value->data.integer;
+    }
+    if ((n = parse_find_node("cyclingDialog", node)))
+        config_desktop_popup = parse_bool(doc, n);
+}
+
+static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                         void *d)
+{
+    xmlNodePtr n;
+
+    node = node->xmlChildrenNode;
+    
+    if ((n = parse_find_node("drawContents", node)))
+        config_redraw_resize = parse_bool(doc, n);
+}
+
+static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+    xmlNodePtr n;
+
+    node = node->xmlChildrenNode;
+
+    if ((n = parse_find_node("position", node))) {
+        if (parse_contains("TopLeft", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_NORTHWEST;
+        else if (parse_contains("Top", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_NORTH;
+        else if (parse_contains("TopRight", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_NORTHEAST;
+        else if (parse_contains("Right", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_EAST;
+        else if (parse_contains("BottomRight", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_SOUTHEAST;
+        else if (parse_contains("Bottom", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_SOUTH;
+        else if (parse_contains("BottomLeft", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_SOUTHWEST;
+        else if (parse_contains("Left", doc, n))
+            config_dock_floating = FALSE,
+            config_dock_pos = OB_DIRECTION_WEST;
+        else if (parse_contains("Floating", doc, n))
+            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 = parse_find_node("stacking", node))) {
+        if (parse_contains("top", doc, n))
+            config_dock_layer = OB_STACKING_LAYER_TOP;
+        else if (parse_contains("normal", doc, n))
+            config_dock_layer = OB_STACKING_LAYER_NORMAL;
+        else if (parse_contains("bottom", doc, n))
+            config_dock_layer = OB_STACKING_LAYER_BELOW;
+    }
+    if ((n = parse_find_node("direction", node))) {
+        if (parse_contains("horizontal", doc, n))
+            config_dock_orient = OB_ORIENTATION_HORZ;
+        else if (parse_contains("vertical", doc, n))
+            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("hideTimeout", node)))
+        config_dock_hide_timeout = parse_int(doc, n);
+}
+
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+    for (node = node->xmlChildrenNode; node; node = node->next) {
+        if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
+            gchar *c;
+
+            c = parse_string(doc, node);
+            config_menu_files = g_slist_append(config_menu_files,
+                                               expand_tilde(c));
+            g_free(c);
         }
-    } else
-        yyerror("invalid option");
-    parse_free_token(value);
+    }
 }
+   
+static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 
+                             void *d)
+{
+    xmlNodePtr n;
 
-void config_startup()
+    node = node->xmlChildrenNode;
+    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);
+}
+
+void config_startup(ObParseInst *i)
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
@@ -209,31 +375,53 @@ void config_startup()
     config_focus_last_on_desktop = TRUE;
     config_focus_popup = TRUE;
 
-    parse_reg_section("focus", NULL, parse_focus);
+    parse_register(i, "focus", parse_focus, NULL);
 
     config_theme = NULL;
 
-    parse_reg_section("theme", NULL, parse_theme);
+    config_title_layout = g_strdup("NLIMC");
+
+    parse_register(i, "theme", parse_theme, NULL);
 
     config_desktops_num = 4;
     config_desktops_names = NULL;
+    config_desktop_popup = TRUE;
 
-    parse_reg_section("desktops", NULL, parse_desktops);
+    parse_register(i, "desktops", parse_desktops, NULL);
 
-    config_opaque_move = TRUE;
-    config_opaque_resize = TRUE;
+    config_redraw_resize = TRUE;
 
-    parse_reg_section("moveresize", NULL, parse_moveresize);
+    parse_register(i, "resize", parse_resize, NULL);
 
-    config_dock_layer = Layer_Top;
-    config_dock_pos = DockPos_TopRight;
+    config_dock_layer = OB_STACKING_LAYER_TOP;
+    config_dock_pos = OB_DIRECTION_NORTHEAST;
+    config_dock_floating = FALSE;
     config_dock_x = 0;
     config_dock_y = 0;
-    config_dock_horz = FALSE;
+    config_dock_orient = OB_ORIENTATION_VERT;
     config_dock_hide = FALSE;
     config_dock_hide_timeout = 3000;
 
-    parse_reg_section("dock", NULL, parse_dock);
+    parse_register(i, "dock", parse_dock, NULL);
+
+    translate_key("C-g", &config_keyboard_reset_state,
+                  &config_keyboard_reset_keycode);
+
+    parse_register(i, "keyboard", parse_keyboard, NULL);
+
+    config_mouse_threshold = 3;
+    config_mouse_dclicktime = 200;
+
+    parse_register(i, "mouse", parse_mouse, NULL);
+
+    config_resist_win = 10;
+    config_resist_edge = 10;
+
+    parse_register(i, "resistance", parse_resistance, NULL);
+
+    config_menu_files = NULL;
+
+    parse_register(i, "menu", parse_menu, NULL);
 }
 
 void config_shutdown()
@@ -242,7 +430,11 @@ void config_shutdown()
 
     g_free(config_theme);
 
-    for (it = config_desktops_names; it; it = it->next)
+    for (it = config_desktops_names; it; it = g_slist_next(it))
         g_free(it->data);
     g_slist_free(config_desktops_names);
+
+    for (it = config_menu_files; it; it = g_slist_next(it))
+        g_free(it->data);
+    g_slist_free(config_menu_files);
 }