X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=d72cce8d234689da98f818dda0ff5e03d57cf4ba;hb=adb9bb700f3235728dacc1d3e3daad81abd93e9a;hp=73754f0b87d9f502d25bb009c41600a1736a54d6;hpb=186824fc13aa0aaa114ed4aaa9e05ad8377b3507;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 73754f0b..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; @@ -195,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, @@ -227,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; @@ -314,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) @@ -356,21 +394,7 @@ static void bind_default_keyboard() ObDefKeyBind binds[] = { { "A-Tab", "NextWindow" }, { "S-A-Tab", "PreviousWindow" }, - { "C-A-Right", "DesktopRight" }, - { "C-A-Left", "DesktopLeft" }, - { "C-A-Up", "DesktopUp" }, - { "C-A-Down", "DesktopDown" }, - { "S-A-Right", "SendToDesktopRight" }, - { "S-A-Left", "SendToDesktopLeft" }, - { "S-A-Up", "SendToDesktopUp" }, - { "S-A-Down", "SendToDesktopDown" }, - { "A-F10", "MaximizeFull" }, - { "A-F5", "UnmaximizeFull" }, - { "A-F12", "ToggleShade" }, { "A-F4", "Close" }, - { "A-F7", "Move" }, - { "A-F8", "Resize" }, - { "A-F9", "Iconify" }, { NULL, NULL } }; @@ -385,7 +409,7 @@ typedef struct { const gchar *button; const gchar *context; - ObMouseAction mact; + const ObMouseAction mact; const gchar *actname; } ObDefMouseBind; @@ -393,14 +417,6 @@ static void bind_default_mouse() { ObDefMouseBind *it; ObDefMouseBind binds[] = { - { "Up", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopNext" }, - { "Down", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" }, - { "A-Up", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopNext" }, - { "A-Down", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" }, - { "A-Up", "Frame", OB_MOUSE_ACTION_PRESS, "DesktopNext" }, - { "A-Down", "Frame", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" }, - { "A-Up", "MoveResize", OB_MOUSE_ACTION_PRESS, "DesktopNext" }, - { "Down", "MoveResize", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" }, { "Left", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, { "Middle", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, { "Right", "Client", OB_MOUSE_ACTION_PRESS, "Focus" }, @@ -473,7 +489,9 @@ 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); @@ -499,7 +517,9 @@ 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); @@ -522,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);