Added SILC Thread Queue API
[crypto.git] / apps / irssi / src / fe-text / gui-entry.c
index f70bf0dfe04e22279198230f460aed0f90edbdc8..7dcec35801a35b7c8631f240822d70e57aa35a26 100644 (file)
@@ -19,6 +19,7 @@
 */
 
 #include "module.h"
+#include "misc.h"
 #include "utf8.h"
 #include "formats.h"
 
 #include "gui-printtext.h"
 #include "term.h"
 
+const unichar empty_str[] = { 0 };
+
 GUI_ENTRY_REC *active_entry;
 
+static void entry_text_grow(GUI_ENTRY_REC *entry, int grow_size)
+{
+       if (entry->text_len+grow_size < entry->text_alloc)
+               return;
+
+       entry->text_alloc = nearest_power(entry->text_alloc+grow_size);
+       entry->text = g_realloc(entry->text,
+                               sizeof(unichar) * entry->text_alloc);
+}
+
 GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
 {
        GUI_ENTRY_REC *rec;
@@ -36,7 +49,9 @@ GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
        rec->xpos = xpos;
        rec->ypos = ypos;
         rec->width = width;
-       rec->text = g_string_new(NULL);
+        rec->text_alloc = 1024;
+       rec->text = g_new(unichar, rec->text_alloc);
+        rec->text[0] = '\0';
         rec->utf8 = utf8;
        return rec;
 }
@@ -48,26 +63,136 @@ void gui_entry_destroy(GUI_ENTRY_REC *entry)
        if (active_entry == entry)
                gui_entry_set_active(NULL);
 
-       g_free_not_null(entry->prompt);
-       g_string_free(entry->text, TRUE);
+        g_free(entry->text);
+       g_free(entry->prompt);
         g_free(entry);
 }
 
