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.296 by root, Wed Jan 9 01:05:24 2008 UTC vs.
Revision 1.351 by sf-exg, Fri Oct 15 11:07:45 2010 UTC

… …
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 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
153/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
156 160
157void 161void
158rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
159{ 163{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 164 view_start = 0;
166 num_scr = 0; 165 num_scr = 0;
167 166
168 if (ncol == 0) 167 if (ncol == 0)
169 ncol = 80; 168 ncol = 80;
… …
171 if (nrow == 0) 170 if (nrow == 0)
172 nrow = 24; 171 nrow = 24;
173 172
174 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 174 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 175
180 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
182 { 178 {
183 //TODO//FIXME 179 //TODO//FIXME
… …
236 selection.text = NULL; 232 selection.text = NULL;
237 selection.len = 0; 233 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
240 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
241 } 239 }
242 else 240 else
243 { 241 {
244 /* 242 /*
245 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
283 281
284 if (top_row) 282 if (top_row)
285 { 283 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
288 287
289 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 290
292 do 291 do
293 { 292 {
294 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 295 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 297
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 299 {
… …
396 delete old_ta; 393 delete old_ta;
397 delete old_ra; 394 delete old_ra;
398 395
399 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
401 399
402 free (tabs); 400 free (tabs);
403 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
404 405
405 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
406 407
407 prev_nrow = nrow; 408 prev_nrow = nrow;
408 prev_ncol = ncol; 409 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol);
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 410
418 tt_winch (); 411 tt_winch ();
419 412
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 414}
… …
433 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
434 427
435 free (row_buf); 428 free (row_buf);
436 free (swap_buf); 429 free (swap_buf);
437 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
438 free (tabs); 433 free (tabs);
439 434 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 435 }
442} 436}
443 437
444/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
445/* 439/*
446 * Hard reset 440 * Hard/Soft reset
447 */ 441 */
448void 442void
449rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
450{ 444{
451 scr_release (); 445 scr_release ();
452 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
453 scr_reset (); 449 scr_reset ();
454 450
455 scr_clear (true); 451 scr_clear (true);
456 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
457} 469}
458 470
459/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
499 } 511 }
500 512
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
507#endif
508} 518}
509 519
510void 520void
511rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
512{ 522{
… …
537 want_refresh = 1; 547 want_refresh = 1;
538 view_start = 0; 548 view_start = 0;
539 549
540 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
541 551
542 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
543 553
544#if NSCREENS 554#if NSCREENS
545 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
546 { 556 {
547 num_scr = 0; 557 num_scr = 0;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
774 } 784 }
775 } 785 }
776 786
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 790 int row = screen.cur.row;
783 791
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 793
786 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
787 795
788 while (str < strend) 796 while (str < strend)
789 { 797 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 799
792 if (c < 0x20) 800 if (expect_false (c < 0x20))
793 if (c == C0_LF) 801 if (c == C0_LF)
794 { 802 {
795 max_it (line->l, screen.cur.col); 803 max_it (line->l, screen.cur.col);
796 804
797 screen.flags &= ~Screen_WrapNext; 805 screen.flags &= ~Screen_WrapNext;
… …
816 { 824 {
817 scr_tab (1, true); 825 scr_tab (1, true);
818 continue; 826 continue;
819 } 827 }
820 828
829 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 830 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 832 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 ))
824 { 834 {
825 checksel = 0; 835 checksel = 0;
826 /* 836 /*
827 * If we wrote anywhere in the selected area, kill the selection 837 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 838 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 839 * should be a similar check.
830 */ 840 */
831 CLEAR_SELECTION (); 841 CLEAR_SELECTION ();
832 } 842 }
833 843
834 if (screen.flags & Screen_WrapNext) 844 if (expect_false (screen.flags & Screen_WrapNext))
835 { 845 {
836 scr_do_wrap (); 846 scr_do_wrap ();
837 847
838 line->l = ncol; 848 line->l = ncol;
839 line->is_longer (1); 849 line->is_longer (1);
… …
841 row = screen.cur.row; 851 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 852 line = &ROW(row); /* _must_ refresh */
843 } 853 }
844 854
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 855 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 857 c = 0xfffd;
848 858
849 // rely on wcwidth to tell us the character width, do wcwidth before 859 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 860 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 861 // drawing characters below as they might be invalid in the current
852 // locale. 862 // locale.
853 int width = WCWIDTH (c); 863 int width = WCWIDTH (c);
854 864
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 866 {
857 // vt100 special graphics and line drawing 867 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 868 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 869 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 870 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 883 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 884 width = 1; // vt100 line drawing characters are always single-width
875 } 885 }
876 } 886 }
877 887
878 if (screen.flags & Screen_Insert) 888 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 889 scr_insdel_chars (width, INSERT);
880 890
881 if (width != 0) 891 if (width != 0)
882 { 892 {
883#if !UNICODE_3 893#if !UNICODE_3
… …
888# else 898# else
889 c = 0xfffd; 899 c = 0xfffd;
890# endif 900# endif
891#endif 901#endif
892 902
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
907 {
908 if (screen.flags & Screen_Autowrap)
909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
912 // and try the same character next loop iteration
913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
917 }
918
893 // nuke the character at this position, if required 919 // nuke the character at this position, if required
920 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 921 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 922 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 923 && line->t[screen.cur.col + 1] == NOCHAR)
897 { 924 ))
898 int col = screen.cur.col; 925 scr_kill_char (*line, 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 926
925 line->touch (); 927 line->touch ();
926 928
927 do 929 do
928 { 930 {
929 line->t[screen.cur.col] = c; 931 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 932 line->r[screen.cur.col] = rend;
931 933
932 if (screen.cur.col < ncol - 1) 934 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 935 screen.cur.col++;
934 else 936 else
935 { 937 {
936 line->l = ncol; 938 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 939 if (screen.flags & Screen_Autowrap)
… …
939 break; 941 break;
940 } 942 }
941 943
942 c = NOCHAR; 944 c = NOCHAR;
943 } 945 }
944 while (--width > 0); 946 while (expect_false (--width > 0));
945 947
946 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 949 if (expect_false (!width))
948 { 950 {
949 line->touch (); 951 line->touch ();
950 952
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 954 {
953 line->t[c] = ' '; 955 line->t[c] = ' ';
954 line->r[c] = rend; 956 line->r[c] = rend;
955 } 957 }
956 } 958 }
957 } 959 }
960#if ENABLE_COMBINING
958 else // width == 0 961 else // width == 0
959 { 962 {
960#if ENABLE_COMBINING 963 if (c != 0xfeff) // ignore BOM
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 { 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)
974 {
971 linep = line; 975 linep = line;
972 tp = line->t + screen.cur.col - 1; 976 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 977 rp = line->r + screen.cur.col - 1;
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));
974 } 1001 }
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 } 1002 }
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
… …
1017 { 1020 {
1018 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1019 { 1022 {
1020#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1021 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1022 screen.cur.row--; 1025 --screen.cur.row;
1026
1023 want_refresh = 1; 1027 want_refresh = 1;
1024#endif 1028#endif
1025 } 1029 }
1026 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1027 else 1033 else
1028 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1029} 1035}
1030 1036
1031/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1226/* 1232/*
1227 * Erase part or whole of a line 1233 * Erase part or whole of a line
1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1230 * 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
1231 */ 1238 */
1232void 1239void
1233rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1234{ 1241{
1235 unsigned int col, num; 1242 unsigned int col, num;
… …
1244 line.touch (); 1251 line.touch ();
1245 line.is_longer (0); 1252 line.is_longer (0);
1246 1253
1247 switch (mode) 1254 switch (mode)
1248 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1249 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1250 col = screen.cur.col; 1263 col = screen.cur.col;
1251 num = ncol - col; 1264 num = ncol - col;
1252 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1255 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1256 break; 1270 break;
1271
1257 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1258 col = 0; 1273 col = 0;
1259 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1260 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1261 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1262 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1263 break; 1279 break;
1280
1264 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1265 col = 0; 1282 col = 0;
1266 num = ncol; 1283 num = ncol;
1267 line.l = 0; 1284 line.l = 0;
1268 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1326 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1327 return; 1344 return;
1328 1345
1329 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1330 1347
1331 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1332 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1333 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1334 { 1351 {
1335 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1336 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);
1337 } 1358 }
1338 else 1359 else
1339 { 1360 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1344 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1346 } 1374 }
1347 1375
1348 for (; num--; row++) 1376 for (; num--; row++)
1349 { 1377 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1352 } 1382 }
1353} 1383}
1354 1384
1355#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1356void 1386void
… …
1430 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1431 */ 1461 */
1432void 1462void
1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1434{ 1464{
1435 int col, row;
1436 rend_t tr;
1437
1438 want_refresh = 1; 1465 want_refresh = 1;
1439 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1440 1467
1441 if (count <= 0) 1468 if (count <= 0)
1442 return; 1469 return;
… …
1444 scr_do_wrap (); 1471 scr_do_wrap ();
1445 1472
1446 selection_check (1); 1473 selection_check (1);
1447 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1448 1475
1449 row = screen.cur.row; 1476 int row = screen.cur.row;
1450 1477
1451 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1452 1479
1453 line->touch (); 1480 line->touch ();
1454 line->is_longer (0); 1481 line->is_longer (0);
1455 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1456 switch (insdel) 1487 switch (insdel)
1457 { 1488 {
1458 case INSERT: 1489 case INSERT:
1459 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--)
1460 { 1496 {
1461 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1462 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1463 } 1499 }
1464
1465 line->l = min (line->l + count, ncol);
1466 1500
1467 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1469 { 1503 {
1470 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
… …
1485 case ERASE: 1519 case ERASE:
1486 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1487 selection_check (1); 1521 selection_check (1);
1488 screen.cur.col -= count; 1522 screen.cur.col -= count;
1489 1523
1490 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
1491 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1492 break; 1529 break;
1493 1530
1494 case DELETE: 1531 case DELETE:
1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1496 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
1497 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1498 { 1539 {
1499 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1500 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1501 } 1542 }
1502 1543
1503 line->l = max (line->l - count, 0);
1504 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1505 1545
1506 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1508 { 1548 {
1509 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1799 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1800 { 1840 {
1801 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1802 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1803 } 1843 }
1804// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1805 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++)
1806 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);
1807 1847
1808 num_scr_allow = 0; 1848 num_scr_allow = 0;
1809 1849
… …
1887 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1888# endif 1928# endif
1889 1929
1890# if ENABLE_FRILLS 1930# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1931 if (option (Opt_urgentOnBell))
1892 { 1932 set_urgency (1);
1893 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1894 {
1895 h->flags |= XUrgencyHint;
1896 XSetWMHints (dpy, parent[0], h);
1897 }
1898 }
1899# endif 1933# endif
1900 1934
1901 if (option (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1902 { 1936 {
1903 rvideo_bell = true; 1937 rvideo_bell = true;
… …
1906 1940
1907 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1908 } 1942 }
1909 else 1943 else
1910 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1911#endif 1946#endif
1912} 1947}
1913 1948
1914/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1915/* ARGSUSED */ 1950/* ARGSUSED */
1916void 1951void
1917rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1918{ 1953{
1919#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1920 int nrows, row_start; 1955 int nrows, row_start;
1921 FILE *fd; 1956 FILE *fd = popen_printer ();
1922 1957
1923 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1924 return; 1959 return;
1925 1960
1926 if (fullhist) 1961 if (fullhist)
1927 { 1962 {
1928 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1934 row_start = view_start; 1969 row_start = view_start;
1935 } 1970 }
1936 1971
1937 wctomb (0, 0); 1972 wctomb (0, 0);
1938 1973
1939 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1940 { 1975 {
1941 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1942 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1943 1978
1944 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
… …
1973 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1974 */ 2009 */
1975void 2010void
1976rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1977{ 2012{
1978 unsigned char have_bg,
1979 showcursor; /* show the cursor */
1980 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1981 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1982 int i; /* tmp */ 2015 int i; /* tmp */
1983#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1984 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
1993 return; 2026 return;
1994 2027
1995 /* 2028 /*
1996 * A: set up vars 2029 * A: set up vars
1997 */ 2030 */
1998 have_bg = 0;
1999 refresh_count = 0; 2031 refresh_count = 0;
2000 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2001#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2002 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2003#endif 2037#endif
2004 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2005 2039
2006 /* 2040 /*
2007 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2008 */ 2042 */
2009 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;
2010 2051
2011 /* 2052 /*
2012 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2013 */ 2054 */
2014 { 2055 {
2015 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2016 2057
2017 showcursor = (screen.flags & Screen_VisibleCursor);
2018#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2019 if (hidden_cursor) 2059 if (hidden_cursor)
2020 showcursor = 0; 2060 showcursor = 0;
2021#endif 2061#endif
2022 2062
… …
2050 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2051#else 2091#else
2052 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2053#endif 2093#endif
2054 2094
2055 if (showcursor && focus) 2095 if (focus)
2056 { 2096 {
2057 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2058 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2059 else 2099 else
2060 { 2100 {
… …
2095 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2096 } 2136 }
2097 } 2137 }
2098 } 2138 }
2099 2139
2100 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2101#if ENABLE_OVERLAY
2102 scr_swap_overlay ();
2103#endif
2104
2105#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2106 /* 2141 /*
2107 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2108 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2109 */ 2144 */
… …
2198 continue; 2233 continue;
2199 2234
2200 // redraw one or more characters 2235 // redraw one or more characters
2201 2236
2202 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2203 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2204 --col; 2239 --col;
2205 2240
2206 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2207 text_t *text = stp + col; 2242 text_t *text = stp + col;
2208 int count = 1; 2243 int count = 1;
2209 2244
2210 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2211 drp[col] = rend; 2246 drp[col] = rend;
… …
2215 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2216 { 2251 {
2217 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2218 { 2253 {
2219 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2220 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2221 count++; 2257 count++;
2222 i++; 2258 i++;
2223 2259
2224 continue; 2260 continue;
2225 } 2261 }
… …
2245 2281
2246 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2247 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2248 2284
2249 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2250 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2251 count++, i--; 2287 count++, i--;
2252 2288
2253 /* 2289 /*
2254 * Determine the attributes for the string 2290 * Determine the attributes for the string
2255 */ 2291 */
2256 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2257 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2258 2294
2259 // 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
2260 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)))
2261 { 2297 {
2262 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2263 2299
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2265 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2284 2320
2285 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2286 fore = Color_UL; 2322 fore = Color_UL;
2287#endif 2323#endif
2288 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
2289 if (invert) 2345 if (invert)
2290 { 2346 {
2291#ifdef OPTION_HC
2292 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2293 || !ISSET_PIXCOLOR (Color_HC))
2294#endif
2295 /* invert the column if no highlightColor is set or it is the
2296 * current cursor column */
2297 ::swap (fore, back); 2347 ::swap (fore, back);
2298#ifdef OPTION_HC
2299 else if (ISSET_PIXCOLOR (Color_HC))
2300 back = Color_HC;
2301#endif
2302 2348
2303#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2304# ifndef OPTION_HC
2305 if (ISSET_PIXCOLOR (Color_RV))
2306 back = Color_RV;
2307# endif
2308 if (fore == back) 2350 if (fore == back)
2309 { 2351 {
2310 fore = Color_bg; 2352 fore = Color_bg;
2311 back = Color_fg; 2353 back = Color_fg;
2312 } 2354 }
… …
2348 /* 2390 /*
2349 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2350 */ 2392 */
2351 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2352 2394
2353 if (have_bg && back == Color_bg) 2395 if (expect_true (have_bg && back == Color_bg))
2354 { 2396 {
2355 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2356 2398
2357 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2358 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2365 did_clear: ; 2407 did_clear: ;
2366 } 2408 }
2367 else 2409 else
2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2369 2411
2370 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2371 { 2413 {
2372#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2373 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2374 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2375 else 2417 else
2376#endif 2418#endif
2377 XSetForeground (dpy, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2378 2420
2379 XDrawLine (dpy, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2380 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2382 } 2424 }
2383 } /* for (col....) */ 2425 } /* for (col....) */
2384 } /* for (row....) */ 2426 } /* for (row....) */
2385
2386#if ENABLE_OVERLAY
2387 scr_swap_overlay ();
2388#endif
2389 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2390 2427
2391 /* 2428 /*
2392 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2393 */ 2430 */
2394 if (showcursor) 2431 if (showcursor)
… …
2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2423 else 2460 else
2424#endif 2461#endif
2425 XSetForeground (dpy, gc, pix_colors[ccol1]); 2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 2463
2427 XDrawRectangle (dpy, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2428 Col2Pixel (col), 2465 Col2Pixel (col),
2429 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2430 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2431 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2432 } 2469 }
2433 } 2470 }
2434 2471
2435 /* 2472 /*
2436 * H: cleanup selection 2473 * H: cleanup selection
2437 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2438 scr_reverse_selection (); 2480 scr_reverse_selection ();
2439 2481
2482 screen.flags = old_screen_flags;
2440 num_scr = 0; 2483 num_scr = 0;
2441 num_scr_allow = 1; 2484 num_scr_allow = 1;
2442} 2485}
2443 2486
2444void 2487void
… …
2475 2518
2476 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2477 XClearWindow (dpy, parent[0]); 2520 XClearWindow (dpy, parent[0]);
2478 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2479 2522
2480# if HAVE_SCROLLBARS
2481 if (scrollBar.win) 2523 if (scrollBar.win)
2482 { 2524 {
2483 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2484 scrollBar.setIdle (); 2526 scrollBar.state = STATE_IDLE;
2485 scrollbar_show (0); 2527 scrollBar.show (0);
2486 } 2528 }
2529
2487# endif 2530#endif
2488 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
2493#endif
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/*
… …
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 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
… …
2867 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2868 2925
2869#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2870 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2871 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2872 return; 2929 return;
2873#else 2930#else
2874 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2875 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2876 return; 2933 return;
2877#endif 2934#endif
2878 } 2935 }
2879 2936
2880 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2881 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2909/* 2966/*
2910 * Clear all selected text 2967 * Clear all selected text
2911 * EXT: SelectionClear 2968 * EXT: SelectionClear
2912 */ 2969 */
2913void 2970void
2914rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2915{ 2972{
2973 if (!clipboard)
2974 {
2916 want_refresh = 1; 2975 want_refresh = 1;
2917 free (selection.text); 2976 free (selection.text);
2918 selection.text = NULL; 2977 selection.text = NULL;
2919 selection.len = 0; 2978 selection.len = 0;
2920 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2921 2980
2922 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2923 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 }
2924} 2993}
2925 2994
2926/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2927/* 2996/*
2928 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3054 3123
3055 selection_grab (tm); 3124 selection_grab (tm);
3056} 3125}
3057 3126
3058bool 3127bool
3059rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3060{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3061 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 }
3062 3142
3063 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3064 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3065 { 3145 {
3066 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3067 return true; 3147 return true;
3068 } 3148 }
3069 else 3149 else
3070 { 3150 {
3071 selection_clear (); 3151 selection_clear (clipboard);
3072 return false; 3152 return false;
3073 } 3153 }
3074 3154
3075#if 0 3155#if 0
3076 XTextProperty ct; 3156 XTextProperty ct;
… …
3571 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3572 { 3652 {
3573 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3574 } 3654 }
3575#endif 3655#endif
3576 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3577 { 3657 {
3578 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3579 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);
3580 ev.property = rq.property; 3666 ev.property = rq.property;
3581 } 3667 }
3582 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3583 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3584 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3617 { 3703 {
3618 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3619 style = enc_compound_text; 3705 style = enc_compound_text;
3620 } 3706 }
3621 3707
3622 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3623 { 3709 {
3624 cl = selection.text; 3710 cl = selection.text;
3625 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;
3626 } 3717 }
3627 else 3718 else
3628 { 3719 {
3629 cl = L""; 3720 cl = L"";
3630 selectlen = 0; 3721 selectlen = 0;
… …
3698 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3699 3790
3700 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3701 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3702 3793
3703 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3704 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3705 3796
3706 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3707 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3708 3799
3709 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3710 { 3801 {
3711 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3712 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3713 3804
3714 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3715 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3716 3807
3717 if (y == 0) 3808 if (y == 0)
… …
3736} 3827}
3737 3828
3738void 3829void
3739rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3740{ 3831{
3741 if (!ov_text) 3832 if (!ov.text)
3742 return; 3833 return;
3743 3834
3744 want_refresh = 1; 3835 want_refresh = 1;
3745 3836
3746 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3747 { 3838 {
3748 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3749 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3750 } 3841 }
3751 3842
3752 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3753 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3754} 3845}
3755 3846
3756void 3847void
3757rxvt_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
3758{ 3849{
3759 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3760 return; 3851 return;
3761 3852
3762 x++, y++; 3853 x++, y++;
3763 3854
3764 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3765 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3766} 3857}
3767 3858
3768void 3859void
3769rxvt_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
3770{ 3861{
… …
3789} 3880}
3790 3881
3791void 3882void
3792rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3793{ 3884{
3794 if (!ov_text) 3885 if (!ov.text)
3795 return; 3886 return;
3796 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
3797 // swap screen mem with overlay 3893 // swap screen mem with overlay
3798 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3799 { 3895 {
3800 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3801 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3802 3898
3803 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;
3804 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;
3805 3901
3806 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3807 { 3903 {
3808 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3809 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));
3810 } 3906 }
3811 } 3907 }

Diff Legend

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