Merge branch 'master' into next

[i3/i3] / i3bar / src / outputs.c

diff --git a/i3bar/src/outputs.c b/i3bar/src/outputs.c
index 464f24a0ea52fa171b5caa1904d6d4708672cd89..b407df59dd78a83ea99d0ed6058dd15dabbc1d8b 100644 (file)
--- a/i3bar/src/outputs.c
+++ b/i3bar/src/outputs.c
@@ -1,11 +1,10 @@
 /*
- * i3bar - an xcb-based status- and ws-bar for i3
- *
- * © 2010-2011 Axel Wagner and contributors
+ * vim:ts=4:sw=4:expandtab
  *
- * See file LICNSE for license information
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
  *
- * src/outputs.c: Maintaining the output-list
+ * outputs.c: Maintaining the output-list
  *
  */
 #include <string.h>
@@ -24,7 +23,7 @@ struct outputs_json_params {
     i3_output           *outputs_walk;
     char                *cur_key;
     char                *json;
-    bool                init;
+    bool                in_rect;
 };
 
 /*
@@ -46,15 +45,19 @@ static int outputs_null_cb(void *params_) {
 static int outputs_boolean_cb(void *params_, int val) {
     struct outputs_json_params *params = (struct outputs_json_params*) params_;
 
-    if (strcmp(params->cur_key, "active")) {
-        return 0;
+    if (!strcmp(params->cur_key, "active")) {
+        params->outputs_walk->active = val;
+        FREE(params->cur_key);
+        return 1;
     }
 
-    params->outputs_walk->active = val;
-
-    FREE(params->cur_key);
+    if (!strcmp(params->cur_key, "primary")) {
+        params->outputs_walk->primary = val;
+        FREE(params->cur_key);
+        return 1;
+    }
 
-    return 1;
+    return 0;
 }
 
 /*
@@ -113,7 +116,7 @@ static int outputs_string_cb(void *params_, const unsigned char *val, unsigned i
     struct outputs_json_params *params = (struct outputs_json_params*) params_;
 
     if (!strcmp(params->cur_key, "current_workspace")) {
-        char *copy = malloc(sizeof(const unsigned char) * (len + 1));
+        char *copy = smalloc(sizeof(const unsigned char) * (len + 1));
         strncpy(copy, (const char*) val, len);
         copy[len] = '\0';
 
@@ -132,7 +135,7 @@ static int outputs_string_cb(void *params_, const unsigned char *val, unsigned i
         return 0;
     }
 
-    char *name = malloc(sizeof(const unsigned char) * (len + 1));
+    char *name = smalloc(sizeof(const unsigned char) * (len + 1));
     strncpy(name, (const char*) val, len);
     name[len] = '\0';
 
@@ -152,16 +155,16 @@ static int outputs_start_map_cb(void *params_) {
     i3_output *new_output = NULL;
 
     if (params->cur_key == NULL) {
-        new_output = malloc(sizeof(i3_output));
+        new_output = smalloc(sizeof(i3_output));
         new_output->name = NULL;
         new_output->ws = 0,
         memset(&new_output->rect, 0, sizeof(rect));
         new_output->bar = XCB_NONE;
 
-        new_output->workspaces = malloc(sizeof(struct ws_head));
+        new_output->workspaces = smalloc(sizeof(struct ws_head));
         TAILQ_INIT(new_output->workspaces);
 
-        new_output->trayclients = malloc(sizeof(struct tc_head));
+        new_output->trayclients = smalloc(sizeof(struct tc_head));
         TAILQ_INIT(new_output->trayclients);
 
         params->outputs_walk = new_output;
@@ -169,6 +172,10 @@ static int outputs_start_map_cb(void *params_) {
         return 1;
     }
 
+    if (!strcmp(params->cur_key, "rect")) {
+        params->in_rect = true;
+    }
+
     return 1;
 }
 
@@ -178,7 +185,33 @@ static int outputs_start_map_cb(void *params_) {
  */
 static int outputs_end_map_cb(void *params_) {
     struct outputs_json_params *params = (struct outputs_json_params*) params_;
-    /* FIXME: What is at the end of a rect? */
+    if (params->in_rect) {
+        params->in_rect = false;
+        /* Ignore the end of a rect */
+        return 1;
+    }
+
+    /* See if we actually handle that output */
+    if (config.num_outputs > 0) {
+        bool handle_output = false;
+        for (int c = 0; c < config.num_outputs; c++) {
+            if (strcasecmp(params->outputs_walk->name, config.outputs[c]) != 0)
+                continue;
+
+            handle_output = true;
+            break;
+        }
+        if (!handle_output) {
+            DLOG("Ignoring output \"%s\", not configured to handle it.\n",
+                 params->outputs_walk->name);
+            FREE(params->outputs_walk->name);
+            FREE(params->outputs_walk->workspaces);
+            FREE(params->outputs_walk->trayclients);
+            FREE(params->outputs_walk);
+            FREE(params->cur_key);
+            return 1;
+        }
+    }
 
     i3_output *target = get_output_by_name(params->outputs_walk->name);
 
@@ -186,6 +219,7 @@ static int outputs_end_map_cb(void *params_) {
         SLIST_INSERT_HEAD(outputs, params->outputs_walk, slist);
     } else {
         target->active = params->outputs_walk->active;
+        target->primary = params->outputs_walk->primary;
         target->ws = params->outputs_walk->ws;
         target->rect = params->outputs_walk->rect;
     }
@@ -206,7 +240,7 @@ static int outputs_map_key_cb(void *params_, const unsigned char *keyVal, unsign
     struct outputs_json_params *params = (struct outputs_json_params*) params_;
     FREE(params->cur_key);
 
-    params->cur_key = malloc(sizeof(unsigned char) * (keyLen + 1));
+    params->cur_key = smalloc(sizeof(unsigned char) * (keyLen + 1));
     strncpy(params->cur_key, (const char*) keyVal, keyLen);
     params->cur_key[keyLen] = '\0';
 
@@ -214,26 +248,22 @@ static int outputs_map_key_cb(void *params_, const unsigned char *keyVal, unsign
 }
 
 /* A datastructure to pass all these callbacks to yajl */
-yajl_callbacks outputs_callbacks = {
-    &outputs_null_cb,
-    &outputs_boolean_cb,
-    &outputs_integer_cb,
-    NULL,
-    NULL,
-    &outputs_string_cb,
-    &outputs_start_map_cb,
-    &outputs_map_key_cb,
-    &outputs_end_map_cb,
-    NULL,
-    NULL
+static yajl_callbacks outputs_callbacks = {
+    .yajl_null = outputs_null_cb,
+    .yajl_boolean = outputs_boolean_cb,
+    .yajl_integer = outputs_integer_cb,
+    .yajl_string = outputs_string_cb,
+    .yajl_start_map = outputs_start_map_cb,
+    .yajl_map_key = outputs_map_key_cb,
+    .yajl_end_map = outputs_end_map_cb,
 };
 
 /*
  * Initiate the output-list
  *
  */
-void init_outputs() {
-    outputs = malloc(sizeof(struct outputs_head));
+void init_outputs(void) {
+    outputs = smalloc(sizeof(struct outputs_head));
     SLIST_INIT(outputs);
 }
 
@@ -247,6 +277,7 @@ void parse_outputs_json(char *json) {
     params.outputs_walk = NULL;
     params.cur_key = NULL;
     params.json = json;
+    params.in_rect = false;
 
     yajl_handle handle;
     yajl_status state;