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.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.234 by root, Mon Jan 16 08:57:02 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
… …
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
119 117
120/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
121void 119void
122rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
123{ 121{
124 if (!l.t) 122 if (!l.t)
125 { 123 {
126 lalloc (l); 124 lalloc (l);
127 col = 0; 125 col = 0;
128 width = ncol; 126 width = ncol;
129 } 127 }
130 128
129 l.touch ();
130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
155void 159void
156rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
157{ 161{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
162 scr_overlay_off (); 163 scr_overlay_off ();
163#endif 164#endif
164 165
165 view_start = 0; 166 view_start = 0;
… …
175 return; 176 return;
176 177
177 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
179 { 180 {
181 //TODO//FIXME
180 saveLines++; 182 saveLines++;
181 prev_nrow--; 183 prev_nrow--;
182 nsaved++; 184 top_row--;
183 } 185 }
184 186
185 want_refresh = 1; 187 want_refresh = 1;
186 188
187 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
188 total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
189 191
190 screen.tscroll = 0; 192 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
192 194
193 if (!save) 195 if (!row_buf)
194 { 196 {
195 /* 197 /*
196 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
197 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 199 */
199 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
200 term_start = 0; 201 term_start = 0;
201 202
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 205
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 209
210 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
211 { 211 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 215 }
216 216
217 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
243 { 243 {
244 /* 244 /*
245 * add or delete rows as appropriate 245 * add or delete rows as appropriate
246 */ 246 */
247 247
248 rxvt_salloc *old_ta; 248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 250
251#if 0
251 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
252 { 253 {
253 /* delete rows */
254 k = min (nsaved, prev_nrow - nrow);
255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257
258 for (p = nrow; p < prev_nrow; p++) 254 for (int row = nrow; row < prev_nrow; row++)
259 { 255 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 256 lfree (swap_buf [row]);
262 lfree (drawn[p]); 257 lfree (drawn_buf[row]);
263 } 258 }
259 }
260#endif
264 261
265 /* we have fewer rows so fix up cursor position */ 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 264
268 scr_reset_realloc (); /* realloc _last_ */ 265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
269 } 279
270 else if (nrow > prev_nrow) 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row
283
284 if (top_row)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
271 { 292 do
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 293 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 294 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 297#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 300
353 assert (llen >= 0); 301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 302 {
303 p = MOD (p - 1, prev_total_rows);
304
357 --p; 305 plines++;
358 llen += prev_ncol; 306 llen += prev_ncol;
359 } 307 }
360 308
361 int qlines = llen / ncol + 1; 309 int qlines = max (0, (llen - 1) / ncol) + 1;
310
311 // drop partial lines completely
312 if (q < qlines)
313 break;
314
315 q -= qlines;
316
362 int lofs = 0; 317 int lofs = 0;
318 line_t *qline;
363 319
364 q -= qlines; 320 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
370 { 322 {
323 qline = row_buf + qrow;
324 lalloc (*qline);
325 qline->l = ncol;
326 qline->is_longer (1);
327
371 if (qrow >= 0) 328 int qcol = 0;
329
330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
372 { 332 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 333 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
383 335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
345 line_t &pline = old_buf [prow];
346
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 348
386 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);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000); 349 assert (len);
350 assert (pline.t);
400 351
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 354
404 lofs += len; 355 lofs += len;
405 qcol += len; 356 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 357 }
411 else
412 lofs += ncol;
413 } 358 }
359
360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 363 }
364 while (p != pend && q > 0);
365
366 term_start = total_rows - nrow;
367 top_row = q - term_start;
368
369 // make sure all terminal lines exist
370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 }
373 else
415 } 374 {
375 // if no scrollback exists (yet), wing, instead of wrap
376
377 for (int row = min (nrow, prev_nrow); row--; )
378 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
416 381
417 free (screen.text); screen.text = tp; 382 qline = pline;
418 free (screen.rend); screen.rend = rp; 383 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 384 }
420 385
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 386 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390
391 term_start = 0;
392 }
393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
422#endif 397#endif
398
399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
402
403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1);
423 405
424 if (tabs) 406 if (tabs)
425 free (tabs); 407 free (tabs);
426 } 408 }
427 409
428 prev_nrow = nrow; 410 prev_nrow = nrow;
429 prev_ncol = ncol; 411 prev_ncol = ncol;
430 412
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 414
433 for (p = 0; p < ncol; p++) 415 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 416 tabs [col] = col % TABSIZE == 0;
435 417
436 tt_winch (); 418 tt_winch ();
437}
438 419
439void 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446} 421}
447 422
448/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
449/* 424/*
450 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
453rxvt_term::scr_release () 428rxvt_term::scr_release ()
454{ 429{
455 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
457 432
458 free (save); 433 free (row_buf);
459 free (swap_save); 434 free (swap_buf);
460 free (drawn); 435 free (drawn_buf);
461 free (buf);
462 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
463} 439}
464 440
465/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
466/* 442/*
467 * Hard reset 443 * Hard reset
… …
518 set_font_style (); 494 set_font_style ();
519 break; 495 break;
520 } 496 }
521 497
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 503 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0);
531#endif 504#endif
532} 505}
533 506
534/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
535/* 508/*
… …
538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539 */ 512 */
540int 513int
541rxvt_term::scr_change_screen (int scrn) 514rxvt_term::scr_change_screen (int scrn)
542{ 515{
543 int i;
544#if NSCREENS
545 int offset;
546#endif
547
548 want_refresh = 1; 516 want_refresh = 1;
549
550 view_start = 0; 517 view_start = 0;
551 518
552 if (current_screen == scrn) 519 if (current_screen == scrn)
553 return scrn; 520 return scrn;
554 521
555 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
556 523
557 i = current_screen; current_screen = scrn; scrn = i; 524 int i = current_screen; current_screen = scrn; scrn = i;
558 525
559 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 526 ::swap (screen.cur.row, swap.cur.row);
560 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 527 ::swap (screen.cur.col, swap.cur.col);
561 MAX_IT (screen.cur.row, 0); 528
562 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
563 MAX_IT (screen.cur.col, 0); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
564 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
565 531
566#if NSCREENS 532#if NSCREENS
567 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
568 { 534 {
569 num_scr = 0; 535 num_scr = 0;
570 offset = saveLines;
571 536
572 for (i = prev_nrow; i--;) 537 for (int i = prev_nrow; i--; )
573 SWAP_IT (ROW(i), swap_save[i], line_t); 538 ::swap (ROW(i), swap_buf [i]);
574 539
575 SWAP_IT (screen.charset, swap.charset, int16_t); 540 ::swap (screen.charset, swap.charset);
576 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
577 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
578 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
579 } 544 }
580 else 545 else
581#endif 546#endif
582 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
583 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
584 549
585 return scrn; 550 return scrn;
586} 551}
587 552
588// clear WrapNext indicator, solidifying position on next line 553// clear WrapNext indicator, solidifying position on next line
… …
595 screen.flags &= ~Screen_WrapNext; 560 screen.flags &= ~Screen_WrapNext;
596 561
597 screen.cur.col = 0; 562 screen.cur.col = 0;
598 563
599 if (screen.cur.row == screen.bscroll) 564 if (screen.cur.row == screen.bscroll)
600 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 565 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
601 else if (screen.cur.row < nrow - 1) 566 else if (screen.cur.row < nrow - 1)
602 screen.cur.row++; 567 screen.cur.row++;
603} 568}
604 569
605/* ------------------------------------------------------------------------- */ 570/* ------------------------------------------------------------------------- */
… …
607 * Change the colour for following text 572 * Change the colour for following text
608 */ 573 */
609void 574void
610rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
611{ 576{
612 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
613 color = fgbg; 578 color = fgbg;
614 579
615 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
616 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
617 else 582 else
… …
636/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
637/* 602/*
638 * Scroll text between <row1> and <row2> inclusive, by <count> lines 603 * Scroll text between <row1> and <row2> inclusive, by <count> lines
639 * count positive ==> scroll up 604 * count positive ==> scroll up
640 * count negative ==> scroll down 605 * count negative ==> scroll down
641 * spec == 0 for normal routines
642 */ 606 */
643int 607int
644rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 608rxvt_term::scr_scroll_text (int row1, int row2, int count)
645{ 609{
646 int i, j;
647
648 if (count == 0 || (row1 > row2)) 610 if (count == 0 || (row1 > row2))
649 return 0; 611 return 0;
650 612
651 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count;
652 615
653 if (row1 == 0 && count > 0 616 if (count > 0
617 && row1 == 0
654 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
655 { 619 {
656 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
621
622 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows; 623 term_start = (term_start + count) % total_rows;
658 624
625 {
626 // severe bottommost scrolled line
627 line_t &l = ROW(row2 - count);
628 l.touch ();
629 l.is_longer (0);
630 }
631
632 // erase newly scorlled-in lines
633 for (int i = count; i; --i )
634 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - i);
638
639 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0;
642 l.f = 0;
643 }
644
645 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they
647 // hadn't moved.
648 for (int i = nrow; --i > row2; )
649 {
650 line_t &l1 = ROW(i - count);
651 line_t &l2 = ROW(i);
652
653 ::swap (l1, l2);
654 l2.touch ();
655 }
656
657 // move and/or clear selection, if any
659 if (selection.op && current_screen == selection.screen) 658 if (selection.op && current_screen == selection.screen)
660 { 659 {
661 selection.beg.row -= count; 660 selection.beg.row -= count;
662 selection.end.row -= count; 661 selection.end.row -= count;
663 selection.mark.row -= count; 662 selection.mark.row -= count;
664 }
665 663
666 for (int i = count; i--; ) 664 if (selection.beg.row < top_row
667 scr_blank_screen_mem (ROW(row2 - i), rstyle); 665 || selection.end.row < top_row
668 666 || selection.mark.row < top_row)
669 if ((options & Opt_scrollWithBuffer)
670 && view_start != 0
671 && view_start != saveLines)
672 scr_page (UP, count);
673 }
674 else
675 {
676 if (!spec)
677 row1 += saveLines;
678
679 row2 += saveLines;
680
681 if (selection.op && current_screen == selection.screen)
682 {
683 i = selection.beg.row + saveLines;
684 j = selection.end.row + saveLines;
685
686 if ((i < row1 && j > row1)
687 || (i < row2 && j > row2)
688 || (i - count < row1 && i >= row1)
689 || (i - count > row2 && i <= row2)
690 || (j - count < row1 && j >= row1)
691 || (j - count > row2 && j <= row2))
692 { 667 {
693 CLEAR_ALL_SELECTION (); 668 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 669 selection.op = SELECTION_CLEAR;
695 } 670 }
696 else if (j >= row1 && j <= row2) 671 }
672
673 // finally move the view window, if desired
674 if (OPTION (Opt_scrollWithBuffer)
675 && view_start != 0
676 && view_start != -saveLines)
677 scr_page (UP, count);
678
679 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
680 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
681 }
682 else
683 {
684 if (selection.op && current_screen == selection.screen)
685 {
686 if ((selection.beg.row < row1 && selection.end.row > row1)
687 || (selection.beg.row < row2 && selection.end.row > row2)
688 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
689 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
690 || (selection.end.row - count < row1 && selection.end.row >= row1)
691 || (selection.end.row - count > row2 && selection.end.row <= row2))
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 else if (selection.end.row >= row1 && selection.end.row <= row2)
697 { 697 {
698 /* move selected region too */ 698 /* move selected region too */
699 selection.beg.row -= count; 699 selection.beg.row -= count;
700 selection.end.row -= count; 700 selection.end.row -= count;
701 selection.mark.row -= count; 701 selection.mark.row -= count;
702
703 selection_check (0);
702 } 704 }
703 } 705 }
704 706
705 selection_check (0); /* _after_ nsaved update */ 707 // use a simple and robust scrolling algorithm, this
708 // part of scr_scroll_text is not time-critical.
706 709
707 num_scr += count;
708 j = count;
709
710 if (count < 0)
711 count = -count;
712
713 i = row2 - row1 + 1; 710 int rows = row2 - row1 + 1;
714 MIN_IT (count, i);
715 711
716 if (j > 0) 712 min_it (count, rows);
717 {
718 /* scroll up */
719 713
720 /* Copy lines that will get clobbered by the rotation */ 714 line_t *temp_buf = row_buf + total_rows;
721 memcpy (buf, save + row1, count * sizeof (line_t));
722 715
723 /* Rotate lines */ 716 for (int row = 0; row < rows; row++)
724 i = row2 - row1 - count + 1;
725 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
726
727 j = row2 - count + 1, i = count;
728 } 717 {
729 else /* if (j < 0) */ 718 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
719
720 if (!IN_RANGE_EXC (row + count, 0, rows))
721 scr_blank_screen_mem (temp_buf [row], rstyle);
730 { 722 }
731 /* scroll down */
732 723
733 /* Copy lines that will get clobbered by the rotation */ 724 for (int row = 0; row < rows; row++)
734 for (i = 0, j = row2; i < count; i++, j--) 725 ROW(row1 + row) = temp_buf [row];
735 buf[i] = save[j];
736
737 /* Rotate lines */
738 for (j = row2, i = j - count; i >= row1; i--, j--)
739 save[j] = save[i];
740
741 j = row1, i = count;
742 count = -count;
743 }
744
745 /* Resurrect lines */
746 memcpy (save + j, buf, i * sizeof (line_t));
747
748 if (!spec) /* line length may not equal ncol */
749 for (; i--; j++)
750 scr_blank_screen_mem (save[j], rstyle);
751 } 726 }
752 727
753 return count; 728 return count;
754} 729}
755 730
756/* ------------------------------------------------------------------------- */ 731/* ------------------------------------------------------------------------- */
757/* 732/*
758 * Add text given in <str> of length <len> to screen struct 733 * Add text given in <str> of length <len> to screen struct
759 */ 734 */
760void 735void
761rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 736rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
762{ 737{
763 if (len <= 0) /* sanity */ 738 if (len <= 0) /* sanity */
764 return; 739 return;
765 740
766 unsigned char checksel; 741 unsigned char checksel;
767 unicode_t c; 742 unicode_t c;
768 int row, last_col; 743 int ncol = this->ncol;
769 const unicode_t *strend = str + len; 744 const wchar_t *strend = str + len;
770 745
771 want_refresh = 1; 746 want_refresh = 1;
772 ZERO_SCROLLBACK (); 747 ZERO_SCROLLBACK ();
773 last_col = ncol;
774 748
775 if (nlines > 0) 749 if (minlines > 0)
776 { 750 {
777 nlines += screen.cur.row - screen.bscroll; 751 minlines += screen.cur.row - screen.bscroll;
752
778 if ((nlines > 0) 753 if (minlines > 0
779 && (screen.tscroll == 0) 754 && screen.tscroll == 0
780 && (screen.bscroll == (nrow - 1))) 755 && screen.bscroll == nrow - 1)
781 { 756 {
782 /* _at least_ this many lines need to be scrolled */ 757 /* _at least_ this many lines need to be scrolled */
783 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 758 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= nlines; 759 screen.cur.row -= minlines;
785 } 760 }
786 } 761 }
787 762
788#ifdef DEBUG_STRICT 763#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 764 assert (screen.cur.col < ncol);
790 assert ((screen.cur.row < nrow) 765 assert (screen.cur.row < nrow
791 && (screen.cur.row >= - (int32_t)nsaved)); 766 && screen.cur.row >= top_row);
792#else /* drive with your eyes closed */
793 MIN_IT (screen.cur.col, last_col - 1);
794 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
795 MAX_IT (screen.cur.row, - (int32_t)nsaved);
796#endif 767#endif
797 row = screen.cur.row; 768 int row = screen.cur.row;
798 769
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 770 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 771
801 line_t *line = &ROW(row); 772 line_t *line = &ROW(row);
802 773
803 while (str < strend) 774 while (str < strend)
804 { 775 {
805 c = *str++; 776 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
806 777
807 if (c < 0x20) 778 if (c < 0x20)
808 if (c == C0_LF) 779 if (c == C0_LF)
809 { 780 {
810 if (!line->is_longer ()) /* XXX: think about this */
811 MAX_IT (line->l, screen.cur.col); 781 max_it (line->l, screen.cur.col);
812 782
813 screen.flags &= ~Screen_WrapNext; 783 screen.flags &= ~Screen_WrapNext;
814 784
815 if (screen.cur.row == screen.bscroll) 785 if (screen.cur.row == screen.bscroll)
816 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 786 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
817 else if (screen.cur.row < (nrow - 1)) 787 else if (screen.cur.row < (nrow - 1))
818 row = ++screen.cur.row; 788 row = ++screen.cur.row;
819 789
820 line = &ROW(row); /* _must_ refresh */ 790 line = &ROW(row); /* _must_ refresh */
821 continue; 791 continue;
822 } 792 }
823 else if (c == C0_CR) 793 else if (c == C0_CR)
824 { 794 {
825 if (!line->is_longer ()) /* XXX: think about this */
826 MAX_IT (line->l, screen.cur.col); 795 max_it (line->l, screen.cur.col);
827 796
828 screen.flags &= ~Screen_WrapNext; 797 screen.flags &= ~Screen_WrapNext;
829 screen.cur.col = 0; 798 screen.cur.col = 0;
830 continue; 799 continue;
831 } 800 }
… …
848 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
849 } 818 }
850 819
851 if (screen.flags & Screen_WrapNext) 820 if (screen.flags & Screen_WrapNext)
852 { 821 {
822 max_it (line->l, ncol);
853 line->set_is_longer (); 823 line->is_longer (1);
854 824
855 scr_do_wrap (); 825 scr_do_wrap ();
856 826
857 row = screen.cur.row; 827 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
… …
866 // do wcwidth before further replacements, as wcwidth might return -1 836 // do wcwidth before further replacements, as wcwidth might return -1
867 // for the line drawing characters below as they might be invalid in the current 837 // for the line drawing characters below as they might be invalid in the current
868 // locale. 838 // locale.
869 int width = c < 0x100 ? 1 : wcwidth (c); 839 int width = c < 0x100 ? 1 : wcwidth (c);
870 840
871 if (charsets[screen.charset] == '0') // DEC SPECIAL 841 if (charsets [screen.charset] == '0') // DEC SPECIAL
872 { 842 {
873 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 844 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
928 } 898 }
929 899
930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 900 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
931 901
932 // if the character doesn't fit into the remaining columns... 902 // if the character doesn't fit into the remaining columns...
933 if (screen.cur.col > last_col - width && last_col >= width) 903 if (screen.cur.col > ncol - width && ncol >= width)
934 { 904 {
935 // ...output spaces 905 // ...output spaces
936 c = ' '; 906 c = ' ';
937 // and try the same character next loop iteration 907 // and try the same character next loop iteration
938 --str; 908 --str;
939 } 909 }
940 910
911 line->touch ();
912
941 do 913 do
942 { 914 {
943 line->t[screen.cur.col] = c; 915 line->t[screen.cur.col] = c;
944 line->r[screen.cur.col] = rend; 916 line->r[screen.cur.col] = rend;
945 917
946 if (screen.cur.col < last_col - 1) 918 if (screen.cur.col < ncol - 1)
947 screen.cur.col++; 919 screen.cur.col++;
948 else 920 else
949 { 921 {
950 line->l = last_col; 922 line->l = ncol;
951 if (screen.flags & Screen_Autowrap) 923 if (screen.flags & Screen_Autowrap)
952 screen.flags |= Screen_WrapNext; 924 screen.flags |= Screen_WrapNext;
953 break; 925 break;
954 } 926 }
955 927
… …
957 } 929 }
958 while (--width > 0); 930 while (--width > 0);
959 931
960 // pad with spaces when overwriting wide character with smaller one 932 // pad with spaces when overwriting wide character with smaller one
961 if (!width) 933 if (!width)
934 {
935 line->touch ();
936
962 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 937 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
963 { 938 {
964 line->t[c] = ' '; 939 line->t[c] = ' ';
965 line->r[c] = rend; 940 line->r[c] = rend;
966 } 941 }
942 }
967 } 943 }
968 else // width == 0 944 else // width == 0
969 { 945 {
970#if ENABLE_COMBINING 946#if ENABLE_COMBINING
971 // handle combining characters 947 // handle combining characters
972 // we just tag the accent on the previous on-screen character. 948 // we just tag the accent on the previous on-screen character.
973 // this is arguably not correct, but also arguably not wrong. 949 // this is arguably not correct, but also arguably not wrong.
974 // we don't handle double-width characters nicely yet. 950 // we don't handle double-width characters nicely yet.
951 line_t *linep;
975 text_t *tp; 952 text_t *tp;
976 rend_t *rp; 953 rend_t *rp;
977 954
978 if (screen.cur.col > 0) 955 if (screen.cur.col > 0)
979 { 956 {
957 linep = line;
980 tp = line->t + screen.cur.col - 1; 958 tp = line->t + screen.cur.col - 1;
981 rp = line->r + screen.cur.col - 1; 959 rp = line->r + screen.cur.col - 1;
982
983 while (*tp == NOCHAR && tp > line->t)
984 tp--, rp--;
985 } 960 }
986 else if (screen.cur.row > 0 961 else if (screen.cur.row > 0
987 && ROW(screen.cur.row - 1).is_longer ()) 962 && ROW(screen.cur.row - 1).is_longer ())
988 { 963 {
989 line_t *line = &ROW(screen.cur.row - 1); 964 linep = &ROW(screen.cur.row - 1);
990
991 tp = line->t + last_col - 1; 965 tp = line->t + ncol - 1;
992 rp = line->r + last_col - 1; 966 rp = line->r + ncol - 1;
993
994 while (*tp == NOCHAR && tp > line->t)
995 tp--, rp--;
996 } 967 }
997 else 968 else
998 continue; 969 continue;
970
971 linep->touch ();
972
973 while (*tp == NOCHAR && tp > linep->t)
974 tp--, rp--;
999 975
1000 // first try to find a precomposed character 976 // first try to find a precomposed character
1001 unicode_t n = rxvt_compose (*tp, c); 977 unicode_t n = rxvt_compose (*tp, c);
1002 if (n == NOCHAR) 978 if (n == NOCHAR)
1003 n = rxvt_composite.compose (*tp, c); 979 n = rxvt_composite.compose (*tp, c);
… …
1006 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 982 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1007#endif 983#endif
1008 } 984 }
1009 } 985 }
1010 986
1011 if (!line->is_longer ()) /* XXX: think about this */
1012 MAX_IT (line->l, screen.cur.col); 987 max_it (line->l, screen.cur.col);
1013 988
1014#ifdef DEBUG_STRICT 989#ifdef DEBUG_STRICT
1015 assert (screen.cur.row >= 0); 990 assert (screen.cur.row >= 0);
1016#else /* drive with your eyes closed */
1017 MAX_IT (screen.cur.row, 0);
1018#endif 991#endif
1019} 992}
1020 993
1021/* ------------------------------------------------------------------------- */ 994/* ------------------------------------------------------------------------- */
1022/* 995/*
… …
1061 1034
1062 if (count == 0) 1035 if (count == 0)
1063 return; 1036 return;
1064 else if (count > 0) 1037 else if (count > 0)
1065 { 1038 {
1066 int row = screen.cur.row;
1067
1068 line_t &l = ROW(row); 1039 line_t &l = ROW(screen.cur.row);
1069 rend_t base_rend = l.r[i]; 1040 rend_t base_rend = l.r[i];
1070 ht &= l.t[i] == ' '; 1041 ht &= l.t[i] == ' ';
1071 1042
1072 for (; ++i < ncol; ) 1043 for (; ++i < ncol; )
1073 if (tabs[i]) 1044 if (tabs[i])
1074 { 1045 {
1075 x = i; 1046 x = i;
1047
1076 if (!--count) 1048 if (!--count)
1077 break; 1049 break;
1078 } 1050 }
1079 else 1051 else
1080 ht &= l.t[i] == ' ' 1052 ht &= l.t[i] == ' '
… …
1083 if (count) 1055 if (count)
1084 x = ncol - 1; 1056 x = ncol - 1;
1085 1057
1086 // store horizontal tab commands as characters inside the text 1058 // store horizontal tab commands as characters inside the text
1087 // buffer so they can be selected and pasted. 1059 // buffer so they can be selected and pasted.
1088 if (ht && options & Opt_pastableTabs) 1060 if (ht && OPTION (Opt_pastableTabs))
1089 { 1061 {
1090 base_rend = SET_FONT (base_rend, 0); 1062 base_rend = SET_FONT (base_rend, 0);
1091 1063
1092 if (!l.is_longer ()) /* XXX: think about this */ 1064 l.touch (x);
1093 MAX_IT (l.l, x);
1094 1065
1095 i = screen.cur.col; 1066 i = screen.cur.col;
1096 1067
1097 l.t[i] = '\t'; 1068 l.t[i] = '\t';
1098 l.r[i] = base_rend; 1069 l.r[i] = base_rend;
… …
1148 */ 1119 */
1149#if ENABLE_FRILLS 1120#if ENABLE_FRILLS
1150void 1121void
1151rxvt_term::scr_forwardindex () 1122rxvt_term::scr_forwardindex ()
1152{ 1123{
1153 int row;
1154
1155 if (screen.cur.col < ncol - 1) 1124 if (screen.cur.col < ncol - 1)
1156 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1157 else 1126 else
1158 { 1127 {
1159 row = screen.cur.row; 1128 line_t &l = ROW(screen.cur.row);
1160 1129
1161 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1130 l.touch ();
1162 ROW(row).l = ncol; 1131 l.is_longer (0);
1163 1132
1164 scr_gotorc (0, 0, R_RELATIVE); 1133 scr_gotorc (0, 0, R_RELATIVE);
1165 scr_insdel_chars (1, DELETE); 1134 scr_insdel_chars (1, DELETE);
1166 scr_gotorc (0, ncol - 1, R_RELATIVE); 1135 scr_gotorc (0, ncol - 1, R_RELATIVE);
1167 } 1136 }
… …
1177{ 1146{
1178 want_refresh = 1; 1147 want_refresh = 1;
1179 ZERO_SCROLLBACK (); 1148 ZERO_SCROLLBACK ();
1180 1149
1181 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1150 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1182 MAX_IT (screen.cur.col, 0); 1151 clamp_it (screen.cur.col, 0, ncol - 1);
1183 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1184 1152
1185 screen.flags &= ~Screen_WrapNext; 1153 screen.flags &= ~Screen_WrapNext;
1186 1154
1187 if (relative & R_RELATIVE) 1155 if (relative & R_RELATIVE)
1188 { 1156 {
… …
1206 else 1174 else
1207 { 1175 {
1208 if (screen.flags & Screen_Relative) 1176 if (screen.flags & Screen_Relative)
1209 { /* relative origin mode */ 1177 { /* relative origin mode */
1210 screen.cur.row = row + screen.tscroll; 1178 screen.cur.row = row + screen.tscroll;
1211 MIN_IT (screen.cur.row, screen.bscroll); 1179 min_it (screen.cur.row, screen.bscroll);
1212 } 1180 }
1213 else 1181 else
1214 screen.cur.row = row; 1182 screen.cur.row = row;
1215 } 1183 }
1216 1184
1217 MAX_IT (screen.cur.row, 0); 1185 clamp_it (screen.cur.row, 0, nrow - 1);
1218 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1219} 1186}
1220 1187
1221/* ------------------------------------------------------------------------- */ 1188/* ------------------------------------------------------------------------- */
1222/* 1189/*
1223 * direction should be UP or DN 1190 * direction should be UP or DN
… …
1234 1201
1235 screen.flags &= ~Screen_WrapNext; 1202 screen.flags &= ~Screen_WrapNext;
1236 1203
1237 if ((screen.cur.row == screen.bscroll && direction == UP) 1204 if ((screen.cur.row == screen.bscroll && direction == UP)
1238 || (screen.cur.row == screen.tscroll && direction == DN)) 1205 || (screen.cur.row == screen.tscroll && direction == DN))
1239 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1206 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1240 else 1207 else
1241 screen.cur.row += dirn; 1208 screen.cur.row += dirn;
1242 1209
1243 MAX_IT (screen.cur.row, 0); 1210 clamp_it (screen.cur.row, 0, nrow - 1);
1244 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1245 selection_check (0); 1211 selection_check (0);
1246} 1212}
1247 1213
1248/* ------------------------------------------------------------------------- */ 1214/* ------------------------------------------------------------------------- */
1249/* 1215/*
… …
1253 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1219 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1254 */ 1220 */
1255void 1221void
1256rxvt_term::scr_erase_line (int mode) 1222rxvt_term::scr_erase_line (int mode)
1257{ 1223{
1258 unsigned int row, col, num; 1224 unsigned int col, num;
1259 1225
1260 want_refresh = 1; 1226 want_refresh = 1;
1261 ZERO_SCROLLBACK (); 1227 ZERO_SCROLLBACK ();
1262 1228
1263 selection_check (1); 1229 selection_check (1);
1264 1230
1265 row = screen.cur.row; 1231 line_t &line = ROW(screen.cur.row);
1232
1233 line.touch ();
1234 line.is_longer (0);
1266 1235
1267 switch (mode) 1236 switch (mode)
1268 { 1237 {
1269 case 0: /* erase to end of line */ 1238 case 0: /* erase to end of line */
1270 col = screen.cur.col; 1239 col = screen.cur.col;
1271 num = ncol - col; 1240 num = ncol - col;
1272 MIN_IT (ROW(row).l, (int16_t)col); 1241 min_it (line.l, col);
1273 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1242 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1274 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1243 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1275 CLEAR_SELECTION (); 1244 CLEAR_SELECTION ();
1276 break; 1245 break;
1277 case 1: /* erase to beginning of line */ 1246 case 1: /* erase to beginning of line */
… …
1282 CLEAR_SELECTION (); 1251 CLEAR_SELECTION ();
1283 break; 1252 break;
1284 case 2: /* erase whole line */ 1253 case 2: /* erase whole line */
1285 col = 0; 1254 col = 0;
1286 num = ncol; 1255 num = ncol;
1287 ROW(row).l = 0; 1256 line.l = 0;
1288 if (selection.beg.row <= screen.cur.row 1257 if (selection.beg.row <= screen.cur.row
1289 && selection.end.row >= screen.cur.row) 1258 && selection.end.row >= screen.cur.row)
1290 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1291 break; 1260 break;
1292 default: 1261 default:
1293 return; 1262 return;
1294 } 1263 }
1295 1264
1296 scr_blank_line (ROW(row), col, num, rstyle); 1265 scr_blank_line (line, col, num, rstyle);
1297} 1266}
1298 1267
1299/* ------------------------------------------------------------------------- */ 1268/* ------------------------------------------------------------------------- */
1300/* 1269/*
1301 * Erase part of whole of the screen 1270 * Erase part of whole of the screen
… …
1305 */ 1274 */
1306void 1275void
1307rxvt_term::scr_erase_screen (int mode) 1276rxvt_term::scr_erase_screen (int mode)
1308{ 1277{
1309 int num; 1278 int num;
1310 int32_t row, row_offset; 1279 int32_t row;
1311 rend_t ren; 1280 rend_t ren;
1312 XGCValues gcvalue; 1281 XGCValues gcvalue;
1313 1282
1314 want_refresh = 1; 1283 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1284 ZERO_SCROLLBACK ();
1316
1317 row_offset = (int32_t)saveLines;
1318 1285
1319 switch (mode) 1286 switch (mode)
1320 { 1287 {
1321 case 0: /* erase to end of screen */ 1288 case 0: /* erase to end of screen */
1322 selection_check (1); 1289 selection_check (1);
… …
1346 CLEAR_SELECTION (); 1313 CLEAR_SELECTION ();
1347 1314
1348 if (row >= nrow) /* Out Of Bounds */ 1315 if (row >= nrow) /* Out Of Bounds */
1349 return; 1316 return;
1350 1317
1351 MIN_IT (num, (nrow - row)); 1318 min_it (num, nrow - row);
1352 1319
1353 if (rstyle & (RS_RVid | RS_Uline)) 1320 if (rstyle & (RS_RVid | RS_Uline))
1354 ren = (rend_t) ~RS_None; 1321 ren = (rend_t) ~RS_None;
1355 else if (GET_BASEBG (rstyle) == Color_bg) 1322 else if (GET_BASEBG (rstyle) == Color_bg)
1356 { 1323 {
… …
1358 CLEAR_ROWS (row, num); 1325 CLEAR_ROWS (row, num);
1359 } 1326 }
1360 else 1327 else
1361 { 1328 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1329 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1330 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1331 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1365 ERASE_ROWS (row, num); 1332 ERASE_ROWS (row, num);
1366 gcvalue.foreground = pix_colors[Color_fg]; 1333 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1368 } 1335 }
1369 1336
1370 for (; num--; row++) 1337 for (; num--; row++)
1371 { 1338 {
1372 scr_blank_screen_mem (save[row + row_offset], rstyle); 1339 scr_blank_screen_mem (ROW(row), rstyle);
1373 save[row + row_offset].l = 0;
1374 scr_blank_line (drawn[row], 0, ncol, ren); 1340 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1375 } 1341 }
1376} 1342}
1377 1343
1378#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
1379void 1345void
1380rxvt_term::scr_erase_savelines () 1346rxvt_term::scr_erase_savelines ()
1381{ 1347{
1382 want_refresh = 1; 1348 want_refresh = 1;
1383 ZERO_SCROLLBACK (); 1349 ZERO_SCROLLBACK ();
1384 1350
1385 nsaved = 0; 1351 top_row = 0;
1386} 1352}
1387#endif 1353#endif
1388 1354
1389/* ------------------------------------------------------------------------- */ 1355/* ------------------------------------------------------------------------- */
1390/* 1356/*
… …
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1358 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1359 */
1394void 1360void
1395rxvt_term::scr_E () 1361rxvt_term::scr_E ()
1396{ 1362{
1397 int i, j, k;
1398 rend_t *r1, fs; 1363 rend_t fs;
1399 1364
1400 want_refresh = 1; 1365 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1366 ZERO_SCROLLBACK ();
1402 1367
1403 num_scr_allow = 0; 1368 num_scr_allow = 0;
1404 selection_check (3); 1369 selection_check (3);
1405 1370
1406 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1371 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1407 for (k = saveLines, i = nrow; i--; k++) 1372 for (int row = nrow; row--; )
1408 { 1373 {
1409 line_t &line = save[k]; 1374 line_t &line = ROW(row);
1410 1375
1411 fill_text (line.t, 'E', ncol); 1376 fill_text (line.t, 'E', ncol);
1377 rend_t *r1 = line.r;
1412 1378
1413 for (r1 = line.r, j = ncol; j--; ) 1379 for (int j = ncol; j--; )
1414 *r1++ = fs; 1380 *r1++ = fs;
1415 1381
1416 line.l = ncol; /* make the `E's selectable */ 1382 line.is_longer (0);
1383 line.touch (ncol);
1417 } 1384 }
1418} 1385}
1419 1386
1420/* ------------------------------------------------------------------------- */ 1387/* ------------------------------------------------------------------------- */
1421/* 1388/*
… …
1442 count = end; 1409 count = end;
1443 } 1410 }
1444 1411
1445 scr_do_wrap (); 1412 scr_do_wrap ();
1446 1413
1447 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1414 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1448} 1415}
1449 1416
1450/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1451/* 1418/*
1452 * Insert/Delete <count> characters from the current position 1419 * Insert/Delete <count> characters from the current position
… …
1464 return; 1431 return;
1465 1432
1466 scr_do_wrap (); 1433 scr_do_wrap ();
1467 1434
1468 selection_check (1); 1435 selection_check (1);
1469 MIN_IT (count, (ncol - screen.cur.col)); 1436 min_it (count, ncol - screen.cur.col);
1470 1437
1471 row = screen.cur.row + saveLines; 1438 row = screen.cur.row;
1472 1439
1473 line_t *line = save + row; 1440 line_t *line = &ROW(row);
1441
1442 line->touch ();
1443 line->is_longer (0);
1474 1444
1475 switch (insdel) 1445 switch (insdel)
1476 { 1446 {
1477 case INSERT: 1447 case INSERT:
1478 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1448 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1479 { 1449 {
1480 line->t[col] = line->t[col - count]; 1450 line->t[col] = line->t[col - count];
1481 line->r[col] = line->r[col - count]; 1451 line->r[col] = line->r[col - count];
1482 } 1452 }
1483 1453
1484 if (!line->is_longer ()) 1454 line->l = min (line->l + count, ncol);
1485 {
1486 line->l += count;
1487 MIN_IT (line->l, ncol);
1488 }
1489 1455
1490 if (selection.op && current_screen == selection.screen 1456 if (selection.op && current_screen == selection.screen
1491 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1492 { 1458 {
1493 if (selection.end.row != screen.cur.row 1459 if (selection.end.row != screen.cur.row
… …
1499 selection.mark.col += count; /* XXX: yes? */ 1465 selection.mark.col += count; /* XXX: yes? */
1500 selection.end.col += count; 1466 selection.end.col += count;
1501 } 1467 }
1502 } 1468 }
1503 1469
1504 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1470 scr_blank_line (*line, screen.cur.col, count, rstyle);
1505 break; 1471 break;
1506 1472
1507 case ERASE: 1473 case ERASE:
1508 screen.cur.col += count; /* don't worry if > ncol */ 1474 screen.cur.col += count; /* don't worry if > ncol */
1509 selection_check (1); 1475 selection_check (1);
1510 screen.cur.col -= count; 1476 screen.cur.col -= count;
1477
1478 line->l = max (line->l - count, 0);
1511 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1479 scr_blank_line (*line, screen.cur.col, count, rstyle);
1512 break; 1480 break;
1513 1481
1514 case DELETE: 1482 case DELETE:
1515 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1483 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1516 1484
… …
1518 { 1486 {
1519 line->t[col] = line->t[col + count]; 1487 line->t[col] = line->t[col + count];
1520 line->r[col] = line->r[col + count]; 1488 line->r[col] = line->r[col + count];
1521 } 1489 }
1522 1490
1491 line->l = max (line->l - count, 0);
1523 scr_blank_line (*line, ncol - count, count, tr); 1492 scr_blank_line (*line, ncol - count, count, tr);
1524
1525 if (line->is_longer ()) /* break line continuation */
1526 line->l = ncol;
1527
1528 line->l -= count;
1529 MAX_IT (line->l, 0);
1530 1493
1531 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1533 { 1496 {
1534 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
… …
1554 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1517 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1555 */ 1518 */
1556void 1519void
1557rxvt_term::scr_scroll_region (int top, int bot) 1520rxvt_term::scr_scroll_region (int top, int bot)
1558{ 1521{
1559 MAX_IT (top, 0); 1522 max_it (top, 0);
1560 MIN_IT (bot, (int)nrow - 1); 1523 min_it (bot, nrow - 1);
1561 1524
1562 if (top > bot) 1525 if (top > bot)
1563 return; 1526 return;
1564 1527
1565 screen.tscroll = top; 1528 screen.tscroll = top;
… …
1646rxvt_term::scr_set_tab (int mode) 1609rxvt_term::scr_set_tab (int mode)
1647{ 1610{
1648 if (mode < 0) 1611 if (mode < 0)
1649 memset (tabs, 0, ncol * sizeof (char)); 1612 memset (tabs, 0, ncol * sizeof (char));
1650 else if (screen.cur.col < ncol) 1613 else if (screen.cur.col < ncol)
1651 tabs[screen.cur.col] = (mode ? 1 : 0); 1614 tabs [screen.cur.col] = !!mode;
1652} 1615}
1653 1616
1654/* ------------------------------------------------------------------------- */ 1617/* ------------------------------------------------------------------------- */
1655/* 1618/*
1656 * Set reverse/normal video 1619 * Set reverse/normal video
… …
1663 XGCValues gcvalue; 1626 XGCValues gcvalue;
1664 1627
1665 if (rvideo != mode) 1628 if (rvideo != mode)
1666 { 1629 {
1667 rvideo = mode; 1630 rvideo = mode;
1668 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1669#if XPM_BACKGROUND 1632#if XPM_BACKGROUND
1670 if (bgPixmap.pixmap == None) 1633 if (bgPixmap.pixmap == None)
1671#endif 1634#endif
1672#if TRANSPARENT 1635#if TRANSPARENT
1673 if (! (options & Opt_transparent) || am_transparent == 0) 1636 if (! OPTION (Opt_transparent) || am_transparent == 0)
1674#endif 1637#endif
1675 XSetWindowBackground (display->display, vt, 1638 XSetWindowBackground (display->display, vt,
1676 pix_colors[Color_bg]); 1639 pix_colors[Color_bg]);
1677 1640
1678 gcvalue.foreground = pix_colors[Color_fg]; 1641 gcvalue.foreground = pix_colors[Color_fg];
… …
1703 * Set font style 1666 * Set font style
1704 */ 1667 */
1705void 1668void
1706rxvt_term::set_font_style () 1669rxvt_term::set_font_style ()
1707{ 1670{
1671#if 0
1708 switch (charsets[screen.charset]) 1672 switch (charsets [screen.charset])
1709 { 1673 {
1710 case '0': /* DEC Special Character & Line Drawing Set */ 1674 case '0': /* DEC Special Character & Line Drawing Set */
1711 break; 1675 break;
1712 case 'A': /* United Kingdom (UK) */ 1676 case 'A': /* United Kingdom (UK) */
1713 break; 1677 break;
… …
1720 case 'C': /* Finnish character set */ 1684 case 'C': /* Finnish character set */
1721 break; 1685 break;
1722 case 'K': /* German character set */ 1686 case 'K': /* German character set */
1723 break; 1687 break;
1724 } 1688 }
1689#endif
1725} 1690}
1726 1691
1727/* ------------------------------------------------------------------------- */ 1692/* ------------------------------------------------------------------------- */
1728/* 1693/*
1729 * Choose a font 1694 * Choose a font
… …
1769 bool found = false; 1734 bool found = false;
1770 1735
1771 for (int i = 0; i < nrow; i++) 1736 for (int i = 0; i < nrow; i++)
1772 { 1737 {
1773 int col = 0; 1738 int col = 0;
1774 rend_t *drp = drawn[i].r; 1739 rend_t *drp = drawn_buf[i].r;
1775 1740
1776 for (; col < ncol; col++, drp++) 1741 for (; col < ncol; col++, drp++)
1777 if ((*drp & mask) == value) 1742 if ((*drp & mask) == value)
1778 { 1743 {
1779 found = true; 1744 found = true;
… …
1797rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1762rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1798{ 1763{
1799 int i; 1764 int i;
1800 row_col_t rc[RC_COUNT]; 1765 row_col_t rc[RC_COUNT];
1801 1766
1802 if (!drawn) /* sanity check */ 1767 if (!drawn_buf) /* sanity check */
1803 return; 1768 return;
1804 1769
1805#ifndef NO_SLOW_LINK_SUPPORT 1770#ifndef NO_SLOW_LINK_SUPPORT
1806 if (refresh_type == FAST_REFRESH && !display->is_local) 1771 if (refresh_type == FAST_REFRESH && !display->is_local)
1807 { 1772 {
1808 y = 0; 1773 y = 0;
1809 eheight = height; 1774 eheight = height;
1810 } 1775 }
1811#endif
1812
1813#ifdef DEBUG_STRICT
1814 x = max (x, 0);
1815 x = min (x, (int)width);
1816 y = max (y, 0);
1817 y = min (y, (int)height);
1818#endif 1776#endif
1819 1777
1820 /* round down */ 1778 /* round down */
1821 rc[PART_BEG].col = Pixel2Col (x); 1779 rc[PART_BEG].col = Pixel2Col (x);
1822 rc[PART_BEG].row = Pixel2Row (y); 1780 rc[PART_BEG].row = Pixel2Row (y);
… …
1825 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1783 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1826 1784
1827 /* sanity checks */ 1785 /* sanity checks */
1828 for (i = PART_BEG; i < RC_COUNT; i++) 1786 for (i = PART_BEG; i < RC_COUNT; i++)
1829 { 1787 {
1830 MIN_IT (rc[i].col, ncol - 1); 1788 min_it (rc[i].col, ncol - 1);
1831 MIN_IT (rc[i].row, nrow - 1); 1789 min_it (rc[i].row, nrow - 1);
1832 } 1790 }
1833 1791
1834 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1835 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1793 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1836 1794
1837 if (refresh) 1795 if (refresh)
1838 scr_refresh (SLOW_REFRESH); 1796 scr_refresh (SLOW_REFRESH);
1839} 1797}
1840 1798
… …
1851/* ------------------------------------------------------------------------- */ 1809/* ------------------------------------------------------------------------- */
1852/* 1810/*
1853 * Move the display so that the line represented by scrollbar value Y is at 1811 * Move the display so that the line represented by scrollbar value Y is at
1854 * the top of the screen 1812 * the top of the screen
1855 */ 1813 */
1856int 1814void
1857rxvt_term::scr_move_to (int y, int len) 1815rxvt_term::scr_move_to (int y, int len)
1858{ 1816{
1859 long p = 0; 1817 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1860 unsigned int oldviewstart;
1861
1862 oldviewstart = view_start;
1863
1864 if (y < len)
1865 {
1866 p = (nrow + nsaved) * (len - y) / len;
1867 p -= (long) (nrow - 1);
1868 p = max (p, 0);
1869 }
1870
1871 view_start = (unsigned int)min (p, nsaved);
1872
1873 return scr_changeview (oldviewstart);
1874} 1818}
1875 1819
1876/* ------------------------------------------------------------------------- */ 1820/* ------------------------------------------------------------------------- */
1877/* 1821/*
1878 * Page the screen up/down nlines 1822 * Page the screen up/down nlines
1879 * direction should be UP or DN 1823 * direction should be UP or DN
1880 */ 1824 */
1881int 1825bool
1882rxvt_term::scr_page (enum page_dirn direction, int nlines) 1826rxvt_term::scr_page (enum page_dirn direction, int nlines)
1883{ 1827{
1884 int n; 1828 int new_view_start =
1885 unsigned int oldviewstart;
1886
1887 oldviewstart = view_start;
1888
1889 if (direction == UP)
1890 {
1891 n = view_start + nlines;
1892 view_start = min (n, nsaved);
1893 }
1894 else
1895 {
1896 n = view_start - nlines; 1829 direction == UP ? view_start - nlines
1897 view_start = max (n, 0); 1830 : view_start + nlines;
1898 }
1899 1831
1900 return scr_changeview (oldviewstart); 1832 return scr_changeview (new_view_start);
1901} 1833}
1902 1834
1903int 1835bool
1904rxvt_term::scr_changeview (unsigned int oldviewstart) 1836rxvt_term::scr_changeview (int new_view_start)
1905{ 1837{
1838 clamp_it (new_view_start, top_row, 0);
1839
1906 if (view_start != oldviewstart) 1840 if (new_view_start == view_start)
1907 { 1841 return false;
1842
1843 num_scr += new_view_start - view_start;
1844 view_start = new_view_start;
1908 want_refresh = 1; 1845 want_refresh = 1;
1909 num_scr -= (view_start - oldviewstart);
1910 }
1911 1846
1912 return (int) (view_start - oldviewstart); 1847 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1848
1849 return true;
1913} 1850}
1914 1851
1915/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1916void 1853void
1917rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1918{ 1855{
1919#ifndef NO_BELL 1856#ifndef NO_BELL
1920 1857
1921# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1923 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1924# endif 1861# endif
1925 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1926# endif 1863# endif
1927 1864
1928 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1929 { 1866 {
1930 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1931 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1932 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1933 } 1871 }
1934 else 1872 else
1935 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
1941/* ARGSUSED */ 1879/* ARGSUSED */
1942void 1880void
1943rxvt_term::scr_printscreen (int fullhist) 1881rxvt_term::scr_printscreen (int fullhist)
1944{ 1882{
1945#ifdef PRINTPIPE 1883#ifdef PRINTPIPE
1946 int i, r1, nrows, row_offset; 1884 int nrows, row_start;
1947 FILE *fd; 1885 FILE *fd;
1948 1886
1949 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1950 return; 1888 return;
1951 1889
1952 nrows = nrow;
1953 row_offset = saveLines;
1954
1955 if (!fullhist) 1890 if (fullhist)
1956 row_offset -= view_start; 1891 {
1892 nrows = nrow - top_row;
1893 row_start = top_row;
1894 }
1957 else 1895 else
1958 { 1896 {
1959 nrows += nsaved; 1897 nrows = nrow;
1960 row_offset -= nsaved; 1898 row_start = view_start;
1961 } 1899 }
1962 1900
1963 wctomb (0, 0); 1901 wctomb (0, 0);
1964 1902
1965 for (r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
1966 { 1904 {
1967 text_t *tp = save[r1 + row_offset].t; 1905 text_t *tp = ROW(r1).t;
1968 int len = save[r1 + row_offset].l; 1906 int len = ROW(r1).l;
1969 1907
1970 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1908 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1971 { 1909 {
1972 char mb[MB_LEN_MAX]; 1910 char mb[MB_LEN_MAX];
1973 text_t t = *tp++; 1911 text_t t = *tp++;
1974 if (t == NOCHAR) 1912 if (t == NOCHAR)
1975 continue; 1913 continue;
… …
2003{ 1941{
2004 unsigned char must_clear, /* use draw_string not draw_image_string */ 1942 unsigned char must_clear, /* use draw_string not draw_image_string */
2005 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
2006 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
2007 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
2008 int i, /* tmp */ 1946 int i; /* tmp */
2009 row_offset; /* basic offset in screen structure */
2010#ifndef NO_CURSORCOLOR 1947#ifndef NO_CURSORCOLOR
2011 rend_t cc1; /* store colours at cursor position (s) */ 1948 rend_t cc1; /* store colours at cursor position (s) */
2012#endif 1949#endif
2013 rend_t *crp; // cursor rendition pointer 1950 rend_t *crp; // cursor rendition pointer
2014 1951
… …
2021 * A: set up vars 1958 * A: set up vars
2022 */ 1959 */
2023 must_clear = 0; 1960 must_clear = 0;
2024 refresh_count = 0; 1961 refresh_count = 0;
2025 1962
2026 row_offset = term_start - view_start;
2027
2028#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
2029 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
2030#endif 1965#endif
2031#if TRANSPARENT 1966#if TRANSPARENT
2032 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
2033#endif 1968#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 1970
2036 /* 1971 /*
2037 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
2061 1996
2062 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
2063 1998
2064 if (showcursor && focus) 1999 if (showcursor && focus)
2065 { 2000 {
2066 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
2067 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
2068 else 2003 else
2069 { 2004 {
2070 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2071 2006
… …
2073 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
2076 else 2011 else
2077#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2078 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
2079#else 2014#else
2080 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2081#endif 2016#endif
2082 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2083 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2084 else 2019 else
2085#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2086 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2087#else 2022#else
2088 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2089#endif 2024#endif
2090 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2091 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2096 2031
2097 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2098 setoldcursor = 0; 2033 setoldcursor = 0;
2099 if (ocrow != -1) 2034 if (ocrow != -1)
2100 { 2035 {
2101 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row - view_start != ocrow
2102 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2103 { 2038 {
2104 if (ocrow < nrow 2039 if (ocrow < nrow
2105 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2106 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2107 2042
2108 if (focus || !showcursor) 2043 if (focus || !showcursor)
2109 oldcursor.row = -1; 2044 oldcursor.row = -1;
2110 else 2045 else
2111 setoldcursor = 1; 2046 setoldcursor = 1;
… …
2114 else if (!focus) 2049 else if (!focus)
2115 setoldcursor = 1; 2050 setoldcursor = 1;
2116 2051
2117 if (setoldcursor) 2052 if (setoldcursor)
2118 { 2053 {
2119 if (screen.cur.row + view_start >= nrow) 2054 if (screen.cur.row - view_start >= nrow)
2120 oldcursor.row = -1; 2055 oldcursor.row = -1;
2121 else 2056 else
2122 { 2057 {
2123 oldcursor.row = screen.cur.row + view_start; 2058 oldcursor.row = screen.cur.row - view_start;
2124 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2125 } 2060 }
2126 } 2061 }
2127 } 2062 }
2128 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2129#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2130 scr_swap_overlay (); 2066 scr_swap_overlay ();
2131#endif 2067#endif
2132 2068
2133#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2135 * D: CopyArea pass - very useful for slower links 2071 * D: CopyArea pass - very useful for slower links
2136 * This has been deliberately kept simple. 2072 * This has been deliberately kept simple.
2137 */ 2073 */
2138 i = num_scr; 2074 i = num_scr;
2139 if (!display->is_local 2075 if (!display->is_local
2140 && refresh_type == FAST_REFRESH && num_scr_allow && i 2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2141 && abs (i) < nrow && !must_clear) 2077 && abs (num_scr) < nrow && !must_clear)
2142 { 2078 {
2143 int16_t nits; 2079 int16_t nits;
2144 int j; 2080 int j;
2145 int len, wlen; 2081 int len, wlen;
2146 2082
… …
2149 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2150 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2151 { 2087 {
2152 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2153 { 2089 {
2154 line_t s = save[(row + row_offset) % nlines]; 2090 line_t s = ROW(view_start + row);
2155 line_t d = drawn[row]; 2091 line_t d = drawn_buf[row];
2156 line_t d2 = drawn[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2157 2093
2158 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2159 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2160 nits--; 2096 nits--;
2161 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2097 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2179 2115
2180 if (len != -1) 2116 if (len != -1)
2181 { 2117 {
2182 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2183 if (wlen < len) 2119 if (wlen < len)
2184 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2185 2121
2186 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2187 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2188 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2189 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2190 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2191 len = -1; 2127 len = -1;
2192 } 2128 }
2193 } 2129 }
… …
2197 /* 2133 /*
2198 * E: main pass across every character 2134 * E: main pass across every character
2199 */ 2135 */
2200 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2201 { 2137 {
2202 text_t *stp = save[(row + row_offset) % total_rows].t; 2138 text_t *stp = ROW(view_start + row).t;
2203 rend_t *srp = save[(row + row_offset) % total_rows].r; 2139 rend_t *srp = ROW(view_start + row).r;
2204 text_t *dtp = drawn[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2205 rend_t *drp = drawn[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2206 2142
2207 /* 2143 /*
2208 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2209 */ 2145 */
2210 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
… …
2272 count++, i--; 2208 count++, i--;
2273 2209
2274 /* 2210 /*
2275 * Determine the attributes for the string 2211 * Determine the attributes for the string
2276 */ 2212 */
2277 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2278 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2279 2215
2280 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2281 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2282 { 2218 {
2283#if ENABLE_STYLES 2219#if ENABLE_STYLES
2284 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2285 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2321 fore = Color_UL; 2257 fore = Color_UL;
2322#endif 2258#endif
2323 2259
2324 if (invert) 2260 if (invert)
2325 { 2261 {
2326 SWAP_IT (fore, back, int); 2262 ::swap (fore, back);
2327 2263
2328#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2329 if (ISSET_PIXCOLOR (Color_RV)) 2265 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV; 2266 back = Color_RV;
2331 2267
… …
2396 } /* for (row....) */ 2332 } /* for (row....) */
2397 2333
2398#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2399 scr_swap_overlay (); 2335 scr_swap_overlay ();
2400#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2401 2338
2402 /* 2339 /*
2403 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2404 */ 2341 */
2405 if (showcursor) 2342 if (showcursor)
2406 { 2343 {
2407 if (focus) 2344 if (focus)
2408 { 2345 {
2409 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2410 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2411 else 2348 else
2412 { 2349 {
2413 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2414#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2423 2360
2424 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2361 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2425 col--; 2362 col--;
2426 2363
2427 while (col + cursorwidth < ncol 2364 while (col + cursorwidth < ncol
2428 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2429 cursorwidth++; 2366 cursorwidth++;
2430 2367
2431#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2444 /* 2381 /*
2445 * H: cleanup selection 2382 * H: cleanup selection
2446 */ 2383 */
2447 scr_reverse_selection (); 2384 scr_reverse_selection ();
2448 2385
2449 if (refresh_type & SMOOTH_REFRESH)
2450 XFlush (display->display);
2451
2452 num_scr = 0; 2386 num_scr = 0;
2453 num_scr_allow = 1; 2387 num_scr_allow = 1;
2454} 2388}
2455 2389
2456void 2390void
2457rxvt_term::scr_remap_chars (const line_t &l) 2391rxvt_term::scr_remap_chars (line_t &l)
2458{ 2392{
2459 if (!l.t) 2393 if (!l.t)
2460 return; 2394 return;
2461 2395
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2397
2462 for (int i = ncol; i--; ) 2398 for (int i = ncol; i--; )
2463 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2464} 2400}
2465 2401
2466void 2402void
2467rxvt_term::scr_remap_chars () 2403rxvt_term::scr_remap_chars ()
2468{ 2404{
2469 for (int i = total_rows; i--; ) 2405 for (int i = total_rows; i--; )
2470 scr_remap_chars (save[i]); 2406 scr_remap_chars (row_buf [i]);
2471 2407
2472 for (int i = nrow; i--; ) 2408 for (int i = nrow; i--; )
2473 { 2409 {
2474 scr_remap_chars (drawn[i]); 2410 scr_remap_chars (drawn_buf [i]);
2475 scr_remap_chars (swap_save[i]); 2411 scr_remap_chars (swap_buf [i]);
2476 } 2412 }
2477} 2413}
2478 2414
2479void 2415void
2480rxvt_term::scr_recolour () 2416rxvt_term::scr_recolour ()
… …
2518 2454
2519 if (really) 2455 if (really)
2520 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2521} 2457}
2522 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2523/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2524void 2508void
2525rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2526{ 2510{
2527 if (selection.op 2511 if (selection.op
2528 && current_screen == selection.screen 2512 && current_screen == selection.screen
2529 && selection.end.row >= -view_start) 2513 && selection.end.row >= view_start)
2530 { 2514 {
2531 int view_end = -view_start + nrow;
2532 int row, col;
2533
2534#if ENABLE_FRILLS 2515#if ENABLE_FRILLS
2535 if (selection.rect) 2516 if (selection.rect)
2536 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2518 selection.end.row, selection.end.col,
2538 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2519 RS_RVid, RS_RVid | RS_Uline);
2539 srp[col] ^= RS_RVid;
2540 }
2541 else 2520 else
2542#endif 2521#endif
2543 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2544 if (selection.beg.row >= -view_start) 2523 selection.end.row, selection.end.col,
2545 { 2524 RS_RVid);
2546 col = selection.beg.col;
2547 row = selection.beg.row;
2548 }
2549 else
2550 {
2551 col = 0;
2552 row = view_start;
2553 }
2554
2555 for (; row < min (selection.end.row, view_end); row++, col = 0)
2556 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2557 srp[col] ^= RS_RVid;
2558
2559 if (row == selection.end.row)
2560 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2563 } 2525 }
2564} 2526}
2565 2527
2566/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2567/* 2529/*
… …
2577 char r1[] = "\n"; 2539 char r1[] = "\n";
2578 2540
2579 for (row = saveLines - nsaved; 2541 for (row = saveLines - nsaved;
2580 row < saveLines + nrow - 1; row++) 2542 row < saveLines + nrow - 1; row++)
2581 { 2543 {
2582 width = save[row].l >= 0 ? save[row].l 2544 width = row_buf[row].l >= 0 ? row_buf[row].l
2583 : ncol; 2545 : ncol;
2584 for (towrite = width; towrite; towrite -= wrote) 2546 for (towrite = width; towrite; towrite -= wrote)
2585 { 2547 {
2586 wrote = write (fd, & (save[row].t[width - towrite]), 2548 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2587 towrite); 2549 towrite);
2588 if (wrote < 0) 2550 if (wrote < 0)
2589 return; /* XXX: death, no report */ 2551 return; /* XXX: death, no report */
2590 } 2552 }
2591 if (save[row].l >= 0) 2553 if (row_buf[row].l >= 0)
2592 if (write (fd, r1, 1) <= 0) 2554 if (write (fd, r1, 1) <= 0)
2593 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2594 } 2556 }
2595} 2557}
2596#endif 2558#endif
… …
2605 2567
2606 if (!selection.op) 2568 if (!selection.op)
2607 return; 2569 return;
2608 2570
2609 pos.row = pos.col = 0; 2571 pos.row = pos.col = 0;
2610 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2572 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2611 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2573 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2612 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2574 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2613 || (check_more == 1 2575 || (check_more == 1
2614 && current_screen == selection.screen 2576 && current_screen == selection.screen
2615 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2616 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2617 || (check_more == 2 2579 || (check_more == 2
… …
2628/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2629/* 2591/*
2630 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2631 */ 2593 */
2632void 2594void
2633rxvt_term::paste (unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2634{ 2596{
2635 /* convert normal newline chars into common keyboard Return key sequence */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2636 for (unsigned int i = 0; i < len; i++) 2598 for (unsigned int i = 0; i < len; i++)
2637 if (data[i] == C0_LF) 2599 if (data[i] == C0_LF)
2638 data[i] = C0_CR; 2600 data[i] = C0_CR;
… …
2782 { 2744 {
2783 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2784 char *s = rxvt_wcstombs (w); 2746 char *s = rxvt_wcstombs (w);
2785 free (w); 2747 free (w);
2786 // TODO: strlen == only the first element will be converted. well... 2748 // TODO: strlen == only the first element will be converted. well...
2787 paste ((unsigned char *)s, strlen (s)); 2749 paste (s, strlen (s));
2788 free (s); 2750 free (s);
2789 } 2751 }
2790 else 2752 else
2791#endif 2753#endif
2792 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2793 && cl) 2755 && cl)
2794 { 2756 {
2795 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2796 paste ((unsigned char *)cl[i], strlen (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2797 2759
2798 XFreeStringList (cl); 2760 XFreeStringList (cl);
2799 } 2761 }
2800 else 2762 else
2801 paste (ct.value, ct.nitems); // paste raw 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2802 2764
2803bailout: 2765bailout:
2804 XFree (ct.value); 2766 XFree (ct.value);
2805 2767
2806 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
… …
2844 return; /* outside window */ 2806 return; /* outside window */
2845 2807
2846 if (selection.text) 2808 if (selection.text)
2847 { /* internal selection */ 2809 { /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2850 free (str); 2812 free (str);
2851 return; 2813 return;
2852 } 2814 }
2853 else 2815 else
2854 { 2816 {
… …
2946 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2947 2909
2948 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2949 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2950 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2951 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2952 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2953 2918
2954 int ofs = 0; 2919 int ofs = 0;
2955 int extra = 0; 2920 int extra = 0;
… …
2967 col = selection.beg.col; 2932 col = selection.beg.col;
2968 end_col = ncol + 1; 2933 end_col = ncol + 1;
2969 } 2934 }
2970 else 2935 else
2971#endif 2936#endif
2972 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2973 2938
2974 col = max (col, 0); 2939 col = max (col, 0);
2975 2940
2976 if (row == selection.end.row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2977 end_col = min (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2978 2947
2979 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2980 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2981 { 2951 {
2982 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2983 t++; 2953 t++;
2984#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
3000#endif 2970#endif
3001 else 2971 else
3002 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
3003 } 2973 }
3004 2974
2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
3005 if (!ROW(row).is_longer () && row != selection.end.row) 2987 if (!ROW(row).is_longer () && row != selection.end.row)
3006 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
3007 } 2989 }
3008 2990
3009 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
3010 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
3011 2993
… …
3021 3003
3022 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
3023 selection.len = ofs; 3005 selection.len = ofs;
3024 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3025 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
3026 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3027 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
3028 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
3029 else 3025 else
3030 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
3031 3030
3032#if 0 3031#if 0
3033 XTextProperty ct; 3032 XTextProperty ct;
3034 3033
3035 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3036 { 3035 {
3037 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3038 XFree (ct.value); 3037 XFree (ct.value);
3039 } 3038 }
3040#endif 3039#endif
3041
3042 selection_time = tm;
3043} 3040}
3044 3041
3045/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
3046/* 3043/*
3047 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3051rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3052{ 3049{
3053 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3054 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3055 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
3056 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3057 3063
3058 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3059 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3060 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
3061 0, /* button 3 */ 3067 0, /* button 3 */
3062 1, /* button press */ 3068 1, /* button press */
3063 0); /* click change */ 3069 0); /* click change */
3064} 3070}
3065 3071
… …
3070void 3076void
3071rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3072{ 3078{
3073 want_refresh = 1; 3079 want_refresh = 1;
3074 3080
3075 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
3076 selection.mark.col = col; 3082 selection.mark.col = col;
3077 3083
3078 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3079 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3080 3086
3081 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3082 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3083 --selection.mark.col; 3089 --selection.mark.col;
3084 3090
… …
3111 text_t *stp; 3117 text_t *stp;
3112 rend_t *srp; 3118 rend_t *srp;
3113 3119
3114 if (dirn == UP) 3120 if (dirn == UP)
3115 { 3121 {
3116 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3117 bound.col = 0; 3123 bound.col = 0;
3118 dirnadd = -1; 3124 dirnadd = -1;
3119 } 3125 }
3120 else 3126 else
3121 { 3127 {
… …
3169 } 3175 }
3170 } 3176 }
3171 break; 3177 break;
3172 } 3178 }
3173 3179
3174Old_Word_Selection_You_Die:
3175 if (dirn == DN) 3180 if (dirn == DN)
3176 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3177 3182
3178 /* Poke the values back in */ 3183 /* Poke the values back in */
3179 ret->row = row; 3184 ret->row = row;
… …
3189 * flag == 2 ==> button 3 motion 3194 * flag == 2 ==> button 3 motion
3190 */ 3195 */
3191void 3196void
3192rxvt_term::selection_extend (int x, int y, int flag) 3197rxvt_term::selection_extend (int x, int y, int flag)
3193{ 3198{
3194 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3199 int col = clamp (Pixel2Col (x), 0, ncol);
3195 int row = min (max (Pixel2Row (y), 0), ncol); 3200 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3196 3201
3197 /* 3202 /*
3198 * If we're selecting characters (single click) then we must check first 3203 * If we're selecting characters (single click) then we must check first
3199 * if we are at the same place as the original mark. If we are then 3204 * if we are at the same place as the original mark. If we are then
3200 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3201 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3202 */ 3207 */
3203 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3204 && (col == selection.mark.col 3209 && (col == selection.mark.col
3205 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3206 { 3211 {
3207 /* select nothing */ 3212 /* select nothing */
3208 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3209 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3210 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3265 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3266 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3267 } 3272 }
3268 3273
3269 pos.col = col; 3274 pos.col = col;
3270 pos.row = row - view_start; 3275 pos.row = view_start + row;
3271 3276
3272 /* 3277 /*
3273 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3274 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3275 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3362 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3363 } 3368 }
3364 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3365 { 3370 {
3366#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3367 if (options & Opt_tripleclickwords) 3372 if (OPTION (Opt_tripleclickwords))
3368 { 3373 {
3369 selection_delimit_word (UP, &selection.beg, &selection.beg); 3374 selection_delimit_word (UP, &selection.beg, &selection.beg);
3370 3375
3371 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3372 { 3377 {
3373 if (!ROW(end_row).is_longer ()) 3378 if (!ROW(end_row).is_longer ())
3374 { 3379 {
3375 selection.end.row = end_row; 3380 selection.end.row = end_row;
3376 selection.end.col = save[end_row + saveLines].l; 3381 selection.end.col = ROW(end_row).l;
3377 selection_remove_trailing_spaces (); 3382 selection_remove_trailing_spaces ();
3378 break; 3383 break;
3379 } 3384 }
3380 } 3385 }
3381 } 3386 }
… …
3413 } 3418 }
3414 } 3419 }
3415 3420
3416#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3417 if (selection.rect && selection.beg.col > selection.end.col) 3422 if (selection.rect && selection.beg.col > selection.end.col)
3418 SWAP_IT (selection.beg.col, selection.end.col, int); 3423 ::swap (selection.beg.col, selection.end.col);
3419#endif 3424#endif
3420} 3425}
3421 3426
3422#if ENABLE_FRILLS 3427#if ENABLE_FRILLS
3423void 3428void
… …
3433 { 3438 {
3434 stp = ROW(end_row).t; 3439 stp = ROW(end_row).t;
3435 3440
3436 while (--end_col >= 0) 3441 while (--end_col >= 0)
3437 { 3442 {
3438 if (stp[end_col] != ' ' 3443 if (stp[end_col] != NOCHAR
3439 && stp[end_col] != '\t' 3444 && !unicode::is_space (stp[end_col]))
3440 && stp[end_col] != NOCHAR)
3441 break; 3445 break;
3442 } 3446 }
3443 3447
3444 if (end_col >= 0 3448 if (end_col >= 0
3445 || !ROW(end_row - 1).is_longer ()) 3449 || !ROW(end_row - 1).is_longer ())
… …
3621 */ 3625 */
3622void 3626void
3623rxvt_term::pixel_position (int *x, int *y) 3627rxvt_term::pixel_position (int *x, int *y)
3624{ 3628{
3625 *x = Pixel2Col (*x); 3629 *x = Pixel2Col (*x);
3626 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3627 *y = Pixel2Row (*y); 3631 *y = Pixel2Row (*y);
3628 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3629} 3633}
3630 3634
3631/* ------------------------------------------------------------------------- */ 3635/* ------------------------------------------------------------------------- */
3632#ifdef USE_XIM 3636#ifdef USE_XIM
3633void 3637void
… …
3644 3648
3645#if ENABLE_OVERLAY 3649#if ENABLE_OVERLAY
3646void 3650void
3647rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3651rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3648{ 3652{
3649 if (nrow < 3 || ncol < 3) 3653 if (nrow < 1 || ncol < 1)
3650 return; 3654 return;
3651 3655
3652 want_refresh = 1; 3656 want_refresh = 1;
3653 3657
3654 scr_overlay_off (); 3658 scr_overlay_off ();
3655 3659
3656 if (x < 0) x = ncol - w; 3660 if (x < 0) x = ncol - w;
3657 if (y < 0) y = nrow - h; 3661 if (y < 0) y = nrow - h;
3658 3662
3659 // make space for border 3663 // make space for border
3660 w += 2; MIN_IT (w, ncol); 3664 w += 2; min_it (w, ncol);
3661 h += 2; MIN_IT (h, nrow); 3665 h += 2; min_it (h, nrow);
3662 3666
3663 x -= 1; MAX_IT (x, 0); 3667 x -= 1; clamp_it (x, 0, ncol - w);
3664 y -= 1; MAX_IT (y, 0); 3668 y -= 1; clamp_it (y, 0, nrow - h);
3665
3666 MIN_IT (x, ncol - w);
3667 MIN_IT (y, nrow - h);
3668 3669
3669 ov_x = x; ov_y = y; 3670 ov_x = x; ov_y = y;
3670 ov_w = w; ov_h = h; 3671 ov_w = w; ov_h = h;
3671 3672
3672 ov_text = new text_t *[h]; 3673 ov_text = new text_t *[h];
… …
3764 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3765 { 3766 {
3766 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3767 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3768 3769
3769 text_t *t2 = ROW(y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3770 rend_t *r2 = ROW(y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3771 3772
3772 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3773 { 3774 {
3774 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3775 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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