diff options
| -rwxr-xr-x | examplebar.sh | 8 | ||||
| -rw-r--r-- | src/bardata.c | 6 | ||||
| -rw-r--r-- | src/tsar.c | 28 |
3 files changed, 35 insertions, 7 deletions
diff --git a/examplebar.sh b/examplebar.sh index eb52723..4a30fcd 100755 --- a/examplebar.sh +++ b/examplebar.sh @@ -1,6 +1,7 @@ #! /bin/sh -./tsarc config font "monospace:style=Regular" +# Put any monospace font here +./tsarc config font "Liberation Mono:style=Regular" ./tsarc create test_comp ./tsarc set test_comp -text "Testing spaces" @@ -10,7 +11,10 @@ ./tsarc create date -./tsarc layout -left test_comp sep date +./tsarc layout \ + -left test_comp sep date \ + -right test_comp \ + -center date while true; do ./tsarc set date -text "$(date)" diff --git a/src/bardata.c b/src/bardata.c index 493e9b1..507d8f9 100644 --- a/src/bardata.c +++ b/src/bardata.c @@ -103,4 +103,10 @@ void set_config(char argv[MAX_ARGS][MAX_ARG_LEN], int argc) { // fontsize = atoi(argv[2]); load_font(argv[2]); } + if (strcmp(var, "background") == 0) { + + } + if (strcmp(var, "foreground") == 0) { + + } } @@ -19,7 +19,7 @@ GC gc; XftFont* font = NULL; XftColor fg_color; -static int width = 1000; +static int bar_width = 1000; static float width_ratio = 1; static int err_code = 1; @@ -61,13 +61,13 @@ void init_x(void) { }; Screen* screen = DefaultScreenOfDisplay(display); - width = WidthOfScreen(screen); + bar_width = WidthOfScreen(screen); win = XCreateWindow( display, DefaultRootWindow(display), 0, 0, - width, bar_height, + bar_width, bar_height, 0, CopyFromParent, InputOutput, @@ -120,6 +120,22 @@ void draw_text(const char* text, int x, int y) { XftDrawDestroy(xft_draw); } +void draw_comp_set(float pos_ratio, comp_t **set, int size) { + int width = 0; + for (int i = 0; i < size; i++) { + comp_t *comp = set[i]; + width += font->max_advance_width * strlen(comp->data); + } + + int x = (bar_width - width) * pos_ratio; + for (int i = 0; i < size; i++) { + comp_t *comp = set[i]; + + draw_text(comp->data, x, 0); + x += font->max_advance_width * strlen(comp->data); + } +} + int main(void) { init_pipe(); init_x(); @@ -130,8 +146,7 @@ int main(void) { XNextEvent(display, &ev); XClearWindow(display, win); - - XResizeWindow(display, win, width, bar_height); + XResizeWindow(display, win, bar_width, bar_height); int x = 0; for (int i = 0; i < left_size; i++) { @@ -139,6 +154,9 @@ int main(void) { draw_text(comp->data, x, 0); x += font->max_advance_width * strlen(comp->data); } + draw_comp_set(0, comps_left, left_size); + draw_comp_set(0.5, comps_center, center_size); + draw_comp_set(1, comps_right, right_size); XFlush(display); await_change(); |