Added generic prof_autocomplete

Makefile

@@ -7,7 +7,7 @@ CPPLIB = -lstdc++
 CFLAGS = -I ~/include -O3 $(WARNS) $(LIBS) `pkg-config --cflags glib-2.0`
 OBJS = log.o windows.o title_bar.o status_bar.o input_win.o jabber.o \
        profanity.o util.o command.o history.o contact_list.o prof_history.o \
-	   contact.o preferences.o prof_tabcompletion.o main.o
+	   contact.o preferences.o prof_autocomplete.o main.o
 TESTOBJS = test_contact_list.o contact_list.o contact.o \
 	       test_util.o test_prof_history.o prof_history.o util.o
 
@@ -28,7 +28,7 @@ contact_list.o: contact_list.h contact.h
 prof_history.o: prof_history.h
 contact.o: contact.h
 preferences.o: preferences.h
-prof_tabcompletion.o: prof_tabcompletion.h
+prof_autocomplete.o: prof_autocomplete.h
 main.o: profanity.h
 
 test_contact_list.o: contact_list.h contact.h

prof_autocomplete.c

@@ -0,0 +1,200 @@
+/* 
+ * prof_autocomplete.c
+ *
+ * Copyright (C) 2012 James Booth <boothj5@gmail.com>
+ * 
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "prof_autocomplete.h"
+
+struct p_autocomplete_t {
+    GSList *items;
+    GSList *last_found;
+    gchar *search_str;
+};
+
+
+static gchar * _search_from(PAutocomplete ac, GSList *curr,  char * (*str_func)(void *));
+
+PAutocomplete p_autocomplete_new(void)
+{
+    PAutocomplete new = malloc(sizeof(struct p_autocomplete_t));
+    new->items = NULL;
+    new->last_found = NULL;
+    new->search_str = NULL;
+
+    return new;
+}
+
+void p_autocomplete_clear(PAutocomplete ac, GDestroyNotify free_func)
+{
+    g_slist_free_full(ac->items, free_func);
+    ac->items = NULL;
+
+    p_autocomplete_reset(ac);
+}
+
+void p_autocomplete_reset(PAutocomplete ac)
+{
+    ac->last_found = NULL;
+    if (ac->search_str != NULL) {
+        free(ac->search_str);
+        ac->search_str = NULL;
+    }
+}
+
+void p_autocomplete_add(PAutocomplete ac, void *item, char * (*str_func)(void *), 
+    GDestroyNotify free_func)
+{
+    if (ac->items == NULL) {
+        ac->items = g_slist_append(ac->items, item);
+        return;
+    } else {
+        GSList *curr = ac->items;
+        
+        while(curr) {
+            
+            // insert
+            if (g_strcmp0(str_func(curr->data), str_func(item)) > 0) {
+                ac->items = g_slist_insert_before(ac->items,
+                    curr, item);
+                return;
+            
+            // update
+            } else if (g_strcmp0(str_func(curr->data), str_func(item)) == 0) {
+                free_func(curr->data);
+                curr->data = item;
+                return;
+            }
+            
+            curr = g_slist_next(curr);
+        }
+
+        // hit end, append
+        ac->items = g_slist_append(ac->items, item);
+
+        return;
+    }
+}
+
+void p_autocomplete_remove(PAutocomplete ac, char *item, char * (*str_func)(void *),   GDestroyNotify free_func)
+{
+    // reset last found if it points to the item to be removed
+    if (ac->last_found != NULL)
+        if (g_strcmp0(str_func(ac->last_found->data), item) == 0)
+            ac->last_found = NULL;
+
+    if (!ac->items) {
+        return;
+    } else {
+        GSList *curr = ac->items;
+        
+        while(curr) {
+            if (g_strcmp0(str_func(curr->data), item) == 0) {
+                ac->items = g_slist_remove(ac->items, curr->data);
+                free_func(curr->data);
+                
+                return;
+            }
+
+            curr = g_slist_next(curr);
+        }
+
+        return;
+    }
+}
+
+GSList * p_autocomplete_get_list(PAutocomplete ac, void * (*copy_func)(void *))
+{
+    GSList *copy = NULL;
+    GSList *curr = ac->items;
+
+    while(curr) {
+        copy = g_slist_append(copy, copy_func(curr->data));
+        curr = g_slist_next(curr);
+    }
+
+    return copy;
+}
+
+gchar * p_autocomplete_complete(PAutocomplete ac, gchar *search_str, 
+    char * (*str_func)(void *))
+{
+    gchar *found = NULL;
+
+    // no items to search
+    if (!ac->items)
+        return NULL;
+
+    // first search attempt
+    if (ac->last_found == NULL) {
+        ac->search_str = 
+            (gchar *) malloc((strlen(search_str) + 1) * sizeof(gchar));
+        strcpy(ac->search_str, search_str);
+
+        found = _search_from(ac, ac->items, str_func);
+        return found;
+
+    // subsequent search attempt    
+    } else {
+        // search from here+1 tp end
+        found = _search_from(ac, g_slist_next(ac->last_found), str_func);
+        if (found != NULL)
+            return found;
+
+        // search from beginning
+        found = _search_from(ac, ac->items, str_func);
+        if (found != NULL)
+            return found;
+    
+        // we found nothing, reset search
+        p_autocomplete_reset(ac);
+        return NULL;
+    }
+}
+
+static gchar * _search_from(PAutocomplete ac, GSList *curr,  char * (*str_func)(void *))
+{
+    while(curr) {
+        
+        // match found
+        if (strncmp(str_func(curr->data),
+                ac->search_str,
+                strlen(ac->search_str)) == 0) {
+            gchar *result = 
+                (gchar *) malloc((strlen(str_func(curr->data)) + 1) * sizeof(gchar));
+            
+            // set pointer to last found
+            ac->last_found = curr;
+
+            // return the string, must be free'd by caller
+            strcpy(result, str_func(curr->data));
+            return result;
+        }
+
+        curr = g_slist_next(curr);
+    }
+
+    return NULL;
+}
+

prof_autocomplete.h

@@ -0,0 +1,40 @@
+/* 
+ * prof_autocomplete.h
+ *
+ * Copyright (C) 2012 James Booth <boothj5@gmail.com>
+ * 
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef PROF_AUTOCOMPLETE_H
+#define PROF_AUTOCOMPLETE_H
+
+#include <glib.h>
+
+typedef struct p_autocomplete_t *PAutocomplete;
+
+PAutocomplete p_autocomplete_new(void);
+void p_autocomplete_clear(PAutocomplete ac, GDestroyNotify free_func);
+void p_autocomplete_reset(PAutocomplete ac);
+void p_autocomplete_add(PAutocomplete ac, void *item, char * (*str_func)(void *), 
+    GDestroyNotify free_func);
+void p_autocomplete_remove(PAutocomplete ac, char *item, char * (*str_func)(void *),   GDestroyNotify free_func);
+GSList * p_autocomplete_get_list(PAutocomplete ac, void * (*copy_func)(void *));
+gchar * p_autocomplete_complete(PAutocomplete ac, gchar *search_str, 
+    char * (*str_func)(void *));
+
+#endif