X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=d72cce8d234689da98f818dda0ff5e03d57cf4ba;hb=4e8eff328cf9f99f833ce01997621d3817074ab1;hp=54ae4c33dbdf060b03931a28ce718fa7ce995c94;hpb=fb035e4b0f91fa68a833f681f1f7bd7c71325bdb;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 54ae4c33..d72cce8d 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -1,16 +1,34 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + config.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #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; -gboolean config_desktop_popup; +guint config_focus_delay; +guint config_focus_raise; char *config_theme; @@ -28,7 +46,9 @@ gint config_dock_x; gint config_dock_y; ObOrientation config_dock_orient; gboolean config_dock_hide; -guint config_dock_hide_timeout; +guint config_dock_hide_delay; +guint config_dock_app_move_button; +guint config_dock_app_move_modifiers; guint config_keyboard_reset_keycode; guint config_keyboard_reset_state; @@ -36,21 +56,14 @@ guint config_keyboard_reset_state; gint config_mouse_threshold; gint config_mouse_dclicktime; +gboolean config_dialog_focus; +gboolean config_dialog_desktop; + 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); -} - /* @@ -81,7 +94,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if (parse_attr_string("key", n, &key)) { keylist = g_list_append(keylist, key); - parse_key(i, doc, n->xmlChildrenNode, keylist); + parse_key(i, doc, n->children, keylist); it = g_list_last(keylist); g_free(it->data); @@ -92,20 +105,9 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if (keylist) { nact = parse_find_node("action", node); while (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 != - 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); } } @@ -114,7 +116,9 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) { - parse_key(i, doc, node->xmlChildrenNode, NULL); + keyboard_unbind_all(); + + parse_key(i, doc, node->children, NULL); } /* @@ -133,10 +137,13 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, xmlNodePtr n, nbut, nact; char *buttonstr; char *contextstr; + ObUserAction uact; ObMouseAction mact; ObAction *action; - node = node->xmlChildrenNode; + mouse_unbind_all(); + + node = node->children; if ((n = parse_find_node("dragThreshold", node))) config_mouse_threshold = parse_int(doc, n); @@ -147,48 +154,31 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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")) + 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")) + } 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")) + } 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")) + } 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")) + } else if (parse_attr_contains("drag", nbut, "action")) { + uact = OB_USER_ACTION_MOUSE_MOTION; mact = OB_MOUSE_ACTION_MOTION; - else + } else goto next_nbut; - nact = parse_find_node("action", nbut->xmlChildrenNode); + nact = parse_find_node("action", nbut->children); while (nact) { - if ((action = action_parse(i, 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); - } + if ((action = action_parse(i, doc, nact, uact))) + mouse_bind(buttonstr, contextstr, mact, action); nact = parse_find_node("action", nact->next); } g_free(buttonstr); @@ -206,7 +196,7 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, { xmlNodePtr n; - node = node->xmlChildrenNode; + node = node->children; if ((n = parse_find_node("focusNew", node))) config_focus_new = parse_bool(doc, n); @@ -214,10 +204,10 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr 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; + if ((n = parse_find_node("raiseOnFocus", node))) + config_focus_raise = parse_bool(doc, n); } static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -225,14 +215,14 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, { xmlNodePtr n; - node = node->xmlChildrenNode; + node = node->children; - if ((n = parse_find_node("theme", node))) { + if ((n = parse_find_node("name", node))) { gchar *c; g_free(config_theme); c = parse_string(doc, n); - config_theme = expand_tilde(c); + config_theme = parse_expand_tilde(c); g_free(c); } if ((n = parse_find_node("titleLayout", node))) { @@ -246,10 +236,13 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, { xmlNodePtr n; - node = node->xmlChildrenNode; + node = node->children; - if ((n = parse_find_node("number", node))) - config_desktops_num = parse_int(doc, n); + if ((n = parse_find_node("number", node))) { + guint d = parse_int(doc, n); + if (d > 0) + config_desktops_num = d; + } if ((n = parse_find_node("names", node))) { GSList *it; xmlNodePtr nname; @@ -259,15 +252,13 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -275,7 +266,7 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, { xmlNodePtr n; - node = node->xmlChildrenNode; + node = node->children; if ((n = parse_find_node("drawContents", node))) config_redraw_resize = parse_bool(doc, n); @@ -285,7 +276,7 @@ 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)) @@ -337,19 +328,43 @@ static void parse_dock(ObParseInst *i, 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); + if ((n = parse_find_node("hideDelay", node))) + config_dock_hide_delay = parse_int(doc, n) * 1000; + if ((n = parse_find_node("moveButton", node))) { + gchar *str = parse_string(doc, n); + guint b, s; + if (translate_button(str, &s, &b)) { + config_dock_app_move_button = b; + config_dock_app_move_modifiers = s; + } else { + g_warning("invalid button '%s'", str); + } + g_free(str); + } +} + +static void parse_dialog(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + void *d) +{ + xmlNodePtr n; + + node = node->children; + + if ((n = parse_find_node("focus", node))) + config_dialog_focus = parse_bool(doc, n); + if ((n = parse_find_node("desktop", node))) + config_dialog_desktop = parse_bool(doc, n); } static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) { - for (node = node->xmlChildrenNode; node; node = node->next) { + 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, - expand_tilde(c)); + parse_expand_tilde(c)); g_free(c); } } @@ -360,20 +375,123 @@ static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, { xmlNodePtr n; - node = node->xmlChildrenNode; + 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); } +typedef struct +{ + const gchar *key; + const gchar *actname; +} ObDefKeyBind; + +static void bind_default_keyboard() +{ + ObDefKeyBind *it; + ObDefKeyBind binds[] = { + { "A-Tab", "NextWindow" }, + { "S-A-Tab", "PreviousWindow" }, + { "A-F4", "Close" }, + { NULL, NULL } + }; + + for (it = binds; it->key; ++it) { + GList *l = g_list_append(NULL, g_strdup(it->key)); + keyboard_bind(l, action_from_string(it->actname, + OB_USER_ACTION_KEYBOARD_KEY)); + } +} + +typedef struct +{ + const gchar *button; + const gchar *context; + const ObMouseAction mact; + const gchar *actname; +} ObDefMouseBind; + +static void bind_default_mouse() +{ + ObDefMouseBind *it; + ObDefMouseBind binds[] = { + { "Left", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Middle", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Right", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Middle", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Right", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Titlebar", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Handle", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "BLCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "BRCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "TLCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "TRCorner", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Close", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Maximize", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Iconify", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Icon", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "AllDesktops", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Shade", OB_MOUSE_ACTION_PRESS, "Focus" }, + { "Left", "Client", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "Titlebar", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Middle", "Titlebar", OB_MOUSE_ACTION_CLICK, "Lower" }, + { "Left", "Handle", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "BLCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "BRCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "TLCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "TRCorner", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "Close", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "Icon", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" }, + { "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" }, + { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "ToggleMaximizeFull" }, + { "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" }, + { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "ToggleOmnipresent" }, + { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "ToggleShade" }, + { "Left", "TLCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, + { "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, + { "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, + { "Left", "BRCorner", OB_MOUSE_ACTION_MOTION, "Resize" }, + { "Left", "Titlebar", OB_MOUSE_ACTION_MOTION, "Move" }, + { "A-Left", "Frame", OB_MOUSE_ACTION_MOTION, "Move" }, + { "A-Middle", "Frame", OB_MOUSE_ACTION_MOTION, "Resize" }, + { NULL, NULL, 0, NULL } + }; + + for (it = binds; it->button; ++it) { + ObUserAction uact; + switch (it->mact) { + case OB_MOUSE_ACTION_PRESS: + uact = OB_USER_ACTION_MOUSE_PRESS; break; + case OB_MOUSE_ACTION_RELEASE: + uact = OB_USER_ACTION_MOUSE_RELEASE; break; + case OB_MOUSE_ACTION_CLICK: + uact = OB_USER_ACTION_MOUSE_CLICK; break; + case OB_MOUSE_ACTION_DOUBLE_CLICK: + uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK; break; + case OB_MOUSE_ACTION_MOTION: + uact = OB_USER_ACTION_MOUSE_MOTION; break; + case OB_NUM_MOUSE_ACTIONS: + g_assert_not_reached(); + } + mouse_bind(it->button, it->context, it->mact, + action_from_string(it->actname, uact)); + } +} + 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; + config_focus_raise = FALSE; parse_register(i, "focus", parse_focus, NULL); @@ -385,7 +503,6 @@ void config_startup(ObParseInst *i) config_desktops_num = 4; config_desktops_names = NULL; - config_desktop_popup = TRUE; parse_register(i, "desktops", parse_desktops, NULL); @@ -400,25 +517,36 @@ void config_startup(ObParseInst *i) config_dock_y = 0; config_dock_orient = OB_ORIENTATION_VERT; config_dock_hide = FALSE; - config_dock_hide_timeout = 3000; + config_dock_hide_delay = 300; + config_dock_app_move_button = 2; /* middle */ + config_dock_app_move_modifiers = 0; parse_register(i, "dock", parse_dock, NULL); translate_key("C-g", &config_keyboard_reset_state, &config_keyboard_reset_keycode); + bind_default_keyboard(); + parse_register(i, "keyboard", parse_keyboard, NULL); config_mouse_threshold = 3; config_mouse_dclicktime = 200; + bind_default_mouse(); + parse_register(i, "mouse", parse_mouse, NULL); config_resist_win = 10; - config_resist_edge = 10; + config_resist_edge = 20; parse_register(i, "resistance", parse_resistance, NULL); + config_dialog_focus = TRUE; + config_dialog_desktop = TRUE; + + parse_register(i, "dialog", parse_dialog, NULL); + config_menu_files = NULL; parse_register(i, "menu", parse_menu, NULL); @@ -430,6 +558,8 @@ void config_shutdown() g_free(config_theme); + 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);