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.206 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 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.
… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_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
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch ();
130
129 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131 133
132 text_t *et = l.t + col; 134 text_t *et = l.t + col;
133 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
140} 142}
141 143
142/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
143/* 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 */
144void 146void
145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
146{ 148{
147 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
148} 153}
149 154
150/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
151 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
152 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
174 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
175 { 180 {
176 //TODO//FIXME 181 //TODO//FIXME
177 saveLines++; 182 saveLines++;
178 prev_nrow--; 183 prev_nrow--;
179 nsaved++; 184 top_row--;
180 } 185 }
181 186
182 want_refresh = 1; 187 want_refresh = 1;
183 188
184 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
189 194
190 if (!row_buf) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * 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
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 199 */
196 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
197 term_start = 0; 201 term_start = 0;
198 202
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 205
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 209
207 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
208 { 211 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
236 CLEAR_ALL_SELECTION (); 239 CLEAR_ALL_SELECTION ();
237 rvideo = 0; 240 rvideo = 0;
238 } 241 }
239 else 242 else
240 { 243 {
244 CLEAR_ALL_SELECTION ();
245
241 /* 246 /*
242 * add or delete rows as appropriate 247 * add or delete rows as appropriate
243 */ 248 */
244 249
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
… …
255 } 260 }
256 } 261 }
257#endif 262#endif
258 263
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 266
263 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
264 { 268 {
265 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
270 { 274 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 } 277 }
274 278
279 line_t *old_buf = row_buf;
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 281
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
280 285
281 if (nsaved) 286 if (top_row)
282 { 287 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
285 290
286 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
… …
290 { 295 {
291 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 299#endif
295
296 int plines = 1; 300 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 302
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 304 {
… …
318 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
320 { 324 {
321 qline = row_buf + qrow; 325 qline = row_buf + qrow;
322 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
323 qline->set_is_longer (); 328 qline->is_longer (1);
324 329
325 int qcol = 0; 330 int qcol = 0;
326 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
327 // fill a single destination line 336 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
329 { 338 {
330 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
331 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
353 qcol += len; 362 qcol += len;
354 } 363 }
355 } 364 }
356 365
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 366 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 367 qline->is_longer (0);
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 368 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 369 }
367 while (p != pend && q > 0); 370 while (p != pend && q > 0);
368 371
369 term_start = total_rows - nrow; 372 term_start = total_rows - nrow;
370 nsaved = term_start - q; 373 top_row = q - term_start;
371 374
372 // make sure all terminal lines exist 375 // make sure all terminal lines exist
373 while (nsaved < 0) 376 while (top_row > 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 377 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375
376 } 378 }
377 else 379 else
378 { 380 {
379 // if no scrollback exists (yet), wing, instead of wrap 381 // if no scrollback exists (yet), wing, instead of wrap
380 382
… …
393 } 395 }
394 396
395 term_start = 0; 397 term_start = 0;
396 } 398 }
397 399
398#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++)
400 assert (ROW (i).t);
401#endif
402
403 free (old_buf); 400 free (old_buf);
404 delete old_ta; 401 delete old_ta;
405 delete old_ra; 402 delete old_ra;
406 403
407 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
… …
419 for (int col = ncol; col--; ) 416 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0; 417 tabs [col] = col % TABSIZE == 0;
421 418
422 tt_winch (); 419 tt_winch ();
423 420
424 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 421 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425} 422}
426 423
427/* ------------------------------------------------------------------------- */ 424/* ------------------------------------------------------------------------- */
428/* 425/*
429 * Free everything. That way malloc debugging can find leakage. 426 * Free everything. That way malloc debugging can find leakage.
… …
435 delete ralloc; ralloc = 0; 432 delete ralloc; ralloc = 0;
436 433
437 free (row_buf); 434 free (row_buf);
438 free (swap_buf); 435 free (swap_buf);
439 free (drawn_buf); 436 free (drawn_buf);
440 free (temp_buf);
441 free (tabs); 437 free (tabs);
442 438
443 row_buf = 0; // signal that we freed all the arrays 439 row_buf = 0; // signal that we freed all the arrays
444} 440}
445 441
… …
453 scr_release (); 449 scr_release ();
454 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
455 scr_reset (); 451 scr_reset ();
456 452
457 scr_clear (true); 453 scr_clear (true);
458 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
459} 455}
460 456
461/* ------------------------------------------------------------------------- * 457/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 458 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 459 * ------------------------------------------------------------------------- */
… …
577 * Change the colour for following text 573 * Change the colour for following text
578 */ 574 */
579void 575void
580rxvt_term::scr_color (unsigned int color, int fgbg) 576rxvt_term::scr_color (unsigned int color, int fgbg)
581{ 577{
582 if (color > maxTermCOLOR) 578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
583 color = fgbg; 579 color = fgbg;
584 580
585 if (fgbg == Color_fg) 581 if (fgbg == Color_fg)
586 rstyle = SET_FGCOLOR (rstyle, color); 582 rstyle = SET_FGCOLOR (rstyle, color);
587 else 583 else
… …
618 want_refresh = 1; 614 want_refresh = 1;
619 num_scr += count; 615 num_scr += count;
620 616
621 if (count > 0 617 if (count > 0
622 && row1 == 0 618 && row1 == 0
623 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 620 {
626 nsaved = min (nsaved + count, saveLines); 621 top_row = max (top_row - count, -saveLines);
627 622
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 623 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows;
625
626 // sever bottommost line
627 {
628 line_t &l = ROW(row2 - count);
629 l.is_longer (0);
630 l.touch ();
631 }
632
633 // erase newly scrolled-in lines
634 for (int i = count; i--; )
635 {
636 // basically this is a slightly optimized scr_blank_screen_mem
637 // it is worth the effort on slower machines
638 line_t &l = ROW(nrow - 1 - i);
639
640 scr_blank_line (l, 0, l.l, rstyle);
641
642 l.l = 0;
643 l.f = 0;
644 }
645
646 // now copy lines below the scroll region bottom to the
647 // bottom of the screen again, so they look as if they
648 // hadn't moved.
649 for (int i = nrow; --i > row2; )
650 {
651 line_t &l1 = ROW(i - count);
652 line_t &l2 = ROW(i);
653
654 ::swap (l1, l2);
655 l2.touch ();
656 }
629 657
630 term_start = (term_start + count) % total_rows; 658 // move and/or clear selection, if any
631
632 if (selection.op && current_screen == selection.screen) 659 if (selection.op && current_screen == selection.screen)
633 { 660 {
634 selection.beg.row -= count; 661 selection.beg.row -= count;
635 selection.end.row -= count; 662 selection.end.row -= count;
636 selection.mark.row -= count; 663 selection.mark.row -= count;
637 664
638 if (selection.beg.row < -nsaved 665 if (selection.beg.row < top_row
639 || selection.end.row < -nsaved 666 || selection.end.row < top_row
640 || selection.mark.row < -nsaved) 667 || selection.mark.row < top_row)
641 { 668 {
642 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR; 670 selection.op = SELECTION_CLEAR;
644 } 671 }
645 } 672 }
646 673
647 for (int i = count; i--; ) 674 // finally move the view window, if desired
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652
653 if (OPTION (Opt_scrollWithBuffer) 675 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 676 && view_start != 0
655 && view_start != saveLines) 677 && view_start != -saveLines)
656 scr_page (UP, count); 678 scr_page (UP, count);
679
680 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
681 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
657 } 682 }
658 else 683 else
659 { 684 {
660 if (selection.op && current_screen == selection.screen) 685 if (selection.op && current_screen == selection.screen)
661 { 686 {
… …
685 710
686 int rows = row2 - row1 + 1; 711 int rows = row2 - row1 + 1;
687 712
688 min_it (count, rows); 713 min_it (count, rows);
689 714
715 line_t *temp_buf = row_buf + total_rows;
716
690 for (int row = 0; row < rows; row++) 717 for (int row = 0; row < rows; row++)
691 { 718 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 719 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693 720
694 if (!IN_RANGE_EXC (row + count, 0, rows)) 721 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
705/* ------------------------------------------------------------------------- */ 732/* ------------------------------------------------------------------------- */
706/* 733/*
707 * Add text given in <str> of length <len> to screen struct 734 * Add text given in <str> of length <len> to screen struct
708 */ 735 */
709void 736void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
711{ 738{
712 if (len <= 0) /* sanity */ 739 if (len <= 0) /* sanity */
713 return; 740 return;
714 741
715 unsigned char checksel; 742 unsigned char checksel;
716 unicode_t c; 743 unicode_t c;
717 int last_col; 744 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 745 const wchar_t *strend = str + len;
719 746
720 want_refresh = 1; 747 want_refresh = 1;
721 ZERO_SCROLLBACK (); 748 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 749
724 if (nlines > 0) 750 if (minlines > 0)
725 { 751 {
726 nlines += screen.cur.row - screen.bscroll; 752 minlines += screen.cur.row - screen.bscroll;
753
727 if (nlines > 0 754 if (minlines > 0
728 && screen.tscroll == 0 755 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 756 && screen.bscroll == nrow - 1)
730 { 757 {
731 /* _at least_ this many lines need to be scrolled */ 758 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 759 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 760 screen.cur.row -= minlines;
734 } 761 }
735 } 762 }
736 763
737#ifdef DEBUG_STRICT 764#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 765 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 766 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 767 && screen.cur.row >= top_row);
741#endif 768#endif
742 int row = screen.cur.row; 769 int row = screen.cur.row;
743 770
744 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 771 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
745 772
746 line_t *line = &ROW(row); 773 line_t *line = &ROW(row);
747 774
748 while (str < strend) 775 while (str < strend)
749 { 776 {
750 c = *str++; 777 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 778
752 if (c < 0x20) 779 if (c < 0x20)
753 if (c == C0_LF) 780 if (c == C0_LF)
754 { 781 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 782 max_it (line->l, screen.cur.col);
757 783
758 screen.flags &= ~Screen_WrapNext; 784 screen.flags &= ~Screen_WrapNext;
759 785
760 if (screen.cur.row == screen.bscroll) 786 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 787 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 791 line = &ROW(row); /* _must_ refresh */
766 continue; 792 continue;
767 } 793 }
768 else if (c == C0_CR) 794 else if (c == C0_CR)
769 { 795 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 796 max_it (line->l, screen.cur.col);
772 797
773 screen.flags &= ~Screen_WrapNext; 798 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 799 screen.cur.col = 0;
775 continue; 800 continue;
776 } 801 }
… …
793 CLEAR_SELECTION (); 818 CLEAR_SELECTION ();
794 } 819 }
795 820
796 if (screen.flags & Screen_WrapNext) 821 if (screen.flags & Screen_WrapNext)
797 { 822 {
798 line->set_is_longer ();
799
800 scr_do_wrap (); 823 scr_do_wrap ();
801 824
825 line->l = ncol;
826 line->is_longer (1);
827
802 row = screen.cur.row; 828 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 829 line = &ROW(row); /* _must_ refresh */
804 } 830 }
805 831
806 // some utf-8 decoders "decode" surrogate characters: let's fix this. 832 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
811 // do wcwidth before further replacements, as wcwidth might return -1 837 // do wcwidth before further replacements, as wcwidth might return -1
812 // for the line drawing characters below as they might be invalid in the current 838 // for the line drawing characters below as they might be invalid in the current
813 // locale. 839 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 840 int width = c < 0x100 ? 1 : wcwidth (c);
815 841
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 842 if (charsets [screen.charset] == '0') // DEC SPECIAL
817 { 843 {
818 // vt100 special graphics and line drawing 844 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 845 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 846 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 847 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 } 899 }
874 900
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 901 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876 902
877 // if the character doesn't fit into the remaining columns... 903 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width) 904 if (screen.cur.col > ncol - width && ncol >= width)
879 { 905 {
880 // ...output spaces 906 // ...output spaces
881 c = ' '; 907 c = ' ';
882 // and try the same character next loop iteration 908 // and try the same character next loop iteration
883 --str; 909 --str;
884 } 910 }
885 911
912 line->touch ();
913
886 do 914 do
887 { 915 {
888 line->t[screen.cur.col] = c; 916 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 917 line->r[screen.cur.col] = rend;
890 918
891 if (screen.cur.col < last_col - 1) 919 if (screen.cur.col < ncol - 1)
892 screen.cur.col++; 920 screen.cur.col++;
893 else 921 else
894 { 922 {
895 line->l = last_col; 923 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 924 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 925 screen.flags |= Screen_WrapNext;
898 break; 926 break;
899 } 927 }
900 928
… …
902 } 930 }
903 while (--width > 0); 931 while (--width > 0);
904 932
905 // pad with spaces when overwriting wide character with smaller one 933 // pad with spaces when overwriting wide character with smaller one
906 if (!width) 934 if (!width)
935 {
936 line->touch ();
937
907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 938 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
908 { 939 {
909 line->t[c] = ' '; 940 line->t[c] = ' ';
910 line->r[c] = rend; 941 line->r[c] = rend;
911 } 942 }
943 }
912 } 944 }
913 else // width == 0 945 else // width == 0
914 { 946 {
915#if ENABLE_COMBINING 947#if ENABLE_COMBINING
916 // handle combining characters 948 // handle combining characters
917 // we just tag the accent on the previous on-screen character. 949 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong. 950 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet. 951 // we don't handle double-width characters nicely yet.
952 line_t *linep;
920 text_t *tp; 953 text_t *tp;
921 rend_t *rp; 954 rend_t *rp;
922 955
923 if (screen.cur.col > 0) 956 if (screen.cur.col > 0)
924 { 957 {
958 linep = line;
925 tp = line->t + screen.cur.col - 1; 959 tp = line->t + screen.cur.col - 1;
926 rp = line->r + screen.cur.col - 1; 960 rp = line->r + screen.cur.col - 1;
927
928 while (*tp == NOCHAR && tp > line->t)
929 tp--, rp--;
930 } 961 }
931 else if (screen.cur.row > 0 962 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ()) 963 && ROW(screen.cur.row - 1).is_longer ())
933 { 964 {
934 line_t *line = &ROW(screen.cur.row - 1); 965 linep = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1; 966 tp = line->t + ncol - 1;
937 rp = line->r + last_col - 1; 967 rp = line->r + ncol - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 968 }
942 else 969 else
943 continue; 970 continue;
971
972 linep->touch ();
973
974 while (*tp == NOCHAR && tp > linep->t)
975 tp--, rp--;
944 976
945 // first try to find a precomposed character 977 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c); 978 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR) 979 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c); 980 n = rxvt_composite.compose (*tp, c);
… …
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 983 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 984#endif
953 } 985 }
954 } 986 }
955 987
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 988 max_it (line->l, screen.cur.col);
958 989
959#ifdef DEBUG_STRICT 990#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 991 assert (screen.cur.row >= 0);
961#endif 992#endif
962} 993}
… …
1012 1043
1013 for (; ++i < ncol; ) 1044 for (; ++i < ncol; )
1014 if (tabs[i]) 1045 if (tabs[i])
1015 { 1046 {
1016 x = i; 1047 x = i;
1048
1017 if (!--count) 1049 if (!--count)
1018 break; 1050 break;
1019 } 1051 }
1020 else 1052 else
1021 ht &= l.t[i] == ' ' 1053 ht &= l.t[i] == ' '
… …
1028 // buffer so they can be selected and pasted. 1060 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1061 if (ht && OPTION (Opt_pastableTabs))
1030 { 1062 {
1031 base_rend = SET_FONT (base_rend, 0); 1063 base_rend = SET_FONT (base_rend, 0);
1032 1064
1033 if (!l.is_longer ()) /* XXX: think about this */ 1065 l.touch (x);
1034 max_it (l.l, x);
1035 1066
1036 i = screen.cur.col; 1067 i = screen.cur.col;
1037 1068
1038 l.t[i] = '\t'; 1069 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1070 l.r[i] = base_rend;
… …
1093{ 1124{
1094 if (screen.cur.col < ncol - 1) 1125 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1127 else
1097 { 1128 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1129 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1130
1131 l.touch ();
1132 l.is_longer (0);
1100 1133
1101 scr_gotorc (0, 0, R_RELATIVE); 1134 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1135 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1136 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1137 }
… …
1195 ZERO_SCROLLBACK (); 1228 ZERO_SCROLLBACK ();
1196 1229
1197 selection_check (1); 1230 selection_check (1);
1198 1231
1199 line_t &line = ROW(screen.cur.row); 1232 line_t &line = ROW(screen.cur.row);
1233
1234 line.touch ();
1235 line.is_longer (0);
1200 1236
1201 switch (mode) 1237 switch (mode)
1202 { 1238 {
1203 case 0: /* erase to end of line */ 1239 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1240 col = screen.cur.col;
… …
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1335 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1300 } 1336 }
1301 1337
1302 for (; num--; row++) 1338 for (; num--; row++)
1303 { 1339 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1340 scr_blank_screen_mem (ROW(row), rstyle);
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1341 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1307 } 1342 }
1308} 1343}
1309 1344
1310#if ENABLE_FRILLS 1345#if ENABLE_FRILLS
… …
1312rxvt_term::scr_erase_savelines () 1347rxvt_term::scr_erase_savelines ()
1313{ 1348{
1314 want_refresh = 1; 1349 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1350 ZERO_SCROLLBACK ();
1316 1351
1317 nsaved = 0; 1352 top_row = 0;
1318} 1353}
1319#endif 1354#endif
1320 1355
1321/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1322/* 1357/*
… …
1343 rend_t *r1 = line.r; 1378 rend_t *r1 = line.r;
1344 1379
1345 for (int j = ncol; j--; ) 1380 for (int j = ncol; j--; )
1346 *r1++ = fs; 1381 *r1++ = fs;
1347 1382
1348 line.l = ncol; /* make the `E's selectable */ 1383 line.is_longer (0);
1384 line.touch (ncol);
1349 } 1385 }
1350} 1386}
1351 1387
1352/* ------------------------------------------------------------------------- */ 1388/* ------------------------------------------------------------------------- */
1353/* 1389/*
… …
1401 min_it (count, ncol - screen.cur.col); 1437 min_it (count, ncol - screen.cur.col);
1402 1438
1403 row = screen.cur.row; 1439 row = screen.cur.row;
1404 1440
1405 line_t *line = &ROW(row); 1441 line_t *line = &ROW(row);
1442
1443 line->touch ();
1444 line->is_longer (0);
1406 1445
1407 switch (insdel) 1446 switch (insdel)
1408 { 1447 {
1409 case INSERT: 1448 case INSERT:
1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1449 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411 { 1450 {
1412 line->t[col] = line->t[col - count]; 1451 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1452 line->r[col] = line->r[col - count];
1414 } 1453 }
1415 1454
1416 if (!line->is_longer ()) 1455 line->l = min (line->l + count, ncol);
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 }
1421 1456
1422 if (selection.op && current_screen == selection.screen 1457 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1458 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1459 {
1425 if (selection.end.row != screen.cur.row 1460 if (selection.end.row != screen.cur.row
… …
1438 1473
1439 case ERASE: 1474 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1475 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1476 selection_check (1);
1442 screen.cur.col -= count; 1477 screen.cur.col -= count;
1478
1479 line->l = max (line->l - count, 0);
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1480 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1481 break;
1445 1482
1446 case DELETE: 1483 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1484 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1450 { 1487 {
1451 line->t[col] = line->t[col + count]; 1488 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1489 line->r[col] = line->r[col + count];
1453 } 1490 }
1454 1491
1492 line->l = max (line->l - count, 0);
1455 scr_blank_line (*line, ncol - count, count, tr); 1493 scr_blank_line (*line, ncol - count, count, tr);
1456
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1494
1462 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1497 {
1465 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
… …
1577rxvt_term::scr_set_tab (int mode) 1610rxvt_term::scr_set_tab (int mode)
1578{ 1611{
1579 if (mode < 0) 1612 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1613 memset (tabs, 0, ncol * sizeof (char));
1581 else if (screen.cur.col < ncol) 1614 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1615 tabs [screen.cur.col] = !!mode;
1583} 1616}
1584 1617
1585/* ------------------------------------------------------------------------- */ 1618/* ------------------------------------------------------------------------- */
1586/* 1619/*
1587 * Set reverse/normal video 1620 * Set reverse/normal video
… …
1634 * Set font style 1667 * Set font style
1635 */ 1668 */
1636void 1669void
1637rxvt_term::set_font_style () 1670rxvt_term::set_font_style ()
1638{ 1671{
1672#if 0
1639 switch (charsets[screen.charset]) 1673 switch (charsets [screen.charset])
1640 { 1674 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1675 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1676 break;
1643 case 'A': /* United Kingdom (UK) */ 1677 case 'A': /* United Kingdom (UK) */
1644 break; 1678 break;
… …
1651 case 'C': /* Finnish character set */ 1685 case 'C': /* Finnish character set */
1652 break; 1686 break;
1653 case 'K': /* German character set */ 1687 case 'K': /* German character set */
1654 break; 1688 break;
1655 } 1689 }
1690#endif
1656} 1691}
1657 1692
1658/* ------------------------------------------------------------------------- */ 1693/* ------------------------------------------------------------------------- */
1659/* 1694/*
1660 * Choose a font 1695 * Choose a font
… …
1756 } 1791 }
1757 1792
1758 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1793 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1794 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1760 1795
1796 num_scr_allow = 0;
1797
1761 if (refresh) 1798 if (refresh)
1762 scr_refresh (SLOW_REFRESH); 1799 scr_refresh ();
1763} 1800}
1764 1801
1765/* ------------------------------------------------------------------------- */ 1802/* ------------------------------------------------------------------------- */
1766/* 1803/*
1767 * Refresh the entire screen 1804 * Refresh the entire screen
… …
1775/* ------------------------------------------------------------------------- */ 1812/* ------------------------------------------------------------------------- */
1776/* 1813/*
1777 * Move the display so that the line represented by scrollbar value Y is at 1814 * Move the display so that the line represented by scrollbar value Y is at
1778 * the top of the screen 1815 * the top of the screen
1779 */ 1816 */
1780int 1817void
1781rxvt_term::scr_move_to (int y, int len) 1818rxvt_term::scr_move_to (int y, int len)
1782{ 1819{
1783 long p = 0; 1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1784 unsigned int oldviewstart;
1785
1786 oldviewstart = view_start;
1787
1788 if (y < len)
1789 {
1790 p = (nrow + nsaved) * (len - y) / len;
1791 p -= (long) (nrow - 1);
1792 p = max (p, 0);
1793 }
1794
1795 view_start = (unsigned int)min (p, nsaved);
1796
1797 return scr_changeview (oldviewstart);
1798} 1821}
1799 1822
1800/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1801/* 1824/*
1802 * Page the screen up/down nlines 1825 * Page the screen up/down nlines
1803 * direction should be UP or DN 1826 * direction should be UP or DN
1804 */ 1827 */
1805int 1828bool
1806rxvt_term::scr_page (enum page_dirn direction, int nlines) 1829rxvt_term::scr_page (enum page_dirn direction, int nlines)
1807{ 1830{
1808 int n; 1831 int new_view_start =
1809 unsigned int oldviewstart;
1810
1811 oldviewstart = view_start;
1812
1813 if (direction == UP)
1814 {
1815 n = view_start + nlines;
1816 view_start = min (n, nsaved);
1817 }
1818 else
1819 {
1820 n = view_start - nlines; 1832 direction == UP ? view_start - nlines
1821 view_start = max (n, 0); 1833 : view_start + nlines;
1822 }
1823 1834
1824 return scr_changeview (oldviewstart); 1835 return scr_changeview (new_view_start);
1825} 1836}
1826 1837
1827int 1838bool
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (int new_view_start)
1829{ 1840{
1841 clamp_it (new_view_start, top_row, 0);
1842
1843 if (new_view_start == view_start)
1844 return false;
1845
1846 num_scr += new_view_start - view_start;
1847 view_start = new_view_start;
1848 want_refresh = 1;
1849
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831 1851
1832 if (view_start != oldviewstart) 1852 return true;
1833 {
1834 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart);
1836 }
1837
1838 return (int) (view_start - oldviewstart);
1839} 1853}
1840 1854
1841/* ------------------------------------------------------------------------- */ 1855/* ------------------------------------------------------------------------- */
1842void 1856void
1843rxvt_term::scr_bell () 1857rxvt_term::scr_bell ()
… …
1852# endif 1866# endif
1853 1867
1854 if (OPTION (Opt_visualBell)) 1868 if (OPTION (Opt_visualBell))
1855 { 1869 {
1856 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 display->flush ();
1857 rxvt_usleep (VISUAL_BELL_DURATION); 1872 rxvt_usleep (VISUAL_BELL_DURATION);
1858 scr_rvideo_mode (!rvideo); /* refresh also done */ 1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1859 } 1874 }
1860 else 1875 else
1861 XBell (display->display, 0); 1876 XBell (display->display, 0);
… …
1875 if ((fd = popen_printer ()) == NULL) 1890 if ((fd = popen_printer ()) == NULL)
1876 return; 1891 return;
1877 1892
1878 if (fullhist) 1893 if (fullhist)
1879 { 1894 {
1880 nrows = nrow + nsaved; 1895 nrows = nrow - top_row;
1881 row_start = -nsaved; 1896 row_start = top_row;
1882 } 1897 }
1883 else 1898 else
1884 { 1899 {
1885 nrows = nrow; 1900 nrows = nrow;
1886 row_start = -view_start; 1901 row_start = view_start;
1887 } 1902 }
1888 1903
1889 wctomb (0, 0); 1904 wctomb (0, 0);
1890 1905
1891 for (int r1 = 0; r1 < nrows; r1++) 1906 for (int r1 = 0; r1 < nrows; r1++)
… …
1923 * Refresh the screen 1938 * Refresh the screen
1924 * drawn_text/drawn_rend contain the screen information before the update. 1939 * drawn_text/drawn_rend contain the screen information before the update.
1925 * screen.text/screen.rend contain what the screen will change to. 1940 * screen.text/screen.rend contain what the screen will change to.
1926 */ 1941 */
1927void 1942void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 1943rxvt_term::scr_refresh ()
1929{ 1944{
1930 unsigned char must_clear, /* use draw_string not draw_image_string */ 1945 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 showcursor; /* show the cursor */ 1946 showcursor; /* show the cursor */
1932 int16_t col, row, /* column/row we're processing */ 1947 int16_t col, row, /* column/row we're processing */
1933 ocrow; /* old cursor row */ 1948 ocrow; /* old cursor row */
… …
2019 2034
2020 /* make sure no outline cursor is left around */ 2035 /* make sure no outline cursor is left around */
2021 setoldcursor = 0; 2036 setoldcursor = 0;
2022 if (ocrow != -1) 2037 if (ocrow != -1)
2023 { 2038 {
2024 if (screen.cur.row + view_start != ocrow 2039 if (screen.cur.row - view_start != ocrow
2025 || screen.cur.col != oldcursor.col) 2040 || screen.cur.col != oldcursor.col)
2026 { 2041 {
2027 if (ocrow < nrow 2042 if (ocrow < nrow
2028 && oldcursor.col < ncol) 2043 && oldcursor.col < ncol)
2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2044 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2037 else if (!focus) 2052 else if (!focus)
2038 setoldcursor = 1; 2053 setoldcursor = 1;
2039 2054
2040 if (setoldcursor) 2055 if (setoldcursor)
2041 { 2056 {
2042 if (screen.cur.row + view_start >= nrow) 2057 if (screen.cur.row - view_start >= nrow)
2043 oldcursor.row = -1; 2058 oldcursor.row = -1;
2044 else 2059 else
2045 { 2060 {
2046 oldcursor.row = screen.cur.row + view_start; 2061 oldcursor.row = screen.cur.row - view_start;
2047 oldcursor.col = screen.cur.col; 2062 oldcursor.col = screen.cur.col;
2048 } 2063 }
2049 } 2064 }
2050 } 2065 }
2051 2066
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2054 scr_swap_overlay (); 2069 scr_swap_overlay ();
2055#endif 2070#endif
2056 2071
2057#ifndef NO_SLOW_LINK_SUPPORT 2072#ifndef NO_SLOW_LINK_SUPPORT
2058 /* 2073 /*
2059 * D: CopyArea pass - very useful for slower links 2074 * D: CopyArea pass - very useful for slower links
2060 * This has been deliberately kept simple. 2075 * This has been deliberately kept simple.
2061 */ 2076 */
2062 i = num_scr;
2063 if (!display->is_local 2077 if (!display->is_local
2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2065 && abs (num_scr) < nrow && !must_clear) 2079 && abs (num_scr) < nrow && !must_clear)
2066 { 2080 {
2067 int16_t nits; 2081 int16_t nits;
2068 int j; 2082 int j;
2069 int len, wlen; 2083 int len, wlen;
2084 dLocal (int, num_scr);
2070 2085
2071 j = nrow; 2086 j = nrow;
2072 wlen = len = -1; 2087 wlen = len = -1;
2073 row = i > 0 ? 0 : j - 1; 2088 row = i > 0 ? 0 : j - 1;
2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2075 { 2090 {
2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2077 { 2092 {
2078 line_t s = ROW(row - view_start); 2093 line_t s = ROW(view_start + row);
2079 line_t d = drawn_buf[row]; 2094 line_t d = drawn_buf[row];
2080 line_t d2 = drawn_buf[row + i]; 2095 line_t d2 = drawn_buf[row + i];
2081 2096
2082 for (nits = 0, col = ncol; col--; ) 2097 for (nits = 0, col = ncol; col--; )
2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2098 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2107 if (wlen < len) 2122 if (wlen < len)
2108 ::swap (wlen, len); 2123 ::swap (wlen, len);
2109 2124
2110 XCopyArea (display->display, vt, vt, 2125 XCopyArea (display->display, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2126 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2127 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2128 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2129 0, Row2Pixel (len));
2115 len = -1; 2130 len = -1;
2116 } 2131 }
2117 } 2132 }
… …
2121 /* 2136 /*
2122 * E: main pass across every character 2137 * E: main pass across every character
2123 */ 2138 */
2124 for (row = 0; row < nrow; row++) 2139 for (row = 0; row < nrow; row++)
2125 { 2140 {
2126 text_t *stp = ROW(row - view_start).t; 2141 text_t *stp = ROW(view_start + row).t;
2127 rend_t *srp = ROW(row - view_start).r; 2142 rend_t *srp = ROW(view_start + row).r;
2128 text_t *dtp = drawn_buf[row].t; 2143 text_t *dtp = drawn_buf[row].t;
2129 rend_t *drp = drawn_buf[row].r; 2144 rend_t *drp = drawn_buf[row].r;
2130 2145
2131 /* 2146 /*
2132 * E2: OK, now the real pass 2147 * E2: OK, now the real pass
… …
2320 } /* for (row....) */ 2335 } /* for (row....) */
2321 2336
2322#if ENABLE_OVERLAY 2337#if ENABLE_OVERLAY
2323 scr_swap_overlay (); 2338 scr_swap_overlay ();
2324#endif 2339#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2340 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326 2341
2327 /* 2342 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2343 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2344 */
2330 if (showcursor) 2345 if (showcursor)
… …
2369 /* 2384 /*
2370 * H: cleanup selection 2385 * H: cleanup selection
2371 */ 2386 */
2372 scr_reverse_selection (); 2387 scr_reverse_selection ();
2373 2388
2374 if (refresh_type & SMOOTH_REFRESH)
2375 XFlush (display->display);
2376
2377 num_scr = 0; 2389 num_scr = 0;
2378 num_scr_allow = 1; 2390 num_scr_allow = 1;
2379} 2391}
2380 2392
2381void 2393void
2382rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2383{ 2395{
2384 if (!l.t) 2396 if (!l.t)
2385 return; 2397 return;
2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2386 2400
2387 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2389} 2403}
2390 2404
… …
2443 2457
2444 if (really) 2458 if (really)
2445 XClearWindow (display->display, vt); 2459 XClearWindow (display->display, vt);
2446} 2460}
2447 2461
2462void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{
2465 int view_end = view_start + nrow;
2466 int row, col;
2467
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2469 {
2470 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r;
2472
2473 for (col = beg_col; col < end_col; col++)
2474 srp[col] ^= rstyle1;
2475
2476 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2477 srp[col] ^= rstyle2;
2478
2479 if (++col < end_col)
2480 srp[col] ^= rstyle2;
2481 }
2482}
2483
2484void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{
2487 int view_end = view_start + nrow;
2488 int row, col;
2489
2490 if (beg_row >= view_start)
2491 {
2492 col = beg_col;
2493 row = beg_row;
2494 }
2495 else
2496 {
2497 col = 0;
2498 row = view_start;
2499 }
2500
2501 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= rstyle;
2504
2505 if (row == end_row)
2506 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2507 srp[col] ^= rstyle;
2508}
2509
2448/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2449void 2511void
2450rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2451{ 2513{
2452 if (selection.op 2514 if (selection.op
2453 && current_screen == selection.screen 2515 && current_screen == selection.screen
2454 && selection.end.row >= -view_start) 2516 && selection.end.row >= view_start)
2455 { 2517 {
2456 int view_end = -view_start + nrow;
2457 int row, col;
2458
2459#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2460 if (selection.rect) 2519 if (selection.rect)
2461 { 2520 scr_xor_rect (selection.beg.row, selection.beg.col,
2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2521 selection.end.row, selection.end.col,
2463 { 2522 RS_RVid, RS_RVid | RS_Uline);
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2467 for (col = selection.beg.col; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2476 }
2477 else 2523 else
2478#endif 2524#endif
2479 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2480 if (selection.beg.row >= -view_start) 2526 selection.end.row, selection.end.col,
2481 { 2527 RS_RVid);
2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2485 else
2486 {
2487 col = 0;
2488 row = -view_start;
2489 }
2490
2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2493 srp[col] ^= RS_RVid;
2494
2495 if (row == selection.end.row)
2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2497 srp[col] ^= RS_RVid;
2498 }
2499 } 2528 }
2500} 2529}
2501 2530
2502/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2503/* 2532/*
… …
2541 2570
2542 if (!selection.op) 2571 if (!selection.op)
2543 return; 2572 return;
2544 2573
2545 pos.row = pos.col = 0; 2574 pos.row = pos.col = 0;
2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2575 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2549 || (check_more == 1 2578 || (check_more == 1
2550 && current_screen == selection.screen 2579 && current_screen == selection.screen
2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2580 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2553 || (check_more == 2 2582 || (check_more == 2
… …
2564/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2565/* 2594/*
2566 * Paste a selection direct to the command fd 2595 * Paste a selection direct to the command fd
2567 */ 2596 */
2568void 2597void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2598rxvt_term::paste (char *data, unsigned int len)
2570{ 2599{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2600 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2601 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2602 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2603 data[i] = C0_CR;
… …
2718 { 2747 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w); 2749 char *s = rxvt_wcstombs (w);
2721 free (w); 2750 free (w);
2722 // TODO: strlen == only the first element will be converted. well... 2751 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s)); 2752 paste (s, strlen (s));
2724 free (s); 2753 free (s);
2725 } 2754 }
2726 else 2755 else
2727#endif 2756#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl) 2758 && cl)
2730 { 2759 {
2731 for (int i = 0; i < cr; i++) 2760 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i])); 2761 paste (cl[i], strlen (cl[i]));
2733 2762
2734 XFreeStringList (cl); 2763 XFreeStringList (cl);
2735 } 2764 }
2736 else 2765 else
2737 paste (ct.value, ct.nitems); // paste raw 2766 paste ((char *)ct.value, ct.nitems); // paste raw
2738 2767
2739bailout: 2768bailout:
2740 XFree (ct.value); 2769 XFree (ct.value);
2741 2770
2742 if (selection_wait == Sel_normal) 2771 if (selection_wait == Sel_normal)
… …
2772 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2773 * will auto fallback to CUT_BUFFER0 2802 * will auto fallback to CUT_BUFFER0
2774 * EXT: button 2 release 2803 * EXT: button 2 release
2775 */ 2804 */
2776void 2805void
2777rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm)
2778{ 2807{
2779 if (x < 0 || x >= width || y < 0 || y >= height)
2780 return; /* outside window */
2781
2782 if (selection.text) 2808 if (selection.text)
2783 { /* internal selection */ 2809 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2786 free (str); 2812 free (str);
2787 return; 2813 return;
2788 } 2814 }
2789 else 2815 else
2790 { 2816 {
… …
2882 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2883 2909
2884 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2886 2912
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return; 2914 return;
2889 2915
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 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));
2892 2918
… …
2906 col = selection.beg.col; 2932 col = selection.beg.col;
2907 end_col = ncol + 1; 2933 end_col = ncol + 1;
2908 } 2934 }
2909 else 2935 else
2910#endif 2936#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2912 2938
2913 col = max (col, 0); 2939 col = max (col, 0);
2914 2940
2915 if (row == selection.end.row 2941 if (row == selection.end.row
2916#if ENABLE_FRILLS 2942#if ENABLE_FRILLS
… …
2918#endif 2944#endif
2919 ) 2945 )
2920 min_it (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2921 2947
2922 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2923 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2924 { 2951 {
2925 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2926 t++; 2953 t++;
2927#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
2976 3003
2977 // 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
2978 selection.len = ofs; 3005 selection.len = ofs;
2979 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));
2980 3007
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return; 3009 return;
2983 3010
2984 selection_grab (tm); 3011 selection_grab (tm);
2985} 3012}
2986 3013
… …
2994 { 3021 {
2995 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
2996 return true; 3023 return true;
2997 } 3024 }
2998 else 3025 else
3026 {
3027 selection_clear ();
2999 return false; 3028 return false;
3029 }
3000 3030
3001#if 0 3031#if 0
3002 XTextProperty ct; 3032 XTextProperty ct;
3003 3033
3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3018rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3019{ 3049{
3020 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3021 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3022 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
3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024 3063
3025 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3026 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3027 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
3028 0, /* button 3 */ 3067 0, /* button 3 */
3029 1, /* button press */ 3068 1, /* button press */
3030 0); /* click change */ 3069 0); /* click change */
3031} 3070}
3032 3071
… …
3037void 3076void
3038rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3039{ 3078{
3040 want_refresh = 1; 3079 want_refresh = 1;
3041 3080
3042 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
3043 selection.mark.col = col; 3082 selection.mark.col = col;
3044 3083
3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3047 3086
3048 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3050 --selection.mark.col; 3089 --selection.mark.col;
… …
3078 text_t *stp; 3117 text_t *stp;
3079 rend_t *srp; 3118 rend_t *srp;
3080 3119
3081 if (dirn == UP) 3120 if (dirn == UP)
3082 { 3121 {
3083 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3084 bound.col = 0; 3123 bound.col = 0;
3085 dirnadd = -1; 3124 dirnadd = -1;
3086 } 3125 }
3087 else 3126 else
3088 { 3127 {
… …
3136 } 3175 }
3137 } 3176 }
3138 break; 3177 break;
3139 } 3178 }
3140 3179
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3180 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3144 3182
3145 /* Poke the values back in */ 3183 /* Poke the values back in */
3146 ret->row = row; 3184 ret->row = row;
… …
3167 * 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
3168 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3169 */ 3207 */
3170 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3171 && (col == selection.mark.col 3209 && (col == selection.mark.col
3172 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3173 { 3211 {
3174 /* select nothing */ 3212 /* select nothing */
3175 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3176 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3177 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3232 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3233 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3234 } 3272 }
3235 3273
3236 pos.col = col; 3274 pos.col = col;
3237 pos.row = row - view_start; 3275 pos.row = view_start + row;
3238 3276
3239 /* 3277 /*
3240 * 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
3241 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3242 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3323 else if (selection.clicks == 2) 3361 else if (selection.clicks == 2)
3324 { 3362 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3363 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3364 selection.end.col--;
3327 3365
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3366 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3368 }
3334 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3335 { 3370 {
3336#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3372 if (OPTION (Opt_tripleclickwords))
… …
3730 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3731 { 3766 {
3732 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3734 3769
3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3737 3772
3738 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3739 { 3774 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 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