scary merge

2 files changed, 19 insertions, 6 deletions

diff --git a/src/bardata.c b/src/bardata.c
index 900cb6a..507d8f9 100644
--- a/src/bardata.c
+++ b/src/bardata.c
@@ -18,11 +18,6 @@ size_t comps_size = 0;
 comp_t *comps_left[16], *comps_right[16], *comps_center[16];
 size_t left_size = 0, right_size = 0, center_size = 0;
 
-void new_component(char *name) {
-  strcpy(comps[comps_size].name, name);
-  comps_size++;
-}
-
 comp_t *find_comp(char *name) {
   for (size_t i = 0; i < comps_size; i++) {
     if (strcmp(comps[i].name, name) == 0) {
@@ -32,6 +27,14 @@ comp_t *find_comp(char *name) {
   return NULL;
 }
 
+void new_component(char *name) {
+  comp_t* existing = find_comp(name);
+  if (existing)
+    return;
+  strcpy(comps[comps_size].name, name);
+  comps_size++;
+}
+
 void add_component(comp_side_t side, char *name) {
   comp_t *comp = find_comp(name);
   if (side == SIDE_LEFT) {
@@ -65,6 +68,9 @@ void set_component(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) {
 
 void set_layout(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) {
   comp_side_t side = SIDE_LEFT;
+  left_size = 0;
+  center_size = 0;
+  right_size = 0;
 
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-left") == 0) {
diff --git a/src/tsar.c b/src/tsar.c
index 298e662..2d9d041 100644
--- a/src/tsar.c
+++ b/src/tsar.c
@@ -7,6 +7,7 @@
 
 #include <X11/Xft/Xft.h>
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 
 #include "pipe.h"
 #include "bardata.h"
@@ -75,7 +76,13 @@ void init_x(void) {
     &win_attr
   );
 
-  XMapRaised(display, win);
+  XClassHint class_hint;
+  class_hint.res_name = "tsarbar";
+  class_hint.res_class = "Bar";
+
+  XSetClassHint(display, win, &class_hint);
+
+  XMapWindow(display, win);
 
   load_font("monospace:size=10");