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.280 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.375 by root, Mon Feb 21 07:12:03 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 85
87/* 86/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 88 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 90 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 94
112/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
115 98
… …
148 131
149 l.l = 0; 132 l.l = 0;
150 l.f = 0; 133 l.f = 0;
151} 134}
152 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
153/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
156 160
157void 161void
158rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
159{ 163{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 164 view_start = 0;
166 num_scr = 0; 165 num_scr = 0;
167 166
168 if (ncol == 0) 167 if (ncol == 0)
169 ncol = 80; 168 ncol = 80;
… …
171 if (nrow == 0) 170 if (nrow == 0)
172 nrow = 24; 171 nrow = 24;
173 172
174 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 174 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 175
180 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
182 { 178 {
183 //TODO//FIXME 179 //TODO//FIXME
… …
236 selection.text = NULL; 232 selection.text = NULL;
237 selection.len = 0; 233 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
240 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
241 } 239 }
242 else 240 else
243 { 241 {
244 /* 242 /*
245 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 273 }
276 274
277 line_t *old_buf = row_buf; 275 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 277
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
283 281
284 if (top_row) 282 if (top_row)
285 { 283 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
288 287
289 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 290
292 do 291 do
293 { 292 {
294 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 295 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 297
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 299 {
… …
328 int qcol = 0; 325 int qcol = 0;
329 326
330 // see below for cursor adjustment rationale 327 // see below for cursor adjustment rationale
331 if (p == ocur.row) 328 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 329 screen.cur.row = q - (total_rows - nrow);
333 330
334 // fill a single destination line 331 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 332 while (lofs < llen && qcol < ncol)
336 { 333 {
337 int prow = lofs / prev_ncol; 334 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 335 int pcol = lofs % prev_ncol;
… …
364 } 361 }
365 while (p != pend && q > 0); 362 while (p != pend && q > 0);
366 363
367 term_start = total_rows - nrow; 364 term_start = total_rows - nrow;
368 top_row = q - term_start; 365 top_row = q - term_start;
369 366
370 // make sure all terminal lines exist 367 // make sure all terminal lines exist
371 while (top_row > 0) 368 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 369 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 370 }
374 else 371 else
375 { 372 {
376 // if no scrollback exists (yet), wing, instead of wrap 373 // if no scrollback exists (yet), wing, instead of wrap
377 374
378 for (int row = min (nrow, prev_nrow); row--; ) 375 for (int row = min (nrow, prev_nrow); row--; )
379 { 376 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 378 line_t &qline = row_buf [row];
382 379
… …
396 delete old_ta; 393 delete old_ta;
397 delete old_ra; 394 delete old_ra;
398 395
399 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
401 399
402 free (tabs); 400 free (tabs);
403 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
404 405
405 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
406 407
407 prev_nrow = nrow; 408 prev_nrow = nrow;
408 prev_ncol = ncol; 409 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol);
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 410
418 tt_winch (); 411 tt_winch ();
419 412
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 414}
… …
433 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
434 427
435 free (row_buf); 428 free (row_buf);
436 free (swap_buf); 429 free (swap_buf);
437 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
438 free (tabs); 433 free (tabs);
439 434 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 435 }
442} 436}
443 437
444/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
445/* 439/*
446 * Hard reset 440 * Hard/Soft reset
447 */ 441 */
448void 442void
449rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
450{ 444{
451 scr_release (); 445 scr_release ();
452 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
453 scr_reset (); 449 scr_reset ();
454 450
455 scr_clear (true); 451 scr_clear (true);
456 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
457} 469}
458 470
459/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
499 } 511 }
500 512
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
507#endif
508} 518}
509 519
510void 520void
511rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
512{ 522{
… …
537 want_refresh = 1; 547 want_refresh = 1;
538 view_start = 0; 548 view_start = 0;
539 549
540 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
541 551
542 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
543 553
544#if NSCREENS 554#if NSCREENS
545 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
546 { 556 {
547 num_scr = 0; 557 num_scr = 0;
… …
596/* 606/*
597 * Change the rendition style for following text 607 * Change the rendition style for following text
598 */ 608 */
599void 609void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 610rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 611{
602 if (set) 612 if (set)
603 rstyle |= style; 613 rstyle |= style;
604 else if (style == ~RS_None) 614 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 615 rstyle = DEFAULT_RSTYLE;
606 else 616 else
607 rstyle &= ~style; 617 rstyle &= ~style;
608 } 618}
609 619
610/* ------------------------------------------------------------------------- */ 620/* ------------------------------------------------------------------------- */
611/* 621/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 622 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 623 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 674 line_t &l2 = ROW(i);
665 675
666 ::swap (l1, l2); 676 ::swap (l1, l2);
667 l2.touch (); 677 l2.touch ();
668 } 678 }
669 679
670 // move and/or clear selection, if any 680 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 681 if (selection.op && current_screen == selection.screen)
672 { 682 {
673 selection.beg.row -= count; 683 selection.beg.row -= count;
674 selection.end.row -= count; 684 selection.end.row -= count;
… …
710 { 720 {
711 /* move selected region too */ 721 /* move selected region too */
712 selection.beg.row -= count; 722 selection.beg.row -= count;
713 selection.end.row -= count; 723 selection.end.row -= count;
714 selection.mark.row -= count; 724 selection.mark.row -= count;
715 725
716 selection_check (0); 726 selection_check (0);
717 } 727 }
718 } 728 }
719 729
720 // use a simple and robust scrolling algorithm, this 730 // use a simple and robust scrolling algorithm, this
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
774 } 784 }
775 } 785 }
776 786
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 790 int row = screen.cur.row;
783 791
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 793
786 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
787 795
788 while (str < strend) 796 while (str < strend)
789 { 797 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 799
792 if (c < 0x20) 800 if (expect_false (c < 0x20))
793 if (c == C0_LF) 801 if (c == C0_LF)
794 { 802 {
795 max_it (line->l, screen.cur.col); 803 max_it (line->l, screen.cur.col);
796 804
797 screen.flags &= ~Screen_WrapNext; 805 screen.flags &= ~Screen_WrapNext;
… …
816 { 824 {
817 scr_tab (1, true); 825 scr_tab (1, true);
818 continue; 826 continue;
819 } 827 }
820 828
829 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 830 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 832 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 ))
824 { 834 {
825 checksel = 0; 835 checksel = 0;
826 /* 836 /*
827 * If we wrote anywhere in the selected area, kill the selection 837 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 838 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 839 * should be a similar check.
830 */ 840 */
831 CLEAR_SELECTION (); 841 CLEAR_SELECTION ();
832 } 842 }
833 843
834 if (screen.flags & Screen_WrapNext) 844 if (expect_false (screen.flags & Screen_WrapNext))
835 { 845 {
836 scr_do_wrap (); 846 scr_do_wrap ();
837 847
838 line->l = ncol; 848 line->l = ncol;
839 line->is_longer (1); 849 line->is_longer (1);
840 850
841 row = screen.cur.row; 851 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 852 line = &ROW(row); /* _must_ refresh */
843 } 853 }
844 854
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 855 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 857 c = 0xfffd;
848 858
849 // rely on wcwidth to tell us the character width, do wcwidth before 859 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 860 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 861 // drawing characters below as they might be invalid in the current
852 // locale. 862 // locale.
853 int width = WCWIDTH (c); 863 int width = WCWIDTH (c);
854 864
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 866 {
857 // vt100 special graphics and line drawing 867 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 868 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 869 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 870 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 883 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 884 width = 1; // vt100 line drawing characters are always single-width
875 } 885 }
876 } 886 }
877 887
878 if (screen.flags & Screen_Insert) 888 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 889 scr_insdel_chars (width, INSERT);
880 890
881 if (width != 0) 891 if (width != 0)
882 { 892 {
883#if !UNICODE_3 893#if !UNICODE_3
… …
888# else 898# else
889 c = 0xfffd; 899 c = 0xfffd;
890# endif 900# endif
891#endif 901#endif
892 902
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
907 {
908 if (screen.flags & Screen_Autowrap)
909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
912 // and try the same character next loop iteration
913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
917 }
918
893 // nuke the character at this position, if required 919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 924 scr_kill_char (*line, screen.cur.col);
896 && line->t[screen.cur.col + 1] == NOCHAR))
897 {
898 int col = screen.cur.col;
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' ';
921 // and try the same character next loop iteration
922 --str;
923 }
924 925
925 line->touch (); 926 line->touch ();
926 927
927 do 928 do
928 { 929 {
929 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 931 line->r[screen.cur.col] = rend;
931 932
932 if (screen.cur.col < ncol - 1) 933 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 934 screen.cur.col++;
934 else 935 else
935 { 936 {
936 line->l = ncol; 937 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
939 break; 940
941 goto end_of_line;
940 } 942 }
941 943
942 c = NOCHAR; 944 c = NOCHAR;
943 } 945 }
944 while (--width > 0); 946 while (expect_false (--width > 0));
945 947
946 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 950 {
949 line->touch (); 951 line->t[c] = ' ';
952 line->r[c] = rend;
953 }
950 954
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 955end_of_line:
956 ;
957 }
958#if ENABLE_COMBINING
959 else // width == 0
960 {
961 if (c != 0xfeff) // ignore BOM
962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
952 { 972 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
955 } 976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 999 }
957 } 1000 }
958 else // width == 0
959 {
960#if ENABLE_COMBINING
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 {
971 linep = line;
972 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1;
974 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 1001#endif
998 }
999 } 1002 }
1000 1003
1001 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1002 1005
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1005#endif
1006} 1007}
1007 1008
1008/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1009/* 1010/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1012 * XTERM_SEQ: CTRL-H
1012 */ 1013 */
1013void 1014void
1014rxvt_term::scr_backspace () NOTHROW 1015rxvt_term::scr_backspace () NOTHROW
1015{ 1016{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1017 if (screen.cur.col == 0)
1019 { 1018 {
1020 if (screen.cur.row > 0) 1019 if (screen.cur.row > 0)
1021 { 1020 {
1022#ifdef TERMCAP_HAS_BW 1021#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1022 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1023 --screen.cur.row;
1025 return; 1024
1025 want_refresh = 1;
1026#endif 1026#endif
1027 } 1027 }
1028 } 1028 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1031 else
1030 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1033}
1034 1034
1035/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1036/* 1036/*
1037 * Process Horizontal Tab 1037 * Process Horizontal Tab
… …
1060 x = i; 1060 x = i;
1061 1061
1062 if (!--count) 1062 if (!--count)
1063 break; 1063 break;
1064 } 1064 }
1065 else 1065 else
1066 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1068 1068
1069 if (count) 1069 if (count)
1070 x = ncol - 1; 1070 x = ncol - 1;
… …
1186 } 1186 }
1187 } 1187 }
1188 else 1188 else
1189 { 1189 {
1190 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1191 { /* relative origin mode */ 1192 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1194 } 1195 }
1195 else 1196 else
1196 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1229/* 1230/*
1230 * Erase part or whole of a line 1231 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1236 */
1235void 1237void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1239{
1238 unsigned int col, num; 1240 unsigned int col, num;
… …
1247 line.touch (); 1249 line.touch ();
1248 line.is_longer (0); 1250 line.is_longer (0);
1249 1251
1250 switch (mode) 1252 switch (mode)
1251 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1252 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1261 col = screen.cur.col;
1254 num = ncol - col; 1262 num = ncol - col;
1255 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1259 break; 1268 break;
1269
1260 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1261 col = 0; 1271 col = 0;
1262 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1266 break; 1277 break;
1278
1267 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1268 col = 0; 1280 col = 0;
1269 num = ncol; 1281 num = ncol;
1270 line.l = 0; 1282 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1330 return; 1342 return;
1331 1343
1332 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1333 1345
1334 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1349 {
1338 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1351
1352 if (mapped)
1353 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width,
1355 (unsigned int)Height2Pixel (num), False);
1340 } 1356 }
1341 else 1357 else
1342 { 1358 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1360
1361 if (mapped)
1362 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1349 } 1372 }
1350 1373
1351 for (; num--; row++) 1374 for (; num--; row++)
1352 { 1375 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1355 } 1380 }
1356} 1381}
1357 1382
1358#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1359void 1384void
… …
1433 * Insert/Delete <count> characters from the current position 1458 * Insert/Delete <count> characters from the current position
1434 */ 1459 */
1435void 1460void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1462{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1463 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1464 ZERO_SCROLLBACK ();
1443 1465
1444 if (count <= 0) 1466 if (count <= 0)
1445 return; 1467 return;
… …
1447 scr_do_wrap (); 1469 scr_do_wrap ();
1448 1470
1449 selection_check (1); 1471 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1472 min_it (count, ncol - screen.cur.col);
1451 1473
1452 row = screen.cur.row; 1474 int row = screen.cur.row;
1453 1475
1454 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1455 1477
1456 line->touch (); 1478 line->touch ();
1457 line->is_longer (0); 1479 line->is_longer (0);
1458 1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1459 switch (insdel) 1485 switch (insdel)
1460 { 1486 {
1461 case INSERT: 1487 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1488 line->l = min (line->l + count, ncol);
1489
1490 if (line->t[screen.cur.col] == NOCHAR)
1491 scr_kill_char (*line, screen.cur.col);
1492
1493 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1494 {
1464 line->t[col] = line->t[col - count]; 1495 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1496 line->r[col] = line->r[col - count];
1466 } 1497 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1498
1470 if (selection.op && current_screen == selection.screen 1499 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1500 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1501 {
1473 if (selection.end.row != screen.cur.row 1502 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1503 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1504 CLEAR_SELECTION ();
1476 else 1505 else
1506 {
1477 { /* shift selection */ 1507 /* shift selection */
1478 selection.beg.col += count; 1508 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1509 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1510 selection.end.col += count;
1481 } 1511 }
1482 } 1512 }
… …
1487 case ERASE: 1517 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1519 selection_check (1);
1490 screen.cur.col -= count; 1520 screen.cur.col -= count;
1491 1521
1492 line->l = max (line->l - count, 0); 1522 // nuke wide char after the end
1523 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col + count);
1525
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1527 break;
1495 1528
1496 case DELETE: 1529 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1530 line->l = max (line->l - count, 0);
1498 1531
1532 // nuke wide char spanning the end
1533 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1534 scr_kill_char (*line, screen.cur.col + count);
1535
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1537 {
1501 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1503 } 1540 }
1504 1541
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1543
1508 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1546 {
1511 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1647 { 1683 {
1648 rvideo_state = on; 1684 rvideo_state = on;
1649 1685
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1653#endif 1689#endif
1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1691
1656 XGCValues gcvalue; 1692 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1838 {
1803 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1805 } 1841 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1845
1810 num_scr_allow = 0; 1846 num_scr_allow = 0;
1811 1847
… …
1866 return true; 1902 return true;
1867} 1903}
1868 1904
1869#ifndef NO_BELL 1905#ifndef NO_BELL
1870void 1906void
1871rxvt_term::bell_cb (time_watcher &w) 1907rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1908{
1873 rvideo_bell = false; 1909 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1910 scr_rvideo_mode (rvideo_mode);
1911 refresh_check ();
1875} 1912}
1876#endif 1913#endif
1877 1914
1878/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1879void 1916void
… …
1888 XMapWindow (dpy, parent[0]); 1925 XMapWindow (dpy, parent[0]);
1889# endif 1926# endif
1890 1927
1891# if ENABLE_FRILLS 1928# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1929 if (option (Opt_urgentOnBell))
1893 { 1930 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1931# endif
1901 1932
1902 if (option (Opt_visualBell)) 1933 if (option (Opt_visualBell))
1903 { 1934 {
1904 rvideo_bell = true; 1935 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1936 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1937 flush ();
1907 1938
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1940 }
1910 else 1941 else
1911 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1944#endif
1913} 1945}
1914 1946
1915/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */ 1948/* ARGSUSED */
1917void 1949void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1950rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1951{
1920#ifdef PRINTPIPE 1952#ifdef PRINTPIPE
1921 int nrows, row_start; 1953 int nrows, row_start;
1922 FILE *fd; 1954 FILE *fd = popen_printer ();
1923 1955
1924 if ((fd = popen_printer ()) == NULL) 1956 if (!fd)
1925 return; 1957 return;
1926 1958
1927 if (fullhist) 1959 if (fullhist)
1928 { 1960 {
1929 nrows = nrow - top_row; 1961 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1967 row_start = view_start;
1936 } 1968 }
1937 1969
1938 wctomb (0, 0); 1970 wctomb (0, 0);
1939 1971
1940 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1973 {
1942 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1944 1976
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2007 */
1976void 2008void
1977rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1978{ 2010{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2013 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2024 return;
1995 2025
1996 /* 2026 /*
1997 * A: set up vars 2027 * A: set up vars
1998 */ 2028 */
1999 have_bg = 0;
2000 refresh_count = 0; 2029 refresh_count = 0;
2001 2030
2031 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2004#endif 2035#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2037
2007 /* 2038 /*
2008 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2009 */ 2040 */
2010 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2011 2049
2012 /* 2050 /*
2013 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2014 */ 2052 */
2015 { 2053 {
2016 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2017 2055
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2057 if (hidden_cursor)
2021 showcursor = 0; 2058 showcursor = 0;
2022#endif 2059#endif
2023 2060
… …
2051 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2052#else 2089#else
2053 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2054#endif 2091#endif
2055 2092
2056 if (showcursor && focus) 2093 if (focus)
2057 { 2094 {
2058 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2060 else 2097 else
2061 { 2098 {
… …
2096 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2097 } 2134 }
2098 } 2135 }
2099 } 2136 }
2100 2137
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2102#if ENABLE_OVERLAY
2103 scr_swap_overlay ();
2104#endif
2105
2106#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2139 /*
2108 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2110 */ 2142 */
… …
2199 continue; 2231 continue;
2200 2232
2201 // redraw one or more characters 2233 // redraw one or more characters
2202 2234
2203 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2237 --col;
2206 2238
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2240 text_t *text = stp + col;
2209 int count = 1; 2241 int count = 1;
2210 2242
2211 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2212 drp[col] = rend; 2244 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2217 { 2249 {
2218 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2219 { 2251 {
2220 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2221 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2222 count++; 2255 count++;
2223 i++; 2256 i++;
2224 2257
2225 continue; 2258 continue;
2226 } 2259 }
… …
2246 2279
2247 col--; /* went one too far. move back */ 2280 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2281 count -= i; /* dump any matching trailing chars */
2249 2282
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2283 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2284 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2285 count++, i--;
2253 2286
2254 /* 2287 /*
2255 * Determine the attributes for the string 2288 * Determine the attributes for the string
2256 */ 2289 */
2257 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2259 2292
2260 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2295 {
2263 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2264 2297
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
2268 { 2300 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2301 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2302 fore = Color_BD;
2271# if !ENABLE_STYLES 2303# if !ENABLE_STYLES
2272 else 2304 else
2273 invert = !invert; 2305 invert = !invert;
2274# endif 2306# endif
2275 } 2307 }
2276 2308
2277 if (rend & RS_Italic 2309 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2310 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2311 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2312 fore = Color_IT;
2282# if !ENABLE_STYLES 2313# if !ENABLE_STYLES
2283 else 2314 else
… …
2287 2318
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2320 fore = Color_UL;
2290#endif 2321#endif
2291 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2292 if (invert) 2343 if (invert)
2293 { 2344 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2300 ::swap (fore, back); 2345 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2346
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2308 if (ISSET_PIXCOLOR (Color_RV))
2309 back = Color_RV;
2310# endif
2311 if (fore == back) 2348 if (fore == back)
2312 { 2349 {
2313 fore = Color_bg; 2350 fore = Color_bg;
2314 back = Color_fg; 2351 back = Color_fg;
2315 } 2352 }
… …
2317 } 2354 }
2318 2355
2319#ifdef TEXT_BLINK 2356#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2357 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2358 {
2322 if (!text_blink_ev.active) 2359 if (!text_blink_ev.is_active ())
2323 { 2360 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2361 text_blink_ev.again ();
2325 hidden_text = 0; 2362 hidden_text = 0;
2326 } 2363 }
2327 else if (hidden_text) 2364 else if (hidden_text)
2328 fore = back; 2365 fore = back;
2329 } 2366 }
… …
2351 /* 2388 /*
2352 * Actually do the drawing of the string here 2389 * Actually do the drawing of the string here
2353 */ 2390 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2392
2356 if (have_bg && back == Color_bg) 2393 if (expect_true (have_bg && back == Color_bg))
2357 { 2394 {
2358 // this is very ugly, maybe push it into ->draw? 2395 // this is very ugly, maybe push it into ->draw?
2359 2396
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2397 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2398 if (text[i] != ' ')
… …
2368 did_clear: ; 2405 did_clear: ;
2369 } 2406 }
2370 else 2407 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2409
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2411 {
2375#if ENABLE_FRILLS 2412#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2413 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2414 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2415 else
2379#endif 2416#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2417 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2418
2382 XDrawLine (dpy, drawBuffer, gc, 2419 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2420 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2422 }
2386 } /* for (col....) */ 2423 } /* for (col....) */
2387 } /* for (row....) */ 2424 } /* for (row....) */
2388
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393 2425
2394 /* 2426 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2428 */
2397 if (showcursor) 2429 if (showcursor)
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2458 else
2427#endif 2459#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2461
2430 XDrawRectangle (dpy, drawBuffer, gc, 2462 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2463 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2464 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2465 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2467 }
2436 } 2468 }
2437 2469
2438 /* 2470 /*
2439 * H: cleanup selection 2471 * H: cleanup selection
2440 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2441 scr_reverse_selection (); 2478 scr_reverse_selection ();
2442 2479
2480 screen.flags = old_screen_flags;
2443 num_scr = 0; 2481 num_scr = 0;
2444 num_scr_allow = 1; 2482 num_scr_allow = 1;
2445} 2483}
2446 2484
2447void 2485void
… …
2468 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2469 } 2507 }
2470} 2508}
2471 2509
2472void 2510void
2473rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2474{ 2512{
2513 bool transparent = false;
2514
2475#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2477#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2479 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2541
2481# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2542 if (scrollBar.win)
2483 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2548 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2549 scrollBar.show (0);
2487 } 2550 }
2488# endif 2551
2552 if (refresh)
2553 {
2489 scr_clear (); 2554 scr_clear ();
2490 scr_touch (true); 2555 scr_touch (true);
2556 }
2491 want_refresh = 1; 2557 want_refresh = 1;
2492#endif
2493
2494} 2558}
2495 2559
2496/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2497void 2561void
2498rxvt_term::scr_clear (bool really) NOTHROW 2562rxvt_term::scr_clear (bool really) NOTHROW
… …
2565 { 2629 {
2566#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2567 if (selection.rect) 2631 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2571 else 2635 else
2572#endif 2636#endif
2573 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2575 RS_RVid); 2639 RS_Sel | RS_RVid);
2576 } 2640 }
2577} 2641}
2578 2642
2579/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2580/* 2644/*
… …
2585void 2649void
2586rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2587{ 2651{
2588 int row, wrote; 2652 int row, wrote;
2589 unsigned int width, towrite; 2653 unsigned int width, towrite;
2590 char r1[] = "\n"; 2654 const char r1[] = "\n";
2591 2655
2592 for (row = saveLines - nsaved; 2656 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2594 { 2658 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2660 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2661 for (towrite = width; towrite; towrite -= wrote)
… …
2641/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2642/* 2706/*
2643 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2644 */ 2708 */
2645void 2709void
2646rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2647{ 2711{
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2715 data[i] = C0_CR;
2652 2716
2717 if (priv_modes & PrivMode_BracketPaste)
2718 tt_printf ("\e[200~");
2719
2653 tt_write (data, len); 2720 tt_write (data, len);
2654}
2655 2721
2656/* ------------------------------------------------------------------------- */ 2722 if (priv_modes & PrivMode_BracketPaste)
2657/* 2723 tt_printf ("\e[201~");
2658 * Respond to a notification that a primary selection has been sent
2659 * EXT: SelectionNotify
2660 */
2661void
2662rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2663{
2664 if (prop == None) /* check for failed XConvertSelection */
2665 {
2666 if ((selection_type & Sel_CompoundText))
2667 {
2668 int selnum = selection_type & Sel_whereMask;
2669
2670 selection_type = 0;
2671 if (selnum != Sel_direct)
2672 selection_request_other (XA_STRING, selnum);
2673 }
2674
2675 if ((selection_type & Sel_UTF8String))
2676 {
2677 int selnum = selection_type & Sel_whereMask;
2678
2679 selection_type = Sel_CompoundText;
2680 if (selnum != Sel_direct)
2681 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2682 else
2683 selection_type = 0;
2684 }
2685
2686 return;
2687 }
2688
2689 unsigned long bytes_after;
2690 XTextProperty ct;
2691
2692 if (XGetWindowProperty (dpy, win, prop,
2693 0, PROP_SIZE / 4,
2694 delete_prop, AnyPropertyType,
2695 &ct.encoding, &ct.format,
2696 &ct.nitems, &bytes_after,
2697 &ct.value) != Success)
2698 {
2699 ct.value = 0;
2700 goto bailout;
2701 }
2702
2703 if (ct.encoding == None)
2704 goto bailout;
2705
2706 if (bytes_after)
2707 {
2708 // fetch and append remaining data
2709 XTextProperty ct2;
2710
2711 if (XGetWindowProperty (dpy, win, prop,
2712 ct.nitems / 4, (bytes_after + 3) / 4,
2713 delete_prop, AnyPropertyType,
2714 &ct2.encoding, &ct2.format,
2715 &ct2.nitems, &bytes_after,
2716 &ct2.value) != Success)
2717 goto bailout;
2718
2719 // realloc should be compatible to XFree, here, and elsewhere, too
2720 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2721 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2722 ct.nitems += ct2.nitems;
2723
2724 XFree (ct2.value);
2725 }
2726
2727 if (ct.value == 0)
2728 goto bailout;
2729
2730 if (ct.encoding == xa[XA_INCR])
2731 {
2732 // INCR selection, start handshake
2733 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop);
2735
2736 selection_wait = Sel_incr;
2737 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10);
2739
2740 goto bailout;
2741 }
2742
2743 if (ct.nitems == 0)
2744 {
2745 if (selection_wait == Sel_incr)
2746 {
2747 XFree (ct.value);
2748
2749 // finally complete, now paste the whole thing
2750 selection_wait = Sel_normal;
2751 ct.value = (unsigned char *)incr_buf;
2752 ct.nitems = incr_buf_fill;
2753 incr_buf = 0;
2754 incr_buf_size = 0;
2755 incr_ev.stop ();
2756 }
2757 else
2758 {
2759 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 {
2762 /*
2763 * pass through again trying CUT_BUFFER0 if we've come from
2764 * XConvertSelection () but nothing was presented
2765 */
2766 selection_paste (display->root, XA_CUT_BUFFER0, False);
2767 }
2768
2769 goto bailout;
2770 }
2771 }
2772 else if (selection_wait == Sel_incr)
2773 {
2774 incr_ev.start (NOW + 10);
2775
2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2780 }
2781
2782 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2783 incr_buf_fill += ct.nitems;
2784
2785 goto bailout;
2786 }
2787
2788 char **cl;
2789 int cr;
2790
2791#if !ENABLE_MINIMAL
2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2793 // so recode it manually
2794 if (ct.encoding == xa[XA_UTF8_STRING])
2795 {
2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2797 char *s = rxvt_wcstombs (w);
2798 free (w);
2799 // TODO: strlen == only the first element will be converted. well...
2800 paste (s, strlen (s));
2801 free (s);
2802 }
2803 else
2804#endif
2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2806 && cl)
2807 {
2808 for (int i = 0; i < cr; i++)
2809 paste (cl[i], strlen (cl[i]));
2810
2811 XFreeStringList (cl);
2812 }
2813 else
2814 paste ((char *)ct.value, ct.nitems); // paste raw
2815
2816bailout:
2817 XFree (ct.value);
2818
2819 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none;
2821} 2724}
2822 2725
2823void 2726void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2825{ 2728{
2826 selection_wait = Sel_none; 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2827
2828 incr_buf_size = 0;
2829 free (incr_buf);
2830
2831 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2832}
2833
2834void
2835rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2836{
2837 if (prop == None || selection_wait != Sel_incr)
2838 return; 2730 return;
2839 2731
2840 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2841} 2733}
2842 2734
2843/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2844/* 2736/*
2845 * Request the current selection: 2737 * Request the current selection:
2846 * Order: > internal selection if available 2738 * Order: > internal selection if available
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2848 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0 2742 * will auto fallback to CUT_BUFFER0
… …
2852 */ 2744 */
2853void 2745void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2747{
2856 if (selection.text && selnum == Sel_Primary) 2748 if (selection.text && selnum == Sel_Primary)
2749 {
2857 { /* internal selection */ 2750 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2860 free (str); 2753 free (str);
2861 return; 2754 return;
2862 } 2755 }
2863 else 2756 else if (!selection_req)
2864 {
2865 selection_request_time = tm;
2866 selection_wait = Sel_normal;
2867
2868#if X_HAVE_UTF8_STRING
2869 selection_type = Sel_UTF8String;
2870 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2871 return;
2872#else
2873 selection_type = Sel_CompoundText;
2874 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2875 return;
2876#endif
2877 } 2757 {
2878 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2879 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2759 selection_req->run ();
2880 selection_paste (display->root, XA_CUT_BUFFER0, false);
2881}
2882
2883int
2884rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2885{
2886 Atom sel;
2887
2888 selection_type |= selnum;
2889
2890 if (selnum == Sel_Primary)
2891 sel = XA_PRIMARY;
2892 else if (selnum == Sel_Secondary)
2893 sel = XA_SECONDARY;
2894 else
2895 sel = xa[XA_CLIPBOARD];
2896
2897 if (XGetSelectionOwner (dpy, sel) != None)
2898 { 2760 }
2899 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2900 vt, selection_request_time);
2901 return 1;
2902 }
2903
2904 return 0;
2905} 2761}
2906 2762
2907/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2908/* 2764/*
2909 * Clear all selected text 2765 * Clear all selected text
2910 * EXT: SelectionClear 2766 * EXT: SelectionClear
2911 */ 2767 */
2912void 2768void
2913rxvt_term::selection_clear () NOTHROW 2769rxvt_term::selection_clear (bool clipboard) NOTHROW
2914{ 2770{
2771 if (!clipboard)
2772 {
2915 want_refresh = 1; 2773 want_refresh = 1;
2916 free (selection.text); 2774 free (selection.text);
2917 selection.text = NULL; 2775 selection.text = NULL;
2918 selection.len = 0; 2776 selection.len = 0;
2919 CLEAR_SELECTION (); 2777 CLEAR_SELECTION ();
2920 2778
2921 if (display->selection_owner == this) 2779 if (display->selection_owner == this)
2922 display->selection_owner = 0; 2780 display->selection_owner = 0;
2781 }
2782 else
2783 {
2784 free (selection.clip_text);
2785 selection.clip_text = NULL;
2786 selection.clip_len = 0;
2787
2788 if (display->clipboard_owner == this)
2789 display->clipboard_owner = 0;
2790 }
2923} 2791}
2924 2792
2925/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2926/* 2794/*
2927 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2928 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2929 */ 2797 */
2930void 2798void
2931rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
2932{ 2800{
2933 int i; 2801 int size;
2934 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
2935 text_t *t; 2803 text_t *t;
2936 2804
2937 switch (selection.op) 2805 switch (selection.op)
2938 { 2806 {
… …
2954 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
2955 2823
2956 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2957 return; 2825 return;
2958 2826
2959 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2960 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2961 2829
2962 int ofs = 0; 2830 int ofs = 0;
2963 int extra = 0; 2831 int extra = 0;
2964 2832
2965 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
2971 { 2839 {
2972#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
2973 if (selection.rect) 2841 if (selection.rect)
2974 { 2842 {
2975 col = selection.beg.col; 2843 col = selection.beg.col;
2976 end_col = ncol + 1; 2844 end_col = selection.end.col;
2977 } 2845 }
2978 else 2846 else
2979#endif 2847#endif
2980 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
2981 2849
2982 col = max (col, 0); 2850 col = max (col, 0);
2983 2851
2984 if (row == selection.end.row 2852 if (row == selection.end.row)
2985#if !ENABLE_MINIMAL
2986 || selection.rect
2987#endif
2988 )
2989 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
2990 2854
2991 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
2992 2856
2993 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3001 2865
3002 extra -= (len - 1); 2866 extra -= (len - 1);
3003 2867
3004 if (extra < 0) 2868 if (extra < 0)
3005 { 2869 {
3006 extra += i; 2870 extra += size;
3007 i += i; 2871 size += size;
3008 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3009 } 2873 }
3010 2874
3011 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3012 } 2876 }
3013#endif 2877#endif
… …
3025 2889
3026 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3027 } 2891 }
3028 else 2892 else
3029#endif 2893#endif
3030 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3031 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3032 } 2898 }
3033
3034 if (end_col != selection.end.col)
3035 new_selection_text[ofs++] = C0_LF;
3036 2899
3037 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3038 2901
3039 if (ofs == 0) 2902 if (ofs == 0)
3040 { 2903 {
… …
3053 2916
3054 selection_grab (tm); 2917 selection_grab (tm);
3055} 2918}
3056 2919
3057bool 2920bool
3058rxvt_term::selection_grab (Time tm) NOTHROW 2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3059{ 2922{
2923 Atom sel;
2924
2925 if (!clipboard)
2926 {
3060 selection_time = tm; 2927 selection_time = tm;
2928 sel = XA_PRIMARY;
2929 }
2930 else
2931 {
2932 clipboard_time = tm;
2933 sel = xa[XA_CLIPBOARD];
2934 }
3061 2935
3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2936 XSetSelectionOwner (dpy, sel, vt, tm);
3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2937 if (XGetSelectionOwner (dpy, sel) == vt)
3064 { 2938 {
3065 display->set_selection_owner (this); 2939 display->set_selection_owner (this, clipboard);
3066 return true; 2940 return true;
3067 } 2941 }
3068 else 2942 else
3069 { 2943 {
3070 selection_clear (); 2944 selection_clear (clipboard);
3071 return false; 2945 return false;
3072 } 2946 }
3073 2947
3074#if 0 2948#if 0
3075 XTextProperty ct; 2949 XTextProperty ct;
… …
3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3002 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3129 3003
3130 while (selection.mark.col > 0 3004 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3005 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3006 --selection.mark.col;
3133 3007
3134 if (selection.op) 3008 if (selection.op)
3009 {
3135 { /* clear the old selection */ 3010 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3011 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3012 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3013 }
3139 3014
3140 selection.op = SELECTION_INIT; 3015 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3204 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3205 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3206 * time of the most recent button3 press
3332 */ 3207 */
3333 if (button3 && buttonpress) 3208 if (button3 && buttonpress)
3209 {
3334 { /* button3 press */ 3210 /* button3 press */
3335 /* 3211 /*
3336 * first determine which edge of the selection we are closest to 3212 * first determine which edge of the selection we are closest to
3337 */ 3213 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3214 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3215 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3233 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3234 selection.mark.col = selection.beg.col;
3359 } 3235 }
3360 } 3236 }
3361 else 3237 else
3238 {
3362 { /* button1 drag or button3 drag */ 3239 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3240 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3241 {
3365 if (selection.mark.row == selection.end.row 3242 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3243 && selection.mark.col == selection.end.col
3367 && clickchange 3244 && clickchange
… …
3448 selection.end.row++; 3325 selection.end.row++;
3449 } 3326 }
3450 } 3327 }
3451 3328
3452 if (button3 && buttonpress) 3329 if (button3 && buttonpress)
3330 {
3453 { /* mark may need to be changed */ 3331 /* mark may need to be changed */
3454 if (closeto == LEFT) 3332 if (closeto == LEFT)
3455 { 3333 {
3456 selection.mark.row = selection.end.row; 3334 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3335 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3336 }
… …
3566 else if (rq.target == xa[XA_MULTIPLE]) 3444 else if (rq.target == xa[XA_MULTIPLE])
3567 { 3445 {
3568 /* TODO: Handle MULTIPLE */ 3446 /* TODO: Handle MULTIPLE */
3569 } 3447 }
3570#endif 3448#endif
3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3572 { 3450 {
3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3574 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3452 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3453 ev.property = rq.property;
3454 }
3455 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3456 {
3457 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3458 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3575 ev.property = rq.property; 3459 ev.property = rq.property;
3576 } 3460 }
3577 else if (rq.target == XA_STRING 3461 else if (rq.target == XA_STRING
3578 || rq.target == xa[XA_TEXT] 3462 || rq.target == xa[XA_TEXT]
3579 || rq.target == xa[XA_COMPOUND_TEXT] 3463 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3612 { 3496 {
3613 target = xa[XA_COMPOUND_TEXT]; 3497 target = xa[XA_COMPOUND_TEXT];
3614 style = enc_compound_text; 3498 style = enc_compound_text;
3615 } 3499 }
3616 3500
3617 if (selection.text) 3501 if (rq.selection == XA_PRIMARY && selection.text)
3618 { 3502 {
3619 cl = selection.text; 3503 cl = selection.text;
3620 selectlen = selection.len; 3504 selectlen = selection.len;
3505 }
3506 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3507 {
3508 cl = selection.clip_text;
3509 selectlen = selection.clip_len;
3621 } 3510 }
3622 else 3511 else
3623 { 3512 {
3624 cl = L""; 3513 cl = L"";
3625 selectlen = 0; 3514 selectlen = 0;
… …
3657 XFree (ct.value); 3546 XFree (ct.value);
3658 } 3547 }
3659 3548
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3549 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3550}
3662
3663/* ------------------------------------------------------------------------- *
3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */
3666 3551
3667/* ------------------------------------------------------------------------- */ 3552/* ------------------------------------------------------------------------- */
3668#ifdef USE_XIM 3553#ifdef USE_XIM
3669void 3554void
3670rxvt_term::im_set_position (XPoint &pos) NOTHROW 3555rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3697 h += 2; min_it (h, nrow); 3582 h += 2; min_it (h, nrow);
3698 3583
3699 x -= 1; clamp_it (x, 0, ncol - w); 3584 x -= 1; clamp_it (x, 0, ncol - w);
3700 y -= 1; clamp_it (y, 0, nrow - h); 3585 y -= 1; clamp_it (y, 0, nrow - h);
3701 3586
3702 ov_x = x; ov_y = y; 3587 ov.x = x; ov.y = y;
3703 ov_w = w; ov_h = h; 3588 ov.w = w; ov.h = h;
3704 3589
3705 ov_text = new text_t *[h]; 3590 ov.text = new text_t *[h];
3706 ov_rend = new rend_t *[h]; 3591 ov.rend = new rend_t *[h];
3707 3592
3708 for (y = 0; y < h; y++) 3593 for (y = 0; y < h; y++)
3709 { 3594 {
3710 text_t *tp = ov_text[y] = new text_t[w]; 3595 text_t *tp = ov.text[y] = new text_t[w];
3711 rend_t *rp = ov_rend[y] = new rend_t[w]; 3596 rend_t *rp = ov.rend[y] = new rend_t[w];
3712 3597
3713 text_t t0, t1, t2; 3598 text_t t0, t1, t2;
3714 rend_t r = OVERLAY_RSTYLE; 3599 rend_t r = OVERLAY_RSTYLE;
3715 3600
3716 if (y == 0) 3601 if (y == 0)
… …
3735} 3620}
3736 3621
3737void 3622void
3738rxvt_term::scr_overlay_off () NOTHROW 3623rxvt_term::scr_overlay_off () NOTHROW
3739{ 3624{
3740 if (!ov_text) 3625 if (!ov.text)
3741 return; 3626 return;
3742 3627
3743 want_refresh = 1; 3628 want_refresh = 1;
3744 3629
3745 for (int y = 0; y < ov_h; y++) 3630 for (int y = 0; y < ov.h; y++)
3746 { 3631 {
3747 delete [] ov_text[y]; 3632 delete [] ov.text[y];
3748 delete [] ov_rend[y]; 3633 delete [] ov.rend[y];
3749 } 3634 }
3750 3635
3751 delete [] ov_text; ov_text = 0; 3636 delete [] ov.text; ov.text = 0;
3752 delete [] ov_rend; ov_rend = 0; 3637 delete [] ov.rend; ov.rend = 0;
3753} 3638}
3754 3639
3755void 3640void
3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3641rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3757{ 3642{
3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3643 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3759 return; 3644 return;
3760 3645
3761 x++, y++; 3646 x++, y++;
3762 3647
3763 ov_text[y][x] = text; 3648 ov.text[y][x] = text;
3764 ov_rend[y][x] = rend; 3649 ov.rend[y][x] = rend;
3765} 3650}
3766 3651
3767void 3652void
3768rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3653rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3769{ 3654{
… …
3788} 3673}
3789 3674
3790void 3675void
3791rxvt_term::scr_swap_overlay () NOTHROW 3676rxvt_term::scr_swap_overlay () NOTHROW
3792{ 3677{
3793 if (!ov_text) 3678 if (!ov.text)
3794 return; 3679 return;
3795 3680
3681 // hide cursor if it is within the overlay area
3682 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3683 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3684 screen.flags &= ~Screen_VisibleCursor;
3685
3796 // swap screen mem with overlay 3686 // swap screen mem with overlay
3797 for (int y = ov_h; y--; ) 3687 for (int y = ov.h; y--; )
3798 { 3688 {
3799 text_t *t1 = ov_text[y]; 3689 text_t *t1 = ov.text[y];
3800 rend_t *r1 = ov_rend[y]; 3690 rend_t *r1 = ov.rend[y];
3801 3691
3802 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3692 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3803 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3693 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3804 3694
3805 for (int x = ov_w; x--; ) 3695 for (int x = ov.w; x--; )
3806 { 3696 {
3807 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3697 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3808 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3698 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3809 } 3699 }
3810 } 3700 }

Diff Legend

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