X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=e2ca29f7da4b1d682a59846bb8c67f456f6fc34f;hb=973507ff28b5d71433b3d0583e757fbc82b254c5;hp=19b664032426135cddd4e6e54f73b65854c8966d;hpb=fdc52e879f11166186014ebb2bac7121edf08e79;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 19b66403..e2ca29f7 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -4,13 +4,13 @@ #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; -gboolean config_desktop_popup; +guint config_focus_delay; char *config_theme; @@ -36,6 +36,11 @@ 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; + /* @@ -46,7 +51,8 @@ gint config_mouse_dclicktime; */ -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; @@ -57,6 +63,7 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist) 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); @@ -64,7 +71,7 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist) 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); @@ -75,7 +82,7 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist) 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 != @@ -94,13 +101,12 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist) } } -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 int threshold; -static int dclicktime; /* @@ -111,7 +117,8 @@ static int dclicktime; */ -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; @@ -122,9 +129,9 @@ static void parse_mouse(xmlDocPtr doc, xmlNodePtr node, void *d) node = node->xmlChildrenNode; if ((n = parse_find_node("dragThreshold", node))) - threshold = parse_int(doc, n); + config_mouse_threshold = parse_int(doc, n); if ((n = parse_find_node("doubleClickTime", node))) - dclicktime = parse_int(doc, n); + config_mouse_dclicktime = parse_int(doc, n); n = parse_find_node("context", node); while (n) { @@ -135,22 +142,22 @@ static void parse_mouse(xmlDocPtr doc, xmlNodePtr node, void *d) 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 || @@ -184,7 +191,8 @@ static void parse_mouse(xmlDocPtr doc, xmlNodePtr node, void *d) } } -static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d) +static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + void *d) { xmlNodePtr n; @@ -198,27 +206,33 @@ static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d) 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); } -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))) { + if ((n = parse_find_node("name", node))) { + gchar *c; + g_free(config_theme); - config_theme = parse_string(doc, n); + c = parse_string(doc, n); + config_theme = ob_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; @@ -242,11 +256,10 @@ 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_resize(xmlDocPtr doc, xmlNodePtr node, void *d) +static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + void *d) { xmlNodePtr n; @@ -256,7 +269,7 @@ static void parse_resize(xmlDocPtr doc, xmlNodePtr node, void *d) 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; @@ -316,31 +329,56 @@ 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) +{ + 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, + ob_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; + config_focus_delay = 150000; - 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; @@ -351,17 +389,26 @@ void config_startup() 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 = 20; + + parse_register(i, "resistance", parse_resistance, NULL); + + config_menu_files = NULL; + + parse_register(i, "menu", parse_menu, NULL); } void config_shutdown() @@ -370,7 +417,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); }