X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fconfig.c;h=10a60fb4b35743380113f065483c5b4875b81f22;hb=17b927ab6dcaa00ab5a68647cab4a514235e5892;hp=c007de5368c0ea114cfc12a5a85b777676630112;hpb=928305d0b7ba46db3608cab8564c0cd0ec1a0724;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index c007de53..10a60fb4 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -33,6 +33,7 @@ gboolean config_focus_follow; guint config_focus_delay; gboolean config_focus_raise; gboolean config_focus_last; +gboolean config_focus_under_mouse; ObPlacePolicy config_place_policy; @@ -89,6 +90,56 @@ gint config_resist_edge; GSList *config_per_app_settings; +ObAppSettings* config_create_app_settings() +{ + ObAppSettings *settings = g_new0(ObAppSettings, 1); + settings->decor = -1; + settings->shade = -1; + settings->monitor = -1; + settings->focus = -1; + settings->desktop = 0; + settings->layer = -2; + settings->iconic = -1; + settings->skip_pager = -1; + settings->skip_taskbar = -1; + settings->fullscreen = -1; + settings->max_horz = -1; + settings->max_vert = -1; + return settings; +} + +#define copy_if(setting, default) \ + if (src->setting != default) dst->setting = src->setting +void config_app_settings_copy_non_defaults(const ObAppSettings *src, + ObAppSettings *dst) +{ + g_assert(src != NULL); + g_assert(dst != NULL); + + copy_if(decor, -1); + copy_if(shade, -1); + copy_if(focus, -1); + copy_if(desktop, 0); + copy_if(layer, -2); + copy_if(iconic, -1); + copy_if(skip_pager, -1); + copy_if(skip_taskbar, -1); + copy_if(fullscreen, -1); + copy_if(max_horz, -1); + copy_if(max_vert, -1); + + if (src->pos_given) { + dst->pos_given = TRUE; + dst->center_x = src->center_x; + dst->center_y = src->center_y; + dst->opposite_x = src->opposite_x; + dst->opposite_y = src->opposite_y; + dst->position.x = src->position.x; + dst->position.y = src->position.y; + dst->monitor = src->monitor; + } +} + /* @@ -121,7 +172,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gpointer d) { xmlNodePtr app = parse_find_node("application", node->children); - gchar *name, *class; + gchar *name = NULL, *class = NULL, *role = NULL; gboolean name_set, class_set; gboolean x_pos_given; @@ -132,33 +183,25 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, name_set = parse_attr_string("name", app, &name); if (class_set || name_set) { xmlNodePtr n, c; - ObAppSettings *settings = g_new0(ObAppSettings, 1); + ObAppSettings *settings = config_create_app_settings();; if (name_set) - settings->name = name; - else - settings->name = NULL; + settings->name = g_pattern_spec_new(name); if (class_set) - settings->class = class; - else - settings->class = NULL; + settings->class = g_pattern_spec_new(class); - if (!parse_attr_string("role", app, &settings->role)) - settings->role = NULL; + if (parse_attr_string("role", app, &role)) + settings->role = g_pattern_spec_new(role); - settings->decor = -1; if ((n = parse_find_node("decor", app->children))) if (!parse_contains("default", doc, n)) settings->decor = parse_bool(doc, n); - settings->shade = -1; if ((n = parse_find_node("shade", app->children))) if (!parse_contains("default", doc, n)) settings->shade = parse_bool(doc, n); - settings->position.x = settings->position.y = 0; - settings->pos_given = FALSE; if ((n = parse_find_node("position", app->children))) { if ((c = parse_find_node("x", n->children))) if (!parse_contains("default", doc, c)) { @@ -167,7 +210,12 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, settings->center_x = TRUE; x_pos_given = TRUE; } else { - settings->position.x = parse_int(doc, c); + if (s[0] == '-') + settings->opposite_x = TRUE; + if (s[0] == '-' || s[0] == '+') + settings->position.x = atoi(s+1); + else + settings->position.x = atoi(s); x_pos_given = TRUE; } g_free(s); @@ -180,7 +228,12 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, settings->center_y = TRUE; settings->pos_given = TRUE; } else { - settings->position.y = parse_int(doc, c); + if (s[0] == '-') + settings->opposite_y = TRUE; + if (s[0] == '-' || s[0] == '+') + settings->position.y = atoi(s+1); + else + settings->position.y = atoi(s); settings->pos_given = TRUE; } g_free(s); @@ -198,7 +251,6 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, } } - settings->focus = -1; if ((n = parse_find_node("focus", app->children))) if (!parse_contains("default", doc, n)) settings->focus = parse_bool(doc, n); @@ -214,11 +266,9 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, settings->desktop = i; } g_free(s); - } else - settings->desktop = 0; + } } - settings->layer = -2; if ((n = parse_find_node("layer", app->children))) if (!parse_contains("default", doc, n)) { gchar *s = parse_string(doc, n); @@ -231,28 +281,22 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, g_free(s); } - settings->iconic = -1; if ((n = parse_find_node("iconic", app->children))) if (!parse_contains("default", doc, n)) settings->iconic = parse_bool(doc, n); - settings->skip_pager = -1; if ((n = parse_find_node("skip_pager", app->children))) if (!parse_contains("default", doc, n)) settings->skip_pager = parse_bool(doc, n); - settings->skip_taskbar = -1; if ((n = parse_find_node("skip_taskbar", app->children))) if (!parse_contains("default", doc, n)) settings->skip_taskbar = parse_bool(doc, n); - settings->fullscreen = -1; if ((n = parse_find_node("fullscreen", app->children))) if (!parse_contains("default", doc, n)) settings->fullscreen = parse_bool(doc, n); - settings->max_horz = -1; - settings->max_vert = -1; if ((n = parse_find_node("maximized", app->children))) if (!parse_contains("default", doc, n)) { gchar *s = parse_string(doc, n); @@ -274,6 +318,10 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc, app = parse_find_node("application", app->next); } + + g_free(name); + g_free(class); + g_free(role); } /* @@ -433,6 +481,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_focus_raise = parse_bool(doc, n); if ((n = parse_find_node("focusLast", node))) config_focus_last = parse_bool(doc, n); + if ((n = parse_find_node("underMouse", node))) + config_focus_under_mouse = parse_bool(doc, n); } static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -813,7 +863,8 @@ void config_startup(ObParseInst *i) config_focus_follow = FALSE; config_focus_delay = 0; config_focus_raise = FALSE; - config_focus_last = FALSE; + config_focus_last = TRUE; + config_focus_under_mouse = FALSE; parse_register(i, "focus", parse_focus, NULL); @@ -869,7 +920,7 @@ void config_startup(ObParseInst *i) parse_register(i, "keyboard", parse_keyboard, NULL); - config_mouse_threshold = 3; + config_mouse_threshold = 8; config_mouse_dclicktime = 200; bind_default_mouse(); @@ -917,9 +968,9 @@ void config_shutdown() for (it = config_per_app_settings; it; it = g_slist_next(it)) { ObAppSettings *itd = (ObAppSettings *)it->data; - g_free(itd->name); - g_free(itd->role); - g_free(itd->class); + if (itd->name) g_pattern_spec_free(itd->name); + if (itd->role) g_pattern_spec_free(itd->role); + if (itd->class) g_pattern_spec_free(itd->class); g_free(it->data); } g_slist_free(config_per_app_settings);