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.307 by root, Fri Jun 27 00:44:32 2008 UTC vs.
Revision 1.356 by sf-exg, Tue Dec 21 10:37:42 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
… …
132 133
133 l.l = 0; 134 l.l = 0;
134 l.f = 0; 135 l.f = 0;
135} 136}
136 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
157}
158
137/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
140 162
141void 163void
142rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
143{ 165{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 166 view_start = 0;
150 num_scr = 0; 167 num_scr = 0;
151 168
152 if (ncol == 0) 169 if (ncol == 0)
153 ncol = 80; 170 ncol = 80;
… …
155 if (nrow == 0) 172 if (nrow == 0)
156 nrow = 24; 173 nrow = 24;
157 174
158 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 176 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 177
164 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
166 { 180 {
167 //TODO//FIXME 181 //TODO//FIXME
… …
220 selection.text = NULL; 234 selection.text = NULL;
221 selection.len = 0; 235 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
224 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
225 } 241 }
226 else 242 else
227 { 243 {
228 /* 244 /*
229 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
267 283
268 if (top_row) 284 if (top_row)
269 { 285 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
272 289
273 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 292
276 do 293 do
277 { 294 {
278 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 297 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 299
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 301 {
… …
380 delete old_ta; 395 delete old_ta;
381 delete old_ra; 396 delete old_ra;
382 397
383 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
385 401
386 free (tabs); 402 free (tabs);
387 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
388 407
389 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
390 409
391 prev_nrow = nrow; 410 prev_nrow = nrow;
392 prev_ncol = ncol; 411 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 412
402 tt_winch (); 413 tt_winch ();
403 414
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 416}
… …
417 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
418 429
419 free (row_buf); 430 free (row_buf);
420 free (swap_buf); 431 free (swap_buf);
421 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
422 free (tabs); 435 free (tabs);
423 436 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 437 }
426} 438}
427 439
428/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
429/* 441/*
430 * Hard reset 442 * Hard/Soft reset
431 */ 443 */
432void 444void
433rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
434{ 446{
435 scr_release (); 447 scr_release ();
436 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
437 scr_reset (); 451 scr_reset ();
438 452
439 scr_clear (true); 453 scr_clear (true);
440 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
441} 471}
442 472
443/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
483 } 513 }
484 514
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
491#endif
492} 520}
493 521
494void 522void
495rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
496{ 524{
… …
521 want_refresh = 1; 549 want_refresh = 1;
522 view_start = 0; 550 view_start = 0;
523 551
524 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
525 553
526 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
527 555
528#if NSCREENS 556#if NSCREENS
529 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
530 { 558 {
531 num_scr = 0; 559 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
758 } 786 }
759 } 787 }
760 788
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 792 int row = screen.cur.row;
767 793
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 795
770 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
771 797
772 while (str < strend) 798 while (str < strend)
773 { 799 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 801
776 if (c < 0x20) 802 if (expect_false (c < 0x20))
777 if (c == C0_LF) 803 if (c == C0_LF)
778 { 804 {
779 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
780 806
781 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
800 { 826 {
801 scr_tab (1, true); 827 scr_tab (1, true);
802 continue; 828 continue;
803 } 829 }
804 830
831 if (expect_false (
805 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
806 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
808 { 836 {
809 checksel = 0; 837 checksel = 0;
810 /* 838 /*
811 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
812 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
813 * should be a similar check. 841 * should be a similar check.
814 */ 842 */
815 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
816 } 844 }
817 845
818 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
819 { 847 {
820 scr_do_wrap (); 848 scr_do_wrap ();
821 849
822 line->l = ncol; 850 line->l = ncol;
823 line->is_longer (1); 851 line->is_longer (1);
… …
825 row = screen.cur.row; 853 row = screen.cur.row;
826 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
827 } 855 }
828 856
829 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
830 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831 c = 0xfffd; 859 c = 0xfffd;
832 860
833 // rely on wcwidth to tell us the character width, do wcwidth before 861 // rely on wcwidth to tell us the character width, do wcwidth before
834 // further replacements, as wcwidth might return -1 for the line 862 // further replacements, as wcwidth might return -1 for the line
835 // drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
836 // locale. 864 // locale.
837 int width = WCWIDTH (c); 865 int width = WCWIDTH (c);
838 866
839 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
840 { 868 {
841 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
842 // 5f-7e standard vt100 870 // 5f-7e standard vt100
843 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
844 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
858 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
859 } 887 }
860 } 888 }
861 889
862 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
863 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
864 892
865 if (width != 0) 893 if (width != 0)
866 { 894 {
867#if !UNICODE_3 895#if !UNICODE_3
… …
872# else 900# else
873 c = 0xfffd; 901 c = 0xfffd;
874# endif 902# endif
875#endif 903#endif
876 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
877 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
878 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
879 || (screen.cur.col < ncol - 1 926 scr_kill_char (*line, screen.cur.col);
880 && line->t[screen.cur.col + 1] == NOCHAR))
881 {
882 int col = screen.cur.col;
883
884 // find begin
885 while (col > 0 && line->t[col] == NOCHAR)
886 col--;
887
888 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
889
890 // found begin, nuke
891 do {
892 line->t[col] = ' ';
893 line->r[col] = rend;
894 col++;
895 } while (col < ncol && line->t[col] == NOCHAR);
896 }
897
898 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899
900 // if the character doesn't fit into the remaining columns...
901 if (screen.cur.col > ncol - width && ncol >= width)
902 {
903 // ...output spaces
904 c = ' ';
905 // and try the same character next loop iteration
906 --str;
907 }
908 927
909 line->touch (); 928 line->touch ();
910 929
911 do 930 do
912 { 931 {
913 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
914 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
915 934
916 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
917 screen.cur.col++; 936 screen.cur.col++;
918 else 937 else
919 { 938 {
920 line->l = ncol; 939 line->l = ncol;
921 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
922 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
923 break; 942
943 goto end_of_line;
924 } 944 }
925 945
926 c = NOCHAR; 946 c = NOCHAR;
927 } 947 }
928 while (--width > 0); 948 while (expect_false (--width > 0));
929 949
930 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
931 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
932 { 952 {
933 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
934 956
935 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 957end_of_line:
958 ;
959 }
960#if ENABLE_COMBINING
961 else // width == 0
962 {
963 if (c != 0xfeff) // ignore BOM
964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
936 { 974 {
937 line->t[c] = ' ';
938 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
939 } 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));
940 } 1001 }
941 } 1002 }
942 else // width == 0
943 {
944#if ENABLE_COMBINING
945 // handle combining characters
946 // we just tag the accent on the previous on-screen character.
947 // this is arguably not correct, but also arguably not wrong.
948 // we don't handle double-width characters nicely yet.
949 line_t *linep;
950 text_t *tp;
951 rend_t *rp;
952
953 if (screen.cur.col > 0)
954 {
955 linep = line;
956 tp = line->t + screen.cur.col - 1;
957 rp = line->r + screen.cur.col - 1;
958 }
959 else if (screen.cur.row > 0
960 && ROW(screen.cur.row - 1).is_longer ())
961 {
962 linep = &ROW(screen.cur.row - 1);
963 tp = line->t + ncol - 1;
964 rp = line->r + ncol - 1;
965 }
966 else
967 continue;
968
969 linep->touch ();
970
971 while (*tp == NOCHAR && tp > linep->t)
972 tp--, rp--;
973
974 // first try to find a precomposed character
975 unicode_t n = rxvt_compose (*tp, c);
976 if (n == NOCHAR)
977 n = rxvt_composite.compose (*tp, c);
978
979 *tp = n;
980 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
981#endif 1003#endif
982 }
983 } 1004 }
984 1005
985 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
986 1007
987#ifdef DEBUG_STRICT
988 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
989#endif
990} 1009}
991 1010
992/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
993/* 1012/*
994 * 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
… …
1007 1026
1008 want_refresh = 1; 1027 want_refresh = 1;
1009#endif 1028#endif
1010 } 1029 }
1011 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1012 else 1033 else
1013 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1014} 1035}
1015 1036
1016/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1322 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1323 return; 1344 return;
1324 1345
1325 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1326 1347
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1328 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1329 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1330 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1331 { 1351 {
1332 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1333 1353
1334 if (mapped) 1354 if (mapped)
1335 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1337 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1338 } 1358 }
1339 else 1359 else
1340 { 1360 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 1362
1363 if (mapped)
1364 {
1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1345 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row), 1368 0, Row2Pixel (row - view_start),
1347 (unsigned int)width, 1369 (unsigned int)width,
1348 (unsigned int)Height2Pixel (num)); 1370 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1351 } 1374 }
1352 1375
1353 for (; num--; row++) 1376 for (; num--; row++)
1354 { 1377 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1382 }
1358} 1383}
1359 1384
1360#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1361void 1386void
… …
1435 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1436 */ 1461 */
1437void 1462void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1464{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1465 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1445 1467
1446 if (count <= 0) 1468 if (count <= 0)
1447 return; 1469 return;
… …
1449 scr_do_wrap (); 1471 scr_do_wrap ();
1450 1472
1451 selection_check (1); 1473 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1453 1475
1454 row = screen.cur.row; 1476 int row = screen.cur.row;
1455 1477
1456 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1457 1479
1458 line->touch (); 1480 line->touch ();
1459 line->is_longer (0); 1481 line->is_longer (0);
1460 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1461 switch (insdel) 1487 switch (insdel)
1462 { 1488 {
1463 case INSERT: 1489 case INSERT:
1464 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--)
1465 { 1496 {
1466 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1468 } 1499 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1500
1472 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1503 {
1475 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
… …
1490 case ERASE: 1519 case ERASE:
1491 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1492 selection_check (1); 1521 selection_check (1);
1493 screen.cur.col -= count; 1522 screen.cur.col -= count;
1494 1523
1495 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
1496 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1497 break; 1529 break;
1498 1530
1499 case DELETE: 1531 case DELETE:
1500 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1501 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
1502 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1503 { 1539 {
1504 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1505 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1506 } 1542 }
1507 1543
1508 line->l = max (line->l - count, 0);
1509 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1510 1545
1511 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1548 {
1514 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1840 {
1806 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1808 } 1843 }
1809// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1810 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++)
1811 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);
1812 1847
1813 num_scr_allow = 0; 1848 num_scr_allow = 0;
1814 1849
… …
1892 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1893# endif 1928# endif
1894 1929
1895# if ENABLE_FRILLS 1930# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1931 if (option (Opt_urgentOnBell))
1897 { 1932 set_urgency (1);
1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 {
1900 h->flags |= XUrgencyHint;
1901 XSetWMHints (dpy, parent[0], h);
1902 }
1903 }
1904# endif 1933# endif
1905 1934
1906 if (option (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1907 { 1936 {
1908 rvideo_bell = true; 1937 rvideo_bell = true;
… …
1911 1940
1912 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1942 }
1914 else 1943 else
1915 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1946#endif
1917} 1947}
1918 1948
1919/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1950/* ARGSUSED */
1921void 1951void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1953{
1924#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1925 int nrows, row_start; 1955 int nrows, row_start;
1926 FILE *fd; 1956 FILE *fd = popen_printer ();
1927 1957
1928 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1929 return; 1959 return;
1930 1960
1931 if (fullhist) 1961 if (fullhist)
1932 { 1962 {
1933 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1939 row_start = view_start; 1969 row_start = view_start;
1940 } 1970 }
1941 1971
1942 wctomb (0, 0); 1972 wctomb (0, 0);
1943 1973
1944 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1975 {
1946 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1948 1978
1949 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
… …
1978 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2009 */
1980void 2010void
1981rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1982{ 2012{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2015 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2028 /*
2001 * A: set up vars 2029 * A: set up vars
2002 */ 2030 */
2003 refresh_count = 0; 2031 refresh_count = 0;
2004 2032
2033 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2034 char have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2008#endif 2037#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2039
2011 /* 2040 /*
2012 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2013 */ 2042 */
2014 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;
2015 2051
2016 /* 2052 /*
2017 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2018 */ 2054 */
2019 { 2055 {
2020 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2021 2057
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2059 if (hidden_cursor)
2025 showcursor = 0; 2060 showcursor = 0;
2026#endif 2061#endif
2027 2062
… …
2055 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2056#else 2091#else
2057 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2058#endif 2093#endif
2059 2094
2060 if (showcursor && focus) 2095 if (focus)
2061 { 2096 {
2062 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2064 else 2099 else
2065 { 2100 {
… …
2100 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2101 } 2136 }
2102 } 2137 }
2103 } 2138 }
2104 2139
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2141 /*
2112 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2114 */ 2144 */
… …
2203 continue; 2233 continue;
2204 2234
2205 // redraw one or more characters 2235 // redraw one or more characters
2206 2236
2207 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2208 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2209 --col; 2239 --col;
2210 2240
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2242 text_t *text = stp + col;
2213 int count = 1; 2243 int count = 1;
2214 2244
2215 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2216 drp[col] = rend; 2246 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2221 { 2251 {
2222 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2223 { 2253 {
2224 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2225 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2226 count++; 2257 count++;
2227 i++; 2258 i++;
2228 2259
2229 continue; 2260 continue;
2230 } 2261 }
… …
2250 2281
2251 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2253 2284
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2256 count++, i--; 2287 count++, i--;
2257 2288
2258 /* 2289 /*
2259 * Determine the attributes for the string 2290 * Determine the attributes for the string
2260 */ 2291 */
2261 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2263 2294
2264 // 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
2265 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)))
2266 { 2297 {
2267 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2268 2299
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2320
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2322 fore = Color_UL;
2292#endif 2323#endif
2293 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
2294 if (invert) 2345 if (invert)
2295 { 2346 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2347 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2348
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2350 if (fore == back)
2314 { 2351 {
2315 fore = Color_bg; 2352 fore = Color_bg;
2316 back = Color_fg; 2353 back = Color_fg;
2317 } 2354 }
… …
2353 /* 2390 /*
2354 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2355 */ 2392 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2394
2358 if (have_bg && back == Color_bg) 2395 if (expect_true (have_bg && back == Color_bg))
2359 { 2396 {
2360 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2361 2398
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2370 did_clear: ; 2407 did_clear: ;
2371 } 2408 }
2372 else 2409 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2411
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2413 {
2377#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2417 else
… …
2385 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2424 }
2388 } /* for (col....) */ 2425 } /* for (col....) */
2389 } /* for (row....) */ 2426 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2427
2396 /* 2428 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2430 */
2399 if (showcursor) 2431 if (showcursor)
… …
2438 } 2470 }
2439 2471
2440 /* 2472 /*
2441 * H: cleanup selection 2473 * H: cleanup selection
2442 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2443 scr_reverse_selection (); 2480 scr_reverse_selection ();
2444 2481
2482 screen.flags = old_screen_flags;
2445 num_scr = 0; 2483 num_scr = 0;
2446 num_scr_allow = 1; 2484 num_scr_allow = 1;
2447} 2485}
2448 2486
2449void 2487void
… …
2569 { 2607 {
2570#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2571 if (selection.rect) 2609 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2613 else
2576#endif 2614#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2579 RS_RVid); 2617 RS_Sel | RS_RVid);
2580 } 2618 }
2581} 2619}
2582 2620
2583/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2584/* 2622/*
… …
2589void 2627void
2590rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2629{
2592 int row, wrote; 2630 int row, wrote;
2593 unsigned int width, towrite; 2631 unsigned int width, towrite;
2594 char r1[] = "\n"; 2632 const char r1[] = "\n";
2595 2633
2596 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2598 { 2636 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2645/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2646/* 2684/*
2647 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2648 */ 2686 */
2649void 2687void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2689{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2659 2697
2660 tt_write (data, len); 2698 tt_write (data, len);
2661 2699
2662 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2663 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);
2664} 2711}
2665 2712
2666/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2667/* 2714/*
2668 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2877 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2878 2925
2879#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return; 2929 return;
2883#else 2930#else
2884 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return; 2933 return;
2887#endif 2934#endif
2888 } 2935 }
2889 2936
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2919/* 2966/*
2920 * Clear all selected text 2967 * Clear all selected text
2921 * EXT: SelectionClear 2968 * EXT: SelectionClear
2922 */ 2969 */
2923void 2970void
2924rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2972{
2973 if (!clipboard)
2974 {
2926 want_refresh = 1; 2975 want_refresh = 1;
2927 free (selection.text); 2976 free (selection.text);
2928 selection.text = NULL; 2977 selection.text = NULL;
2929 selection.len = 0; 2978 selection.len = 0;
2930 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2931 2980
2932 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2933 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 }
2934} 2993}
2935 2994
2936/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2937/* 2996/*
2938 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3064 3123
3065 selection_grab (tm); 3124 selection_grab (tm);
3066} 3125}
3067 3126
3068bool 3127bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3071 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 }
3072 3142
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 3145 {
3076 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3077 return true; 3147 return true;
3078 } 3148 }
3079 else 3149 else
3080 { 3150 {
3081 selection_clear (); 3151 selection_clear (clipboard);
3082 return false; 3152 return false;
3083 } 3153 }
3084 3154
3085#if 0 3155#if 0
3086 XTextProperty ct; 3156 XTextProperty ct;
… …
3581 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3652 {
3583 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3584 } 3654 }
3585#endif 3655#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3657 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3589 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);
3590 ev.property = rq.property; 3666 ev.property = rq.property;
3591 } 3667 }
3592 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3627 { 3703 {
3628 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3705 style = enc_compound_text;
3630 } 3706 }
3631 3707
3632 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3709 {
3634 cl = selection.text; 3710 cl = selection.text;
3635 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;
3636 } 3717 }
3637 else 3718 else
3638 { 3719 {
3639 cl = L""; 3720 cl = L"";
3640 selectlen = 0; 3721 selectlen = 0;
… …
3708 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3709 3790
3710 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3712 3793
3713 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3715 3796
3716 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3718 3799
3719 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3720 { 3801 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3804
3724 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3726 3807
3727 if (y == 0) 3808 if (y == 0)
… …
3746} 3827}
3747 3828
3748void 3829void
3749rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3750{ 3831{
3751 if (!ov_text) 3832 if (!ov.text)
3752 return; 3833 return;
3753 3834
3754 want_refresh = 1; 3835 want_refresh = 1;
3755 3836
3756 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3757 { 3838 {
3758 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3760 } 3841 }
3761 3842
3762 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3764} 3845}
3765 3846
3766void 3847void
3767rxvt_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
3768{ 3849{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3851 return;
3771 3852
3772 x++, y++; 3853 x++, y++;
3773 3854
3774 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3776} 3857}
3777 3858
3778void 3859void
3779rxvt_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
3780{ 3861{
… …
3799} 3880}
3800 3881
3801void 3882void
3802rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3884{
3804 if (!ov_text) 3885 if (!ov.text)
3805 return; 3886 return;
3806 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
3807 // swap screen mem with overlay 3893 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3809 { 3895 {
3810 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3812 3898
3813 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;
3814 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;
3815 3901
3816 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3817 { 3903 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 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));
3820 } 3906 }
3821 } 3907 }

Diff Legend

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