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.306 by root, Sun Jun 15 10:15:39 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 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
… …
886# else 898# else
887 c = 0xfffd; 899 c = 0xfffd;
888# endif 900# endif
889#endif 901#endif
890 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
891 // nuke the character at this position, if required 919 // nuke the character at this position, if required
920 if (expect_false (
892 if (line->t[screen.cur.col] == NOCHAR 921 line->t[screen.cur.col] == NOCHAR
893 || (screen.cur.col < ncol - 1 922 || (screen.cur.col < ncol - 1
894 && line->t[screen.cur.col + 1] == NOCHAR)) 923 && line->t[screen.cur.col + 1] == NOCHAR)
895 { 924 ))
896 int col = screen.cur.col; 925 scr_kill_char (*line, screen.cur.col);
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 = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922 926
923 line->touch (); 927 line->touch ();
924 928
925 do 929 do
926 { 930 {
927 line->t[screen.cur.col] = c; 931 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 932 line->r[screen.cur.col] = rend;
929 933
930 if (screen.cur.col < ncol - 1) 934 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 935 screen.cur.col++;
932 else 936 else
933 { 937 {
934 line->l = ncol; 938 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 939 if (screen.flags & Screen_Autowrap)
… …
937 break; 941 break;
938 } 942 }
939 943
940 c = NOCHAR; 944 c = NOCHAR;
941 } 945 }
942 while (--width > 0); 946 while (expect_false (--width > 0));
943 947
944 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 949 if (expect_false (!width))
946 { 950 {
947 line->touch (); 951 line->touch ();
948 952
949 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++)
950 { 954 {
951 line->t[c] = ' '; 955 line->t[c] = ' ';
952 line->r[c] = rend; 956 line->r[c] = rend;
953 } 957 }
954 } 958 }
955 } 959 }
960#if ENABLE_COMBINING
956 else // width == 0 961 else // width == 0
957 { 962 {
958#if ENABLE_COMBINING 963 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 { 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 {
969 linep = line; 975 linep = line;
970 tp = line->t + screen.cur.col - 1; 976 tp = line->t + screen.cur.col - 1;
971 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));
972 } 1001 }
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 } 1002 }
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 1003#endif
996 }
997 } 1004 }
998 1005
999 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1000 1007
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1003#endif
1004} 1009}
1005 1010
1006/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1007/* 1012/*
1008 * 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
… …
1021 1026
1022 want_refresh = 1; 1027 want_refresh = 1;
1023#endif 1028#endif
1024 } 1029 }
1025 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1026 else 1033 else
1027 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1028} 1035}
1029 1036
1030/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1337 return; 1344 return;
1338 1345
1339 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1340 1347
1341 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1351 {
1345 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1346 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);
1347 } 1358 }
1348 else 1359 else
1349 { 1360 {
1350 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1352 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1353 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1354 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1356 } 1374 }
1357 1375
1358 for (; num--; row++) 1376 for (; num--; row++)
1359 { 1377 {
1360 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1361 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1362 } 1382 }
1363} 1383}
1364 1384
1365#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1366void 1386void
… …
1440 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1441 */ 1461 */
1442void 1462void
1443rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1444{ 1464{
1445 int col, row;
1446 rend_t tr;
1447
1448 want_refresh = 1; 1465 want_refresh = 1;
1449 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1450 1467
1451 if (count <= 0) 1468 if (count <= 0)
1452 return; 1469 return;
… …
1454 scr_do_wrap (); 1471 scr_do_wrap ();
1455 1472
1456 selection_check (1); 1473 selection_check (1);
1457 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1458 1475
1459 row = screen.cur.row; 1476 int row = screen.cur.row;
1460 1477
1461 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1462 1479
1463 line->touch (); 1480 line->touch ();
1464 line->is_longer (0); 1481 line->is_longer (0);
1465 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1466 switch (insdel) 1487 switch (insdel)
1467 { 1488 {
1468 case INSERT: 1489 case INSERT:
1469 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--)
1470 { 1496 {
1471 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1472 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1473 } 1499 }
1474
1475 line->l = min (line->l + count, ncol);
1476 1500
1477 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1478 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1479 { 1503 {
1480 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
… …
1495 case ERASE: 1519 case ERASE:
1496 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1497 selection_check (1); 1521 selection_check (1);
1498 screen.cur.col -= count; 1522 screen.cur.col -= count;
1499 1523
1500 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
1501 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1502 break; 1529 break;
1503 1530
1504 case DELETE: 1531 case DELETE:
1505 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1506 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
1507 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1508 { 1539 {
1509 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1510 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1511 } 1542 }
1512 1543
1513 line->l = max (line->l - count, 0);
1514 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1515 1545
1516 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1517 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1518 { 1548 {
1519 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1809 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1810 { 1840 {
1811 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1812 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1813 } 1843 }
1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1815 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++)
1816 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);
1817 1847
1818 num_scr_allow = 0; 1848 num_scr_allow = 0;
1819 1849
… …
1897 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1898# endif 1928# endif
1899 1929
1900# if ENABLE_FRILLS 1930# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell)) 1931 if (option (Opt_urgentOnBell))
1902 { 1932 set_urgency (1);
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif 1933# endif
1910 1934
1911 if (option (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1912 { 1936 {
1913 rvideo_bell = true; 1937 rvideo_bell = true;
… …
1916 1940
1917 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1918 } 1942 }
1919 else 1943 else
1920 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1921#endif 1946#endif
1922} 1947}
1923 1948
1924/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1925/* ARGSUSED */ 1950/* ARGSUSED */
1926void 1951void
1927rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1928{ 1953{
1929#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1930 int nrows, row_start; 1955 int nrows, row_start;
1931 FILE *fd; 1956 FILE *fd = popen_printer ();
1932 1957
1933 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1934 return; 1959 return;
1935 1960
1936 if (fullhist) 1961 if (fullhist)
1937 { 1962 {
1938 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1944 row_start = view_start; 1969 row_start = view_start;
1945 } 1970 }
1946 1971
1947 wctomb (0, 0); 1972 wctomb (0, 0);
1948 1973
1949 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1950 { 1975 {
1951 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1952 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1953 1978
1954 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
… …
1983 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1984 */ 2009 */
1985void 2010void
1986rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1987{ 2012{
1988 unsigned char have_bg,
1989 showcursor; /* show the cursor */
1990 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1991 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1992 int i; /* tmp */ 2015 int i; /* tmp */
1993#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1994 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2005 /* 2028 /*
2006 * A: set up vars 2029 * A: set up vars
2007 */ 2030 */
2008 refresh_count = 0; 2031 refresh_count = 0;
2009 2032
2033 unsigned int old_screen_flags = screen.flags;
2010 have_bg = 0; 2034 char have_bg = 0;
2011#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2012 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2013#endif 2037#endif
2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2015 2039
2016 /* 2040 /*
2017 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2018 */ 2042 */
2019 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;
2020 2051
2021 /* 2052 /*
2022 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2023 */ 2054 */
2024 { 2055 {
2025 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2026 2057
2027 showcursor = (screen.flags & Screen_VisibleCursor);
2028#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2029 if (hidden_cursor) 2059 if (hidden_cursor)
2030 showcursor = 0; 2060 showcursor = 0;
2031#endif 2061#endif
2032 2062
… …
2060 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2061#else 2091#else
2062 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2063#endif 2093#endif
2064 2094
2065 if (showcursor && focus) 2095 if (focus)
2066 { 2096 {
2067 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2068 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2069 else 2099 else
2070 { 2100 {
… …
2105 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2106 } 2136 }
2107 } 2137 }
2108 } 2138 }
2109 2139
2110 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2111#if ENABLE_OVERLAY
2112 scr_swap_overlay ();
2113#endif
2114
2115#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2116 /* 2141 /*
2117 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2118 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2119 */ 2144 */
… …
2208 continue; 2233 continue;
2209 2234
2210 // redraw one or more characters 2235 // redraw one or more characters
2211 2236
2212 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2213 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2214 --col; 2239 --col;
2215 2240
2216 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2217 text_t *text = stp + col; 2242 text_t *text = stp + col;
2218 int count = 1; 2243 int count = 1;
2219 2244
2220 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2221 drp[col] = rend; 2246 drp[col] = rend;
… …
2225 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2226 { 2251 {
2227 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2228 { 2253 {
2229 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2230 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2231 count++; 2257 count++;
2232 i++; 2258 i++;
2233 2259
2234 continue; 2260 continue;
2235 } 2261 }
… …
2255 2281
2256 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2257 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2258 2284
2259 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2260 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2261 count++, i--; 2287 count++, i--;
2262 2288
2263 /* 2289 /*
2264 * Determine the attributes for the string 2290 * Determine the attributes for the string
2265 */ 2291 */
2266 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2267 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2268 2294
2269 // 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
2270 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)))
2271 { 2297 {
2272 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2273 2299
2274#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2275 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2294 2320
2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2322 fore = Color_UL;
2297#endif 2323#endif
2298 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
2299 if (invert) 2345 if (invert)
2300 { 2346 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2307 ::swap (fore, back); 2347 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2312 2348
2313#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2315 if (ISSET_PIXCOLOR (Color_RV))
2316 back = Color_RV;
2317# endif
2318 if (fore == back) 2350 if (fore == back)
2319 { 2351 {
2320 fore = Color_bg; 2352 fore = Color_bg;
2321 back = Color_fg; 2353 back = Color_fg;
2322 } 2354 }
… …
2358 /* 2390 /*
2359 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2360 */ 2392 */
2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2362 2394
2363 if (have_bg && back == Color_bg) 2395 if (expect_true (have_bg && back == Color_bg))
2364 { 2396 {
2365 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2366 2398
2367 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2368 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2375 did_clear: ; 2407 did_clear: ;
2376 } 2408 }
2377 else 2409 else
2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2379 2411
2380 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2381 { 2413 {
2382#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2383 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2384 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2385 else 2417 else
… …
2390 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2392 } 2424 }
2393 } /* for (col....) */ 2425 } /* for (col....) */
2394 } /* for (row....) */ 2426 } /* for (row....) */
2395
2396#if ENABLE_OVERLAY
2397 scr_swap_overlay ();
2398#endif
2399 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2400 2427
2401 /* 2428 /*
2402 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2403 */ 2430 */
2404 if (showcursor) 2431 if (showcursor)
… …
2443 } 2470 }
2444 2471
2445 /* 2472 /*
2446 * H: cleanup selection 2473 * H: cleanup selection
2447 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2448 scr_reverse_selection (); 2480 scr_reverse_selection ();
2449 2481
2482 screen.flags = old_screen_flags;
2450 num_scr = 0; 2483 num_scr = 0;
2451 num_scr_allow = 1; 2484 num_scr_allow = 1;
2452} 2485}
2453 2486
2454void 2487void
… …
2574 { 2607 {
2575#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2576 if (selection.rect) 2609 if (selection.rect)
2577 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2579 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2580 else 2613 else
2581#endif 2614#endif
2582 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2583 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2584 RS_RVid); 2617 RS_Sel | RS_RVid);
2585 } 2618 }
2586} 2619}
2587 2620
2588/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2589/* 2622/*
… …
2650/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2651/* 2684/*
2652 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2653 */ 2686 */
2654void 2687void
2655rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2656{ 2689{
2657 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2658 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2659 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2660 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2664 2697
2665 tt_write (data, len); 2698 tt_write (data, len);
2666 2699
2667 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~"); 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);
2669} 2711}
2670 2712
2671/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2672/* 2714/*
2673 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2882 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2883 2925
2884#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2885 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2887 return; 2929 return;
2888#else 2930#else
2889 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2891 return; 2933 return;
2892#endif 2934#endif
2893 } 2935 }
2894 2936
2895 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2896 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2924/* 2966/*
2925 * Clear all selected text 2967 * Clear all selected text
2926 * EXT: SelectionClear 2968 * EXT: SelectionClear
2927 */ 2969 */
2928void 2970void
2929rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2930{ 2972{
2973 if (!clipboard)
2974 {
2931 want_refresh = 1; 2975 want_refresh = 1;
2932 free (selection.text); 2976 free (selection.text);
2933 selection.text = NULL; 2977 selection.text = NULL;
2934 selection.len = 0; 2978 selection.len = 0;
2935 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2936 2980
2937 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2938 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 }
2939} 2993}
2940 2994
2941/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2942/* 2996/*
2943 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3069 3123
3070 selection_grab (tm); 3124 selection_grab (tm);
3071} 3125}
3072 3126
3073bool 3127bool
3074rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3075{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3076 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 }
3077 3142
3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3080 { 3145 {
3081 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3082 return true; 3147 return true;
3083 } 3148 }
3084 else 3149 else
3085 { 3150 {
3086 selection_clear (); 3151 selection_clear (clipboard);
3087 return false; 3152 return false;
3088 } 3153 }
3089 3154
3090#if 0 3155#if 0
3091 XTextProperty ct; 3156 XTextProperty ct;
… …
3586 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3587 { 3652 {
3588 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3589 } 3654 }
3590#endif 3655#endif
3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3592 { 3657 {
3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3594 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);
3595 ev.property = rq.property; 3666 ev.property = rq.property;
3596 } 3667 }
3597 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3598 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3599 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3632 { 3703 {
3633 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3634 style = enc_compound_text; 3705 style = enc_compound_text;
3635 } 3706 }
3636 3707
3637 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3638 { 3709 {
3639 cl = selection.text; 3710 cl = selection.text;
3640 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;
3641 } 3717 }
3642 else 3718 else
3643 { 3719 {
3644 cl = L""; 3720 cl = L"";
3645 selectlen = 0; 3721 selectlen = 0;
… …
3713 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3714 3790
3715 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3717 3793
3718 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3719 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3720 3796
3721 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3722 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3723 3799
3724 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3725 { 3801 {
3726 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3727 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3728 3804
3729 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3730 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3731 3807
3732 if (y == 0) 3808 if (y == 0)
… …
3751} 3827}
3752 3828
3753void 3829void
3754rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3755{ 3831{
3756 if (!ov_text) 3832 if (!ov.text)
3757 return; 3833 return;
3758 3834
3759 want_refresh = 1; 3835 want_refresh = 1;
3760 3836
3761 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3762 { 3838 {
3763 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3764 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3765 } 3841 }
3766 3842
3767 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3768 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3769} 3845}
3770 3846
3771void 3847void
3772rxvt_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
3773{ 3849{
3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775 return; 3851 return;
3776 3852
3777 x++, y++; 3853 x++, y++;
3778 3854
3779 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3780 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3781} 3857}
3782 3858
3783void 3859void
3784rxvt_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
3785{ 3861{
… …
3804} 3880}
3805 3881
3806void 3882void
3807rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3808{ 3884{
3809 if (!ov_text) 3885 if (!ov.text)
3810 return; 3886 return;
3811 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
3812 // swap screen mem with overlay 3893 // swap screen mem with overlay
3813 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3814 { 3895 {
3815 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3816 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3817 3898
3818 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;
3819 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;
3820 3901
3821 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3822 { 3903 {
3823 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824 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));
3825 } 3906 }
3826 } 3907 }

Diff Legend

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