X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=b6ec290b70db8fb94a17807123fc9fd4a111c982;hb=3ce8f836749c9f74f6888251f0a7f2ff601830c0;hp=d9c9789e309e91984ab327e9cabbfed7f59bb53c;hpb=54ad34a039d5d83d61c481aaef18d1ea7876d36e;p=chaz%2Fopenbox
diff --git a/openbox/config.c b/openbox/config.c
index d9c9789e..b6ec290b 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,11 +1,14 @@
#include "config.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "prop.h"
+#include "translate.h"
#include "parser/parse.h"
+#include "openbox.h"
gboolean config_focus_new;
gboolean config_focus_follow;
-gboolean config_focus_last;
-gboolean config_focus_last_on_desktop;
-gboolean config_focus_popup;
+guint config_focus_delay;
char *config_theme;
@@ -14,8 +17,7 @@ gchar *config_title_layout;
int config_desktops_num;
GSList *config_desktops_names;
-gboolean config_opaque_move;
-gboolean config_opaque_resize;
+gboolean config_redraw_resize;
ObStackingLayer config_dock_layer;
gboolean config_dock_floating;
@@ -26,45 +28,182 @@ ObOrientation config_dock_orient;
gboolean config_dock_hide;
guint config_dock_hide_timeout;
-static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
+guint config_keyboard_reset_keycode;
+guint config_keyboard_reset_state;
+
+gint config_mouse_threshold;
+gint config_mouse_dclicktime;
+
+GSList *config_menu_files;
+
+gint config_resist_win;
+gint config_resist_edge;
+
+/*
+
+
+
+ 3
+
+
+
+*/
+
+static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ GList *keylist)
+{
+ char *key;
+ ObAction *action;
+ xmlNodePtr n, nact;
+ GList *it;
+
+ 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->children, keylist);
+
+ it = g_list_last(keylist);
+ g_free(it->data);
+ keylist = g_list_delete_link(keylist, it);
+ }
+ 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)))
+ keyboard_bind(keylist, action);
+ nact = parse_find_node("action", nact->next);
+ }
+ }
+}
+
+static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
+{
+ parse_key(i, doc, node->children, NULL);
+}
+
+/*
+
+
+
+
+
+
+
+*/
+
+static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
+{
+ xmlNodePtr n, nbut, nact;
+ char *buttonstr;
+ char *contextstr;
+ ObUserAction uact;
+ ObMouseAction mact;
+ ObAction *action;
+
+ 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);
+ while (n) {
+ if (!parse_attr_string("name", n, &contextstr))
+ goto next_n;
+ nbut = parse_find_node("mousebind", n->children);
+ while (nbut) {
+ if (!parse_attr_string("button", nbut, &buttonstr))
+ goto next_nbut;
+ if (parse_attr_contains("press", nbut, "action")) {
+ uact = OB_USER_ACTION_MOUSE_PRESS;
+ mact = OB_MOUSE_ACTION_PRESS;
+ } else if (parse_attr_contains("release", nbut, "action")) {
+ uact = OB_USER_ACTION_MOUSE_RELEASE;
+ mact = OB_MOUSE_ACTION_RELEASE;
+ } else if (parse_attr_contains("click", nbut, "action")) {
+ uact = OB_USER_ACTION_MOUSE_CLICK;
+ mact = OB_MOUSE_ACTION_CLICK;
+ } else if (parse_attr_contains("doubleclick", nbut,"action")) {
+ uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK;
+ mact = OB_MOUSE_ACTION_DOUBLE_CLICK;
+ } else if (parse_attr_contains("drag", nbut, "action")) {
+ uact = OB_USER_ACTION_MOUSE_MOTION;
+ mact = OB_MOUSE_ACTION_MOTION;
+ } else
+ goto next_nbut;
+ nact = parse_find_node("action", nbut->children);
+ while (nact) {
+ if ((action = action_parse(i, doc, nact, uact)))
+ 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);
+ }
+ 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;
+ 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("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);
+ if ((n = parse_find_node("focusDelay", node)))
+ config_focus_delay = parse_int(doc, n) * 1000;
}
-static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
xmlNodePtr n;
- node = node->xmlChildrenNode;
+ node = node->children;
+
+ if ((n = parse_find_node("name", node))) {
+ gchar *c;
- if ((n = parse_find_node("theme", node))) {
g_free(config_theme);
- config_theme = parse_string(doc, n);
+ c = parse_string(doc, n);
+ config_theme = parse_expand_tilde(c);
+ g_free(c);
}
- if ((n = parse_find_node("titlelayout", node))) {
+ 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)
+static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
xmlNodePtr n;
- node = node->xmlChildrenNode;
+ node = node->children;
if ((n = parse_find_node("number", node)))
config_desktops_num = parse_int(doc, n);
@@ -77,7 +216,7 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
g_slist_free(config_desktops_names);
config_desktops_names = NULL;
- nname = parse_find_node("name", n->xmlChildrenNode);
+ nname = parse_find_node("name", n->children);
while (nname) {
config_desktops_names = g_slist_append(config_desktops_names,
parse_string(doc, nname));
@@ -86,23 +225,22 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
}
}
-static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
xmlNodePtr n;
- node = node->xmlChildrenNode;
+ node = node->children;
- if ((n = parse_find_node("opaqueMove", node)))
- config_opaque_move = parse_bool(doc, n);
- if ((n = parse_find_node("opaqueResize", node)))
- config_opaque_resize = parse_bool(doc, n);
+ if ((n = parse_find_node("drawContents", node)))
+ config_redraw_resize = parse_bool(doc, n);
}
-static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
{
xmlNodePtr n;
- node = node->xmlChildrenNode;
+ node = node->children;
if ((n = parse_find_node("position", node))) {
if (parse_contains("TopLeft", doc, n))
@@ -155,34 +293,57 @@ static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
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);
+ config_dock_hide_timeout = parse_int(doc, n) * 1000;
+}
+
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+ for (node = node->children; 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,
+ parse_expand_tilde(c));
+ g_free(c);
+ }
+ }
+}
+
+static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
+{
+ 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);
}
-void config_startup()
+void config_startup(ObParseInst *i)
{
config_focus_new = TRUE;
config_focus_follow = FALSE;
- config_focus_last = TRUE;
- config_focus_last_on_desktop = TRUE;
- config_focus_popup = TRUE;
+ config_focus_delay = 0;
- parse_register("focus", parse_focus, NULL);
+ parse_register(i, "focus", parse_focus, NULL);
config_theme = NULL;
config_title_layout = g_strdup("NLIMC");
- parse_register("theme", parse_theme, NULL);
+ parse_register(i, "theme", parse_theme, NULL);
config_desktops_num = 4;
config_desktops_names = NULL;
- parse_register("desktops", parse_desktops, NULL);
+ parse_register(i, "desktops", parse_desktops, NULL);
- config_opaque_move = TRUE;
- config_opaque_resize = TRUE;
+ config_redraw_resize = TRUE;
- parse_register("moveresize", parse_moveresize, NULL);
+ parse_register(i, "resize", parse_resize, NULL);
config_dock_layer = OB_STACKING_LAYER_TOP;
config_dock_pos = OB_DIRECTION_NORTHEAST;
@@ -191,9 +352,28 @@ void config_startup()
config_dock_y = 0;
config_dock_orient = OB_ORIENTATION_VERT;
config_dock_hide = FALSE;
- config_dock_hide_timeout = 3000;
+ config_dock_hide_timeout = 300;
+
+ 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);
- parse_register("dock", parse_dock, NULL);
+ config_resist_win = 10;
+ config_resist_edge = 20;
+
+ parse_register(i, "resistance", parse_resistance, NULL);
+
+ config_menu_files = NULL;
+
+ parse_register(i, "menu", parse_menu, NULL);
}
void config_shutdown()
@@ -202,7 +382,13 @@ void config_shutdown()
g_free(config_theme);
- for (it = config_desktops_names; it; it = it->next)
+ g_free(config_title_layout);
+
+ 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);
}