mcabber-isbear-patches: comparison completion-sorting.diff

equal deleted inserted replaced

-:1c5d368913c9
+:5e5992999357
 # HG changeset patch
-# Parent 3c7cebacae165329047f6859c26224e9c8a67807
+# Parent f8958ab545ac1af3e3fbc3b3b025de66fd1ffa51
 Make completion sorting order configurable
 * Use allocated plain array for categories
 * Use callbacks for dynamic completions (private for now)
 * Add compl_set_flags() to allow user to set completion order
 * [todo] Test ordering
 * [todo] Bump API (compatibly)
 * [todo] Reallocate array, when need more completions
 * [todo] Design and publish interface to dynamic completion cbs
-diff -r 3c7cebacae16 mcabber/mcabber/compl.c
+diff -r f8958ab545ac mcabber/mcabber/compl.c
---- a/mcabber/mcabber/compl.c	Wed Oct 17 02:33:43 2012 +0300
+--- a/mcabber/mcabber/compl.c	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/compl.c	Wed Oct 17 03:00:30 2012 +0300
++++ b/mcabber/mcabber/compl.c	Thu Oct 18 00:00:39 2012 +0300
 @@ -2,7 +2,7 @@
 * compl.c      -- Completion system
 *
 * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net>
 - * Copyright (C) 2009,2010 Myhailo Danylenko <isbear@ukrpost.net>
 + * Copyright (C) 2009-2012 Myhailo Danylenko <isbear@ukrpost.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
-@@ -47,49 +47,96 @@
+@@ -47,49 +47,97 @@
 GSList *next;         // pointer to next completion to try
 } compl;
 +typedef GSList *(*compl_handler_t) (void); // XXX userdata? *dynlist?
 +
 +  compl = g_slist_append(compl, g_strdup("list"));
 +  return compl;
 +}
 +
 +static inline void register_builtin_cat(guint c, compl_handler_t dynamic) {
-+  Categories[c-1].flags = COMPL_CAT_BUILTIN | COMPL_CAT_ACTIVE;
++  Categories[c-1].flags   = COMPL_CAT_BUILTIN | COMPL_CAT_ACTIVE;
++  Categories[c-1].words   = NULL;
++  Categories[c-1].dynamic = dynamic;
 +  if (dynamic != NULL) {
 +    Categories[c-1].flags |= COMPL_CAT_DYNAMIC;
-+    Categories[c-1].dynamic = dynamic;
 +  }
 }
 void compl_init_system(void)
 {
 +#ifdef MODULES_ENABLE
 +  num_categories = 64; // XXX
 +#else
 +  num_categories = COMPL_MODULE;
 +#endif
-+  Categories = g_new0(category, num_categories);
++  Categories = g_new(category, num_categories);
 +
 // Builtin completion categories:
 -  register_builtin_cat(COMPL_CMD);
 -  register_builtin_cat(COMPL_JID);
 -  register_builtin_cat(COMPL_URLJID);
 +#ifdef MODULES_ENABLE
 //  compl_new_category()
 // Reserves id for new completion category.
 // Returns 0, if no more categories can be allocated.
-@@ -97,32 +144,68 @@
+@@ -97,32 +145,87 @@
 // as it is likely to change in future.
 guint compl_new_category(void)
 {
 -  const guint maxcat = 8 * sizeof (registered_cats);
 guint i = 0;
 +      Categories[i].flags = COMPL_CAT_ACTIVE;
 +      Categories[i].words = NULL;
 +      return i+1;
 +    }
 }
-+  // XXX realloc
++  {
-+  scr_log_print(LPRINT_LOGNORM, "Warning: run out of completion categories!");
++    guint new_num = num_categories + 16; // *2?
++    category *new_categories = g_try_renew(category, Categories, new_num);
++    if (new_categories) {
++      Categories     = new_categories;
++      num_categories = new_num;
++      Categories[i].flags = COMPL_CAT_ACTIVE;
++      Categories[i].words = NULL;
++      return i+1;
++    } else
++      scr_log_print(LPRINT_LOGNORM, "Warning: Unable to reallocate "
++                    "more memory for completion categories!");
++  }
 +  return 0;
 }
 //  compl_del_category(id)
 // Frees reserved id for category.
 // and specify exactly what you get from compl_new_category.
 -void compl_del_category(guint id)
 +void compl_del_category(guint compl)
 {
 -  if (!id) {
+-    scr_log_print(LPRINT_LOGNORM, "Error: compl_del_category() - "
+-                  "Invalid category.");
++  GSList *wel;
++
 +  if (!compl) {
-scr_log_print(LPRINT_LOGNORM, "Error: compl_del_category() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_del_category() - "
--                  "Invalid category.");
++                                "Invalid category.");
-+                                  "Invalid category.");
 return;
 }
 -  id--;
 -  registered_cats &= ~(1<<id);
++
 +  compl--;
++
 +  if ((compl >= num_categories) ||
 +      (Categories[compl].flags & COMPL_CAT_BUILTIN)) {
 +    scr_log_print(LPRINT_DEBUG, "Error: compl_del_category() "
 +                                "Invalid category.");
 +    return;
 +  }
 +
 +  Categories[compl].flags = 0;
