1 Index: src/perl/textui/TextUI.xs
2 ===================================================================
3 --- src/perl/textui/TextUI.xs (revision 4874)
4 +++ src/perl/textui/TextUI.xs (working copy)
7 gui_entry_set_text(active_entry, str);
10 +gui_input_color(pos, len, color)
15 + gui_entry_set_color(active_entry, pos, len, color);
20 Index: src/fe-text/gui-entry.c
21 ===================================================================
22 --- src/fe-text/gui-entry.c (revision 4874)
23 +++ src/fe-text/gui-entry.c (working copy)
25 entry->text_alloc = nearest_power(entry->text_alloc+grow_size);
26 entry->text = g_realloc(entry->text,
27 sizeof(unichar) * entry->text_alloc);
28 + entry->colors = g_realloc(entry->colors,
29 + sizeof(int) * entry->text_alloc);
32 GUI_ENTRY_REC *gui_entry_create(int xpos, int ypos, int width, int utf8)
34 rec = g_new0(GUI_ENTRY_REC, 1);
38 - rec->text_alloc = 1024;
40 + rec->text_alloc = 1024;
41 rec->text = g_new(unichar, rec->text_alloc);
42 - rec->text[0] = '\0';
44 + rec->colors = g_new(int, rec->text_alloc);
45 + rec->text[0] = '\0';
51 if (active_entry == entry)
52 gui_entry_set_active(NULL);
54 - g_free(entry->text);
55 + g_free(entry->text);
56 + g_free(entry->colors);
57 g_free(entry->prompt);
61 static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
65 + int xpos, end_xpos, color;
67 xpos = entry->xpos + entry->promptlen +
68 pos2scrpos(entry, pos + entry->scrstart) -
74 term_set_color(root_window, ATTR_RESET);
75 term_move(root_window, xpos, entry->ypos);
77 for (i = entry->scrstart + pos; i < entry->text_len; i++) {
78 unichar c = entry->text[i];
79 + int cc = entry->colors[i];
88 + term_set_color(root_window, cc);
93 term_addch(root_window, ' ');
94 else if (unichar_isprint(*p))
97 term_set_color(root_window, ATTR_RESET|ATTR_REVERSE);
98 term_addch(root_window, (c & 127)+'A'-1);
99 - term_set_color(root_window, ATTR_RESET);
100 + term_set_color(root_window, color);
105 g_memmove(entry->text + entry->pos + len, entry->text + entry->pos,
106 (entry->text_len-entry->pos + 1) * sizeof(unichar));
108 + /* make space for the color */
109 + g_memmove(entry->colors + entry->pos + len, entry->colors + entry->pos,
110 + (entry->text_len-entry->pos) * sizeof(int));
113 if (term_type == TERM_TYPE_BIG5) {
114 chr = entry->text[entry->pos + len];
116 utf8_to_utf16(str, entry->text+entry->pos);
117 entry->text[entry->pos+len] = chr;
120 + for (i = 0; i < len; i++) {
121 + entry->colors[entry->pos + i] = ATTR_RESET;
124 entry->text_len += len;
127 /* make space for the string */
128 g_memmove(entry->text + entry->pos + 1, entry->text + entry->pos,
129 (entry->text_len-entry->pos + 1) * sizeof(unichar));
132 + g_memmove(entry->colors + entry->pos + 1, entry->colors + entry->pos,
133 + (entry->text_len-entry->pos) * sizeof(int));
136 entry->text[entry->pos] = chr;
137 + entry->colors[entry->pos] = ATTR_RESET;
142 w = cell_width(entry->text + entry->pos - size, entry->pos - size + 1)-1;
144 g_memmove(entry->text + entry->pos - size, entry->text + entry->pos,
145 - (entry->text_len-entry->pos+1) * sizeof(unichar));
147 + (entry->text_len-entry->pos+1) * sizeof(unichar));
149 + g_memmove(entry->colors+ entry->pos - size, entry->colors + entry->pos,
150 + (entry->text_len-entry->pos) * sizeof(int));
153 entry->text_len -= size;
156 mk_wcwidth(entry->text[entry->pos+size]) == 0) size++;
158 g_memmove(entry->text + entry->pos, entry->text + entry->pos + size,
159 - (entry->text_len-entry->pos-size+1) * sizeof(unichar));
161 + (entry->text_len-entry->pos-size+1) * sizeof(unichar));
163 + g_memmove(entry->colors + entry->pos, entry->colors + entry->pos + size,
164 + (entry->text_len-entry->pos-size) * sizeof(int));
166 entry->text_len -= size;
168 gui_entry_redraw_from(entry, entry->pos);
170 void gui_entry_transpose_chars(GUI_ENTRY_REC *entry)
175 if (entry->pos == 0 || entry->text_len < 2)
178 chr = entry->text[entry->pos];
179 entry->text[entry->pos] = entry->text[entry->pos-1];
180 entry->text[entry->pos-1] = chr;
183 + color = entry->colors[entry->pos];
184 + entry->colors[entry->pos] = entry->colors[entry->pos-1];
185 + entry->colors[entry->pos-1] = color;
189 gui_entry_redraw_from(entry, entry->pos-2);
190 @@ -703,31 +740,50 @@
191 /* do wordswap if any found */
192 if (spos1 < epos1 && epos1 < spos2 && spos2 < epos2) {
193 unichar *first, *sep, *second;
194 + int *first_color, *sep_color, *second_color;
197 first = (unichar *) g_malloc( (epos1 - spos1) * sizeof(unichar) );
198 sep = (unichar *) g_malloc( (spos2 - epos1) * sizeof(unichar) );
199 second = (unichar *) g_malloc( (epos2 - spos2) * sizeof(unichar) );
201 - for (i = spos1; i < epos1; i++)
202 + first_color = (int *) g_malloc( (epos1 - spos1) * sizeof(int) );
203 + sep_color = (int *) g_malloc( (spos2 - epos1) * sizeof(int) );
204 + second_color = (int *) g_malloc( (epos2 - spos2) * sizeof(int) );
206 + for (i = spos1; i < epos1; i++) {
207 first[i-spos1] = entry->text[i];
208 - for (i = epos1; i < spos2; i++)
209 + first_color[i-spos1] = entry->colors[i];
211 + for (i = epos1; i < spos2; i++) {
212 sep[i-epos1] = entry->text[i];
213 - for (i = spos2; i < epos2; i++)
214 + sep_color[i-epos1] = entry->colors[i];
216 + for (i = spos2; i < epos2; i++) {
217 second[i-spos2] = entry->text[i];
218 + second_color[i-spos2] = entry->colors[i];
222 - for (i = 0; i < epos2-spos2; i++)
223 + for (i = 0; i < epos2-spos2; i++) {
224 entry->text[entry->pos++] = second[i];
225 - for (i = 0; i < spos2-epos1; i++)
226 + entry->colors[entry->pos++] = second_color[i];
228 + for (i = 0; i < spos2-epos1; i++) {
229 entry->text[entry->pos++] = sep[i];
230 - for (i = 0; i < epos1-spos1; i++)
231 + entry->colors[entry->pos++] = sep_color[i];
233 + for (i = 0; i < epos1-spos1; i++) {
234 entry->text[entry->pos++] = first[i];
236 + entry->colors[entry->pos++] = first_color[i];
243 + g_free(first_color);
245 + g_free(second_color);
248 gui_entry_redraw_from(entry, spos1);
250 gui_entry_fix_cursor(entry);
251 gui_entry_draw(entry);
254 +void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color)
256 + int i, end, update = 0;
258 + g_return_if_fail(entry != NULL);
260 + if (pos > entry->text_len)
265 + if (end > entry->text_len)
266 + end = entry->text_len;
268 + for (i = pos; i < end; i++) {
269 + if (entry->colors[i] != color) {
270 + entry->colors[i] = color;
276 + gui_entry_redraw_from(entry, pos);
277 + gui_entry_fix_cursor(entry);
278 + gui_entry_draw(entry);
281 Index: src/fe-text/gui-entry.h
282 ===================================================================
283 --- src/fe-text/gui-entry.h (revision 4874)
284 +++ src/fe-text/gui-entry.h (working copy)
287 int text_len, text_alloc; /* as shorts, not chars */
295 void gui_entry_redraw(GUI_ENTRY_REC *entry);
297 +void gui_entry_set_color(GUI_ENTRY_REC *entry, int pos, int len, int color);