Lucas-mother3/spmenu
1
0
Fork 0
forked from speedie/spmenu
Code Pull requests Activity

cleanup drw_text lines by setting an integer depending on whether or not

Browse source 
USERTL is true once globally
This commit is contained in:
speedie 2023-03-02 17:51:25 +01:00
parent fbfdfe2583
commit 327636b0ee
4 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libs/draw.c
View file

@ -58,12 +58,8 @@ drawitem(struct item *item, int x, int y, int w)
/* draw text */
rw = TEXTWM(buffer) - lrpad;
#if USERTL
apply_fribidi(buffer);
drw_text(drw, x, y, rw + lp, bh, lp, fribidi_text, 0, pango_item ? True : False);
#else
drw_text(drw, x, y, rw + lp, bh, lp, buffer, 0, pango_item ? True : False);
#endif
drw_text(drw, x, y, rw + lp, bh, lp, isrtl ? fribidi_text : buffer, 0, pango_item ? True : False);
x += rw + lp;
ib = 1;
@ -108,12 +104,8 @@ drawitem(struct item *item, int x, int y, int w)
buffer[wr] = '\0';
/* draw any text that doesn't use sgr sequences */
#if USERTL
apply_fribidi(buffer);
int r = drw_text(drw, x, y, w - rw, bh, lp, fribidi_text, 0, pango_item ? True : False);
#else
int r = drw_text(drw, x, y, w - rw, bh, lp, buffer, 0, pango_item ? True : False);
#endif
int r = drw_text(drw, x, y, w - rw, bh, lp, isrtl ? fribidi_text : buffer, 0, pango_item ? True : False);
if (!hidehighlight && !ib) drawhighlights(item, x, y, w - rw);
return r;
@ -130,8 +122,15 @@ drawmenu(void)
drw_setscheme(drw, scheme[SchemeMenu]);
drw_rect(drw, 0, 0, mw, mh, 1, 1);
if (hidemode)
strcpy(modetext, "");
int numberWidth = 0;
int modeWidth = 0;
int larrowWidth = 0;
int rarrowWidth = 0;
if (!hidematchcount) numberWidth = TEXTW(numbers);
if (!hidemode) modeWidth = TEXTW(modetext);
if (!hidelarrow) larrowWidth = TEXTW(leftarrow);
if (!hiderarrow) rarrowWidth = TEXTW(rightarrow);
if (prompt && *prompt) {
if (colorprompt) {
@ -146,23 +145,18 @@ drawmenu(void)
if (passwd) {
censort = ecalloc(1, sizeof(text));
memset(censort, '.', strlen(text));
#if USERTL
apply_fribidi(censort);
drw_text(drw, x, 0, w, bh, lrpad / 2, fribidi_text, 0, pango_password ? True : False);
#else
drw_text(drw, x, 0, w - LENGTH(censort), bh, lrpad / 2, censort, 0, pango_password ? True : False);
#endif
drw_text(drw, x, 0, w, bh, lrpad / 2, isrtl ? fribidi_text : censort, 0, pango_password ? True : False);
curpos = TEXTW(censort) - TEXTW(&text[cursor]);
free(censort);
} else {
#if USERTL
} else if (!passwd) {
apply_fribidi(text);
drw_text(drw, x, 0, w, bh, lrpad / 2, fribidi_text, 0, pango_input ? True : False);
#else
drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0, pango_input ? True : False);
#endif
drw_text(drw, x, 0, w, bh, lrpad / 2, isrtl ? fribidi_text : text, 0, pango_input ? True : False);
curpos = TEXTW(text) - TEXTW(&text[cursor]);
}
curpos = TEXTW(text) - TEXTW(&text[cursor]);
if ((curpos += lrpad / 2 - 1) < w) {
drw_setscheme(drw, scheme[SchemeCaret]);
drw_rect(drw, x + curpos, 2 + (bh - fh) / 2, 2, fh - 4, 1, 0);

3
libs/rtl.c
View file

@ -1,6 +1,9 @@
void
apply_fribidi(char *str)
{
#if !USERTL
return;
#endif
FriBidiStrIndex len = strlen(str);
FriBidiChar logical[BUFSIZ];
FriBidiChar visual[BUFSIZ];

2
options.h
View file

@ -65,6 +65,8 @@ static char *prompt = NULL; /* Default prompt, set to NULL (n
/* Hide options */
static int hidematchcount = 0; /* Hide match count (0/1) */
static int hidemode = 0; /* Hide mode (0/1) */
static int hidelarrow = 0; /* Hide left arrow (0/1) */
static int hiderarrow = 0; /* Hide right arrow (0/1) */
static int hidehighlight = 0; /* Hide highlight (0/1) */
static int hideimage = 0; /* Hide image (0/1) */

26
spmenu.c
View file

@ -121,6 +121,12 @@ static struct item *prev, *curr, *next, *sel;
static int mon = -1, screen;
static int managed = 0;
#if USERTL
static int isrtl = 1;
#else
static int isrtl = 0;
#endif
#include "libs/mode.h"
static Atom clip, utf8, types, dock;
@ -269,13 +275,19 @@ calcoffsets(void)
if (lines > 0)
n = lines * columns * bh;
else
/* hide match count */
if (hidematchcount) {
n = mw - (promptw + inputw + TEXTW(leftarrow) + TEXTW(rightarrow) + TEXTW(modetext));
} else {
n = mw - (promptw + inputw + TEXTW(leftarrow) + TEXTW(rightarrow) + TEXTW(numbers) + TEXTW(modetext));
}
else {
int numberWidth = 0;
int modeWidth = 0;
int larrowWidth = 0;
int rarrowWidth = 0;
if (!hidematchcount) numberWidth = TEXTW(numbers);
if (!hidemode) modeWidth = TEXTW(modetext);
if (!hidelarrow) larrowWidth = TEXTW(leftarrow);
if (!hiderarrow) rarrowWidth = TEXTW(rightarrow);
n = mw - (promptw + inputw + larrowWidth + rarrowWidth + modeWidth + numberWidth);
}
/* calculate which items will begin the next page and previous page */
for (i = 0, next = curr; next; next = next->right)
if ((i += (lines > 0) ? bh : MIN(TEXTWM(next->text), n)) > n)