Merge remote-tracking branch 'dmitry/bookmarks' into nextdev

src/command/command.c

@@ -44,6 +44,7 @@
 #include "tools/tinyurl.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/bookmark.h"
 
 /*
  * Command structure
@@ -83,6 +84,7 @@ static char * _account_autocomplete(char *input, int *size);
 static char * _who_autocomplete(char *input, int *size);
 static char * _roster_autocomplete(char *input, int *size);
 static char * _group_autocomplete(char *input, int *size);
+static char * _bookmark_autocomplete(char *input, int *size);
 
 static int _strtoi(char *str, int *saveptr, int min, int max);
 
@@ -128,6 +130,7 @@ static gboolean _cmd_priority(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_quit(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_reconnect(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_rooms(gchar **args, struct cmd_help_t help);
+static gboolean _cmd_bookmark(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_roster(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_software(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_splash(gchar **args, struct cmd_help_t help);
@@ -367,6 +370,15 @@ static struct cmd_t command_defs[] =
           "Example : /rooms (if logged in as me@server.org, is equivalent to /rooms conference.server.org)",
           NULL } } },
 
+    { "/bookmark",
+        _cmd_bookmark, parse_args, 0, 4, NULL,
+        { "/bookmark [add|list|remove] [room@server] [autojoin on|off] [nick nickname]",
+          "Manage bookmarks.",
+        { "/bookmark [add|list|remove] [room@server] [autojoin on|off] [nick nickname]",
+          "---------------------------------------------------------------------------",
+          "Manage bookmarks.",
+          NULL } } },
+
     { "/disco",
         _cmd_disco, parse_args, 1, 2, NULL,
         { "/disco command entity", "Service discovery.",
@@ -853,6 +865,7 @@ static Autocomplete close_ac;
 static Autocomplete wins_ac;
 static Autocomplete roster_ac;
 static Autocomplete group_ac;
+static Autocomplete bookmark_ac;
 
 /*
  * Initialise command autocompleter and history
@@ -978,6 +991,11 @@ cmd_init(void)
     autocomplete_add(who_ac, strdup("unavailable"));
     autocomplete_add(who_ac, strdup("any"));
 
+    bookmark_ac = autocomplete_new();
+    autocomplete_add(bookmark_ac, strdup("add"));
+    autocomplete_add(bookmark_ac, strdup("list"));
+    autocomplete_add(bookmark_ac, strdup("remove"));
+
     cmd_history_init();
 }
 
@@ -1003,6 +1021,7 @@ cmd_close(void)
     autocomplete_free(wins_ac);
     autocomplete_free(roster_ac);
     autocomplete_free(group_ac);
+    autocomplete_free(bookmark_ac);
 }
 
 // Command autocompletion functions
@@ -1072,6 +1091,8 @@ cmd_reset_autocomplete()
     autocomplete_reset(wins_ac);
     autocomplete_reset(roster_ac);
     autocomplete_reset(group_ac);
+    autocomplete_reset(bookmark_ac);
+    bookmark_autocomplete_reset();
 }
 
 // Command execution
@@ -1255,6 +1276,13 @@ _cmd_complete_parameters(char *input, int *size)
         }
     }
 
+    result = autocomplete_param_with_func(input, size, "/join", bookmark_find);
+    if (result != NULL) {
+        inp_replace_input(input, result, size);
+        g_free(result);
+        return;
+    }
+
     result = autocomplete_param_with_func(input, size, "/connect", accounts_find_enabled);
     if (result != NULL) {
         inp_replace_input(input, result, size);
@@ -1276,7 +1304,8 @@ _cmd_complete_parameters(char *input, int *size)
 
     autocompleter acs[] = { _who_autocomplete, _sub_autocomplete, _notify_autocomplete,
         _autoaway_autocomplete, _titlebar_autocomplete, _theme_autocomplete,
-        _account_autocomplete, _roster_autocomplete, _group_autocomplete };
+        _account_autocomplete, _roster_autocomplete, _group_autocomplete,
+        _bookmark_autocomplete };
 
     for (i = 0; i < ARRAY_SIZE(acs); i++) {
         result = acs[i](input, size);
@@ -2798,6 +2827,73 @@ _cmd_rooms(gchar **args, struct cmd_help_t help)
     return TRUE;
 }
 
+static gboolean
+_cmd_bookmark(gchar **args, struct cmd_help_t help)
+{
+    jabber_conn_status_t conn_status = jabber_get_connection_status();
+    gchar *cmd = args[0];
+
+    if (conn_status != JABBER_CONNECTED) {
+        cons_show("You are not currenlty connect.");
+        return TRUE;
+    }
+
+    /* TODO: /bookmark list room@server */
+
+    if (cmd == NULL || strcmp(cmd, "list") == 0) {
+        cons_show_bookmarks(bookmark_get_list());
+    } else {
+        gboolean autojoin = FALSE;
+        gboolean jid_release = FALSE;
+        gchar *jid = NULL;
+        gchar *nick = NULL;
+        int idx = 1;
+
+        while (args[idx] != NULL) {
+            gchar *opt = args[idx];
+
+            if (strcmp(opt, "autojoin") == 0) {
+                autojoin = TRUE;
+            } else if (jid == NULL) {
+                jid = opt;
+            } else if (nick == NULL) {
+                nick = opt;
+            } else {
+                cons_show("Usage: %s", help.usage);
+            }
+
+            ++idx;
+        }
+
+        if (jid == NULL) {
+            win_type_t win_type = ui_current_win_type();
+
+            if (win_type == WIN_MUC) {
+                jid = ui_current_recipient();
+                jid_release = TRUE;
+                nick = muc_get_room_nick(jid);
+            } else {
+                cons_show("Usage: %s", help.usage);
+                return TRUE;
+            }
+        }
+
+        if (strcmp(cmd, "add") == 0) {
+            bookmark_add(jid, nick, autojoin);
+        } else if (strcmp(cmd, "remove") == 0) {
+            bookmark_remove(jid, autojoin);
+        } else {
+            cons_show("Usage: %s", help.usage);
+        }
+
+        if (jid_release) {
+            free(jid);
+        }
+    }
+
+    return TRUE;
+}
+
 static gboolean
 _cmd_disco(gchar **args, struct cmd_help_t help)
 {
@@ -3588,6 +3684,34 @@ _group_autocomplete(char *input, int *size)
     return NULL;
 }
 
