From 9ad69fb4b4f7ddad68045733bd90588acde1570a Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Sat, 25 Oct 2014 20:57:30 +0300 Subject: [PATCH] Sort items in bemenu-run. --- client/bemenu-run.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/client/bemenu-run.c b/client/bemenu-run.c index 6c7228d..3ffb28d 100644 --- a/client/bemenu-run.c +++ b/client/bemenu-run.c @@ -84,6 +84,13 @@ get_paths(const char *env, const char *default_paths, struct paths *state) return strip_slash(path); } +static int +compare(const void *a, const void *b) +{ + const struct bm_item *ia = *(struct bm_item**)a, *ib = *(struct bm_item**)b; + return strcmp(bm_item_get_text(ia), bm_item_get_text(ib)); +} + static void read_items_to_menu_from_dir(struct bm_menu *menu, const char *path) { @@ -98,7 +105,7 @@ read_items_to_menu_from_dir(struct bm_menu *menu, const char *path) memset(&file, 0, sizeof(file)); tinydir_readfile(&dir, &file); - if (!file.is_dir) { + if (!file.is_dir && file.name) { struct bm_item *item; if (!(item = bm_item_new(file.name))) break; @@ -110,6 +117,10 @@ read_items_to_menu_from_dir(struct bm_menu *menu, const char *path) } tinydir_close(&dir); + + uint32_t count; + struct bm_item **items = bm_menu_get_items(menu, &count); + qsort(items, count, sizeof(struct bm_item*), compare); } static void