Bar Modules - splits the bar functionality into individual segments that can be re-arranged

This commit is contained in:
Bakkeby
2022-01-10 14:06:10 +01:00
committed by Zoe Roux
parent e1d12a7c1e
commit 83230de4a2
14 changed files with 497 additions and 107 deletions
+17
View File
@@ -0,0 +1,17 @@
int
width_ltsymbol(Bar *bar, BarWidthArg *a)
{
return TEXTW(bar->mon->ltsymbol);
}
int
draw_ltsymbol(Bar *bar, BarDrawArg *a)
{
return drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, bar->mon->ltsymbol, 0);
}
int
click_ltsymbol(Bar *bar, Arg *arg, BarClickArg *a)
{
return ClkLtSymbol;
}
+3
View File
@@ -0,0 +1,3 @@
static int width_ltsymbol(Bar *bar, BarWidthArg *a);
static int draw_ltsymbol(Bar *bar, BarDrawArg *a);
static int click_ltsymbol(Bar *bar, Arg *arg, BarClickArg *a);
+19
View File
@@ -0,0 +1,19 @@
int
width_status(Bar *bar, BarWidthArg *a)
{
return TEXTW(stext);
}
int
draw_status(Bar *bar, BarDrawArg *a)
{
return drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, stext, 0);
}
int
click_status(Bar *bar, Arg *arg, BarClickArg *a)
{
return ClkStatusText;
}
+3
View File
@@ -0,0 +1,3 @@
static int width_status(Bar *bar, BarWidthArg *a);
static int draw_status(Bar *bar, BarDrawArg *a);
static int click_status(Bar *bar, Arg *arg, BarClickArg *a);
+55
View File
@@ -0,0 +1,55 @@
int
width_tags(Bar *bar, BarWidthArg *a)
{
int w, i;
for (w = 0, i = 0; i < LENGTH(tags); i++) {
w += TEXTW(tags[i]);
}
return w;
}
int
draw_tags(Bar *bar, BarDrawArg *a)
{
int invert;
int w, x = a->x;
int boxs = drw->fonts->h / 9;
int boxw = drw->fonts->h / 6 + 2;
unsigned int i, occ = 0, urg = 0;
Client *c;
Monitor *m = bar->mon;
for (c = m->cl->clients; c; c = c->next) {
occ |= c->tags;
if (c->isurgent)
urg |= c->tags;
}
for (i = 0; i < LENGTH(tags); i++) {
invert = urg & 1 << i;
w = TEXTW(tags[i]);
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], invert);
if (occ & 1 << i)
drw_rect(drw, x + boxs, boxs, boxw, boxw,
m == selmon && selmon->sel && selmon->sel->tags & 1 << i, invert);
x += w;
}
return x;
}
int
click_tags(Bar *bar, Arg *arg, BarClickArg *a)
{
int i = 0, x = lrpad / 2;
do {
x += TEXTW(tags[i]);
} while (a->rel_x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) {
arg->ui = 1 << i;
}
return ClkTagBar;
}
+3
View File
@@ -0,0 +1,3 @@
static int width_tags(Bar *bar, BarWidthArg *a);
static int draw_tags(Bar *bar, BarDrawArg *a);
static int click_tags(Bar *bar, Arg *arg, BarClickArg *a);
+31
View File
@@ -0,0 +1,31 @@
int
width_wintitle(Bar *bar, BarWidthArg *a)
{
return a->max_width;
}
int
draw_wintitle(Bar *bar, BarDrawArg *a)
{
int boxs = drw->fonts->h / 9;
int boxw = drw->fonts->h / 6 + 2;
int x = a->x, w = a->w;
Monitor *m = bar->mon;
if (m->sel) {
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
if (m->sel->isfloating)
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
} else {
drw_setscheme(drw, scheme[SchemeNorm]);
drw_rect(drw, x, 0, w, bh, 1, 1);
}
return x + w;
}
int
click_wintitle(Bar *bar, Arg *arg, BarClickArg *a)
{
return ClkWinTitle;
}
+3
View File
@@ -0,0 +1,3 @@
static int width_wintitle(Bar *bar, BarWidthArg *a);
static int draw_wintitle(Bar *bar, BarDrawArg *a);
static int click_wintitle(Bar *bar, Arg *arg, BarClickArg *a);
+5
View File
@@ -0,0 +1,5 @@
/* Bar functionality */
#include "bar_ltsymbol.c"
#include "bar_status.c"
#include "bar_tags.c"
#include "bar_wintitle.c"
+5
View File
@@ -0,0 +1,5 @@
/* Bar functionality */
#include "bar_ltsymbol.h"
#include "bar_status.h"
#include "bar_tags.h"
#include "bar_wintitle.h"