* 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).
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) {
+__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]))
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 == LONG_MAX ||
+ parsed_num < 0 ||
+ endptr == name) {
parsed_num = -1;
}
/* 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;
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);
}
/*
return original;
}
/* Copy the original array */
- char **result = smalloc((num_args+2) * sizeof(char*));
- memcpy(result, original, num_args * sizeof(char*));
+ char **result = smalloc((num_args + 2) * sizeof(char *));
+ memcpy(result, original, num_args * sizeof(char *));
result[num_args] = argument;
- result[num_args+1] = NULL;
+ result[num_args + 1] = NULL;
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");
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()");
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) {
- DLOG("write == 0?\n");
- free(filename);
- close(fd);
- return NULL;
- }
- written += n;
- DLOG("written: %zd of %zd\n", written, length);
+ 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) {
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*));
+ 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;
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;
}
/*
*
*/
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);
projects / i3 / i3 / blobdiff