diff --git a/include/data.h b/include/data.h index 122833c3..1db7c442 100644 --- a/include/data.h +++ b/include/data.h @@ -148,7 +148,7 @@ struct Ignore_Event { * */ struct regex { - const char *pattern; + char *pattern; pcre *regex; pcre_extra *extra; }; diff --git a/include/match.h b/include/match.h index 2786c66a..6c0694ef 100644 --- a/include/match.h +++ b/include/match.h @@ -28,4 +28,10 @@ void match_copy(Match *dest, Match *src); */ bool match_matches_window(Match *match, i3Window *window); +/** + * Frees the given match. It must not be used afterwards! + * + */ +void match_free(Match *match); + #endif diff --git a/include/regex.h b/include/regex.h index 2a6608a8..adfa6656 100644 --- a/include/regex.h +++ b/include/regex.h @@ -17,6 +17,12 @@ */ struct regex *regex_new(const char *pattern); +/** + * Frees the given regular expression. It must not be used afterwards! + * + */ +void regex_free(struct regex *regex); + /** * Checks if the given regular expression matches the given input and returns * true if it does. In either case, it logs the outcome using LOG(), so it will diff --git a/src/config.c b/src/config.c index b3a20442..c979d8cd 100644 --- a/src/config.c +++ b/src/config.c @@ -257,112 +257,116 @@ static void parse_configuration(const char *override_configpath) { * */ void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) { - if (reload) { - /* First ungrab the keys */ - ungrab_all_keys(conn); + if (reload) { + /* First ungrab the keys */ + ungrab_all_keys(conn); - struct Mode *mode; - Binding *bind; - while (!SLIST_EMPTY(&modes)) { - mode = SLIST_FIRST(&modes); - FREE(mode->name); + struct Mode *mode; + Binding *bind; + while (!SLIST_EMPTY(&modes)) { + mode = SLIST_FIRST(&modes); + FREE(mode->name); - /* Clear the old binding list */ - bindings = mode->bindings; - while (!TAILQ_EMPTY(bindings)) { - bind = TAILQ_FIRST(bindings); - TAILQ_REMOVE(bindings, bind, bindings); - FREE(bind->translated_to); - FREE(bind->command); - FREE(bind); - } - FREE(bindings); - SLIST_REMOVE(&modes, mode, Mode, modes); - } - -#if 0 - struct Assignment *assign; - while (!TAILQ_EMPTY(&assignments)) { - assign = TAILQ_FIRST(&assignments); - FREE(assign->windowclass_title); - TAILQ_REMOVE(&assignments, assign, assignments); - FREE(assign); - } -#endif - - /* Clear workspace names */ -#if 0 - Workspace *ws; - TAILQ_FOREACH(ws, workspaces, workspaces) - workspace_set_name(ws, NULL); -#endif + /* Clear the old binding list */ + bindings = mode->bindings; + while (!TAILQ_EMPTY(bindings)) { + bind = TAILQ_FIRST(bindings); + TAILQ_REMOVE(bindings, bind, bindings); + FREE(bind->translated_to); + FREE(bind->command); + FREE(bind); + } + FREE(bindings); + SLIST_REMOVE(&modes, mode, Mode, modes); } - SLIST_INIT(&modes); + struct Assignment *assign; + while (!TAILQ_EMPTY(&assignments)) { + assign = TAILQ_FIRST(&assignments); + if (assign->type == A_TO_WORKSPACE) + FREE(assign->dest.workspace); + else if (assign->type == A_TO_OUTPUT) + FREE(assign->dest.output); + else if (assign->type == A_COMMAND) + FREE(assign->dest.command); + match_free(&(assign->match)); + TAILQ_REMOVE(&assignments, assign, assignments); + FREE(assign); + } - struct Mode *default_mode = scalloc(sizeof(struct Mode)); - default_mode->name = sstrdup("default"); - default_mode->bindings = scalloc(sizeof(struct bindings_head)); - TAILQ_INIT(default_mode->bindings); - SLIST_INSERT_HEAD(&modes, default_mode, modes); + /* Clear workspace names */ +#if 0 + Workspace *ws; + TAILQ_FOREACH(ws, workspaces, workspaces) + workspace_set_name(ws, NULL); +#endif + } - bindings = default_mode->bindings; + SLIST_INIT(&modes); + + struct Mode *default_mode = scalloc(sizeof(struct Mode)); + default_mode->name = sstrdup("default"); + default_mode->bindings = scalloc(sizeof(struct bindings_head)); + TAILQ_INIT(default_mode->bindings); + SLIST_INSERT_HEAD(&modes, default_mode, modes); + + bindings = default_mode->bindings; #define REQUIRED_OPTION(name) \ - if (config.name == NULL) \ - die("You did not specify required configuration option " #name "\n"); + if (config.name == NULL) \ + die("You did not specify required configuration option " #name "\n"); - /* Clear the old config or initialize the data structure */ - memset(&config, 0, sizeof(config)); + /* Clear the old config or initialize the data structure */ + memset(&config, 0, sizeof(config)); - /* Initialize default colors */ + /* Initialize default colors */ #define INIT_COLOR(x, cborder, cbackground, ctext) \ - do { \ - x.border = get_colorpixel(cborder); \ - x.background = get_colorpixel(cbackground); \ - x.text = get_colorpixel(ctext); \ - } while (0) + do { \ + x.border = get_colorpixel(cborder); \ + x.background = get_colorpixel(cbackground); \ + x.text = get_colorpixel(ctext); \ + } while (0) - config.client.background = get_colorpixel("#000000"); - INIT_COLOR(config.client.focused, "#4c7899", "#285577", "#ffffff"); - INIT_COLOR(config.client.focused_inactive, "#333333", "#5f676a", "#ffffff"); - INIT_COLOR(config.client.unfocused, "#333333", "#222222", "#888888"); - INIT_COLOR(config.client.urgent, "#2f343a", "#900000", "#ffffff"); - INIT_COLOR(config.bar.focused, "#4c7899", "#285577", "#ffffff"); - INIT_COLOR(config.bar.unfocused, "#333333", "#222222", "#888888"); - INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff"); + config.client.background = get_colorpixel("#000000"); + INIT_COLOR(config.client.focused, "#4c7899", "#285577", "#ffffff"); + INIT_COLOR(config.client.focused_inactive, "#333333", "#5f676a", "#ffffff"); + INIT_COLOR(config.client.unfocused, "#333333", "#222222", "#888888"); + INIT_COLOR(config.client.urgent, "#2f343a", "#900000", "#ffffff"); + INIT_COLOR(config.bar.focused, "#4c7899", "#285577", "#ffffff"); + INIT_COLOR(config.bar.unfocused, "#333333", "#222222", "#888888"); + INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff"); - config.default_border = BS_NORMAL; - config.default_floating_border = BS_NORMAL; - /* Set default_orientation to NO_ORIENTATION for auto orientation. */ - config.default_orientation = NO_ORIENTATION; + config.default_border = BS_NORMAL; + config.default_floating_border = BS_NORMAL; + /* Set default_orientation to NO_ORIENTATION for auto orientation. */ + config.default_orientation = NO_ORIENTATION; - parse_configuration(override_configpath); + parse_configuration(override_configpath); - if (reload) { - translate_keysyms(); - grab_all_keys(conn, false); - } + if (reload) { + translate_keysyms(); + grab_all_keys(conn, false); + } - if (config.font.id == 0) { - ELOG("You did not specify required configuration option \"font\"\n"); - config.font = load_font("fixed", true); - } + if (config.font.id == 0) { + ELOG("You did not specify required configuration option \"font\"\n"); + config.font = load_font("fixed", true); + } #if 0 - /* Set an empty name for every workspace which got no name */ - Workspace *ws; - TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->name != NULL) { - /* If the font was not specified when the workspace name - * was loaded, we need to predict the text width now */ - if (ws->text_width == 0) - ws->text_width = predict_text_width(global_conn, - config.font, ws->name, ws->name_len); - continue; - } + /* Set an empty name for every workspace which got no name */ + Workspace *ws; + TAILQ_FOREACH(ws, workspaces, workspaces) { + if (ws->name != NULL) { + /* If the font was not specified when the workspace name + * was loaded, we need to predict the text width now */ + if (ws->text_width == 0) + ws->text_width = predict_text_width(global_conn, + config.font, ws->name, ws->name_len); + continue; + } - workspace_set_name(ws, NULL); - } + workspace_set_name(ws, NULL); + } #endif } diff --git a/src/match.c b/src/match.c index 85d2eaab..3514acee 100644 --- a/src/match.c +++ b/src/match.c @@ -136,3 +136,23 @@ bool match_matches_window(Match *match, i3Window *window) { return true; } + +/* + * Frees the given match. It must not be used afterwards! + * + */ +void match_free(Match *match) { + /* First step: free the regex fields / patterns */ + regex_free(match->title); + regex_free(match->application); + regex_free(match->class); + regex_free(match->instance); + regex_free(match->mark); + + /* Second step: free the regex helper struct itself */ + FREE(match->title); + FREE(match->application); + FREE(match->class); + FREE(match->instance); + FREE(match->mark); +} diff --git a/src/regex.c b/src/regex.c index da8f91d8..f419e4bb 100644 --- a/src/regex.c +++ b/src/regex.c @@ -49,6 +49,18 @@ struct regex *regex_new(const char *pattern) { return re; } +/* + * Frees the given regular expression. It must not be used afterwards! + * + */ +void regex_free(struct regex *regex) { + if (!regex) + return; + FREE(regex->pattern); + FREE(regex->regex); + FREE(regex->extra); +} + /* * Checks if the given regular expression matches the given input and returns * true if it does. In either case, it logs the outcome using LOG(), so it will