diff options
| -rw-r--r-- | src/bardata.c | 10 | ||||
| -rw-r--r-- | src/bardata.h | 2 | ||||
| -rw-r--r-- | src/tsar.c | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/bardata.c b/src/bardata.c index f0fe32e..7929201 100644 --- a/src/bardata.c +++ b/src/bardata.c @@ -17,6 +17,7 @@ size_t comps_size = 0; 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; +int comp_gap = 16; comp_t *find_comp(char *name) { for (size_t i = 0; i < comps_size; i++) { @@ -117,12 +118,19 @@ void set_config(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) { return; } bar_height = new_bar_height; + return; } if (strcmp(var, "font") == 0) { load_font(argv[2]); + return; + } + if (strcmp(var, "gap") == 0) { + comp_gap = atoi(argv[2]); + return; } if (strcmp(var, "padding") == 0) { padding = atoi(argv[2]); + return; } if (strcmp(var, "background") == 0 || strcmp(var, "bg") == 0) { default_bg = parse_color(argv[2]); @@ -130,6 +138,7 @@ void set_config(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) { .background_pixel = default_bg.pixel, }; XChangeWindowAttributes(display, win, CWBackPixel, &win_attr); + return; } if (strcmp(var, "foreground") == 0 || strcmp(var, "fg") == 0) { default_fg = parse_color(argv[2]); @@ -147,5 +156,6 @@ void set_config(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) { argv[2], &xft_fg_color ); + return; } } diff --git a/src/bardata.h b/src/bardata.h index 67321e7..c2144bd 100644 --- a/src/bardata.h +++ b/src/bardata.h @@ -27,6 +27,8 @@ extern int bar_height; extern comp_t *comps_left[32], *comps_right[32], *comps_center[32]; extern size_t left_size, right_size, center_size; extern int padding; +extern int comp_gap; + void new_component(char *name); void set_component(char argv[MAX_ARGS][MAX_ARG_LEN], int argc); @@ -131,7 +131,7 @@ void draw_text(const char* text, int x, int y) { } void draw_comp_set(float pos_ratio, comp_t **set, int size) { - int width = 0; + int width = (size - 1) * comp_gap; for (int i = 0; i < size; i++) { comp_t *comp = set[i]; width += font->max_advance_width * utf8_strlen(comp->data); @@ -146,6 +146,7 @@ void draw_comp_set(float pos_ratio, comp_t **set, int size) { draw_text(comp->data, x, y); x += font->max_advance_width * utf8_strlen(comp->data); + x += comp_gap; } } |
