From 67be25fbe43274340de89049fec7098cdf998b47 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Thu, 10 Apr 2014 01:09:35 +0300
Subject: Basic working bemenu with curses backend

---
 lib/util.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 226 insertions(+)
 create mode 100644 lib/util.c

(limited to 'lib/util.c')

diff --git a/lib/util.c b/lib/util.c
new file mode 100644
index 0000000..8c9bc0f
--- /dev/null
+++ b/lib/util.c
@@ -0,0 +1,226 @@
+/**
+ * @file util.c
+ */
+
+#include "internal.h"
+#define _XOPEN_SOURCE 700
+#include <wchar.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+
+/**
+ * Portable strdup.
+ *
+ * @param string C "string" to copy.
+ * @return Copy of the given C "string".
+ */
+char* _bmStrdup(const char *string)
+{
+    size_t len = strlen(string);
+    if (len == 0)
+        return NULL;
+
+    void *copy = calloc(1, len + 1);
+    if (copy == NULL)
+        return NULL;
+
+    return (char *)memcpy(copy, string, len);
+}
+
+/**
+ * Shrink bmItem** list pointer.
+ *
+ * Useful helper function for filter functions.
+ *
+ * @param list Pointer to pointer to list of bmItem pointers.
+ * @param osize Current size of the list.
+ * @param nsize New size the list will be shrinked to.
+ * @return Pointer to list of bmItem pointers.
+ */
+bmItem** _bmShrinkItemList(bmItem ***list, size_t osize, size_t nsize)
+{
+    if (nsize >= osize)
+        return *list;
+
+    void *tmp = malloc(sizeof(bmItem*) * nsize);
+    if (!tmp)
+        return *list;
+
+    memcpy(tmp, *list, sizeof(bmItem*) * nsize);
+    free(*list);
+    *list = tmp;
+    return *list;
+}
+
+/**
+ * Determite columns needed to display UTF8 string.
+ *
+ * @param string C "string" to determite.
+ * @return Number of columns, or -1 on failure.
+ */
+int _bmUtf8StringScreenWidth(const char *string)
+{
+    if (!string)
+        return 0;
+
+    int num_char = mbstowcs(NULL, string, 0) + 1;
+    wchar_t *wstring = malloc((num_char + 1) * sizeof (wstring[0]));
+
+    if (mbstowcs(wstring, string, num_char) == (size_t)(-1)) {
+        free(wstring);
+        return strlen(string);
+    }
+
+    int length = wcswidth(wstring, num_char);
+    free(wstring);
+    return length;
+}
+
+/**
+ * Figure out how many bytes to shift to next UTF8 rune.
+ *
+ * @param string C "string" which contains the runes.
+ * @param start Offset where to figure out next rune. (cursor)
+ * @return Number of bytes to next UTF8 rune.
+ */
+size_t _bmUtf8RuneNext(const char *string, size_t start)
+{
+    assert(string != NULL);
+
+    size_t len = strlen(string), i = start;
+    if (len == 0 || len <= i || !*string)
+        return 0;
+
+    while (++i < len && (string[i] & 0xc0) == 0x80);
+    return i - start;
+}
+
+/**
+ * Figure out how many bytes to shift to previous UTF8 rune.
+ *
+ * @param string C "string" which contains the runes.
+ * @param start Offset where to figure out previous rune. (cursor)
+ * @return Number of bytes to previous UTF8 rune.
+ */
+size_t _bmUtf8RunePrev(const char *string, size_t start)
+{
+    assert(string != NULL);
+
+    size_t len = strlen(string), i = start;
+    if (i == 0 || len < start || !*string)
+        return 0;
+
+    while (--i > 0 && (string[i] & 0xc0) == 0x80);
+    return start - i;
+}
+
+/**
+ * Figure out how many columns are needed to display UTF8 rune.
+ *
+ * @param rune Buffer which contains the rune.
+ * @param u8len Byte length of the rune.
+ * @return Number of columns, or -1 on failure.
+ */
+size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len)
+{
+    assert(rune != NULL);
+    char mb[5] = { 0, 0, 0, 0, 0 };
+    memcpy(mb, rune, (u8len > 4 ? 4 : u8len));
+    return _bmUtf8StringScreenWidth(mb);
+}
+
+/**
+ * Remove previous UTF8 rune from buffer.
+ *
+ * @param string Null terminated C "string".
+ * @param start Start offset where to delete from. (cursor)
+ * @param runeWidth Reference to size_t, return number of columns for removed rune, or -1 on failure.
+ * @return Number of bytes removed from buffer.
+ */
+size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
+{
+    assert(string != NULL);
+
+    if (runeWidth)
+        *runeWidth = 0;
+
+    size_t len = strlen(string), oldStart = start;
+    if (len == 0 || len < start || !*string)
+        return 0;
+
+    start -= _bmUtf8RunePrev(string, start);
+
+    if (runeWidth)
+        *runeWidth = _bmUtf8RuneWidth(string + start, oldStart - start);
+
+    memmove(string + start, string + oldStart, len - oldStart);
+    string[len - (oldStart - start)] = 0;
+    return (oldStart - start);
+}
+
+/**
+ * Insert UTF8 rune to buffer.
+ *
+ * @param string Null terminated C "string".
+ * @param bufSize Size of the buffer.
+ * @param start Start offset where to insert to. (cursor)
+ * @param rune Buffer to insert to string.
+ * @param u8len Byte length of the rune.
+ * @param runeWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
+ * @return Number of bytes inserted to buffer.
+ */
+size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *runeWidth)
+{
+    assert(string != NULL);
+
+    if (runeWidth)
+        *runeWidth = 0;
+
+    size_t len = strlen(string);
+    if (len + u8len >= bufSize)
+        return 0;
+
+    if (u8len == 1 && iscntrl(*rune))
+        return 0;
+
+    char *str = string + start;
+    memmove(str + u8len, str, len - start);
+    memcpy(str, rune, u8len);
+
+    if (runeWidth)
+        *runeWidth = _bmUtf8RuneWidth(rune, u8len);
+    return u8len;
+}
+
+/**
+ * Insert unicode character to UTF8 buffer.
+ *
+ * @param string Null terminated C "string".
+ * @param bufSize Size of the buffer.
+ * @param start Start offset where to insert to. (cursor)
+ * @param unicode Unicode character to insert.
+ * @param runeWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
+ * @return Number of bytes inserted to buffer.
+ */
+size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *runeWidth)
+{
+    assert(string != NULL);
+
+    char u8len = ((unicode < 0x80) ? 1 : ((unicode < 0x800) ? 2 : ((unicode < 0x10000) ? 3 : 4)));
+    char mb[5] = { 0, 0, 0, 0 };
+
+    if (u8len == 1) {
+        mb[0] = unicode;
+    } else {
+        size_t i, j;
+        for (i = j = u8len; j > 1; --j) mb[j - 1] = 0x80 | (0x3F & (unicode >> ((i - j) * 6)));
+        mb[0] = (~0) << (8 - i);
+        mb[0] |= (unicode >> (i * 6 - 6));
+    }
+
+    return _bmUtf8RuneInsert(string, bufSize, start, mb, u8len, runeWidth);
+}
+
+/* vim: set ts=8 sw=4 tw=0 :*/
-- 
cgit v1.2.3-70-g09d2


From 4d920ad9e4aa344c1600e7419f75f6adb647b1b0 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Thu, 10 Apr 2014 01:41:32 +0300
Subject: Make asserts and ifs more consistent.

---
 client/client.c   | 10 +++++-----
 lib/draw/curses.c |  2 +-
 lib/filter.c      | 12 ++++++------
 lib/item.c        |  6 +++---
 lib/menu.c        | 42 +++++++++++++++++++++---------------------
 lib/util.c        | 19 +++++++++++--------
 test/bmMenuNew.c  |  2 +-
 7 files changed, 48 insertions(+), 45 deletions(-)

(limited to 'lib/util.c')

diff --git a/client/client.c b/client/client.c
index df56511..973e57a 100644
--- a/client/client.c
+++ b/client/client.c
@@ -17,22 +17,22 @@ static ptrdiff_t getLine(char **outLine, size_t *outAllocated, FILE *stream)
     size_t len = 0, allocated;
     char *s, *buffer;
 
-    assert(outLine != NULL);
-    assert(outAllocated != NULL);
+    assert(outLine);
+    assert(outAllocated);
 
-    if (stream == NULL || feof(stream) || ferror(stream))
+    if (!stream || feof(stream) || ferror(stream))
         return -1;
 
     allocated = *outAllocated;
     buffer = *outLine;
 
