X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Futil.c;h=85f359c0fa801b45e20a9ee9515253cd0316d934;hb=HEAD;hp=57bfa89bb77051a53a5964ee4c3f7520079391ff;hpb=0f9fbcbd259a26969c3503ac1e31b2cf2df351f5;p=i3%2Fi3 diff --git a/src/util.c b/src/util.c index 57bfa89b..85f359c0 100644 --- a/src/util.c +++ b/src/util.c @@ -2,7 +2,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). @@ -19,6 +19,7 @@ #include #include #include +#include #define SN_API_NOT_YET_FROZEN 1 #include @@ -45,6 +46,73 @@ 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; +} + +/* + * 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". + * + */ +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 @@ -80,7 +148,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; @@ -91,7 +159,7 @@ void exec_i3_utility(char *name, char *argv[]) { char buffer[BUFSIZ]; if (readlink("/proc/self/exe", buffer, BUFSIZ) == -1) { warn("could not read /proc/self/exe"); - exit(1); + _exit(1); } dir = dirname(buffer); sasprintf(&migratepath, "%s/%s", dir, name); @@ -100,53 +168,7 @@ void exec_i3_utility(char *name, char *argv[]) { #endif warn("Could not start %s", name); - 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); - } -} - -/* - * 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 ? 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; + _exit(2); } /* @@ -154,81 +176,57 @@ char *resolve_tilde(const char *path) { * */ 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; - return result; -} + /* add the arguments we'll replace */ + result[write_index++] = opt_char; + result[write_index] = opt_arg; -/* - * Returns the name of a temporary file with the specified prefix. - * - */ -char *get_process_filename(const char *prefix) { - char *dir = getenv("XDG_RUNTIME_DIR"); - if (dir == NULL) { - struct passwd *pw = getpwuid(getuid()); - const char *username = pw ? pw->pw_name : "unknown"; - sasprintf(&dir, "/tmp/i3-%s", username); - } else { - char *tmp; - sasprintf(&tmp, "%s/i3", dir); - dir = tmp; - } - if (!path_exists(dir)) { - if (mkdir(dir, 0700) == -1) { - perror("mkdir()"); - return NULL; - } - } - char *filename; - sasprintf(&filename, "%s/%s.%d", dir, prefix, getpid()); - free(dir); - return filename; + 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() { +static 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 @@ -242,6 +240,15 @@ char *store_restart_layout() { 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()"); @@ -249,33 +256,17 @@ char *store_restart_layout() { return NULL; } - int 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 - printf("written: %d of %zd\n", written, length); -#else - printf("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); @@ -291,45 +282,29 @@ char *store_restart_layout() { void i3_restart(bool forget_layout) { char *restart_filename = forget_layout ? NULL : store_restart_layout(); - kill_configerror_nagbar(true); + kill_nagbar(&config_error_nagbar_pid, true); + kill_nagbar(&command_error_nagbar_pid, true); 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 */ } @@ -368,3 +343,174 @@ 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). + * + */ +static void nagbar_exited(EV_P_ ev_child *watcher, int revents) { + ev_child_stop(EV_A_ watcher); + + if (!WIFEXITED(watcher->rstatus)) { + ELOG("ERROR: i3-nagbar did not exit normally.\n"); + return; + } + + int exitcode = WEXITSTATUS(watcher->rstatus); + DLOG("i3-nagbar process exited with status %d\n", exitcode); + if (exitcode == 2) { + ELOG("ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\n"); + } + + *((pid_t *)watcher->data) = -1; +} + +/* + * Cleanup handler. Will be called when i3 exits. Kills i3-nagbar with signal + * SIGKILL (9) to make sure there are no left-over i3-nagbar processes. + * + */ +static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) { + 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); + } +} + +/* + * Starts an i3-nagbar instance with the given parameters. Takes care of + * handling SIGCHLD and killing i3-nagbar when i3 exits. + * + * The resulting PID will be stored in *nagbar_pid and can be used with + * kill_nagbar() to kill the bar later on. + * + */ +void start_nagbar(pid_t *nagbar_pid, char *argv[]) { + if (*nagbar_pid != -1) { + DLOG("i3-nagbar already running (PID %d), not starting again.\n", *nagbar_pid); + return; + } + + *nagbar_pid = fork(); + if (*nagbar_pid == -1) { + warn("Could not fork()"); + return; + } + + /* child */ + if (*nagbar_pid == 0) + exec_i3_utility("i3-nagbar", argv); + + DLOG("Starting i3-nagbar with PID %d\n", *nagbar_pid); + + /* parent */ + /* install a child watcher */ + ev_child *child = smalloc(sizeof(ev_child)); + ev_child_init(child, &nagbar_exited, *nagbar_pid, 0); + child->data = nagbar_pid; + ev_child_start(main_loop, child); + + /* install a cleanup watcher (will be called when i3 exits and i3-nagbar is + * still running) */ + ev_cleanup *cleanup = smalloc(sizeof(ev_cleanup)); + ev_cleanup_init(cleanup, nagbar_cleanup); + cleanup->data = nagbar_pid; + ev_cleanup_start(main_loop, cleanup); +} + +/* + * Kills the i3-nagbar process, if *nagbar_pid != -1. + * + * If wait_for_it is set (restarting i3), this function will waitpid(), + * otherwise, ev is assumed to handle it (reloading). + * + */ +void kill_nagbar(pid_t *nagbar_pid, bool wait_for_it) { + if (*nagbar_pid == -1) + return; + + if (kill(*nagbar_pid, SIGTERM) == -1) + warn("kill(configerror_nagbar) failed"); + + if (!wait_for_it) + return; + + /* When restarting, we don’t enter the ev main loop anymore and after the + * exec(), our old pid is no longer watched. So, ev won’t handle SIGCHLD + * for us and we would end up with a process. Therefore we + * 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; +}