Some stylechanges to previous commit

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index e885ddcd327f040171d059a1371988012e84be62..4ad337039df78695f1750b7195b8e190ce9f6e06 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -24,12 +24,12 @@ struct rect_t {
 
 #include "queue.h"
 #include "child.h"
-#include "config.h"
 #include "ipc.h"
 #include "outputs.h"
 #include "util.h"
 #include "workspaces.h"
 #include "xcb.h"
 #include "ucs2_to_utf8.h"
+#include "config.h"
 
 #endif

diff --git a/i3bar/include/config.h b/i3bar/include/config.h
index 0496f4315f7da44392b8600276307f47bb1c7cbc..2dd0f532a7bb2ab004ad01852b53f3d56eaa0295 100644 (file)
--- a/i3bar/include/config.h
+++ b/i3bar/include/config.h
@@ -1,9 +1,12 @@
 #ifndef CONFIG_H_
-#define CONFIL_H_
+#define CONFIG_H_
+
+#include "common.h"
 
 typedef struct config_t {
-    int hide_on_modifier;
-    int verbose;
+    int          hide_on_modifier;
+    int          verbose;
+    xcb_colors_t *colors;
 } config_t;
 
 config_t config;

diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index 83c65a55bc80aa04a4394356f86f8457bb28061f..5ace4f0b665d4ffeea20df8fd43dbf4f3909c2e7 100644 (file)
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -10,8 +10,9 @@
 #define XCB_H_
 
 #include <stdint.h>
+//#include "outputs.h"
 
-struct colors_t {
+struct xcb_color_strings_t {
     char *bar_fg;
     char *bar_bg;
     char *active_ws_fg;
@@ -22,16 +23,7 @@ struct colors_t {
     char *urgent_ws_fg;
 };
 
-struct parsed_colors_t {
-    uint32_t bar_fg;
-    uint32_t bar_bg;
-    uint32_t active_ws_fg;
-    uint32_t active_ws_bg;
-    uint32_t inactive_ws_fg;
-    uint32_t inactive_ws_bg;
-    uint32_t urgent_ws_bg;
-    uint32_t urgent_ws_fg;
-};
+typedef struct xcb_colors_t xcb_colors_t;
 
 /*
  * Initialize xcb and use the specified fontname for text-rendering
@@ -43,7 +35,7 @@ void init_xcb();
  * Initialize the colors
  *
  */
-void init_colors(const struct colors_t *colors);
+void init_colors(const struct xcb_color_strings_t *colors);
 
 /*
  * Cleanup the xcb-stuff.

diff --git a/i3bar/src/main.c b/i3bar/src/main.c
index e081d880105bee3cc398a9c3afdd0977d1b7fdf6..e50bcc40c56d1c7f562ccc9b3bec15470c4963bb 100644 (file)
--- a/i3bar/src/main.c
+++ b/i3bar/src/main.c
@@ -37,8 +37,7 @@ char *expand_path(char *path) {
     return result;
 }
 
-static void read_color(char **color)
-{
+static void read_color(char **color) {
     int len = strlen(optarg);
     if (len == 6 || (len == 7 && optarg[0] == '#')) {
         int offset = len - 6;
@@ -62,8 +61,7 @@ static void read_color(char **color)
     exit(EXIT_FAILURE);
 }
 
-static void free_colors(struct colors_t *colors)
-{
+static void free_colors(struct xcb_color_strings_t *colors) {
 #define FREE_COLOR(x) \
     do { \
         if (colors->x) \
@@ -99,7 +97,7 @@ int main(int argc, char **argv) {
     char *command = NULL;
     char *fontname = NULL;
     char *i3_default_sock_path = "~/.i3/ipc.sock";
-    struct colors_t colors = {0,};
+    struct xcb_color_strings_t colors = { NULL, };
 
     /* Definition of the standard-config */
     config.hide_on_modifier = 0;

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 41f221cf1507156b6d8c2c12fc481f98dde54502..bf679b5d5ae91db6e1fa56c2549310a71470d526 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -64,7 +64,17 @@ ev_io      *xcb_io;
 ev_io      *xkb_io;
 
 /* The parsed colors */
-struct parsed_colors_t colors;
+struct xcb_colors_t {
+    uint32_t bar_fg;
+    uint32_t bar_bg;
+    uint32_t active_ws_fg;
+    uint32_t active_ws_bg;
+    uint32_t inactive_ws_fg;
+    uint32_t inactive_ws_bg;
+    uint32_t urgent_ws_bg;
+    uint32_t urgent_ws_fg;
+};
+struct xcb_colors_t colors;
 
 /* We define xcb_request_failed as a macro to include the relevant line-number */
 #define xcb_request_failed(cookie, err_msg) _xcb_request_failed(cookie, err_msg, __LINE__)
@@ -254,7 +264,7 @@ void unhide_bars() {
  * Parse the colors into a format that we can use
  *
  */
-void init_colors(const struct colors_t *new_colors) {
+void init_colors(const struct xcb_color_strings_t *new_colors) {
 #define PARSE_COLOR(name, def) \
     do { \
         colors.name = get_colorpixel(new_colors->name ? new_colors->name : def); \