ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.147 by root, Sun Dec 12 15:13:37 2004 UTC vs.
Revision 1.180 by root, Wed Dec 21 10:34:24 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
52 TermWin.view_start = 0 52 view_start = 0
53#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 57 selection.beg.row = selection.beg.col \
… …
88/* 88/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 92 */
93#define drawBuffer TermWin.vt 93#define drawBuffer vt
94 94
95#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 96 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 97 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 98 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 99 (unsigned int)Height2Pixel (num), False)
100 100
101#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 102 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 103 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 104 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 105 (unsigned int)Height2Pixel (1), False)
106 106
107#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 108 XFillRectangle (display->display, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 109 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 110 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
112 112
113/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116 116
117/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
118void 118void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 120{
121 if (!l.t)
122 {
123 lalloc (l);
124 col = 0;
125 width = ncol;
126 }
127
121 efs &= ~RS_baseattrMask; 128 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 130
131 text_t *et = l.t + col;
132 rend_t *er = l.r + col;
133
124 while (width--) 134 while (width--)
125 { 135 {
126 *et++ = ' '; 136 *et++ = ' ';
127 *er++ = efs; 137 *er++ = efs;
128 } 138 }
129} 139}
130 140
131/* ------------------------------------------------------------------------- */ 141/* ------------------------------------------------------------------------- */
132/* Fill a full line with blanks - make sure it is allocated first */ 142/* Fill a full line with blanks - make sure it is allocated first */
133void 143void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
135{ 145{
136#ifdef DEBUG_STRICT 146 scr_blank_line (l, 0, ncol, efs);
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
146} 147}
147 148
148/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
151void 152void
152rxvt_term::scr_reset () 153rxvt_term::scr_reset ()
153{ 154{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q; 155 unsigned int p, q;
156 int k; 156 int k;
157 rend_t setrstyle;
158 157
159#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
160 scr_overlay_off (); 159 scr_overlay_off ();
161#endif 160#endif
162 161
163 TermWin.view_start = 0; 162 view_start = 0;
164 num_scr = 0; 163 num_scr = 0;
165 164
166 if (TermWin.ncol == 0) 165 if (ncol == 0)
167 TermWin.ncol = 80; 166 ncol = 80;
168 167
169 if (TermWin.nrow == 0) 168 if (nrow == 0)
170 TermWin.nrow = 24; 169 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 170
175 if (ncol == prev_ncol && nrow == prev_nrow) 171 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 172 return;
177 173
178 // we need at least two lines for wrapping to work correctly 174 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 175 if (nrow + saveLines < 2)
180 { 176 {
181 TermWin.saveLines++; 177 saveLines++;
182 prev_nrow--; 178 prev_nrow--;
183 TermWin.nscrolled++; 179 nsaved++;
184 } 180 }
185 181
186 want_refresh = 1; 182 want_refresh = 1;
187 183
188 prev_total_rows = prev_nrow + TermWin.saveLines; 184 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 185 total_rows = nrow + saveLines;
190 186
191 screen.tscroll = 0; 187 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
193 189
194 if (!talloc) 190 if (!save)
195 {
196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199
200 if (!screen.text)
201 { 191 {
202 /* 192 /*
203 * first time called so just malloc everything: don't rely on realloc 193 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 194 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 195 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 196 nsaved = 0; /* no saved lines */
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 term_start = 0;
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 198
199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
210 206
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++) 207 for (p = nrow; p--; )
220 { 208 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
226 } 212 }
227 213
228 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 217 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 218 screen.charset = 0;
234 current_screen = PRIMARY; 219 current_screen = PRIMARY;
… …
254 else 239 else
255 { 240 {
256 /* 241 /*
257 * add or delete rows as appropriate 242 * add or delete rows as appropriate
258 */ 243 */
259 setrstyle = DEFAULT_RSTYLE; 244
245 rxvt_salloc *old_ta;
246 rxvt_salloc *old_ra;
260 247
261 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
262 { 249 {
263 /* delete rows */ 250 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow); 251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 253 scr_scroll_text (0, (int)prev_nrow - 1, k);
266 254
267 for (p = nrow; p < prev_nrow; p++) 255 for (p = nrow; p < prev_nrow; p++)
268 { 256 {
269 q = p + TermWin.saveLines; 257 lfree (ROW(p));
270
271 if (screen.text[q])
272 {
273#ifdef DEBUG_STRICT
274 assert (screen.rend[q]);
275#endif
276 talloc->free (screen.text[q]);
277 ralloc->free (screen.rend[q]);
278 }
279
280 if (swap.text[p]) 258 lfree (swap_save[p]);
281 {
282#ifdef DEBUG_STRICT
283 assert (swap.rend[p]);
284#endif
285 talloc->free (swap.text[p]);
286 ralloc->free (swap.rend[p]);
287 }
288
289#ifdef DEBUG_STRICT
290 assert (drawn_text[p] && drawn_rend[p]);
291#endif
292 talloc->free (drawn_text[p]); 259 lfree (drawn[p]);
293 ralloc->free (drawn_rend[p]);
294 } 260 }
295 261
296 /* we have fewer rows so fix up cursor position */ 262 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 263 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 264
300 scr_reset_realloc (); /* realloc _last_ */ 265 scr_reset_realloc (); /* realloc _last_ */
301 } 266 }
302 else if (nrow > prev_nrow) 267 else if (nrow > prev_nrow)
303 { 268 {
304 /* add rows */ 269 /* add rows */
305 scr_reset_realloc (); /* realloc _first_ */ 270 scr_reset_realloc (); /* realloc _first_ */
306 271
272 int ocol = ncol;
307 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
308 274
309 k = min (TermWin.nscrolled, nrow - prev_nrow); 275 k = min (nsaved, nrow - prev_nrow);
310 276
311 for (p = prev_total_rows; p < total_rows; p++) 277 for (p = prev_total_rows; p < total_rows; p++)
312 { 278 save[p].clear ();
313 screen.tlen[p] = 0;
314 screen.text[p] = NULL;
315 screen.rend[p] = NULL;
316 }
317 279
318 for (p = prev_total_rows; p < total_rows - k; p++) 280 for (p = prev_total_rows; p < total_rows - k; p++)
319 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); 281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
320 282
321 for (p = prev_nrow; p < nrow; p++) 283 for (p = prev_nrow; p < nrow; p++)
322 { 284 {
323 swap.tlen[p] = 0; 285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
324 swap.text[p] = NULL; 286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
325 swap.rend[p] = NULL;
326 drawn_text[p] = NULL;
327 drawn_rend[p] = NULL;
328 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
329 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
330 } 287 }
331 288
332 if (k > 0) 289 if (k > 0)
333 { 290 {
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 291 scr_scroll_text (0, (int)nrow - 1, -k);
335 screen.cur.row += k; 292 screen.cur.row += k;
336 screen.s_cur.row += k; 293 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 294 nsaved -= k;
338 } 295 }
296
339#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 298 assert (screen.cur.row < nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 299#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 300 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 301#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
348 } 303 }
349 304
350 /* resize columns */ 305 /* resize columns */
351 if (ncol != prev_ncol) 306 if (ncol != prev_ncol)
352 { 307 {
353 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
354 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
355 310
356 for (p = 0; p < total_rows; p++) 311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
357 { 315 {
358 if (screen.text[p]) 316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l;
349
350 assert (llen >= 0);
351
352 while (p && save[p - 1].l < 0)
359 { 353 {
360 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); 354 --p;
361 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
362
363 MIN_IT (screen.tlen[p], (int16_t)ncol);
364
365 if (ncol > prev_ncol) 355 llen += prev_ncol;
366 scr_blank_line (&screen.text[p][prev_ncol], 356 }
367 &screen.rend[p][prev_ncol], 357
368 ncol - prev_ncol, setrstyle); 358 int qlines = llen / ncol + 1;
359 int lofs = 0;
360
361 q -= qlines;
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++)
367 {
368 if (qrow >= 0)
369 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p;
379 int pcol = lofs % prev_ncol;
380
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382
383 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000);
397
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
400
401 lofs += len;
402 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 }
408 else
409 lofs += ncol;
369 } 410 }
370 } 411 }
371
372 for (p = 0; p < nrow; p++)
373 {
374 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
375 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
376
377 if (ncol > prev_ncol)
378 scr_blank_line (&drawn_text[p][prev_ncol],
379 &drawn_rend[p][prev_ncol],
380 ncol - prev_ncol, setrstyle);
381
382 if (swap.text[p])
383 {
384 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
385 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
386
387 MIN_IT (swap.tlen[p], (int16_t)ncol);
388
389 if (ncol > prev_ncol)
390 scr_blank_line (&swap.text[p][prev_ncol],
391 &swap.rend[p][prev_ncol],
392 ncol - prev_ncol, setrstyle);
393 }
394
395 } 412 }
396 413
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 414 free (screen.text); screen.text = tp;
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1); 415 free (screen.rend); screen.rend = rp;
416 free (screen.tlen); screen.tlen = tl;
399 417
400 delete talloc; talloc = ta; 418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
401 delete ralloc; ralloc = ra; 419#endif
402 }
403 420
404 if (tabs) 421 if (tabs)
405 free (tabs); 422 free (tabs);
406 } 423 }
407 424
… …
417} 434}
418 435
419void 436void
420rxvt_term::scr_reset_realloc () 437rxvt_term::scr_reset_realloc ()
421{ 438{
422 unsigned int total_rows, nrow;
423
424 nrow = TermWin.nrow;
425 total_rows = nrow + TermWin.saveLines;
426 /* *INDENT-OFF* */
427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
428 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
429 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
430 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); 439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
431 440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
432 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); 441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
433 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); 442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
434
435 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
436 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
437 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
438 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
439 /* *INDENT-ON* */
440} 443}
441 444
442/* ------------------------------------------------------------------------- */ 445/* ------------------------------------------------------------------------- */
443/* 446/*
444 * Free everything. That way malloc debugging can find leakage. 447 * Free everything. That way malloc debugging can find leakage.
445 */ 448 */
446void 449void
447rxvt_term::scr_release () 450rxvt_term::scr_release ()
448{ 451{
449 unsigned int total_rows;
450 int i;
451
452 total_rows = TermWin.nrow + TermWin.saveLines;
453
454 delete talloc; talloc = 0; 452 delete talloc; talloc = 0;
455 delete ralloc; ralloc = 0; 453 delete ralloc; ralloc = 0;
456 454
457 free (screen.text); 455 free (save);
458 free (screen.tlen); 456 free (swap_save);
459 free (screen.rend);
460 free (drawn_text); 457 free (drawn);
461 free (drawn_rend);
462 free (swap.text);
463 free (swap.tlen);
464 free (swap.rend);
465 free (buf_text); 458 free (buf);
466 free (buf_rend);
467 free (tabs); 459 free (tabs);
468
469 /* NULL these so if anything tries to use them, we'll know about it */
470 screen.text = drawn_text = swap.text = NULL;
471 screen.rend = drawn_rend = swap.rend = NULL;
472 screen.tlen = swap.tlen = NULL;
473 buf_text = NULL;
474 buf_rend = NULL;
475 tabs = NULL;
476} 460}
477 461
478/* ------------------------------------------------------------------------- */ 462/* ------------------------------------------------------------------------- */
479/* 463/*
480 * Hard reset 464 * Hard reset
… …
531 set_font_style (); 515 set_font_style ();
532 break; 516 break;
533 } 517 }
534 518
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 519 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 520 MIN_IT (s->cur.row, nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 521 MIN_IT (s->cur.col, ncol - 1);
538#ifdef DEBUG_STRICT 522#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
540 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
541#else /* drive with your eyes closed */ 525#else /* drive with your eyes closed */
542 MAX_IT (s->cur.row, 0); 526 MAX_IT (s->cur.row, 0);
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 535 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 536 */
553int 537int
554rxvt_term::scr_change_screen (int scrn) 538rxvt_term::scr_change_screen (int scrn)
555{ 539{
556 int i;
557#if NSCREENS
558 int offset;
559#endif
560
561 want_refresh = 1; 540 want_refresh = 1;
562
563 TermWin.view_start = 0; 541 view_start = 0;
564 542
565 if (current_screen == scrn) 543 if (current_screen == scrn)
566 return scrn; 544 return scrn;
567 545
568 selection_check (2); /* check for boundary cross */ 546 selection_check (2); /* check for boundary cross */
569 547
570 SWAP_IT (current_screen, scrn, int); 548 int i = current_screen; current_screen = scrn; scrn = i;
571 549
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 550 ::swap (screen.cur.row, swap.cur.row);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 551 ::swap (screen.cur.col, swap.cur.col);
574# ifdef DEBUG_STRICT 552
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow); 553 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol); 554 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583 555
584#if NSCREENS 556#if NSCREENS
585 if (options & Opt_secondaryScreen) 557 if (options & Opt_secondaryScreen)
586 { 558 {
587 num_scr = 0; 559 num_scr = 0;
588 offset = TermWin.saveLines;
589 560
590 for (i = prev_nrow; i--;) 561 for (int i = nrow; i--; )
591 { 562 ::swap (ROW(i), swap_save[i]);
592 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
593 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
594 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
595 }
596 563
597 SWAP_IT (screen.charset, swap.charset, int16_t); 564 ::swap (screen.charset, swap.charset);
598 SWAP_IT (screen.flags, swap.flags, int); 565 ::swap (screen.flags, swap.flags);
599 screen.flags |= Screen_VisibleCursor; 566 screen.flags |= Screen_VisibleCursor;
600 swap.flags |= Screen_VisibleCursor; 567 swap.flags |= Screen_VisibleCursor;
601 } 568 }
602 else 569 else
603#endif 570#endif
604 if (options & Opt_secondaryScroll) 571 if (options & Opt_secondaryScroll)
605 //if (current_screen == PRIMARY)
606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 572 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
607 573
608 return scrn; 574 return scrn;
609} 575}
610 576
611// clear WrapNext indicator, solidifying position on next line 577// clear WrapNext indicator, solidifying position on next line
… …
618 screen.flags &= ~Screen_WrapNext; 584 screen.flags &= ~Screen_WrapNext;
619 585
620 screen.cur.col = 0; 586 screen.cur.col = 0;
621 587
622 if (screen.cur.row == screen.bscroll) 588 if (screen.cur.row == screen.bscroll)
623 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 589 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
624 else if (screen.cur.row < TermWin.nrow - 1) 590 else if (screen.cur.row < nrow - 1)
625 screen.cur.row++; 591 screen.cur.row++;
626} 592}
627 593
628/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
629/* 595/*
… …
659/* ------------------------------------------------------------------------- */ 625/* ------------------------------------------------------------------------- */
660/* 626/*
661 * Scroll text between <row1> and <row2> inclusive, by <count> lines 627 * Scroll text between <row1> and <row2> inclusive, by <count> lines
662 * count positive ==> scroll up 628 * count positive ==> scroll up
663 * count negative ==> scroll down 629 * count negative ==> scroll down
664 * spec == 0 for normal routines
665 */ 630 */
666int 631int
667rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 632rxvt_term::scr_scroll_text (int row1, int row2, int count)
668{ 633{
669 int i, j;
670 long nscrolled;
671
672 if (count == 0 || (row1 > row2)) 634 if (count == 0 || (row1 > row2))
673 return 0; 635 return 0;
674 636
675 want_refresh = 1; 637 want_refresh = 1;
638 num_scr += count;
676 639
677 if (row1 == 0 && count > 0 640 if (count > 0
641 && row1 == 0
642 && row2 == nrow - 1
678 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 643 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
679 { 644 {
680 nscrolled = (long)TermWin.nscrolled + (long)count; 645 nsaved = min (nsaved + count, saveLines);
646 term_start = (term_start + count) % total_rows;
681 647
682 if (nscrolled > (long)TermWin.saveLines) 648 if (selection.op && current_screen == selection.screen)
683 TermWin.nscrolled = TermWin.saveLines; 649 {
650 selection.beg.row -= count;
651 selection.end.row -= count;
652 selection.mark.row -= count;
653
654 selection_check (0);
655 }
656
657 for (int i = count; i--; )
658 scr_blank_screen_mem (ROW(row2 - i), rstyle);
684 else 659
685 TermWin.nscrolled = (unsigned int)nscrolled;
686
687 if ((options & Opt_scrollWithBuffer) 660 if ((options & Opt_scrollWithBuffer)
688 && TermWin.view_start != 0 661 && view_start != 0
689 && TermWin.view_start != TermWin.saveLines) 662 && view_start != saveLines)
690 scr_page (UP, count); 663 scr_page (UP, count);
691 } 664 }
692 else if (!spec) 665 else
693 row1 += TermWin.saveLines; 666 {
694
695 row2 += TermWin.saveLines;
696
697 if (selection.op && current_screen == selection.screen) 667 if (selection.op && current_screen == selection.screen)
698 { 668 {
699 i = selection.beg.row + TermWin.saveLines; 669 int i = selection.beg.row;
700 j = selection.end.row + TermWin.saveLines; 670 int j = selection.end.row;
671
701 if ((i < row1 && j > row1) 672 if ((i < row1 && j > row1)
702 || (i < row2 && j > row2) 673 || (i < row2 && j > row2)
703 || (i - count < row1 && i >= row1) 674 || (i - count < row1 && i >= row1)
704 || (i - count > row2 && i <= row2) 675 || (i - count > row2 && i <= row2)
705 || (j - count < row1 && j >= row1) 676 || (j - count < row1 && j >= row1)
706 || (j - count > row2 && j <= row2)) 677 || (j - count > row2 && j <= row2))
707 { 678 {
708 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
709 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710 } 681 }
711 else if (j >= row1 && j <= row2) 682 else if (j >= row1 && j <= row2)
712 { 683 {
713 /* move selected region too */ 684 /* move selected region too */
714 selection.beg.row -= count; 685 selection.beg.row -= count;
715 selection.end.row -= count; 686 selection.end.row -= count;
716 selection.mark.row -= count; 687 selection.mark.row -= count;
688
689 selection_check (0);
717 } 690 }
718 }
719
720 selection_check (0); /* _after_ TermWin.nscrolled update */
721
722 num_scr += count;
723 j = count;
724
725 if (count < 0)
726 count = -count;
727
728 i = row2 - row1 + 1;
729 MIN_IT (count, i);
730
731 if (j > 0)
732 {
733 /* A: scroll up */
734
735 /* A1: Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738
739 /* A2: Rotate lines */
740 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744
745 j = row2 - count + 1, i = count;
746 }
747 else /* if (j < 0) */
748 {
749 /* B: scroll down */
750
751 /* B1: Copy lines that will get clobbered by the rotation */
752 for (i = 0, j = row2; i < count; i++, j--)
753 { 691 }
754 buf_text[i] = screen.text[j]; 692
755 buf_rend[i] = screen.rend[j]; 693 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical.
695
696 int rows = row2 - row1 + 1;
697
698 for (int row = 0; row < rows; row++)
756 } 699 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows);
757 701
758 /* B2: Rotate lines */ 702 if (!IN_RANGE_EXC (row + count, 0, rows))
759 for (j = row2, i = j - count; i >= row1; i--, j--) 703 scr_blank_screen_mem (buf [row], rstyle);
760 { 704 }
761 screen.tlen[j] = screen.tlen[i];
762 screen.text[j] = screen.text[i];
763 screen.rend[j] = screen.rend[i];
764 }
765 705
766 j = row1, i = count; 706 for (int row = 0; row < rows; row++)
767 count = -count; 707 ROW(row1 + row) = buf [row];
768 } 708 }
769
770 /* C: Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */
775 for (; i--; j++)
776 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
777 709
778 return count; 710 return count;
779} 711}
780 712
781/* ------------------------------------------------------------------------- */ 713/* ------------------------------------------------------------------------- */
… …
783 * Add text given in <str> of length <len> to screen struct 715 * Add text given in <str> of length <len> to screen struct
784 */ 716 */
785void 717void
786rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 718rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
787{ 719{
720 if (len <= 0) /* sanity */
721 return;
722
788 unsigned char checksel; 723 unsigned char checksel;
789 unicode_t c; 724 unicode_t c;
790 int i, row, last_col; 725 int row, last_col;
791 text_t *stp; 726 const unicode_t *strend = str + len;
792 rend_t *srp;
793
794 if (len <= 0) /* sanity */
795 return;
796 727
797 want_refresh = 1; 728 want_refresh = 1;
798 ZERO_SCROLLBACK (); 729 ZERO_SCROLLBACK ();
799 last_col = TermWin.ncol; 730 last_col = ncol;
800 731
801 if (nlines > 0) 732 if (nlines > 0)
802 { 733 {
803 nlines += screen.cur.row - screen.bscroll; 734 nlines += screen.cur.row - screen.bscroll;
804 if ((nlines > 0) 735 if ((nlines > 0)
805 && (screen.tscroll == 0) 736 && (screen.tscroll == 0)
806 && (screen.bscroll == (TermWin.nrow - 1))) 737 && (screen.bscroll == (nrow - 1)))
807 { 738 {
808 /* _at least_ this many lines need to be scrolled */ 739 /* _at least_ this many lines need to be scrolled */
809 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
810 screen.cur.row -= nlines; 741 screen.cur.row -= nlines;
811 } 742 }
812 } 743 }
813 744
814#ifdef DEBUG_STRICT 745#ifdef DEBUG_STRICT
815 assert (screen.cur.col < last_col); 746 assert (screen.cur.col < last_col);
816 assert ((screen.cur.row < TermWin.nrow) 747 assert ((screen.cur.row < nrow)
817 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 748 && (screen.cur.row >= - (int32_t)nsaved));
818#else /* drive with your eyes closed */ 749#else /* drive with your eyes closed */
819 MIN_IT (screen.cur.col, last_col - 1); 750 MIN_IT (screen.cur.col, last_col - 1);
820 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 751 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 752 MAX_IT (screen.cur.row, - (int32_t)nsaved);
822#endif 753#endif
823 row = screen.cur.row + TermWin.saveLines; 754 row = screen.cur.row;
824 755
825 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 756 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
826 757
827 stp = screen.text[row]; 758 line_t *line = &ROW(row);
828 srp = screen.rend[row];
829 759
830 while (len--) 760 while (str < strend)
831 { 761 {
832 c = *str++; 762 c = *str++;
833 763
834 if (c < 0x20) 764 if (c < 0x20)
835 switch (c) 765 if (c == C0_LF)
766 {
767 if (!line->is_longer ()) /* XXX: think about this */
768 MAX_IT (line->l, screen.cur.col);
769
770 screen.flags &= ~Screen_WrapNext;
771
772 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
774 else if (screen.cur.row < (nrow - 1))
775 row = ++screen.cur.row;
776
777 line = &ROW(row); /* _must_ refresh */
778 continue;
779 }
780 else if (c == C0_CR)
836 { 781 {
837 case C0_HT: 782 if (!line->is_longer ()) /* XXX: think about this */
838 scr_tab (1, true);
839 continue;
840
841 case C0_LF:
842 if (screen.tlen[row] != -1) /* XXX: think about this */
843 MAX_IT (screen.tlen[row], screen.cur.col); 783 MAX_IT (line->l, screen.cur.col);
844 784
845 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
846
847 if (screen.cur.row == screen.bscroll)
848 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
849 else if (screen.cur.row < (TermWin.nrow - 1))
850 row = (++screen.cur.row) + TermWin.saveLines;
851
852 stp = screen.text[row]; /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */
854 continue;
855
856 case C0_CR:
857 if (screen.tlen[row] != -1) /* XXX: think about this */
858 MAX_IT (screen.tlen[row], screen.cur.col);
859
860 screen.flags &= ~Screen_WrapNext;
861 screen.cur.col = 0; 786 screen.cur.col = 0;
862 continue; 787 continue;
788 }
789 else if (c == C0_HT)
790 {
791 scr_tab (1, true);
792 continue;
863 } 793 }
864 794
865 if (checksel /* see if we're writing within selection */ 795 if (checksel /* see if we're writing within selection */
866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 796 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 797 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
875 CLEAR_SELECTION (); 805 CLEAR_SELECTION ();
876 } 806 }
877 807
878 if (screen.flags & Screen_WrapNext) 808 if (screen.flags & Screen_WrapNext)
879 { 809 {
880 screen.tlen[row] = -1; 810 line->set_is_longer ();
881 811
882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 812 scr_do_wrap ();
883
884 stp = screen.text[row]; /* _must_ refresh */
885 srp = screen.rend[row]; /* _must_ refresh */
886 } 813
814 row = screen.cur.row;
815 line = &ROW(row); /* _must_ refresh */
816 }
817
818 // some utf-8 decoders "decode" surrogate characters: let's fix this.
819 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
820 c = 0xfffd;
887 821
888 // rely on wcwidth to tell us the character width, at least for non-latin1 822 // rely on wcwidth to tell us the character width, at least for non-latin1
889 // do wcwidth before further replacements, as wcwidth says that line-drawing 823 // do wcwidth before further replacements, as wcwidth might return -1
890 // characters have width -1 (DOH!) on GNU/Linux sometimes. 824 // for the line drawing characters below as they might be invalid in the current
825 // locale.
891 int width = c < 0x100 ? 1 : wcwidth (c); 826 int width = c < 0x100 ? 1 : wcwidth (c);
892 827
893 if (charsets[screen.charset] == '0') // DEC SPECIAL 828 if (charsets[screen.charset] == '0') // DEC SPECIAL
894 { 829 {
895 // vt100 special graphics and line drawing 830 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100 831 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars 832 // 40-5e rxvt extension for extra curses acs chars
898 static uint16_t vt100_0[63] = { // 40 .. 7e 833 static uint16_t vt100_0[62] = { // 41 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 834 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 835 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 836 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 837 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 838 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 839 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 840 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 841 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
907 }; 842 };
908 843
909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 844 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
910 { 845 {
911 c = vt100_0[c - 0x40]; 846 c = vt100_0[c - 0x41];
912 width = 1; 847 width = 1; // vt100 line drawing characters are always single-width
913 } 848 }
914 } 849 }
915 850
916 if (screen.flags & Screen_Insert) 851 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT); 852 scr_insdel_chars (width, INSERT);
918 853
919 if (width != 0) 854 if (width != 0)
920 { 855 {
921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3 856#if !UNICODE_3
926 // trim characters we can't store directly :( 857 // trim characters we can't store directly :(
927 if (c >= 0x10000) 858 if (c >= 0x10000)
928# if ENABLE_COMBINING 859# if ENABLE_COMBINING
929 c = rxvt_composite.compose (c); // map to lower 16 bits 860 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
931 c = 0xfffd; 862 c = 0xfffd;
932# endif 863# endif
933#endif 864#endif
934 865
935 // nuke the character at this position, if required 866 // nuke the character at this position, if required
936 if (stp[screen.cur.col] == NOCHAR 867 if (line->t[screen.cur.col] == NOCHAR
937 || (screen.cur.col < TermWin.ncol - 1 868 || (screen.cur.col < ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR)) 869 && line->t[screen.cur.col + 1] == NOCHAR))
939 { 870 {
940 int col = screen.cur.col; 871 int col = screen.cur.col;
941 872
942 // find begin 873 // find begin
943 while (col > 0 && stp[col] == NOCHAR) 874 while (col > 0 && line->t[col] == NOCHAR)
944 col--; 875 col--;
945 876
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); 877 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
947 878
948 // found begin, nuke 879 // found begin, nuke
949 do { 880 do {
950 stp[col] = ' '; 881 line->t[col] = ' ';
951 srp[col] = rend; 882 line->r[col] = rend;
952 col++; 883 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR); 884 } while (col < ncol && line->t[col] == NOCHAR);
954 } 885 }
955 886
956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 887 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
888
889 // if the character doesn't fit into the remaining columns...
890 if (screen.cur.col > last_col - width && last_col >= width)
891 {
892 // ...output spaces
893 c = ' ';
894 // and try the same character next loop iteration
895 --str;
896 }
957 897
958 do 898 do
959 { 899 {
960 stp[screen.cur.col] = c; 900 line->t[screen.cur.col] = c;
961 srp[screen.cur.col] = rend; 901 line->r[screen.cur.col] = rend;
962 902
963 if (screen.cur.col < last_col - 1) 903 if (screen.cur.col < last_col - 1)
964 screen.cur.col++; 904 screen.cur.col++;
965 else 905 else
966 { 906 {
967 screen.tlen[row] = last_col; 907 line->l = last_col;
968 if (screen.flags & Screen_Autowrap) 908 if (screen.flags & Screen_Autowrap)
969 screen.flags |= Screen_WrapNext; 909 screen.flags |= Screen_WrapNext;
970 break; 910 break;
971 } 911 }
972 912
… …
974 } 914 }
975 while (--width > 0); 915 while (--width > 0);
976 916
977 // pad with spaces when overwriting wide character with smaller one 917 // pad with spaces when overwriting wide character with smaller one
978 if (!width) 918 if (!width)
979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 919 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
980 { 920 {
981 stp[c] = ' '; 921 line->t[c] = ' ';
982 srp[c] = rend; 922 line->r[c] = rend;
983 } 923 }
984 } 924 }
985 else if (width == 0) 925 else // width == 0
986 { 926 {
987#if ENABLE_COMBINING 927#if ENABLE_COMBINING
988 // handle combining characters 928 // handle combining characters
989 // we just tag the accent on the previous on-screen character. 929 // we just tag the accent on the previous on-screen character.
990 // this is arguably not correct, but also arguably not wrong. 930 // this is arguably not correct, but also arguably not wrong.
991 // we don't handle double-width characters nicely yet. 931 // we don't handle double-width characters nicely yet.
992
993 text_t *tp; 932 text_t *tp;
994 rend_t *rp; 933 rend_t *rp;
995 934
996 if (screen.cur.col > 0) 935 if (screen.cur.col > 0)
997 { 936 {
998 tp = stp + screen.cur.col - 1; 937 tp = line->t + screen.cur.col - 1;
999 rp = srp + screen.cur.col - 1; 938 rp = line->r + screen.cur.col - 1;
1000 939
1001 while (*tp == NOCHAR && tp > stp) 940 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--; 941 tp--, rp--;
1003 } 942 }
1004 else if (screen.cur.row > 0 943 else if (screen.cur.row > 0
1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 944 && ROW(screen.cur.row - 1).is_longer ())
1006 { 945 {
1007 int line = screen.cur.row - 1 + TermWin.saveLines; 946 line_t *line = &ROW(screen.cur.row - 1);
1008 947
1009 tp = screen.text[line] + last_col - 1; 948 tp = line->t + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1; 949 rp = line->r + last_col - 1;
1011 950
1012 while (*tp == NOCHAR && tp > screen.text[line]) 951 while (*tp == NOCHAR && tp > line->t)
1013 tp--, rp--; 952 tp--, rp--;
1014 } 953 }
1015 else 954 else
1016 continue; 955 continue;
1017 956
… …
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 963 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1025#endif 964#endif
1026 } 965 }
1027 } 966 }
1028 967
1029 if (screen.tlen[row] != -1) /* XXX: think about this */ 968 if (!line->is_longer ()) /* XXX: think about this */
1030 MAX_IT (screen.tlen[row], screen.cur.col); 969 MAX_IT (line->l, screen.cur.col);
1031 970
1032#ifdef DEBUG_STRICT 971#ifdef DEBUG_STRICT
1033 assert (screen.cur.row >= 0); 972 assert (screen.cur.row >= 0);
1034#else /* drive with your eyes closed */ 973#else /* drive with your eyes closed */
1035 MAX_IT (screen.cur.row, 0); 974 MAX_IT (screen.cur.row, 0);
… …
1049 if (screen.cur.col == 0) 988 if (screen.cur.col == 0)
1050 { 989 {
1051 if (screen.cur.row > 0) 990 if (screen.cur.row > 0)
1052 { 991 {
1053#ifdef TERMCAP_HAS_BW 992#ifdef TERMCAP_HAS_BW
1054 screen.cur.col = TermWin.ncol - 1; 993 screen.cur.col = ncol - 1;
1055 screen.cur.row--; 994 screen.cur.row--;
1056 return; 995 return;
1057#endif 996#endif
1058 } 997 }
1059 } 998 }
… …
1079 1018
1080 if (count == 0) 1019 if (count == 0)
1081 return; 1020 return;
1082 else if (count > 0) 1021 else if (count > 0)
1083 { 1022 {
1084 int row = TermWin.saveLines + screen.cur.row; 1023 int row = screen.cur.row;
1085 text_t *tp = screen.text[row]; 1024
1086 rend_t *rp = screen.rend[row]; 1025 line_t &l = ROW(row);
1087 rend_t base_rend = rp[i]; 1026 rend_t base_rend = l.r[i];
1088 ht &= tp[i] == ' '; 1027 ht &= l.t[i] == ' ';
1089 1028
1090 for (; ++i < TermWin.ncol; ) 1029 for (; ++i < ncol; )
1091 if (tabs[i]) 1030 if (tabs[i])
1092 { 1031 {
1093 x = i; 1032 x = i;
1094 if (!--count) 1033 if (!--count)
1095 break; 1034 break;
1096 } 1035 }
1097 else 1036 else
1098 ht &= tp[i] == ' ' 1037 ht &= l.t[i] == ' '
1099 && RS_SAME (rp[i], base_rend); 1038 && RS_SAME (l.r[i], base_rend);
1100 1039
1101 if (count) 1040 if (count)
1102 x = TermWin.ncol - 1; 1041 x = ncol - 1;
1103 1042
1104 // store horizontal tab commands as characters inside the text 1043 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted. 1044 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs) 1045 if (ht && options & Opt_pastableTabs)
1107 { 1046 {
1108 base_rend = SET_FONT (base_rend, 0); 1047 base_rend = SET_FONT (base_rend, 0);
1109 1048
1110 if (screen.tlen[row] != -1) /* XXX: think about this */ 1049 if (!l.is_longer ()) /* XXX: think about this */
1111 MAX_IT (screen.tlen[row], x); 1050 MAX_IT (l.l, x);
1112 1051
1113 i = screen.cur.col; 1052 i = screen.cur.col;
1114 1053
1115 tp[i] = '\t'; 1054 l.t[i] = '\t';
1116 rp[i] = base_rend; 1055 l.r[i] = base_rend;
1117 1056
1118 while (++i < x) 1057 while (++i < x)
1119 { 1058 {
1120 tp[i] = NOCHAR; 1059 l.t[i] = NOCHAR;
1121 rp[i] = base_rend; 1060 l.r[i] = base_rend;
1122 } 1061 }
1123 } 1062 }
1124 } 1063 }
1125 else /* if (count < 0) */ 1064 else /* if (count < 0) */
1126 { 1065 {
… …
1152rxvt_term::scr_backindex () 1091rxvt_term::scr_backindex ()
1153{ 1092{
1154 if (screen.cur.col > 0) 1093 if (screen.cur.col > 0)
1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1156 else 1095 else
1157 {
1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1159 return; /* um, yeah? */
1160
1161 scr_insdel_chars (1, INSERT); 1096 scr_insdel_chars (1, INSERT);
1162 }
1163} 1097}
1164#endif 1098#endif
1165/* ------------------------------------------------------------------------- */ 1099/* ------------------------------------------------------------------------- */
1166/* 1100/*
1167 * Process DEC Forward Index 1101 * Process DEC Forward Index
… …
1171 */ 1105 */
1172#if ENABLE_FRILLS 1106#if ENABLE_FRILLS
1173void 1107void
1174rxvt_term::scr_forwardindex () 1108rxvt_term::scr_forwardindex ()
1175{ 1109{
1176 int row; 1110 int row;
1177 1111
1178 if (screen.cur.col < TermWin.ncol - 1) 1112 if (screen.cur.col < ncol - 1)
1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1180 else 1114 else
1181 { 1115 {
1182 row = screen.cur.row + TermWin.saveLines; 1116 row = screen.cur.row;
1183 1117
1184 if (screen.tlen[row] == 0) 1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1185 return; /* um, yeah? */ 1119 ROW(row).l = ncol;
1186 else if (screen.tlen[row] == -1)
1187 screen.tlen[row] = TermWin.ncol;
1188 1120
1189 scr_gotorc (0, 0, R_RELATIVE); 1121 scr_gotorc (0, 0, R_RELATIVE);
1190 scr_insdel_chars (1, DELETE); 1122 scr_insdel_chars (1, DELETE);
1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1123 scr_gotorc (0, ncol - 1, R_RELATIVE);
1192 } 1124 }
1193} 1125}
1194#endif 1126#endif
1195 1127
1196/* ------------------------------------------------------------------------- */ 1128/* ------------------------------------------------------------------------- */
… …
1203 want_refresh = 1; 1135 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1136 ZERO_SCROLLBACK ();
1205 1137
1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1207 MAX_IT (screen.cur.col, 0); 1139 MAX_IT (screen.cur.col, 0);
1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1140 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1209 1141
1210 screen.flags &= ~Screen_WrapNext; 1142 screen.flags &= ~Screen_WrapNext;
1211 1143
1212 if (relative & R_RELATIVE) 1144 if (relative & R_RELATIVE)
1213 { 1145 {
… …
1238 else 1170 else
1239 screen.cur.row = row; 1171 screen.cur.row = row;
1240 } 1172 }
1241 1173
1242 MAX_IT (screen.cur.row, 0); 1174 MAX_IT (screen.cur.row, 0);
1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1175 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1244} 1176}
1245 1177
1246/* ------------------------------------------------------------------------- */ 1178/* ------------------------------------------------------------------------- */
1247/* 1179/*
1248 * direction should be UP or DN 1180 * direction should be UP or DN
… …
1259 1191
1260 screen.flags &= ~Screen_WrapNext; 1192 screen.flags &= ~Screen_WrapNext;
1261 1193
1262 if ((screen.cur.row == screen.bscroll && direction == UP) 1194 if ((screen.cur.row == screen.bscroll && direction == UP)
1263 || (screen.cur.row == screen.tscroll && direction == DN)) 1195 || (screen.cur.row == screen.tscroll && direction == DN))
1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1265 else 1197 else
1266 screen.cur.row += dirn; 1198 screen.cur.row += dirn;
1267 1199
1268 MAX_IT (screen.cur.row, 0); 1200 MAX_IT (screen.cur.row, 0);
1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1201 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1270 selection_check (0); 1202 selection_check (0);
1271} 1203}
1272 1204
1273/* ------------------------------------------------------------------------- */ 1205/* ------------------------------------------------------------------------- */
1274/* 1206/*
… …
1285 want_refresh = 1; 1217 want_refresh = 1;
1286 ZERO_SCROLLBACK (); 1218 ZERO_SCROLLBACK ();
1287 1219
1288 selection_check (1); 1220 selection_check (1);
1289 1221
1290 row = TermWin.saveLines + screen.cur.row; 1222 row = screen.cur.row;
1223
1291 switch (mode) 1224 switch (mode)
1292 { 1225 {
1293 case 0: /* erase to end of line */ 1226 case 0: /* erase to end of line */
1294 col = screen.cur.col; 1227 col = screen.cur.col;
1295 num = TermWin.ncol - col; 1228 num = ncol - col;
1296 MIN_IT (screen.tlen[row], (int16_t)col); 1229 MIN_IT (ROW(row).l, (int16_t)col);
1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1299 CLEAR_SELECTION (); 1232 CLEAR_SELECTION ();
1300 break; 1233 break;
1301 case 1: /* erase to beginning of line */ 1234 case 1: /* erase to beginning of line */
… …
1305 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1238 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1306 CLEAR_SELECTION (); 1239 CLEAR_SELECTION ();
1307 break; 1240 break;
1308 case 2: /* erase whole line */ 1241 case 2: /* erase whole line */
1309 col = 0; 1242 col = 0;
1310 num = TermWin.ncol; 1243 num = ncol;
1311 screen.tlen[row] = 0; 1244 ROW(row).l = 0;
1312 if (selection.beg.row <= screen.cur.row 1245 if (selection.beg.row <= screen.cur.row
1313 && selection.end.row >= screen.cur.row) 1246 && selection.end.row >= screen.cur.row)
1314 CLEAR_SELECTION (); 1247 CLEAR_SELECTION ();
1315 break; 1248 break;
1316 default: 1249 default:
1317 return; 1250 return;
1318 } 1251 }
1319 1252
1320 if (screen.text[row]) 1253 scr_blank_line (ROW(row), col, num, rstyle);
1321 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1322 else
1323 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1324} 1254}
1325 1255
1326/* ------------------------------------------------------------------------- */ 1256/* ------------------------------------------------------------------------- */
1327/* 1257/*
1328 * Erase part of whole of the screen 1258 * Erase part of whole of the screen
… …
1332 */ 1262 */
1333void 1263void
1334rxvt_term::scr_erase_screen (int mode) 1264rxvt_term::scr_erase_screen (int mode)
1335{ 1265{
1336 int num; 1266 int num;
1337 int32_t row, row_offset; 1267 int32_t row;
1338 rend_t ren; 1268 rend_t ren;
1339 XGCValues gcvalue; 1269 XGCValues gcvalue;
1340 1270
1341 want_refresh = 1; 1271 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1343
1344 row_offset = (int32_t)TermWin.saveLines;
1345 1273
1346 switch (mode) 1274 switch (mode)
1347 { 1275 {
1348 case 0: /* erase to end of screen */ 1276 case 0: /* erase to end of screen */
1349 selection_check (1); 1277 selection_check (1);
1350 scr_erase_line (0); 1278 scr_erase_line (0);
1351 row = screen.cur.row + 1; /* possible OOB */ 1279 row = screen.cur.row + 1; /* possible OOB */
1352 num = TermWin.nrow - row; 1280 num = nrow - row;
1353 break; 1281 break;
1354 case 1: /* erase to beginning of screen */ 1282 case 1: /* erase to beginning of screen */
1355 selection_check (3); 1283 selection_check (3);
1356 scr_erase_line (1); 1284 scr_erase_line (1);
1357 row = 0; 1285 row = 0;
1358 num = screen.cur.row; 1286 num = screen.cur.row;
1359 break; 1287 break;
1360 case 2: /* erase whole screen */ 1288 case 2: /* erase whole screen */
1361 selection_check (3); 1289 selection_check (3);
1362 row = 0; 1290 row = 0;
1363 num = TermWin.nrow; 1291 num = nrow;
1364 break; 1292 break;
1365 default: 1293 default:
1366 return; 1294 return;
1367 } 1295 }
1368 1296
… …
1370 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1298 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1371 || (selection.end.row >= row 1299 || (selection.end.row >= row
1372 && selection.end.row <= row + num))) 1300 && selection.end.row <= row + num)))
1373 CLEAR_SELECTION (); 1301 CLEAR_SELECTION ();
1374 1302
1375 if (row >= TermWin.nrow) /* Out Of Bounds */ 1303 if (row >= nrow) /* Out Of Bounds */
1376 return; 1304 return;
1377 1305
1378 MIN_IT (num, (TermWin.nrow - row)); 1306 MIN_IT (num, (nrow - row));
1379 1307
1380 if (rstyle & (RS_RVid | RS_Uline)) 1308 if (rstyle & (RS_RVid | RS_Uline))
1381 ren = (rend_t) ~RS_None; 1309 ren = (rend_t) ~RS_None;
1382 else if (GET_BASEBG (rstyle) == Color_bg) 1310 else if (GET_BASEBG (rstyle) == Color_bg)
1383 { 1311 {
… …
1386 } 1314 }
1387 else 1315 else
1388 { 1316 {
1389 ren = rstyle & (RS_fgMask | RS_bgMask); 1317 ren = rstyle & (RS_fgMask | RS_bgMask);
1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1319 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1392 ERASE_ROWS (row, num); 1320 ERASE_ROWS (row, num);
1393 gcvalue.foreground = pix_colors[Color_fg]; 1321 gcvalue.foreground = pix_colors[Color_fg];
1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1322 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1395 } 1323 }
1396 1324
1397 for (; num--; row++) 1325 for (; num--; row++)
1398 { 1326 {
1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1327 scr_blank_screen_mem (ROW (row), rstyle);
1400 screen.tlen[row + row_offset] = 0; 1328 ROW (row).l = 0;
1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1329 scr_blank_line (drawn[row], 0, ncol, ren);
1402 } 1330 }
1403} 1331}
1332
1333#if ENABLE_FRILLS
1334void
1335rxvt_term::scr_erase_savelines ()
1336{
1337 want_refresh = 1;
1338 ZERO_SCROLLBACK ();
1339
1340 nsaved = 0;
1341}
1342#endif
1404 1343
1405/* ------------------------------------------------------------------------- */ 1344/* ------------------------------------------------------------------------- */
1406/* 1345/*
1407 * Fill the screen with `E's 1346 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1347 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1348 */
1410void 1349void
1411rxvt_term::scr_E () 1350rxvt_term::scr_E ()
1412{ 1351{
1413 int i, j, k; 1352 rend_t fs;
1414 rend_t *r1, fs;
1415 1353
1416 want_refresh = 1; 1354 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1355 ZERO_SCROLLBACK ();
1418 1356
1419 num_scr_allow = 0; 1357 num_scr_allow = 0;
1420 selection_check (3); 1358 selection_check (3);
1421 1359
1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1360 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1361 for (int row = nrow; row--; )
1424 { 1362 {
1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1363 line_t &line = ROW(row);
1364
1426 fill_text (screen.text[k], 'E', TermWin.ncol); 1365 fill_text (line.t, 'E', ncol);
1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1366 rend_t *r1 = line.r;
1367
1368 for (int j = ncol; j--; )
1428 *r1++ = fs; 1369 *r1++ = fs;
1370
1371 line.l = ncol; /* make the `E's selectable */
1429 } 1372 }
1430} 1373}
1431 1374
1432/* ------------------------------------------------------------------------- */ 1375/* ------------------------------------------------------------------------- */
1433/* 1376/*
… …
1454 count = end; 1397 count = end;
1455 } 1398 }
1456 1399
1457 scr_do_wrap (); 1400 scr_do_wrap ();
1458 1401
1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1402 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1460} 1403}
1461 1404
1462/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1463/* 1406/*
1464 * Insert/Delete <count> characters from the current position 1407 * Insert/Delete <count> characters from the current position
… …
1466void 1409void
1467rxvt_term::scr_insdel_chars (int count, int insdel) 1410rxvt_term::scr_insdel_chars (int count, int insdel)
1468{ 1411{
1469 int col, row; 1412 int col, row;
1470 rend_t tr; 1413 rend_t tr;
1471 text_t *stp;
1472 rend_t *srp;
1473 int16_t *slp;
1474 1414
1475 want_refresh = 1; 1415 want_refresh = 1;
1476 ZERO_SCROLLBACK (); 1416 ZERO_SCROLLBACK ();
1477 1417
1478 if (count <= 0) 1418 if (count <= 0)
1479 return; 1419 return;
1480 1420
1481 scr_do_wrap (); 1421 scr_do_wrap ();
1482 1422
1483 selection_check (1); 1423 selection_check (1);
1484 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1424 MIN_IT (count, (ncol - screen.cur.col));
1485 1425
1486 row = screen.cur.row + TermWin.saveLines;
1487
1488 stp = screen.text[row];
1489 srp = screen.rend[row]; 1426 row = screen.cur.row;
1490 slp = &screen.tlen[row]; 1427
1428 line_t *line = &ROW(row);
1491 1429
1492 switch (insdel) 1430 switch (insdel)
1493 { 1431 {
1494 case INSERT: 1432 case INSERT:
1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1433 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1496 { 1434 {
1497 stp[col] = stp[col - count]; 1435 line->t[col] = line->t[col - count];
1498 srp[col] = srp[col - count]; 1436 line->r[col] = line->r[col - count];
1499 } 1437 }
1500 1438
1501 if (*slp != -1) 1439 if (!line->is_longer ())
1502 { 1440 {
1503 *slp += count; 1441 line->l += count;
1504 MIN_IT (*slp, TermWin.ncol); 1442 MIN_IT (line->l, ncol);
1505 } 1443 }
1506 1444
1507 if (selection.op && current_screen == selection.screen 1445 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1447 {
1510 if (selection.end.row != screen.cur.row 1448 if (selection.end.row != screen.cur.row
1511 || (selection.end.col + count >= TermWin.ncol)) 1449 || (selection.end.col + count >= ncol))
1512 CLEAR_SELECTION (); 1450 CLEAR_SELECTION ();
1513 else 1451 else
1514 { /* shift selection */ 1452 { /* shift selection */
1515 selection.beg.col += count; 1453 selection.beg.col += count;
1516 selection.mark.col += count; /* XXX: yes? */ 1454 selection.mark.col += count; /* XXX: yes? */
1517 selection.end.col += count; 1455 selection.end.col += count;
1518 } 1456 }
1519 } 1457 }
1520 1458
1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1459 scr_blank_line (*line, screen.cur.col, count, rstyle);
1522 (unsigned int)count, rstyle);
1523 break; 1460 break;
1524 1461
1525 case ERASE: 1462 case ERASE:
1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1463 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1464 selection_check (1);
1528 screen.cur.col -= count; 1465 screen.cur.col -= count;
1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1466 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 (unsigned int)count, rstyle);
1531 break; 1467 break;
1532 1468
1533 case DELETE: 1469 case DELETE:
1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1470 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1535 1471
1536 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1472 for (col = screen.cur.col; (col + count) < ncol; col++)
1537 { 1473 {
1538 stp[col] = stp[col + count]; 1474 line->t[col] = line->t[col + count];
1539 srp[col] = srp[col + count]; 1475 line->r[col] = line->r[col + count];
1540 } 1476 }
1541 1477
1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1478 scr_blank_line (*line, ncol - count, count, tr);
1543 (unsigned int)count, tr);
1544 1479
1545 if (*slp == -1) /* break line continuation */ 1480 if (line->is_longer ()) /* break line continuation */
1546 *slp = TermWin.ncol; 1481 line->l = ncol;
1547 1482
1548 *slp -= count; 1483 line->l = max (line->l - count, 0);
1549 MAX_IT (*slp, 0);
1550 1484
1551 if (selection.op && current_screen == selection.screen 1485 if (selection.op && current_screen == selection.screen
1552 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1553 { 1487 {
1554 if (selection.end.row != screen.cur.row 1488 if (selection.end.row != screen.cur.row
1555 || (screen.cur.col >= selection.beg.col - count) 1489 || (screen.cur.col >= selection.beg.col - count)
1556 || selection.end.col >= TermWin.ncol) 1490 || selection.end.col >= ncol)
1557 CLEAR_SELECTION (); 1491 CLEAR_SELECTION ();
1558 else 1492 else
1559 { 1493 {
1560 /* shift selection */ 1494 /* shift selection */
1561 selection.beg.col -= count; 1495 selection.beg.col -= count;
… …
1575 */ 1509 */
1576void 1510void
1577rxvt_term::scr_scroll_region (int top, int bot) 1511rxvt_term::scr_scroll_region (int top, int bot)
1578{ 1512{
1579 MAX_IT (top, 0); 1513 MAX_IT (top, 0);
1580 MIN_IT (bot, (int)TermWin.nrow - 1); 1514 MIN_IT (bot, (int)nrow - 1);
1581 1515
1582 if (top > bot) 1516 if (top > bot)
1583 return; 1517 return;
1584 1518
1585 screen.tscroll = top; 1519 screen.tscroll = top;
… …
1664 */ 1598 */
1665void 1599void
1666rxvt_term::scr_set_tab (int mode) 1600rxvt_term::scr_set_tab (int mode)
1667{ 1601{
1668 if (mode < 0) 1602 if (mode < 0)
1669 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1603 memset (tabs, 0, ncol * sizeof (char));
1670 else if (screen.cur.col < TermWin.ncol) 1604 else if (screen.cur.col < ncol)
1671 tabs[screen.cur.col] = (mode ? 1 : 0); 1605 tabs[screen.cur.col] = (mode ? 1 : 0);
1672} 1606}
1673 1607
1674/* ------------------------------------------------------------------------- */ 1608/* ------------------------------------------------------------------------- */
1675/* 1609/*
… …
1690 if (bgPixmap.pixmap == None) 1624 if (bgPixmap.pixmap == None)
1691#endif 1625#endif
1692#if TRANSPARENT 1626#if TRANSPARENT
1693 if (! (options & Opt_transparent) || am_transparent == 0) 1627 if (! (options & Opt_transparent) || am_transparent == 0)
1694#endif 1628#endif
1695 XSetWindowBackground (display->display, TermWin.vt, 1629 XSetWindowBackground (display->display, vt,
1696 pix_colors[Color_bg]); 1630 pix_colors[Color_bg]);
1697 1631
1698 gcvalue.foreground = pix_colors[Color_fg]; 1632 gcvalue.foreground = pix_colors[Color_fg];
1699 gcvalue.background = pix_colors[Color_bg]; 1633 gcvalue.background = pix_colors[Color_bg];
1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1634 XChangeGC (display->display, gc, GCBackground | GCForeground,
1701 &gcvalue); 1635 &gcvalue);
1702 scr_clear (); 1636 scr_clear ();
1703 scr_touch (true); 1637 scr_touch (true);
1704 } 1638 }
1705} 1639}
… …
1786bool 1720bool
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1721rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1788{ 1722{
1789 bool found = false; 1723 bool found = false;
1790 1724
1791 for (int i = 0; i < TermWin.nrow; i++) 1725 for (int i = 0; i < nrow; i++)
1792 { 1726 {
1793 int col = 0; 1727 int col = 0;
1794 rend_t *drp = drawn_rend [i]; 1728 rend_t *drp = drawn[i].r;
1795 1729
1796 for (; col < TermWin.ncol; col++, drp++) 1730 for (; col < ncol; col++, drp++)
1797 if ((*drp & mask) == value) 1731 if ((*drp & mask) == value)
1798 { 1732 {
1799 found = true; 1733 found = true;
1800 *drp = ~value; 1734 *drp = ~value;
1801 } 1735 }
… …
1812 PART_END, 1746 PART_END,
1813 RC_COUNT 1747 RC_COUNT
1814}; 1748};
1815 1749
1816void 1750void
1817rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1818{ 1752{
1819 int i; 1753 int i;
1820 row_col_t rc[RC_COUNT]; 1754 row_col_t rc[RC_COUNT];
1821 1755
1822 if (drawn_text == NULL) /* sanity check */ 1756 if (!drawn) /* sanity check */
1823 return; 1757 return;
1824 1758
1825#ifndef NO_SLOW_LINK_SUPPORT 1759#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local) 1760 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 { 1761 {
1828 y = 0; 1762 y = 0;
1829 height = TermWin.height; 1763 eheight = height;
1830 } 1764 }
1831#endif 1765#endif
1832 1766
1833#ifdef DEBUG_STRICT 1767#ifdef DEBUG_STRICT
1834 x = max (x, 0); 1768 x = max (x, 0);
1835 x = min (x, (int)TermWin.width); 1769 x = min (x, (int)width);
1836 y = max (y, 0); 1770 y = max (y, 0);
1837 y = min (y, (int)TermWin.height); 1771 y = min (y, (int)height);
1838#endif 1772#endif
1839 1773
1840 /* round down */ 1774 /* round down */
1841 rc[PART_BEG].col = Pixel2Col (x); 1775 rc[PART_BEG].col = Pixel2Col (x);
1842 rc[PART_BEG].row = Pixel2Row (y); 1776 rc[PART_BEG].row = Pixel2Row (y);
1843 /* round up */ 1777 /* round up */
1844 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1778 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1845 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1779 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1846 1780
1847 /* sanity checks */ 1781 /* sanity checks */
1848 for (i = PART_BEG; i < RC_COUNT; i++) 1782 for (i = PART_BEG; i < RC_COUNT; i++)
1849 { 1783 {
1850 MIN_IT (rc[i].col, TermWin.ncol - 1); 1784 MIN_IT (rc[i].col, ncol - 1);
1851 MIN_IT (rc[i].row, TermWin.nrow - 1); 1785 MIN_IT (rc[i].row, nrow - 1);
1852 } 1786 }
1853 1787
1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1855 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1789 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1856 1790
1857 if (refresh) 1791 if (refresh)
1858 scr_refresh (SLOW_REFRESH); 1792 scr_refresh (SLOW_REFRESH);
1859} 1793}
1860 1794
… …
1863 * Refresh the entire screen 1797 * Refresh the entire screen
1864 */ 1798 */
1865void 1799void
1866rxvt_term::scr_touch (bool refresh) 1800rxvt_term::scr_touch (bool refresh)
1867{ 1801{
1868 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1802 scr_expose (0, 0, width, height, refresh);
1869} 1803}
1870 1804
1871/* ------------------------------------------------------------------------- */ 1805/* ------------------------------------------------------------------------- */
1872/* 1806/*
1873 * Move the display so that the line represented by scrollbar value Y is at 1807 * Move the display so that the line represented by scrollbar value Y is at
… …
1877rxvt_term::scr_move_to (int y, int len) 1811rxvt_term::scr_move_to (int y, int len)
1878{ 1812{
1879 long p = 0; 1813 long p = 0;
1880 unsigned int oldviewstart; 1814 unsigned int oldviewstart;
1881 1815
1882 oldviewstart = TermWin.view_start; 1816 oldviewstart = view_start;
1883 1817
1884 if (y < len) 1818 if (y < len)
1885 { 1819 {
1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1820 p = (nrow + nsaved) * (len - y) / len;
1887 p -= (long) (TermWin.nrow - 1); 1821 p -= (long) (nrow - 1);
1888 p = max (p, 0); 1822 p = max (p, 0);
1889 } 1823 }
1890 1824
1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); 1825 view_start = (unsigned int)min (p, nsaved);
1892 1826
1893 return scr_changeview (oldviewstart); 1827 return scr_changeview (oldviewstart);
1894} 1828}
1895 1829
1896/* ------------------------------------------------------------------------- */ 1830/* ------------------------------------------------------------------------- */
… …
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1836rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903{ 1837{
1904 int n; 1838 int n;
1905 unsigned int oldviewstart; 1839 unsigned int oldviewstart;
1906 1840
1907#ifdef DEBUG_STRICT
1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909#endif
1910 oldviewstart = TermWin.view_start; 1841 oldviewstart = view_start;
1842
1911 if (direction == UP) 1843 if (direction == UP)
1912 { 1844 {
1913 n = TermWin.view_start + nlines; 1845 n = view_start + nlines;
1914 TermWin.view_start = min (n, TermWin.nscrolled); 1846 view_start = min (n, nsaved);
1915 } 1847 }
1916 else 1848 else
1917 { 1849 {
1918 n = TermWin.view_start - nlines; 1850 n = view_start - nlines;
1919 TermWin.view_start = max (n, 0); 1851 view_start = max (n, 0);
1920 } 1852 }
1853
1921 return scr_changeview (oldviewstart); 1854 return scr_changeview (oldviewstart);
1922} 1855}
1923 1856
1924int 1857int
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (unsigned int oldviewstart)
1926{ 1859{
1927 if (TermWin.view_start != oldviewstart) 1860 if (view_start != oldviewstart)
1928 { 1861 {
1929 want_refresh = 1; 1862 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart); 1863 num_scr -= (view_start - oldviewstart);
1931 } 1864 }
1932 1865
1933 return (int) (TermWin.view_start - oldviewstart); 1866 return (int) (view_start - oldviewstart);
1934} 1867}
1935 1868
1936/* ------------------------------------------------------------------------- */ 1869/* ------------------------------------------------------------------------- */
1937void 1870void
1938rxvt_term::scr_bell () 1871rxvt_term::scr_bell ()
1939{ 1872{
1940#ifndef NO_BELL 1873#ifndef NO_BELL
1874
1941# ifndef NO_MAPALERT 1875# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1876# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1877 if (options & Opt_mapAlert)
1944# endif 1878# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1879 XMapWindow (display->display, parent[0]);
1946# endif 1880# endif
1881
1947 if (options & Opt_visualBell) 1882 if (options & Opt_visualBell)
1948 { 1883 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1884 scr_rvideo_mode (!rvideo); /* refresh also done */
1885 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1886 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1887 }
1952 else 1888 else
1953 XBell (display->display, 0); 1889 XBell (display->display, 0);
1890
1954#endif 1891#endif
1955} 1892}
1956 1893
1957/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1895/* ARGSUSED */
1959void 1896void
1960rxvt_term::scr_printscreen (int fullhist) 1897rxvt_term::scr_printscreen (int fullhist)
1961{ 1898{
1962#ifdef PRINTPIPE 1899#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1900 int nrows, row_start;
1964 FILE *fd; 1901 FILE *fd;
1965 1902
1966 if ((fd = popen_printer ()) == NULL) 1903 if ((fd = popen_printer ()) == NULL)
1967 return; 1904 return;
1968 1905
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1906 if (fullhist)
1973 row_offset -= TermWin.view_start; 1907 {
1908 nrows = nrow + nsaved;
1909 row_start = -nsaved;
1910 }
1974 else 1911 else
1975 { 1912 {
1976 nrows += TermWin.nscrolled; 1913 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1914 row_start = -view_start;
1978 } 1915 }
1979 1916
1980 wctomb (0, 0); 1917 wctomb (0, 0);
1981 1918
1982 for (r1 = 0; r1 < nrows; r1++) 1919 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1920 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1921 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1922 int len = ROW(r1).l;
1986 1923
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1924 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1925 {
1989 char mb[MB_LEN_MAX]; 1926 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1927 text_t t = *tp++;
1991 if (t == NOCHAR) 1928 if (t == NOCHAR)
1992 continue; 1929 continue;
… …
2013/* 1950/*
2014 * Refresh the screen 1951 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1952 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1953 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1954 */
2018
2019#define FONT_WIDTH(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021#define FONT_RBEAR(X, Y) \
2022 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023#define FONT_LBEAR(X, Y) \
2024 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025#define IS_FONT_CHAR(X, Y) \
2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028void 1955void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 1956rxvt_term::scr_refresh (unsigned char refresh_type)
2030{ 1957{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 1958 unsigned char must_clear, /* use draw_string not draw_image_string */
2032 showcursor; /* show the cursor */ 1959 showcursor; /* show the cursor */
2033 int16_t col, row, /* column/row we're processing */ 1960 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 1961 ocrow; /* old cursor row */
2035 int i, /* tmp */ 1962 int i; /* tmp */
2036 row_offset; /* basic offset in screen structure */
2037#ifndef NO_CURSORCOLOR 1963#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */ 1964 rend_t cc1; /* store colours at cursor position (s) */
2039#endif 1965#endif
2040 rend_t *crp; // cursor rendition pointer 1966 rend_t *crp; // cursor rendition pointer
2041 1967
2042 want_refresh = 0; /* screen is current */ 1968 want_refresh = 0; /* screen is current */
2043 1969
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1970 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 1971 return;
2046 1972
2047 /* 1973 /*
2048 * A: set up vars 1974 * A: set up vars
2049 */ 1975 */
2050 must_clear = 0; 1976 must_clear = 0;
2051 refresh_count = 0; 1977 refresh_count = 0;
2052 1978
2053 row_offset = TermWin.saveLines - TermWin.view_start;
2054
2055#if XPM_BACKGROUND 1979#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 1980 must_clear |= bgPixmap.pixmap != None;
2057#endif 1981#endif
2058#if TRANSPARENT 1982#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent); 1983 must_clear |= (options & Opt_transparent) && am_transparent;
2060#endif 1984#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1985 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 1986
2063 /* 1987 /*
2064 * B: reverse any characters which are selected 1988 * B: reverse any characters which are selected
… …
2081 2005
2082 if (showcursor) 2006 if (showcursor)
2083 { 2007 {
2084 int col = screen.cur.col; 2008 int col = screen.cur.col;
2085 2009
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2010 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2011 col--;
2088 2012
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2013 crp = &ROW(screen.cur.row).r[col];
2090 2014
2091 if (showcursor && TermWin.focus) 2015 if (showcursor && focus)
2092 { 2016 {
2017 if (options & Opt_cursorUnderline)
2018 *crp ^= RS_Uline;
2019 else
2020 {
2093 *crp ^= RS_RVid; 2021 *crp ^= RS_RVid;
2022
2094#ifndef NO_CURSORCOLOR 2023#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask); 2024 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2025 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2026 ccol1 = Color_cursor;
2098 else 2027 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2028#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle); 2029 ccol1 = GET_FGCOLOR (rstyle);
2101#else 2030#else
2102 ccol1 = Color_fg; 2031 ccol1 = Color_fg;
2103#endif 2032#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2)) 2033 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2; 2034 ccol2 = Color_cursor2;
2106 else 2035 else
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2036#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108 ccol2 = GET_BGCOLOR (rstyle); 2037 ccol2 = GET_BGCOLOR (rstyle);
2109#else 2038#else
2110 ccol2 = Color_bg; 2039 ccol2 = Color_bg;
2111#endif 2040#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2041 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2042 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2043#endif
2044 }
2115 } 2045 }
2116 } 2046 }
2117 2047
2118 /* make sure no outline cursor is left around */ 2048 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2049 setoldcursor = 0;
2120 if (ocrow != -1) 2050 if (ocrow != -1)
2121 { 2051 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2052 if (screen.cur.row + view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2053 || screen.cur.col != oldcursor.col)
2124 { 2054 {
2125 if (ocrow < TermWin.nrow 2055 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2056 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2058
2129 if (TermWin.focus || !showcursor) 2059 if (focus || !showcursor)
2130 oldcursor.row = -1; 2060 oldcursor.row = -1;
2131 else 2061 else
2132 setoldcursor = 1; 2062 setoldcursor = 1;
2133 } 2063 }
2134 } 2064 }
2135 else if (!TermWin.focus) 2065 else if (!focus)
2136 setoldcursor = 1; 2066 setoldcursor = 1;
2137 2067
2138 if (setoldcursor) 2068 if (setoldcursor)
2139 { 2069 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2070 if (screen.cur.row + view_start >= nrow)
2141 oldcursor.row = -1; 2071 oldcursor.row = -1;
2142 else 2072 else
2143 { 2073 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2074 oldcursor.row = screen.cur.row + view_start;
2145 oldcursor.col = screen.cur.col; 2075 oldcursor.col = screen.cur.col;
2146 } 2076 }
2147 } 2077 }
2148 } 2078 }
2149 2079
2150#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2151 scr_swap_overlay (); 2081 scr_swap_overlay ();
2152#endif 2082#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156 2083
2157#ifndef NO_SLOW_LINK_SUPPORT 2084#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2085 /*
2159 * D: CopyArea pass - very useful for slower links 2086 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2087 * This has been deliberately kept simple.
2161 */ 2088 */
2162 i = num_scr; 2089 i = num_scr;
2163 if (!display->is_local 2090 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2091 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2092 && abs (num_scr) < nrow && !must_clear)
2166 { 2093 {
2167 int16_t nits; 2094 int16_t nits;
2168 int j; 2095 int j;
2169 int len, wlen; 2096 int len, wlen;
2170 2097
2171 j = TermWin.nrow; 2098 j = nrow;
2172 wlen = len = -1; 2099 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2100 row = i > 0 ? 0 : j - 1;
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2102 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2104 {
2178 text_t *stp = screen.text[row + row_offset]; 2105 line_t s = ROW(row - view_start);
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2106 line_t d = drawn[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2107 line_t d2 = drawn[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2108
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2109 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2111 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2113 nits++;
2190 2114
2191 if (nits > 8) /* XXX: arbitrary choice */ 2115 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2116 {
2193 for (col = TermWin.ncol; col--; ) 2117 for (col = ncol; col--; )
2194 { 2118 {
2195 *dtp++ = *dtp2++; 2119 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2120 *d.r++ = *d2.r++;
2197 } 2121 }
2198 2122
2199 if (len == -1) 2123 if (len == -1)
2200 len = row; 2124 len = row;
2201 2125
… …
2208 { 2132 {
2209 /* also comes here at end if needed because of >= above */ 2133 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2134 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2135 SWAP_IT (wlen, len, int);
2212 2136
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2137 XCopyArea (display->display, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2138 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2139 (unsigned int)TermWin_TotalWidth (),
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2140 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2141 0, Row2Pixel (len));
2218 len = -1; 2142 len = -1;
2219 } 2143 }
… …
2222#endif 2146#endif
2223 2147
2224 /* 2148 /*
2225 * E: main pass across every character 2149 * E: main pass across every character
2226 */ 2150 */
2227 for (row = 0; row < TermWin.nrow; row++) 2151 for (row = 0; row < nrow; row++)
2228 { 2152 {
2229 text_t *stp = screen.text[row + row_offset]; 2153 text_t *stp = ROW(row - view_start).t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2154 rend_t *srp = ROW(row - view_start).r;
2231 text_t *dtp = drawn_text[row]; 2155 text_t *dtp = drawn[row].t;
2232 rend_t *drp = drawn_rend[row]; 2156 rend_t *drp = drawn[row].r;
2233 2157
2234 /* 2158 /*
2235 * E2: OK, now the real pass 2159 * E2: OK, now the real pass
2236 */ 2160 */
2237 int ypixel = (int)Row2Pixel (row); 2161 int ypixel = (int)Row2Pixel (row);
2238 2162
2239 for (col = 0; col < TermWin.ncol; col++) 2163 for (col = 0; col < ncol; col++)
2240 { 2164 {
2241 /* compare new text with old - if exactly the same then continue */ 2165 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2166 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2167 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2168 || (stp[col] == ' ' /* space w/ no background change */
… …
2258 dtp[col] = stp[col]; 2182 dtp[col] = stp[col];
2259 drp[col] = rend; 2183 drp[col] = rend;
2260 2184
2261 int xpixel = Col2Pixel (col); 2185 int xpixel = Col2Pixel (col);
2262 2186
2263 for (i = 0; ++col < TermWin.ncol; ) 2187 for (i = 0; ++col < ncol; )
2264 { 2188 {
2265 if (stp[col] == NOCHAR) 2189 if (stp[col] == NOCHAR)
2266 { 2190 {
2267 dtp[col] = stp[col]; 2191 dtp[col] = stp[col];
2268 drp[col] = rend; 2192 drp[col] = rend;
… …
2296 2220
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2221 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2222 while (i && text[count] == NOCHAR)
2299 count++, i--; 2223 count++, i--;
2300 2224
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2312
2313 /* 2225 /*
2314 * Determine the attributes for the string 2226 * Determine the attributes for the string
2315 */ 2227 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2228 int fore = GET_FGCOLOR (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2229 int back = GET_BGCOLOR (rend); // desired background
2318 2230
2319 // only do special processing if ana attributes are set, which is rare 2231 // only do special processing if any attributes are set, which is rare
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2232 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2233 {
2234#if ENABLE_STYLES
2235 // force redraw after "careful" characters to avoid pixel droppings
2236 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2237 drp[col + 1] = ~srp[col + 1];
2238
2239 // include previous careful character(s) if possible, looks nicer (best effort...)
2240 while (text > stp
2241 && srp[text - stp - 1] & RS_Careful
2242 && RS_SAME (rend, srp[text - stp - 1]))
2243 text--, count++, xpixel -= fwidth;
2244#endif
2245
2322 bool invert = rend & RS_RVid; 2246 bool invert = rend & RS_RVid;
2323 2247
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2248#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold 2249 if (rend & RS_Bold
2326 && fore == Color_fg) 2250 && fore == Color_fg)
… …
2353 SWAP_IT (fore, back, int); 2277 SWAP_IT (fore, back, int);
2354 2278
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2279#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV)) 2280 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV; 2281 back = Color_RV;
2282
2283 if (fore == back)
2284 {
2285 fore = Color_bg;
2286 back = Color_fg;
2287 }
2358#endif 2288#endif
2359 } 2289 }
2360 2290
2361#ifdef TEXT_BLINK 2291#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2292 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2373 } 2303 }
2374 2304
2375 /* 2305 /*
2376 * Actually do the drawing of the string here 2306 * Actually do the drawing of the string here
2377 */ 2307 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2308 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2309
2380 if (back == fore) 2310 if (back == fore)
2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2311 font->clear_rect (*drawable, xpixel, ypixel,
2382 TermWin.fwidth * count, TermWin.fheight, 2312 fwidth * count, fheight,
2383 back); 2313 back);
2384 else if (back == Color_bg) 2314 else if (back == Color_bg)
2385 { 2315 {
2386 if (must_clear) 2316 if (must_clear)
2387 { 2317 {
2388 CLEAR_CHARS (xpixel, ypixel, count); 2318 CLEAR_CHARS (xpixel, ypixel, count);
2389 2319
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2320 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2321 if (text[i] != ' ')
2392 { 2322 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2323 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2394 break; 2324 break;
2395 } 2325 }
2396 } 2326 }
2397 else 2327 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2328 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2399 } 2329 }
2400 else 2330 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2331 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2332
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2333 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2334 {
2335#if ENABLE_FRILLS
2336 if (ISSET_PIXCOLOR (Color_underline))
2337 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2338 else
2339#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2340 XSetForeground (display->display, gc, pix_colors[fore]);
2341
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2342 XDrawLine (display->display, drawBuffer, gc,
2407 xpixel, ypixel + font->ascent + 1, 2343 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2344 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2345 }
2410 } /* for (col....) */ 2346 } /* for (col....) */
2411 } /* for (row....) */ 2347 } /* for (row....) */
… …
2417 /* 2353 /*
2418 * G: cleanup cursor and display outline cursor if necessary 2354 * G: cleanup cursor and display outline cursor if necessary
2419 */ 2355 */
2420 if (showcursor) 2356 if (showcursor)
2421 { 2357 {
2422 if (TermWin.focus) 2358 if (focus)
2359 {
2360 if (options & Opt_cursorUnderline)
2361 *crp ^= RS_Uline;
2362 else
2423 { 2363 {
2424 *crp ^= RS_RVid; 2364 *crp ^= RS_RVid;
2425#ifndef NO_CURSORCOLOR 2365#ifndef NO_CURSORCOLOR
2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2366 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2427#endif 2367#endif
2368 }
2428 } 2369 }
2429 else if (oldcursor.row >= 0) 2370 else if (oldcursor.row >= 0)
2430 { 2371 {
2372 int cursorwidth = 1;
2373 int col = oldcursor.col;
2374
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--;
2377
2378 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++;
2381
2431#ifndef NO_CURSORCOLOR 2382#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2383 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2434#endif 2385#endif
2435 int cursorwidth = 1;
2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2438 cursorwidth++;
2439 2386
2440 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2387 XDrawRectangle (display->display, drawBuffer, gc,
2441 Col2Pixel (oldcursor.col), 2388 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2389 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2390 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2391 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2392 }
2446 } 2393 }
2447 2394
2448 /* 2395 /*
2449 * H: cleanup selection 2396 * H: cleanup selection
… …
2456 num_scr = 0; 2403 num_scr = 0;
2457 num_scr_allow = 1; 2404 num_scr_allow = 1;
2458} 2405}
2459 2406
2460void 2407void
2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2408rxvt_term::scr_remap_chars (const line_t &l)
2462{ 2409{
2463 if (!rp || !tp) 2410 if (!l.t)
2464 return; 2411 return;
2465 2412
2466 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2413 for (int i = ncol; i--; )
2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2414 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2468} 2415}
2469 2416
2470void 2417void
2471rxvt_term::scr_remap_chars () 2418rxvt_term::scr_remap_chars ()
2472{ 2419{
2473 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2420 for (int i = total_rows; i--; )
2474 scr_remap_chars (screen.text[i], screen.rend[i]); 2421 scr_remap_chars (save[i]);
2475 2422
2476 for (int i = TermWin.nrow; i--; ) 2423 for (int i = nrow; i--; )
2477 { 2424 {
2478 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2425 scr_remap_chars (drawn[i]);
2479 scr_remap_chars (swap.text[i], swap.rend[i]); 2426 scr_remap_chars (swap_save[i]);
2480 } 2427 }
2481} 2428}
2482 2429
2483void 2430void
2484rxvt_term::scr_recolour () 2431rxvt_term::scr_recolour ()
… …
2490#if XPM_BACKGROUND 2437#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap 2438 && !bgPixmap.pixmap
2492#endif 2439#endif
2493 ) 2440 )
2494 { 2441 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2442 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]); 2443 XClearWindow (display->display, parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2444 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2445#if HAVE_SCROLLBARS
2499 if (scrollBar.win) 2446 if (scrollBar.win)
2500 { 2447 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2448 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2449 scrollBar.setIdle ();
… …
2512 2459
2513/* ------------------------------------------------------------------------- */ 2460/* ------------------------------------------------------------------------- */
2514void 2461void
2515rxvt_term::scr_clear (bool really) 2462rxvt_term::scr_clear (bool really)
2516{ 2463{
2517 if (!TermWin.mapped) 2464 if (!mapped)
2518 return; 2465 return;
2519 2466
2520 num_scr_allow = 0; 2467 num_scr_allow = 0;
2521 want_refresh = 1; 2468 want_refresh = 1;
2522 2469
2523#if TRANSPARENT
2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2525 {
2526 int i;
2527
2528 if (!(options & Opt_transparent_all))
2529 i = 0;
2530 else
2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2532
2533 while (i--)
2534 if (TermWin.parent[i] != None)
2535 XClearWindow (display->display, TermWin.parent[i]);
2536 }
2537#endif
2538
2539 if (really) 2470 if (really)
2540 XClearWindow (display->display, TermWin.vt); 2471 XClearWindow (display->display, vt);
2541} 2472}
2542 2473
2543/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2544void 2475void
2545rxvt_term::scr_reverse_selection () 2476rxvt_term::scr_reverse_selection ()
2546{ 2477{
2478 if (selection.op
2547 if (selection.op && current_screen == selection.screen) 2479 && current_screen == selection.screen
2480 && selection.end.row >= -view_start)
2548 { 2481 {
2549 int end_row = TermWin.saveLines - TermWin.view_start; 2482 int view_end = -view_start + nrow;
2550 int i = selection.beg.row + TermWin.saveLines; 2483 int row, col;
2551 int col, row = selection.end.row + TermWin.saveLines;
2552 rend_t *srp;
2553 2484
2554#if ENABLE_FRILLS 2485#if ENABLE_FRILLS
2555 if (selection.rect) 2486 if (selection.rect)
2556 { 2487 {
2557 end_row += TermWin.nrow; 2488 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) 2489 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid; 2490 srp[col] ^= RS_RVid;
2562 } 2491 }
2563 else 2492 else
2564#endif 2493#endif
2565 { 2494 {
2566 if (i >= end_row) 2495 if (selection.beg.row >= -view_start)
2496 {
2567 col = selection.beg.col; 2497 col = selection.beg.col;
2498 row = selection.beg.row;
2499 }
2568 else 2500 else
2569 { 2501 {
2570 col = 0; 2502 col = 0;
2571 i = end_row; 2503 row = view_start;
2572 } 2504 }
2573 2505
2574 end_row += TermWin.nrow; 2506 for (; row < min (selection.end.row, view_end); row++, col = 0)
2575 2507 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2576 for (; i < row && i < end_row; i++, col = 0)
2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2578 srp[col] ^= RS_RVid; 2508 srp[col] ^= RS_RVid;
2579 2509
2580 if (i == row && i < end_row) 2510 if (row == selection.end.row)
2581 for (srp = screen.rend[i]; col < selection.end.col; col++) 2511 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2582 srp[col] ^= RS_RVid; 2512 srp[col] ^= RS_RVid;
2583 } 2513 }
2584 } 2514 }
2585} 2515}
2586 2516
… …
2595{ 2525{
2596 int row, wrote; 2526 int row, wrote;
2597 unsigned int width, towrite; 2527 unsigned int width, towrite;
2598 char r1[] = "\n"; 2528 char r1[] = "\n";
2599 2529
2600 for (row = TermWin.saveLines - TermWin.nscrolled; 2530 for (row = saveLines - nsaved;
2601 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2531 row < saveLines + nrow - 1; row++)
2602 { 2532 {
2603 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2533 width = save[row].l >= 0 ? save[row].l
2604 : TermWin.ncol; 2534 : ncol;
2605 for (towrite = width; towrite; towrite -= wrote) 2535 for (towrite = width; towrite; towrite -= wrote)
2606 { 2536 {
2607 wrote = write (fd, & (screen.text[row][width - towrite]), 2537 wrote = write (fd, & (save[row].t[width - towrite]),
2608 towrite); 2538 towrite);
2609 if (wrote < 0) 2539 if (wrote < 0)
2610 return; /* XXX: death, no report */ 2540 return; /* XXX: death, no report */
2611 } 2541 }
2612 if (screen.tlen[row] >= 0) 2542 if (save[row].l >= 0)
2613 if (write (fd, r1, 1) <= 0) 2543 if (write (fd, r1, 1) <= 0)
2614 return; /* XXX: death, no report */ 2544 return; /* XXX: death, no report */
2615 } 2545 }
2616} 2546}
2617#endif 2547#endif
2618 2548
2619/* ------------------------------------------------------------------------- * 2549/* ------------------------------------------------------------------------- *
2620 * CHARACTER SELECTION * 2550 * CHARACTER SELECTION *
2621 * ------------------------------------------------------------------------- */ 2551 * ------------------------------------------------------------------------- */
2622
2623/*
2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2625 */
2626void 2552void
2627rxvt_term::selection_check (int check_more) 2553rxvt_term::selection_check (int check_more)
2628{ 2554{
2629 row_col_t pos; 2555 row_col_t pos;
2630 2556
2631 if (!selection.op) 2557 if (!selection.op)
2632 return; 2558 return;
2633 2559
2634 pos.row = pos.col = 0; 2560 pos.row = pos.col = 0;
2635 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2561 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2636 || (selection.beg.row >= TermWin.nrow) 2562 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2637 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2563 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2638 || (selection.mark.row >= TermWin.nrow)
2639 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2640 || (selection.end.row >= TermWin.nrow)
2641 || (check_more == 1 2564 || (check_more == 1
2642 && current_screen == selection.screen 2565 && current_screen == selection.screen
2643 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2566 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2644 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2567 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2645 || (check_more == 2 2568 || (check_more == 2
… …
2647 && ROWCOL_IS_AFTER (selection.end, pos)) 2570 && ROWCOL_IS_AFTER (selection.end, pos))
2648 || (check_more == 3 2571 || (check_more == 3
2649 && ROWCOL_IS_AFTER (selection.end, pos)) 2572 && ROWCOL_IS_AFTER (selection.end, pos))
2650 || (check_more == 4 /* screen width change */ 2573 || (check_more == 4 /* screen width change */
2651 && (selection.beg.row != selection.end.row 2574 && (selection.beg.row != selection.end.row
2652 || selection.end.col > TermWin.ncol))) 2575 || selection.end.col > ncol)))
2653 CLEAR_SELECTION (); 2576 CLEAR_SELECTION ();
2654} 2577}
2655 2578
2656/* ------------------------------------------------------------------------- */ 2579/* ------------------------------------------------------------------------- */
2657/* 2580/*
2658 * Paste a selection direct to the command fd 2581 * Paste a selection direct to the command fd
2659 */ 2582 */
2660void 2583void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2584rxvt_term::paste (unsigned char *data, unsigned int len)
2662{ 2585{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2586 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PROP_SIZE) 2587 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PROP_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2588 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2589 data[i] = C0_CR;
2675 2590
2676 tt_write (ds, (int)n); 2591 tt_write (data, len);
2677 }
2678
2679 free (ds);
2680} 2592}
2681 2593
2682/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2683/* 2595/*
2684 * Respond to a notification that a primary selection has been sent 2596 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify 2597 * EXT: SelectionNotify
2686 */ 2598 */
2687int 2599void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2600rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2689{ 2601{
2690 long nread = 0;
2691 unsigned long bytes_after;
2692 XTextProperty ct;
2693
2694 if (prop == None) /* check for failed XConvertSelection */ 2602 if (prop == None) /* check for failed XConvertSelection */
2695 { 2603 {
2696 if ((selection_type & Sel_CompoundText)) 2604 if ((selection_type & Sel_CompoundText))
2697 { 2605 {
2698 int selnum = selection_type & Sel_whereMask; 2606 int selnum = selection_type & Sel_whereMask;
… …
2711 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2619 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2712 else 2620 else
2713 selection_type = 0; 2621 selection_type = 0;
2714 } 2622 }
2715 2623
2716 return 0; 2624 return;
2717 }
2718
2719 for (;;)
2720 { 2625 }
2626
2627 unsigned long bytes_after;
2628 XTextProperty ct;
2629
2630 if (XGetWindowProperty (display->display, win, prop,
2631 0, PROP_SIZE / 4,
2632 delete_prop, AnyPropertyType,
2633 &ct.encoding, &ct.format,
2634 &ct.nitems, &bytes_after,
2635 &ct.value) != Success)
2636 {
2637 ct.value = 0;
2638 goto bailout;
2639 }
2640
2641 if (ct.encoding == None)
2642 goto bailout;
2643
2644 if (bytes_after)
2645 {
2646 // fetch and append remaining data
2647 XTextProperty ct2;
2648
2721 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2649 if (XGetWindowProperty (display->display, win, prop,
2722 (long) (PROP_SIZE / 4), delete_prop, 2650 ct.nitems / 4, (bytes_after + 3) / 4,
2651 delete_prop, AnyPropertyType,
2723 AnyPropertyType, &ct.encoding, &ct.format, 2652 &ct2.encoding, &ct2.format,
2724 &ct.nitems, &bytes_after, 2653 &ct2.nitems, &bytes_after,
2725 &ct.value) != Success) 2654 &ct2.value) != Success)
2726 break; 2655 goto bailout;
2727 2656
2728 if (ct.encoding == 0) 2657 // realloc should be compatible to XFree, here, and elsewhere, too
2729 break; 2658 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2659 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2660 ct.nitems += ct2.nitems;
2730 2661
2662 XFree (ct2.value);
2663 }
2664
2665 if (ct.value == 0)
2666 goto bailout;
2667
2731 if (ct.encoding == xa[XA_INCR]) 2668 if (ct.encoding == xa[XA_INCR])
2732 { 2669 {
2733 // INCR selection, start handshake 2670 // INCR selection, start handshake
2671 if (!delete_prop)
2734 XDeleteProperty (display->display, win, prop); 2672 XDeleteProperty (display->display, win, prop);
2673
2735 selection_wait = Sel_incr; 2674 selection_wait = Sel_incr;
2675 incr_buf_fill = 0;
2736 incr_ev.start (NOW + 10); 2676 incr_ev.start (NOW + 10);
2737 break;
2738 }
2739 2677
2740 if (ct.value == NULL) 2678 goto bailout;
2741 continue; 2679 }
2742 2680
2743 if (ct.nitems == 0) 2681 if (ct.nitems == 0)
2682 {
2683 if (selection_wait == Sel_incr)
2684 {
2685 XFree (ct.value);
2686
2687 // finally complete, now paste the whole thing
2688 selection_wait = Sel_normal;
2689 ct.value = (unsigned char *)incr_buf;
2690 ct.nitems = incr_buf_fill;
2691 incr_buf = 0;
2692 incr_buf_size = 0;
2693 incr_ev.stop ();
2744 { 2694 }
2695 else
2696 {
2745 if (selection_wait == Sel_normal && nread == 0 2697 if (selection_wait == Sel_normal
2746 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2698 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2747 { 2699 {
2748 /* 2700 /*
2749 * pass through again trying CUT_BUFFER0 if we've come from 2701 * pass through again trying CUT_BUFFER0 if we've come from
2750 * XConvertSelection () but nothing was presented 2702 * XConvertSelection () but nothing was presented
2751 */ 2703 */
2752 selection_paste (display->root, XA_CUT_BUFFER0, False); 2704 selection_paste (display->root, XA_CUT_BUFFER0, False);
2753 } 2705 }
2754 2706
2755 nread = -1; /* discount any previous stuff */ 2707 goto bailout;
2756 break; 2708 }
2709 }
2710 else if (selection_wait == Sel_incr)
2711 {
2712 incr_ev.start (NOW + 10);
2713
2714 while (incr_buf_fill + ct.nitems > incr_buf_size)
2757 } 2715 {
2716 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2717 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2718 }
2758 2719
2720 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2759 nread += ct.nitems; 2721 incr_buf_fill += ct.nitems;
2760 2722
2723 goto bailout;
2724 }
2725
2761 char **cl; 2726 char **cl;
2762 int cr; 2727 int cr;
2763 2728
2764#if ENABLE_FRILLS 2729#if ENABLE_FRILLS
2765 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2730 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2766 // so recode it manually 2731 // so recode it manually
2767 if (ct.encoding == xa[XA_UTF8_STRING]) 2732 if (ct.encoding == xa[XA_UTF8_STRING])
2768 { 2733 {
2769 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2734 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2770 char *s = rxvt_wcstombs (w); 2735 char *s = rxvt_wcstombs (w);
2771 2736 free (w);
2772 // TODO: strlen == only the first element will be converted. well... 2737 // TODO: strlen == only the first element will be converted. well...
2773 paste ((unsigned char *)s, strlen (s)); 2738 paste ((unsigned char *)s, strlen (s));
2774
2775 free (s); 2739 free (s);
2776 free (w); 2740 }
2777 }
2778 else 2741 else
2779#endif 2742#endif
2780 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2743 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2781 { 2744 && cl)
2745 {
2782 for (int i = 0; i < cr; i++) 2746 for (int i = 0; i < cr; i++)
2783 paste ((unsigned char *)cl[i], strlen (cl[i])); 2747 paste ((unsigned char *)cl[i], strlen (cl[i]));
2784 2748
2785 XFreeStringList (cl); 2749 XFreeStringList (cl);
2786 } 2750 }
2787 else 2751 else
2788 paste (ct.value, ct.nitems); 2752 paste (ct.value, ct.nitems); // paste raw
2789 2753
2790 if (bytes_after == 0) 2754bailout:
2791 break;
2792
2793 XFree (ct.value);
2794 }
2795
2796 if (ct.value)
2797 XFree (ct.value); 2755 XFree (ct.value);
2798 2756
2799 if (selection_wait == Sel_normal) 2757 if (selection_wait == Sel_normal)
2800 selection_wait = Sel_none; 2758 selection_wait = Sel_none;
2801
2802 return (int)nread;
2803} 2759}
2804 2760
2805void 2761void
2806rxvt_term::incr_cb (time_watcher &w) 2762rxvt_term::incr_cb (time_watcher &w)
2807{ 2763{
2808 selection_wait = Sel_none; 2764 selection_wait = Sel_none;
2809 2765
2766 incr_buf_size = 0;
2767 free (incr_buf);
2768
2810 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2769 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2811} 2770}
2812 2771
2813/*
2814 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2815 */
2816void 2772void
2817rxvt_term::selection_property (Window win, Atom prop) 2773rxvt_term::selection_property (Window win, Atom prop)
2818{ 2774{
2819 if (prop == None || selection_wait != Sel_incr) 2775 if (prop == None || selection_wait != Sel_incr)
2820 return; 2776 return;
2821 2777
2822 if (selection_paste (win, prop, 1) > 0) 2778 selection_paste (win, prop, true);
2823 incr_ev.start (NOW + 10);
2824 else
2825 {
2826 selection_wait = Sel_none;
2827 incr_ev.stop ();
2828 }
2829} 2779}
2830 2780
2831/* ------------------------------------------------------------------------- */ 2781/* ------------------------------------------------------------------------- */
2832/* 2782/*
2833 * Request the current selection: 2783 * Request the current selection:
… …
2839 * EXT: button 2 release 2789 * EXT: button 2 release
2840 */ 2790 */
2841void 2791void
2842rxvt_term::selection_request (Time tm, int x, int y) 2792rxvt_term::selection_request (Time tm, int x, int y)
2843{ 2793{
2844 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2794 if (x < 0 || x >= width || y < 0 || y >= height)
2845 return; /* outside window */ 2795 return; /* outside window */
2846 2796
2847 if (selection.text) 2797 if (selection.text)
2848 { /* internal selection */ 2798 { /* internal selection */
2849 char *str = rxvt_wcstombs (selection.text, selection.len); 2799 char *str = rxvt_wcstombs (selection.text, selection.len);
… …
2870 return; 2820 return;
2871#endif 2821#endif
2872 } 2822 }
2873 } 2823 }
2874 2824
2875 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2825 selection_wait = Sel_none; /* don't loop in selection_paste () */
2876 selection_paste (display->root, XA_CUT_BUFFER0, False); 2826 selection_paste (display->root, XA_CUT_BUFFER0, false);
2877} 2827}
2878 2828
2879int 2829int
2880rxvt_term::selection_request_other (Atom target, int selnum) 2830rxvt_term::selection_request_other (Atom target, int selnum)
2881{ 2831{
2882 Atom sel; 2832 Atom sel;
2883#ifdef DEBUG_SELECT
2884 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2885#endif
2886 2833
2887 selection_type |= selnum; 2834 selection_type |= selnum;
2888 2835
2889 if (selnum == Sel_Primary) 2836 if (selnum == Sel_Primary)
2890 sel = XA_PRIMARY; 2837 sel = XA_PRIMARY;
… …
2894 sel = xa[XA_CLIPBOARD]; 2841 sel = xa[XA_CLIPBOARD];
2895 2842
2896 if (XGetSelectionOwner (display->display, sel) != None) 2843 if (XGetSelectionOwner (display->display, sel) != None)
2897 { 2844 {
2898 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2845 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2899 TermWin.vt, selection_request_time); 2846 vt, selection_request_time);
2900 return 1; 2847 return 1;
2901 } 2848 }
2902 2849
2903 return 0; 2850 return 0;
2904} 2851}
… …
2927 * EXT: button 1 or 3 release 2874 * EXT: button 1 or 3 release
2928 */ 2875 */
2929void 2876void
2930rxvt_term::selection_make (Time tm) 2877rxvt_term::selection_make (Time tm)
2931{ 2878{
2932 int i, col, end_col, row, end_row; 2879 int i;
2933 wchar_t *new_selection_text; 2880 wchar_t *new_selection_text;
2934 text_t *t; 2881 text_t *t;
2935 2882
2936 switch (selection.op) 2883 switch (selection.op)
2937 { 2884 {
… …
2950 selection.op = SELECTION_DONE; 2897 selection.op = SELECTION_DONE;
2951 2898
2952 if (selection.clicks == 4) 2899 if (selection.clicks == 4)
2953 return; /* nothing selected, go away */ 2900 return; /* nothing selected, go away */
2954 2901
2955 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2902 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2956 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2903 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2957 2904
2958 col = selection.beg.col;
2959 row = selection.beg.row + TermWin.saveLines;
2960 end_row = selection.end.row + TermWin.saveLines;
2961 int ofs = 0; 2905 int ofs = 0;
2962 int extra = 0; 2906 int extra = 0;
2963 2907
2908 int col = selection.beg.col;
2909 int row = selection.beg.row;
2910
2911 int end_col;
2912
2964 for (; row <= end_row; row++, col = 0) 2913 for (; row <= selection.end.row; row++, col = 0)
2965 { 2914 {
2966 end_col = screen.tlen[row];
2967
2968#if ENABLE_FRILLS 2915#if ENABLE_FRILLS
2969 if (selection.rect) 2916 if (selection.rect)
2970 { 2917 {
2971 col = selection.beg.col; 2918 col = selection.beg.col;
2972 end_col = TermWin.ncol + 1; 2919 end_col = ncol + 1;
2973 } 2920 }
2921 else
2974#endif 2922#endif
2923 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2975 2924
2976 MAX_IT (col, 0); 2925 col = max (col, 0);
2977 2926
2978 if (end_col == -1)
2979 end_col = TermWin.ncol;
2980
2981 if (row == end_row || selection.rect) 2927 if (row == selection.end.row || selection.rect)
2982 MIN_IT (end_col, selection.end.col); 2928 end_col = min (end_col, selection.end.col);
2983 2929
2984 t = &screen.text[row][col]; 2930 t = ROW(row).t + col;
2985 for (; col < end_col; col++) 2931 for (; col < end_col; col++)
2986 { 2932 {
2987 if (*t == NOCHAR) 2933 if (*t == NOCHAR)
2988 t++; 2934 t++;
2989#if ENABLE_COMBINING 2935#if ENABLE_COMBINING
… …
3005#endif 2951#endif
3006 else 2952 else
3007 new_selection_text[ofs++] = *t++; 2953 new_selection_text[ofs++] = *t++;
3008 } 2954 }
3009 2955
3010 if (screen.tlen[row] != -1 && row != end_row) 2956 if (!ROW(row).is_longer () && row != selection.end.row)
3011 new_selection_text[ofs++] = C0_LF; 2957 new_selection_text[ofs++] = C0_LF;
3012 } 2958 }
3013 2959
3014 if (end_col != selection.end.col) 2960 if (end_col != selection.end.col)
3015 new_selection_text[ofs++] = C0_LF; 2961 new_selection_text[ofs++] = C0_LF;
… …
3026 2972
3027 // we usually allocate much more than necessary, so realloc it smaller again 2973 // we usually allocate much more than necessary, so realloc it smaller again
3028 selection.len = ofs; 2974 selection.len = ofs;
3029 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2975 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3030 2976
3031 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2977 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3032 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2978 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3033 display->set_selection_owner (this); 2979 display->set_selection_owner (this);
3034 else 2980 else
3035 rxvt_warn ("can't get primary selection, ignoring.\n"); 2981 rxvt_warn ("can't get primary selection, ignoring.\n");
3036 2982
3037#if 0 2983#if 0
… …
3060 3006
3061 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3007 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3062 3008
3063 if (clicks == 2 || clicks == 3) 3009 if (clicks == 2 || clicks == 3)
3064 selection_extend_colrow (selection.mark.col, 3010 selection_extend_colrow (selection.mark.col,
3065 selection.mark.row + TermWin.view_start, 3011 selection.mark.row + view_start,
3066 0, /* button 3 */ 3012 0, /* button 3 */
3067 1, /* button press */ 3013 1, /* button press */
3068 0); /* click change */ 3014 0); /* click change */
3069} 3015}
3070 3016
… …
3074 */ 3020 */
3075void 3021void
3076rxvt_term::selection_start_colrow (int col, int row) 3022rxvt_term::selection_start_colrow (int col, int row)
3077{ 3023{
3078 want_refresh = 1; 3024 want_refresh = 1;
3025
3026 selection.mark.row = row - view_start;
3079 selection.mark.col = col; 3027 selection.mark.col = col;
3080 selection.mark.row = row - TermWin.view_start;
3081 3028
3082 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3029 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3083 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3030 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3084 MAX_IT (selection.mark.col, 0);
3085 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3086 3031
3087 while (selection.mark.col > 0 3032 while (selection.mark.col > 0
3088 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3033 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3034 --selection.mark.col;
3090 3035
3091 if (selection.op) 3036 if (selection.op)
3092 { /* clear the old selection */ 3037 { /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3038 selection.beg.row = selection.end.row = selection.mark.row;
… …
3117 text_t *stp; 3062 text_t *stp;
3118 rend_t *srp; 3063 rend_t *srp;
3119 3064
3120 if (dirn == UP) 3065 if (dirn == UP)
3121 { 3066 {
3122 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3067 bound.row = - nsaved - 1;
3123 bound.col = 0; 3068 bound.col = 0;
3124 dirnadd = -1; 3069 dirnadd = -1;
3125 } 3070 }
3126 else 3071 else
3127 { 3072 {
3128 bound.row = TermWin.saveLines + TermWin.nrow; 3073 bound.row = nrow;
3129 bound.col = TermWin.ncol - 1; 3074 bound.col = ncol - 1;
3130 dirnadd = 1; 3075 dirnadd = 1;
3131 } 3076 }
3132 3077
3133 row = mark->row + TermWin.saveLines; 3078 row = mark->row;
3134 col = mark->col; 3079 col = max (mark->col, 0);
3135 MAX_IT (col, 0); 3080
3136 /* find the edge of a word */ 3081 /* find the edge of a word */
3137 stp = &screen.text[row][col]; 3082 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3138 w1 = DELIMIT_TEXT (*stp); 3083 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3139
3140 srp = &screen.rend[row][col];
3141 w2 = DELIMIT_REND (*srp);
3142 3084
3143 for (;;) 3085 for (;;)
3144 { 3086 {
3145 for (; col != bound.col; col += dirnadd) 3087 for (; col != bound.col; col += dirnadd)
3146 { 3088 {
… …
3156 break; 3098 break;
3157 } 3099 }
3158 3100
3159 if ((col == bound.col) && (row != bound.row)) 3101 if ((col == bound.col) && (row != bound.row))
3160 { 3102 {
3161 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3103 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3162 { 3104 {
3163 trow = row + dirnadd; 3105 trow = row + dirnadd;
3164 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3106 tcol = dirn == UP ? ncol - 1 : 0;
3165 3107
3166 if (screen.text[trow] == NULL) 3108 if (!ROW(trow).t)
3167 break; 3109 break;
3168 3110
3169 stp = & (screen.text[trow][tcol]); 3111 stp = ROW(trow).t + tcol;
3170 srp = & (screen.rend[trow][tcol]); 3112 srp = ROW(trow).r + tcol;
3171 3113
3172 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3114 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3173 break; 3115 break;
3174 3116
3175 row = trow; 3117 row = trow;
… …
3183Old_Word_Selection_You_Die: 3125Old_Word_Selection_You_Die:
3184 if (dirn == DN) 3126 if (dirn == DN)
3185 col++; /* put us on one past the end */ 3127 col++; /* put us on one past the end */
3186 3128
3187 /* Poke the values back in */ 3129 /* Poke the values back in */
3188 ret->row = row - TermWin.saveLines; 3130 ret->row = row;
3189 ret->col = col; 3131 ret->col = col;
3190} 3132}
3191 3133
3192/* ------------------------------------------------------------------------- */ 3134/* ------------------------------------------------------------------------- */
3193/* 3135/*
… …
3198 * flag == 2 ==> button 3 motion 3140 * flag == 2 ==> button 3 motion
3199 */ 3141 */
3200void 3142void
3201rxvt_term::selection_extend (int x, int y, int flag) 3143rxvt_term::selection_extend (int x, int y, int flag)
3202{ 3144{
3203 int col, row; 3145 int col = clamp (Pixel2Col (x), 0, ncol);
3204 3146 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3205 col = Pixel2Col (x);
3206 row = Pixel2Row (y);
3207 MAX_IT (row, 0);
3208 MIN_IT (row, (int)TermWin.nrow - 1);
3209 MAX_IT (col, 0);
3210 MIN_IT (col, (int)TermWin.ncol);
3211 3147
3212 /* 3148 /*
3213 * If we're selecting characters (single click) then we must check first 3149 * If we're selecting characters (single click) then we must check first
3214 * if we are at the same place as the original mark. If we are then 3150 * if we are at the same place as the original mark. If we are then
3215 * select nothing. Otherwise, if we're to the right of the mark, you have to 3151 * select nothing. Otherwise, if we're to the right of the mark, you have to
3216 * be _past_ a character for it to be selected. 3152 * be _past_ a character for it to be selected.
3217 */ 3153 */
3218 if (((selection.clicks % 3) == 1) && !flag 3154 if (((selection.clicks % 3) == 1) && !flag
3219 && (col == selection.mark.col 3155 && (col == selection.mark.col
3220 && (row == selection.mark.row + TermWin.view_start))) 3156 && (row == selection.mark.row + view_start)))
3221 { 3157 {
3222 /* select nothing */ 3158 /* select nothing */
3223 selection.beg.row = selection.end.row = 0; 3159 selection.beg.row = selection.end.row = 0;
3224 selection.beg.col = selection.end.col = 0; 3160 selection.beg.col = selection.end.col = 0;
3225 selection.clicks = 4; 3161 selection.clicks = 4;
… …
3240 * Extend the selection to the specified col/row 3176 * Extend the selection to the specified col/row
3241 */ 3177 */
3242void 3178void
3243rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3179rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3244{ 3180{
3245 int16_t ncol = TermWin.ncol;
3246 int end_col;
3247 row_col_t pos; 3181 row_col_t pos;
3248 enum { 3182 enum {
3249 LEFT, RIGHT 3183 LEFT, RIGHT
3250 } closeto = RIGHT; 3184 } closeto = RIGHT;
3251 3185
… …
3282 selection.beg.col = selection.end.col = selection.mark.col; 3216 selection.beg.col = selection.end.col = selection.mark.col;
3283 selection.beg.row = selection.end.row = selection.mark.row; 3217 selection.beg.row = selection.end.row = selection.mark.row;
3284 } 3218 }
3285 3219
3286 pos.col = col; 3220 pos.col = col;
3287 pos.row = row; 3221 pos.row = row - view_start;
3288
3289 pos.row -= TermWin.view_start; /* adjust for scroll */
3290 3222
3291 /* 3223 /*
3292 * This is mainly xterm style selection with a couple of differences, mainly 3224 * This is mainly xterm style selection with a couple of differences, mainly
3293 * in the way button3 drag extension works. 3225 * in the way button3 drag extension works.
3294 * We're either doing: button1 drag; button3 press; or button3 drag 3226 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3353 } 3285 }
3354 } 3286 }
3355 3287
3356 if (selection.clicks == 1) 3288 if (selection.clicks == 1)
3357 { 3289 {
3358 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3290 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3359 3291 && !ROW(selection.beg.row).is_longer ()
3360 if (selection.beg.col > end_col
3361 && end_col != -1
3362#if ENABLE_FRILLS 3292#if ENABLE_FRILLS
3363 && !selection.rect 3293 && !selection.rect
3364#endif 3294#endif
3365 ) 3295 )
3366 selection.beg.col = ncol; 3296 selection.beg.col = ncol;
3367 3297
3368 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3369
3370 if ( 3298 if (
3371 selection.end.col > end_col 3299 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && end_col != -1 3300 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3301#if ENABLE_FRILLS
3374 && !selection.rect 3302 && !selection.rect
3375#endif 3303#endif
3376 ) 3304 )
3377 selection.end.col = ncol; 3305 selection.end.col = ncol;
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3313 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3314 }
3387 else if (selection.clicks == 3) 3315 else if (selection.clicks == 3)
3388 { 3316 {
3389#if ENABLE_FRILLS 3317#if ENABLE_FRILLS
3390 if ((options & Opt_tripleclickwords)) 3318 if (options & Opt_tripleclickwords)
3391 { 3319 {
3392 int end_row;
3393
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3320 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3396 3321
3397 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3322 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3398 { 3323 {
3399 end_col = screen.tlen[end_row + TermWin.saveLines]; 3324 if (!ROW(end_row).is_longer ())
3400
3401 if (end_col != -1)
3402 { 3325 {
3403 selection.end.row = end_row; 3326 selection.end.row = end_row;
3404 selection.end.col = end_col; 3327 selection.end.col = ROW(end_row).l;
3405 selection_remove_trailing_spaces (); 3328 selection_remove_trailing_spaces ();
3406 break; 3329 break;
3407 } 3330 }
3408 } 3331 }
3409 } 3332 }
… …
3413 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3336 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3414 selection.mark.col++; 3337 selection.mark.col++;
3415 3338
3416 selection.beg.col = 0; 3339 selection.beg.col = 0;
3417 selection.end.col = ncol; 3340 selection.end.col = ncol;
3341
3342 // select a complete logical line
3343 while (selection.beg.row > -saveLines
3344 && ROW(selection.beg.row - 1).is_longer ())
3345 selection.beg.row--;
3346
3347 while (selection.end.row < nrow
3348 && ROW(selection.end.row).is_longer ())
3349 selection.end.row++;
3418 } 3350 }
3419 } 3351 }
3420 3352
3421 if (button3 && buttonpress) 3353 if (button3 && buttonpress)
3422 { /* mark may need to be changed */ 3354 { /* mark may need to be changed */
… …
3446 text_t *stp; 3378 text_t *stp;
3447 3379
3448 end_col = selection.end.col; 3380 end_col = selection.end.col;
3449 end_row = selection.end.row; 3381 end_row = selection.end.row;
3450 3382
3451 for ( ; end_row >= selection.beg.row; ) 3383 for (; end_row >= selection.beg.row; )
3452 { 3384 {
3453 stp = screen.text[end_row + TermWin.saveLines]; 3385 stp = ROW(end_row).t;
3454 3386
3455 while (--end_col >= 0) 3387 while (--end_col >= 0)
3456 { 3388 {
3457 if (stp[end_col] != ' ' 3389 if (stp[end_col] != ' '
3458 && stp[end_col] != '\t' 3390 && stp[end_col] != '\t'
3459 && stp[end_col] != NOCHAR) 3391 && stp[end_col] != NOCHAR)
3460 break; 3392 break;
3461 } 3393 }
3462 3394
3463 if (end_col >= 0 3395 if (end_col >= 0
3464 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3396 || !ROW(end_row - 1).is_longer ())
3465 { 3397 {
3466 selection.end.col = end_col + 1; 3398 selection.end.col = end_col + 1;
3467 selection.end.row = end_row; 3399 selection.end.row = end_row;
3468 break; 3400 break;
3469 } 3401 }
3470 3402
3471 end_row--; 3403 end_row--;
3472 end_col = TermWin.ncol; 3404 end_col = ncol;
3473 } 3405 }
3474 3406
3475 if (selection.mark.row > selection.end.row) 3407 if (selection.mark.row > selection.end.row)
3476 { 3408 {
3477 selection.mark.row = selection.end.row; 3409 selection.mark.row = selection.end.row;
… …
3502 */ 3434 */
3503void 3435void
3504rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3436rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3505{ 3437{
3506 XSelectionEvent ev; 3438 XSelectionEvent ev;
3439 dDisp;
3507 3440
3508 ev.type = SelectionNotify; 3441 ev.type = SelectionNotify;
3509 ev.property = None; 3442 ev.property = None;
3510 ev.display = rq.display; 3443 ev.display = rq.display;
3511 ev.requestor = rq.requestor; 3444 ev.requestor = rq.requestor;
… …
3525 *target++ = xa[XA_COMPOUND_TEXT]; 3458 *target++ = xa[XA_COMPOUND_TEXT];
3526#if X_HAVE_UTF8_STRING 3459#if X_HAVE_UTF8_STRING
3527 *target++ = xa[XA_UTF8_STRING]; 3460 *target++ = xa[XA_UTF8_STRING];
3528#endif 3461#endif
3529 3462
3530 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3463 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3531 32, PropModeReplace, 3464 32, PropModeReplace,
3532 (unsigned char *)target_list, target - target_list); 3465 (unsigned char *)target_list, target - target_list);
3533 ev.property = rq.property; 3466 ev.property = rq.property;
3534 } 3467 }
3535#if TODO // TODO 3468#if TODO // TODO
… …
3538 /* TODO: Handle MULTIPLE */ 3471 /* TODO: Handle MULTIPLE */
3539 } 3472 }
3540#endif 3473#endif
3541 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3474 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3542 { 3475 {
3543 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3476 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3544 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3477 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3545 ev.property = rq.property; 3478 ev.property = rq.property;
3546 } 3479 }
3547 else if (rq.target == XA_STRING 3480 else if (rq.target == XA_STRING
3548 || rq.target == xa[XA_TEXT] 3481 || rq.target == xa[XA_TEXT]
… …
3606 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3539 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3607 ct.nitems = strlen ((char *)ct.value); 3540 ct.nitems = strlen ((char *)ct.value);
3608 } 3541 }
3609 else 3542 else
3610#endif 3543#endif
3611 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3544 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3612 freect = 1; 3545 freect = 1;
3613 else 3546 else
3614 { 3547 {
3615 /* if we failed to convert then send it raw */ 3548 /* if we failed to convert then send it raw */
3616 ct.value = (unsigned char *)cl; 3549 ct.value = (unsigned char *)cl;
3617 ct.nitems = selectlen; 3550 ct.nitems = selectlen;
3618 ct.encoding = target; 3551 ct.encoding = target;
3619 } 3552 }
3620 3553
3621 XChangeProperty (display->display, rq.requestor, rq.property, 3554 XChangeProperty (disp, rq.requestor, rq.property,
3622 ct.encoding, 8, PropModeReplace, 3555 ct.encoding, 8, PropModeReplace,
3623 ct.value, (int)ct.nitems); 3556 ct.value, (int)ct.nitems);
3624 ev.property = rq.property; 3557 ev.property = rq.property;
3625 3558
3626 if (freect) 3559 if (freect)
3627 XFree (ct.value); 3560 XFree (ct.value);
3628 } 3561 }
3629 3562
3630 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3563 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3631} 3564}
3632 3565
3633/* ------------------------------------------------------------------------- * 3566/* ------------------------------------------------------------------------- *
3634 * MOUSE ROUTINES * 3567 * MOUSE ROUTINES *
3635 * ------------------------------------------------------------------------- */ 3568 * ------------------------------------------------------------------------- */
… …
3639 */ 3572 */
3640void 3573void
3641rxvt_term::pixel_position (int *x, int *y) 3574rxvt_term::pixel_position (int *x, int *y)
3642{ 3575{
3643 *x = Pixel2Col (*x); 3576 *x = Pixel2Col (*x);
3644 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3577 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3645 *y = Pixel2Row (*y); 3578 *y = Pixel2Row (*y);
3646 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3579 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3647} 3580}
3648 3581
3649/* ------------------------------------------------------------------------- */ 3582/* ------------------------------------------------------------------------- */
3650#ifdef USE_XIM 3583#ifdef USE_XIM
3651void 3584void
3652rxvt_term::im_set_position (XPoint &pos) 3585rxvt_term::im_set_position (XPoint &pos)
3653{ 3586{
3654 XWindowAttributes xwa; 3587 XWindowAttributes xwa;
3655 3588
3656 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3589 XGetWindowAttributes (display->display, vt, &xwa);
3657 3590
3658 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3591 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3659 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3592 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3660} 3593}
3661#endif 3594#endif
3662 3595
3663#if ENABLE_OVERLAY 3596#if ENABLE_OVERLAY
3664void 3597void
3665rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3598rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3666{ 3599{
3667 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3600 if (nrow < 3 || ncol < 3)
3668 return; 3601 return;
3669 3602
3670 want_refresh = 1; 3603 want_refresh = 1;
3671 3604
3672 scr_overlay_off (); 3605 scr_overlay_off ();
3673 3606
3674 if (x < 0) x = TermWin.ncol - w; 3607 if (x < 0) x = ncol - w;
3675 if (y < 0) y = TermWin.nrow - h; 3608 if (y < 0) y = nrow - h;
3676 3609
3677 // make space for border 3610 // make space for border
3678 w += 2; MIN_IT (w, TermWin.ncol); 3611 w += 2; MIN_IT (w, ncol);
3679 h += 2; MIN_IT (h, TermWin.nrow); 3612 h += 2; MIN_IT (h, nrow);
3680 3613
3681 x -= 1; MAX_IT (x, 0); 3614 x -= 1; MAX_IT (x, 0);
3682 y -= 1; MAX_IT (y, 0); 3615 y -= 1; MAX_IT (y, 0);
3683 3616
3684 MIN_IT (x, TermWin.ncol - w); 3617 MIN_IT (x, ncol - w);
3685 MIN_IT (y, TermWin.nrow - h); 3618 MIN_IT (y, nrow - h);
3686 3619
3687 ov_x = x; ov_y = y; 3620 ov_x = x; ov_y = y;
3688 ov_w = w; ov_h = h; 3621 ov_w = w; ov_h = h;
3689 3622
3690 ov_text = new text_t *[h]; 3623 ov_text = new text_t *[h];
… …
3755 while (*s) 3688 while (*s)
3756 scr_overlay_set (x++, y, *s++); 3689 scr_overlay_set (x++, y, *s++);
3757} 3690}
3758 3691
3759void 3692void
3693rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3694{
3695 while (*s)
3696 {
3697 text_t t = *s++;
3698 int width = wcwidth (t);
3699
3700 while (width--)
3701 {
3702 scr_overlay_set (x++, y, t);
3703 t = NOCHAR;
3704 }
3705 }
3706}
3707
3708void
3760rxvt_term::scr_swap_overlay () 3709rxvt_term::scr_swap_overlay ()
3761{ 3710{
3762 if (!ov_text) 3711 if (!ov_text)
3763 return; 3712 return;
3764 3713
3765 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3766
3767 // swap screen mem with overlay 3714 // swap screen mem with overlay
3768 for (int y = ov_h; y--; ) 3715 for (int y = ov_h; y--; )
3769 { 3716 {
3770 text_t *t1 = ov_text[y]; 3717 text_t *t1 = ov_text[y];
3771 rend_t *r1 = ov_rend[y]; 3718 rend_t *r1 = ov_rend[y];
3772 3719
3773 text_t *t2 = screen.text[y + row_offset] + ov_x; 3720 text_t *t2 = ROW(y - view_start).t + ov_x;
3774 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3721 rend_t *r2 = ROW(y - view_start).r + ov_x;
3775 3722
3776 for (int x = ov_w; x--; ) 3723 for (int x = ov_w; x--; )
3777 { 3724 {
3778 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3725 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3779 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3726 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3781 } 3728 }
3782} 3729}
3783 3730
3784#endif 3731#endif
3785/* ------------------------------------------------------------------------- */ 3732/* ------------------------------------------------------------------------- */
3733

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines