X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=62ca822fae85bf38367a8e3f2975159355c31a78;hb=def76092b587e7e9a2b212dc5211773e336525e1;hp=0e199546c4316fd4a54f0dc8fb67bbdc9b6bf43a;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 0e199546..62ca822f 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -1,4 +1,4 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*- +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- config.c for the Openbox window manager Copyright (c) 2003 Ben Jansens @@ -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; @@ -107,8 +112,10 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { + keyboard_unbind_all(); + parse_key(i, doc, node->children, NULL); } @@ -123,15 +130,17 @@ static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, */ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n, nbut, nact; - char *buttonstr; - char *contextstr; + gchar *buttonstr; + gchar *contextstr; ObUserAction uact; ObMouseAction mact; ObAction *action; + mouse_unbind_all(); + node = node->children; if ((n = parse_find_node("dragThreshold", node))) @@ -181,7 +190,7 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n; @@ -193,10 +202,24 @@ 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, + gpointer 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, - void *d) + gpointer d) { xmlNodePtr n; @@ -217,14 +240,17 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n; 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; @@ -244,7 +270,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n; @@ -254,7 +280,8 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_redraw_resize = parse_bool(doc, n); } -static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) +static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + gpointer d) { xmlNodePtr n; @@ -296,11 +323,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)) @@ -310,11 +337,23 @@ 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) +static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + gpointer d) { for (node = node->children; node; node = node->next) { if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) { @@ -329,7 +368,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) } static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n; @@ -340,14 +379,122 @@ 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_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"); @@ -363,25 +510,31 @@ 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); 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;