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;
gint config_mouse_threshold;
gint config_mouse_dclicktime;
+GSList *config_menu_files;
+
+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);
+}
+
/*
<keybind key="C-x">
*/
-static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist)
+static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ GList *keylist)
{
char *key;
ObAction *action;
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);
if (parse_attr_string("key", n, &key)) {
keylist = g_list_append(keylist, key);
- parse_key(doc, n->xmlChildrenNode, keylist);
+ parse_key(i, doc, n->xmlChildrenNode, keylist);
it = g_list_last(keylist);
g_free(it->data);
if (keylist) {
nact = parse_find_node("action", node);
while (nact) {
- if ((action = action_parse(doc, 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 !=
}
}
-static void parse_keyboard(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
- parse_key(doc, node->xmlChildrenNode, NULL);
+ parse_key(i, doc, node->xmlChildrenNode, NULL);
}
/*
*/
-static void parse_mouse(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
xmlNodePtr n, nbut, nact;
char *buttonstr;
if (!parse_attr_string("button", nbut, &buttonstr))
goto next_nbut;
if (parse_attr_contains("press", nbut, "action"))
- mact = MouseAction_Press;
+ mact = OB_MOUSE_ACTION_PRESS;
else if (parse_attr_contains("release", nbut, "action"))
- mact = MouseAction_Release;
+ mact = OB_MOUSE_ACTION_RELEASE;
else if (parse_attr_contains("click", nbut, "action"))
- mact = MouseAction_Click;
+ mact = OB_MOUSE_ACTION_CLICK;
else if (parse_attr_contains("doubleclick", nbut,"action"))
- mact = MouseAction_DClick;
+ mact = OB_MOUSE_ACTION_DOUBLE_CLICK;
else if (parse_attr_contains("drag", nbut, "action"))
- mact = MouseAction_Motion;
+ mact = OB_MOUSE_ACTION_MOTION;
else
goto next_nbut;
nact = parse_find_node("action", nbut->xmlChildrenNode);
while (nact) {
- if ((action = action_parse(doc, nact))) {
+ if ((action = action_parse(i, doc, nact))) {
/* validate that its okay for a mouse binding*/
- if (mact == MouseAction_Motion) {
+ if (mact == OB_MOUSE_ACTION_MOTION) {
if (action->func != action_moveresize ||
action->data.moveresize.corner ==
prop_atoms.net_wm_moveresize_move_keyboard ||
}
}
-static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
xmlNodePtr n;
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)
+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);
- config_theme = parse_string(doc, n);
+ c = parse_string(doc, n);
+ config_theme = 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;
nname = parse_find_node("name", nname->next);
}
}
- if ((n = parse_find_node("cyclingDialog", node)))
- config_desktop_popup = parse_bool(doc, n);
}
-static void parse_resize(xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ void *d)
{
xmlNodePtr n;
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;
config_dock_hide_timeout = parse_int(doc, n);
}
-void config_startup()
+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);
+ }
+ }
+}
+
+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;
config_focus_last = TRUE;
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;
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;
- config_desktop_popup = TRUE;
- parse_register("desktops", parse_desktops, NULL);
+ parse_register(i, "desktops", parse_desktops, NULL);
config_redraw_resize = TRUE;
- parse_register("resize", parse_resize, NULL);
+ parse_register(i, "resize", parse_resize, NULL);
config_dock_layer = OB_STACKING_LAYER_TOP;
config_dock_pos = OB_DIRECTION_NORTHEAST;
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("keyboard", parse_keyboard, NULL);
+ parse_register(i, "keyboard", parse_keyboard, NULL);
config_mouse_threshold = 3;
config_mouse_dclicktime = 200;
- parse_register("mouse", parse_mouse, NULL);
+ 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()
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);
}
projects / chaz / openbox / blobdiff