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