X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=f9fae2bfef3265fe96217c787fc6c7081c19b2a4;hb=10805a47644f9b7eb01528287c3281232e9187d0;hp=73754f0b87d9f502d25bb009c41600a1736a54d6;hpb=186824fc13aa0aaa114ed4aaa9e05ad8377b3507;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 73754f0b..f9fae2bf 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -1,6 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- config.c for the Openbox window manager + Copyright (c) 2004 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -27,15 +28,23 @@ gboolean config_focus_new; gboolean config_focus_follow; guint config_focus_delay; +gboolean config_focus_raise; +gboolean config_focus_last; -char *config_theme; +ObPlacePolicy config_place_policy; + +gchar *config_theme; +gboolean config_theme_keepborder; gchar *config_title_layout; -int config_desktops_num; +gint config_desktops_num; GSList *config_desktops_names; +gint config_screen_firstdesk; -gboolean config_redraw_resize; +gboolean config_resize_redraw; +gint config_resize_popup_show; +gint config_resize_popup_pos; ObStackingLayer config_dock_layer; gboolean config_dock_floating; @@ -44,7 +53,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,11 +63,18 @@ guint config_keyboard_reset_state; gint config_mouse_threshold; gint config_mouse_dclicktime; +gboolean config_menu_warppointer; +gboolean config_menu_xorstyle; +guint config_menu_hide_delay; +gboolean config_menu_client_list_icons; + GSList *config_menu_files; gint config_resist_win; gint config_resist_edge; +gboolean config_resist_layers_below; + /* @@ -70,7 +88,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,7 +125,7 @@ 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(); @@ -125,11 +143,11 @@ 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; @@ -185,7 +203,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; @@ -197,10 +215,26 @@ 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); + if ((n = parse_find_node("focusLast", node))) + config_focus_last = 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; @@ -218,17 +252,27 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, g_free(config_title_layout); config_title_layout = parse_string(doc, n); } + if ((n = parse_find_node("keepBorder", node))) + config_theme_keepborder = parse_bool(doc, n); } 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))) { + gint d = parse_int(doc, n); + if (d > 0) + config_desktops_num = d; + } + if ((n = parse_find_node("firstdesk", node))) { + gint d = parse_int(doc, n); + if (d > 0) + config_screen_firstdesk = d; + } if ((n = parse_find_node("names", node))) { GSList *it; xmlNodePtr nname; @@ -248,17 +292,34 @@ 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; node = node->children; if ((n = parse_find_node("drawContents", node))) - config_redraw_resize = parse_bool(doc, n); + config_resize_redraw = parse_bool(doc, n); + if ((n = parse_find_node("popupShow", node))) { + config_resize_popup_show = parse_int(doc, n); + if (parse_contains("Always", doc, n)) + config_resize_popup_show = 2; + else if (parse_contains("Never", doc, n)) + config_resize_popup_show = 0; + else if (parse_contains("Nonpixel", doc, n)) + config_resize_popup_show = 1; + } + if ((n = parse_find_node("popupPosition", node))) { + config_resize_popup_pos = parse_int(doc, n); + if (parse_contains("Top", doc, n)) + config_resize_popup_pos = 1; + else if (parse_contains("Center", doc, n)) + config_resize_popup_pos = 0; + } } -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; @@ -300,11 +361,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,12 +375,25 @@ 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) { + xmlNodePtr n; for (node = node->children; node; node = node->next) { if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) { gchar *c; @@ -329,11 +403,19 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) parse_expand_tilde(c)); g_free(c); } + if ((n = parse_find_node("warpPointer", node))) + config_menu_warppointer = parse_bool(doc, n); + if ((n = parse_find_node("xorStyle", node))) + config_menu_xorstyle = parse_bool(doc, n); + if ((n = parse_find_node("hideDelay", node))) + config_menu_hide_delay = parse_int(doc, n); + if ((n = parse_find_node("desktopMenuIcons", node))) + config_menu_client_list_icons = parse_int(doc, n); } } static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n; @@ -342,6 +424,8 @@ static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_resist_win = parse_int(doc, n); if ((n = parse_find_node("screen_edge_strength", node))) config_resist_edge = parse_int(doc, n); + if ((n = parse_find_node("edges_hit_layers_below", node))) + config_resist_layers_below = parse_bool(doc, n); } typedef struct @@ -356,21 +440,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 +455,7 @@ typedef struct { const gchar *button; const gchar *context; - ObMouseAction mact; + const ObMouseAction mact; const gchar *actname; } ObDefMouseBind; @@ -393,14 +463,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,32 +536,44 @@ void config_startup(ObParseInst *i) config_focus_new = TRUE; config_focus_follow = FALSE; config_focus_delay = 0; + config_focus_raise = FALSE; + config_focus_last = 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"); + config_theme_keepborder = TRUE; parse_register(i, "theme", parse_theme, NULL); config_desktops_num = 4; + config_screen_firstdesk = 1; config_desktops_names = NULL; parse_register(i, "desktops", parse_desktops, NULL); - config_redraw_resize = TRUE; + config_resize_redraw = TRUE; + config_resize_popup_show = 1; /* nonpixel increments */ + config_resize_popup_pos = 0; /* center of client */ 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); @@ -519,9 +593,14 @@ void config_startup(ObParseInst *i) config_resist_win = 10; config_resist_edge = 20; + config_resist_layers_below = FALSE; parse_register(i, "resistance", parse_resistance, NULL); + config_menu_warppointer = TRUE; + config_menu_xorstyle = TRUE; + config_menu_hide_delay = 250; + config_menu_client_list_icons = TRUE; config_menu_files = NULL; parse_register(i, "menu", parse_menu, NULL);