X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=inline;f=openbox%2Fconfig.c;h=5444e013a500b20b7fb15cdcdf378ec3da0520a1;hb=c1f0f7c40fbbc33157d59b5e3db58a0801af5008;hp=959f6c2c22b768fcccf249a4cddf8c69fbf5eebe;hpb=f26f23de50cb7941a7702198e3b4d1b2f9de062e;p=chaz%2Fopenbox
diff --git a/openbox/config.c b/openbox/config.c
index 959f6c2c..5444e013 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,5 +1,8 @@
#include "config.h"
-#include "parse.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "prop.h"
+#include "parser/parse.h"
gboolean config_focus_new;
gboolean config_focus_follow;
@@ -9,91 +12,295 @@ gboolean config_focus_popup;
char *config_theme;
-int config_desktops_num;
+gchar *config_title_layout;
+
+int config_desktops_num;
GSList *config_desktops_names;
-static void parse_focus(char *name, ParseToken *value)
+gboolean config_redraw_resize;
+
+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;
+
+gint config_mouse_threshold;
+gint config_mouse_dclicktime;
+
+/*
+
+
+
+ 3
+
+
+
+*/
+
+static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist)
{
- 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;
+ char *key;
+ ObAction *action;
+ xmlNodePtr n, nact;
+ GList *it;
+
+ n = parse_find_node("keybind", node);
+ while (n) {
+ if (parse_attr_string("key", n, &key)) {
+ keylist = g_list_append(keylist, key);
+
+ parse_key(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, "cyclingdialog")) {
- if (value->type != TOKEN_BOOL)
- yyerror("invalid value");
- else {
- config_focus_popup = value->data.bool;
+ n = parse_find_node("keybind", n->next);
+ }
+ if (keylist) {
+ nact = parse_find_node("action", node);
+ while (nact) {
+ if ((action = action_parse(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);
+ }
+ nact = parse_find_node("action", nact->next);
}
- } else
- yyerror("invalid option");
- parse_free_token(value);
+ }
}
-static void parse_theme(char *name, ParseToken *value)
+static void parse_keyboard(xmlDocPtr doc, xmlNodePtr node, void *d)
{
- 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);
+ parse_key(doc, node->xmlChildrenNode, NULL);
}
-static void parse_desktops(char *name, ParseToken *value)
+static int threshold;
+static int dclicktime;
+/*
+
+
+
+
+
+
+
+*/
+
+static void parse_mouse(xmlDocPtr doc, xmlNodePtr node, void *d)
{
- GList *it;
+ xmlNodePtr n, nbut, nact;
+ char *buttonstr;
+ char *contextstr;
+ ObMouseAction mact;
+ ObAction *action;
- if (!g_ascii_strcasecmp(name, "number")) {
- if (value->type != TOKEN_INTEGER)
- yyerror("invalid value");
- else {
- config_desktops_num = value->data.integer;
- }
- } 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");
+ node = node->xmlChildrenNode;
+
+ if ((n = parse_find_node("dragThreshold", node)))
+ threshold = parse_int(doc, n);
+ if ((n = parse_find_node("doubleClickTime", node)))
+ 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 = MouseAction_Press;
+ else if (parse_attr_contains("release", nbut, "action"))
+ mact = MouseAction_Release;
+ else if (parse_attr_contains("click", nbut, "action"))
+ mact = MouseAction_Click;
+ else if (parse_attr_contains("doubleclick", nbut,"action"))
+ mact = MouseAction_DClick;
+ else if (parse_attr_contains("drag", nbut, "action"))
+ mact = MouseAction_Motion;
+ else
+ goto next_nbut;
+ nact = parse_find_node("action", nbut->xmlChildrenNode);
+ while (nact) {
+ if ((action = action_parse(doc, nact))) {
+ /* validate that its okay for a mouse binding*/
+ if (mact == MouseAction_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);
}
- } else {
- yyerror("syntax error (expected list of strings)");
+ g_free(buttonstr);
+ next_nbut:
+ nbut = parse_find_node("mousebind", nbut->next);
+ }
+ g_free(contextstr);
+ next_n:
+ n = parse_find_node("context", n->next);
+ }
+}
+
+static void parse_focus(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(xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+ xmlNodePtr n;
+
+ node = node->xmlChildrenNode;
+
+ if ((n = parse_find_node("theme", node))) {
+ g_free(config_theme);
+ config_theme = parse_string(doc, n);
+ }
+ if ((n = parse_find_node("titlelayout", node))) {
+ g_free(config_title_layout);
+ config_title_layout = parse_string(doc, n);
+ }
+}
+
+static void parse_desktops(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
- yyerror("invalid option");
- parse_free_token(value);
+ }
+}
+
+static void parse_resize(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(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);
}
void config_startup()
@@ -104,16 +311,40 @@ void config_startup()
config_focus_last_on_desktop = TRUE;
config_focus_popup = TRUE;
- parse_reg_section("focus", NULL, parse_focus);
+ parse_register("focus", parse_focus, NULL);
config_theme = NULL;
- parse_reg_section("theme", NULL, parse_theme);
+ config_title_layout = g_strdup("NLIMC");
+
+ parse_register("theme", parse_theme, NULL);
config_desktops_num = 4;
config_desktops_names = NULL;
- parse_reg_section("desktops", NULL, parse_desktops);
+ parse_register("desktops", parse_desktops, NULL);
+
+ config_redraw_resize = TRUE;
+
+ parse_register("resize", parse_resize, NULL);
+
+ 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_orient = OB_ORIENTATION_VERT;
+ config_dock_hide = FALSE;
+ config_dock_hide_timeout = 3000;
+
+ parse_register("dock", parse_dock, NULL);
+
+ parse_register("keyboard", parse_keyboard, NULL);
+
+ config_mouse_threshold = 3;
+ config_mouse_dclicktime = 200;
+
+ parse_register("mouse", parse_mouse, NULL);
}
void config_shutdown()