diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bemenu.h | 19 | ||||
| -rw-r--r-- | lib/internal.h | 6 | ||||
| -rw-r--r-- | lib/menu.c | 17 | ||||
| -rw-r--r-- | lib/renderers/cairo.h | 13 | ||||
| -rw-r--r-- | lib/renderers/curses/curses.c | 10 |
5 files changed, 60 insertions, 5 deletions
diff --git a/lib/bemenu.h b/lib/bemenu.h index c52135d..b4a6423 100644 --- a/lib/bemenu.h +++ b/lib/bemenu.h @@ -253,10 +253,27 @@ void bm_menu_set_userdata(struct bm_menu *menu, void *userdata); void* bm_menu_get_userdata(struct bm_menu *menu); /** + * Set highlight prefix. + * This is shown on vertical list mode only. + * + * @param menu bm_menu instance where to set highlight prefix. + * @param prefix Null terminated C "string" to act as prefix for highlighted item. May be set **NULL** for none. + */ +void bm_menu_set_prefix(struct bm_menu *menu, const char *prefix); + +/** + * Get highlight prefix. + * + * @param menu bm_menu instance where to get highlight prefix. + * @param Const pointer to current highlight prefix, may be **NULL** if empty. + */ +const char* bm_menu_get_prefix(struct bm_menu *menu); + +/** * Set filter text to bm_menu instance. * * @param menu bm_menu instance where to set filter. - * @param filter Null terminated C "string" to act as filter. + * @param filter Null terminated C "string" to act as filter. May be set **NULL** for none. */ void bm_menu_set_filter(struct bm_menu *menu, const char *filter); diff --git a/lib/internal.h b/lib/internal.h index b9b4a5e..e22c546 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -211,6 +211,12 @@ struct bm_menu { struct bm_hex_color colors[BM_COLOR_LAST]; /** + * Prefix shown for highlighted item. + * Vertical mode only. + */ + char *prefix; + + /** * Text used to filter matches. */ char *filter; @@ -136,12 +136,27 @@ bm_menu_get_userdata(struct bm_menu *menu) } void +bm_menu_set_prefix(struct bm_menu *menu, const char *prefix) +{ + assert(menu); + free(menu->prefix); + menu->prefix = (prefix && strlen(prefix) > 0 ? bm_strdup(prefix) : NULL); +} + +const char* +bm_menu_get_prefix(struct bm_menu *menu) +{ + assert(menu); + return menu->prefix; +} + +void bm_menu_set_filter(struct bm_menu *menu, const char *filter) { assert(menu); free(menu->filter); - menu->filter = (filter ? bm_strdup(filter) : NULL); + menu->filter = (filter && strlen(filter) > 0 ? bm_strdup(filter) : NULL); menu->filter_size = (filter ? strlen(filter) : 0); } diff --git a/lib/renderers/cairo.h b/lib/renderers/cairo.h index 3132c09..32f8131 100644 --- a/lib/renderers/cairo.h +++ b/lib/renderers/cairo.h @@ -129,6 +129,12 @@ bm_cairo_paint(struct cairo *cairo, uint32_t width, uint32_t height, const struc uint32_t displayed = 1; uint32_t lines = MAX(height / paint.fe.height, menu->lines); if (lines > 1) { + uint32_t start_x = 0; + if (menu->prefix) { + bm_cairo_get_text_extents(cairo, &result, "%s ", menu->prefix); + start_x = result.te.x_advance; + } + uint32_t count, cl = 1; struct bm_item **items = bm_menu_get_filtered_items(menu, &count); for (uint32_t i = (menu->index / (lines - 1)) * (lines - 1); i < count && cl < lines; ++i) { @@ -145,8 +151,11 @@ bm_cairo_paint(struct cairo *cairo, uint32_t width, uint32_t height, const struc bm_cairo_color_from_menu_color(menu, BM_COLOR_ITEM_BG, &paint.bg); } - bm_cairo_draw_line(cairo, &paint, &result, 0, width, 0, 4 + paint.fe.height * cl++, - "%s%s", (highlighted ? ">> " : " "), (items[i]->text ? items[i]->text : "")); + if (menu->prefix && highlighted) { + bm_cairo_draw_line(cairo, &paint, &result, 0, width, 0, 4 + paint.fe.height * cl++, "%s %s", menu->prefix, (items[i]->text ? items[i]->text : "")); + } else { + bm_cairo_draw_line(cairo, &paint, &result, start_x, width, start_x, 4 + paint.fe.height * cl++, "%s", (items[i]->text ? items[i]->text : "")); + } ++displayed; } diff --git a/lib/renderers/curses/curses.c b/lib/renderers/curses/curses.c index 11dfa2d..7923c93 100644 --- a/lib/renderers/curses/curses.c +++ b/lib/renderers/curses/curses.c @@ -194,7 +194,15 @@ render(const struct bm_menu *menu) for (uint32_t i = (menu->index / (lines - 1)) * (lines - 1); i < count && cl < lines; ++i) { bool highlighted = (items[i] == bm_menu_get_highlighted_item(menu)); int32_t color = (highlighted ? 2 : (bm_menu_item_is_selected(menu, items[i]) ? 1 : 0)); - draw_line(color, cl++, "%s%s", (highlighted ? ">> " : " "), (items[i]->text ? items[i]->text : "")); + + if (menu->prefix && highlighted) { + draw_line(color, cl++, "%s %s", menu->prefix, (items[i]->text ? items[i]->text : "")); + } else if (menu->prefix) { + int32_t offset = (menu->prefix ? bm_utf8_string_screen_width(menu->prefix) : 0); + draw_line(color, cl++, "%*s %s", offset, "", (items[i]->text ? items[i]->text : "")); + } else { + draw_line(color, cl++, "%s", (items[i]->text ? items[i]->text : "")); + } } } |