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.301 by ayin, Tue Jan 29 13:57:23 2008 UTC vs.
Revision 1.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC

… …
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 seperate 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 CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 91#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 92 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 93 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 95 (unsigned int)Height2Pixel (1), False)
103 96
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
113 100
114/* Fill part/all of a line with blanks. */ 101/* Fill part/all of a line with blanks. */
… …
146 133
147 l.l = 0; 134 l.l = 0;
148 l.f = 0; 135 l.f = 0;
149} 136}
150 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
151/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
154 160
155void 161void
156rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
157{ 163{
158#if ENABLE_OVERLAY
159 scr_overlay_off ();
160#endif
161
162 rvideo_mode = false;
163 view_start = 0; 164 view_start = 0;
164 num_scr = 0; 165 num_scr = 0;
165 166
166 if (ncol == 0) 167 if (ncol == 0)
167 ncol = 80; 168 ncol = 80;
… …
169 if (nrow == 0) 170 if (nrow == 0)
170 nrow = 24; 171 nrow = 24;
171 172
172 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 174 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 175
178 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
180 { 178 {
181 //TODO//FIXME 179 //TODO//FIXME
… …
234 selection.text = NULL; 232 selection.text = NULL;
235 selection.len = 0; 233 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
238 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
239 } 239 }
240 else 240 else
241 { 241 {
242 /* 242 /*
243 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
281 281
282 if (top_row) 282 if (top_row)
283 { 283 {
284 // 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
285 // 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
286 287
287 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 290
290 do 291 do
291 { 292 {
292 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
293#ifdef DEBUG_STRICT
294 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
295#endif
296 int plines = 1; 295 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 297
299 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 ())
300 { 299 {
… …
394 delete old_ta; 393 delete old_ta;
395 delete old_ra; 394 delete old_ra;
396 395
397 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
399 399
400 free (tabs); 400 free (tabs);
401 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
402 405
403 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
404 407
405 prev_nrow = nrow; 408 prev_nrow = nrow;
406 prev_ncol = ncol; 409 prev_ncol = ncol;
407
408 tabs = (char *)rxvt_malloc (ncol);
409
410 for (int col = ncol; --col; )
411 tabs [col] = col % TABSIZE == 0;
412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415 410
416 tt_winch (); 411 tt_winch ();
417 412
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419} 414}
… …
431 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
432 427
433 free (row_buf); 428 free (row_buf);
434 free (swap_buf); 429 free (swap_buf);
435 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
436 free (tabs); 433 free (tabs);
437 434 tabs = 0;
438 row_buf = 0; // signal that we freed all the arrays
439 } 435 }
440} 436}
441 437
442/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
443/* 439/*
444 * Hard reset 440 * Hard/Soft reset
445 */ 441 */
446void 442void
447rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
448{ 444{
449 scr_release (); 445 scr_release ();
450 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
451 scr_reset (); 449 scr_reset ();
452 450
453 scr_clear (true); 451 scr_clear (true);
454 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);
455} 469}
456 470
457/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
497 } 511 }
498 512
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
505#endif
506} 518}
507 519
508void 520void
509rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
510{ 522{
… …
535 want_refresh = 1; 547 want_refresh = 1;
536 view_start = 0; 548 view_start = 0;
537 549
538 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
539 551
540 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
541 553
542#if NSCREENS 554#if NSCREENS
543 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
544 { 556 {
545 num_scr = 0; 557 num_scr = 0;
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
772 } 784 }
773 } 785 }
774 786
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 790 int row = screen.cur.row;
781 791
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 793
784 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
785 795
786 while (str < strend) 796 while (str < strend)
787 { 797 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 799
790 if (c < 0x20) 800 if (expect_false (c < 0x20))
791 if (c == C0_LF) 801 if (c == C0_LF)
792 { 802 {
793 max_it (line->l, screen.cur.col); 803 max_it (line->l, screen.cur.col);
794 804
795 screen.flags &= ~Screen_WrapNext; 805 screen.flags &= ~Screen_WrapNext;
… …
814 { 824 {
815 scr_tab (1, true); 825 scr_tab (1, true);
816 continue; 826 continue;
817 } 827 }
818 828
829 if (expect_false (
819 if (checksel /* see if we're writing within selection */ 830 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 832 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 ))
822 { 834 {
823 checksel = 0; 835 checksel = 0;
824 /* 836 /*
825 * If we wrote anywhere in the selected area, kill the selection 837 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 838 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 839 * should be a similar check.
828 */ 840 */
829 CLEAR_SELECTION (); 841 CLEAR_SELECTION ();
830 } 842 }
831 843
832 if (screen.flags & Screen_WrapNext) 844 if (expect_false (screen.flags & Screen_WrapNext))
833 { 845 {
834 scr_do_wrap (); 846 scr_do_wrap ();
835 847
836 line->l = ncol; 848 line->l = ncol;
837 line->is_longer (1); 849 line->is_longer (1);
… …
839 row = screen.cur.row; 851 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 852 line = &ROW(row); /* _must_ refresh */
841 } 853 }
842 854
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 855 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 857 c = 0xfffd;
846 858
847 // 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
848 // further replacements, as wcwidth might return -1 for the line 860 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 861 // drawing characters below as they might be invalid in the current
850 // locale. 862 // locale.
851 int width = WCWIDTH (c); 863 int width = WCWIDTH (c);
852 864
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 866 {
855 // vt100 special graphics and line drawing 867 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 868 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 869 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 870 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 883 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 884 width = 1; // vt100 line drawing characters are always single-width
873 } 885 }
874 } 886 }
875 887
876 if (screen.flags & Screen_Insert) 888 if (expect_false (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 889 scr_insdel_chars (width, INSERT);
878 890
879 if (width != 0) 891 if (width != 0)
880 { 892 {
881#if !UNICODE_3 893#if !UNICODE_3
… …
887 c = 0xfffd; 899 c = 0xfffd;
888# endif 900# endif
889#endif 901#endif
890 902
891 // nuke the character at this position, if required 903 // nuke the character at this position, if required
904 if (expect_false (
892 if (line->t[screen.cur.col] == NOCHAR 905 line->t[screen.cur.col] == NOCHAR
893 || (screen.cur.col < ncol - 1 906 || (screen.cur.col < ncol - 1
894 && line->t[screen.cur.col + 1] == NOCHAR)) 907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
895 { 915 {
896 int col = screen.cur.col; 916 // ... artificially enlargen the previous one
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' '; 917 c = NOCHAR;
919 // and try the same character next loop iteration 918 // and try the same character next loop iteration
920 --str; 919 --str;
921 } 920 }
922 921
923 line->touch (); 922 line->touch ();
… …
925 do 924 do
926 { 925 {
927 line->t[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 927 line->r[screen.cur.col] = rend;
929 928
930 if (screen.cur.col < ncol - 1) 929 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 930 screen.cur.col++;
932 else 931 else
933 { 932 {
934 line->l = ncol; 933 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
… …
937 break; 936 break;
938 } 937 }
939 938
940 c = NOCHAR; 939 c = NOCHAR;
941 } 940 }
942 while (--width > 0); 941 while (expect_false (--width > 0));
943 942
944 // pad with spaces when overwriting wide character with smaller one 943 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 944 if (expect_false (!width))
946 { 945 {
947 line->touch (); 946 line->touch ();
948 947
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
950 { 949 {
951 line->t[c] = ' '; 950 line->t[c] = ' ';
952 line->r[c] = rend; 951 line->r[c] = rend;
953 } 952 }
954 } 953 }
955 } 954 }
955#if ENABLE_COMBINING
956 else // width == 0 956 else // width == 0
957 { 957 {
958#if ENABLE_COMBINING 958 if (c != 0xfeff) // ignore BOM
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 { 959 {
960 // handle combining characters
961 // we just tag the accent on the previous on-screen character.
962 // this is arguably not correct, but also arguably not wrong.
963 // we don't handle double-width characters nicely yet.
964 line_t *linep;
965 text_t *tp;
966 rend_t *rp;
967
968 if (screen.cur.col > 0)
969 {
969 linep = line; 970 linep = line;
970 tp = line->t + screen.cur.col - 1; 971 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1; 972 rp = line->r + screen.cur.col - 1;
973 }
974 else if (screen.cur.row > 0
975 && ROW(screen.cur.row - 1).is_longer ())
976 {
977 linep = &ROW(screen.cur.row - 1);
978 tp = line->t + ncol - 1;
979 rp = line->r + ncol - 1;
980 }
981 else
982 continue;
983
984 linep->touch ();
985
986 while (*tp == NOCHAR && tp > linep->t)
987 tp--, rp--;
988
989 // first try to find a precomposed character
990 unicode_t n = rxvt_compose (*tp, c);
991 if (n == NOCHAR)
992 n = rxvt_composite.compose (*tp, c);
993
994 *tp = n;
995 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
972 } 996 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 } 997 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 998#endif
996 }
997 } 999 }
998 1000
999 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
1000 1002
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1003#endif
1004} 1004}
1005 1005
1006/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1007/* 1007/*
1008 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1225/* 1225/*
1226 * Erase part or whole of a line 1226 * Erase part or whole of a line
1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1230 */ 1231 */
1231void 1232void
1232rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1233{ 1234{
1234 unsigned int col, num; 1235 unsigned int col, num;
… …
1243 line.touch (); 1244 line.touch ();
1244 line.is_longer (0); 1245 line.is_longer (0);
1245 1246
1246 switch (mode) 1247 switch (mode)
1247 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1248 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1249 col = screen.cur.col; 1256 col = screen.cur.col;
1250 num = ncol - col; 1257 num = ncol - col;
1251 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1252 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1255 break; 1263 break;
1264
1256 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1257 col = 0; 1266 col = 0;
1258 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1259 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1262 break; 1272 break;
1273
1263 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1264 col = 0; 1275 col = 0;
1265 num = ncol; 1276 num = ncol;
1266 line.l = 0; 1277 line.l = 0;
1267 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1325 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1326 return; 1337 return;
1327 1338
1328 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1329 1340
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1330 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1331 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1332 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1333 { 1347 {
1334 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1335 CLEAR_ROWS (row, num); 1349
1350 if (mapped && !view_start)
1351 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False);
1336 } 1354 }
1337 else 1355 else
1338 { 1356 {
1339 ren = rstyle & (RS_fgMask | RS_bgMask); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1358
1359 if (mapped && !view_start)
1360 {
1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342 ERASE_ROWS (row, num); 1363 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start),
1365 (unsigned int)width,
1366 (unsigned int)Height2Pixel (num));
1343 gcvalue.foreground = pix_colors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1345 } 1370 }
1346 1371
1347 for (; num--; row++) 1372 for (; num--; row++)
1348 { 1373 {
1349 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1375
1376 if (!view_start)
1350 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1351 } 1378 }
1352} 1379}
1353 1380
1354#if !ENABLE_MINIMAL 1381#if !ENABLE_MINIMAL
1355void 1382void
… …
1429 * Insert/Delete <count> characters from the current position 1456 * Insert/Delete <count> characters from the current position
1430 */ 1457 */
1431void 1458void
1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1459rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433{ 1460{
1434 int col, row;
1435 rend_t tr;
1436
1437 want_refresh = 1; 1461 want_refresh = 1;
1438 ZERO_SCROLLBACK (); 1462 ZERO_SCROLLBACK ();
1439 1463
1440 if (count <= 0) 1464 if (count <= 0)
1441 return; 1465 return;
… …
1443 scr_do_wrap (); 1467 scr_do_wrap ();
1444 1468
1445 selection_check (1); 1469 selection_check (1);
1446 min_it (count, ncol - screen.cur.col); 1470 min_it (count, ncol - screen.cur.col);
1447 1471
1448 row = screen.cur.row; 1472 int row = screen.cur.row;
1449 1473
1450 line_t *line = &ROW(row); 1474 line_t *line = &ROW(row);
1451 1475
1452 line->touch (); 1476 line->touch ();
1453 line->is_longer (0); 1477 line->is_longer (0);
1454 1478
1479 // nuke wide spanning the start
1480 if (line->t[screen.cur.col] == NOCHAR)
1481 scr_kill_char (*line, screen.cur.col);
1482
1455 switch (insdel) 1483 switch (insdel)
1456 { 1484 {
1457 case INSERT: 1485 case INSERT:
1458 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1486 line->l = min (line->l + count, ncol);
1487
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1491 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459 { 1492 {
1460 line->t[col] = line->t[col - count]; 1493 line->t[col] = line->t[col - count];
1461 line->r[col] = line->r[col - count]; 1494 line->r[col] = line->r[col - count];
1462 } 1495 }
1463
1464 line->l = min (line->l + count, ncol);
1465 1496
1466 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468 { 1499 {
1469 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
… …
1484 case ERASE: 1515 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1516 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1517 selection_check (1);
1487 screen.cur.col -= count; 1518 screen.cur.col -= count;
1488 1519
1489 line->l = max (line->l - count, 0); 1520 // nuke wide char after the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1524 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1525 break;
1492 1526
1493 case DELETE: 1527 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1528 line->l = max (line->l - count, 0);
1495 1529
1530 // nuke wide char spanning the end
1531 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1532 scr_kill_char (*line, screen.cur.col + count);
1533
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1534 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1535 {
1498 line->t[col] = line->t[col + count]; 1536 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1537 line->r[col] = line->r[col + count];
1500 } 1538 }
1501 1539
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1541
1505 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1544 {
1508 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1798 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1799 { 1836 {
1800 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1801 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1802 } 1839 }
1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1804 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1806 1843
1807 num_scr_allow = 0; 1844 num_scr_allow = 0;
1808 1845
… …
1886 XMapWindow (dpy, parent[0]); 1923 XMapWindow (dpy, parent[0]);
1887# endif 1924# endif
1888 1925
1889# if ENABLE_FRILLS 1926# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell)) 1927 if (option (Opt_urgentOnBell))
1891 { 1928 set_urgency (1);
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1897 }
1898# endif 1929# endif
1899 1930
1900 if (option (Opt_visualBell)) 1931 if (option (Opt_visualBell))
1901 { 1932 {
1902 rvideo_bell = true; 1933 rvideo_bell = true;
… …
1905 1936
1906 bell_ev.start (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1907 } 1938 }
1908 else 1939 else
1909 XBell (dpy, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1910#endif 1942#endif
1911} 1943}
1912 1944
1913/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1914/* ARGSUSED */ 1946/* ARGSUSED */
1915void 1947void
1916rxvt_term::scr_printscreen (int fullhist) NOTHROW 1948rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917{ 1949{
1918#ifdef PRINTPIPE 1950#ifdef PRINTPIPE
1919 int nrows, row_start; 1951 int nrows, row_start;
1920 FILE *fd; 1952 FILE *fd = popen_printer ();
1921 1953
1922 if ((fd = popen_printer ()) == NULL) 1954 if (!fd)
1923 return; 1955 return;
1924 1956
1925 if (fullhist) 1957 if (fullhist)
1926 { 1958 {
1927 nrows = nrow - top_row; 1959 nrows = nrow - top_row;
… …
1933 row_start = view_start; 1965 row_start = view_start;
1934 } 1966 }
1935 1967
1936 wctomb (0, 0); 1968 wctomb (0, 0);
1937 1969
1938 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939 { 1971 {
1940 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1941 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1942 1974
1943 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1975 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1972 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
1973 */ 2005 */
1974void 2006void
1975rxvt_term::scr_refresh () NOTHROW 2007rxvt_term::scr_refresh () NOTHROW
1976{ 2008{
1977 unsigned char have_bg,
1978 showcursor; /* show the cursor */
1979 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
1980 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1981 int i; /* tmp */ 2011 int i; /* tmp */
1982#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1983 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
… …
1992 return; 2022 return;
1993 2023
1994 /* 2024 /*
1995 * A: set up vars 2025 * A: set up vars
1996 */ 2026 */
1997 have_bg = 0;
1998 refresh_count = 0; 2027 refresh_count = 0;
1999 2028
2029 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0;
2000#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2001 have_bg |= bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2002#endif 2033#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2035
2005 /* 2036 /*
2006 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
2007 */ 2038 */
2008 scr_reverse_selection (); 2039 scr_reverse_selection ();
2040
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY
2043 scr_swap_overlay ();
2044#endif
2045
2046 char showcursor = screen.flags & Screen_VisibleCursor;
2009 2047
2010 /* 2048 /*
2011 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
2012 */ 2050 */
2013 { 2051 {
2014 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
2015 2053
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2055 if (hidden_cursor)
2019 showcursor = 0; 2056 showcursor = 0;
2020#endif 2057#endif
2021 2058
… …
2049 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2050#else 2087#else
2051 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2052#endif 2089#endif
2053 2090
2054 if (showcursor && focus) 2091 if (focus)
2055 { 2092 {
2056 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2058 else 2095 else
2059 { 2096 {
… …
2094 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2095 } 2132 }
2096 } 2133 }
2097 } 2134 }
2098 2135
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100#if ENABLE_OVERLAY
2101 scr_swap_overlay ();
2102#endif
2103
2104#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2105 /* 2137 /*
2106 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2107 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2108 */ 2140 */
… …
2197 continue; 2229 continue;
2198 2230
2199 // redraw one or more characters 2231 // redraw one or more characters
2200 2232
2201 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2203 --col; 2235 --col;
2204 2236
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206 text_t *text = stp + col; 2238 text_t *text = stp + col;
2207 int count = 1; 2239 int count = 1;
2208 2240
2209 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2210 drp[col] = rend; 2242 drp[col] = rend;
… …
2214 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2215 { 2247 {
2216 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2217 { 2249 {
2218 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2219 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2220 count++; 2253 count++;
2221 i++; 2254 i++;
2222 2255
2223 continue; 2256 continue;
2224 } 2257 }
… …
2244 2277
2245 col--; /* went one too far. move back */ 2278 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2279 count -= i; /* dump any matching trailing chars */
2247 2280
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2281 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2282 while (expect_false (i && text[count] == NOCHAR))
2250 count++, i--; 2283 count++, i--;
2251 2284
2252 /* 2285 /*
2253 * Determine the attributes for the string 2286 * Determine the attributes for the string
2254 */ 2287 */
2255 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2257 2290
2258 // only do special processing if any attributes are set, which is unlikely 2291 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2260 { 2293 {
2261 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2262 2295
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2283 2316
2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2318 fore = Color_UL;
2286#endif 2319#endif
2287 2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2339#endif
2340
2288 if (invert) 2341 if (invert)
2289 { 2342 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2296 ::swap (fore, back); 2343 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2301 2344
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV;
2306# endif
2307 if (fore == back) 2346 if (fore == back)
2308 { 2347 {
2309 fore = Color_bg; 2348 fore = Color_bg;
2310 back = Color_fg; 2349 back = Color_fg;
2311 } 2350 }
… …
2347 /* 2386 /*
2348 * Actually do the drawing of the string here 2387 * Actually do the drawing of the string here
2349 */ 2388 */
2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351 2390
2352 if (have_bg && back == Color_bg) 2391 if (expect_true (have_bg && back == Color_bg))
2353 { 2392 {
2354 // this is very ugly, maybe push it into ->draw? 2393 // this is very ugly, maybe push it into ->draw?
2355 2394
2356 for (i = 0; i < count; i++) /* don't draw empty strings */ 2395 for (i = 0; i < count; i++) /* don't draw empty strings */
2357 if (text[i] != ' ') 2396 if (text[i] != ' ')
… …
2364 did_clear: ; 2403 did_clear: ;
2365 } 2404 }
2366 else 2405 else
2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368 2407
2369 if (rend & RS_Uline && font->descent > 1 && fore != back) 2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2370 { 2409 {
2371#if ENABLE_FRILLS 2410#if ENABLE_FRILLS
2372 if (ISSET_PIXCOLOR (Color_underline)) 2411 if (ISSET_PIXCOLOR (Color_underline))
2373 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2412 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374 else 2413 else
… …
2379 xpixel, ypixel + font->ascent + 1, 2418 xpixel, ypixel + font->ascent + 1,
2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381 } 2420 }
2382 } /* for (col....) */ 2421 } /* for (col....) */
2383 } /* for (row....) */ 2422 } /* for (row....) */
2384
2385#if ENABLE_OVERLAY
2386 scr_swap_overlay ();
2387#endif
2388 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389 2423
2390 /* 2424 /*
2391 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2392 */ 2426 */
2393 if (showcursor) 2427 if (showcursor)
… …
2432 } 2466 }
2433 2467
2434 /* 2468 /*
2435 * H: cleanup selection 2469 * H: cleanup selection
2436 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2437 scr_reverse_selection (); 2476 scr_reverse_selection ();
2438 2477
2478 screen.flags = old_screen_flags;
2439 num_scr = 0; 2479 num_scr = 0;
2440 num_scr_allow = 1; 2480 num_scr_allow = 1;
2441} 2481}
2442 2482
2443void 2483void
… …
2478 2518
2479 if (scrollBar.win) 2519 if (scrollBar.win)
2480 { 2520 {
2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482 scrollBar.state = STATE_IDLE; 2522 scrollBar.state = STATE_IDLE;
2483 scrollbar_show (0); 2523 scrollBar.show (0);
2484 } 2524 }
2485 2525
2526#endif
2527
2528 /* bgPixmap.apply () does not do the following : */
2486 scr_clear (); 2529 scr_clear ();
2487 scr_touch (true); 2530 scr_touch (true);
2488 want_refresh = 1; 2531 want_refresh = 1;
2489
2490#endif
2491} 2532}
2492 2533
2493/* ------------------------------------------------------------------------- */ 2534/* ------------------------------------------------------------------------- */
2494void 2535void
2495rxvt_term::scr_clear (bool really) NOTHROW 2536rxvt_term::scr_clear (bool really) NOTHROW
… …
2562 { 2603 {
2563#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2564 if (selection.rect) 2605 if (selection.rect)
2565 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2566 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2567 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2568 else 2609 else
2569#endif 2610#endif
2570 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2571 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2572 RS_RVid); 2613 RS_Sel | RS_RVid);
2573 } 2614 }
2574} 2615}
2575 2616
2576/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2577/* 2618/*
… …
2584{ 2625{
2585 int row, wrote; 2626 int row, wrote;
2586 unsigned int width, towrite; 2627 unsigned int width, towrite;
2587 char r1[] = "\n"; 2628 char r1[] = "\n";
2588 2629
2589 for (row = saveLines - nsaved; 2630 for (row = saveLines + top_row;
2590 row < saveLines + nrow - 1; row++) 2631 row < saveLines + nrow - 1; row++)
2591 { 2632 {
2592 width = row_buf[row].l >= 0 ? row_buf[row].l 2633 width = row_buf[row].l >= 0 ? row_buf[row].l
2593 : ncol; 2634 : ncol;
2594 for (towrite = width; towrite; towrite -= wrote) 2635 for (towrite = width; towrite; towrite -= wrote)
… …
2870 selection_wait = Sel_normal; 2911 selection_wait = Sel_normal;
2871 2912
2872#if X_HAVE_UTF8_STRING 2913#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String; 2914 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return; 2916 return;
2876#else 2917#else
2877 selection_type = Sel_CompoundText; 2918 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return; 2920 return;
2880#endif 2921#endif
2881 } 2922 }
2882 2923
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false); 2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2912/* 2953/*
2913 * Clear all selected text 2954 * Clear all selected text
2914 * EXT: SelectionClear 2955 * EXT: SelectionClear
2915 */ 2956 */
2916void 2957void
2917rxvt_term::selection_clear () NOTHROW 2958rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2959{
2960 if (!clipboard)
2961 {
2919 want_refresh = 1; 2962 want_refresh = 1;
2920 free (selection.text); 2963 free (selection.text);
2921 selection.text = NULL; 2964 selection.text = NULL;
2922 selection.len = 0; 2965 selection.len = 0;
2923 CLEAR_SELECTION (); 2966 CLEAR_SELECTION ();
2924 2967
2925 if (display->selection_owner == this) 2968 if (display->selection_owner == this)
2926 display->selection_owner = 0; 2969 display->selection_owner = 0;
2970 }
2971 else
2972 {
2973 free (selection.clip_text);
2974 selection.clip_text = NULL;
2975 selection.clip_len = 0;
2976
2977 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0;
2979 }
2927} 2980}
2928 2981
2929/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
2930/* 2983/*
2931 * Copy a selection into the cut buffer 2984 * Copy a selection into the cut buffer
… …
3057 3110
3058 selection_grab (tm); 3111 selection_grab (tm);
3059} 3112}
3060 3113
3061bool 3114bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 3115rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 3116{
3117 Atom sel;
3118
3119 if (!clipboard)
3120 {
3064 selection_time = tm; 3121 selection_time = tm;
3122 sel = XA_PRIMARY;
3123 }
3124 else
3125 {
3126 clipboard_time = tm;
3127 sel = xa[XA_CLIPBOARD];
3128 }
3065 3129
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3130 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3131 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 3132 {
3069 display->set_selection_owner (this); 3133 display->set_selection_owner (this, clipboard);
3070 return true; 3134 return true;
3071 } 3135 }
3072 else 3136 else
3073 { 3137 {
3074 selection_clear (); 3138 selection_clear (clipboard);
3075 return false; 3139 return false;
3076 } 3140 }
3077 3141
3078#if 0 3142#if 0
3079 XTextProperty ct; 3143 XTextProperty ct;
… …
3574 else if (rq.target == xa[XA_MULTIPLE]) 3638 else if (rq.target == xa[XA_MULTIPLE])
3575 { 3639 {
3576 /* TODO: Handle MULTIPLE */ 3640 /* TODO: Handle MULTIPLE */
3577 } 3641 }
3578#endif 3642#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3643 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3580 { 3644 {
3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3645 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3646 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3647 ev.property = rq.property;
3648 }
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3650 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3583 ev.property = rq.property; 3653 ev.property = rq.property;
3584 } 3654 }
3585 else if (rq.target == XA_STRING 3655 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3656 || rq.target == xa[XA_TEXT]
3587 || rq.target == xa[XA_COMPOUND_TEXT] 3657 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3620 { 3690 {
3621 target = xa[XA_COMPOUND_TEXT]; 3691 target = xa[XA_COMPOUND_TEXT];
3622 style = enc_compound_text; 3692 style = enc_compound_text;
3623 } 3693 }
3624 3694
3625 if (selection.text) 3695 if (rq.selection == XA_PRIMARY && selection.text)
3626 { 3696 {
3627 cl = selection.text; 3697 cl = selection.text;
3628 selectlen = selection.len; 3698 selectlen = selection.len;
3699 }
3700 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3701 {
3702 cl = selection.clip_text;
3703 selectlen = selection.clip_len;
3629 } 3704 }
3630 else 3705 else
3631 { 3706 {
3632 cl = L""; 3707 cl = L"";
3633 selectlen = 0; 3708 selectlen = 0;
… …
3701 h += 2; min_it (h, nrow); 3776 h += 2; min_it (h, nrow);
3702 3777
3703 x -= 1; clamp_it (x, 0, ncol - w); 3778 x -= 1; clamp_it (x, 0, ncol - w);
3704 y -= 1; clamp_it (y, 0, nrow - h); 3779 y -= 1; clamp_it (y, 0, nrow - h);
3705 3780
3706 ov_x = x; ov_y = y; 3781 ov.x = x; ov.y = y;
3707 ov_w = w; ov_h = h; 3782 ov.w = w; ov.h = h;
3708 3783
3709 ov_text = new text_t *[h]; 3784 ov.text = new text_t *[h];
3710 ov_rend = new rend_t *[h]; 3785 ov.rend = new rend_t *[h];
3711 3786
3712 for (y = 0; y < h; y++) 3787 for (y = 0; y < h; y++)
3713 { 3788 {
3714 text_t *tp = ov_text[y] = new text_t[w]; 3789 text_t *tp = ov.text[y] = new text_t[w];
3715 rend_t *rp = ov_rend[y] = new rend_t[w]; 3790 rend_t *rp = ov.rend[y] = new rend_t[w];
3716 3791
3717 text_t t0, t1, t2; 3792 text_t t0, t1, t2;
3718 rend_t r = OVERLAY_RSTYLE; 3793 rend_t r = OVERLAY_RSTYLE;
3719 3794
3720 if (y == 0) 3795 if (y == 0)
… …
3739} 3814}
3740 3815
3741void 3816void
3742rxvt_term::scr_overlay_off () NOTHROW 3817rxvt_term::scr_overlay_off () NOTHROW
3743{ 3818{
3744 if (!ov_text) 3819 if (!ov.text)
3745 return; 3820 return;
3746 3821
3747 want_refresh = 1; 3822 want_refresh = 1;
3748 3823
3749 for (int y = 0; y < ov_h; y++) 3824 for (int y = 0; y < ov.h; y++)
3750 { 3825 {
3751 delete [] ov_text[y]; 3826 delete [] ov.text[y];
3752 delete [] ov_rend[y]; 3827 delete [] ov.rend[y];
3753 } 3828 }
3754 3829
3755 delete [] ov_text; ov_text = 0; 3830 delete [] ov.text; ov.text = 0;
3756 delete [] ov_rend; ov_rend = 0; 3831 delete [] ov.rend; ov.rend = 0;
3757} 3832}
3758 3833
3759void 3834void
3760rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3835rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3761{ 3836{
3762 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3837 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3763 return; 3838 return;
3764 3839
3765 x++, y++; 3840 x++, y++;
3766 3841
3767 ov_text[y][x] = text; 3842 ov.text[y][x] = text;
3768 ov_rend[y][x] = rend; 3843 ov.rend[y][x] = rend;
3769} 3844}
3770 3845
3771void 3846void
3772rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3847rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3773{ 3848{
… …
3792} 3867}
3793 3868
3794void 3869void
3795rxvt_term::scr_swap_overlay () NOTHROW 3870rxvt_term::scr_swap_overlay () NOTHROW
3796{ 3871{
3797 if (!ov_text) 3872 if (!ov.text)
3798 return; 3873 return;
3799 3874
3875 // hide cursor if it is within the overlay area
3876 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3877 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3878 screen.flags &= ~Screen_VisibleCursor;
3879
3800 // swap screen mem with overlay 3880 // swap screen mem with overlay
3801 for (int y = ov_h; y--; ) 3881 for (int y = ov.h; y--; )
3802 { 3882 {
3803 text_t *t1 = ov_text[y]; 3883 text_t *t1 = ov.text[y];
3804 rend_t *r1 = ov_rend[y]; 3884 rend_t *r1 = ov.rend[y];
3805 3885
3806 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3886 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3807 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3887 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3808 3888
3809 for (int x = ov_w; x--; ) 3889 for (int x = ov.w; x--; )
3810 { 3890 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3891 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3892 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 } 3893 }
3814 } 3894 }

Diff Legend

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