aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorne_mene <[email protected]>2026-03-02 01:22:56 +0100
committerne_mene <[email protected]>2026-03-02 01:22:56 +0100
commitcec2fcedf8dfdd839b0580451d0bce0d0351e780 (patch)
treef72ec88c89e1f68ec8b298e8384d42586021ee84
parent2b79dc291a51e774a5e00ee92ec5b733d6ba24a4 (diff)
utf8
-rw-r--r--src/bardata.c19
-rw-r--r--src/bardata.h2
-rw-r--r--src/pipe.c6
-rw-r--r--src/tsar.c2
4 files changed, 7 insertions, 22 deletions
diff --git a/src/bardata.c b/src/bardata.c
index 43e8443..f0fe32e 100644
--- a/src/bardata.c
+++ b/src/bardata.c
@@ -12,9 +12,9 @@ color_t default_fg = {.pixel=0xFFFFFF}, default_bg = {.pixel=0x202020};
int bar_height = 20;
// Global state, oh naur D:
-comp_t comps[32];
+comp_t comps[64];
size_t comps_size = 0;
-comp_t *comps_left[16], *comps_right[16], *comps_center[16];
+comp_t *comps_left[32], *comps_right[32], *comps_center[32];
size_t left_size = 0, right_size = 0, center_size = 0;
int padding = 0;
@@ -107,21 +107,6 @@ void set_layout(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) {
}
}
-color_t parse_color(const char* col_str) {
- color_t col = {0};
-
- if (col_str[0] == '#') {
- col_str++;
- }
-
- col.pixel = strtol(col_str, NULL, 16);
- col.color.red = (col.pixel >> 16) & 0xFF;
- col.color.green = (col.pixel >> 8) & 0xFF;
- col.color.blue = (col.pixel) & 0xFF;
- col.color.alpha = 255;
-
- return col;
-}
void set_config(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) {
char *var = argv[1];
diff --git a/src/bardata.h b/src/bardata.h
index 40a3e0d..67321e7 100644
--- a/src/bardata.h
+++ b/src/bardata.h
@@ -24,7 +24,7 @@ typedef struct {
extern int fontsize;
extern color_t default_fg, default_bg;
extern int bar_height;
-extern comp_t *comps_left[16], *comps_right[16], *comps_center[16];
+extern comp_t *comps_left[32], *comps_right[32], *comps_center[32];
extern size_t left_size, right_size, center_size;
extern int padding;
diff --git a/src/pipe.c b/src/pipe.c
index 70c6a52..202a89c 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -27,7 +27,7 @@ void await_change(void) {
}
break;
}
- printf("Received: %s\n", buff);
+ // printf("Received: %s\n", buff);
int argc = 0, chr_on = 0, i = 0;
char argv[MAX_ARGS][MAX_ARG_LEN];
@@ -61,9 +61,9 @@ void await_change(void) {
}
void make_change(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) {
- printf("Making change with:\n");
+ // printf("Making change with:\n");
for (int i = 0; i < argc; i++) {
- printf("Arg %d: %s\n", i + 1, argv[i]);
+ // printf("Arg %d: %s\n", i + 1, argv[i]);
}
char *cmd = argv[0];
diff --git a/src/tsar.c b/src/tsar.c
index 9c6a87e..8799421 100644
--- a/src/tsar.c
+++ b/src/tsar.c
@@ -116,7 +116,7 @@ void draw_text(const char* text, int x, int y) {
);
int dy = y + (bar_height - font->height) / 2 + font->ascent;
- XftDrawString8(xft_draw, &xft_fg_color, font, x, dy, (const FcChar8*)text, strlen(text));
+ XftDrawStringUtf8(xft_draw, &xft_fg_color, font, x, dy, (const FcChar8*)text, strlen(text));
XftDrawDestroy(xft_draw);
}