X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=d03ba0312b36d8c8bdf855904e19c2d8a7ededa7;hb=a098c2437e96d58c647559b46278bc92954e9bbe;hp=c3fa786cce71c09b1a9f03e21388305cb43550cb;hpb=d2857b11944146e2e6973b7f7280cb57e1ee260b;p=chaz%2Fopenbox
diff --git a/openbox/config.c b/openbox/config.c
index c3fa786c..d03ba031 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,32 +1,213 @@
#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;
+
+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;
+
+guint config_keyboard_reset_keycode;
+guint config_keyboard_reset_state;
+
+gint config_mouse_threshold;
+gint config_mouse_dclicktime;
+
+gchar *config_menu_path;
+
+gint config_resist_win;
+gint config_resist_edge;
+
+gchar *expand_tilde(const gchar *f)
+{
+ if (!f)
+ return NULL;
+ else if (f[0] != '~')
+ return g_strdup(f);
+ else
+ return g_strconcat(g_get_home_dir(), f+1, NULL);
+}
+
+/*
+
+
+
+ 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->xmlChildrenNode, 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(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);
+ }
+ }
+}
+
+static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
+{
+ parse_key(i, doc, node->xmlChildrenNode, NULL);
+}
+
+/*
+
+
+
+
+
+
-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;
+*/
-static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
+{
+ 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
+ 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 == 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);
+ }
+ 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)))
@@ -39,20 +220,30 @@ static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
config_focus_popup = parse_bool(doc, n);
}
-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;
+
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)
+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))) {
@@ -71,43 +262,56 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
nname = parse_find_node("name", nname->next);
}
}
+ if ((n = parse_find_node("cyclingDialog", node)))
+ config_desktop_popup = parse_bool(doc, n);
}
-static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
xmlNodePtr n;
- 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);
+ 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)
+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_pos = DockPos_TopLeft;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_NORTHWEST;
else if (parse_contains("Top", doc, n))
- config_dock_pos = DockPos_Top;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_NORTH;
else if (parse_contains("TopRight", doc, n))
- config_dock_pos = DockPos_TopRight;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_NORTHEAST;
else if (parse_contains("Right", doc, n))
- config_dock_pos = DockPos_Right;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_EAST;
else if (parse_contains("BottomRight", doc, n))
- config_dock_pos = DockPos_BottomRight;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_SOUTHEAST;
else if (parse_contains("Bottom", doc, n))
- config_dock_pos = DockPos_Bottom;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_SOUTH;
else if (parse_contains("BottomLeft", doc, n))
- config_dock_pos = DockPos_BottomLeft;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_SOUTHWEST;
else if (parse_contains("Left", doc, n))
- config_dock_pos = DockPos_Left;
+ config_dock_floating = FALSE,
+ config_dock_pos = OB_DIRECTION_WEST;
else if (parse_contains("Floating", doc, n))
- config_dock_pos = DockPos_Floating;
+ config_dock_floating = TRUE;
}
- if (config_dock_pos == DockPos_Floating) {
+ 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)))
@@ -115,17 +319,17 @@ static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
}
if ((n = parse_find_node("stacking", node))) {
if (parse_contains("top", doc, n))
- config_dock_layer = Layer_Top;
+ config_dock_layer = OB_STACKING_LAYER_TOP;
else if (parse_contains("normal", doc, n))
- config_dock_layer = Layer_Normal;
+ config_dock_layer = OB_STACKING_LAYER_NORMAL;
else if (parse_contains("bottom", doc, n))
- config_dock_layer = Layer_Below;
+ config_dock_layer = OB_STACKING_LAYER_BELOW;
}
if ((n = parse_find_node("direction", node))) {
if (parse_contains("horizontal", doc, n))
- config_dock_horz = TRUE;
+ config_dock_orient = OB_ORIENTATION_HORZ;
else if (parse_contains("vertical", doc, n))
- config_dock_horz = FALSE;
+ config_dock_orient = OB_ORIENTATION_VERT;
}
if ((n = parse_find_node("autoHide", node)))
config_dock_hide = parse_bool(doc, n);
@@ -133,7 +337,33 @@ static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
config_dock_hide_timeout = parse_int(doc, n);
}
-void config_startup()
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+{
+ xmlNodePtr n;
+
+ node = node->xmlChildrenNode;
+ if ((n = parse_find_node("location", node))) {
+ gchar *c;
+
+ c = parse_string(doc, n);
+ config_menu_path = expand_tilde(c);
+ g_free(c);
+ }
+}
+
+static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
+{
+ xmlNodePtr n;
+
+ 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;
@@ -141,31 +371,53 @@ void config_startup()
config_focus_last_on_desktop = TRUE;
config_focus_popup = TRUE;
- parse_register("focus", parse_focus, NULL);
+ parse_register(i, "focus", parse_focus, NULL);
config_theme = NULL;
- parse_register("theme", parse_theme, NULL);
+ 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_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 = 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_register("dock", parse_dock, NULL);
+ 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_path = NULL;
+
+ parse_register(i, "menu", parse_menu, NULL);
}
void config_shutdown()