New message: 'list_rules'

[bspwm.git] / types.c

diff --git a/types.c b/types.c
index ee307027639271208ef27a58dce4e22b1debc421..1454710f95625bc284d93b22226c8a598d9764e5 100644 (file)
--- a/types.c
+++ b/types.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
+#include "bspwm.h"
 #include "settings.h"
 #include "types.h"
 
@@ -16,10 +17,27 @@ node_t *make_node(void)
     return n;
 }
 
+monitor_t *make_monitor(xcb_rectangle_t *rect)
+{
+    monitor_t *m = malloc(sizeof(monitor_t));
+    snprintf(m->name, sizeof(m->name), "%s%02d", DEFAULT_MON_NAME, ++monitor_uid);
+    m->prev = m->next = NULL;
+    m->desk = m->last_desk = NULL;
+    if (rect != NULL)
+        m->rectangle = *rect;
+    else
+        warn("no rectangle was given for monitor '%s'\n", m->name);
+    m->top_padding = m->right_padding = m->bottom_padding = m->left_padding = 0;
+    return m;
+}
+
 desktop_t *make_desktop(const char *name)
 {
     desktop_t *d = malloc(sizeof(desktop_t));
-    strncpy(d->name, name, sizeof(d->name));
+    if (name == NULL)
+        snprintf(d->name, sizeof(d->name), "%s%02d", DEFAULT_DESK_NAME, ++desktop_uid);
+    else
+        strncpy(d->name, name, sizeof(d->name));
     d->layout = LAYOUT_TILED;
     d->prev = d->next = NULL;
     d->root = d->focus = d->last_focus = NULL;
@@ -30,6 +48,7 @@ client_t *make_client(xcb_window_t win)
 {
     client_t *c = malloc(sizeof(client_t));
     strncpy(c->class_name, MISSING_VALUE, sizeof(c->class_name));
+    c->uid = ++client_uid;
     c->border_width = border_width;
     c->window = win;
     c->floating = c->transient = c->fullscreen = c->locked = c->urgent = false;
@@ -39,7 +58,10 @@ client_t *make_client(xcb_window_t win)
 rule_t *make_rule(void)
 {
     rule_t *r = malloc(sizeof(rule_t));
+    r->uid = ++rule_uid;
     r->effect.floating = false;
+    r->effect.monitor = NULL;
+    r->effect.desktop = NULL;
     r->next = NULL;
     return r;
 }