aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/debug_log.c102
-rw-r--r--sway/list.c55
-rw-r--r--sway/log.c247
3 files changed, 102 insertions, 302 deletions
diff --git a/sway/debug_log.c b/sway/debug_log.c
new file mode 100644
index 00000000..4cb97561
--- /dev/null
+++ b/sway/debug_log.c
@@ -0,0 +1,102 @@
+#include "log.h"
+#include "sway.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <libgen.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+#include <stringop.h>
+#include <execinfo.h>
+#include "workspace.h"
+
+extern log_importance_t v;
+
+/* XXX:DEBUG:XXX */
+static void container_log(const swayc_t *c) {
+ fprintf(stderr, "focus:%c|",
+ c == get_focused_view(&root_container) ? 'K':
+ c == get_focused_container(&root_container) ? 'F' : // Focused
+ c == swayc_active_workspace() ? 'W' : // active workspace
+ c == &root_container ? 'R' : // root
+ 'X');// not any others
+ fprintf(stderr,"(%p)",c);
+ fprintf(stderr,"(p:%p)",c->parent);
+ fprintf(stderr,"(f:%p)",c->focused);
+ fprintf(stderr,"(h:%ld)",c->handle);
+ fprintf(stderr,"Type:");
+ fprintf(stderr,
+ c->type == C_ROOT ? "Root|" :
+ c->type == C_OUTPUT ? "Output|" :
+ c->type == C_WORKSPACE ? "Workspace|" :
+ c->type == C_CONTAINER ? "Container|" :
+ c->type == C_VIEW ? "View|" : "Unknown|");
+ fprintf(stderr,"layout:");
+ fprintf(stderr,
+ c->layout == L_NONE ? "NONE|" :
+ c->layout == L_HORIZ ? "Horiz|":
+ c->layout == L_VERT ? "Vert|":
+ c->layout == L_STACKED ? "Stacked|":
+ c->layout == L_FLOATING ? "Floating|":
+ "Unknown|");
+ fprintf(stderr, "w:%.f|h:%.f|", c->width, c->height);
+ fprintf(stderr, "x:%.f|y:%.f|", c->x, c->y);
+ fprintf(stderr, "g:%d|",c->gaps);
+ fprintf(stderr, "vis:%c|", c->visible?'t':'f');
+ fprintf(stderr, "name:%.16s|", c->name);
+ fprintf(stderr, "children:%d\n",c->children?c->children->length:0);
+}
+void layout_log(const swayc_t *c, int depth) {
+ if (L_DEBUG > v) return;
+ int i, d;
+ int e = c->children ? c->children->length : 0;
+ container_log(c);
+ if (e) {
+ for (i = 0; i < e; ++i) {
+ fputc('|',stderr);
+ for (d = 0; d < depth; ++d) fputc('-', stderr);
+ layout_log(c->children->items[i], depth + 1);
+ }
+ }
+ if (c->type == C_WORKSPACE) {
+ e = c->floating?c->floating->length:0;
+ if (e) {
+ for (i = 0; i < e; ++i) {
+ fputc('|',stderr);
+ for (d = 0; d < depth; ++d) fputc('=', stderr);
+ layout_log(c->floating->items[i], depth + 1);
+ }
+ }
+ }
+}
+
+const char *swayc_type_string(enum swayc_types type) {
+ return type == C_ROOT ? "ROOT" :
+ type == C_OUTPUT ? "OUTPUT" :
+ type == C_WORKSPACE ? "WORKSPACE" :
+ type == C_CONTAINER ? "CONTAINER" :
+ type == C_VIEW ? "VIEW" :
+ "UNKNOWN";
+}
+
+// Like sway_log, but also appends some info about given container to log output.
+void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ...) {
+ sway_assert(cont, "swayc_log: no container ...");
+ va_list args;
+ va_start(args, format);
+ char *txt = malloc(128);
+ vsprintf(txt, format, args);
+ va_end(args);
+
+ char *debug_txt = malloc(32);
+ snprintf(debug_txt, 32, "%s '%s'", swayc_type_string(cont->type), cont->name);
+
+ sway_log(verbosity, "%s (%s)", txt, debug_txt);
+ free(txt);
+ free(debug_txt);
+}
+
+/* XXX:DEBUG:XXX */
diff --git a/sway/list.c b/sway/list.c
deleted file mode 100644
index 45efc16f..00000000
--- a/sway/list.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "list.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-list_t *create_list(void) {
- list_t *list = malloc(sizeof(list_t));
- list->capacity = 10;
- list->length = 0;
- list->items = malloc(sizeof(void*) * list->capacity);
- return list;
-}
-
-static void list_resize(list_t *list) {
- if (list->length == list->capacity) {
- list->capacity += 10;
- list->items = realloc(list->items, sizeof(void*) * list->capacity);
- }
-}
-
-void list_free(list_t *list) {
- if (list == NULL) {
- return;
- }
- free(list->items);
- free(list);
-}
-
-void list_add(list_t *list, void *item) {
- list_resize(list);
- list->items[list->length++] = item;
-}
-
-void list_insert(list_t *list, int index, void *item) {
- list_resize(list);
- memmove(&list->items[index + 1], &list->items[index], sizeof(void*) * (list->length - index));
- list->length++;
- list->items[index] = item;
-}
-
-void list_del(list_t *list, int index) {
- list->length--;
- memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index));
-}
-
-void list_cat(list_t *list, list_t *source) {
- int i;
- for (i = 0; i < source->length; ++i) {
- list_add(list, source->items[i]);
- }
-}
-
-void list_sort(list_t *list, int compare(const void *left, const void *right)) {
- qsort(list->items, list->length, sizeof(void *), compare);
-}
diff --git a/sway/log.c b/sway/log.c
deleted file mode 100644
index f2b828f9..00000000
--- a/sway/log.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include "log.h"
-#include "sway.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <libgen.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <stringop.h>
-#include <execinfo.h>
-
-int colored = 1;
-log_importance_t loglevel_default = L_ERROR;
-log_importance_t v = L_SILENT;
-
-static const char *verbosity_colors[] = {
- [L_SILENT] = "",
- [L_ERROR ] = "\x1B[1;31m",
- [L_INFO ] = "\x1B[1;34m",
- [L_DEBUG ] = "\x1B[1;30m",
-};
-
-void init_log(log_importance_t verbosity) {
- if (verbosity != L_DEBUG) {
- // command "debuglog" needs to know the user specified log level when
- // turning off debug logging.
- loglevel_default = verbosity;
- }
- v = verbosity;
- signal(SIGSEGV, error_handler);
- signal(SIGABRT, error_handler);
-}
-
-void set_log_level(log_importance_t verbosity) {
- v = verbosity;
-}
-
-void reset_log_level(void) {
- v = loglevel_default;
-}
-
-bool toggle_debug_logging(void) {
- v = (v == L_DEBUG) ? loglevel_default : L_DEBUG;
- return (v == L_DEBUG);
-}
-
-void sway_log_colors(int mode) {
- colored = (mode == 1) ? 1 : 0;
-}
-
-void sway_abort(const char *format, ...) {
- fprintf(stderr, "ERROR: ");
- va_list args;
- va_start(args, format);
- vfprintf(stderr, format, args);
- va_end(args);
- fprintf(stderr, "\n");
- sway_terminate();
-}
-
-#ifndef NDEBUG
-void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) {
-#else
-void _sway_log(log_importance_t verbosity, const char* format, ...) {
-#endif
- if (verbosity <= v) {
- unsigned int c = verbosity;
- if (c > sizeof(verbosity_colors) / sizeof(char *)) {
- c = sizeof(verbosity_colors) / sizeof(char *) - 1;
- }
-
- if (colored && isatty(STDERR_FILENO)) {
- fprintf(stderr, "%s", verbosity_colors[c]);
- }
-
- va_list args;
- va_start(args, format);
-#ifndef NDEBUG
- char *file = strdup(filename);
- fprintf(stderr, "[%s:%d] ", basename(file), line);
- free(file);
-#endif
- vfprintf(stderr, format, args);
- va_end(args);
-
- if (colored && isatty(STDERR_FILENO)) {
- fprintf(stderr, "\x1B[0m");
- }
- fprintf(stderr, "\n");
- }
-}
-
-void sway_log_errno(log_importance_t verbosity, char* format, ...) {
- if (verbosity <= v) {
- unsigned int c = verbosity;
- if (c > sizeof(verbosity_colors) / sizeof(char *)) {
- c = sizeof(verbosity_colors) / sizeof(char *) - 1;
- }
-
- if (colored && isatty(STDERR_FILENO)) {
- fprintf(stderr, "%s", verbosity_colors[c]);
- }
-
- va_list args;
- va_start(args, format);
- vfprintf(stderr, format, args);
- va_end(args);
-
- fprintf(stderr, ": ");
- fprintf(stderr, "%s", strerror(errno));
-
- if (colored && isatty(STDERR_FILENO)) {
- fprintf(stderr, "\x1B[0m");
- }
- fprintf(stderr, "\n");
- }
-}
-
-bool _sway_assert(bool condition, const char* format, ...) {
- if (condition) {
- return true;
- }
-
- va_list args;
- va_start(args, format);
- sway_log(L_ERROR, format, args);
- va_end(args);
-
-#ifndef NDEBUG
- raise(SIGABRT);
-#endif
-
- return false;
-}
-
-void error_handler(int sig) {
- int i;
- int max_lines = 20;
- void *array[max_lines];
- char **bt;
- size_t bt_len;
-
- sway_log(L_ERROR, "Error: Signal %d. Printing backtrace", sig);
- bt_len = backtrace(array, max_lines);
- bt = backtrace_symbols(array, bt_len);
- if (!bt) {
- sway_log(L_ERROR, "Could not allocate sufficient memory for backtrace_symbols(), falling back to stderr");
- backtrace_symbols_fd(array, bt_len, STDERR_FILENO);
- exit(1);
- }
-
- for (i = 0; (size_t)i < bt_len; i++) {
- sway_log(L_ERROR, "Backtrace: %s", bt[i]);
- }
- exit(1);
-}
-
-#include "workspace.h"
-
-/* XXX:DEBUG:XXX */
-static void container_log(const swayc_t *c) {
- fprintf(stderr, "focus:%c|",
- c == get_focused_view(&root_container) ? 'K':
- c == get_focused_container(&root_container) ? 'F' : // Focused
- c == swayc_active_workspace() ? 'W' : // active workspace
- c == &root_container ? 'R' : // root
- 'X');// not any others
- fprintf(stderr,"(%p)",c);
- fprintf(stderr,"(p:%p)",c->parent);
- fprintf(stderr,"(f:%p)",c->focused);
- fprintf(stderr,"(h:%ld)",c->handle);
- fprintf(stderr,"Type:");
- fprintf(stderr,
- c->type == C_ROOT ? "Root|" :
- c->type == C_OUTPUT ? "Output|" :
- c->type == C_WORKSPACE ? "Workspace|" :
- c->type == C_CONTAINER ? "Container|" :
- c->type == C_VIEW ? "View|" : "Unknown|");
- fprintf(stderr,"layout:");
- fprintf(stderr,
- c->layout == L_NONE ? "NONE|" :
- c->layout == L_HORIZ ? "Horiz|":
- c->layout == L_VERT ? "Vert|":
- c->layout == L_STACKED ? "Stacked|":
- c->layout == L_FLOATING ? "Floating|":
- "Unknown|");
- fprintf(stderr, "w:%.f|h:%.f|", c->width, c->height);
- fprintf(stderr, "x:%.f|y:%.f|", c->x, c->y);
- fprintf(stderr, "g:%d|",c->gaps);
- fprintf(stderr, "vis:%c|", c->visible?'t':'f');
- fprintf(stderr, "name:%.16s|", c->name);
- fprintf(stderr, "children:%d\n",c->children?c->children->length:0);
-}
-void layout_log(const swayc_t *c, int depth) {
- if (L_DEBUG > v) return;
- int i, d;
- int e = c->children ? c->children->length : 0;
- container_log(c);
- if (e) {
- for (i = 0; i < e; ++i) {
- fputc('|',stderr);
- for (d = 0; d < depth; ++d) fputc('-', stderr);
- layout_log(c->children->items[i], depth + 1);
- }
- }
- if (c->type == C_WORKSPACE) {
- e = c->floating?c->floating->length:0;
- if (e) {
- for (i = 0; i < e; ++i) {
- fputc('|',stderr);
- for (d = 0; d < depth; ++d) fputc('=', stderr);
- layout_log(c->floating->items[i], depth + 1);
- }
- }
- }
-}
-
-const char *swayc_type_string(enum swayc_types type) {
- return type == C_ROOT ? "ROOT" :
- type == C_OUTPUT ? "OUTPUT" :
- type == C_WORKSPACE ? "WORKSPACE" :
- type == C_CONTAINER ? "CONTAINER" :
- type == C_VIEW ? "VIEW" :
- "UNKNOWN";
-}
-
-// Like sway_log, but also appends some info about given container to log output.
-void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ...) {
- sway_assert(cont, "swayc_log: no container ...");
- va_list args;
- va_start(args, format);
- char *txt = malloc(128);
- vsprintf(txt, format, args);
- va_end(args);
-
- char *debug_txt = malloc(32);
- snprintf(debug_txt, 32, "%s '%s'", swayc_type_string(cont->type), cont->name);
-
- sway_log(verbosity, "%s (%s)", txt, debug_txt);
- free(txt);
- free(debug_txt);
-}
-
-/* XXX:DEBUG:XXX */