Mercurial > ~mikael > mcabber > hg
annotate mcabber/src/hbuf.c @ 942:c6bd42119c31
Make hbuf_add_line() UTF-8 aware
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sat, 15 Jul 2006 12:28:42 +0200 |
| parents | fc6aaa223650 |
| children | 9ac0d166a85b |
| rev | line source |
|---|---|
| 71 | 1 /* |
| 2 * hbuf.c -- History buffer implementation | |
| 393 | 3 * |
| 699 | 4 * Copyright (C) 2005, 2006 Mikael Berthe <bmikael@lists.lilotux.net> |
| 71 | 5 * |
| 6 * This program is free software; you can redistribute it and/or modify | |
| 7 * it under the terms of the GNU General Public License as published by | |
| 8 * the Free Software Foundation; either version 2 of the License, or (at | |
| 9 * your option) any later version. | |
| 10 * | |
| 11 * This program is distributed in the hope that it will be useful, but | |
| 12 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 * General Public License for more details. | |
| 15 * | |
| 16 * You should have received a copy of the GNU General Public License | |
| 17 * along with this program; if not, write to the Free Software | |
| 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
| 19 * USA | |
| 20 */ | |
| 21 | |
| 22 #include <string.h> | |
| 23 | |
| 24 #include "hbuf.h" | |
|
804
339c76ed5c0d
Remove a warning on Cygwin (implicit strcasestr() declaration)
Mikael Berthe <mikael@lilotux.net>
parents:
790
diff
changeset
|
25 #include "utils.h" |
|
930
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
26 #include "utf8.h" |
| 71 | 27 |
| 28 | |
| 29 /* This is a private structure type */ | |
| 30 | |
| 31 typedef struct { | |
| 32 char *ptr; | |
| 182 | 33 char *ptr_end; // beginning of the block |
| 34 char *ptr_end_alloc; // end of the current persistent block | |
| 71 | 35 guchar flags; |
| 36 | |
| 37 // XXX This should certainly be a pointer, and be allocated only when needed | |
| 38 // (for ex. when HBB_FLAG_PERSISTENT is set). | |
| 39 struct { // hbuf_line_info | |
| 184 | 40 time_t timestamp; |
|
850
d0781ca2dd08
Use new status buffer window
Mikael Berthe <mikael@lilotux.net>
parents:
804
diff
changeset
|
41 guint flags; |
| 184 | 42 } prefix; |
| 71 | 43 } hbuf_block; |
| 44 | |
| 45 | |
| 184 | 46 // hbuf_add_line(p_hbuf, text, prefix_flags, width) |
| 71 | 47 // Add a line to the given buffer. If width is not null, then lines are |
| 48 // wrapped at this length. | |
| 49 // | |
| 50 // Note 1: Splitting according to width won't work if there are tabs; they | |
| 51 // should be expanded before. | |
| 52 // Note 2: width does not include the ending \0. | |
| 184 | 53 void hbuf_add_line(GList **p_hbuf, const char *text, time_t timestamp, |
| 54 guint prefix_flags, guint width) | |
| 71 | 55 { |
| 56 GList *hbuf = *p_hbuf; | |
|
942
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
57 GList *curr_elt; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
58 char *line, *end; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
59 hbuf_block *hbuf_block_elt, *hbuf_b_curr; |
| 71 | 60 |
| 61 if (!text) return; | |
| 62 | |
| 83 | 63 hbuf_block_elt = g_new0(hbuf_block, 1); |
| 184 | 64 hbuf_block_elt->prefix.timestamp = timestamp; |
| 65 hbuf_block_elt->prefix.flags = prefix_flags; | |
| 71 | 66 if (!hbuf) { |
| 390 | 67 hbuf_block_elt->ptr = g_new(char, HBB_BLOCKSIZE); |
| 71 | 68 hbuf_block_elt->flags = HBB_FLAG_ALLOC | HBB_FLAG_PERSISTENT; |
| 182 | 69 hbuf_block_elt->ptr_end_alloc = hbuf_block_elt->ptr + HBB_BLOCKSIZE; |
| 71 | 70 *p_hbuf = g_list_append(*p_hbuf, hbuf_block_elt); |
| 71 } else { | |
|
502
3134b4960cdb
Fix mixed declaration and code
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
72 hbuf_block *hbuf_b_prev; |
|
392
6329c9601704
Speed up hbuf_add_line()
Mikael Berthe <mikael@lilotux.net>
parents:
390
diff
changeset
|
73 // Set p_hbuf to the end of the list, to speed up history loading |
|
6329c9601704
Speed up hbuf_add_line()
Mikael Berthe <mikael@lilotux.net>
parents:
390
diff
changeset
|
74 // (or CPU time will be used by g_list_last() for each line) |
|
6329c9601704
Speed up hbuf_add_line()
Mikael Berthe <mikael@lilotux.net>
parents:
390
diff
changeset
|
75 hbuf = *p_hbuf = g_list_last(*p_hbuf); |
|
502
3134b4960cdb
Fix mixed declaration and code
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
76 hbuf_b_prev = hbuf->data; |
| 71 | 77 hbuf_block_elt->ptr = hbuf_b_prev->ptr_end; |
| 78 hbuf_block_elt->flags = HBB_FLAG_PERSISTENT; | |
| 182 | 79 hbuf_block_elt->ptr_end_alloc = hbuf_b_prev->ptr_end_alloc; |
|
790
5d4ad1d77da4
Kill a few gcc4 warnings
Mikael Berthe <mikael@lilotux.net>
parents:
733
diff
changeset
|
80 *p_hbuf = g_list_append(*p_hbuf, hbuf_block_elt); |
| 71 | 81 } |
| 82 | |
| 83 if (strlen(text) >= HBB_BLOCKSIZE) { | |
| 84 // Too long | |
| 85 text = "[ERR:LINE_TOO_LONG]"; | |
| 197 | 86 hbuf_block_elt->prefix.flags |= HBB_PREFIX_INFO; |
| 71 | 87 } |
| 182 | 88 if (hbuf_block_elt->ptr + strlen(text) >= hbuf_block_elt->ptr_end_alloc) { |
| 71 | 89 // Too long for the current allocated bloc, we need another one |
| 390 | 90 hbuf_block_elt->ptr = g_new0(char, HBB_BLOCKSIZE); |
| 71 | 91 hbuf_block_elt->flags = HBB_FLAG_ALLOC | HBB_FLAG_PERSISTENT; |
| 182 | 92 hbuf_block_elt->ptr_end_alloc = hbuf_block_elt->ptr + HBB_BLOCKSIZE; |
| 71 | 93 } |
| 94 | |
| 95 line = hbuf_block_elt->ptr; | |
| 96 // Ok, now we can copy the text.. | |
| 97 strcpy(line, text); | |
| 98 hbuf_block_elt->ptr_end = line + strlen(line) + 1; | |
| 99 end = hbuf_block_elt->ptr_end; | |
| 100 | |
|
942
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
101 curr_elt = g_list_last(hbuf); |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
102 |
| 71 | 103 // Let's add non-persistent blocs if necessary |
| 104 // - If there are '\n' in the string | |
| 105 // - If length > width (and width != 0) | |
|
942
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
106 while (curr_elt) { |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
107 hbuf_block *hbuf_b_prev; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
108 char *c, *end; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
109 char *br = NULL; // break pointer |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
110 char *cr = NULL; // CR pointer |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
111 unsigned int cur_w = 0; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
112 |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
113 // We want to break where we can find a space char or a CR |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
114 |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
115 hbuf_b_curr = (hbuf_block*)(curr_elt->data); |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
116 hbuf_b_prev = hbuf_b_curr; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
117 c = hbuf_b_curr->ptr; |
| 71 | 118 |
|
942
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
119 while (*c && (!width || cur_w <= width)) { |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
120 if (*c == '\n') { |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
121 br = cr = c; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
122 *c = 0; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
123 break; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
124 } |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
125 if (iswblank(get_char(c))) |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
126 br = c; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
127 cur_w += get_char_width(c); |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
128 c = next_char(c); |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
129 } |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
130 |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
131 if (cr || (*c && cur_w > width)) { |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
132 if (!br || br == hbuf_b_curr->ptr) |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
133 br = c; |
| 71 | 134 else |
|
942
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
135 br = next_char(br); |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
136 end = hbuf_b_curr->ptr_end; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
137 hbuf_b_curr->ptr_end = br; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
138 // Create another block |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
139 hbuf_b_curr = g_new0(hbuf_block, 1); |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
140 // The block must be persistent after a CR |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
141 if (cr) { |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
142 hbuf_b_curr->ptr = hbuf_b_prev->ptr_end + 1; // == cr+1 |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
143 hbuf_b_curr->flags = HBB_FLAG_PERSISTENT; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
144 } else { |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
145 hbuf_b_curr->ptr = hbuf_b_prev->ptr_end; // == br |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
146 hbuf_b_curr->flags = 0; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
147 } |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
148 hbuf_b_curr->ptr_end = end; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
149 hbuf_b_curr->ptr_end_alloc = hbuf_b_prev->ptr_end_alloc; |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
150 // This is OK because insert_before(NULL) == append(): |
|
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
151 *p_hbuf = g_list_insert_before(*p_hbuf, curr_elt->next, hbuf_b_curr); |
| 71 | 152 } |
|
942
c6bd42119c31
Make hbuf_add_line() UTF-8 aware
Mikael Berthe <mikael@lilotux.net>
parents:
932
diff
changeset
|
153 curr_elt = g_list_next(curr_elt); |
| 71 | 154 } |
| 155 } | |
| 156 | |
| 157 // hbuf_free() | |
| 158 // Destroys all hbuf list. | |
| 159 void hbuf_free(GList **p_hbuf) | |
| 160 { | |
| 161 hbuf_block *hbuf_b_elt; | |
| 162 GList *hbuf_elt; | |
| 163 GList *first_elt = g_list_first(*p_hbuf); | |
| 164 | |
| 165 for (hbuf_elt = first_elt; hbuf_elt; hbuf_elt = g_list_next(hbuf_elt)) { | |
| 166 hbuf_b_elt = (hbuf_block*)(hbuf_elt->data); | |
| 167 if (hbuf_b_elt->flags & HBB_FLAG_ALLOC) { | |
| 168 g_free(hbuf_b_elt->ptr); | |
| 169 } | |
| 390 | 170 g_free(hbuf_b_elt); |
| 71 | 171 } |
| 172 | |
|
893
92aaf2af786b
Fix a small memory leak in /buffer purge
Mikael Berthe <mikael@lilotux.net>
parents:
852
diff
changeset
|
173 g_list_free(first_elt); |
| 71 | 174 *p_hbuf = NULL; |
| 175 } | |
| 176 | |
| 177 // hbuf_rebuild() | |
| 178 // Rebuild all hbuf list, with the new width. | |
| 179 // If width == 0, lines are not wrapped. | |
| 180 void hbuf_rebuild(GList **p_hbuf, unsigned int width) | |
| 181 { | |
| 182 GList *first_elt, *curr_elt, *next_elt; | |
| 183 hbuf_block *hbuf_b_curr, *hbuf_b_next; | |
| 184 | |
| 150 | 185 // *p_hbuf needs to be the head of the list |
| 186 first_elt = *p_hbuf = g_list_first(*p_hbuf); | |
| 71 | 187 |
| 188 // #1 Remove non-persistent blocks (ptr_end should be updated!) | |
| 189 curr_elt = first_elt; | |
| 190 while (curr_elt) { | |
| 191 next_elt = g_list_next(curr_elt); | |
| 192 // Last element? | |
| 193 if (!next_elt) | |
| 194 break; | |
| 195 hbuf_b_curr = (hbuf_block*)(curr_elt->data); | |
| 196 hbuf_b_next = (hbuf_block*)(next_elt->data); | |
| 197 // Is next line not-persistent? | |
| 198 if (!(hbuf_b_next->flags & HBB_FLAG_PERSISTENT)) { | |
| 199 hbuf_b_curr->ptr_end = hbuf_b_next->ptr_end; | |
| 390 | 200 g_free(hbuf_b_next); |
|
790
5d4ad1d77da4
Kill a few gcc4 warnings
Mikael Berthe <mikael@lilotux.net>
parents:
733
diff
changeset
|
201 curr_elt = g_list_delete_link(curr_elt, next_elt); |
| 393 | 202 } else |
| 71 | 203 curr_elt = next_elt; |
| 204 } | |
| 205 // #2 Go back to head and create non-persistent blocks when needed | |
| 206 if (width) { | |
|
930
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
207 char *end; |
| 71 | 208 curr_elt = first_elt; |
| 209 | |
| 210 while (curr_elt) { | |
| 211 hbuf_b_curr = (hbuf_block*)(curr_elt->data); | |
|
930
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
212 hbuf_block *hbuf_b_prev = hbuf_b_curr; |
| 71 | 213 |
|
930
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
214 // We need to break where we can find a space char |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
215 char *br = NULL; // break pointer |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
216 char *c = hbuf_b_curr->ptr; |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
217 unsigned int cur_w = 0; |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
218 while (*c && cur_w <= width) { |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
219 if (iswblank(get_char(c))) |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
220 br = c; |
|
932
fc6aaa223650
Fix a few problems with non-UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
930
diff
changeset
|
221 cur_w += get_char_width(c); |
|
930
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
222 c = next_char(c); |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
223 } |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
224 if (*c && cur_w > width) { |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
225 if (!br || br == hbuf_b_curr->ptr) |
|
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
226 br = c; |
| 71 | 227 else |
|
930
a75f7a13df7b
UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents:
924
diff
changeset
|
228 br = next_char(br); |
| 71 | 229 end = hbuf_b_curr->ptr_end; |
| 230 hbuf_b_curr->ptr_end = br; | |
| 231 // Create another block, non-persistent | |
| 232 hbuf_b_curr = g_new0(hbuf_block, 1); | |
| 233 hbuf_b_curr->ptr = hbuf_b_prev->ptr_end; // == br | |
| 234 hbuf_b_curr->ptr_end = end; | |
| 235 hbuf_b_curr->flags = 0; | |
| 182 | 236 hbuf_b_curr->ptr_end_alloc = hbuf_b_prev->ptr_end_alloc; |
| 150 | 237 // This is OK because insert_before(NULL) == append(): |
| 238 *p_hbuf = g_list_insert_before(*p_hbuf, curr_elt->next, hbuf_b_curr); | |
| 71 | 239 } |
| 240 curr_elt = g_list_next(curr_elt); | |
| 241 } | |
| 242 } | |
| 243 } | |
| 244 | |
| 189 | 245 // hbuf_previous_persistent() |
| 246 // Returns the previous persistent block (line). If the given line is | |
| 247 // persistent, then it is returned. | |
| 248 // This function is used for example when resizing a buffer. If the top of the | |
| 249 // screen is on a non-persistent block, then a screen resize could destroy this | |
| 250 // line... | |
| 251 GList *hbuf_previous_persistent(GList *l_line) | |
| 252 { | |
| 253 hbuf_block *hbuf_b_elt; | |
| 254 | |
| 255 while (l_line) { | |
| 256 hbuf_b_elt = (hbuf_block*)l_line->data; | |
| 257 if (hbuf_b_elt->flags & HBB_FLAG_PERSISTENT) | |
| 258 return l_line; | |
| 259 l_line = g_list_previous(l_line); | |
| 260 } | |
| 261 | |
| 262 return NULL; | |
| 263 } | |
| 264 | |
|
368
da50f08ea058
Update hbuf_get_lines() comment
Mikael Berthe <mikael@lilotux.net>
parents:
197
diff
changeset
|
265 // hbuf_get_lines(hbuf, n) |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
266 // Returns an array of n hbb_line pointers |
| 71 | 267 // (The first line will be the line currently pointed by hbuf) |
|
898
c65b71dcda94
Fix memory leak in scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents:
893
diff
changeset
|
268 // Note: The caller should free the array, the hbb_line pointers and the |
|
c65b71dcda94
Fix memory leak in scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents:
893
diff
changeset
|
269 // text pointers after use. |
| 184 | 270 hbb_line **hbuf_get_lines(GList *hbuf, unsigned int n) |
| 71 | 271 { |
| 272 unsigned int i; | |
|
729
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
273 hbuf_block *blk; |
|
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
274 guchar last_persist_prefixflags = 0; |
|
733
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
275 GList *last_persist; // last persistent flags |
|
852
a3b8956db7bc
hbuf: minor fixes and typos
Mikael Berthe <mikael@lilotux.net>
parents:
850
diff
changeset
|
276 hbb_line **array, **array_elt; |
|
729
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
277 |
|
733
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
278 // To be able to correctly highlight multi-line messages, |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
279 // we need to look at the last non-null prefix, which should be the first |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
280 // line of the message. |
|
729
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
281 last_persist = hbuf_previous_persistent(hbuf); |
|
733
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
282 while (last_persist) { |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
283 blk = (hbuf_block*)last_persist->data; |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
284 if ((blk->flags & HBB_FLAG_PERSISTENT) && blk->prefix.flags) { |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
285 last_persist_prefixflags = blk->prefix.flags; |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
286 break; |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
287 } |
|
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
288 last_persist = g_list_previous(last_persist); |
|
729
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
289 } |
| 71 | 290 |
|
852
a3b8956db7bc
hbuf: minor fixes and typos
Mikael Berthe <mikael@lilotux.net>
parents:
850
diff
changeset
|
291 array = g_new0(hbb_line*, n); |
|
a3b8956db7bc
hbuf: minor fixes and typos
Mikael Berthe <mikael@lilotux.net>
parents:
850
diff
changeset
|
292 array_elt = array; |
| 71 | 293 |
|
852
a3b8956db7bc
hbuf: minor fixes and typos
Mikael Berthe <mikael@lilotux.net>
parents:
850
diff
changeset
|
294 for (i = 0 ; i < n ; i++) { |
| 71 | 295 if (hbuf) { |
| 296 int maxlen; | |
|
729
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
297 blk = (hbuf_block*)(hbuf->data); |
| 71 | 298 maxlen = blk->ptr_end - blk->ptr; |
| 184 | 299 *array_elt = (hbb_line*)g_new(hbb_line, 1); |
| 300 (*array_elt)->timestamp = blk->prefix.timestamp; | |
| 301 (*array_elt)->flags = blk->prefix.flags; | |
| 302 (*array_elt)->text = g_strndup(blk->ptr, maxlen); | |
| 303 | |
|
733
c502bfe67c31
Fix highlighting of outgoing multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents:
729
diff
changeset
|
304 if ((blk->flags & HBB_FLAG_PERSISTENT) && blk->prefix.flags) { |
|
729
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
305 last_persist_prefixflags = blk->prefix.flags; |
|
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
306 } else { |
|
852
a3b8956db7bc
hbuf: minor fixes and typos
Mikael Berthe <mikael@lilotux.net>
parents:
850
diff
changeset
|
307 // Propagate highlighting flag |
|
729
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
308 (*array_elt)->flags |= last_persist_prefixflags & HBB_PREFIX_HLIGHT; |
|
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
309 } |
|
39f67cade02c
Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
310 |
| 71 | 311 hbuf = g_list_next(hbuf); |
| 312 } else | |
| 184 | 313 break; |
| 314 | |
| 315 array_elt++; | |
| 71 | 316 } |
| 317 | |
| 318 return array; | |
| 319 } | |
| 320 | |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
321 // hbuf_search(hbuf, direction, string) |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
322 // Look backward/forward for a line containing string in the history buffer |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
323 // Search starts at hbuf, and goes forward if direction == 1, backward if -1 |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
324 GList *hbuf_search(GList *hbuf, int direction, const char *string) |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
325 { |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
326 hbuf_block *blk; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
327 |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
328 for (;;) { |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
329 if (direction > 0) |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
330 hbuf = g_list_next(hbuf); |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
331 else |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
332 hbuf = g_list_previous(hbuf); |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
333 |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
334 if (!hbuf) break; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
335 |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
336 blk = (hbuf_block*)(hbuf->data); |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
337 // XXX blk->ptr is (maybe) not really correct, because the match should |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
338 // not be after ptr_end. We should check that... |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
339 if (strcasestr(blk->ptr, string)) |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
340 break; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
341 } |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
342 |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
343 return hbuf; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
368
diff
changeset
|
344 } |
| 462 | 345 |
| 464 | 346 // hbuf_jump_date(hbuf, t) |
| 347 // Return a pointer to the first line after date t in the history buffer | |
| 348 GList *hbuf_jump_date(GList *hbuf, time_t t) | |
| 349 { | |
| 350 hbuf_block *blk; | |
| 351 | |
| 352 hbuf = g_list_first(hbuf); | |
| 353 | |
| 354 for ( ; hbuf && g_list_next(hbuf); hbuf = g_list_next(hbuf)) { | |
| 355 blk = (hbuf_block*)(hbuf->data); | |
| 356 if (blk->prefix.timestamp >= t) break; | |
| 357 } | |
| 358 | |
| 359 return hbuf; | |
| 360 } | |
| 361 | |
| 462 | 362 // hbuf_jump_percent(hbuf, pc) |
| 363 // Return a pointer to the line at % pc of the history buffer | |
| 364 GList *hbuf_jump_percent(GList *hbuf, int pc) | |
| 365 { | |
| 366 guint hlen; | |
| 367 | |
| 368 hbuf = g_list_first(hbuf); | |
| 369 hlen = g_list_length(hbuf); | |
| 370 | |
| 371 return g_list_nth(hbuf, pc*hlen/100); | |
| 372 } | |
| 576 | 373 |
| 580 | 374 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */ |