X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=src%2Futil.c;h=85f359c0fa801b45e20a9ee9515253cd0316d934;hp=5a95e67cd401c6a0207e850734323c6e5b63387a;hb=HEAD;hpb=c85d16faa4fa3fc34b35782d2281b5852e5a429b diff --git a/src/util.c b/src/util.c index 5a95e67c..85f359c0 100644 --- a/src/util.c +++ b/src/util.c @@ -1,5 +1,3 @@ -#undef I3__FILE__ -#define I3__FILE__ "util.c" /* * vim:ts=4:sw=4:expandtab * @@ -68,6 +66,34 @@ __attribute__((pure)) bool name_is_digits(const char *name) { return true; } +/* + * Set 'out' to the layout_t value for the given layout. The function + * returns true on success or false if the passed string is not a valid + * layout name. + * + */ +bool layout_from_name(const char *layout_str, layout_t *out) { + if (strcmp(layout_str, "default") == 0) { + *out = L_DEFAULT; + return true; + } else if (strcasecmp(layout_str, "stacked") == 0 || + strcasecmp(layout_str, "stacking") == 0) { + *out = L_STACKED; + return true; + } else if (strcasecmp(layout_str, "tabbed") == 0) { + *out = L_TABBED; + return true; + } else if (strcasecmp(layout_str, "splitv") == 0) { + *out = L_SPLITV; + return true; + } else if (strcasecmp(layout_str, "splith") == 0) { + *out = L_SPLITH; + return true; + } + + return false; +} + /* * Parses the workspace name as a number. Returns -1 if the workspace should be * interpreted as a "named workspace". @@ -145,20 +171,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 +181,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; } @@ -194,7 +217,7 @@ static char **append_argument(char **original, char *argument) { #define y(x, ...) yajl_gen_##x(gen, ##__VA_ARGS__) #define ystr(str) yajl_gen_string(gen, (unsigned char *)str, strlen(str)) -char *store_restart_layout(void) { +static char *store_restart_layout(void) { setlocale(LC_NUMERIC, "C"); yajl_gen gen = yajl_gen_alloc(NULL); @@ -222,7 +245,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 +287,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 +344,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). @@ -438,3 +458,59 @@ void kill_nagbar(pid_t *nagbar_pid, bool wait_for_it) { * waitpid() here. */ waitpid(*nagbar_pid, NULL, 0); } + +/* + * Converts a string into a long using strtol(). + * This is a convenience wrapper checking the parsing result. It returns true + * if the number could be parsed. + */ +bool parse_long(const char *str, long *out, int base) { + char *end; + long result = strtol(str, &end, base); + if (result == LONG_MIN || result == LONG_MAX || result < 0 || (end != NULL && *end != '\0')) { + *out = result; + return false; + } + + *out = result; + return true; +} + +/* + * Slurp reads path in its entirety into buf, returning the length of the file + * or -1 if the file could not be read. buf is set to a buffer of appropriate + * size, or NULL if -1 is returned. + * + */ +ssize_t slurp(const char *path, char **buf) { + FILE *f; + if ((f = fopen(path, "r")) == NULL) { + ELOG("Cannot open file \"%s\": %s\n", path, strerror(errno)); + return -1; + } + struct stat stbuf; + if (fstat(fileno(f), &stbuf) != 0) { + ELOG("Cannot fstat() \"%s\": %s\n", path, strerror(errno)); + fclose(f); + return -1; + } + /* Allocate one extra NUL byte to make the buffer usable with C string + * functions. yajl doesn’t need this, but this makes slurp safer. */ + *buf = scalloc(stbuf.st_size + 1, 1); + size_t n = fread(*buf, 1, stbuf.st_size, f); + fclose(f); + if ((ssize_t)n != stbuf.st_size) { + ELOG("File \"%s\" could not be read entirely: got %zd, want %" PRIi64 "\n", path, n, (int64_t)stbuf.st_size); + FREE(*buf); + return -1; + } + return (ssize_t)n; +} + +/* + * Convert a direction to its corresponding orientation. + * + */ +orientation_t orientation_from_direction(direction_t direction) { + return (direction == D_LEFT || direction == D_RIGHT) ? HORIZ : VERT; +}