-    if (buffer == NULL || allocated == 0) {
+    if (!buffer || allocated == 0) {
         if (!(buffer = calloc(1, (allocated = 1024) + 1)))
             return -1;
     }
 
     for (s = buffer;;) {
-        if (fgets(s, allocated - (s - buffer), stream) == NULL) {
+        if (!fgets(s, allocated - (s - buffer), stream)) {
             *outAllocated = allocated;
             *outLine = buffer;
             return -1;
diff --git a/lib/draw/curses.c b/lib/draw/curses.c
index 5c6ff4a..3582be5 100644
--- a/lib/draw/curses.c
+++ b/lib/draw/curses.c
@@ -139,7 +139,7 @@ static void _bmDrawCursesEndWin(void)
 
 static bmKey _bmDrawCursesGetKey(unsigned int *unicode)
 {
-    assert(unicode != NULL);
+    assert(unicode);
     *unicode = 0;
 
     if (!curses.stdscr)
diff --git a/lib/filter.c b/lib/filter.c
index b1cf668..d301415 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -17,9 +17,9 @@
  */
 bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *count, unsigned int *selected)
 {
-    assert(menu != NULL);
-    assert(count != NULL);
-    assert(selected != NULL);
+    assert(menu);
+    assert(count);
+    assert(selected);
     *count = *selected = 0;
 
     /* FIXME: not real dmenu like filtering at all */
@@ -51,9 +51,9 @@ bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *count, unsigned int *selecte
  */
 bmItem** _bmFilterDmenuCaseInsensitive(bmMenu *menu, unsigned int *count, unsigned int *selected)
 {
-    assert(menu != NULL);
-    assert(count != NULL);
-    assert(selected != NULL);
+    assert(menu);
+    assert(count);
+    assert(selected);
     *count = *selected = 0;
 
     /* FIXME: stub */
diff --git a/lib/item.c b/lib/item.c
index 40ebb52..beca6ed 100644
--- a/lib/item.c
+++ b/lib/item.c
@@ -31,7 +31,7 @@ bmItem* bmItemNew(const char *text)
  */
 void bmItemFree(bmItem *item)
 {
-    assert(item != NULL);
+    assert(item);
 
     if (item->text)
         free(item->text);
@@ -47,7 +47,7 @@ void bmItemFree(bmItem *item)
  */
 int bmItemSetText(bmItem *item, const char *text)
 {
-    assert(item != NULL);
+    assert(item);
 
     char *copy = NULL;
     if (text && !(copy = _bmStrdup(text)))
@@ -68,7 +68,7 @@ int bmItemSetText(bmItem *item, const char *text)
  */
 const char* bmItemGetText(const bmItem *item)
 {
-    assert(item != NULL);
+    assert(item);
     return item->text;
 }
 
diff --git a/lib/menu.c b/lib/menu.c
index 5ea046a..ccdbf0d 100644
--- a/lib/menu.c
+++ b/lib/menu.c
@@ -15,7 +15,7 @@ static bmItem** (*filterFunc[BM_FILTER_MODE_LAST])(bmMenu *menu, unsigned int *c
 
 static void _bmMenuFilter(bmMenu *menu)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     if (menu->filteredItems)
         free(menu->filteredItems);
@@ -90,7 +90,7 @@ bmMenu* bmMenuNew(bmDrawMode drawMode)
  */
 void bmMenuFree(bmMenu *menu)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     if (menu->renderApi.free)
         menu->renderApi.free();
@@ -112,7 +112,7 @@ void bmMenuFree(bmMenu *menu)
  */
 void bmMenuFreeItems(bmMenu *menu)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     unsigned int i;
     for (i = 0; i < menu->itemsCount; ++i)
@@ -131,7 +131,7 @@ void bmMenuFreeItems(bmMenu *menu)
  */
 void bmMenuSetFilterMode(bmMenu *menu, bmFilterMode mode)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     bmFilterMode oldMode = mode;
     menu->filterMode = (mode >= BM_FILTER_MODE_LAST ? BM_FILTER_MODE_DMENU : mode);
@@ -148,7 +148,7 @@ void bmMenuSetFilterMode(bmMenu *menu, bmFilterMode mode)
  */
 bmFilterMode bmMenuGetFilterMode(const bmMenu *menu)
 {
-    assert(menu != NULL);
+    assert(menu);
     return menu->filterMode;
 }
 
@@ -160,7 +160,7 @@ bmFilterMode bmMenuGetFilterMode(const bmMenu *menu)
  */
 int bmMenuSetTitle(bmMenu *menu, const char *title)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     char *copy = NULL;
     if (title && !(copy = _bmStrdup(title)))
@@ -181,7 +181,7 @@ int bmMenuSetTitle(bmMenu *menu, const char *title)
  */
 const char* bmMenuGetTitle(const bmMenu *menu)
 {
-    assert(menu != NULL);
+    assert(menu);
     return menu->title;
 }
 
@@ -195,8 +195,8 @@ const char* bmMenuGetTitle(const bmMenu *menu)
  */
 int bmMenuAddItemAt(bmMenu *menu, bmItem *item, unsigned int index)
 {
-    assert(menu != NULL);
-    assert(item != NULL);
+    assert(menu);
+    assert(item);
 
     if (menu->itemsCount >= menu->allocatedCount && !_bmMenuGrowItems(menu))
         return 0;
@@ -232,7 +232,7 @@ int bmMenuAddItem(bmMenu *menu, bmItem *item)
  */
 int bmMenuRemoveItemAt(bmMenu *menu, unsigned int index)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     unsigned int i = index;
     if (i >= menu->itemsCount)
@@ -251,8 +251,8 @@ int bmMenuRemoveItemAt(bmMenu *menu, unsigned int index)
  */
 int bmMenuRemoveItem(bmMenu *menu, bmItem *item)
 {
-    assert(menu != NULL);
-    assert(item != NULL);
+    assert(menu);
+    assert(item);
 
     unsigned int i;
     for (i = 0; i < menu->itemsCount && menu->items[i] != item; ++i);
@@ -267,7 +267,7 @@ int bmMenuRemoveItem(bmMenu *menu, bmItem *item)
  */
 bmItem* bmMenuGetSelectedItem(const bmMenu *menu)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     unsigned int count;
     bmItem **items = bmMenuGetFilteredItems(menu, &count);
@@ -287,7 +287,7 @@ bmItem* bmMenuGetSelectedItem(const bmMenu *menu)
  */
 bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     if (nmemb)
         *nmemb = menu->itemsCount;
@@ -307,7 +307,7 @@ bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb)
  */
 bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     if (nmemb)
         *nmemb = (menu->filteredItems ? menu->filteredCount : menu->itemsCount);
@@ -326,9 +326,9 @@ bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb)
  */
 int bmMenuSetItems(bmMenu *menu, const bmItem **items, unsigned int nmemb)
 {
-    assert(menu != NULL);
+    assert(menu);
 
-    if (items == NULL || nmemb == 0) {
+    if (!items || nmemb == 0) {
         bmMenuFreeItems(menu);
         return 1;
     }
@@ -353,7 +353,7 @@ int bmMenuSetItems(bmMenu *menu, const bmItem **items, unsigned int nmemb)
  */
 void bmMenuRender(const bmMenu *menu)
 {
-    assert(menu != NULL);
+    assert(menu);
 
     if (menu->renderApi.render)
         menu->renderApi.render(menu);
@@ -370,8 +370,8 @@ void bmMenuRender(const bmMenu *menu)
  */
 bmKey bmMenuGetKey(bmMenu *menu, unsigned int *unicode)
 {
-    assert(menu != NULL);
-    assert(unicode != NULL);
+    assert(menu);
+    assert(unicode);
 
     *unicode = 0;
     bmKey key = BM_KEY_NONE;
@@ -390,7 +390,7 @@ bmKey bmMenuGetKey(bmMenu *menu, unsigned int *unicode)
  */
 bmRunResult bmMenuRunWithKey(bmMenu *menu, bmKey key, unsigned int unicode)
 {
-    assert(menu != NULL);
+    assert(menu);
     char *oldFilter = _bmStrdup(menu->filter);
     unsigned int itemsCount = (menu->filteredItems ? menu->filteredCount : menu->itemsCount);
 
diff --git a/lib/util.c b/lib/util.c
index 8c9bc0f..d948b05 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -18,6 +18,8 @@
  */
 char* _bmStrdup(const char *string)
 {
+    assert(string);
+
     size_t len = strlen(string);
     if (len == 0)
         return NULL;
@@ -41,6 +43,8 @@ char* _bmStrdup(const char *string)
  */
 bmItem** _bmShrinkItemList(bmItem ***list, size_t osize, size_t nsize)
 {
+    assert(list);
+
     if (nsize >= osize)
         return *list;
 
@@ -62,8 +66,7 @@ bmItem** _bmShrinkItemList(bmItem ***list, size_t osize, size_t nsize)
  */
 int _bmUtf8StringScreenWidth(const char *string)
 {
-    if (!string)
-        return 0;
+    assert(string);
 
     int num_char = mbstowcs(NULL, string, 0) + 1;
     wchar_t *wstring = malloc((num_char + 1) * sizeof (wstring[0]));
@@ -87,7 +90,7 @@ int _bmUtf8StringScreenWidth(const char *string)
  */
 size_t _bmUtf8RuneNext(const char *string, size_t start)
 {
-    assert(string != NULL);
+    assert(string);
 
     size_t len = strlen(string), i = start;
     if (len == 0 || len <= i || !*string)
@@ -106,7 +109,7 @@ size_t _bmUtf8RuneNext(const char *string, size_t start)
  */
 size_t _bmUtf8RunePrev(const char *string, size_t start)
 {
-    assert(string != NULL);
+    assert(string);
 
     size_t len = strlen(string), i = start;
     if (i == 0 || len < start || !*string)
@@ -125,7 +128,7 @@ size_t _bmUtf8RunePrev(const char *string, size_t start)
  */
 size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len)
 {
-    assert(rune != NULL);
+    assert(rune);
     char mb[5] = { 0, 0, 0, 0, 0 };
     memcpy(mb, rune, (u8len > 4 ? 4 : u8len));
     return _bmUtf8StringScreenWidth(mb);
@@ -141,7 +144,7 @@ size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len)
  */
 size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
 {
-    assert(string != NULL);
+    assert(string);
 
     if (runeWidth)
         *runeWidth = 0;
@@ -173,7 +176,7 @@ size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
  */
 size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *runeWidth)
 {
-    assert(string != NULL);
+    assert(string);
 
     if (runeWidth)
         *runeWidth = 0;
@@ -206,7 +209,7 @@ size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char
  */
 size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *runeWidth)
 {
-    assert(string != NULL);
+    assert(string);
 
     char u8len = ((unicode < 0x80) ? 1 : ((unicode < 0x800) ? 2 : ((unicode < 0x10000) ? 3 : 4)));
     char mb[5] = { 0, 0, 0, 0 };
diff --git a/test/bmMenuNew.c b/test/bmMenuNew.c
index e1b6161..ccb572d 100644
--- a/test/bmMenuNew.c
+++ b/test/bmMenuNew.c
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
         bmDrawMode i;
         for (i = 0; i < BM_DRAW_MODE_LAST; ++i) {
             bmMenu *menu = bmMenuNew(i);
-            assert(menu != NULL);
+            assert(menu);
             bmMenuRender(menu);
             bmMenuFree(menu);
         }
-- 
cgit v1.2.3-70-g09d2


From ff8ad3a804459ddc4e407b688b093b6f4543cf53 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Thu, 10 Apr 2014 11:08:10 +0300
Subject: Remove @file from non-public library files.

---
 lib/draw/curses.c | 4 ----
 lib/filter.c      | 4 ----
 lib/internal.h    | 4 ----
 lib/item.c        | 4 ----
 lib/menu.c        | 4 ----
 lib/util.c        | 4 ----
 6 files changed, 24 deletions(-)

(limited to 'lib/util.c')

diff --git a/lib/draw/curses.c b/lib/draw/curses.c
index eecfcba..a0f5351 100644
--- a/lib/draw/curses.c
+++ b/lib/draw/curses.c
@@ -1,7 +1,3 @@
-/**
- * @file curses.c
- */
-
 #include "../internal.h"
 #include <wchar.h>
 #include <string.h>
diff --git a/lib/filter.c b/lib/filter.c
index d301415..92e5683 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -1,7 +1,3 @@
-/**
- * @file filter.c
- */
-
 #include "internal.h"
 #include <stdlib.h>
 #include <assert.h>
diff --git a/lib/internal.h b/lib/internal.h
index 786e082..2220333 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -1,7 +1,3 @@
-/**
- * @file internal.h
- */
-
 #include "bemenu.h"
 
 #ifndef size_t
diff --git a/lib/item.c b/lib/item.c
index beca6ed..8320b9b 100644
--- a/lib/item.c
+++ b/lib/item.c
@@ -1,7 +1,3 @@
-/**
- * @file item.c
- */
-
 #include "internal.h"
 #include <stdlib.h>
 #include <assert.h>
diff --git a/lib/menu.c b/lib/menu.c
index 184c976..4ccb94a 100644
--- a/lib/menu.c
+++ b/lib/menu.c
@@ -1,7 +1,3 @@
-/**
- * @file bemenu.c
- */
-
 #include "internal.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/util.c b/lib/util.c
index d948b05..ae230c8 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,7 +1,3 @@
-/**
- * @file util.c
- */
-
 #include "internal.h"
 #define _XOPEN_SOURCE 700
 #include <wchar.h>
-- 
cgit v1.2.3-70-g09d2


From 8631506d9d1522f1a24e528f75682201b4f3cc7b Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Thu, 10 Apr 2014 17:26:42 +0300
Subject: Update documentation, include only public API in doxygen output.

---
 client/client.c      |  16 -------
 doxygen/Doxyfile.in  |   6 +--
 doxygen/Mainpage.dox |   2 +
 lib/bemenu.h         | 119 ++++++++++++++++++++++++++++++++++++++++-----------
 lib/filter.c         |  28 ++++++------
 lib/internal.h       |  13 +++---
 lib/item.c           |   8 ++--
 lib/menu.c           |  46 ++++++++++++--------
 lib/util.c           |  46 ++++++++++----------
 9 files changed, 172 insertions(+), 112 deletions(-)

(limited to 'lib/util.c')

diff --git a/client/client.c b/client/client.c
index 973e57a..4419967 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,10 +1,3 @@
-/**
- * @file client.c
- *
- * Sample client using the libbemenu.
- * Also usable as dmenu replacement.
- */
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -86,15 +79,6 @@ static void readItemsToMenuFromStdin(bmMenu *menu)
         free(line);
 }
 
-/**
- * Main method
- *
- * This function gives and takes the life of our program.
- *
- * @param argc Number of arguments from command line
- * @param argv Pointer to array of the arguments
- * @return exit status of the program
- */
 int main(int argc, char **argv)
 {
     (void)argc, (void)argv;
diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in
index fcd3604..3b80187 100644
--- a/doxygen/Doxyfile.in
+++ b/doxygen/Doxyfile.in
@@ -90,7 +90,7 @@ OUTPUT_LANGUAGE        = English
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 
-BRIEF_MEMBER_DESC      = NO
+BRIEF_MEMBER_DESC      = YES
 
 # If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
 # description of a member or function before the detailed description
@@ -765,7 +765,7 @@ INPUT_ENCODING         = UTF-8
 # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
 # *.qsf, *.as and *.js.
 
-FILE_PATTERNS          =
+FILE_PATTERNS          = *.h *.dox
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -796,7 +796,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = internal.h
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/doxygen/Mainpage.dox b/doxygen/Mainpage.dox
index 8da4792..869071c 100644
--- a/doxygen/Mainpage.dox
+++ b/doxygen/Mainpage.dox
@@ -16,4 +16,6 @@ Features:
       - Curses
 
 bemenu also provides 'bemenu' executable that is compatible with dmenu interface.
+
+Get started on the <a href="modules.html">Modules</a> page.
 */
diff --git a/lib/bemenu.h b/lib/bemenu.h
index d8e604b..f2f0372 100644
--- a/lib/bemenu.h
+++ b/lib/bemenu.h
@@ -1,13 +1,34 @@
 /**
  * @file bemenu.h
  *
- * Public header
+ * Public API header.
  */
 
+typedef struct _bmMenu bmMenu;
+typedef struct _bmItem bmItem;
+
+/**
+ * @defgroup Menu
+ * @brief Menu container.
+ *
+ * Holds all the items, runs logic and gets rendered.
+ */
+
+/**
+ * @defgroup Item
+ * @brief Item container.
+ *
+ * Contains properties for visual representation of item.
+ */
+
+/**
+ * @addtogroup Menu
+ * @{ */
+
 /**
  * Draw mode constants for bmMenu instance draw mode.
  *
- * BM_DRAW_MODE_LAST is provided for enumerating draw modes.
+ * @link ::bmDrawMode BM_DRAW_MODE_LAST @endlink is provided for enumerating draw modes.
  * Instancing with it however provides exactly same functionality as BM_DRAW_MODE_NONE.
  */
 typedef enum bmDrawMode {
@@ -19,7 +40,7 @@ typedef enum bmDrawMode {
 /**
  * Filter mode constants for bmMenu instance filter mode.
  *
- * BM_FILTER_MODE_LAST is provided for enumerating filter modes.
+ * @link ::bmFilterMode BM_FILTER_MODE_LAST @endlink is provided for enumerating filter modes.
  * Using it as filter mode however provides exactly same functionality as BM_FILTER_MODE_DMENU.
  */
 typedef enum bmFilterMode {
@@ -31,9 +52,9 @@ typedef enum bmFilterMode {
 /**
  * Result constants from bmMenuRunWithKey function.
  *
- * BM_RUN_RESULT_RUNNING means that menu is running and thus should be still renderer && ran.
- * BM_RUN_RESULT_SELECTED means that menu was closed and items were selected.
- * BM_RUN_RESULT_CANCEL means that menu was closed and selection was canceled.
+ * - @link ::bmRunResult BM_RUN_RESULT_RUNNING @endlink means that menu is running and thus should be still renderer && ran.
+ * - @link ::bmRunResult BM_RUN_RESULT_SELECTED @endlink means that menu was closed and items were selected.
+ * - @link ::bmRunResult BM_RUN_RESULT_CANCEL @endlink means that menu was closed and selection was canceled.
  */
 typedef enum bmRunResult {
     BM_RUN_RESULT_RUNNING,
@@ -44,7 +65,7 @@ typedef enum bmRunResult {
 /**
  * Key constants.
  *
- * BM_KEY_LAST is provided for enumerating keys.
+ * @link ::bmKey BM_KEY_LAST @endlink is provided for enumerating keys.
  */
 typedef enum bmKey {
     BM_KEY_NONE,
@@ -68,14 +89,15 @@ typedef enum bmKey {
     BM_KEY_LAST
 } bmKey;
 
-typedef struct _bmMenu bmMenu;
-typedef struct _bmItem bmItem;
+/**
+ * @name Menu Memory
+ * @{ */
 
 /**
  * Create new bmMenu instance.
  *
  * @param drawMode Render method to be used for this menu instance.
- * @return bmMenu for new menu instance, NULL if creation failed.
+ * @return bmMenu for new menu instance, **NULL** if creation failed.
  */
 bmMenu* bmMenuNew(bmDrawMode drawMode);
 
@@ -93,6 +115,12 @@ void bmMenuFree(bmMenu *menu);
  */
 void bmMenuFreeItems(bmMenu *menu);
 
+/**  @} Menu Memory */
+
+/**
+ * @name Menu Properties
+ * @{ */
+
 /**
  * Set active filter mode to bmMenu instance.
  *
@@ -113,7 +141,7 @@ bmFilterMode bmMenuGetFilterMode(const bmMenu *menu);
  * Set title to bmMenu instance.
  *
  * @param menu bmMenu instance where to set title.
- * @param title C "string" to set as title, can be NULL for empty title.
+ * @param title C "string" to set as title, can be **NULL** for empty title.
  */
 int bmMenuSetTitle(bmMenu *menu, const char *title);
 
@@ -121,10 +149,16 @@ int bmMenuSetTitle(bmMenu *menu, const char *title);
  * Get title from bmMenu instance.
  *
  * @param menu bmMenu instance where to get title from.
- * @return Pointer to null terminated C "string", can be NULL for empty title.
+ * @return Pointer to null terminated C "string", can be **NULL** for empty title.
  */
 const char* bmMenuGetTitle(const bmMenu *menu);
 
+/**  @} Properties */
+
+/**
+ * @name Menu Items
+ * @{ */
+
 /**
  * Add item to bmMenu instance at specific index.
  *
@@ -147,6 +181,8 @@ int bmMenuAddItem(bmMenu *menu, bmItem *item);
 /**
  * Remove item from bmMenu instance at specific index.
  *
+ * @warning The item won't be freed, use bmItemFree to do that.
+ *
  * @param menu bmMenu instance from where item will be removed.
  * @param index Index of item to remove.
  * @return 1 on successful add, 0 on failure.
@@ -155,7 +191,8 @@ int bmMenuRemoveItemAt(bmMenu *menu, unsigned int index);
 
 /**
  * Remove item from bmMenu instance.
- * The item won't be freed, use bmItemFree to do that.
+ *
+ * @warning The item won't be freed, use bmItemFree to do that.
  *
  * @param menu bmMenu instance from where item will be removed.
  * @param item bmItem instance to remove.
@@ -167,18 +204,20 @@ int bmMenuRemoveItem(bmMenu *menu, bmItem *item);
  * Get selected item from bmMenu instance.
  *
  * @param menu bmMenu instance from where to get selected item.
- * @return Selected bmItem instance, NULL if none selected.
+ * @return Selected bmItem instance, **NULL** if none selected.
  */
 bmItem* bmMenuGetSelectedItem(const bmMenu *menu);
 
 /**
  * Get items from bmMenu instance.
  *
+ * @warning The pointer returned by this function may be invalid after removing or adding new items.
+ *
  * @param menu bmMenu instance from where to get items.
- * @param nmemb Reference to unsigned int where total count of returned items will be stored.
+ * @param outNmemb Reference to unsigned int where total count of returned items will be stored.
  * @return Pointer to array of bmItem pointers.
  */
-bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb);
+bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *outNmemb);
 
 /**
  * Get filtered (displayed) items from bmMenu instance.
@@ -187,16 +226,16 @@ bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb);
  *          Do not store this pointer.
  *
  * @param menu bmMenu instance from where to get filtered items.
- * @param nmemb Reference to unsigned int where total count of returned items will be stored.
+ * @param outNmemb Reference to unsigned int where total count of returned items will be stored.
  * @return Pointer to array of bmItem pointers.
  */
-bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb);
+bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *outNmemb);
 
 /**
  * Set items to bmMenu instance.
  * Will replace all the old items on bmMenu instance.
  *
- * If items is NULL, or nmemb is zero, all items will be freed from the menu.
+ * If items is **NULL**, or nmemb is zero, all items will be freed from the menu.
  *
  * @param menu bmMenu instance where items will be set.
  * @param items Array of bmItem pointers to set.
@@ -205,6 +244,12 @@ bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb);
  */
 int bmMenuSetItems(bmMenu *menu, const bmItem **items, unsigned int nmemb);
 
+/**  @} Menu Items */
+
+/**
+ * @name Menu Logic
+ * @{ */
+
 /**
  * Render bmMenu instance using chosen draw method.
  *
@@ -215,13 +260,13 @@ void bmMenuRender(const bmMenu *menu);
 /**
  * Poll key and unicode from underlying UI toolkit.
  *
- * This function will block on CURSES draw mode.
+ * This function will block on @link ::bmDrawMode BM_DRAW_MODE_CURSES @endlink draw mode.
  *
  * @param menu bmMenu instance from which to poll.
- * @param unicode Reference to unsigned int.
+ * @param outUnicode Reference to unsigned int.
  * @return bmKey for polled key.
  */
-bmKey bmMenuGetKey(bmMenu *menu, unsigned int *unicode);
+bmKey bmMenuGetKey(bmMenu *menu, unsigned int *outUnicode);
 
 /**
  * Advances menu logic with key and unicode as input.
@@ -233,11 +278,23 @@ bmKey bmMenuGetKey(bmMenu *menu, unsigned int *unicode);
  */
 bmRunResult bmMenuRunWithKey(bmMenu *menu, bmKey key, unsigned int unicode);
 
+/**  @} Menu Logic */
+
+/**  @} Menu */
+
+/**
+ * @addtogroup Item
+ * @{ */
+
+/**
+ * @name Item Memory
+ * @{ */
+
 /**
  * Allocate a new item.
  *
- * @param text Pointer to null terminated C "string", can be NULL for empty text.
- * @return bmItem for new item instance, NULL if creation failed.
+ * @param text Pointer to null terminated C "string", can be **NULL** for empty text.
+ * @return bmItem for new item instance, **NULL** if creation failed.
  */
 bmItem* bmItemNew(const char *text);
 
@@ -248,11 +305,17 @@ bmItem* bmItemNew(const char *text);
  */
 void bmItemFree(bmItem *item);
 
+/**  @} Item Memory */
+
+/**
+ * @name Item Properties
+ * @{ */
+
 /**
  * Set text to bmItem instance.
  *
  * @param item bmItem instance where to set text.
- * @param text C "string" to set as text, can be NULL for empty text.
+ * @param text C "string" to set as text, can be **NULL** for empty text.
  */
 int bmItemSetText(bmItem *item, const char *text);
 
@@ -260,8 +323,12 @@ int bmItemSetText(bmItem *item, const char *text);
  * Get text from bmItem instance.
  *
  * @param item bmItem instance where to get text from.
- * @return Pointer to null terminated C "string", can be NULL for empty text.
+ * @return Pointer to null terminated C "string", can be **NULL** for empty text.
  */
 const char* bmItemGetText(const bmItem *item);
 
+/**  @} Item Properties */
+
+/**  @} Item */
+
 /* vim: set ts=8 sw=4 tw=0 :*/
diff --git a/lib/filter.c b/lib/filter.c
index 92e5683..33126c0 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -7,16 +7,16 @@
  * Filter that mimics the vanilla dmenu filtering.
  *
  * @param menu bmMenu instance to filter.
- * @param count unsigned int reference to filtered items count.
- * @param selected unsigned int reference to new selected item index.
+ * @param outNmemb unsigned int reference to filtered items outNmemb.
+ * @param outSelected unsigned int reference to new outSelected item index.
  * @return Pointer to array of bmItem pointers.
  */
-bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *count, unsigned int *selected)
+bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *outNmemb, unsigned int *outSelected)
 {
     assert(menu);
-    assert(count);
-    assert(selected);
-    *count = *selected = 0;
+    assert(outNmemb);
+    assert(outSelected);
+    *outNmemb = *outSelected = 0;
 
     /* FIXME: not real dmenu like filtering at all */
 
@@ -29,28 +29,28 @@ bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *count, unsigned int *selecte
         bmItem *item = menu->items[i];
         if (item->text && strstr(item->text, menu->filter)) {
             if (f == 0 || item == bmMenuGetSelectedItem(menu))
-                *selected = f;
+                *outSelected = f;
             filtered[f++] = item;
         }
     }
 
-    return _bmShrinkItemList(&filtered, menu->itemsCount, (*count = f));
+    return _bmShrinkItemList(&filtered, menu->itemsCount, (*outNmemb = f));
 }
 
 /**
  * Filter that mimics the vanilla case-insensitive dmenu filtering.
  *
  * @param menu bmMenu instance to filter.
- * @param count unsigned int reference to filtered items count.
- * @param selected unsigned int reference to new selected item index.
+ * @param outNmemb unsigned int reference to filtered items outNmemb.
+ * @param outSelected unsigned int reference to new outSelected item index.
  * @return Pointer to array of bmItem pointers.
  */
-bmItem** _bmFilterDmenuCaseInsensitive(bmMenu *menu, unsigned int *count, unsigned int *selected)
+bmItem** _bmFilterDmenuCaseInsensitive(bmMenu *menu, unsigned int *outNmemb, unsigned int *outSelected)
 {
     assert(menu);
-    assert(count);
-    assert(selected);
-    *count = *selected = 0;
+    assert(outNmemb);
+    assert(outSelected);
+    *outNmemb = *outSelected = 0;
 
     /* FIXME: stub */
 
diff --git a/lib/internal.h b/lib/internal.h
index 41fb926..66eabbc 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -64,7 +64,6 @@ struct _bmMenu {
 
     /**
      * Text used to filter matches.
-     *
      * XXX: Change this to a pointer?
      */
     char filter[1024];
@@ -115,18 +114,18 @@ struct _bmMenu {
 int _bmDrawCursesInit(struct _bmRenderApi *api);
 
 /* filter.c */
-bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *count, unsigned int *selected);
-bmItem** _bmFilterDmenuCaseInsensitive(bmMenu *menu, unsigned int *count, unsigned int *selected);
+bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *outNmemb, unsigned int *outSelected);
+bmItem** _bmFilterDmenuCaseInsensitive(bmMenu *menu, unsigned int *outNmemb, unsigned int *outSelected);
 
 /* util.c */
 char* _bmStrdup(const char *s);
-bmItem** _bmShrinkItemList(bmItem ***list, size_t osize, size_t nsize);
+bmItem** _bmShrinkItemList(bmItem ***inOutList, size_t osize, size_t nsize);
 int _bmUtf8StringScreenWidth(const char *string);
 size_t _bmUtf8RuneNext(const char *string, size_t start);
 size_t _bmUtf8RunePrev(const char *string, size_t start);
 size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len);
-size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth);
-size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *runeWidth);
-size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *runeWidth);
+size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *outRuneWidth);
+size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *outRuneWidth);
+size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *outRuneWidth);
 
 /* vim: set ts=8 sw=4 tw=0 :*/
diff --git a/lib/item.c b/lib/item.c
index 8320b9b..e6ccc7a 100644
--- a/lib/item.c
+++ b/lib/item.c
@@ -6,8 +6,8 @@
 /**
  * Allocate a new item.
  *
- * @param text Pointer to null terminated C "string", can be NULL for empty text.
- * @return bmItem instance.
+ * @param text Pointer to null terminated C "string", can be **NULL** for empty text.
+ * @return bmItem for new item instance, **NULL** if creation failed.
  */
 bmItem* bmItemNew(const char *text)
 {
@@ -39,7 +39,7 @@ void bmItemFree(bmItem *item)
  * Set text to bmItem instance.
  *
  * @param item bmItem instance where to set text.
- * @param text C "string" to set as text, can be NULL for empty text.
+ * @param text C "string" to set as text, can be **NULL** for empty text.
  */
 int bmItemSetText(bmItem *item, const char *text)
 {
@@ -60,7 +60,7 @@ int bmItemSetText(bmItem *item, const char *text)
  * Get text from bmItem instance.
  *
  * @param item bmItem instance where to get text from.
- * @return Pointer to null terminated C "string", can be NULL for empty text.
+ * @return Pointer to null terminated C "string", can be **NULL** for empty text.
  */
 const char* bmItemGetText(const bmItem *item)
 {
diff --git a/lib/menu.c b/lib/menu.c
index c8c6a26..3d41121 100644
--- a/lib/menu.c
+++ b/lib/menu.c
@@ -7,7 +7,7 @@
 /**
  * Filter function map.
  */
-static bmItem** (*filterFunc[BM_FILTER_MODE_LAST])(bmMenu *menu, unsigned int *count, unsigned int *selected) = {
+static bmItem** (*filterFunc[BM_FILTER_MODE_LAST])(bmMenu *menu, unsigned int *outNmemb, unsigned int *outSelected) = {
     _bmFilterDmenu, /* BM_FILTER_DMENU */
     _bmFilterDmenuCaseInsensitive /* BM_FILTER_DMENU_CASE_INSENSITIVE */
 };
@@ -53,7 +53,7 @@ static int _bmMenuGrowItems(bmMenu *menu)
  * Create new bmMenu instance.
  *
  * @param drawMode Render method to be used for this menu instance.
- * @return bmMenu for new menu instance, NULL if creation failed.
+ * @return bmMenu for new menu instance, **NULL** if creation failed.
  */
 bmMenu* bmMenuNew(bmDrawMode drawMode)
 {
@@ -155,7 +155,7 @@ bmFilterMode bmMenuGetFilterMode(const bmMenu *menu)
  * Set title to bmMenu instance.
  *
  * @param menu bmMenu instance where to set title.
- * @param title C "string" to set as title, can be NULL for empty title.
+ * @param title C "string" to set as title, can be **NULL** for empty title.
  */
 int bmMenuSetTitle(bmMenu *menu, const char *title)
 {
@@ -176,7 +176,7 @@ int bmMenuSetTitle(bmMenu *menu, const char *title)
  * Get title from bmMenu instance.
  *
  * @param menu bmMenu instance where to get title from.
- * @return Pointer to null terminated C "string", can be NULL for empty title.
+ * @return Pointer to null terminated C "string", can be **NULL** for empty title.
  */
 const char* bmMenuGetTitle(const bmMenu *menu)
 {
@@ -225,6 +225,8 @@ int bmMenuAddItem(bmMenu *menu, bmItem *item)
 /**
  * Remove item from bmMenu instance at specific index.
  *
+ * @warning The item won't be freed, use bmItemFree to do that.
+ *
  * @param menu bmMenu instance from where item will be removed.
  * @param index Index of item to remove.
  * @return 1 on successful add, 0 on failure.
@@ -244,6 +246,8 @@ int bmMenuRemoveItemAt(bmMenu *menu, unsigned int index)
 /**
  * Remove item from bmMenu instance.
  *
+ * @warning The item won't be freed, use bmItemFree to do that.
+ *
  * @param menu bmMenu instance from where item will be removed.
  * @param item bmItem instance to remove.
  * @return 1 on successful add, 0 on failure.
@@ -262,7 +266,7 @@ int bmMenuRemoveItem(bmMenu *menu, bmItem *item)
  * Get selected item from bmMenu instance.
  *
  * @param menu bmMenu instance from where to get selected item.
- * @return Selected bmItem instance, NULL if none selected.
+ * @return Selected bmItem instance, **NULL** if none selected.
  */
 bmItem* bmMenuGetSelectedItem(const bmMenu *menu)
 {
@@ -280,16 +284,18 @@ bmItem* bmMenuGetSelectedItem(const bmMenu *menu)
 /**
  * Get items from bmMenu instance.
  *
+ * @warning The pointer returned by this function may be invalid after removing or adding new items.
+ *
  * @param menu bmMenu instance from where to get items.
- * @param nmemb Reference to unsigned int where total count of returned items will be stored.
+ * @param outNmemb Reference to unsigned int where total count of returned items will be stored.
  * @return Pointer to array of bmItem pointers.
  */
-bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb)
+bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *outNmemb)
 {
     assert(menu);
 
-    if (nmemb)
-        *nmemb = menu->itemsCount;
+    if (outNmemb)
+        *outNmemb = menu->itemsCount;
 
     return menu->items;
 }
@@ -301,15 +307,15 @@ bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb)
  *          Do not store this pointer.
  *
  * @param menu bmMenu instance from where to get filtered items.
- * @param nmemb Reference to unsigned int where total count of returned items will be stored.
+ * @param outNmemb Reference to unsigned int where total count of returned items will be stored.
  * @return Pointer to array of bmItem pointers.
  */
-bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb)
+bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *outNmemb)
 {
     assert(menu);
 
-    if (nmemb)
-        *nmemb = (menu->filteredItems ? menu->filteredCount : menu->itemsCount);
+    if (outNmemb)
+        *outNmemb = (menu->filteredItems ? menu->filteredCount : menu->itemsCount);
 
     return (menu->filteredItems ? menu->filteredItems : menu->items);
 }
@@ -318,6 +324,8 @@ bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb)
  * Set items to bmMenu instance.
  * Will replace all the old items on bmMenu instance.
  *
+ * If items is **NULL**, or nmemb is zero, all items will be freed from the menu.
+ *
  * @param menu bmMenu instance where items will be set.
  * @param items Array of bmItem pointers to set.
  * @param nmemb Total count of items in array.
@@ -360,22 +368,22 @@ void bmMenuRender(const bmMenu *menu)
 /**
  * Poll key and unicode from underlying UI toolkit.
  *
- * This function will block on CURSES draw mode.
+ * This function will block on @link ::bmDrawMode BM_DRAW_MODE_CURSES @endlink draw mode.
  *
  * @param menu bmMenu instance from which to poll.
- * @param unicode Reference to unsigned int.
+ * @param outUnicode Reference to unsigned int.
  * @return bmKey for polled key.
  */
-bmKey bmMenuGetKey(bmMenu *menu, unsigned int *unicode)
+bmKey bmMenuGetKey(bmMenu *menu, unsigned int *outUnicode)
 {
     assert(menu);
-    assert(unicode);
+    assert(outUnicode);
 
-    *unicode = 0;
+    *outUnicode = 0;
     bmKey key = BM_KEY_NONE;
 
     if (menu->renderApi.getKey)
-        key = menu->renderApi.getKey(unicode);
+        key = menu->renderApi.getKey(outUnicode);
 
     return key;
 }
diff --git a/lib/util.c b/lib/util.c
index ae230c8..5eb980d 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -37,21 +37,21 @@ char* _bmStrdup(const char *string)
  * @param nsize New size the list will be shrinked to.
  * @return Pointer to list of bmItem pointers.
  */
-bmItem** _bmShrinkItemList(bmItem ***list, size_t osize, size_t nsize)
+bmItem** _bmShrinkItemList(bmItem ***inOutList, size_t osize, size_t nsize)
 {
-    assert(list);
+    assert(inOutList);
 
     if (nsize >= osize)
-        return *list;
+        return *inOutList;
 
     void *tmp = malloc(sizeof(bmItem*) * nsize);
     if (!tmp)
-        return *list;
+        return *inOutList;
 
-    memcpy(tmp, *list, sizeof(bmItem*) * nsize);
-    free(*list);
-    *list = tmp;
-    return *list;
+    memcpy(tmp, *inOutList, sizeof(bmItem*) * nsize);
+    free(*inOutList);
+    *inOutList = tmp;
+    return *inOutList;
 }
 
 /**
@@ -135,15 +135,15 @@ size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len)
  *
  * @param string Null terminated C "string".
  * @param start Start offset where to delete from. (cursor)
- * @param runeWidth Reference to size_t, return number of columns for removed rune, or -1 on failure.
+ * @param outRuneWidth Reference to size_t, return number of columns for removed rune, or -1 on failure.
  * @return Number of bytes removed from buffer.
  */
-size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
+size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *outRuneWidth)
 {
     assert(string);
 
-    if (runeWidth)
-        *runeWidth = 0;
+    if (outRuneWidth)
+        *outRuneWidth = 0;
 
     size_t len = strlen(string), oldStart = start;
     if (len == 0 || len < start || !*string)
@@ -151,8 +151,8 @@ size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
 
     start -= _bmUtf8RunePrev(string, start);
 
-    if (runeWidth)
-        *runeWidth = _bmUtf8RuneWidth(string + start, oldStart - start);
+    if (outRuneWidth)
+        *outRuneWidth = _bmUtf8RuneWidth(string + start, oldStart - start);
 
     memmove(string + start, string + oldStart, len - oldStart);
     string[len - (oldStart - start)] = 0;
@@ -167,15 +167,15 @@ size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
  * @param start Start offset where to insert to. (cursor)
  * @param rune Buffer to insert to string.
  * @param u8len Byte length of the rune.
- * @param runeWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
+ * @param outRuneWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
  * @return Number of bytes inserted to buffer.
  */
-size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *runeWidth)
+size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *outRuneWidth)
 {
     assert(string);
 
-    if (runeWidth)
-        *runeWidth = 0;
+    if (outRuneWidth)
+        *outRuneWidth = 0;
 
     size_t len = strlen(string);
     if (len + u8len >= bufSize)
@@ -188,8 +188,8 @@ size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char
     memmove(str + u8len, str, len - start);
     memcpy(str, rune, u8len);
 
-    if (runeWidth)
-        *runeWidth = _bmUtf8RuneWidth(rune, u8len);
+    if (outRuneWidth)
+        *outRuneWidth = _bmUtf8RuneWidth(rune, u8len);
     return u8len;
 }
 
@@ -200,10 +200,10 @@ size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char
  * @param bufSize Size of the buffer.
  * @param start Start offset where to insert to. (cursor)
  * @param unicode Unicode character to insert.
- * @param runeWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
+ * @param outRuneWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
  * @return Number of bytes inserted to buffer.
  */
-size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *runeWidth)
+size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *outRuneWidth)
 {
     assert(string);
 
@@ -219,7 +219,7 @@ size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int
         mb[0] |= (unicode >> (i * 6 - 6));
     }
 
-    return _bmUtf8RuneInsert(string, bufSize, start, mb, u8len, runeWidth);
+    return _bmUtf8RuneInsert(string, bufSize, start, mb, u8len, outRuneWidth);
 }
 
 /* vim: set ts=8 sw=4 tw=0 :*/
-- 
cgit v1.2.3-70-g09d2


From 45502a2fd994fdb10b77e4ac79c5f9fd8a8399e8 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Thu, 10 Apr 2014 22:02:47 +0300
Subject: Proper filtering functions.

---
 lib/filter.c   | 133 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 lib/internal.h |   2 +
 lib/menu.c     |  37 ++++++++++++----
 lib/util.c     |  60 ++++++++++++++++++--------
 4 files changed, 188 insertions(+), 44 deletions(-)

(limited to 'lib/util.c')

diff --git a/lib/filter.c b/lib/filter.c
index 4677e73..7e87b11 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -4,37 +4,139 @@
 #include <string.h>
 
 /**
- * Filter that mimics the vanilla dmenu filtering.
+ * Shrink bmItem** list pointer.
+ *
+ * Useful helper function for filter functions.
+ *
+ * @param list Pointer to pointer to list of bmItem pointers.
+ * @param osize Current size of the list.
+ * @param nsize New size the list will be shrinked to.
+ * @return Pointer to list of bmItem pointers.
+ */
+static bmItem** _bmFilterShrinkList(bmItem ***inOutList, size_t osize, size_t nsize)
+{
+    assert(inOutList);
+
+    if (nsize == 0) {
+        free(*inOutList);
+        return (*inOutList = NULL);
+    }
+
+    if (nsize >= osize)
+        return *inOutList;
+
+    void *tmp = malloc(sizeof(bmItem*) * nsize);
+    if (!tmp)
+        return *inOutList;
+
+    memcpy(tmp, *inOutList, sizeof(bmItem*) * nsize);
+    free(*inOutList);
+    return (*inOutList = tmp);
+}
+
+/**
+ * Text filter tokenizer helper.
+ *
+ * @param menu bmMenu instance which filter to tokenize.
+ * @param outTokv char pointer reference to list of tokens, this should be freed after use.
+ * @param outTokc unsigned int reference to number of tokens.
+ * @return Pointer to buffer that contains tokenized string, this should be freed after use.
+ */
+static char* _bmFilterTokenize(bmMenu *menu, char ***outTokv, unsigned int *outTokc)
+{
+    assert(menu);
+    assert(outTokv);
+    assert(outTokc);
+    *outTokv = NULL;
+    *outTokc = 0;
+
+    char **tokv = NULL, *buffer = NULL;
+    if (!(buffer = _bmStrdup(menu->filter)))
+        goto fail;
+
+    char *s, **tmp = NULL;
+    unsigned int tokc = 0, tokn = 0;
+    for (s = strtok(buffer, " "); s; tmp[tokc - 1] = s, s = strtok(NULL, " "), tokv = tmp)
+        if (++tokc > tokn && !(tmp = realloc(tmp, ++tokn * sizeof(char*))))
+            goto fail;
+
+    *outTokv = tmp;
+    *outTokc = tokc;
+    return buffer;
+
+fail:
+    if (buffer)
+        free(buffer);
+    if (tokv)
+        free(tokv);
+    return NULL;
+}
+
+/**
+ * Dmenu filterer that accepts substring function.
  *
  * @param menu bmMenu instance to filter.
+ * @param fstrstr Substring function used to match items.
  * @param outNmemb unsigned int reference to filtered items outNmemb.
  * @param outHighlighted unsigned int reference to new outHighlighted item index.
  * @return Pointer to array of bmItem pointers.
  */
-bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *outNmemb, unsigned int *outHighlighted)
+bmItem** _bmFilterDmenuFun(bmMenu *menu, char* (*fstrstr)(const char *a, const char *b), unsigned int *outNmemb, unsigned int *outHighlighted)
 {
     assert(menu);
     assert(outNmemb);
     assert(outHighlighted);
     *outNmemb = *outHighlighted = 0;
 
-    /* FIXME: not real dmenu like filtering at all */
+    unsigned int itemsCount;
+    bmItem **items = bmMenuGetItems(menu, &itemsCount);
 
-    bmItem **filtered = calloc(menu->items.count, sizeof(bmItem*));
+    bmItem **filtered = calloc(itemsCount, sizeof(bmItem*));
     if (!filtered)
         return NULL;
 
+    char **tokv;
+    unsigned int tokc;
+    char *buffer = _bmFilterTokenize(menu, &tokv, &tokc);
+
     unsigned int i, f;
-    for (f = i = 0; i < menu->items.count; ++i) {
-        bmItem *item = menu->items.list[i];
-        if (item->text && strstr(item->text, menu->filter)) {
-            if (f == 0 || item == bmMenuGetHighlightedItem(menu))
-                *outHighlighted = f;
-            filtered[f++] = item;
+    for (f = i = 0; i < itemsCount; ++i) {
+        bmItem *item = items[i];
+        if (!item->text && tokc != 0)
+            continue;
+
+        if (tokc && item->text) {
+            unsigned int t;
+            for (t = 0; t < tokc && fstrstr(item->text, tokv[t]); ++t);
+            if (t < tokc)
+                continue;
         }
+
+        if (f == 0 || item == bmMenuGetHighlightedItem(menu))
+            *outHighlighted = f;
+        filtered[f++] = item;
     }
 
-    return _bmShrinkItemList(&filtered, menu->items.count, (*outNmemb = f));
+    if (buffer)
+        free(buffer);
+
+    if (tokv)
+        free(tokv);
+
+    return _bmFilterShrinkList(&filtered, menu->items.count, (*outNmemb = f));
+}
+
+/**
+ * Filter that mimics the vanilla dmenu filtering.
+ *
+ * @param menu bmMenu instance to filter.
+ * @param outNmemb unsigned int reference to filtered items outNmemb.
+ * @param outHighlighted unsigned int reference to new outHighlighted item index.
+ * @return Pointer to array of bmItem pointers.
+ */
+bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *outNmemb, unsigned int *outHighlighted)
+{
+    return _bmFilterDmenuFun(menu, strstr, outNmemb, outHighlighted);
 }
 
 /**
@@ -47,14 +149,7 @@ bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *outNmemb, unsigned int *outH
  */
 bmItem** _bmFilterDmenuCaseInsensitive(bmMenu *menu, unsigned int *outNmemb, unsigned int *outHighlighted)
 {
-    assert(menu);
-    assert(outNmemb);
-    assert(outHighlighted);
-    *outNmemb = *outHighlighted = 0;
-
-    /* FIXME: stub */
-
-    return NULL;
+    return _bmFilterDmenuFun(menu, _bmStrupstr, outNmemb, outHighlighted);
 }
 
 /* vim: set ts=8 sw=4 tw=0 :*/
diff --git a/lib/internal.h b/lib/internal.h
index 790b4ed..043c906 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -153,6 +153,8 @@ int _bmItemListRemoveItem(struct _bmItemList *list, const bmItem *item);
 
 /* util.c */
 char* _bmStrdup(const char *s);
+int _bmStrupcmp(const char *hay, const char *needle);
+char* _bmStrupstr(const char *hay, const char *needle);
 bmItem** _bmShrinkItemList(bmItem ***inOutList, size_t osize, size_t nsize);
 int _bmUtf8StringScreenWidth(const char *string);
 size_t _bmUtf8RuneNext(const char *string, size_t start);
diff --git a/lib/menu.c b/lib/menu.c
index bf26c51..e9cf647 100644
--- a/lib/menu.c
+++ b/lib/menu.c
@@ -16,6 +16,11 @@ static void _bmMenuFilter(bmMenu *menu)
 {
     assert(menu);
 
+    if (!menu->items.list || menu->items.count <= 0) {
+        _bmItemListFreeList(&menu->filtered);
+        return;
+    }
+
     unsigned int count, selected;
     bmItem **filtered = filterFunc[menu->filterMode](menu, &count, &selected);
 
@@ -82,9 +87,6 @@ void bmMenuFree(bmMenu *menu)
     if (menu->title)
         free(menu->title);
 
-    if (menu->filtered.list)
-        free(menu->filtered.list);
-
     bmMenuFreeItems(menu);
     free(menu);
 }
@@ -200,7 +202,13 @@ const char* bmMenuGetTitle(const bmMenu *menu)
 int bmMenuAddItemAt(bmMenu *menu, bmItem *item, unsigned int index)
 {
     assert(menu);
-    return _bmItemListAddItemAt(&menu->items, item, index);;
+
+    int ret = _bmItemListAddItemAt(&menu->items, item, index);
+
+    if (ret)
+        _bmMenuFilter(menu);
+
+    return ret;
 }
 
 /**
@@ -212,7 +220,12 @@ int bmMenuAddItemAt(bmMenu *menu, bmItem *item, unsigned int index)
  */
 int bmMenuAddItem(bmMenu *menu, bmItem *item)
 {
-    return _bmItemListAddItem(&menu->items, item);
+    int ret = _bmItemListAddItem(&menu->items, item);
+
+    if (ret)
+        _bmMenuFilter(menu);
+
+    return ret;
 }
 
 /**
@@ -237,6 +250,7 @@ int bmMenuRemoveItemAt(bmMenu *menu, unsigned int index)
     if (ret) {
         _bmItemListRemoveItem(&menu->selection, item);
         _bmItemListRemoveItem(&menu->filtered, item);
+        _bmMenuFilter(menu);
     }
 
     return ret;
@@ -260,6 +274,7 @@ int bmMenuRemoveItem(bmMenu *menu, bmItem *item)
     if (ret) {
         _bmItemListRemoveItem(&menu->selection, item);
         _bmItemListRemoveItem(&menu->filtered, item);
+        _bmMenuFilter(menu);
     }
 
     return ret;
@@ -275,7 +290,9 @@ int bmMenuRemoveItem(bmMenu *menu, bmItem *item)
 int bmMenuSetHighlightedIndex(bmMenu *menu, unsigned int index)
 {
     assert(menu);
-    unsigned int itemsCount = (menu->filtered.list ? menu->filtered.count : menu->items.count);
+
+    unsigned int itemsCount;
+    bmMenuGetFilteredItems(menu, &itemsCount);
 
     if (itemsCount <= index)
         return 0;
@@ -376,6 +393,7 @@ int bmMenuSetItems(bmMenu *menu, const bmItem **items, unsigned int nmemb)
     if (ret) {
         _bmItemListFreeList(&menu->selection);
         _bmItemListFreeList(&menu->filtered);
+        _bmMenuFilter(menu);
     }
 
     return ret;
@@ -410,7 +428,7 @@ bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *outNmemb)
 {
     assert(menu);
 
-    if (menu->filtered.list)
+    if (strlen(menu->filter))
         return _bmItemListGetItems(&menu->filtered, outNmemb);
 
     return _bmItemListGetItems(&menu->items, outNmemb);
@@ -463,8 +481,11 @@ bmKey bmMenuGetKey(bmMenu *menu, unsigned int *outUnicode)
 bmRunResult bmMenuRunWithKey(bmMenu *menu, bmKey key, unsigned int unicode)
 {
     assert(menu);
+
+    unsigned int itemsCount;
+    bmMenuGetFilteredItems(menu, &itemsCount);
+
     char *oldFilter = _bmStrdup(menu->filter);
-    unsigned int itemsCount = (menu->filtered.list ? menu->filtered.count : menu->items.count);
 
     switch (key) {
         case BM_KEY_LEFT:
diff --git a/lib/util.c b/lib/util.c
index 5eb980d..06c89cf 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -28,30 +28,56 @@ char* _bmStrdup(const char *string)
 }
 
 /**
- * Shrink bmItem** list pointer.
+ * Portable case-insensitive strcmp.
  *
- * Useful helper function for filter functions.
+ * @param hay C "string" to match against.
+ * @param needle C "string" to match.
+ */
+int _bmStrupcmp(const char *hay, const char *needle)
+{
+    size_t i, len;
+
+    if ((len = strlen(hay)) != strlen(needle))
+        return 1;
+
+    for (i = 0; i != len; ++i)
+        if (toupper(hay[i]) != toupper(needle[i]))
+            return 1;
+
+    return 0;
+}
+
+/**
+ * Portable case-insensitive strstr.
  *
- * @param list Pointer to pointer to list of bmItem pointers.
- * @param osize Current size of the list.
- * @param nsize New size the list will be shrinked to.
- * @return Pointer to list of bmItem pointers.
+ * @param hay C "string" to substring against.
+ * @param needle C "string" to substring.
  */
-bmItem** _bmShrinkItemList(bmItem ***inOutList, size_t osize, size_t nsize)
+char* _bmStrupstr(const char *hay, const char *needle)
 {
-    assert(inOutList);
+    size_t i, r = 0, p = 0, len, len2;
 
-    if (nsize >= osize)
-        return *inOutList;
+    if (!_bmStrupcmp(hay, needle))
+        return (char*)hay;
 
-    void *tmp = malloc(sizeof(bmItem*) * nsize);
-    if (!tmp)
-        return *inOutList;
+    if ((len = strlen(hay)) < (len2 = strlen(needle)))
+        return NULL;
+
+    for (i = 0; i != len; ++i) {
+        if (p == len2)
+            return (char*)hay + r;
+
+        if (toupper(hay[i]) == toupper(needle[p++])) {
+            if (!r)
+                r = i;
+        } else {
+            if (r)
+                i = r;
+            r = p = 0;
+        }
+    }
 
-    memcpy(tmp, *inOutList, sizeof(bmItem*) * nsize);
-    free(*inOutList);
-    *inOutList = tmp;
-    return *inOutList;
+    return (p == len2 ? (char*)hay + r : NULL);
 }
 
 /**
-- 
cgit v1.2.3-70-g09d2


From 471046d1b2f9ee0a7f6ac3814a261ef67e218976 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 12 Apr 2014 12:55:05 +0300
Subject: Make comparator functions follow standard more.

---
 lib/internal.h |  1 +
 lib/util.c     | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'lib/util.c')

diff --git a/lib/internal.h b/lib/internal.h
index 985d366..c33c441 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -159,6 +159,7 @@ int _bmItemListRemoveItem(struct _bmItemList *list, const bmItem *item);
 /* util.c */
 char* _bmStrdup(const char *s);
 int _bmStrupcmp(const char *hay, const char *needle);
+int _bmStrnupcmp(const char *hay, const char *needle, size_t len);
 char* _bmStrupstr(const char *hay, const char *needle);
 bmItem** _bmShrinkItemList(bmItem ***inOutList, size_t osize, size_t nsize);
 int _bmUtf8StringScreenWidth(const char *string);
diff --git a/lib/util.c b/lib/util.c
index 06c89cf..a77e2ff 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -32,19 +32,38 @@ char* _bmStrdup(const char *string)
  *
  * @param hay C "string" to match against.
  * @param needle C "string" to match.
+ * @return Less than, equal to or greater than zero if hay is lexicographically less than, equal to or greater than needle.
  */
 int _bmStrupcmp(const char *hay, const char *needle)
 {
-    size_t i, len;
+    size_t len, len2;
 
-    if ((len = strlen(hay)) != strlen(needle))
-        return 1;
+    if ((len = strlen(hay)) != (len2 = strlen(needle)))
+        return hay[len] - needle[len2];
 
-    for (i = 0; i != len; ++i)
-        if (toupper(hay[i]) != toupper(needle[i]))
-            return 1;
+    return _bmStrnupcmp(hay, needle, len);
+}
+
+/**
+ * Portable case-insensitive strncmp.
+ *
+ * @param hay C "string" to match against.
+ * @param needle C "string" to match.
+ * @return Less than, equal to or greater than zero if hay is lexicographically less than, equal to or greater than needle.
+ */
+int _bmStrnupcmp(const char *hay, const char *needle, size_t len)
+{
+    size_t i = 0;
+    unsigned char a = 0, b = 0;
+
+    const unsigned char *p1 = (const unsigned char*)hay;
+    const unsigned char *p2 = (const unsigned char*)needle;
 
-    return 0;
+    for (i = 0; len > 0; --len, ++i)
+        if ((a = toupper(*p1++)) != (b = toupper(*p2++)))
+            return a - b;
+
+    return a - b;
 }
 
 /**
@@ -57,13 +76,13 @@ char* _bmStrupstr(const char *hay, const char *needle)
 {
     size_t i, r = 0, p = 0, len, len2;
 
-    if (!_bmStrupcmp(hay, needle))
-        return (char*)hay;
-
     if ((len = strlen(hay)) < (len2 = strlen(needle)))
         return NULL;
 
-    for (i = 0; i != len; ++i) {
+    if (!_bmStrnupcmp(hay, needle, len2))
+        return (char*)hay;
+
+    for (i = 0; i < len; ++i) {
         if (p == len2)
             return (char*)hay + r;
 
-- 
cgit v1.2.3-70-g09d2


From 311e4b36768a0d4e113ccf6d2256ca95c6621508 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 12 Apr 2014 19:59:21 +0300
Subject: Use strcspn instead of strtok

---
 client/client.c   |  7 +++++--
 lib/draw/curses.c | 10 +++++++---
 lib/filter.c      |  9 +++++++--
 lib/internal.h    |  1 +
 lib/util.c        | 13 +++++++++++++
 5 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'lib/util.c')

diff --git a/client/client.c b/client/client.c
index c031c0b..8e670b1 100644
--- a/client/client.c
+++ b/client/client.c
@@ -26,13 +26,16 @@ static void readItemsToMenuFromStdin(bmMenu *menu)
     }
     buffer[allocated - step + read - 1] = 0;
 
-    char *s;
-    for (s = strtok(buffer, "\n"); s; s = strtok(NULL, "\n")) {
+    size_t pos;
+    char *s = buffer;
+    while ((pos = strcspn(s, "\n")) != 0) {
+        s[pos] = 0;
         bmItem *item = bmItemNew(s);
         if (!item)
             break;
 
         bmMenuAddItem(menu, item);
+        s += pos + 1;
     }
 
     free(buffer);
diff --git a/lib/draw/curses.c b/lib/draw/curses.c
index 26754be..3b99cd9 100644
--- a/lib/draw/curses.c
+++ b/lib/draw/curses.c
@@ -1,14 +1,18 @@
 #include "../internal.h"
-#define _XOPEN_SOURCE 700
+
+#define _XOPEN_SOURCE 500
+#include <signal.h> /* sigaction */
+#include <stdarg.h> /* vsnprintf */
+#undef _XOPEN_SOURCE
+
 #include <wchar.h>
+#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <locale.h>
 #include <ncurses.h>
 #include <dlfcn.h>
-#include <signal.h>
 #include <assert.h>
-#include <unistd.h>
 
 #if _WIN32
 static const char *TTY = "CON";
diff --git a/lib/filter.c b/lib/filter.c
index 836ad83..811451b 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -54,12 +54,17 @@ static char* _bmFilterTokenize(bmMenu *menu, char ***outTokv, unsigned int *outT
     if (!(buffer = _bmStrdup(menu->filter)))
         goto fail;
 
-    char *s, **tmp = NULL;
+    size_t pos = 0;
     unsigned int tokc = 0, tokn = 0;
-    for (s = strtok(buffer, " "); s; tmp[tokc - 1] = s, s = strtok(NULL, " "), tokv = tmp)
+    char *s = buffer, **tmp = NULL;
+    while ((pos = _bmStripToken(s, " ")) != 0) {
         if (++tokc > tokn && !(tmp = realloc(tmp, ++tokn * sizeof(char*))))
             goto fail;
 
+        tmp[tokc - 1] = s;
+        s += pos + 1;
+    }
+
     *outTokv = tmp;
     *outTokc = tokc;
     return buffer;
diff --git a/lib/internal.h b/lib/internal.h
index b3ca87c..1ed13b4 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -163,6 +163,7 @@ int _bmItemListRemoveItem(struct _bmItemList *list, const bmItem *item);
 
 /* util.c */
 char* _bmStrdup(const char *s);
+size_t _bmStripToken(char *string, const char *token);
 int _bmStrupcmp(const char *hay, const char *needle);
 int _bmStrnupcmp(const char *hay, const char *needle, size_t len);
 char* _bmStrupstr(const char *hay, const char *needle);
diff --git a/lib/util.c b/lib/util.c
index a77e2ff..49f9175 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -27,6 +27,19 @@ char* _bmStrdup(const char *string)
     return (char *)memcpy(copy, string, len);
 }
 
+/**
+ * Replaces next token in string with '\0' and returns position for the replaced token.
+ *
+ * @param string C "string" where token will be replaced.
+ * @return Position of the replaced token.
+ */
+size_t _bmStripToken(char *string, const char *token)
+{
+    size_t len = strcspn(string, token);
+    string[len] = 0;
+    return len;
+}
+
 /**
  * Portable case-insensitive strcmp.
  *
-- 
cgit v1.2.3-70-g09d2


From 57e76dda1ce422fe5a00df8ee0791aef21dcfe28 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 12 Apr 2014 19:59:45 +0300
Subject: Cleanup header includes.

---
 client/client.c | 1 -
 lib/util.c      | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/util.c')

diff --git a/client/client.c b/client/client.c
index 8e670b1..8bc4be1 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stddef.h>
 #include <assert.h>
 #include <bemenu.h>
 
diff --git a/lib/util.c b/lib/util.c
index 49f9175..351bb5f 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,6 +1,9 @@
 #include "internal.h"
-#define _XOPEN_SOURCE 700
-#include <wchar.h>
+
+#define _XOPEN_SOURCE
+#include <wchar.h> /* wcswidth */
+#undef _XOPEN_SOURCE
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-- 
cgit v1.2.3-70-g09d2


From e738ae17728c697d64beb9adb2dfcc921f864120 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 12 Apr 2014 19:59:58 +0300
Subject: Discard unprintable single width characters instead.

---
 lib/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/util.c')

diff --git a/lib/util.c b/lib/util.c
index 351bb5f..c4533ca 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -242,7 +242,7 @@ size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char
     if (len + u8len >= bufSize)
         return 0;
 
-    if (u8len == 1 && iscntrl(*rune))
+    if (u8len == 1 && !isprint(*rune))
         return 0;
 
     char *str = string + start;
-- 
cgit v1.2.3-70-g09d2


From d54381f00991669fa4ee4f3a8037f246ca1904f8 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 12 Apr 2014 20:16:33 +0300
Subject: Fix out of bound access, and provide better tokenize api.

---
 client/client.c | 4 +++-
 lib/filter.c    | 6 +++---
 lib/internal.h  | 2 +-
 lib/util.c      | 7 ++++++-
 4 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'lib/util.c')

diff --git a/client/client.c b/client/client.c
index 8bc4be1..2f95d52 100644
--- a/client/client.c
+++ b/client/client.c
@@ -28,13 +28,15 @@ static void readItemsToMenuFromStdin(bmMenu *menu)
     size_t pos;
     char *s = buffer;
     while ((pos = strcspn(s, "\n")) != 0) {
+        size_t next = pos + (s[pos] != 0);
         s[pos] = 0;
+
         bmItem *item = bmItemNew(s);
         if (!item)
             break;
 
         bmMenuAddItem(menu, item);
-        s += pos + 1;
+        s += next;
     }
 
     free(buffer);
diff --git a/lib/filter.c b/lib/filter.c
index 811451b..204eac1 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -54,15 +54,15 @@ static char* _bmFilterTokenize(bmMenu *menu, char ***outTokv, unsigned int *outT
     if (!(buffer = _bmStrdup(menu->filter)))
         goto fail;
 
-    size_t pos = 0;
+    size_t pos = 0, next;
     unsigned int tokc = 0, tokn = 0;
     char *s = buffer, **tmp = NULL;
-    while ((pos = _bmStripToken(s, " ")) != 0) {
+    while ((pos = _bmStripToken(s, " ", &next)) > 0) {
         if (++tokc > tokn && !(tmp = realloc(tmp, ++tokn * sizeof(char*))))
             goto fail;
 
         tmp[tokc - 1] = s;
-        s += pos + 1;
+        s += next;
     }
 
     *outTokv = tmp;
diff --git a/lib/internal.h b/lib/internal.h
index 1ed13b4..6d116a0 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -163,7 +163,7 @@ int _bmItemListRemoveItem(struct _bmItemList *list, const bmItem *item);
 
 /* util.c */
 char* _bmStrdup(const char *s);
-size_t _bmStripToken(char *string, const char *token);
+size_t _bmStripToken(char *string, const char *token, size_t *outNext);
 int _bmStrupcmp(const char *hay, const char *needle);
 int _bmStrnupcmp(const char *hay, const char *needle, size_t len);
 char* _bmStrupstr(const char *hay, const char *needle);
diff --git a/lib/util.c b/lib/util.c
index c4533ca..bcb27cb 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -34,11 +34,16 @@ char* _bmStrdup(const char *string)
  * Replaces next token in string with '\0' and returns position for the replaced token.
  *
  * @param string C "string" where token will be replaced.
+ * @param outNext Reference to position of next delimiter, or 0 if none.
  * @return Position of the replaced token.
  */
-size_t _bmStripToken(char *string, const char *token)
+size_t _bmStripToken(char *string, const char *token, size_t *outNext)
 {
     size_t len = strcspn(string, token);
+
+    if (outNext)
+        *outNext = len + (string[len] != 0);
+
     string[len] = 0;
     return len;
 }
-- 
cgit v1.2.3-70-g09d2


From f03e03cdd9c267b9f3c171ba57799d876d80d819 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 12 Apr 2014 20:52:29 +0300
Subject: Make filter to pointer.

---
 lib/draw/curses.c |  2 +-
 lib/internal.h    | 12 ++++++++----
 lib/menu.c        | 40 ++++++++++++++++++----------------------
 lib/util.c        | 41 +++++++++++++++++++++++++++++------------
 4 files changed, 56 insertions(+), 39 deletions(-)

(limited to 'lib/util.c')

diff --git a/lib/draw/curses.c b/lib/draw/curses.c
index 946275e..3d7871e 100644
--- a/lib/draw/curses.c
+++ b/lib/draw/curses.c
@@ -182,7 +182,7 @@ static void _bmDrawCursesRender(const bmMenu *menu)
     curses.erase();
 
     int titleLen = (menu->title ? strlen(menu->title) + 1 : 0);
-    _bmDrawCursesDrawLine(0, 0, "%*s%s", titleLen, "", menu->filter);
+    _bmDrawCursesDrawLine(0, 0, "%*s%s", titleLen, "", (menu->filter ? menu->filter : ""));
 
     if (menu->title) {
         curses.attron(COLOR_PAIR(1));
diff --git a/lib/internal.h b/lib/internal.h
index 6d116a0..4f6afbe 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -103,15 +103,19 @@ struct _bmMenu {
 
     /**
      * Text used to filter matches.
-     * XXX: Change this to a pointer?
      */
-    char filter[1024];
+    char *filter;
 
     /**
      * Used as optimization.
      */
     char *oldFilter;
 
+    /**
+     * Size of filter buffer
+     */
+    size_t filterSize;
+
     /**
      * Current byte offset on filter text.
      */
@@ -173,7 +177,7 @@ size_t _bmUtf8RuneNext(const char *string, size_t start);
 size_t _bmUtf8RunePrev(const char *string, size_t start);
 size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len);
 size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *outRuneWidth);
-size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *outRuneWidth);
-size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *outRuneWidth);
+size_t _bmUtf8RuneInsert(char **string, size_t *bufSize, size_t start, const char *rune, unsigned int u8len, size_t *outRuneWidth);
+size_t _bmUnicodeInsert(char **string, size_t *bufSize, size_t start, unsigned int unicode, size_t *outRuneWidth);
 
 /* vim: set ts=8 sw=4 tw=0 :*/
diff --git a/lib/menu.c b/lib/menu.c
index a53451d..f414772 100644
--- a/lib/menu.c
+++ b/lib/menu.c
@@ -71,6 +71,9 @@ void bmMenuFree(bmMenu *menu)
     if (menu->title)
         free(menu->title);
 
+    if (menu->filter)
+        free(menu->filter);
+
     if (menu->oldFilter)
         free(menu->oldFilter);
 
@@ -126,12 +129,11 @@ void bmMenuSetFilter(bmMenu *menu, const char *filter)
 {
     assert(menu);
 
-    if (!filter) {
-        memset(menu->filter, 0, sizeof(menu->filter));
-        return;
-    }
+    if (menu->filter)
+        free(menu->filter);
 
-    strncpy(menu->filter, filter, sizeof(menu->filter));
+    menu->filter = (filter ? _bmStrdup(filter) : NULL);
+    menu->filterSize = (filter ? strlen(filter) : 0);
 }
 
 /**
@@ -426,7 +428,7 @@ bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *outNmemb)
 {
     assert(menu);
 
-    if (strlen(menu->filter))
+    if (menu->filter && strlen(menu->filter))
         return _bmItemListGetItems(&menu->filtered, outNmemb);
 
     return _bmItemListGetItems(&menu->items, outNmemb);
@@ -459,7 +461,7 @@ void bmMenuFilter(bmMenu *menu)
     assert(menu);
 
     char addition = 0;
-    size_t len = strlen(menu->filter);
+    size_t len = (menu->filter ? strlen(menu->filter) : 0);
 
     if (!len || !menu->items.list || menu->items.count <= 0) {
         _bmItemListFreeList(&menu->filtered);
@@ -561,7 +563,7 @@ bmRunResult bmMenuRunWithKey(bmMenu *menu, bmKey key, unsigned int unicode)
             break;
 
         case BM_KEY_END:
-            menu->cursor = strlen(menu->filter);
+            menu->cursor = (menu->filter ? strlen(menu->filter) : 0);
             menu->cursesCursor = _bmUtf8StringScreenWidth(menu->filter);
             break;
 
@@ -619,17 +621,17 @@ bmRunResult bmMenuRunWithKey(bmMenu *menu, bmKey key, unsigned int unicode)
 
         case BM_KEY_WORD_DELETE:
             {
-                while (menu->cursor < strlen(menu->filter) && !isspace(menu->filter[menu->cursor])) {
+                while (menu->cursor < (menu->filter ? strlen(menu->filter) : 0) && !isspace(menu->filter[menu->cursor])) {
                     unsigned int oldCursor = menu->cursor;
                     menu->cursor += _bmUtf8RuneNext(menu->filter, menu->cursor);
                     menu->cursesCursor += _bmUtf8RuneWidth(menu->filter + oldCursor, menu->cursor - oldCursor);
                 }
-                while (menu->cursor > 0 && isspace(menu->filter[menu->cursor - 1])) {
+                while (menu->cursor > 0 && menu->filter && isspace(menu->filter[menu->cursor - 1])) {
                     unsigned int oldCursor = menu->cursor;
                     menu->cursor -= _bmUtf8RunePrev(menu->filter, menu->cursor);
                     menu->cursesCursor -= _bmUtf8RuneWidth(menu->filter + menu->cursor, oldCursor - menu->cursor);
                 }
-                while (menu->cursor > 0 && !isspace(menu->filter[menu->cursor - 1])) {
+                while (menu->cursor > 0 && menu->filter && !isspace(menu->filter[menu->cursor - 1])) {
                     size_t width;
                     menu->cursor -= _bmUtf8RuneRemove(menu->filter, menu->cursor, &width);
                     menu->cursesCursor -= width;
@@ -640,24 +642,18 @@ bmRunResult bmMenuRunWithKey(bmMenu *menu, bmKey key, unsigned int unicode)
         case BM_KEY_UNICODE:
             {
                 size_t width;
-                menu->cursor += _bmUnicodeInsert(menu->filter, sizeof(menu->filter) - 1, menu->cursor, unicode, &width);
+                menu->cursor += _bmUnicodeInsert(&menu->filter, &menu->filterSize, menu->cursor, unicode, &width);
                 menu->cursesCursor += width;
             }
             break;
 
         case BM_KEY_TAB:
             {
+                const char *text;
                 bmItem *highlighted = bmMenuGetHighlightedItem(menu);
-                if (highlighted && bmItemGetText(highlighted)) {
-                    const char *text = bmItemGetText(highlighted);
-                    size_t len = strlen(text);
-
-                    if (len > sizeof(menu->filter) - 1)
-                        len = sizeof(menu->filter) - 1;
-
-                    memset(menu->filter, 0, strlen(menu->filter));
-                    memcpy(menu->filter, text, len);
-                    menu->cursor = strlen(menu->filter);
+                if (highlighted && (text = bmItemGetText(highlighted))) {
+                    bmMenuSetFilter(menu, text);
+                    menu->cursor = (menu->filter ? strlen(menu->filter) : 0);
                     menu->cursesCursor = _bmUtf8StringScreenWidth(menu->filter);
                 }
             }
diff --git a/lib/util.c b/lib/util.c
index bcb27cb..ca00514 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -228,29 +228,45 @@ size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *outRuneWidth)
 /**
  * Insert UTF8 rune to buffer.
  *
- * @param string Null terminated C "string".
- * @param bufSize Size of the buffer.
+ * @param inOutString Reference to buffer.
+ * @param inOutBufSize Reference to size of the buffer.
  * @param start Start offset where to insert to. (cursor)
  * @param rune Buffer to insert to string.
  * @param u8len Byte length of the rune.
  * @param outRuneWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
  * @return Number of bytes inserted to buffer.
  */
-size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *outRuneWidth)
+size_t _bmUtf8RuneInsert(char **inOutString, size_t *inOutBufSize, size_t start, const char *rune, unsigned int u8len, size_t *outRuneWidth)
 {
-    assert(string);
+    assert(inOutString);
+    assert(inOutBufSize);
 
     if (outRuneWidth)
         *outRuneWidth = 0;
 
-    size_t len = strlen(string);
-    if (len + u8len >= bufSize)
+    size_t len = (*inOutString ? strlen(*inOutString) : 0);
+    if (!*inOutString && !(*inOutString = calloc(1, (*inOutBufSize = u8len + 1))))
         return 0;
 
+    if (len + u8len >= *inOutBufSize) {
+        void *tmp;
+        if (!(tmp = realloc(*inOutString, (*inOutBufSize * 2)))) {
+            if (!(tmp = malloc((*inOutBufSize * 2))))
+                return 0;
+
+            memcpy(tmp, *inOutString, *inOutBufSize);
+            free(*inOutString);
+        }
+
+        memset(tmp + *inOutBufSize, 0, *inOutBufSize);
+        *inOutString = tmp;
+        *inOutBufSize *= 2;
+    }
+
     if (u8len == 1 && !isprint(*rune))
         return 0;
 
-    char *str = string + start;
+    char *str = *inOutString + start;
     memmove(str + u8len, str, len - start);
     memcpy(str, rune, u8len);
 
@@ -262,16 +278,17 @@ size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char
 /**
  * Insert unicode character to UTF8 buffer.
  *
- * @param string Null terminated C "string".
- * @param bufSize Size of the buffer.
+ * @param inOutString Reference to buffer.
+ * @param inOutBufSize Reference to size of the buffer.
  * @param start Start offset where to insert to. (cursor)
  * @param unicode Unicode character to insert.
  * @param outRuneWidth Reference to size_t, return number of columns for inserted rune, or -1 on failure.
  * @return Number of bytes inserted to buffer.
  */
-size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *outRuneWidth)
+size_t _bmUnicodeInsert(char **inOutString, size_t *inOutBufSize, size_t start, unsigned int unicode, size_t *outRuneWidth)
 {
-    assert(string);
+    assert(inOutString);
+    assert(inOutBufSize);
 
     char u8len = ((unicode < 0x80) ? 1 : ((unicode < 0x800) ? 2 : ((unicode < 0x10000) ? 3 : 4)));
     char mb[5] = { 0, 0, 0, 0 };
@@ -285,7 +302,7 @@ size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int
         mb[0] |= (unicode >> (i * 6 - 6));
     }
 
-    return _bmUtf8RuneInsert(string, bufSize, start, mb, u8len, outRuneWidth);
+    return _bmUtf8RuneInsert(inOutString, inOutBufSize, start, mb, u8len, outRuneWidth);
 }
 
 /* vim: set ts=8 sw=4 tw=0 :*/
-- 
cgit v1.2.3-70-g09d2


From d22612899a74005fd442d54710c86e677742c7f4 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 12 Apr 2014 23:21:43 +0300
Subject: Curses really does not like tabs.

---
 lib/util.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'lib/util.c')

diff --git a/lib/util.c b/lib/util.c
index ca00514..fa85431 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -130,16 +130,26 @@ int _bmUtf8StringScreenWidth(const char *string)
 {
     assert(string);
 
-    int num_char = mbstowcs(NULL, string, 0) + 1;
+    char *mstr = _bmStrdup(string);
+    if (!mstr)
+        return strlen(string);
+
+    char *s;
+    for (s = mstr; *s; ++s) if (*s == '\t') *s = ' ';
+
+    int num_char = mbstowcs(NULL, mstr, 0) + 1;
     wchar_t *wstring = malloc((num_char + 1) * sizeof (wstring[0]));
 
-    if (mbstowcs(wstring, string, num_char) == (size_t)(-1)) {
+    if (mbstowcs(wstring, mstr, num_char) == (size_t)(-1)) {
         free(wstring);
-        return strlen(string);
+        int len = strlen(mstr);
+        free(mstr);
+        return len;
     }
 
     int length = wcswidth(wstring, num_char);
     free(wstring);
+    free(mstr);
     return length;
 }
 
-- 
cgit v1.2.3-70-g09d2


From 0f34b70c90afb487541448ae88ca99d7186e8150 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Mon, 14 Apr 2014 18:08:13 +0300
Subject: Move this check before allocation.

---
 lib/util.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/util.c')

diff --git a/lib/util.c b/lib/util.c
index fa85431..539afa2 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -254,6 +254,9 @@ size_t _bmUtf8RuneInsert(char **inOutString, size_t *inOutBufSize, size_t start,
     if (outRuneWidth)
         *outRuneWidth = 0;
 
+    if (u8len == 1 && !isprint(*rune))
+        return 0;
+
     size_t len = (*inOutString ? strlen(*inOutString) : 0);
     if (!*inOutString && !(*inOutString = calloc(1, (*inOutBufSize = u8len + 1))))
         return 0;
@@ -273,9 +276,6 @@ size_t _bmUtf8RuneInsert(char **inOutString, size_t *inOutBufSize, size_t start,
         *inOutBufSize *= 2;
     }
 
-    if (u8len == 1 && !isprint(*rune))
-        return 0;
-
     char *str = *inOutString + start;
     memmove(str + u8len, str, len - start);
     memcpy(str, rune, u8len);
-- 
cgit v1.2.3-70-g09d2


From f410a5e391deccc10838b363955fe823a336bc82 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Mon, 14 Apr 2014 18:10:01 +0300
Subject: Make sure the text is null terminated.

---
 lib/util.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/util.c')

diff --git a/lib/util.c b/lib/util.c
index 539afa2..2ace7f7 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -279,6 +279,7 @@ size_t _bmUtf8RuneInsert(char **inOutString, size_t *inOutBufSize, size_t start,
     char *str = *inOutString + start;
     memmove(str + u8len, str, len - start);
     memcpy(str, rune, u8len);
+    (*inOutString)[len + u8len] = 0;
 
     if (outRuneWidth)
         *outRuneWidth = _bmUtf8RuneWidth(rune, u8len);
-- 
cgit v1.2.3-70-g09d2


From 4ce638eb3a5bdefc0301ab39331ba7b059904406 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Wed, 14 May 2014 20:50:32 +0300
Subject: Length check is fragile and breaking behaviour.

---
 lib/util.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'lib/util.c')

diff --git a/lib/util.c b/lib/util.c
index 2ace7f7..a47ff8d 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -57,12 +57,7 @@ size_t _bmStripToken(char *string, const char *token, size_t *outNext)
  */
 int _bmStrupcmp(const char *hay, const char *needle)
 {
-    size_t len, len2;
-
-    if ((len = strlen(hay)) != (len2 = strlen(needle)))
-        return hay[len] - needle[len2];
-
-    return _bmStrnupcmp(hay, needle, len);
+    return _bmStrnupcmp(hay, needle, strlen(hay));
 }
 
 /**
-- 
cgit v1.2.3-70-g09d2