X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=9279266e9216dfc8f715e1bec7ae941b5dfa243f;hb=2aa5cd3574b2bbdc103cb7626aa1ff77ea2c0046;hp=73754f0b87d9f502d25bb009c41600a1736a54d6;hpb=186824fc13aa0aaa114ed4aaa9e05ad8377b3507;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 73754f0b..9279266e 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -27,12 +27,15 @@ gboolean config_focus_new; gboolean config_focus_follow; guint config_focus_delay; +guint config_focus_raise; -char *config_theme; +ObPlacePolicy config_place_policy; + +gchar *config_theme; gchar *config_title_layout; -int config_desktops_num; +gint config_desktops_num; GSList *config_desktops_names; gboolean config_redraw_resize; @@ -44,7 +47,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; @@ -70,7 +75,7 @@ gint config_resist_edge; static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, GList *keylist) { - char *key; + gchar *key; ObAction *action; xmlNodePtr n, nact; GList *it; @@ -128,8 +133,8 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) { xmlNodePtr n, nbut, nact; - char *buttonstr; - char *contextstr; + gchar *buttonstr; + gchar *contextstr; ObUserAction uact; ObMouseAction mact; ObAction *action; @@ -197,6 +202,20 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_focus_follow = 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_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + void *d) +{ + xmlNodePtr n; + + node = node->children; + + if ((n = parse_find_node("policy", node))) + if (parse_contains("UnderMouse", doc, n)) + config_place_policy = OB_PLACE_POLICY_MOUSE; } static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -227,8 +246,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; @@ -300,11 +322,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) } if ((n = parse_find_node("stacking", node))) { if (parse_contains("top", doc, n)) - config_dock_layer = OB_STACKING_LAYER_TOP; + config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE; else if (parse_contains("normal", doc, n)) - config_dock_layer = OB_STACKING_LAYER_NORMAL; + config_dock_layer = OB_STACKING_LAYER_DOCK_NORMAL; else if (parse_contains("bottom", doc, n)) - config_dock_layer = OB_STACKING_LAYER_BELOW; + config_dock_layer = OB_STACKING_LAYER_DOCK_BELOW; } if ((n = parse_find_node("direction", node))) { if (parse_contains("horizontal", doc, n)) @@ -314,8 +336,19 @@ 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_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) @@ -356,21 +389,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 +404,7 @@ typedef struct { const gchar *button; const gchar *context; - ObMouseAction mact; + const ObMouseAction mact; const gchar *actname; } ObDefMouseBind; @@ -393,14 +412,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" }, @@ -474,9 +485,14 @@ void config_startup(ObParseInst *i) config_focus_new = TRUE; config_focus_follow = FALSE; config_focus_delay = 0; + config_focus_raise = FALSE; parse_register(i, "focus", parse_focus, NULL); + config_place_policy = OB_PLACE_POLICY_SMART; + + parse_register(i, "placement", parse_placement, NULL); + config_theme = NULL; config_title_layout = g_strdup("NLIMC"); @@ -492,14 +508,16 @@ void config_startup(ObParseInst *i) parse_register(i, "resize", parse_resize, NULL); - config_dock_layer = OB_STACKING_LAYER_TOP; + config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE; config_dock_pos = OB_DIRECTION_NORTHEAST; config_dock_floating = FALSE; config_dock_x = 0; 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);