From cf5306d92c245d3ed355ce0a972db43ed3786ef8 Mon Sep 17 00:00:00 2001 From: sewn Date: Sun, 10 Nov 2024 19:10:34 +0300 Subject: [PATCH] change default layout names, add ><> --- config.def.h | 5 +++-- dam-demo.jpg | Bin 13384 -> 14018 bytes dam.c | 11 +++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.def.h b/config.def.h index 9cf9278..838cd7a 100644 --- a/config.def.h +++ b/config.def.h @@ -14,10 +14,11 @@ static char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; /* layout name replacement values */ static const char *layouts[][2] = { /* layout name replace */ - { "rivertile - left", "=[]" }, - { "rivertile - right", "[]=" }, + { "rivertile - left", "[]=" }, + { "rivertile - right", "=[]" }, { "rivertile - top", "[^]" }, { "rivertile - bottom", "[_]" }, + { NULL, "><>" }, /* no layout, last layout */ }; static const char *termcmd[] = { "foot", NULL }; diff --git a/dam-demo.jpg b/dam-demo.jpg index 4c28506d72ed6ee7edf08b5edd23464c05e698f1..2700221b2c3ae187999649b41da9e3b246a7efc3 100644 GIT binary patch literal 14018 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 OzpMA(01)YE?*9QOwa91y literal 13384 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 Twi1_Ibmq7J_q|$#=f(d8NWWI) diff --git a/dam.c b/dam.c index c98e7c4..03e6a57 100644 --- a/dam.c +++ b/dam.c @@ -254,11 +254,10 @@ bar_draw(Bar *bar) x = drwl_text(bar->drw, x, 0, w, bar->height, bar->lrpad / 2, mode, 0); } - if (bar->layout) { - w = TEXTW(bar, bar->layout); - drwl_setscheme(bar->drw, colors[SchemeNorm]); - x = drwl_text(bar->drw, x, 0, w, bar->height, bar->lrpad / 2, bar->layout, 0); - } + bar->layout = bar->layout ? bar->layout : strdup(layouts[LENGTH(layouts)-1][1]); + w = TEXTW(bar, bar->layout); + drwl_setscheme(bar->drw, colors[SchemeNorm]); + x = drwl_text(bar->drw, x, 0, w, bar->height, bar->lrpad / 2, bar->layout, 0); if ((w = bar->width - tw - x) > bar->height) { if (bar->title) { @@ -354,7 +353,7 @@ output_status_handle_layout_name(void *data, if (bar->layout) free(bar->layout); for (i = 0; i < LENGTH(layouts); i++) - if (!strcmp(name, layouts[i][0])) + if (layouts[i][0] && !strcmp(name, layouts[i][0])) name = layouts[i][1]; bar->layout = strdup(name); bar_frame(bar);