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.188 by root, Thu Dec 22 00:07:47 2005 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 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() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* 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 */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
188 194
189 if (!row_buf) 195 if (!row_buf)
190 { 196 {
191 /* 197 /*
192 * 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
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 199 */
195 nsaved = 0; /* no saved lines */ 200 nsaved = 0; /* no saved lines */
196 term_start = 0; 201 term_start = 0;
197 202
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 205
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 209
206 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
207 { 211 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
254 } 258 }
255 } 259 }
256#endif 260#endif
257 261
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 264
262 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
263 { 266 {
264 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
269 { 272 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 275 }
273 276
277 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 279
276 // re-wrap lines, this is rather ugly, possibly because I am too dumb
277 // to come up with a lean and mean algorithm.
278
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
282 283
283 while (p != pend && q > 0) 284 if (nsaved)
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
284 { 292 do
285 p = MOD (p - 1, prev_total_rows);
286#ifdef DEBUG_STRICT
287 assert (old_buf [MOD (p, prev_total_rows)].t);
288#endif
289
290 int llen = old_buf [MOD (p, prev_total_rows)].l;
291
292 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
293 { 293 {
294 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
295 300
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 {
303 p = MOD (p - 1, prev_total_rows);
304
305 plines++;
296 llen += prev_ncol; 306 llen += prev_ncol;
307 }
308
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
317 int lofs = 0;
318 line_t *qline;
319
320 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++)
322 {
323 qline = row_buf + qrow;
324 lalloc (*qline);
325 qline->l = ncol;
326 qline->is_longer (1);
327
328 int qcol = 0;
329
330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
332 {
333 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol;
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
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354
355 lofs += len;
356 qcol += len;
357 }
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);
297 } 363 }
364 while (p != pend && q > 0);
298 365
299 int qlines = max (0, (llen - 1) / ncol) + 1; 366 term_start = total_rows - nrow;
300 367 nsaved = term_start - q;
301 // drop partial lines completely 368
302 if (q < qlines) 369 // make sure all terminal lines exist
303 break; 370 while (nsaved < 0)
304 371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
305 q -= qlines; 372 }
306 373 else
307 int lofs = 0; 374 {
308 line_t *qline; 375 // if no scrollback exists (yet), wing, instead of wrap
309 376
310 // re-assemble the full line by destination lines 377 for (int row = min (nrow, prev_nrow); row--; )
311 for (int qrow = q; qlines--; qrow++)
312 { 378 {
313 qline = row_buf + qrow;
314 lalloc (*qline);
315 qline->set_is_longer ();
316
317 int qcol = 0;
318
319 // fill a single destination line
320 while (lofs < llen && qcol < ncol)
321 {
322 int prow = lofs / prev_ncol;
323 int pcol = lofs % prev_ncol;
324
325 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
326 381
327 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 382 qline = pline;
328 383 lresize (qline);
329 assert (len);
330 assert (pline.t);
331
332 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
333 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
334
335 lofs += len;
336 qcol += len;
337 }
338 } 384 }
339 385
340 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 386 for (int row = prev_nrow; row < nrow; row++)
341 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
342 } 389 }
343 390
344 term_start = total_rows - nrow;
345 view_start = 0; 391 term_start = 0;
346 nsaved = term_start - q; 392 }
347 393
348 // make sure all terminal lines exist 394#ifdef DEBUG_STRICT //TODO: remove
349 while (nsaved < 0)
350 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
351
352 for (int i = -nsaved; i < nrow; i++) 395 for (int i = -nsaved; i < nrow; i++)
353 assert (ROW (i).t);//D 396 assert (ROW (i).t);
397#endif
354 398
355 free (old_buf); 399 free (old_buf);
356 delete old_ta; 400 delete old_ta;
357 delete old_ra; 401 delete old_ra;
358 402
359 min_it (screen.cur.row, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
360 min_it (screen.cur.col, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
361 405
362 if (tabs) 406 if (tabs)
363 free (tabs); 407 free (tabs);
364 } 408 }
365 409
… …
370 414
371 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
372 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
373 417
374 tt_winch (); 418 tt_winch ();
419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
375} 421}
376 422
377/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
378/* 424/*
379 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
385 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
386 432
387 free (row_buf); 433 free (row_buf);
388 free (swap_buf); 434 free (swap_buf);
389 free (drawn_buf); 435 free (drawn_buf);
390 free (temp_buf);
391 free (tabs); 436 free (tabs);
392 437
393 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
394} 439}
395 440
… …
483 528
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486 531
487#if NSCREENS 532#if NSCREENS
488 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
489 { 534 {
490 num_scr = 0; 535 num_scr = 0;
491 536
492 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
… …
497 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
499 } 544 }
500 else 545 else
501#endif 546#endif
502 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504 549
505 return scrn; 550 return scrn;
506} 551}
507 552
… …
527 * Change the colour for following text 572 * Change the colour for following text
528 */ 573 */
529void 574void
530rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
531{ 576{
532 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
533 color = fgbg; 578 color = fgbg;
534 579
535 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
536 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
537 else 582 else
… …
568 want_refresh = 1; 613 want_refresh = 1;
569 num_scr += count; 614 num_scr += count;
570 615
571 if (count > 0 616 if (count > 0
572 && row1 == 0 617 && row1 == 0
573 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 619 {
576 nsaved = min (nsaved + count, saveLines); 620 nsaved = min (nsaved + count, saveLines);
621
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
623
624 // scroll everything up 'count' lines
577 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
578 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
579 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
580 { 661 {
581 selection.beg.row -= count; 662 selection.beg.row -= count;
582 selection.end.row -= count; 663 selection.end.row -= count;
583 selection.mark.row -= count; 664 selection.mark.row -= count;
584 665
585 selection_check (0); 666 if (selection.beg.row < -nsaved
667 || selection.end.row < -nsaved
668 || selection.mark.row < -nsaved)
669 {
670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR;
586 } 672 }
587
588 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle);
590 673 }
674
675 // finally move the view window, if desired
591 if ((options & Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
592 && view_start != 0 677 && view_start != 0
593 && view_start != saveLines) 678 && view_start != saveLines)
594 scr_page (UP, count); 679 scr_page (UP, count);
595 } 680 }
596 else 681 else
597 { 682 {
598 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
599 { 684 {
600 int i = selection.beg.row; 685 if ((selection.beg.row < row1 && selection.end.row > row1)
601 int j = selection.end.row; 686 || (selection.beg.row < row2 && selection.end.row > row2)
602
603 if ((i < row1 && j > row1)
604 || (i < row2 && j > row2)
605 || (i - count < row1 && i >= row1) 687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
606 || (i - count > row2 && i <= row2) 688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
607 || (j - count < row1 && j >= row1) 689 || (selection.end.row - count < row1 && selection.end.row >= row1)
608 || (j - count > row2 && j <= row2)) 690 || (selection.end.row - count > row2 && selection.end.row <= row2))
609 { 691 {
610 CLEAR_ALL_SELECTION (); 692 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 693 selection.op = SELECTION_CLEAR;
612 } 694 }
613 else if (j >= row1 && j <= row2) 695 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 696 {
615 /* move selected region too */ 697 /* move selected region too */
616 selection.beg.row -= count; 698 selection.beg.row -= count;
617 selection.end.row -= count; 699 selection.end.row -= count;
618 selection.mark.row -= count; 700 selection.mark.row -= count;
… …
626 708
627 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
628 710
629 min_it (count, rows); 711 min_it (count, rows);
630 712
713 line_t *temp_buf = row_buf + total_rows;
714
631 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
632 { 716 {
633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
634 718
635 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
646/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
647/* 731/*
648 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
649 */ 733 */
650void 734void
651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
652{ 736{
653 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
654 return; 738 return;
655 739
656 unsigned char checksel; 740 unsigned char checksel;
657 unicode_t c; 741 unicode_t c;
658 int row, last_col; 742 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
660 744
661 want_refresh = 1; 745 want_refresh = 1;
662 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 747
665 if (nlines > 0) 748 if (minlines > 0)
666 { 749 {
667 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
668 if (nlines > 0 752 if (minlines > 0
669 && screen.tscroll == 0 753 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
671 { 755 {
672 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
675 } 759 }
676 } 760 }
677 761
678#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= -nsaved);
682#endif 766#endif
683 row = screen.cur.row; 767 int row = screen.cur.row;
684 768
685 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
686 770
687 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
688 772
689 while (str < strend) 773 while (str < strend)
690 { 774 {
691 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
692 776
693 if (c < 0x20) 777 if (c < 0x20)
694 if (c == C0_LF) 778 if (c == C0_LF)
695 { 779 {
696 if (!line->is_longer ()) /* XXX: think about this */
697 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
698 781
699 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
700 783
701 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
702 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
706 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
707 continue; 790 continue;
708 } 791 }
709 else if (c == C0_CR) 792 else if (c == C0_CR)
710 { 793 {
711 if (!line->is_longer ()) /* XXX: think about this */
712 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
713 795
714 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
715 screen.cur.col = 0; 797 screen.cur.col = 0;
716 continue; 798 continue;
717 } 799 }
… …
734 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
735 } 817 }
736 818
737 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
738 { 820 {
821 max_it (line->l, ncol);
739 line->set_is_longer (); 822 line->is_longer (1);
740 823
741 scr_do_wrap (); 824 scr_do_wrap ();
742 825
743 row = screen.cur.row; 826 row = screen.cur.row;
744 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
752 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
753 // for the line drawing characters below as they might be invalid in the current 836 // for the line drawing characters below as they might be invalid in the current
754 // locale. 837 // locale.
755 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
756 839
757 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
758 { 841 {
759 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
760 // 5f-7e standard vt100 843 // 5f-7e standard vt100
761 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
762 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
814 } 897 }
815 898
816 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
817 900
818 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
819 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
820 { 903 {
821 // ...output spaces 904 // ...output spaces
822 c = ' '; 905 c = ' ';
823 // and try the same character next loop iteration 906 // and try the same character next loop iteration
824 --str; 907 --str;
825 } 908 }
826 909
910 line->touch ();
911
827 do 912 do
828 { 913 {
829 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
830 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
831 916
832 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
833 screen.cur.col++; 918 screen.cur.col++;
834 else 919 else
835 { 920 {
836 line->l = last_col; 921 line->l = ncol;
837 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
838 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
839 break; 924 break;
840 } 925 }
841 926
… …
843 } 928 }
844 while (--width > 0); 929 while (--width > 0);
845 930
846 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
847 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
848 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
849 { 937 {
850 line->t[c] = ' '; 938 line->t[c] = ' ';
851 line->r[c] = rend; 939 line->r[c] = rend;
852 } 940 }
941 }
853 } 942 }
854 else // width == 0 943 else // width == 0
855 { 944 {
856#if ENABLE_COMBINING 945#if ENABLE_COMBINING
857 // handle combining characters 946 // handle combining characters
858 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
859 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
860 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
861 text_t *tp; 951 text_t *tp;
862 rend_t *rp; 952 rend_t *rp;
863 953
864 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
865 { 955 {
956 linep = line;
866 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
867 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
868
869 while (*tp == NOCHAR && tp > line->t)
870 tp--, rp--;
871 } 959 }
872 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
873 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
874 { 962 {
875 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
876
877 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
878 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
879
880 while (*tp == NOCHAR && tp > line->t)
881 tp--, rp--;
882 } 966 }
883 else 967 else
884 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
885 974
886 // first try to find a precomposed character 975 // first try to find a precomposed character
887 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
888 if (n == NOCHAR) 977 if (n == NOCHAR)
889 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
892 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
893#endif 982#endif
894 } 983 }
895 } 984 }
896 985
897 if (!line->is_longer ()) /* XXX: think about this */
898 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
899 987
900#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
901 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
902#endif 990#endif
903} 991}
… …
945 1033
946 if (count == 0) 1034 if (count == 0)
947 return; 1035 return;
948 else if (count > 0) 1036 else if (count > 0)
949 { 1037 {
950 int row = screen.cur.row;
951
952 line_t &l = ROW(row); 1038 line_t &l = ROW(screen.cur.row);
953 rend_t base_rend = l.r[i]; 1039 rend_t base_rend = l.r[i];
954 ht &= l.t[i] == ' '; 1040 ht &= l.t[i] == ' ';
955 1041
956 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
957 if (tabs[i]) 1043 if (tabs[i])
958 { 1044 {
959 x = i; 1045 x = i;
1046
960 if (!--count) 1047 if (!--count)
961 break; 1048 break;
962 } 1049 }
963 else 1050 else
964 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
967 if (count) 1054 if (count)
968 x = ncol - 1; 1055 x = ncol - 1;
969 1056
970 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
971 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
972 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
973 { 1060 {
974 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
975 1062
976 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
977 max_it (l.l, x);
978 1064
979 i = screen.cur.col; 1065 i = screen.cur.col;
980 1066
981 l.t[i] = '\t'; 1067 l.t[i] = '\t';
982 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1032 */ 1118 */
1033#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1034void 1120void
1035rxvt_term::scr_forwardindex () 1121rxvt_term::scr_forwardindex ()
1036{ 1122{
1037 int row;
1038
1039 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1040 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1041 else 1125 else
1042 { 1126 {
1043 row = screen.cur.row; 1127 line_t &l = ROW(screen.cur.row);
1044 1128
1045 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1129 l.touch ();
1046 ROW(row).l = ncol; 1130 l.is_longer (0);
1047 1131
1048 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1049 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1050 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1051 } 1135 }
… …
1134 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1135 */ 1219 */
1136void 1220void
1137rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1138{ 1222{
1139 unsigned int row, col, num; 1223 unsigned int col, num;
1140 1224
1141 want_refresh = 1; 1225 want_refresh = 1;
1142 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1143 1227
1144 selection_check (1); 1228 selection_check (1);
1145 1229
1146 row = screen.cur.row; 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1147 1234
1148 switch (mode) 1235 switch (mode)
1149 { 1236 {
1150 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1151 col = screen.cur.col; 1238 col = screen.cur.col;
1152 num = ncol - col; 1239 num = ncol - col;
1153 min_it (ROW(row).l, col); 1240 min_it (line.l, col);
1154 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1155 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1156 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1157 break; 1244 break;
1158 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1163 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1164 break; 1251 break;
1165 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1166 col = 0; 1253 col = 0;
1167 num = ncol; 1254 num = ncol;
1168 ROW(row).l = 0; 1255 line.l = 0;
1169 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1170 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1171 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1172 break; 1259 break;
1173 default: 1260 default:
1174 return; 1261 return;
1175 } 1262 }
1176 1263
1177 scr_blank_line (ROW(row), col, num, rstyle); 1264 scr_blank_line (line, col, num, rstyle);
1178} 1265}
1179 1266
1180/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1181/* 1268/*
1182 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1237 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1238 } 1325 }
1239 else 1326 else
1240 { 1327 {
1241 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1242 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1243 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1244 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1245 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1246 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1247 } 1334 }
1248 1335
1249 for (; num--; row++) 1336 for (; num--; row++)
1250 { 1337 {
1251 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1252 ROW (row).l = 0;
1253 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1254 } 1340 }
1255} 1341}
1256 1342
1257#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1290 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1291 1377
1292 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1293 *r1++ = fs; 1379 *r1++ = fs;
1294 1380
1295 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1296 } 1383 }
1297} 1384}
1298 1385
1299/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1300/* 1387/*
… …
1348 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1349 1436
1350 row = screen.cur.row; 1437 row = screen.cur.row;
1351 1438
1352 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1353 1443
1354 switch (insdel) 1444 switch (insdel)
1355 { 1445 {
1356 case INSERT: 1446 case INSERT:
1357 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1358 { 1448 {
1359 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1360 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1361 } 1451 }
1362 1452
1363 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1364 {
1365 line->l += count;
1366 min_it (line->l, ncol);
1367 }
1368 1454
1369 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1370 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1371 { 1457 {
1372 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1385 1471
1386 case ERASE: 1472 case ERASE:
1387 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1388 selection_check (1); 1474 selection_check (1);
1389 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1390 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1391 break; 1479 break;
1392 1480
1393 case DELETE: 1481 case DELETE:
1394 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1397 { 1485 {
1398 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1399 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1400 } 1488 }
1401 1489
1490 line->l = max (line->l - count, 0);
1402 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1403
1404 if (line->is_longer ()) /* break line continuation */
1405 line->l = ncol;
1406
1407 line->l = max (line->l - count, 0);
1408 1492
1409 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1410 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1411 { 1495 {
1412 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1524rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1525{ 1609{
1526 if (mode < 0) 1610 if (mode < 0)
1527 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1528 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1529 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1530} 1614}
1531 1615
1532/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1533/* 1617/*
1534 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1546 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1547#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1548 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1549#endif 1633#endif
1550#if TRANSPARENT 1634#if TRANSPARENT
1551 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1552#endif 1636#endif
1553 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1554 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1555 1639
1556 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1581 * Set font style 1665 * Set font style
1582 */ 1666 */
1583void 1667void
1584rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1585{ 1669{
1670#if 0
1586 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1587 { 1672 {
1588 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1589 break; 1674 break;
1590 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1591 break; 1676 break;
… …
1598 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1599 break; 1684 break;
1600 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1601 break; 1686 break;
1602 } 1687 }
1688#endif
1603} 1689}
1604 1690
1605/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1606/* 1692/*
1607 * Choose a font 1693 * Choose a font
… …
1774int 1860int
1775rxvt_term::scr_changeview (unsigned int oldviewstart) 1861rxvt_term::scr_changeview (unsigned int oldviewstart)
1776{ 1862{
1777 if (view_start != oldviewstart) 1863 if (view_start != oldviewstart)
1778 { 1864 {
1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1866
1779 want_refresh = 1; 1867 want_refresh = 1;
1780 num_scr -= (view_start - oldviewstart); 1868 num_scr -= (view_start - oldviewstart);
1781 } 1869 }
1782 1870
1783 return (int) (view_start - oldviewstart); 1871 return (int)view_start - (int)oldviewstart;
1784} 1872}
1785 1873
1786/* ------------------------------------------------------------------------- */ 1874/* ------------------------------------------------------------------------- */
1787void 1875void
1788rxvt_term::scr_bell () 1876rxvt_term::scr_bell ()
1789{ 1877{
1790#ifndef NO_BELL 1878#ifndef NO_BELL
1791 1879
1792# ifndef NO_MAPALERT 1880# ifndef NO_MAPALERT
1793# ifdef MAPALERT_OPTION 1881# ifdef MAPALERT_OPTION
1794 if (options & Opt_mapAlert) 1882 if (OPTION (Opt_mapAlert))
1795# endif 1883# endif
1796 XMapWindow (display->display, parent[0]); 1884 XMapWindow (display->display, parent[0]);
1797# endif 1885# endif
1798 1886
1799 if (options & Opt_visualBell) 1887 if (OPTION (Opt_visualBell))
1800 { 1888 {
1801 scr_rvideo_mode (!rvideo); /* refresh also done */ 1889 scr_rvideo_mode (!rvideo); /* refresh also done */
1890 display->flush ();
1802 rxvt_usleep (VISUAL_BELL_DURATION); 1891 rxvt_usleep (VISUAL_BELL_DURATION);
1803 scr_rvideo_mode (!rvideo); /* refresh also done */ 1892 scr_rvideo_mode (!rvideo); /* refresh also done */
1804 } 1893 }
1805 else 1894 else
1806 XBell (display->display, 0); 1895 XBell (display->display, 0);
… …
1895 1984
1896#if XPM_BACKGROUND 1985#if XPM_BACKGROUND
1897 must_clear |= bgPixmap.pixmap != None; 1986 must_clear |= bgPixmap.pixmap != None;
1898#endif 1987#endif
1899#if TRANSPARENT 1988#if TRANSPARENT
1900 must_clear |= (options & Opt_transparent) && am_transparent; 1989 must_clear |= OPTION (Opt_transparent) && am_transparent;
1901#endif 1990#endif
1902 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1991 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1903 1992
1904 /* 1993 /*
1905 * B: reverse any characters which are selected 1994 * B: reverse any characters which are selected
… …
1929 2018
1930 crp = &ROW(screen.cur.row).r[col]; 2019 crp = &ROW(screen.cur.row).r[col];
1931 2020
1932 if (showcursor && focus) 2021 if (showcursor && focus)
1933 { 2022 {
1934 if (options & Opt_cursorUnderline) 2023 if (OPTION (Opt_cursorUnderline))
1935 *crp ^= RS_Uline; 2024 *crp ^= RS_Uline;
1936 else 2025 else
1937 { 2026 {
1938 *crp ^= RS_RVid; 2027 *crp ^= RS_RVid;
1939 2028
… …
1941 cc1 = *crp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
1942 if (ISSET_PIXCOLOR (Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
1943 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
1944 else 2033 else
1945#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1946 ccol1 = GET_FGCOLOR (rstyle); 2035 ccol1 = fgcolor_of (rstyle);
1947#else 2036#else
1948 ccol1 = Color_fg; 2037 ccol1 = Color_fg;
1949#endif 2038#endif
1950 if (ISSET_PIXCOLOR (Color_cursor2)) 2039 if (ISSET_PIXCOLOR (Color_cursor2))
1951 ccol2 = Color_cursor2; 2040 ccol2 = Color_cursor2;
1952 else 2041 else
1953#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1954 ccol2 = GET_BGCOLOR (rstyle); 2043 ccol2 = bgcolor_of (rstyle);
1955#else 2044#else
1956 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
1957#endif 2046#endif
1958 *crp = SET_FGCOLOR (*crp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
1959 *crp = SET_BGCOLOR (*crp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1992 oldcursor.col = screen.cur.col; 2081 oldcursor.col = screen.cur.col;
1993 } 2082 }
1994 } 2083 }
1995 } 2084 }
1996 2085
2086 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
1997#if ENABLE_OVERLAY 2087#if ENABLE_OVERLAY
1998 scr_swap_overlay (); 2088 scr_swap_overlay ();
1999#endif 2089#endif
2000 2090
2001#ifndef NO_SLOW_LINK_SUPPORT 2091#ifndef NO_SLOW_LINK_SUPPORT
… …
2051 if (wlen < len) 2141 if (wlen < len)
2052 ::swap (wlen, len); 2142 ::swap (wlen, len);
2053 2143
2054 XCopyArea (display->display, vt, vt, 2144 XCopyArea (display->display, vt, vt,
2055 gc, 0, Row2Pixel (len + i), 2145 gc, 0, Row2Pixel (len + i),
2056 (unsigned int)TermWin_TotalWidth (), 2146 (unsigned int)this->width,
2057 (unsigned int)Height2Pixel (wlen - len + 1), 2147 (unsigned int)Height2Pixel (wlen - len + 1),
2058 0, Row2Pixel (len)); 2148 0, Row2Pixel (len));
2059 len = -1; 2149 len = -1;
2060 } 2150 }
2061 } 2151 }
… …
2140 count++, i--; 2230 count++, i--;
2141 2231
2142 /* 2232 /*
2143 * Determine the attributes for the string 2233 * Determine the attributes for the string
2144 */ 2234 */
2145 int fore = GET_FGCOLOR (rend); // desired foreground 2235 int fore = fgcolor_of (rend); // desired foreground
2146 int back = GET_BGCOLOR (rend); // desired background 2236 int back = bgcolor_of (rend); // desired background
2147 2237
2148 // only do special processing if any attributes are set, which is rare 2238 // only do special processing if any attributes are set, which is unlikely
2149 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2239 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2150 { 2240 {
2151#if ENABLE_STYLES 2241#if ENABLE_STYLES
2152 // force redraw after "careful" characters to avoid pixel droppings 2242 // force redraw after "careful" characters to avoid pixel droppings
2153 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2264 } /* for (row....) */ 2354 } /* for (row....) */
2265 2355
2266#if ENABLE_OVERLAY 2356#if ENABLE_OVERLAY
2267 scr_swap_overlay (); 2357 scr_swap_overlay ();
2268#endif 2358#endif
2359 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2269 2360
2270 /* 2361 /*
2271 * G: cleanup cursor and display outline cursor if necessary 2362 * G: cleanup cursor and display outline cursor if necessary
2272 */ 2363 */
2273 if (showcursor) 2364 if (showcursor)
2274 { 2365 {
2275 if (focus) 2366 if (focus)
2276 { 2367 {
2277 if (options & Opt_cursorUnderline) 2368 if (OPTION (Opt_cursorUnderline))
2278 *crp ^= RS_Uline; 2369 *crp ^= RS_Uline;
2279 else 2370 else
2280 { 2371 {
2281 *crp ^= RS_RVid; 2372 *crp ^= RS_RVid;
2282#ifndef NO_CURSORCOLOR 2373#ifndef NO_CURSORCOLOR
… …
2312 /* 2403 /*
2313 * H: cleanup selection 2404 * H: cleanup selection
2314 */ 2405 */
2315 scr_reverse_selection (); 2406 scr_reverse_selection ();
2316 2407
2317 if (refresh_type & SMOOTH_REFRESH)
2318 XFlush (display->display);
2319
2320 num_scr = 0; 2408 num_scr = 0;
2321 num_scr_allow = 1; 2409 num_scr_allow = 1;
2322} 2410}
2323 2411
2324void 2412void
2325rxvt_term::scr_remap_chars (const line_t &l) 2413rxvt_term::scr_remap_chars (line_t &l)
2326{ 2414{
2327 if (!l.t) 2415 if (!l.t)
2328 return; 2416 return;
2417
2418 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2329 2419
2330 for (int i = ncol; i--; ) 2420 for (int i = ncol; i--; )
2331 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2332} 2422}
2333 2423
… …
2386 2476
2387 if (really) 2477 if (really)
2388 XClearWindow (display->display, vt); 2478 XClearWindow (display->display, vt);
2389} 2479}
2390 2480
2481void
2482rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2483{
2484 int view_end = -view_start + nrow;
2485 int row, col;
2486
2487 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2488 {
2489 text_t *stp = ROW(row).t;
2490 rend_t *srp = ROW(row).r;
2491
2492 for (col = beg_col; col < end_col; col++)
2493 srp[col] ^= rstyle1;
2494
2495 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2496 srp[col] ^= rstyle2;
2497
2498 if (++col < end_col)
2499 srp[col] ^= rstyle2;
2500 }
2501}
2502
2503void
2504rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2505{
2506 int view_end = -view_start + nrow;
2507 int row, col;
2508
2509 if (beg_row >= -view_start)
2510 {
2511 col = beg_col;
2512 row = beg_row;
2513 }
2514 else
2515 {
2516 col = 0;
2517 row = -view_start;
2518 }
2519
2520 for (; row < min (end_row, view_end); row++, col = 0)
2521 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2522 srp[col] ^= rstyle;
2523
2524 if (row == end_row)
2525 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2526 srp[col] ^= rstyle;
2527}
2528
2391/* ------------------------------------------------------------------------- */ 2529/* ------------------------------------------------------------------------- */
2392void 2530void
2393rxvt_term::scr_reverse_selection () 2531rxvt_term::scr_reverse_selection ()
2394{ 2532{
2395 if (selection.op 2533 if (selection.op
2396 && current_screen == selection.screen 2534 && current_screen == selection.screen
2397 && selection.end.row >= -view_start) 2535 && selection.end.row >= -view_start)
2398 { 2536 {
2399 int view_end = -view_start + nrow;
2400 int row, col;
2401
2402#if ENABLE_FRILLS 2537#if ENABLE_FRILLS
2403 if (selection.rect) 2538 if (selection.rect)
2404 { 2539 scr_xor_rect (selection.beg.row, selection.beg.col,
2405 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2540 selection.end.row, selection.end.col,
2406 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2541 RS_RVid, RS_RVid | RS_Uline);
2407 srp[col] ^= RS_RVid;
2408 }
2409 else 2542 else
2410#endif 2543#endif
2411 { 2544 scr_xor_span (selection.beg.row, selection.beg.col,
2412 if (selection.beg.row >= -view_start) 2545 selection.end.row, selection.end.col,
2413 { 2546 RS_RVid);
2414 col = selection.beg.col;
2415 row = selection.beg.row;
2416 }
2417 else
2418 {
2419 col = 0;
2420 row = view_start;
2421 }
2422
2423 for (; row < min (selection.end.row, view_end); row++, col = 0)
2424 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2425 srp[col] ^= RS_RVid;
2426
2427 if (row == selection.end.row)
2428 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2429 srp[col] ^= RS_RVid;
2430 }
2431 } 2547 }
2432} 2548}
2433 2549
2434/* ------------------------------------------------------------------------- */ 2550/* ------------------------------------------------------------------------- */
2435/* 2551/*
… …
2496/* ------------------------------------------------------------------------- */ 2612/* ------------------------------------------------------------------------- */
2497/* 2613/*
2498 * Paste a selection direct to the command fd 2614 * Paste a selection direct to the command fd
2499 */ 2615 */
2500void 2616void
2501rxvt_term::paste (unsigned char *data, unsigned int len) 2617rxvt_term::paste (char *data, unsigned int len)
2502{ 2618{
2503 /* convert normal newline chars into common keyboard Return key sequence */ 2619 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (unsigned int i = 0; i < len; i++) 2620 for (unsigned int i = 0; i < len; i++)
2505 if (data[i] == C0_LF) 2621 if (data[i] == C0_LF)
2506 data[i] = C0_CR; 2622 data[i] = C0_CR;
… …
2650 { 2766 {
2651 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2767 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2652 char *s = rxvt_wcstombs (w); 2768 char *s = rxvt_wcstombs (w);
2653 free (w); 2769 free (w);
2654 // TODO: strlen == only the first element will be converted. well... 2770 // TODO: strlen == only the first element will be converted. well...
2655 paste ((unsigned char *)s, strlen (s)); 2771 paste (s, strlen (s));
2656 free (s); 2772 free (s);
2657 } 2773 }
2658 else 2774 else
2659#endif 2775#endif
2660 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2776 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2661 && cl) 2777 && cl)
2662 { 2778 {
2663 for (int i = 0; i < cr; i++) 2779 for (int i = 0; i < cr; i++)
2664 paste ((unsigned char *)cl[i], strlen (cl[i])); 2780 paste (cl[i], strlen (cl[i]));
2665 2781
2666 XFreeStringList (cl); 2782 XFreeStringList (cl);
2667 } 2783 }
2668 else 2784 else
2669 paste (ct.value, ct.nitems); // paste raw 2785 paste ((char *)ct.value, ct.nitems); // paste raw
2670 2786
2671bailout: 2787bailout:
2672 XFree (ct.value); 2788 XFree (ct.value);
2673 2789
2674 if (selection_wait == Sel_normal) 2790 if (selection_wait == Sel_normal)
… …
2712 return; /* outside window */ 2828 return; /* outside window */
2713 2829
2714 if (selection.text) 2830 if (selection.text)
2715 { /* internal selection */ 2831 { /* internal selection */
2716 char *str = rxvt_wcstombs (selection.text, selection.len); 2832 char *str = rxvt_wcstombs (selection.text, selection.len);
2717 paste ((unsigned char *)str, strlen (str)); 2833 paste (str, strlen (str));
2718 free (str); 2834 free (str);
2719 return; 2835 return;
2720 } 2836 }
2721 else 2837 else
2722 { 2838 {
… …
2814 selection.op = SELECTION_DONE; 2930 selection.op = SELECTION_DONE;
2815 2931
2816 if (selection.clicks == 4) 2932 if (selection.clicks == 4)
2817 return; /* nothing selected, go away */ 2933 return; /* nothing selected, go away */
2818 2934
2935 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2936 return;
2937
2819 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2938 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2820 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2939 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2821 2940
2822 int ofs = 0; 2941 int ofs = 0;
2823 int extra = 0; 2942 int extra = 0;
… …
2835 col = selection.beg.col; 2954 col = selection.beg.col;
2836 end_col = ncol + 1; 2955 end_col = ncol + 1;
2837 } 2956 }
2838 else 2957 else
2839#endif 2958#endif
2840 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2959 end_col = ROW(row).l;
2841 2960
2842 col = max (col, 0); 2961 col = max (col, 0);
2843 2962
2844 if (row == selection.end.row || selection.rect) 2963 if (row == selection.end.row
2964#if ENABLE_FRILLS
2965 || selection.rect
2966#endif
2967 )
2845 end_col = min (end_col, selection.end.col); 2968 min_it (end_col, selection.end.col);
2846 2969
2847 t = ROW(row).t + col; 2970 t = ROW(row).t + col;
2971
2848 for (; col < end_col; col++) 2972 for (; col < end_col; col++)
2849 { 2973 {
2850 if (*t == NOCHAR) 2974 if (*t == NOCHAR)
2851 t++; 2975 t++;
2852#if ENABLE_COMBINING 2976#if ENABLE_COMBINING
… …
2868#endif 2992#endif
2869 else 2993 else
2870 new_selection_text[ofs++] = *t++; 2994 new_selection_text[ofs++] = *t++;
2871 } 2995 }
2872 2996
2997#if ENABLE_FRILLS
2998 if (selection.rect)
2999 {
3000 while (ofs
3001 && new_selection_text[ofs - 1] != C0_LF
3002 && unicode::is_space (new_selection_text[ofs - 1]))
3003 --ofs;
3004
3005 new_selection_text[ofs++] = C0_LF;
3006 }
3007 else
3008#endif
2873 if (!ROW(row).is_longer () && row != selection.end.row) 3009 if (!ROW(row).is_longer () && row != selection.end.row)
2874 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
2875 } 3011 }
2876 3012
2877 if (end_col != selection.end.col) 3013 if (end_col != selection.end.col)
2878 new_selection_text[ofs++] = C0_LF; 3014 new_selection_text[ofs++] = C0_LF;
2879 3015
… …
2889 3025
2890 // we usually allocate much more than necessary, so realloc it smaller again 3026 // we usually allocate much more than necessary, so realloc it smaller again
2891 selection.len = ofs; 3027 selection.len = ofs;
2892 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3028 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2893 3029
3030 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3031 return;
3032
3033 selection_grab (tm);
3034}
3035
3036bool
3037rxvt_term::selection_grab (Time tm)
3038{
3039 selection_time = tm;
3040
2894 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3041 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2895 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3042 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3043 {
2896 display->set_selection_owner (this); 3044 display->set_selection_owner (this);
3045 return true;
3046 }
2897 else 3047 else
2898 rxvt_warn ("can't get primary selection, ignoring.\n"); 3048 {
3049 selection_clear ();
3050 return false;
3051 }
2899 3052
2900#if 0 3053#if 0
2901 XTextProperty ct; 3054 XTextProperty ct;
2902 3055
2903 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3056 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2904 { 3057 {
2905 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3058 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2906 XFree (ct.value); 3059 XFree (ct.value);
2907 } 3060 }
2908#endif 3061#endif
2909
2910 selection_time = tm;
2911} 3062}
2912 3063
2913/* ------------------------------------------------------------------------- */ 3064/* ------------------------------------------------------------------------- */
2914/* 3065/*
2915 * Mark or select text based upon number of clicks: 1, 2, or 3 3066 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2918void 3069void
2919rxvt_term::selection_click (int clicks, int x, int y) 3070rxvt_term::selection_click (int clicks, int x, int y)
2920{ 3071{
2921 clicks = ((clicks - 1) % 3) + 1; 3072 clicks = ((clicks - 1) % 3) + 1;
2922 selection.clicks = clicks; /* save clicks so extend will work */ 3073 selection.clicks = clicks; /* save clicks so extend will work */
3074
3075 if (clicks == 2 && !selection.rect
3076 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3077 {
3078 MEvent.clicks = 1; // what a mess
3079 selection.screen = current_screen;
3080 selection.op = SELECTION_CONT;
3081 return;
3082 }
2923 3083
2924 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2925 3085
2926 if (clicks == 2 || clicks == 3) 3086 if (clicks == 2 || clicks == 3)
2927 selection_extend_colrow (selection.mark.col, 3087 selection_extend_colrow (selection.mark.col,
… …
3037 } 3197 }
3038 } 3198 }
3039 break; 3199 break;
3040 } 3200 }
3041 3201
3042Old_Word_Selection_You_Die:
3043 if (dirn == DN) 3202 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3203 col++; /* put us on one past the end */
3045 3204
3046 /* Poke the values back in */ 3205 /* Poke the values back in */
3047 ret->row = row; 3206 ret->row = row;
… …
3230 selection_delimit_word (DN, &selection.end, &selection.end); 3389 selection_delimit_word (DN, &selection.end, &selection.end);
3231 } 3390 }
3232 else if (selection.clicks == 3) 3391 else if (selection.clicks == 3)
3233 { 3392 {
3234#if ENABLE_FRILLS 3393#if ENABLE_FRILLS
3235 if (options & Opt_tripleclickwords) 3394 if (OPTION (Opt_tripleclickwords))
3236 { 3395 {
3237 selection_delimit_word (UP, &selection.beg, &selection.beg); 3396 selection_delimit_word (UP, &selection.beg, &selection.beg);
3238 3397
3239 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3398 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3240 { 3399 {
… …
3301 { 3460 {
3302 stp = ROW(end_row).t; 3461 stp = ROW(end_row).t;
3303 3462
3304 while (--end_col >= 0) 3463 while (--end_col >= 0)
3305 { 3464 {
3306 if (stp[end_col] != ' ' 3465 if (stp[end_col] != NOCHAR
3307 && stp[end_col] != '\t' 3466 && !unicode::is_space (stp[end_col]))
3308 && stp[end_col] != NOCHAR)
3309 break; 3467 break;
3310 } 3468 }
3311 3469
3312 if (end_col >= 0 3470 if (end_col >= 0
3313 || !ROW(end_row - 1).is_longer ()) 3471 || !ROW(end_row - 1).is_longer ())
… …
3512 3670
3513#if ENABLE_OVERLAY 3671#if ENABLE_OVERLAY
3514void 3672void
3515rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3673rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3516{ 3674{
3517 if (nrow < 3 || ncol < 3) 3675 if (nrow < 1 || ncol < 1)
3518 return; 3676 return;
3519 3677
3520 want_refresh = 1; 3678 want_refresh = 1;
3521 3679
3522 scr_overlay_off (); 3680 scr_overlay_off ();
… …
3629 for (int y = ov_h; y--; ) 3787 for (int y = ov_h; y--; )
3630 { 3788 {
3631 text_t *t1 = ov_text[y]; 3789 text_t *t1 = ov_text[y];
3632 rend_t *r1 = ov_rend[y]; 3790 rend_t *r1 = ov_rend[y];
3633 3791
3634 text_t *t2 = ROW(y - view_start).t + ov_x; 3792 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3635 rend_t *r2 = ROW(y - view_start).r + ov_x; 3793 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3636 3794
3637 for (int x = ov_w; x--; ) 3795 for (int x = ov_w; x--; )
3638 { 3796 {
3639 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3797 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3640 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3798 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