mirror of
https://github.com/mintycube/dmenu.git
synced 2024-10-22 12:05:48 +00:00
0329c28407
The highlight feature by default overrides other colour schemes and may in the process partially or fully obscure that an item has already been output (or is scheduled for output using the multiselect patch). In this context the highlighting does not add any valuable information given that the user has already selected the item. Overall it seems more user-friendly to skip drawing highlights for outputted items.
60 lines
1.7 KiB
C
60 lines
1.7 KiB
C
static void
|
|
#if EMOJI_HIGHLIGHT_PATCH
|
|
drawhighlights(struct item *item, char *output, int x, int y, int maxw)
|
|
#else
|
|
drawhighlights(struct item *item, int x, int y, int maxw)
|
|
#endif // EMOJI_HIGHLIGHT_PATCH
|
|
{
|
|
char restorechar, tokens[sizeof text], *highlight, *token;
|
|
int indentx, highlightlen;
|
|
#if EMOJI_HIGHLIGHT_PATCH
|
|
char *itemtext = output;
|
|
#elif TSV_PATCH && !SEPARATOR_PATCH
|
|
char *itemtext = item->stext;
|
|
#else
|
|
char *itemtext = item->text;
|
|
#endif // EMOJI_HIGHLIGHT_PATCH | TSV_PATCH
|
|
|
|
/* Do not highlight items scheduled for output */
|
|
#if MULTI_SELECTION_PATCH
|
|
if (issel(item->id))
|
|
return;
|
|
#else
|
|
if (item->out)
|
|
return;
|
|
#endif // MULTI_SELECTION_PATCH
|
|
|
|
drw_setscheme(drw, scheme[item == sel ? SchemeSelHighlight : SchemeNormHighlight]);
|
|
strcpy(tokens, text);
|
|
for (token = strtok(tokens, " "); token; token = strtok(NULL, " ")) {
|
|
highlight = fstrstr(itemtext, token);
|
|
while (highlight) {
|
|
// Move item str end, calc width for highlight indent, & restore
|
|
highlightlen = highlight - itemtext;
|
|
restorechar = *highlight;
|
|
itemtext[highlightlen] = '\0';
|
|
indentx = TEXTW(itemtext);
|
|
itemtext[highlightlen] = restorechar;
|
|
|
|
// Move highlight str end, draw highlight, & restore
|
|
restorechar = highlight[strlen(token)];
|
|
highlight[strlen(token)] = '\0';
|
|
if (indentx - (lrpad / 2) - 1 < maxw)
|
|
drw_text(
|
|
drw,
|
|
x + indentx - (lrpad / 2) - 1,
|
|
y,
|
|
MIN(maxw - indentx, TEXTW(highlight) - lrpad),
|
|
bh, 0, highlight, 0
|
|
#if PANGO_PATCH
|
|
, True
|
|
#endif // PANGO_PATCH
|
|
);
|
|
highlight[strlen(token)] = restorechar;
|
|
|
|
if (strlen(highlight) - strlen(token) < strlen(token))
|
|
break;
|
|
highlight = fstrstr(highlight + strlen(token), token);
|
|
}
|
|
}
|
|
} |