+/* big5 functions */
+#define big5_width(ch) ((ch)>0xff ? 2:1)
+
+void unichars_to_big5(const unichar *str, char *out)
+{
+       for (; *str != '\0'; str++) {
+               if (*str > 0xff)
+                       *out++ = (*str >> 8) & 0xff;
+               *out++ = *str & 0xff;
+       }
+       *out = '\0';
+}
+
+int strlen_big5(const unsigned char *str)
+{
+       int len=0;
+
+       if (term_type != TERM_TYPE_BIG5)
+               return strlen(str);
+
+       while (*str != '\0') {
+               if (is_big5(str[0], str[1]))
+                       str++;
+               len++;
+               str++;
+       }
+       return len;
+}
+
+void unichars_to_big5_with_pos(const unichar *str, int spos, char *out, int *opos)
+{
+       const unichar *sstart = str;
+       char *ostart = out;
+
+       *opos = 0;
+       while(*str != '\0')
+       {
+               if(*str > 0xff)
+                       *out ++ = (*str >> 8) & 0xff;
+               *out ++ = *str & 0xff;
+               str ++;
+               if(str - sstart == spos)
+                       *opos = out - ostart;
+       }
+       *out = '\0';
+}
+
+void big5_to_unichars(const char *str, unichar *out)
+{
+       const unsigned char *p = (const unsigned char *) str;
+
+       while (*p != '\0') {
+               if (is_big5(p[0], p[1])) {
+                       *out++ = p[0] << 8 | p[1];
+                       p += 2;
+               } else {
+                       *out++ = *p++;
+               }
+       }
+       *out = '\0';
+}
+
+/* ----------------------------- */
+
+static int pos2scrpos(GUI_ENTRY_REC *entry, int pos)
+{
+       unichar *p;
+       int xpos = 0;
+
+       for (p = entry->text; p - entry->text < pos; p++) {
+               if (term_type == TERM_TYPE_BIG5)
+                       xpos += big5_width(*p);
+               else if (entry->utf8)
+                       xpos += utf8_width(*p);
+               else
+                       xpos++;
+       }
+       return xpos;
+}
+
+static int scrpos2pos(GUI_ENTRY_REC *entry, int pos)
+{
+       int i, width, xpos;
+
+       for (i = 0, xpos = 0; entry->text[i]; i++) {
+               unichar *p = entry->text+i;
+
+               if (term_type == TERM_TYPE_BIG5)
+                       width = big5_width(*p);
+               else if (entry->utf8)
+                       width = utf8_width(*p);
+               else
+                       width = 1;
+
+               if (xpos + width > pos)
+                       break;
+               xpos += width;
+       }
+
+       if (xpos == pos)
+               return i;
+       else
+               return i-1;
+}
+
 /* Fixes the cursor position in screen */
 static void gui_entry_fix_cursor(GUI_ENTRY_REC *entry)
 {
        int old_scrstart;
 
-        old_scrstart = entry->scrstart;
-       if (entry->pos - entry->scrstart < entry->width-2 - entry->promptlen &&
-           entry->pos - entry->scrstart > 0) {
-               entry->scrpos = entry->pos - entry->scrstart;
-       } else if (entry->pos < entry->width-1 - entry->promptlen) {
+       /* assume prompt len == prompt scrlen */
+       int start = pos2scrpos(entry, entry->scrstart);
+       int now = pos2scrpos(entry, entry->pos);
+
+       old_scrstart = entry->scrstart;
+       if (now-start < entry->width - 2 - entry->promptlen && now-start > 0)
+               entry->scrpos = now-start;
+       else if (now < entry->width - 1 - entry->promptlen) {
                entry->scrstart = 0;
-               entry->scrpos = entry->pos;
+               entry->scrpos = now;
        } else {
-               entry->scrpos = (entry->width - entry->promptlen)*2/3;
-               entry->scrstart = entry->pos - entry->scrpos;
+               entry->scrstart = scrpos2pos(entry, now-(entry->width -
+                                                        entry->promptlen)*2/3);
+               start = pos2scrpos(entry, entry->scrstart);
+               entry->scrpos = now - start;
        }
 
        if (old_scrstart != entry->scrstart)
@@ -76,36 +201,40 @@ static void gui_entry_fix_cursor(GUI_ENTRY_REC *entry)
 
 static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 {
-       const unsigned char *p, *end;
+       const unichar *p;
        int xpos, end_xpos;
 
-       if (entry->utf8) {
-               /* FIXME: a stupid kludge to make the chars output correctly */
-               pos = 0;
-       }
-
-        xpos = entry->xpos + entry->promptlen + pos;
+       xpos = entry->xpos + entry->promptlen + 
+               pos2scrpos(entry, pos + entry->scrstart) - 
+               pos2scrpos(entry, entry->scrstart);
         end_xpos = entry->xpos + entry->width;
+
        if (xpos > end_xpos)
                 return;
 
        term_set_color(root_window, ATTR_RESET);
        term_move(root_window, xpos, entry->ypos);
 
-       p = (unsigned char *) (entry->scrstart + pos >= entry->text->len ? "" :
-                              entry->text->str + entry->scrstart + pos);
-       for (; *p != '\0' && xpos < end_xpos; p++, xpos++) {
-                end = p;
-               if (entry->utf8)
-                       get_utf8_char(&end);
+       p = entry->scrstart + pos < entry->text_len ?
+               entry->text + entry->scrstart + pos : empty_str;
+       for (; *p != '\0'; p++) {
+               if (entry->hidden)
+                       xpos++;
+               else if (term_type == TERM_TYPE_BIG5)
+                       xpos += big5_width(*p);
+               else if (entry->utf8)
+                       xpos += utf8_width(*p);
+               else
+                       xpos++;
+
+               if (xpos > end_xpos)
+                       break;
 
                if (entry->hidden)
                         term_addch(root_window, ' ');
-               else if (*p >= 32 && (end != p || (*p & 127) >= 32)) {
-                        for (; p < end; p++)
-                               term_addch(root_window, *p);
-                       term_addch(root_window, *p);
-               } else {
+               else if (*p >= 32 && (entry->utf8 || (*p & 127) >= 32))
+                       term_add_unichar(root_window, *p);
+               else {
                        term_set_color(root_window, ATTR_RESET|ATTR_REVERSE);
                        term_addch(root_window, *p+'A'-1);
                        term_set_color(root_window, ATTR_RESET);
@@ -113,7 +242,7 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
        }
 
         /* clear the rest of the input line */
-        if (end_xpos == term_width)
+        if (end_xpos == term_width-1)
                term_clrtoeol(root_window);
        else {
                while (xpos < end_xpos) {
@@ -230,38 +359,99 @@ void gui_entry_set_utf8(GUI_ENTRY_REC *entry, int utf8)
 
 void gui_entry_set_text(GUI_ENTRY_REC *entry, const char *str)
 {
-        g_return_if_fail(entry != NULL);
+       g_return_if_fail(entry != NULL);
        g_return_if_fail(str != NULL);
 
-       g_string_assign(entry->text, str);
-       entry->pos = entry->text->len;
+       entry->text_len = 0;
+       entry->pos = 0;
+       entry->text[0] = '\0';
 
-        gui_entry_redraw_from(entry, 0);
-       gui_entry_fix_cursor(entry);
-       gui_entry_draw(entry);
+       gui_entry_insert_text(entry, str);
 }
 
 char *gui_entry_get_text(GUI_ENTRY_REC *entry)
 {
+       char *buf;
+        int i;
+
        g_return_val_if_fail(entry != NULL, NULL);
 
-       return entry->text->str;
+       buf = g_malloc(entry->text_len*6 + 1);
+       if (entry->utf8)
+               utf16_to_utf8(entry->text, buf);
+       else {
+               if (term_type == TERM_TYPE_BIG5)
+                       unichars_to_big5(entry->text, buf);
+               else
+                       for (i = 0; i <= entry->text_len; i++)
+                               buf[i] = entry->text[i];
+       }
+       return buf;
+}
+
+char *gui_entry_get_text_and_pos(GUI_ENTRY_REC *entry, int *pos)
+{
+       char *buf;
+        int i;
+
+       g_return_val_if_fail(entry != NULL, NULL);
+
+       buf = g_malloc(entry->text_len*6 + 1);
+       if (entry->utf8)
+               utf16_to_utf8_with_pos(entry->text, entry->pos, buf, pos);
+       else {
+               if(term_type==TERM_TYPE_BIG5)
+                       unichars_to_big5_with_pos(entry->text, entry->pos, buf, pos);
+               else
+               {
+                       for (i = 0; i <= entry->text_len; i++)
+                               buf[i] = entry->text[i];
+                       *pos = entry->pos;
+               }
+       }
+       return buf;
 }
 
 void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
 {
+        unichar chr;
+       int i, len;
+
         g_return_if_fail(entry != NULL);
        g_return_if_fail(str != NULL);
 
         gui_entry_redraw_from(entry, entry->pos);
-       g_string_insert(entry->text, entry->pos, str);
-       entry->pos += strlen(str);
+
+       len = !entry->utf8 ? strlen_big5(str) : strlen_utf8(str);
+        entry_text_grow(entry, len);
+
+        /* make space for the string */
+       g_memmove(entry->text + entry->pos + len, entry->text + entry->pos,
+                 (entry->text_len-entry->pos + 1) * sizeof(unichar));
+
+       if (!entry->utf8) {
+               if (term_type == TERM_TYPE_BIG5) {
+                       chr = entry->text[entry->pos + len];
+                       big5_to_unichars(str, entry->text + entry->pos);
+                       entry->text[entry->pos + len] = chr;
+               } else {
+                       for (i = 0; i < len; i++)
+                               entry->text[entry->pos + i] = str[i];
+               }
+       } else {
+                chr = entry->text[entry->pos+len];
+               utf8_to_utf16(str, entry->text+entry->pos);
+                entry->text[entry->pos+len] = chr;
+       }
+
+       entry->text_len += len;
+        entry->pos += len;
 
        gui_entry_fix_cursor(entry);
        gui_entry_draw(entry);
 }
 
-void gui_entry_insert_char(GUI_ENTRY_REC *entry, char chr)
+void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
 {
         g_return_if_fail(entry != NULL);
 
@@ -269,28 +459,84 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, char chr)
                return; /* never insert NUL, CR or LF characters */
 
         gui_entry_redraw_from(entry, entry->pos);
-       g_string_insert_c(entry->text, entry->pos, chr);
-       entry->pos++;
+
+       entry_text_grow(entry, 1);
+
+       /* make space for the string */
+       g_memmove(entry->text + entry->pos + 1, entry->text + entry->pos,
+                 (entry->text_len-entry->pos + 1) * sizeof(unichar));
+
+       entry->text[entry->pos] = chr;
+       entry->text_len++;
+        entry->pos++;
 
        gui_entry_fix_cursor(entry);
        gui_entry_draw(entry);
 }
 
-void gui_entry_erase(GUI_ENTRY_REC *entry, int size)
+char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
+{
+       char *buf;
+        int i;
+
+       g_return_val_if_fail(entry != NULL, NULL);
+
+       if (entry->cutbuffer == NULL)
+                return NULL;
+
+       buf = g_malloc(entry->cutbuffer_len*6 + 1);
+       if (entry->utf8)
+               utf16_to_utf8(entry->cutbuffer, buf);
+       else if (term_type == TERM_TYPE_BIG5) {
+               unichars_to_big5(entry->cutbuffer, buf);
+       } else {
+               for (i = 0; i <= entry->cutbuffer_len; i++)
+                       buf[i] = entry->cutbuffer[i];
+       }
+       return buf;
+}
+
+void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer)
+{
+       int newpos, size = 0;
+
+       g_return_if_fail(entry != NULL);
+
+       for (newpos = gui_entry_get_pos(entry); newpos > pos; size++)
+               newpos = newpos - 1;
+       gui_entry_erase(entry, size, update_cutbuffer);
+}
+
+void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
 {
         g_return_if_fail(entry != NULL);
 
        if (entry->pos < size)
                return;
 
-#ifdef WANT_BIG5
-       if (is_big5(entry->text->str[entry->pos-2],
-                   entry->text->str[entry->pos-1]))
-               size++;
-#endif
+       if (update_cutbuffer) {
+               /* put erased text to cutbuffer */
+               if (entry->cutbuffer == NULL || entry->cutbuffer_len < size) {
+                       g_free(entry->cutbuffer);
+                       entry->cutbuffer = g_new(unichar, size+1);
+               }
+
+               entry->cutbuffer_len = size;
+               entry->cutbuffer[size] = '\0';
+               memcpy(entry->cutbuffer, entry->text + entry->pos - size,
+                      size * sizeof(unichar));
+       }
+
+       if (size == 0) {
+                /* we just wanted to clear the cutbuffer */
+               return;
+       }
+
+       g_memmove(entry->text + entry->pos - size, entry->text + entry->pos,
+                 (entry->text_len-entry->pos+1) * sizeof(unichar));
 
        entry->pos -= size;
-       g_string_erase(entry->text, entry->pos, size);
+        entry->text_len -= size;
 
        gui_entry_redraw_from(entry, entry->pos);
        gui_entry_fix_cursor(entry);
@@ -308,50 +554,182 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space)
        to = entry->pos - 1;
 
        if (to_space) {
-               while (entry->text->str[to] == ' ' && to > 0)
+               while (entry->text[to] == ' ' && to > 0)
                        to--;
-               while (entry->text->str[to] != ' ' && to > 0)
+               while (entry->text[to] != ' ' && to > 0)
                        to--;
        } else {
-               while (!i_isalnum(entry->text->str[to]) && to > 0)
+               while (!i_isalnum(entry->text[to]) && to > 0)
                        to--;
-               while (i_isalnum(entry->text->str[to]) && to > 0)
+               while (i_isalnum(entry->text[to]) && to > 0)
                        to--;
        }
        if (to > 0) to++;
 
-       g_string_erase(entry->text, to, entry->pos - to);
-       entry->pos = to;
-
-        gui_entry_redraw_from(entry, entry->pos);
-       gui_entry_fix_cursor(entry);
-       gui_entry_draw(entry);
+        gui_entry_erase(entry, entry->pos-to, TRUE);
 }
 
 void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)
 {
-       int to;
+       int to, size;
 
         g_return_if_fail(entry != NULL);
-       if (entry->pos == entry->text->len)
+       if (entry->pos == entry->text_len)
                return;
 
         to = entry->pos;
        if (to_space) {
-               while (entry->text->str[to] == ' ' && to < entry->text->len)
+               while (entry->text[to] == ' ' && to < entry->text_len)
                        to++;
-               while (entry->text->str[to] != ' ' && to < entry->text->len)
+               while (entry->text[to] != ' ' && to < entry->text_len)
                        to++;
        } else {
-               while (!i_isalnum(entry->text->str[to]) && to < entry->text->len)
+               while (!i_isalnum(entry->text[to]) && to < entry->text_len)
                        to++;
-               while (i_isalnum(entry->text->str[to]) && to < entry->text->len)
+               while (i_isalnum(entry->text[to]) && to < entry->text_len)
                        to++;
        }
 
-       g_string_erase(entry->text, entry->pos, to - entry->pos);
+        size = to-entry->pos;
+       entry->pos = to;
+        gui_entry_erase(entry, size, TRUE);
+}
+
+void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
+{
+        unichar chr;
 
-        gui_entry_redraw_from(entry, entry->pos);
+       if (entry->pos == 0 || entry->text_len < 2)
+                return;
+
+       if (entry->pos == entry->text_len)
+                entry->pos--;
+
+        /* swap chars */
+       chr = entry->text[entry->pos];
+       entry->text[entry->pos] = entry->text[entry->pos-1];
+        entry->text[entry->pos-1] = chr;
+
+        entry->pos++;
+
+       gui_entry_redraw_from(entry, entry->pos-2);
+       gui_entry_fix_cursor(entry);
+       gui_entry_draw(entry);
+}
+
+void gui_entry_transpose_words(GUI_ENTRY_REC *entry)
+{
+       int spos1, epos1, spos2, epos2;
+
+       /* find last position */
+       epos2 = entry->pos;
+       while (epos2 < entry->text_len && !i_isalnum(entry->text[epos2]))
+               epos2++;
+       while (epos2 < entry->text_len &&  i_isalnum(entry->text[epos2]))
+               epos2++;
+
+       /* find other position */
+       spos2 = epos2;
+       while (spos2 > 0 && !i_isalnum(entry->text[spos2-1]))
+               spos2--;
+       while (spos2 > 0 &&  i_isalnum(entry->text[spos2-1]))
+               spos2--;
+
+       epos1 = spos2;
+       while (epos1 > 0 && !i_isalnum(entry->text[epos1-1]))
+               epos1--;
+
+       spos1 = epos1;
+       while (spos1 > 0 && i_isalnum(entry->text[spos1-1]))
+               spos1--;
+
+       /* do wordswap if any found */
+       if (spos1 < epos1 && epos1 < spos2 && spos2 < epos2) {
+               unichar *first, *sep, *second;
+               int i;
+
+               first  = (unichar *) g_malloc( (epos1 - spos1) * sizeof(unichar) );
+               sep    = (unichar *) g_malloc( (spos2 - epos1) * sizeof(unichar) );
+               second = (unichar *) g_malloc( (epos2 - spos2) * sizeof(unichar) );
+
+               for (i = spos1; i < epos1; i++)
+                       first[i-spos1] = entry->text[i];
+               for (i = epos1; i < spos2; i++)
+                       sep[i-epos1] = entry->text[i];
+               for (i = spos2; i < epos2; i++)
+                       second[i-spos2] = entry->text[i];
+
+               entry->pos = spos1;
+               for (i = 0; i < epos2-spos2; i++)
+                       entry->text[entry->pos++] = second[i];
+               for (i = 0; i < spos2-epos1; i++)
+                       entry->text[entry->pos++] = sep[i];
+               for (i = 0; i < epos1-spos1; i++)
+                       entry->text[entry->pos++] = first[i];
+
+               g_free(first);
+               g_free(sep);
+               g_free(second);
+
+       }
+       
+       gui_entry_redraw_from(entry, spos1);
+       gui_entry_fix_cursor(entry);
+       gui_entry_draw(entry);
+}
+
+void gui_entry_capitalize_word(GUI_ENTRY_REC *entry)
+{
+       int pos = entry->pos;
+       while (pos < entry->text_len && !i_isalnum(entry->text[pos]))
+               pos++;
+
+       if (pos < entry->text_len) {
+               entry->text[pos] = i_toupper(entry->text[pos]);
+               pos++;
+       }
+
+       while (pos < entry->text_len && i_isalnum(entry->text[pos])) {
+               entry->text[pos] = i_tolower(entry->text[pos]);
+               pos++;
+       }
+
+       gui_entry_redraw_from(entry, entry->pos);
+       entry->pos = pos;
+       gui_entry_fix_cursor(entry);
+       gui_entry_draw(entry);
+}
+
+void gui_entry_downcase_word(GUI_ENTRY_REC *entry)
+{
+       int pos = entry->pos;
+       while (pos < entry->text_len && !i_isalnum(entry->text[pos]))
+               pos++;
+
+       while (pos < entry->text_len && i_isalnum(entry->text[pos])) {
+               entry->text[pos] = i_tolower(entry->text[pos]);
+               pos++;
+       }
+
+       gui_entry_redraw_from(entry, entry->pos);
+       entry->pos = pos;
+       gui_entry_fix_cursor(entry);
+       gui_entry_draw(entry);
+}
+
+void gui_entry_upcase_word(GUI_ENTRY_REC *entry)
+{
+       int pos = entry->pos;
+       while (pos < entry->text_len && !i_isalnum(entry->text[pos]))
+               pos++;
+
+       while (pos < entry->text_len && i_isalnum(entry->text[pos])) {
+               entry->text[pos] = i_toupper(entry->text[pos]);
+               pos++;
+       }
+
+       gui_entry_redraw_from(entry, entry->pos);
+       entry->pos = pos;
        gui_entry_fix_cursor(entry);
        gui_entry_draw(entry);
 }
@@ -367,7 +745,7 @@ void gui_entry_set_pos(GUI_ENTRY_REC *entry, int pos)
 {
         g_return_if_fail(entry != NULL);
 
-       if (pos >= 0 && pos <= entry->text->len)
+       if (pos >= 0 && pos <= entry->text_len)
                entry->pos = pos;
 
        gui_entry_fix_cursor(entry);
@@ -378,16 +756,7 @@ void gui_entry_move_pos(GUI_ENTRY_REC *entry, int pos)
 {
         g_return_if_fail(entry != NULL);
 
-#ifdef WANT_BIG5
-       if (pos > 0 && is_big5(entry->text->str[entry->pos],
-                              entry->text->str[entry->pos+1]))
-               pos++;
-       else if (pos < 0 && is_big5(entry->text->str[entry->pos-1],
-                                   entry->text->str[entry->pos]))
-               pos--;
-#endif
-
-       if (entry->pos+pos >= 0 && entry->pos+pos <= entry->text->len)
+       if (entry->pos + pos >= 0 && entry->pos + pos <= entry->text_len)
                entry->pos += pos;
 
        gui_entry_fix_cursor(entry);
@@ -401,14 +770,14 @@ static void gui_entry_move_words_left(GUI_ENTRY_REC *entry, int count, int to_sp
        pos = entry->pos;
        while (count > 0 && pos > 0) {
                if (to_space) {
-                       while (pos > 0 && entry->text->str[pos-1] == ' ')
+                       while (pos > 0 && entry->text[pos-1] == ' ')
                                pos--;
-                       while (pos > 0 && entry->text->str[pos-1] != ' ')
+                       while (pos > 0 && entry->text[pos-1] != ' ')
                                pos--;
                } else {
-                       while (pos > 0 && !i_isalnum(entry->text->str[pos-1]))
+                       while (pos > 0 && !i_isalnum(entry->text[pos-1]))
                                pos--;
-                       while (pos > 0 &&  i_isalnum(entry->text->str[pos-1]))
+                       while (pos > 0 &&  i_isalnum(entry->text[pos-1]))
                                pos--;
                }
                count--;
@@ -422,16 +791,16 @@ static void gui_entry_move_words_right(GUI_ENTRY_REC *entry, int count, int to_s
        int pos;
 
        pos = entry->pos;
-       while (count > 0 && pos < entry->text->len) {
+       while (count > 0 && pos < entry->text_len) {
                if (to_space) {
-                       while (pos < entry->text->len && entry->text->str[pos] == ' ')
+                       while (pos < entry->text_len && entry->text[pos] == ' ')
                                pos++;
-                       while (pos < entry->text->len && entry->text->str[pos] != ' ')
+                       while (pos < entry->text_len && entry->text[pos] != ' ')
                                pos++;
                } else {
-                       while (pos < entry->text->len && !i_isalnum(entry->text->str[pos]))
+                       while (pos < entry->text_len && !i_isalnum(entry->text[pos]))
                                pos++;
-                       while (pos < entry->text->len &&  i_isalnum(entry->text->str[pos]))
+                       while (pos < entry->text_len &&  i_isalnum(entry->text[pos]))
                                pos++;
                }
                count--;