+static char *
+_bookmark_autocomplete(char *input, int *size)
+{
+    char *result = NULL;
+
+    if (strcmp(input, "/bookmark add ") == 0) {
+        GString *str = g_string_new(input);
+
+        str = g_string_append(str, "autojoin");
+        result = str->str;
+        g_string_free(str, FALSE);
+        return result;
+    }
+
+    result = autocomplete_param_with_func(input, size, "/bookmark list", bookmark_find);
+    if (result != NULL) {
+        return result;
+    }
+    result = autocomplete_param_with_func(input, size, "/bookmark remove", bookmark_find);
+    if (result != NULL) {
+        return result;
+    }
+
+    result = autocomplete_param_with_ac(input, size, "/bookmark", bookmark_ac);
+
+    return result;
+}
+
 static char *
 _notify_autocomplete(char *input, int *size)
 {

src/common.c

@@ -37,9 +37,6 @@
 // and page size is at least 4KB
 #define READ_BUF_SIZE 4088
 
-// for generating ids
-static int unique_id = 0;
-
 struct curl_data_t
 {
     char *buffer;
@@ -400,10 +397,12 @@ xdg_get_data_home(void)
 char *
 get_unique_id(void)
 {
+    static unsigned long unique_id;
     char *result = NULL;
-    unique_id++;
     GString *result_str = g_string_new("");
-    g_string_printf(result_str, "prof%d", unique_id);
+
+    unique_id++;
+    g_string_printf(result_str, "prof%lu", unique_id);
     result = result_str->str;
     g_string_free(result_str, FALSE);
 

src/ui/console.c

@@ -37,6 +37,7 @@
 #include "ui/window.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/bookmark.h"
 
 #define CONS_WIN_TITLE "_cons"
 
@@ -643,6 +644,34 @@ cons_show_room_list(GSList *rooms, const char * const conference_node)
     cons_alert();
 }
 
+void
+cons_show_bookmarks(const GList *list)
+{
+    Bookmark *item;
+
+    cons_show("");
+    cons_show("Bookmarks:");
+
+    /* TODO: show status (connected or not) and window number */
+    while (list != NULL) {
+        item = list->data;
+
+        win_print_time(console, '-');
+        wprintw(console->win, "  %s", item->jid);
+        if (item->nick != NULL) {
+            wprintw(console->win, "/%s", item->nick);
+        }
+        if (item->autojoin) {
+            wprintw(console->win, " (autojoin)");
+        }
+        wprintw(console->win, "\n");
+        list = g_list_next(list);
+    }
+
+    ui_console_dirty();
+    cons_alert();
+}
+
 void
 cons_show_disco_info(const char *jid, GSList *identities, GSList *features)
 {

src/ui/ui.h

@@ -184,6 +184,7 @@ void cons_show_software_version(const char * const jid,
     const char * const version, const char * const os);
 void cons_show_account_list(gchar **accounts);
 void cons_show_room_list(GSList *room, const char * const conference_node);
+void cons_show_bookmarks(const GList *list);
 void cons_show_disco_items(GSList *items, const char * const jid);
 void cons_show_disco_info(const char *from, GSList *identities, GSList *features);
 void cons_show_room_invite(const char * const invitor, const char * const room,

src/xmpp/bookmark.c

@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,41 +12,115 @@
 #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 */
+#define BOOKMARK_AUTOJOIN_MAX 5
+
+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)
 {
-    int id;
-    char id_str[10];
-    xmpp_conn_t * const conn = connection_get_conn();
-    xmpp_ctx_t * const ctx = connection_get_ctx();
-    xmpp_stanza_t *iq = stanza_create_storage_bookmarks(ctx);
+    char *id;
+    xmpp_conn_t *conn = connection_get_conn();
+    xmpp_ctx_t *ctx = connection_get_ctx();
+    xmpp_stanza_t *iq;
 
-    id = jabber_get_id();
-    snprintf(id_str, sizeof(id_str), "%u", id);
+    id = get_unique_id();
+    if (!id) {
+        return;
+    }
 
-    /* TODO: timed handler to remove this id_handler */
-    xmpp_id_handler_add(conn, _bookmark_handle_result, id_str, ctx);
+    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_stanza_set_id(iq, id_str);
+    xmpp_timed_handler_add(conn, _bookmark_handle_delete, BOOKMARK_TIMEOUT, id);
+    xmpp_id_handler_add(conn, _bookmark_handle_result, id, id);
+
+    iq = stanza_create_storage_bookmarks(ctx);
+    xmpp_stanza_set_id(iq, id);
     xmpp_send(conn, iq);
     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)
 {
-    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
+    xmpp_ctx_t *ctx = connection_get_ctx();
+    char *id = (char *)userdata;
     xmpp_stanza_t *ptr;
     xmpp_stanza_t *nick;
     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);
 
     name = xmpp_stanza_get_name(stanza);
     if (!name || strcmp(name, STANZA_NAME_IQ) != 0) {
@@ -61,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);
@@ -76,8 +154,6 @@ _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) {
@@ -87,26 +163,47 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
                 name = strdup(tmp);
                 xmpp_free(ctx, tmp);
             }
-            } else {
-                name = strdup(my_jid->localpart);
         }
 
-            if (name) {
-                /* TODO: autojoin maximum (e.g. 5) rooms */
+        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);
-                Jid *room_jid = jid_create_from_bare_and_resource(jid, name);
+                room_jid = jid_create_from_bare_and_resource(jid, name);
                 if (!muc_room_is_active(room_jid)) {
                     presence_join_room(room_jid);
-                    /* XXX: this should be removed after fixing #195 */
+                    /* TODO: this should be removed after fixing #195 */
                     ui_room_join(room_jid);
                 }
                 jid_destroy(room_jid);
-                free(name);
+            } else {
+                log_debug("Rejected autojoin %s (maximum has been reached)", jid);
             }
         }
 
