/
auto-complete.patch
262 lines (237 loc) · 8.65 KB
/
auto-complete.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
*** original/garglk/wintext.c 2013-06-07 11:42:16.424568317 -0700
--- gargoyle/garglk/wintext.c 2013-06-07 11:40:49.168571887 -0700
***************
*** 30,35 ****
--- 30,37 ----
#define MIN(a,b) (a < b ? a : b)
#define MAX(a,b) (a > b ? a : b)
+ #define countof(x) (sizeof x / sizeof *x)
+
/* how many pixels we add to left/right margins */
#define SLOP (2 * GLI_SUBPIX)
***************
*** 40,45 ****
--- 42,49 ----
static glui32
put_picture(window_textbuffer_t *dwin, picture_t *pic, glui32 align, glui32 linkval);
+ int stc, etc = 0;
+
static void touch(window_textbuffer_t *dwin, int line)
{
window_t *win = dwin->owner;
***************
*** 1618,1623 ****
--- 1622,1629 ----
cx = dwin->history[dwin->historypos];
put_text_uni(dwin, cx, cx ? strlen_uni(cx) : 0, dwin->infence,
dwin->numchars - dwin->infence);
+ etc = 0;
+ stc = 0;
break;
case keycode_Down:
***************
*** 1629,1634 ****
--- 1635,1642 ----
cx = dwin->history[dwin->historypos];
put_text_uni(dwin, cx, cx ? strlen_uni(cx) : 0, dwin->infence,
dwin->numchars - dwin->infence);
+ etc = 0;
+ stc = 0;
break;
/* Cursor movement keys, during line input. */
***************
*** 1637,1694 ****
if (dwin->incurs <= dwin->infence)
return;
dwin->incurs--;
break;
case keycode_Right:
if (dwin->incurs >= dwin->numchars)
return;
dwin->incurs++;
break;
case keycode_Home:
if (dwin->incurs <= dwin->infence)
return;
dwin->incurs = dwin->infence;
break;
case keycode_End:
if (dwin->incurs >= dwin->numchars)
return;
dwin->incurs = dwin->numchars;
break;
/* Delete keys, during line input. */
! case keycode_Delete:
if (dwin->incurs <= dwin->infence)
return;
put_text_uni(dwin, NULL, 0, dwin->incurs-1, 1);
break;
! case keycode_Erase:
if (dwin->incurs >= dwin->numchars)
return;
! put_text_uni(dwin, NULL, 0, dwin->incurs, 1);
break;
case keycode_Escape:
if (dwin->infence >= dwin->numchars)
return;
put_text_uni(dwin, NULL, 0, dwin->infence, dwin->numchars - dwin->infence);
break;
/* Regular keys */
case keycode_Return:
acceptline(win, arg);
break;
default:
if (arg >= 32 && arg <= 0x10FFFF)
{
if (gli_conf_caps && (arg > 0x60 && arg < 0x7b))
arg -= 0x20;
put_text_uni(dwin, &arg, 1, dwin->incurs, 0);
}
break;
}
--- 1645,1799 ----
if (dwin->incurs <= dwin->infence)
return;
dwin->incurs--;
+ if (etc-stc != 0)
+ put_text_uni(dwin, NULL, 0, stc, etc-stc);
+ etc = 0;
+ stc = 0;
break;
case keycode_Right:
if (dwin->incurs >= dwin->numchars)
return;
dwin->incurs++;
+ etc = 0;
+ stc = 0;
break;
case keycode_Home:
if (dwin->incurs <= dwin->infence)
return;
dwin->incurs = dwin->infence;
+ if (etc-stc != 0)
+ put_text_uni(dwin, NULL, 0, stc, etc-stc);
+ etc = 0;
+ stc = 0;
break;
case keycode_End:
if (dwin->incurs >= dwin->numchars)
return;
dwin->incurs = dwin->numchars;
+ etc = 0;
+ stc = 0;
break;
/* Delete keys, during line input. */
! case keycode_Delete: // Backspace
if (dwin->incurs <= dwin->infence)
return;
+ if (etc-stc != 0)
+ put_text_uni(dwin, NULL, 0, stc, etc-stc);
put_text_uni(dwin, NULL, 0, dwin->incurs-1, 1);
+ etc = 0;
+ stc = 0;
break;
! case keycode_Erase: // Delete
if (dwin->incurs >= dwin->numchars)
return;
! if (etc-stc != 0)
! put_text_uni(dwin, NULL, 0, stc, etc-stc);
! else
! put_text_uni(dwin, NULL, 0, dwin->incurs, 1);
! etc = 0;
! stc = 0;
break;
case keycode_Escape:
if (dwin->infence >= dwin->numchars)
return;
put_text_uni(dwin, NULL, 0, dwin->infence, dwin->numchars - dwin->infence);
+ etc = 0;
+ stc = 0;
break;
/* Regular keys */
case keycode_Return:
acceptline(win, arg);
+ etc = 0;
+ stc = 0;
break;
default:
if (arg >= 32 && arg <= 0x10FFFF)
{
+ if (etc-stc != 0)
+ put_text_uni(dwin, NULL, 0, stc, etc-stc);
+
if (gli_conf_caps && (arg > 0x60 && arg < 0x7b))
arg -= 0x20;
put_text_uni(dwin, &arg, 1, dwin->incurs, 0);
+
+ // Do not auto complete in the middle of a word
+ if (dwin->incurs == dwin->numchars || dwin->chars[dwin->incurs] == ' ')
+ {
+ int i, n, z;
+ char c;
+
+ // Step backward to find last space on input line
+ for (i=dwin->incurs-1; i>0; i--)
+ {
+ // Convert to lowercase
+ c = dwin->chars[i];
+ if (c >= 'A' && c <= 'Z')
+ c = c+32;
+
+ if (dwin->chars[i] == 0x20)
+ break;
+ }
+
+ // Step forward to extract last word
+ glui32 word[dwin->incurs-i-1];
+
+ for (n=i; n<dwin->incurs; n++)
+ word[n-i] = dwin->chars[n];
+
+ // Loop through lines of prv output
+ for (i=1; i<=dwin->scrollmax; i++)
+ {
+ // Step backwards through char of the line
+ for (n=dwin->lines[i].len; n>=0; n--)
+ {
+ // Step forward again, break if char doesn't match word
+ for (z=0; z<=countof(word); z++)
+ {
+ // Convert to lowercase
+ c = dwin->lines[i].chars[n+z];
+ if (c >= 'A' && c <= 'Z')
+ c = c+32;
+
+ // Compensate for no space before first char in line
+ int g = (n==0) ? z+1 : z;
+
+ if (c != (char)word[g])
+ break;
+
+ if (g == countof(word))
+ goto End; // Match found, break all three loops
+ }
+ }
+ }
+ End:
+
+ /* Call input event for each char in tab complete
+ i is the line, n is the first char of match, z is length of match,
+ so n+z is end of match and start of tab complete */
+ n += 1;
+ stc = dwin->incurs;
+ c = (char)dwin->lines[i].chars[n+z];
+ while ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'))
+ {
+ put_text_uni(dwin, &dwin->lines[i].chars[n+z], 1, dwin->incurs, 0);
+ n++;
+ c = (char)dwin->lines[i].chars[n+z];
+ }
+ etc = dwin->incurs;
+
+ // Move curser to beginning of insert
+ dwin->incurs = stc;
+ }
}
break;
}