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.356 by sf-exg, Tue Dec 21 10:37:42 2010 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
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 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) \ 85#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) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 87
87/* 88/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * 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 */ 90 */
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) \ 91#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 92 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 95 (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 96
112/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
115 100
… …
148 133
149 l.l = 0; 134 l.l = 0;
150 l.f = 0; 135 l.f = 0;
151} 136}
152 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
157}
158
153/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
156 162
157void 163void
158rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
159{ 165{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 166 view_start = 0;
166 num_scr = 0; 167 num_scr = 0;
167 168
168 if (ncol == 0) 169 if (ncol == 0)
169 ncol = 80; 170 ncol = 80;
… …
171 if (nrow == 0) 172 if (nrow == 0)
172 nrow = 24; 173 nrow = 24;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 177
180 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
182 { 180 {
183 //TODO//FIXME 181 //TODO//FIXME
… …
236 selection.text = NULL; 234 selection.text = NULL;
237 selection.len = 0; 235 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
240 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 /* 244 /*
245 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 275 }
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (top_row) 284 if (top_row)
285 { 285 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
288 289
289 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 292
292 do 293 do
293 { 294 {
294 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 297 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 299
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 301 {
… …
328 int qcol = 0; 327 int qcol = 0;
329 328
330 // see below for cursor adjustment rationale 329 // see below for cursor adjustment rationale
331 if (p == ocur.row) 330 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 331 screen.cur.row = q - (total_rows - nrow);
333 332
334 // fill a single destination line 333 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
336 { 335 {
337 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
364 } 363 }
365 while (p != pend && q > 0); 364 while (p != pend && q > 0);
366 365
367 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
368 top_row = q - term_start; 367 top_row = q - term_start;
369 368
370 // make sure all terminal lines exist 369 // make sure all terminal lines exist
371 while (top_row > 0) 370 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 372 }
374 else 373 else
375 { 374 {
376 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
377 376
378 for (int row = min (nrow, prev_nrow); row--; ) 377 for (int row = min (nrow, prev_nrow); row--; )
379 { 378 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 380 line_t &qline = row_buf [row];
382 381
… …
396 delete old_ta; 395 delete old_ta;
397 delete old_ra; 396 delete old_ra;
398 397
399 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
401 401
402 free (tabs); 402 free (tabs);
403 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
404 407
405 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
406 409
407 prev_nrow = nrow; 410 prev_nrow = nrow;
408 prev_ncol = ncol; 411 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 412
418 tt_winch (); 413 tt_winch ();
419 414
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 416}
… …
433 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
434 429
435 free (row_buf); 430 free (row_buf);
436 free (swap_buf); 431 free (swap_buf);
437 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
438 free (tabs); 435 free (tabs);
439 436 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 437 }
442} 438}
443 439
444/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
445/* 441/*
446 * Hard reset 442 * Hard/Soft reset
447 */ 443 */
448void 444void
449rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
450{ 446{
451 scr_release (); 447 scr_release ();
452 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
453 scr_reset (); 451 scr_reset ();
454 452
455 scr_clear (true); 453 scr_clear (true);
456 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
457} 471}
458 472
459/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
499 } 513 }
500 514
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
507#endif
508} 520}
509 521
510void 522void
511rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
512{ 524{
… …
537 want_refresh = 1; 549 want_refresh = 1;
538 view_start = 0; 550 view_start = 0;
539 551
540 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
541 553
542 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
543 555
544#if NSCREENS 556#if NSCREENS
545 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
546 { 558 {
547 num_scr = 0; 559 num_scr = 0;
… …
596/* 608/*
597 * Change the rendition style for following text 609 * Change the rendition style for following text
598 */ 610 */
599void 611void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 612rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 613{
602 if (set) 614 if (set)
603 rstyle |= style; 615 rstyle |= style;
604 else if (style == ~RS_None) 616 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
606 else 618 else
607 rstyle &= ~style; 619 rstyle &= ~style;
608 } 620}
609 621
610/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
611/* 623/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 625 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
665 677
666 ::swap (l1, l2); 678 ::swap (l1, l2);
667 l2.touch (); 679 l2.touch ();
668 } 680 }
669 681
670 // move and/or clear selection, if any 682 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
672 { 684 {
673 selection.beg.row -= count; 685 selection.beg.row -= count;
674 selection.end.row -= count; 686 selection.end.row -= count;
… …
710 { 722 {
711 /* move selected region too */ 723 /* move selected region too */
712 selection.beg.row -= count; 724 selection.beg.row -= count;
713 selection.end.row -= count; 725 selection.end.row -= count;
714 selection.mark.row -= count; 726 selection.mark.row -= count;
715 727
716 selection_check (0); 728 selection_check (0);
717 } 729 }
718 } 730 }
719 731
720 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
774 } 786 }
775 } 787 }
776 788
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 792 int row = screen.cur.row;
783 793
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 795
786 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
787 797
788 while (str < strend) 798 while (str < strend)
789 { 799 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 801
792 if (c < 0x20) 802 if (expect_false (c < 0x20))
793 if (c == C0_LF) 803 if (c == C0_LF)
794 { 804 {
795 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
796 806
797 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
816 { 826 {
817 scr_tab (1, true); 827 scr_tab (1, true);
818 continue; 828 continue;
819 } 829 }
820 830
831 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
824 { 836 {
825 checksel = 0; 837 checksel = 0;
826 /* 838 /*
827 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 841 * should be a similar check.
830 */ 842 */
831 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
832 } 844 }
833 845
834 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
835 { 847 {
836 scr_do_wrap (); 848 scr_do_wrap ();
837 849
838 line->l = ncol; 850 line->l = ncol;
839 line->is_longer (1); 851 line->is_longer (1);
840 852
841 row = screen.cur.row; 853 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
843 } 855 }
844 856
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 859 c = 0xfffd;
848 860
849 // rely on wcwidth to tell us the character width, do wcwidth before 861 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 862 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
852 // locale. 864 // locale.
853 int width = WCWIDTH (c); 865 int width = WCWIDTH (c);
854 866
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 868 {
857 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 870 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
875 } 887 }
876 } 888 }
877 889
878 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
880 892
881 if (width != 0) 893 if (width != 0)
882 { 894 {
883#if !UNICODE_3 895#if !UNICODE_3
… …
888# else 900# else
889 c = 0xfffd; 901 c = 0xfffd;
890# endif 902# endif
891#endif 903#endif
892 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
893 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 926 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 927
925 line->touch (); 928 line->touch ();
926 929
927 do 930 do
928 { 931 {
929 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
931 934
932 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 936 screen.cur.col++;
934 else 937 else
935 { 938 {
936 line->l = ncol; 939 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
939 break; 942
943 goto end_of_line;
940 } 944 }
941 945
942 c = NOCHAR; 946 c = NOCHAR;
943 } 947 }
944 while (--width > 0); 948 while (expect_false (--width > 0));
945 949
946 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 952 {
949 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
950 956
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 957end_of_line:
958 ;
959 }
960#if ENABLE_COMBINING
961 else // width == 0
962 {
963 if (c != 0xfeff) // ignore BOM
964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
952 { 974 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
955 } 978 }
979 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ())
981 {
982 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1;
984 rp = line->r + ncol - 1;
985 }
986 else
987 continue;
988
989 linep->touch ();
990
991 while (*tp == NOCHAR && tp > linep->t)
992 tp--, rp--;
993
994 // first try to find a precomposed character
995 unicode_t n = rxvt_compose (*tp, c);
996 if (n == NOCHAR)
997 n = rxvt_composite.compose (*tp, c);
998
999 *tp = n;
1000 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1001 }
957 } 1002 }
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 1003#endif
998 }
999 } 1004 }
1000 1005
1001 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1002 1007
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1005#endif
1006} 1009}
1007 1010
1008/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1009/* 1012/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1012 */ 1015 */
1013void 1016void
1014rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1015{ 1018{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1019 { 1020 {
1020 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1021 { 1022 {
1022#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1025 --screen.cur.row;
1025 return; 1026
1027 want_refresh = 1;
1026#endif 1028#endif
1027 } 1029 }
1028 } 1030 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1033 else
1030 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1035}
1034 1036
1035/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1036/* 1038/*
1037 * Process Horizontal Tab 1039 * Process Horizontal Tab
… …
1060 x = i; 1062 x = i;
1061 1063
1062 if (!--count) 1064 if (!--count)
1063 break; 1065 break;
1064 } 1066 }
1065 else 1067 else
1066 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1069 && RS_SAME (l.r[i], base_rend);
1068 1070
1069 if (count) 1071 if (count)
1070 x = ncol - 1; 1072 x = ncol - 1;
… …
1186 } 1188 }
1187 } 1189 }
1188 else 1190 else
1189 { 1191 {
1190 if (screen.flags & Screen_Relative) 1192 if (screen.flags & Screen_Relative)
1193 {
1191 { /* relative origin mode */ 1194 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1195 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1196 min_it (screen.cur.row, screen.bscroll);
1194 } 1197 }
1195 else 1198 else
1196 screen.cur.row = row; 1199 screen.cur.row = row;
… …
1229/* 1232/*
1230 * Erase part or whole of a line 1233 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1238 */
1235void 1239void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1241{
1238 unsigned int col, num; 1242 unsigned int col, num;
… …
1247 line.touch (); 1251 line.touch ();
1248 line.is_longer (0); 1252 line.is_longer (0);
1249 1253
1250 switch (mode) 1254 switch (mode)
1251 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1252 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1263 col = screen.cur.col;
1254 num = ncol - col; 1264 num = ncol - col;
1255 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1259 break; 1270 break;
1271
1260 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1261 col = 0; 1273 col = 0;
1262 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1266 break; 1279 break;
1280
1267 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1268 col = 0; 1282 col = 0;
1269 num = ncol; 1283 num = ncol;
1270 line.l = 0; 1284 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1330 return; 1344 return;
1331 1345
1332 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1333 1347
1334 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1351 {
1338 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1340 } 1358 }
1341 else 1359 else
1342 { 1360 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1349 } 1374 }
1350 1375
1351 for (; num--; row++) 1376 for (; num--; row++)
1352 { 1377 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1355 } 1382 }
1356} 1383}
1357 1384
1358#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1359void 1386void
… …
1433 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1434 */ 1461 */
1435void 1462void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1464{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1465 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1443 1467
1444 if (count <= 0) 1468 if (count <= 0)
1445 return; 1469 return;
… …
1447 scr_do_wrap (); 1471 scr_do_wrap ();
1448 1472
1449 selection_check (1); 1473 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1451 1475
1452 row = screen.cur.row; 1476 int row = screen.cur.row;
1453 1477
1454 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1455 1479
1456 line->touch (); 1480 line->touch ();
1457 line->is_longer (0); 1481 line->is_longer (0);
1458 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1459 switch (insdel) 1487 switch (insdel)
1460 { 1488 {
1461 case INSERT: 1489 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1496 {
1464 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1466 } 1499 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1500
1470 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1503 {
1473 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1505 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1506 CLEAR_SELECTION ();
1476 else 1507 else
1508 {
1477 { /* shift selection */ 1509 /* shift selection */
1478 selection.beg.col += count; 1510 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1511 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1512 selection.end.col += count;
1481 } 1513 }
1482 } 1514 }
… …
1487 case ERASE: 1519 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1521 selection_check (1);
1490 screen.cur.col -= count; 1522 screen.cur.col -= count;
1491 1523
1492 line->l = max (line->l - count, 0); 1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1529 break;
1495 1530
1496 case DELETE: 1531 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1498 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1539 {
1501 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1503 } 1542 }
1504 1543
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1545
1508 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1548 {
1511 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1840 {
1803 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1805 } 1843 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 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); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1847
1810 num_scr_allow = 0; 1848 num_scr_allow = 0;
1811 1849
… …
1866 return true; 1904 return true;
1867} 1905}
1868 1906
1869#ifndef NO_BELL 1907#ifndef NO_BELL
1870void 1908void
1871rxvt_term::bell_cb (time_watcher &w) 1909rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1910{
1873 rvideo_bell = false; 1911 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1875} 1914}
1876#endif 1915#endif
1877 1916
1878/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1879void 1918void
… …
1888 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1889# endif 1928# endif
1890 1929
1891# if ENABLE_FRILLS 1930# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1931 if (option (Opt_urgentOnBell))
1893 { 1932 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 1933# endif
1901 1934
1902 if (option (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1903 { 1936 {
1904 rvideo_bell = true; 1937 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1938 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1939 flush ();
1907 1940
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1942 }
1910 else 1943 else
1911 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1946#endif
1913} 1947}
1914 1948
1915/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */ 1950/* ARGSUSED */
1917void 1951void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1953{
1920#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1921 int nrows, row_start; 1955 int nrows, row_start;
1922 FILE *fd; 1956 FILE *fd = popen_printer ();
1923 1957
1924 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1925 return; 1959 return;
1926 1960
1927 if (fullhist) 1961 if (fullhist)
1928 { 1962 {
1929 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1969 row_start = view_start;
1936 } 1970 }
1937 1971
1938 wctomb (0, 0); 1972 wctomb (0, 0);
1939 1973
1940 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1975 {
1942 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1944 1978
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2009 */
1976void 2010void
1977rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1978{ 2012{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2015 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2026 return;
1995 2027
1996 /* 2028 /*
1997 * A: set up vars 2029 * A: set up vars
1998 */ 2030 */
1999 have_bg = 0;
2000 refresh_count = 0; 2031 refresh_count = 0;
2001 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2004#endif 2037#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2039
2007 /* 2040 /*
2008 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2009 */ 2042 */
2010 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2011 2051
2012 /* 2052 /*
2013 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2014 */ 2054 */
2015 { 2055 {
2016 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2017 2057
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2059 if (hidden_cursor)
2021 showcursor = 0; 2060 showcursor = 0;
2022#endif 2061#endif
2023 2062
… …
2051 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2052#else 2091#else
2053 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2054#endif 2093#endif
2055 2094
2056 if (showcursor && focus) 2095 if (focus)
2057 { 2096 {
2058 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2060 else 2099 else
2061 { 2100 {
… …
2096 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2097 } 2136 }
2098 } 2137 }
2099 } 2138 }
2100 2139
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 2140#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2141 /*
2108 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2110 */ 2144 */
… …
2199 continue; 2233 continue;
2200 2234
2201 // redraw one or more characters 2235 // redraw one or more characters
2202 2236
2203 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2239 --col;
2206 2240
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2242 text_t *text = stp + col;
2209 int count = 1; 2243 int count = 1;
2210 2244
2211 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2212 drp[col] = rend; 2246 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2217 { 2251 {
2218 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2219 { 2253 {
2220 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2221 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2222 count++; 2257 count++;
2223 i++; 2258 i++;
2224 2259
2225 continue; 2260 continue;
2226 } 2261 }
… …
2246 2281
2247 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2249 2284
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2287 count++, i--;
2253 2288
2254 /* 2289 /*
2255 * Determine the attributes for the string 2290 * Determine the attributes for the string
2256 */ 2291 */
2257 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2259 2294
2260 // only do special processing if any attributes are set, which is unlikely 2295 // 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)) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2297 {
2263 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2264 2299
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2268 { 2302 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2303 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2304 fore = Color_BD;
2271# if !ENABLE_STYLES 2305# if !ENABLE_STYLES
2272 else 2306 else
2273 invert = !invert; 2307 invert = !invert;
2274# endif 2308# endif
2275 } 2309 }
2276 2310
2277 if (rend & RS_Italic 2311 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2312 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2313 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2314 fore = Color_IT;
2282# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2283 else 2316 else
… …
2287 2320
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2322 fore = Color_UL;
2290#endif 2323#endif
2291 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2292 if (invert) 2345 if (invert)
2293 { 2346 {
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); 2347 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2348
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#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) 2350 if (fore == back)
2312 { 2351 {
2313 fore = Color_bg; 2352 fore = Color_bg;
2314 back = Color_fg; 2353 back = Color_fg;
2315 } 2354 }
… …
2317 } 2356 }
2318 2357
2319#ifdef TEXT_BLINK 2358#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2360 {
2322 if (!text_blink_ev.active) 2361 if (!text_blink_ev.is_active ())
2323 { 2362 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2363 text_blink_ev.again ();
2325 hidden_text = 0; 2364 hidden_text = 0;
2326 } 2365 }
2327 else if (hidden_text) 2366 else if (hidden_text)
2328 fore = back; 2367 fore = back;
2329 } 2368 }
… …
2351 /* 2390 /*
2352 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2353 */ 2392 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2394
2356 if (have_bg && back == Color_bg) 2395 if (expect_true (have_bg && back == Color_bg))
2357 { 2396 {
2358 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2359 2398
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2368 did_clear: ; 2407 did_clear: ;
2369 } 2408 }
2370 else 2409 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2411
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2413 {
2375#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2417 else
2379#endif 2418#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2420
2382 XDrawLine (dpy, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2424 }
2386 } /* for (col....) */ 2425 } /* for (col....) */
2387 } /* for (row....) */ 2426 } /* for (row....) */
2388
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393 2427
2394 /* 2428 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2430 */
2397 if (showcursor) 2431 if (showcursor)
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2460 else
2427#endif 2461#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2463
2430 XDrawRectangle (dpy, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2465 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2469 }
2436 } 2470 }
2437 2471
2438 /* 2472 /*
2439 * H: cleanup selection 2473 * H: cleanup selection
2440 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2441 scr_reverse_selection (); 2480 scr_reverse_selection ();
2442 2481
2482 screen.flags = old_screen_flags;
2443 num_scr = 0; 2483 num_scr = 0;
2444 num_scr_allow = 1; 2484 num_scr_allow = 1;
2445} 2485}
2446 2486
2447void 2487void
… …
2473rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour () NOTHROW
2474{ 2514{
2475#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2516 bgPixmap.apply ();
2477#else 2517#else
2518
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2520 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2522
2482 if (scrollBar.win) 2523 if (scrollBar.win)
2483 { 2524 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2526 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2527 scrollBar.show (0);
2487 } 2528 }
2529
2488# endif 2530#endif
2531
2532 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2533 scr_clear ();
2490 scr_touch (true); 2534 scr_touch (true);
2491 want_refresh = 1; 2535 want_refresh = 1;
2492#endif
2493
2494} 2536}
2495 2537
2496/* ------------------------------------------------------------------------- */ 2538/* ------------------------------------------------------------------------- */
2497void 2539void
2498rxvt_term::scr_clear (bool really) NOTHROW 2540rxvt_term::scr_clear (bool really) NOTHROW
… …
2565 { 2607 {
2566#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2567 if (selection.rect) 2609 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2571 else 2613 else
2572#endif 2614#endif
2573 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2575 RS_RVid); 2617 RS_Sel | RS_RVid);
2576 } 2618 }
2577} 2619}
2578 2620
2579/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2580/* 2622/*
… …
2585void 2627void
2586rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2587{ 2629{
2588 int row, wrote; 2630 int row, wrote;
2589 unsigned int width, towrite; 2631 unsigned int width, towrite;
2590 char r1[] = "\n"; 2632 const char r1[] = "\n";
2591 2633
2592 for (row = saveLines - nsaved; 2634 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2594 { 2636 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2638 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2639 for (towrite = width; towrite; towrite -= wrote)
… …
2641/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2642/* 2684/*
2643 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2644 */ 2686 */
2645void 2687void
2646rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2647{ 2689{
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2693 data[i] = C0_CR;
2652 2694
2695 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~");
2697
2653 tt_write (data, len); 2698 tt_write (data, len);
2699
2700 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2654} 2711}
2655 2712
2656/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2657/* 2714/*
2658 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2733 if (!delete_prop) 2790 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop); 2791 XDeleteProperty (dpy, win, prop);
2735 2792
2736 selection_wait = Sel_incr; 2793 selection_wait = Sel_incr;
2737 incr_buf_fill = 0; 2794 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10); 2795 incr_ev.start (10);
2739 2796
2740 goto bailout; 2797 goto bailout;
2741 } 2798 }
2742 2799
2743 if (ct.nitems == 0) 2800 if (ct.nitems == 0)
… …
2752 ct.nitems = incr_buf_fill; 2809 ct.nitems = incr_buf_fill;
2753 incr_buf = 0; 2810 incr_buf = 0;
2754 incr_buf_size = 0; 2811 incr_buf_size = 0;
2755 incr_ev.stop (); 2812 incr_ev.stop ();
2756 } 2813 }
2757 else 2814 else
2758 { 2815 {
2759 if (selection_wait == Sel_normal 2816 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 { 2818 {
2762 /* 2819 /*
… …
2769 goto bailout; 2826 goto bailout;
2770 } 2827 }
2771 } 2828 }
2772 else if (selection_wait == Sel_incr) 2829 else if (selection_wait == Sel_incr)
2773 { 2830 {
2774 incr_ev.start (NOW + 10); 2831 incr_ev.start (10);
2775 2832
2776 while (incr_buf_fill + ct.nitems > incr_buf_size) 2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 { 2834 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2819 if (selection_wait == Sel_normal) 2876 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none; 2877 selection_wait = Sel_none;
2821} 2878}
2822 2879
2823void 2880void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2825{ 2882{
2826 selection_wait = Sel_none; 2883 selection_wait = Sel_none;
2827 2884
2828 incr_buf_size = 0; 2885 incr_buf_size = 0;
2829 free (incr_buf); 2886 free (incr_buf);
… …
2840 selection_paste (win, prop, true); 2897 selection_paste (win, prop, true);
2841} 2898}
2842 2899
2843/* ------------------------------------------------------------------------- */ 2900/* ------------------------------------------------------------------------- */
2844/* 2901/*
2845 * Request the current selection: 2902 * Request the current selection:
2846 * Order: > internal selection if available 2903 * Order: > internal selection if available
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2848 * > CUT_BUFFER0 2905 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0 2907 * will auto fallback to CUT_BUFFER0
… …
2852 */ 2909 */
2853void 2910void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2912{
2856 if (selection.text && selnum == Sel_Primary) 2913 if (selection.text && selnum == Sel_Primary)
2914 {
2857 { /* internal selection */ 2915 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2917 paste (str, strlen (str));
2860 free (str); 2918 free (str);
2861 return; 2919 return;
2862 } 2920 }
… …
2866 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2867 2925
2868#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2869 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2870 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2871 return; 2929 return;
2872#else 2930#else
2873 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2874 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2875 return; 2933 return;
2876#endif 2934#endif
2877 } 2935 }
2878 2936
2879 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2880 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2908/* 2966/*
2909 * Clear all selected text 2967 * Clear all selected text
2910 * EXT: SelectionClear 2968 * EXT: SelectionClear
2911 */ 2969 */
2912void 2970void
2913rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2914{ 2972{
2973 if (!clipboard)
2974 {
2915 want_refresh = 1; 2975 want_refresh = 1;
2916 free (selection.text); 2976 free (selection.text);
2917 selection.text = NULL; 2977 selection.text = NULL;
2918 selection.len = 0; 2978 selection.len = 0;
2919 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2920 2980
2921 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2922 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
2923} 2993}
2924 2994
2925/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2926/* 2996/*
2927 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3053 3123
3054 selection_grab (tm); 3124 selection_grab (tm);
3055} 3125}
3056 3126
3057bool 3127bool
3058rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3059{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3060 selection_time = tm; 3134 selection_time = tm;
3135 sel = XA_PRIMARY;
3136 }
3137 else
3138 {
3139 clipboard_time = tm;
3140 sel = xa[XA_CLIPBOARD];
3141 }
3061 3142
3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3064 { 3145 {
3065 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3066 return true; 3147 return true;
3067 } 3148 }
3068 else 3149 else
3069 { 3150 {
3070 selection_clear (); 3151 selection_clear (clipboard);
3071 return false; 3152 return false;
3072 } 3153 }
3073 3154
3074#if 0 3155#if 0
3075 XTextProperty ct; 3156 XTextProperty ct;
… …
3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3209 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3129 3210
3130 while (selection.mark.col > 0 3211 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3212 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3213 --selection.mark.col;
3133 3214
3134 if (selection.op) 3215 if (selection.op)
3216 {
3135 { /* clear the old selection */ 3217 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3218 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3219 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3220 }
3139 3221
3140 selection.op = SELECTION_INIT; 3222 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3411 * 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 3412 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3413 * time of the most recent button3 press
3332 */ 3414 */
3333 if (button3 && buttonpress) 3415 if (button3 && buttonpress)
3416 {
3334 { /* button3 press */ 3417 /* button3 press */
3335 /* 3418 /*
3336 * first determine which edge of the selection we are closest to 3419 * first determine which edge of the selection we are closest to
3337 */ 3420 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3421 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3422 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3440 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3441 selection.mark.col = selection.beg.col;
3359 } 3442 }
3360 } 3443 }
3361 else 3444 else
3445 {
3362 { /* button1 drag or button3 drag */ 3446 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3447 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3448 {
3365 if (selection.mark.row == selection.end.row 3449 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3450 && selection.mark.col == selection.end.col
3367 && clickchange 3451 && clickchange
… …
3448 selection.end.row++; 3532 selection.end.row++;
3449 } 3533 }
3450 } 3534 }
3451 3535
3452 if (button3 && buttonpress) 3536 if (button3 && buttonpress)
3537 {
3453 { /* mark may need to be changed */ 3538 /* mark may need to be changed */
3454 if (closeto == LEFT) 3539 if (closeto == LEFT)
3455 { 3540 {
3456 selection.mark.row = selection.end.row; 3541 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3542 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3543 }
… …
3566 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3567 { 3652 {
3568 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3569 } 3654 }
3570#endif 3655#endif
3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3572 { 3657 {
3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3574 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3659 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property;
3661 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3575 ev.property = rq.property; 3666 ev.property = rq.property;
3576 } 3667 }
3577 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3578 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3579 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3612 { 3703 {
3613 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3614 style = enc_compound_text; 3705 style = enc_compound_text;
3615 } 3706 }
3616 3707
3617 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3618 { 3709 {
3619 cl = selection.text; 3710 cl = selection.text;
3620 selectlen = selection.len; 3711 selectlen = selection.len;
3712 }
3713 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3714 {
3715 cl = selection.clip_text;
3716 selectlen = selection.clip_len;
3621 } 3717 }
3622 else 3718 else
3623 { 3719 {
3624 cl = L""; 3720 cl = L"";
3625 selectlen = 0; 3721 selectlen = 0;
… …
3657 XFree (ct.value); 3753 XFree (ct.value);
3658 } 3754 }
3659 3755
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3756 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3757}
3662
3663/* ------------------------------------------------------------------------- *
3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */
3666 3758
3667/* ------------------------------------------------------------------------- */ 3759/* ------------------------------------------------------------------------- */
3668#ifdef USE_XIM 3760#ifdef USE_XIM
3669void 3761void
3670rxvt_term::im_set_position (XPoint &pos) NOTHROW 3762rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3697 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3698 3790
3699 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3700 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3701 3793
3702 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3703 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3704 3796
3705 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3706 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3707 3799
3708 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3709 { 3801 {
3710 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3711 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3712 3804
3713 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3714 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3715 3807
3716 if (y == 0) 3808 if (y == 0)
… …
3735} 3827}
3736 3828
3737void 3829void
3738rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3739{ 3831{
3740 if (!ov_text) 3832 if (!ov.text)
3741 return; 3833 return;
3742 3834
3743 want_refresh = 1; 3835 want_refresh = 1;
3744 3836
3745 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3746 { 3838 {
3747 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3748 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3749 } 3841 }
3750 3842
3751 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3752 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3753} 3845}
3754 3846
3755void 3847void
3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3848rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3757{ 3849{
3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3759 return; 3851 return;
3760 3852
3761 x++, y++; 3853 x++, y++;
3762 3854
3763 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3764 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3765} 3857}
3766 3858
3767void 3859void
3768rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3860rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3769{ 3861{
… …
3788} 3880}
3789 3881
3790void 3882void
3791rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3792{ 3884{
3793 if (!ov_text) 3885 if (!ov.text)
3794 return; 3886 return;
3795 3887
3888 // hide cursor if it is within the overlay area
3889 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3890 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3891 screen.flags &= ~Screen_VisibleCursor;
3892
3796 // swap screen mem with overlay 3893 // swap screen mem with overlay
3797 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3798 { 3895 {
3799 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3800 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3801 3898
3802 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3899 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; 3900 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3804 3901
3805 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3806 { 3903 {
3807 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3808 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3905 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3809 } 3906 }
3810 } 3907 }

Diff Legend

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