-        /* TODO: add to autocompleter */
-
         ptr = xmpp_stanza_get_next(ptr);
     }
 
@@ -114,3 +211,33 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
 
     return 0;
 }
+
+static int
+_bookmark_handle_delete(xmpp_conn_t * const conn,
+    void * const userdata)
+{
+    char *id = (char *)userdata;
+
+    assert(id != NULL);
+
+    log_debug("Timeout for handler with id=%s", id);
+
+    xmpp_id_handler_delete(conn, _bookmark_handle_result, id);
+    g_free(id);
+
+    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

src/xmpp/connection.c

@@ -232,19 +232,6 @@ jabber_set_autoping(const int seconds)
     }
 }
 
-int
-jabber_get_id(void)
-{
-    static int xmpp_id;
-
-    ++xmpp_id;
-    if (xmpp_id < 0) {
-        xmpp_id = 1;
-    }
-
-    return xmpp_id;
-}
-
 GList *
 jabber_get_available_resources(void)
 {

src/xmpp/connection.h

@@ -31,7 +31,6 @@ xmpp_conn_t *connection_get_conn(void);
 xmpp_ctx_t *connection_get_ctx(void);
 int connection_error_handler(xmpp_conn_t * const conn,
     xmpp_stanza_t * const stanza, void * const userdata);
-int jabber_get_id(void);
 void connection_set_priority(int priority);
 void connection_set_presence_message(const char * const message);
 void connection_add_available_resource(Resource *resource);