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

Diff Legend

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