X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Futil.c;h=5c8fc774bd389a8b710ea4755bb0e432f7379604;hb=4a2d5da0443d34051ef246fcdb91b94538f86211;hp=c891a6bc5c9678c998c4cf2a7cca348d40b56cfa;hpb=b338e25317e51598228ac69b6d817149ce345f15;p=i3%2Fi3 diff --git a/src/util.c b/src/util.c index c891a6bc..5c8fc774 100644 --- a/src/util.c +++ b/src/util.c @@ -1,10 +1,8 @@ -#undef I3__FILE__ -#define I3__FILE__ "util.c" /* * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * * util.c: Utility functions, which can be useful everywhere within i3 (see * also libi3). @@ -122,7 +120,7 @@ void exec_i3_utility(char *name, char *argv[]) { /* if the script is not in path, maybe the user installed to a strange * location and runs the i3 binary with an absolute path. We use * argv[0]’s dirname */ - char *pathbuf = strdup(start_argv[0]); + char *pathbuf = sstrdup(start_argv[0]); char *dir = dirname(pathbuf); sasprintf(&migratepath, "%s/%s", dir, name); argv[0] = migratepath; @@ -145,20 +143,6 @@ void exec_i3_utility(char *name, char *argv[]) { _exit(2); } -/* - * Checks a generic cookie for errors and quits with the given message if there - * was an error. - * - */ -void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_message) { - xcb_generic_error_t *error = xcb_request_check(conn, cookie); - if (error != NULL) { - fprintf(stderr, "ERROR: %s (X error %d)\n", err_message, error->error_code); - xcb_disconnect(conn); - exit(-1); - } -} - /* * Checks if the given path exists by calling stat(). * @@ -169,24 +153,35 @@ bool path_exists(const char *path) { } /* - * Goes through the list of arguments (for exec()) and checks if the given argument - * is present. If not, it copies the arguments (because we cannot realloc it) and - * appends the given argument. - * + * Goes through the list of arguments (for exec()) and add/replace the given option, + * including the option name, its argument, and the option character. */ -static char **append_argument(char **original, char *argument) { +static char **add_argument(char **original, char *opt_char, char *opt_arg, char *opt_name) { int num_args; - for (num_args = 0; original[num_args] != NULL; num_args++) { - DLOG("original argument: \"%s\"\n", original[num_args]); - /* If the argument is already present we return the original pointer */ - if (strcmp(original[num_args], argument) == 0) - return original; + for (num_args = 0; original[num_args] != NULL; num_args++) + ; + char **result = scalloc(num_args + 3, sizeof(char *)); + + /* copy the arguments, but skip the ones we'll replace */ + int write_index = 0; + bool skip_next = false; + for (int i = 0; i < num_args; ++i) { + if (skip_next) { + skip_next = false; + continue; + } + if (!strcmp(original[i], opt_char) || + (opt_name && !strcmp(original[i], opt_name))) { + if (opt_arg) + skip_next = true; + continue; + } + result[write_index++] = original[i]; } - /* Copy the original array */ - char **result = smalloc((num_args + 2) * sizeof(char *)); - memcpy(result, original, num_args * sizeof(char *)); - result[num_args] = argument; - result[num_args + 1] = NULL; + + /* add the arguments we'll replace */ + result[write_index++] = opt_char; + result[write_index] = opt_arg; return result; } @@ -222,7 +217,7 @@ char *store_restart_layout(void) { char *filenamecopy = sstrdup(filename); char *base = dirname(filenamecopy); DLOG("Creating \"%s\" for storing the restart layout\n", base); - if (!mkdirp(base)) + if (mkdirp(base, DEFAULT_DIR_MODE) != 0) ELOG("Could not create \"%s\" for storing the restart layout, layout will be lost.\n", base); free(filenamecopy); @@ -264,42 +259,24 @@ void i3_restart(bool forget_layout) { restore_geometry(); - ipc_shutdown(); + ipc_shutdown(SHUTDOWN_REASON_RESTART); LOG("restarting \"%s\"...\n", start_argv[0]); - /* make sure -a is in the argument list or append it */ - start_argv = append_argument(start_argv, "-a"); + /* make sure -a is in the argument list or add it */ + start_argv = add_argument(start_argv, "-a", NULL, NULL); + + /* make debuglog-on persist */ + if (get_debug_logging()) { + start_argv = add_argument(start_argv, "-d", "all", NULL); + } /* replace -r so that the layout is restored */ if (restart_filename != NULL) { - /* create the new argv */ - int num_args; - for (num_args = 0; start_argv[num_args] != NULL; num_args++) - ; - char **new_argv = scalloc((num_args + 3) * sizeof(char *)); - - /* copy the arguments, but skip the ones we'll replace */ - int write_index = 0; - bool skip_next = false; - for (int i = 0; i < num_args; ++i) { - if (skip_next) - skip_next = false; - else if (!strcmp(start_argv[i], "-r") || - !strcmp(start_argv[i], "--restart")) - skip_next = true; - else - new_argv[write_index++] = start_argv[i]; - } - - /* add the arguments we'll replace */ - new_argv[write_index++] = "--restart"; - new_argv[write_index] = restart_filename; - - /* swap the argvs */ - start_argv = new_argv; + start_argv = add_argument(start_argv, "--restart", restart_filename, "-r"); } execvp(start_argv[0], start_argv); + /* not reached */ } @@ -339,6 +316,21 @@ void *memmem(const void *l, size_t l_len, const void *s, size_t s_len) { #endif +/* + * Escapes the given string if a pango font is currently used. + * If the string has to be escaped, the input string will be free'd. + * + */ +char *pango_escape_markup(char *input) { + if (!font_is_pango()) + return input; + + char *escaped = g_markup_escape_text(input, -1); + FREE(input); + + return escaped; +} + /* * Handler which will be called when we get a SIGCHLD for the nagbar, meaning * it exited (or could not be started, depending on the exit code).