X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fconfig.c;h=768cc600ba9af38e0967e1834556545b0420d8e9;hb=b27343a314efa7f42510beaee2c7260a54bbf7ac;hp=2c787e4b483dbd55684aeb4489692d2166c90b5e;hpb=8e63ffdabdc3be3ad355dcaddd47d8e71c510739;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 2c787e4b..768cc600 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,18 +28,23 @@ gboolean config_focus_new; gboolean config_focus_follow; guint config_focus_delay; -guint config_focus_raise; +gboolean config_focus_raise; +gboolean config_focus_last; ObPlacePolicy config_place_policy; -char *config_theme; +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; @@ -57,14 +63,17 @@ guint config_keyboard_reset_state; gint config_mouse_threshold; gint config_mouse_dclicktime; -gboolean config_dialog_focus; -gboolean config_dialog_desktop; +gboolean config_menu_warppointer; +gboolean config_menu_xorstyle; +guint config_menu_hide_delay; GSList *config_menu_files; gint config_resist_win; gint config_resist_edge; +gboolean config_resist_layers_below; + /* @@ -78,7 +87,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; @@ -115,7 +124,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(); @@ -133,11 +142,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; @@ -193,7 +202,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; @@ -207,10 +216,12 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr 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, - void *d) + gpointer d) { xmlNodePtr n; @@ -222,7 +233,7 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n; @@ -240,20 +251,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))) { - guint d = parse_int(doc, n); + 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; @@ -273,17 +291,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; @@ -325,11 +360,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)) @@ -354,8 +389,10 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) } } -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; @@ -365,11 +402,17 @@ 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); } } static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, - void *d) + gpointer d) { xmlNodePtr n; @@ -378,6 +421,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 @@ -489,6 +534,7 @@ void config_startup(ObParseInst *i) config_focus_follow = FALSE; config_focus_delay = 0; config_focus_raise = FALSE; + config_focus_last = FALSE; parse_register(i, "focus", parse_focus, NULL); @@ -499,19 +545,23 @@ void config_startup(ObParseInst *i) 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; @@ -540,9 +590,13 @@ 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_files = NULL; parse_register(i, "menu", parse_menu, NULL);