draft of bookmarks implementation

'/bookmark add' and '/bookmark remove' ain't finished

src/xmpp/bookmark.c

@@ -12,6 +12,7 @@
 #include "xmpp/connection.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/bookmark.h"
 
 #define BOOKMARK_TIMEOUT 5000
 /* TODO: replace with a preference */
@@ -19,10 +20,14 @@
 
 static int autojoin_count;
 
+static Autocomplete bookmark_ac;
+static GList *bookmark_list;
+
 static int _bookmark_handle_result(xmpp_conn_t * const conn,
     xmpp_stanza_t * const stanza, void * const userdata);
 static int _bookmark_handle_delete(xmpp_conn_t * const conn,
     void * const userdata);
+static void _bookmark_item_destroy(gpointer item);
 
 void
 bookmark_request(void)
@@ -38,6 +43,15 @@ bookmark_request(void)
     }
 
     autojoin_count = 0;
+    if (bookmark_ac != NULL) {
+        autocomplete_free(bookmark_ac);
+    }
+    bookmark_ac = autocomplete_new();
+    if (bookmark_list != NULL) {
+        g_list_free_full(bookmark_list, _bookmark_item_destroy);
+        bookmark_list = NULL;
+    }
+
     xmpp_timed_handler_add(conn, _bookmark_handle_delete, BOOKMARK_TIMEOUT, id);
     xmpp_id_handler_add(conn, _bookmark_handle_result, id, id);
 
@@ -47,6 +61,49 @@ bookmark_request(void)
     xmpp_stanza_release(iq);
 }
 
+void
+bookmark_add(const char *jid, const char *nick, gboolean autojoin)
+{
+    /* TODO: send request */
+    /* TODO: manage bookmark_list */
+
+    /* this may be command for modifying */
+    autocomplete_remove(bookmark_ac, jid);
+    autocomplete_add(bookmark_ac, strdup(jid));
+}
+
+void
+bookmark_remove(const char *jid, gboolean autojoin)
+{
+    /* TODO: manage bookmark_list */
+    if (autojoin) {
+        /* TODO: just set autojoin=0 */
+    } else {
+        /* TODO: send request */
+        autocomplete_remove(bookmark_ac, jid);
+    }
+}
+
+const GList *
+bookmark_get_list(void)
+{
+    return bookmark_list;
+}
+
+char *
+bookmark_find(char *search_str)
+{
+    return autocomplete_complete(bookmark_ac, search_str);
+}
+
+void
+bookmark_autocomplete_reset(void)
+{
+    if (bookmark_ac != NULL) {
+        autocomplete_reset(bookmark_ac);
+    }
+}
+
 static int
 _bookmark_handle_result(xmpp_conn_t * const conn,
     xmpp_stanza_t * const stanza, void * const userdata)
@@ -58,7 +115,9 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
     char *name;
     char *jid;
     char *autojoin;
+    gboolean autojoin_val;
     Jid *my_jid;
+    Bookmark *item;
 
     xmpp_timed_handler_delete(conn, _bookmark_handle_delete);
     g_free(id);
@@ -77,6 +136,9 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
         return 0;
     }
 
+    if (bookmark_ac == NULL) {
+        bookmark_ac = autocomplete_new();
+    }
     my_jid = jid_create(jabber_get_fulljid());
 
     ptr = xmpp_stanza_get_children(ptr);
@@ -92,42 +154,55 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
 
         log_debug("Handle bookmark for %s", jid);
 
-        autojoin = xmpp_stanza_get_attribute(ptr, "autojoin");
-        if (autojoin && strcmp(autojoin, "1") == 0) {
-            name = NULL;
-            nick = xmpp_stanza_get_child_by_name(ptr, "nick");
-            if (nick) {
-                char *tmp;
-                tmp = xmpp_stanza_get_text(nick);
-                if (tmp) {
-                    name = strdup(tmp);
-                    xmpp_free(ctx, tmp);
-                }
-            } else {
-                name = strdup(my_jid->localpart);
-            }
-
-            if (name) {
-                if (autojoin_count < BOOKMARK_AUTOJOIN_MAX) {
-                    Jid *room_jid;
-
-                    log_debug("Autojoin %s with nick=%s", jid, name);
-                    ++autojoin_count;
-                    room_jid = jid_create_from_bare_and_resource(jid, name);
-                    if (!muc_room_is_active(room_jid)) {
-                        presence_join_room(room_jid);
-                        /* TODO: this should be removed after fixing #195 */
-                        ui_room_join(room_jid);
-                    }
-                    jid_destroy(room_jid);
-                } else {
-                    log_debug("Rejected autojoin %s (maximum has been reached)", jid);
-                }
-                free(name);
+        name = NULL;
+        nick = xmpp_stanza_get_child_by_name(ptr, "nick");
+        if (nick) {
+            char *tmp;
+            tmp = xmpp_stanza_get_text(nick);
+            if (tmp) {
+                name = strdup(tmp);
+                xmpp_free(ctx, tmp);
             }
         }
 
-        /* TODO: add to autocompleter */
+        autojoin = xmpp_stanza_get_attribute(ptr, "autojoin");
+        if (autojoin && strcmp(autojoin, "1") == 0) {
+            autojoin_val = TRUE;
+        } else {
+            autojoin_val = FALSE;
+        }
+
+        autocomplete_add(bookmark_ac, strdup(jid));
+        item = malloc(sizeof(*item));
+        item->jid = strdup(jid);
+        item->nick = name;
+        item->autojoin = autojoin_val;
+        bookmark_list = g_list_append(bookmark_list, item);
+
+
+        /* TODO: preference whether autojoin */
+        if (autojoin_val) {
+            if (autojoin_count < BOOKMARK_AUTOJOIN_MAX) {
+                Jid *room_jid;
+
+                ++autojoin_count;
+
+                if (name == NULL) {
+                    name = my_jid->localpart;
+                }
+
+                log_debug("Autojoin %s with nick=%s", jid, name);
+                room_jid = jid_create_from_bare_and_resource(jid, name);
+                if (!muc_room_is_active(room_jid)) {
+                    presence_join_room(room_jid);
+                    /* TODO: this should be removed after fixing #195 */
+                    ui_room_join(room_jid);
+                }
+                jid_destroy(room_jid);
+            } else {
+                log_debug("Rejected autojoin %s (maximum has been reached)", jid);
+            }
+        }
 
         ptr = xmpp_stanza_get_next(ptr);
     }
@@ -152,3 +227,17 @@ _bookmark_handle_delete(xmpp_conn_t * const conn,
 
     return 0;
 }
+
+static void
+_bookmark_item_destroy(gpointer item)
+{
+    Bookmark *p = (Bookmark *)item;
+
+    if (p == NULL) {
+        return;
+    }
+
+    free(p->jid);
+    free(p->nick);
+    free(p);
+}

src/xmpp/bookmark.h

@@ -2,6 +2,21 @@
 #ifndef BOOKMARK_H
 #define BOOKMARK_H
 
+#include <glib.h>
+
+struct bookmark_t {
+    char *jid;
+    char *nick;
+    gboolean autojoin;
+};
+
+typedef struct bookmark_t Bookmark;
+
 void bookmark_request(void);
+void bookmark_add(const char *jid, const char *nick, gboolean autojoin);
+void bookmark_remove(const char *jid, gboolean autojoin);
+const GList *bookmark_get_list(void);
+char *bookmark_find(char *search_str);
+void bookmark_autocomplete_reset(void);
 
 #endif