mirror of
https://github.com/mintycube/dmenu.git
synced 2024-10-22 14:05:48 +02:00
Compare commits
No commits in common. "b820f2c1feceafdc30af00eb935ad73ebad756f2" and "cde29093ca07b2753ebe2fa6a79db24ab60ccb8c" have entirely different histories.
b820f2c1fe
...
cde29093ca
8
dmenu.c
8
dmenu.c
@ -647,18 +647,10 @@ drawmenu(void)
|
||||
} else if (matches) {
|
||||
/* draw horizontal list */
|
||||
x += inputw;
|
||||
#if SYMBOLS_PATCH
|
||||
w = TEXTW(symbol_1);
|
||||
#else
|
||||
w = TEXTW("<");
|
||||
#endif // SYMBOLS_PATCH
|
||||
if (curr->left) {
|
||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||
#if SYMBOLS_PATCH
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, symbol_1, 0
|
||||
#else
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0
|
||||
#endif // SYMBOLS_PATCH
|
||||
#if PANGO_PATCH
|
||||
, True
|
||||
#endif // PANGO_PATCH
|
||||
|
@ -25,7 +25,6 @@ drw_text_align(Drw *drw, int x, int y, unsigned int w, unsigned int h, const cha
|
||||
FcPattern *match;
|
||||
XftResult result;
|
||||
int charexists = 0;
|
||||
int utf8err = 0;
|
||||
int i, n;
|
||||
|
||||
if (!drw || (render && !drw->scheme) || !text || !drw->fonts || textlen <= 0
|
||||
@ -57,14 +56,14 @@ drw_text_align(Drw *drw, int x, int y, unsigned int w, unsigned int h, const cha
|
||||
|
||||
while ((align == AlignL && i < textlen) || (align == AlignR && i > 0)) {
|
||||
if (align == AlignL) {
|
||||
utf8charlen = utf8decode(text + i, &utf8codepoint, &utf8err);
|
||||
utf8charlen = utf8decode(text + i, &utf8codepoint, MIN(textlen - i, UTF_SIZ));
|
||||
if (!utf8charlen) {
|
||||
textlen = i;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
n = utf8nextchar(text, textlen, i, -1);
|
||||
utf8charlen = utf8decode(text + n, &utf8codepoint, &utf8err);
|
||||
utf8charlen = utf8decode(text + n, &utf8codepoint, MIN(textlen - n, UTF_SIZ));
|
||||
if (!utf8charlen) {
|
||||
textlen -= i;
|
||||
text += i;
|
||||
|
Loading…
Reference in New Issue
Block a user