X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Futil.c;h=7a73011d050d879dc5aecd205e777f0779f16e95;hb=b2bbd2c064bbe77fc5e045f68cb12eaefd378b02;hp=f672cc2e994b1ff86c4d8b9f6eda165609a70d90;hpb=00cf2b21daa5bd5973f52cb1ac7a3852bf69f7cc;p=i3%2Fi3 diff --git a/src/util.c b/src/util.c index f672cc2e..7a73011d 100644 --- a/src/util.c +++ b/src/util.c @@ -4,7 +4,7 @@ * 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). @@ -21,6 +21,7 @@ #include #include #include +#include #define SN_API_NOT_YET_FROZEN 1 #include @@ -47,6 +48,45 @@ Rect rect_add(Rect a, Rect b) { a.height + b.height}; } +Rect rect_sub(Rect a, Rect b) { + return (Rect){a.x - b.x, + a.y - b.y, + a.width - b.width, + a.height - b.height}; +} + +/* + * Returns true if the name consists of only digits. + * + */ +__attribute__((pure)) bool name_is_digits(const char *name) { + /* positive integers and zero are interpreted as numbers */ + for (size_t i = 0; i < strlen(name); i++) + if (!isdigit(name[i])) + return false; + + return true; +} + +/* + * Parses the workspace name as a number. Returns -1 if the workspace should be + * interpreted as a "named workspace". + * + */ +long ws_name_to_number(const char *name) { + /* positive integers and zero are interpreted as numbers */ + char *endptr = NULL; + long parsed_num = strtol(name, &endptr, 10); + if (parsed_num == LONG_MIN || + parsed_num == LONG_MAX || + parsed_num < 0 || + endptr == name) { + parsed_num = -1; + } + + return parsed_num; +} + /* * Updates *destination with new_value and returns true if it was changed or false * if it was the same @@ -82,7 +122,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; @@ -113,97 +153,68 @@ void exec_i3_utility(char *name, char *argv[]) { 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); + fprintf(stderr, "ERROR: %s (X error %d)\n", err_message, error->error_code); xcb_disconnect(conn); exit(-1); } } -/* - * This function resolves ~ in pathnames. - * It may resolve wildcards in the first part of the path, but if no match - * or multiple matches are found, it just returns a copy of path as given. - * - */ -char *resolve_tilde(const char *path) { - static glob_t globbuf; - char *head, *tail, *result; - - tail = strchr(path, '/'); - head = strndup(path, tail ? (size_t)(tail - path) : strlen(path)); - - int res = glob(head, GLOB_TILDE, NULL, &globbuf); - free(head); - /* no match, or many wildcard matches are bad */ - if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1) - result = sstrdup(path); - else if (res != 0) { - die("glob() failed"); - } else { - head = globbuf.gl_pathv[0]; - result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1); - strncpy(result, head, strlen(head)); - if (tail) - strncat(result, tail, strlen(tail)); - } - globfree(&globbuf); - - return result; -} - /* * Checks if the given path exists by calling stat(). * */ bool path_exists(const char *path) { - struct stat buf; - return (stat(path, &buf) == 0); + struct stat buf; + return (stat(path, &buf) == 0); } /* - * 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; } -#define y(x, ...) yajl_gen_ ## x (gen, ##__VA_ARGS__) -#define ystr(str) yajl_gen_string(gen, (unsigned char*)str, strlen(str)) +#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) { setlocale(LC_NUMERIC, "C"); -#if YAJL_MAJOR >= 2 yajl_gen gen = yajl_gen_alloc(NULL); -#else - yajl_gen gen = yajl_gen_alloc(NULL, NULL); -#endif dump_node(gen, croot, true); setlocale(LC_NUMERIC, ""); const unsigned char *payload; -#if YAJL_MAJOR >= 2 size_t length; -#else - unsigned int length; -#endif y(get_buf, &payload, &length); /* create a temporary file if one hasn't been specified, or just @@ -217,6 +228,15 @@ char *store_restart_layout(void) { filename = resolve_tilde(config.restart_state_path); } + /* create the directory, it could have been cleaned up before restarting or + * may not exist at all in case it was user-specified. */ + char *filenamecopy = sstrdup(filename); + char *base = dirname(filenamecopy); + DLOG("Creating \"%s\" for storing the restart layout\n", 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); + int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); if (fd == -1) { perror("open()"); @@ -224,33 +244,17 @@ char *store_restart_layout(void) { return NULL; } - size_t written = 0; - while (written < length) { - int n = write(fd, payload + written, length - written); - /* TODO: correct error-handling */ - if (n == -1) { - perror("write()"); - free(filename); - close(fd); - return NULL; - } - if (n == 0) { - printf("write == 0?\n"); - free(filename); - close(fd); - return NULL; - } - written += n; -#if YAJL_MAJOR >= 2 - DLOG("written: %zd of %zd\n", written, length); -#else - DLOG("written: %d of %d\n", written, length); -#endif + if (writeall(fd, payload, length) == -1) { + ELOG("Could not write restart layout to \"%s\", layout will be lost: %s\n", filename, strerror(errno)); + free(filename); + close(fd); + return NULL; } + close(fd); if (length > 0) { - printf("layout: %.*s\n", (int)length, payload); + DLOG("layout: %.*s\n", (int)length, payload); } y(free); @@ -274,38 +278,21 @@ void i3_restart(bool forget_layout) { ipc_shutdown(); 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 */ } @@ -364,7 +351,7 @@ static void nagbar_exited(EV_P_ ev_child *watcher, int revents) { ELOG("ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\n"); } - *((pid_t*)watcher->data) = -1; + *((pid_t *)watcher->data) = -1; } /* @@ -373,7 +360,7 @@ static void nagbar_exited(EV_P_ ev_child *watcher, int revents) { * */ static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) { - pid_t *nagbar_pid = (pid_t*)watcher->data; + pid_t *nagbar_pid = (pid_t *)watcher->data; if (*nagbar_pid != -1) { LOG("Sending SIGKILL (%d) to i3-nagbar with PID %d\n", SIGKILL, *nagbar_pid); kill(*nagbar_pid, SIGKILL);