X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=480308be603b3277486e1487aff185374176fb56;hb=6a9d502f2020a73202b919ee3e9d85999ededd0f;hp=99e35b5ada0d57e92ba2e7d1a3e3cb6fd71dcd50;hpb=23d4eb5f4f4f5dbcf2795df180de1fa36ba6c42a;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index 99e35b5a..480308be 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -77,7 +77,6 @@ guint config_keyboard_reset_state; gint config_mouse_threshold; gint config_mouse_dclicktime; -gboolean config_menu_warppointer; guint config_menu_hide_delay; gboolean config_menu_middle; guint config_submenu_show_delay; @@ -87,10 +86,57 @@ GSList *config_menu_files; gint config_resist_win; gint config_resist_edge; -gboolean config_resist_layers_below; 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->position.x = src->position.x; + dst->position.y = src->position.y; + dst->monitor = src->monitor; + } +} + /* @@ -123,7 +169,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; @@ -134,33 +180,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)) { @@ -200,7 +238,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); @@ -216,11 +253,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); @@ -233,28 +268,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); @@ -276,6 +305,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); } /* @@ -705,8 +738,6 @@ 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 @@ -751,7 +782,7 @@ static void bind_default_mouse() { "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", "Bottom", 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" }, @@ -765,7 +796,6 @@ static void bind_default_mouse() { "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" }, @@ -883,11 +913,9 @@ 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_hide_delay = 250; config_menu_middle = FALSE; config_submenu_show_delay = 0; @@ -924,9 +952,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);