-+  // XXX free words
++  for (wel = Categories[compl].words; wel; wel = g_slist_next (wel))
-+}
++    g_free (wel -> data);
-+
++  g_slist_free (Categories[compl].words);
-+//  compl_set_sorting_order(category,order)
++}
++
++//  compl_set_flags (category, flags)
 +// Sets sorting order for given category.
 +// In future can be merged with new_category, set more flags,
 +// maybe even set dynamic callback.
 +void compl_set_flags(guint compl, guint new_flags)
 +{
 +  if (!compl) {
-+    scr_log_print(LPRINT_LOGNORM, "Error: compl_set_flags() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                  "Invalid category.");
++                                "Invalid category.");
 +    return;
 +  }
++
 +  compl--;
++
 +  if (compl < num_categories) {
 +    guint flags = Categories[compl].flags;
 +    if (flags & COMPL_CAT_BUILTIN)
 +      scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                  "Invalid category.");
++                                  "Rejecting builtin category.");
 +    else if (!(flags & COMPL_CAT_ACTIVE))
 +      scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                  "Invalid category.");
++                                  "Not existing category.");
 +    else
 +      Categories[compl].flags = (flags & ~COMPL_CAT_USERFLAGS)
 +        | ((new_flags << 2) & COMPL_CAT_USERFLAGS);
 +  } else
 +    scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                "Invalid category.");
++                                "Not existing category.");
 }
 #endif
