X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=42a9433d513620855eb4b5019d9d7c8d3b8f70a6;hb=e68e6c6a536a2132570ddf1d1d3759bb31ef781e;hp=b7241f5905c4787dde988d734456a0afc773e6e6;hpb=555e3384ff652ece08b45c6a050688cd5a3231fe;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index b7241f59..42a9433d 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->children, keylist); it = g_list_last(keylist); g_free(it->data); @@ -75,28 +82,18 @@ 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))) { - /* 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); - } + 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(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->children, NULL); } /* @@ -109,15 +106,17 @@ static void parse_keyboard(xmlDocPtr doc, xmlNodePtr node, void *d) */ -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; char *contextstr; + ObUserAction uact; ObMouseAction mact; ObAction *action; - node = node->xmlChildrenNode; + node = node->children; if ((n = parse_find_node("dragThreshold", node))) config_mouse_threshold = parse_int(doc, n); @@ -128,48 +127,31 @@ static void parse_mouse(xmlDocPtr doc, xmlNodePtr node, void *d) while (n) { if (!parse_attr_string("name", n, &contextstr)) goto next_n; - nbut = parse_find_node("mousebind", n->xmlChildrenNode); + 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")) - 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 + 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->xmlChildrenNode); + nact = parse_find_node("action", nbut->children); 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); - } + if ((action = action_parse(i, doc, nact, uact))) + mouse_bind(buttonstr, contextstr, mact, action); nact = parse_find_node("action", nact->next); } g_free(buttonstr); @@ -182,11 +164,12 @@ 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; - node = node->xmlChildrenNode; + node = node->children; if ((n = parse_find_node("focusNew", node))) config_focus_new = parse_bool(doc, n); @@ -196,31 +179,37 @@ 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) * 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 = 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; - node = node->xmlChildrenNode; + node = node->children; if ((n = parse_find_node("number", node))) config_desktops_num = parse_int(doc, n); @@ -233,32 +222,31 @@ 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)); 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; - node = node->xmlChildrenNode; + node = node->children; 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)) @@ -311,34 +299,59 @@ 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; } -void config_startup() +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, + ob_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(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; - 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; @@ -347,19 +360,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("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() @@ -368,7 +390,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); }