X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Futil.c;h=83a2d57bab8ad23a6f45cbf1b40dbbc7b5db8d43;hb=617afc67a25c9bb7bf91a7659319e07fbe32d758;hp=81ef083d9fb4703d43fdeda3dda9488c61fbaa13;hpb=42d355f2b75376cdb42bf6c634aa5a9d4b36c447;p=i3%2Fi3 diff --git a/src/util.c b/src/util.c index 81ef083d..83a2d57b 100644 --- a/src/util.c +++ b/src/util.c @@ -1,3 +1,5 @@ +#undef I3__FILE__ +#define I3__FILE__ "util.c" /* * vim:ts=4:sw=4:expandtab * @@ -12,7 +14,6 @@ #include #include -#include #if defined(__OpenBSD__) #include #endif @@ -20,12 +21,11 @@ #include #include #include +#include #define SN_API_NOT_YET_FROZEN 1 #include -static iconv_t conversion_descriptor = 0; - int min(int a, int b) { return (a < b ? a : b); } @@ -48,6 +48,38 @@ Rect rect_add(Rect a, Rect b) { 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 (int 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 @@ -85,7 +117,7 @@ void exec_i3_utility(char *name, char *argv[]) { * argv[0]’s dirname */ char *pathbuf = strdup(start_argv[0]); char *dir = dirname(pathbuf); - asprintf(&migratepath, "%s/%s", dir, name); + sasprintf(&migratepath, "%s/%s", dir, name); argv[0] = migratepath; execvp(migratepath, argv); @@ -94,16 +126,16 @@ 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); - asprintf(&migratepath, "%s/%s", dir, name); + sasprintf(&migratepath, "%s/%s", dir, name); argv[0] = migratepath; execvp(migratepath, argv); #endif warn("Could not start %s", name); - exit(2); + _exit(2); } /* @@ -120,50 +152,6 @@ void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_mes } } -/* - * Converts the given string to UCS-2 big endian for use with - * xcb_image_text_16(). The amount of real glyphs is stored in real_strlen, - * a buffer containing the UCS-2 encoded string (16 bit per glyph) is - * returned. It has to be freed when done. - * - */ -char *convert_utf8_to_ucs2(char *input, int *real_strlen) { - size_t input_size = strlen(input) + 1; - /* UCS-2 consumes exactly two bytes for each glyph */ - int buffer_size = input_size * 2; - - char *buffer = smalloc(buffer_size); - size_t output_size = buffer_size; - /* We need to use an additional pointer, because iconv() modifies it */ - char *output = buffer; - - /* We convert the input into UCS-2 big endian */ - if (conversion_descriptor == 0) { - conversion_descriptor = iconv_open("UCS-2BE", "UTF-8"); - if (conversion_descriptor == 0) { - fprintf(stderr, "error opening the conversion context\n"); - exit(1); - } - } - - /* Get the conversion descriptor back to original state */ - iconv(conversion_descriptor, NULL, NULL, NULL, NULL); - - /* Convert our text */ - int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size); - if (rc == (size_t)-1) { - perror("Converting to UCS-2 failed"); - if (real_strlen != NULL) - *real_strlen = 0; - return NULL; - } - - if (real_strlen != NULL) - *real_strlen = ((buffer_size - output_size) / 2) - 1; - - return buffer; -} - /* * This function resolves ~ in pathnames. * It may resolve wildcards in the first part of the path, but if no match @@ -175,7 +163,7 @@ char *resolve_tilde(const char *path) { char *head, *tail, *result; tail = strchr(path, '/'); - head = strndup(path, tail ? tail - path : strlen(path)); + head = strndup(path, tail ? (size_t)(tail - path) : strlen(path)); int res = glob(head, GLOB_TILDE, NULL, &globbuf); free(head); @@ -228,64 +216,19 @@ static char **append_argument(char **original, char *argument) { return result; } -/* - * 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"; - if (asprintf(&dir, "/tmp/i3-%s", username) == -1) { - perror("asprintf()"); - return NULL; - } - } else { - char *tmp; - if (asprintf(&tmp, "%s/i3", dir) == -1) { - perror("asprintf()"); - return NULL; - } - dir = tmp; - } - if (!path_exists(dir)) { - if (mkdir(dir, 0700) == -1) { - perror("mkdir()"); - return NULL; - } - } - char *filename; - if (asprintf(&filename, "%s/%s.%d", dir, prefix, getpid()) == -1) { - perror("asprintf()"); - filename = NULL; - } - - free(dir); - return filename; -} - #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() { +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 @@ -306,7 +249,7 @@ char *store_restart_layout() { return NULL; } - int written = 0; + size_t written = 0; while (written < length) { int n = write(fd, payload + written, length - written); /* TODO: correct error-handling */ @@ -317,22 +260,18 @@ char *store_restart_layout() { return NULL; } if (n == 0) { - printf("write == 0?\n"); + DLOG("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 + DLOG("written: %zd of %zd\n", written, length); } close(fd); if (length > 0) { - printf("layout: %.*s\n", (int)length, payload); + DLOG("layout: %.*s\n", (int)length, payload); } y(free); @@ -348,7 +287,8 @@ 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(); @@ -426,26 +366,102 @@ void *memmem(const void *l, size_t l_len, const void *s, size_t s_len) { #endif -#if defined(__APPLE__) +/* + * 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; +} /* - * Taken from FreeBSD - * Returns a pointer to a new string which is a duplicate of the - * string, but only copies at most n characters. + * 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. * */ -char *strndup(const char *str, size_t n) { - size_t len; - char *copy; - - for (len = 0; len < n && str[len]; len++) - continue; - - if ((copy = malloc(len + 1)) == NULL) - return (NULL); - memcpy(copy, str, len); - copy[len] = '\0'; - return (copy); +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); + } } -#endif +/* + * 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); +}