-@@ -222,13 +305,30 @@
+@@ -136,12 +239,15 @@
+guint new_completion(const char *prefix, GSList *compl_cat, const gchar *suffix)
+{
+compl *c;
++  guint  ret_len = 0;
+GSList *sl_cat;
+gint (*cmp)(const char *s1, const char *s2, size_t n);
+size_t len = strlen(prefix);
+if (InputCompl) { // This should not happen, but hey...
+-    cancel_completion();
++    scr_log_print(LPRINT_DEBUG, "Warinng: new_completion() - "
++                                "Previous completion exists!");
++    done_completion();
+}
+if (settings_opt_get_int("completion_ignore_case"))
+@@ -160,14 +266,15 @@
+compval = g_strdup_printf("%s%s", word+len, suffix);
+else
+compval = g_strdup(word+len);
+-        c->list = g_slist_insert_sorted(c->list, compval,
+-                                        (GCompareFunc)g_ascii_strcasecmp);
++        // for a bit of efficiency, will reverse order afterwards
++        c->list = g_slist_prepend(c->list, compval);
++        ret_len ++;
+}
+}
+}
+-  c->next = c->list;
++  c->next = c->list = g_slist_reverse (c->list);
+InputCompl = c;
+-  return g_slist_length(c->list);
++  return ret_len;
+}
+//  done_completion();
+@@ -222,35 +329,46 @@
 /* Categories functions */
 +static gint compl_sort_forward(gconstpointer a, gconstpointer b)
 +{
 -  GSList *sl_cat;
 -  category *cat;
 char *nword;
 if (!categ) {
-@@ -236,21 +336,15 @@
+-    scr_log_print(LPRINT_LOGNORM, "Error: compl_add_category_word() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_add_category_word() - "
 "Invalid category.");
 return;
 }
 -
 +
 -  // Look for category
 -  for (sl_cat=Categories; sl_cat; sl_cat = g_slist_next(sl_cat)) {
 -    if (catv == ((category*)sl_cat->data)->flag)
 -      break;
 +
-+  if ((categ > num_categories) ||
++  if ((categ >= num_categories) ||
 +      !(Categories[categ].flags & COMPL_CAT_ACTIVE)) {
-+    scr_log_print(LPRINT_LOGNORM, "Error: compl_add_category_word() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_add_category_word() - "
-+                  "Invalid category.");
++                  "Not existing category.");
 +    return;
 }
 -  if (!sl_cat) {   // Category not found, let's create it
 -    cat = g_new0(category, 1);
 -    cat->flag = catv;
 -  } else
 -    cat = (category*)sl_cat->data;
 // If word is not space-terminated, we add one trailing space
 for (nword = (char*)word; *nword; nword++)
-@@ -262,20 +356,28 @@
+@@ -262,59 +380,64 @@
 nword = g_strdup(word);
 }
 -  if (g_slist_find_custom(cat->words, nword, (GCompareFunc)g_strcmp0) != NULL)
 -    return;
 void compl_del_category_word(guint categ, const gchar *word)
 {
 -  guint64 catv;
 -  GSList *sl_cat, *sl_elt;
 -  category *cat;
-+  GSList *sl_elt;
++  GSList *wel;
 char *nword;
 if (!categ) {
-@@ -285,16 +387,13 @@
+-    scr_log_print(LPRINT_LOGNORM, "Error: compl_del_category_word() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_del_category_word() - "
+"Invalid category.");
+return;
 }
 categ--;
 -  catv = 1UL << categ;
 -  // Look for category
 -  for (sl_cat=Categories; sl_cat; sl_cat = g_slist_next(sl_cat)) {
 -    if (catv == ((category*)sl_cat->data)->flag)
 -      break;
-+  if ((categ > num_categories) ||
++  if ((categ >= num_categories) ||
 +      !(Categories[categ].flags & COMPL_CAT_ACTIVE)) {
-+    scr_log_print(LPRINT_LOGNORM, "Error: compl_del_category_word() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_del_category_word() - "
-+                  "Invalid category.");
++                  "Not existing category.");
 +    return;
 }
 -  if (!sl_cat) return;   // Category not found, finished!
 -
 -  cat = (category*)sl_cat->data;
 // If word is not space-terminated, we add one trailing space
 for (nword = (char*)word; *nword; nword++)
-@@ -306,11 +405,12 @@
+;
-nword = g_strdup(word);
+if (nword > word) nword--;
+-  if (*nword != ' ') {  // Add a space
+-    nword = g_strdup_printf("%s ", word);
+-  } else {              // word is fine
+-    nword = g_strdup(word);
++  if (*nword != ' ')  // Add a space
++    word = nword = g_strdup_printf("%s ", word);
++  else
++    nword = NULL;
++
++  for (wel = Categories[categ].words; wel; wel = g_slist_next (wel)) {
++    if (!strcasecmp((char*)wel->data, word)) {
++      g_free(wel->data);
++      Categories[categ].words = g_slist_delete_link
++                                (Categories[categ].words, wel);
++      break; // Only remove first occurence
++    }
 }
 -  sl_elt = cat->words;
-+  sl_elt = Categories[categ].words;
+-  while (sl_elt) {
-while (sl_elt) {
+-    if (!strcasecmp((char*)sl_elt->data, nword)) {
-if (!strcasecmp((char*)sl_elt->data, nword)) {
+-      g_free(sl_elt->data);
-g_free(sl_elt->data);
 -      cat->words = g_slist_delete_link(cat->words, sl_elt);
-+      Categories[categ].words = g_slist_delete_link
+-      break; // Only remove first occurence
-+                                             (Categories[categ].words, sl_elt);
+-    }
-break; // Only remove first occurence
+-    sl_elt = g_slist_next(sl_elt);
-}
+-  }
-sl_elt = g_slist_next(sl_elt);
++  g_free (nword);
-@@ -323,48 +423,28 @@
+}
+//  compl_get_category_list()
+@@ -323,48 +446,28 @@
 // whole list after use.
 GSList *compl_get_category_list(guint categ, guint *dynlist)
 {
 -  guint64 cat_flags;
 -  GSList *sl_cat;
 -
 if (!categ) {
-scr_log_print(LPRINT_LOGNORM, "Error: compl_get_category_list() - "
+-    scr_log_print(LPRINT_LOGNORM, "Error: compl_get_category_list() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_get_category_list() - "
 "Invalid category.");
 return NULL;
 }
 -  *dynlist = FALSE;
 -      cel->data = g_strdup(cel->data);
 -    compl = g_slist_append(compl, g_strdup("list"));
 -    return compl;
 +  if ((categ > num_categories) ||
 +      !(Categories[categ].flags & COMPL_CAT_ACTIVE)) {
-+    scr_log_print(LPRINT_LOGNORM, "Error: compl_get_category_list() - "
++    scr_log_print(LPRINT_DEBUG, "Error: compl_get_category_list() - "
-+                  "Invalid category.");
++                  "Not existing category.");
 +    return NULL;
 }
 -  *dynlist = FALSE;
 -  return NULL;
 +    return Categories[categ].words;
 +  }
 }
 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r 3c7cebacae16 mcabber/mcabber/compl.h
+diff -r f8958ab545ac mcabber/mcabber/compl.h
---- a/mcabber/mcabber/compl.h	Wed Oct 17 02:33:43 2012 +0300
+--- a/mcabber/mcabber/compl.h	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/compl.h	Wed Oct 17 03:00:30 2012 +0300
++++ b/mcabber/mcabber/compl.h	Thu Oct 18 00:00:39 2012 +0300
 @@ -28,10 +28,17 @@
 #define COMPL_OTRPOLICY   21
 #define COMPL_MODULE      22
 +void compl_init_system(void); /* private */
 void  compl_del_category(guint id);
 +void  compl_set_flags(guint id, guint flags);
 #endif
 void    compl_add_category_word(guint categ, const gchar *command);
-diff -r 3c7cebacae16 mcabber/mcabber/main.c
+diff -r f8958ab545ac mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Wed Oct 17 02:33:43 2012 +0300
+--- a/mcabber/mcabber/main.c	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/main.c	Wed Oct 17 03:00:30 2012 +0300
++++ b/mcabber/mcabber/main.c	Thu Oct 18 00:00:39 2012 +0300
-@@ -368,13 +368,13 @@
+@@ -364,13 +364,13 @@
 }
 /* Initialize command system, roster and default key bindings */
 +  compl_init_system();
 cmd_init();

changeset 51	5e5992999357
parent 50	1c5d368913c9
child 52	887f44e99aa1