X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=d72cce8d234689da98f818dda0ff5e03d57cf4ba;hb=4e8eff328cf9f99f833ce01997621d3817074ab1;hp=7cffcd57f898ed1a5fb9c2abce1a2a9bdc3d9cae;hpb=16f46c296d1fcd3f27fc62a18e71c55fb3fd3e88;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 7cffcd57..d72cce8d 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -26,7 +26,9 @@ gboolean config_focus_new; gboolean config_focus_follow; +gboolean config_focus_last; guint config_focus_delay; +guint config_focus_raise; char *config_theme; @@ -44,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; @@ -52,6 +56,9 @@ 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; @@ -109,6 +116,8 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) { + keyboard_unbind_all(); + parse_key(i, doc, node->children, NULL); } @@ -132,6 +141,8 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, ObMouseAction mact; ObAction *action; + mouse_unbind_all(); + node = node->children; if ((n = parse_find_node("dragThreshold", node))) @@ -191,8 +202,12 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_focus_new = parse_bool(doc, n); if ((n = parse_find_node("followMouse", 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("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, @@ -223,8 +238,11 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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; @@ -310,8 +328,32 @@ 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) * 1000; + 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) @@ -340,11 +382,116 @@ static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr 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_delay = 0; + config_focus_raise = FALSE; parse_register(i, "focus", parse_focus, NULL); @@ -370,18 +517,24 @@ void config_startup(ObParseInst *i) config_dock_y = 0; config_dock_orient = OB_ORIENTATION_VERT; config_dock_hide = FALSE; - config_dock_hide_timeout = 300; + 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; @@ -389,6 +542,11 @@ void config_startup(ObParseInst *i) 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);