#include <pwd.h>
#include <yajl/yajl_version.h>
#include <libgen.h>
+#include <ctype.h>
#define SN_API_NOT_YET_FROZEN 1
#include <libsn/sn-launcher.h>
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
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);
}
*
*/
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);
+ 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;
+ return result;
}
/*
*
*/
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");
-#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
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))
+ 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;
}
- 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);
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