Merge pull request #1580 from Airblader/feature-nop

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

diff --git a/i3bar/src/mode.c b/i3bar/src/mode.c
index 21b803a3c5904cc9ca938b63178ae310899f81d0..0ff8ba4f0239fd3fa70d6706e108d40a8144349d 100644 (file)
--- a/i3bar/src/mode.c
+++ b/i3bar/src/mode.c
@@ -4,7 +4,7 @@
  * i3bar - an xcb-based status- and ws-bar for i3
  * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
  *
- * mode.c: Handle mode-event and show current binding mode in the bar
+ * mode.c: Handle mode event and show current binding mode in the bar
  *
  */
 #include <string.h>
@@ -18,9 +18,9 @@
 
 /* A datatype to pass through the callbacks to save the state */
 struct mode_json_params {
-    char  *json;
-    char  *cur_key;
-    mode  *mode;
+    char *json;
+    char *cur_key;
+    mode *mode;
 };
 
 /*
@@ -28,36 +28,35 @@ struct mode_json_params {
  *
  */
 static int mode_string_cb(void *params_, const unsigned char *val, size_t len) {
-        struct mode_json_params *params = (struct mode_json_params*) params_;
+    struct mode_json_params *params = (struct mode_json_params *)params_;
 
-        if (!strcmp(params->cur_key, "change")) {
+    if (!strcmp(params->cur_key, "change")) {
+        /* Save the name */
+        params->mode->name = i3string_from_utf8_with_length((const char *)val, len);
+        /* Save its rendered width */
+        params->mode->width = predict_text_width(params->mode->name);
 
-            /* Save the name */
-            params->mode->name = i3string_from_utf8_with_length((const char *)val, len);
-            /* Save its rendered width */
-            params->mode->width = predict_text_width(params->mode->name);
+        DLOG("Got mode change: %s\n", i3string_as_utf8(params->mode->name));
+        FREE(params->cur_key);
 
-            DLOG("Got mode change: %s\n", i3string_as_utf8(params->mode->name));
-            FREE(params->cur_key);
-
-            return 1;
-        }
+        return 1;
+    }
 
-        return 0;
+    return 0;
 }
 
 /*
  * Parse a key.
  *
- * Essentially we just save it in the parsing-state
+ * Essentially we just save it in the parsing state
  *
  */
 static int mode_map_key_cb(void *params_, const unsigned char *keyVal, size_t keyLen) {
-    struct mode_json_params *params = (struct mode_json_params*) params_;
+    struct mode_json_params *params = (struct mode_json_params *)params_;
     FREE(params->cur_key);
 
     params->cur_key = smalloc(sizeof(unsigned char) * (keyLen + 1));
-    strncpy(params->cur_key, (const char*) keyVal, keyLen);
+    strncpy(params->cur_key, (const char *)keyVal, keyLen);
     params->cur_key[keyLen] = '\0';
 
     return 1;
@@ -70,11 +69,11 @@ static yajl_callbacks mode_callbacks = {
 };
 
 /*
- * Start parsing the received json-string
+ * Start parsing the received JSON string
  *
  */
 void parse_mode_json(char *json) {
-    /* FIXME: Fasciliate stream-processing, i.e. allow starting to interpret
+    /* FIXME: Fasciliate stream processing, i.e. allow starting to interpret
      * JSON in chunks */
     struct mode_json_params params;
 
@@ -87,17 +86,17 @@ void parse_mode_json(char *json) {
     yajl_handle handle;
     yajl_status state;
 
-    handle = yajl_alloc(&mode_callbacks, NULL, (void*) &params);
+    handle = yajl_alloc(&mode_callbacks, NULL, (void *)&params);
 
-    state = yajl_parse(handle, (const unsigned char*) json, strlen(json));
+    state = yajl_parse(handle, (const unsigned char *)json, strlen(json));
 
-    /* FIXME: Propper errorhandling for JSON-parsing */
+    /* FIXME: Propper error handling for JSON parsing */
     switch (state) {
         case yajl_status_ok:
             break;
         case yajl_status_client_canceled:
         case yajl_status_error:
-            ELOG("Could not parse mode-event!\n");
+            ELOG("Could not parse mode event!\n");
             exit(EXIT_FAILURE);
             break;
     }