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.308 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

… …
132 132
133 l.l = 0; 133 l.l = 0;
134 l.f = 0; 134 l.f = 0;
135} 135}
136 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
137/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
140 159
141void 160void
142rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
143{ 162{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 163 view_start = 0;
150 num_scr = 0; 164 num_scr = 0;
151 165
152 if (ncol == 0) 166 if (ncol == 0)
153 ncol = 80; 167 ncol = 80;
… …
155 if (nrow == 0) 169 if (nrow == 0)
156 nrow = 24; 170 nrow = 24;
157 171
158 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 173 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 174
164 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
166 { 177 {
167 //TODO//FIXME 178 //TODO//FIXME
… …
220 selection.text = NULL; 231 selection.text = NULL;
221 selection.len = 0; 232 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
224 selection.clicks = 0; 235 selection.clicks = 0;
236 selection.clip_text = NULL;
237 selection.clip_len = 0;
225 } 238 }
226 else 239 else
227 { 240 {
228 /* 241 /*
229 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
267 280
268 if (top_row) 281 if (top_row)
269 { 282 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
272 286
273 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 289
276 do 290 do
277 { 291 {
278 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 294 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 296
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 298 {
… …
380 delete old_ta; 392 delete old_ta;
381 delete old_ra; 393 delete old_ra;
382 394
383 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
385 398
386 free (tabs); 399 free (tabs);
387 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
388 404
389 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
390 406
391 prev_nrow = nrow; 407 prev_nrow = nrow;
392 prev_ncol = ncol; 408 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 409
402 tt_winch (); 410 tt_winch ();
403 411
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 413}
… …
417 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
418 426
419 free (row_buf); 427 free (row_buf);
420 free (swap_buf); 428 free (swap_buf);
421 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
422 free (tabs); 432 free (tabs);
423 433 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 434 }
426} 435}
427 436
428/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
429/* 438/*
430 * Hard reset 439 * Hard/Soft reset
431 */ 440 */
432void 441void
433rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
434{ 443{
435 scr_release (); 444 scr_release ();
436 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
437 scr_reset (); 448 scr_reset ();
438 449
439 scr_clear (true); 450 scr_clear (true);
440 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
441} 468}
442 469
443/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
483 } 510 }
484 511
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
491#endif
492} 517}
493 518
494void 519void
495rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
496{ 521{
… …
521 want_refresh = 1; 546 want_refresh = 1;
522 view_start = 0; 547 view_start = 0;
523 548
524 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
525 550
526 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
527 552
528#if NSCREENS 553#if NSCREENS
529 if (option (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
530 { 555 {
531 num_scr = 0; 556 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
758 } 783 }
759 } 784 }
760 785
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 789 int row = screen.cur.row;
767 790
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 792
770 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
771 794
772 while (str < strend) 795 while (str < strend)
773 { 796 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 798
776 if (c < 0x20) 799 if (expect_false (c < 0x20))
777 if (c == C0_LF) 800 if (c == C0_LF)
778 { 801 {
779 max_it (line->l, screen.cur.col); 802 max_it (line->l, screen.cur.col);
780 803
781 screen.flags &= ~Screen_WrapNext; 804 screen.flags &= ~Screen_WrapNext;
… …
800 { 823 {
801 scr_tab (1, true); 824 scr_tab (1, true);
802 continue; 825 continue;
803 } 826 }
804 827
828 if (expect_false (
805 if (checksel /* see if we're writing within selection */ 829 checksel /* see if we're writing within selection */
806 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 831 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 ))
808 { 833 {
809 checksel = 0; 834 checksel = 0;
810 /* 835 /*
811 * If we wrote anywhere in the selected area, kill the selection 836 * If we wrote anywhere in the selected area, kill the selection
812 * XXX: should we kill the mark too? Possibly, but maybe that 837 * XXX: should we kill the mark too? Possibly, but maybe that
813 * should be a similar check. 838 * should be a similar check.
814 */ 839 */
815 CLEAR_SELECTION (); 840 CLEAR_SELECTION ();
816 } 841 }
817 842
818 if (screen.flags & Screen_WrapNext) 843 if (expect_false (screen.flags & Screen_WrapNext))
819 { 844 {
820 scr_do_wrap (); 845 scr_do_wrap ();
821 846
822 line->l = ncol; 847 line->l = ncol;
823 line->is_longer (1); 848 line->is_longer (1);
… …
825 row = screen.cur.row; 850 row = screen.cur.row;
826 line = &ROW(row); /* _must_ refresh */ 851 line = &ROW(row); /* _must_ refresh */
827 } 852 }
828 853
829 // some utf-8 decoders "decode" surrogate characters: let's fix this. 854 // some utf-8 decoders "decode" surrogate characters: let's fix this.
830 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831 c = 0xfffd; 856 c = 0xfffd;
832 857
833 // rely on wcwidth to tell us the character width, do wcwidth before 858 // rely on wcwidth to tell us the character width, do wcwidth before
834 // further replacements, as wcwidth might return -1 for the line 859 // further replacements, as wcwidth might return -1 for the line
835 // drawing characters below as they might be invalid in the current 860 // drawing characters below as they might be invalid in the current
836 // locale. 861 // locale.
837 int width = WCWIDTH (c); 862 int width = WCWIDTH (c);
838 863
839 if (charsets [screen.charset] == '0') // DEC SPECIAL 864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
840 { 865 {
841 // vt100 special graphics and line drawing 866 // vt100 special graphics and line drawing
842 // 5f-7e standard vt100 867 // 5f-7e standard vt100
843 // 40-5e rxvt extension for extra curses acs chars 868 // 40-5e rxvt extension for extra curses acs chars
844 static uint16_t vt100_0[62] = { // 41 .. 7e 869 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 c = vt100_0[c - 0x41]; 882 c = vt100_0[c - 0x41];
858 width = 1; // vt100 line drawing characters are always single-width 883 width = 1; // vt100 line drawing characters are always single-width
859 } 884 }
860 } 885 }
861 886
862 if (screen.flags & Screen_Insert) 887 if (expect_false (screen.flags & Screen_Insert))
863 scr_insdel_chars (width, INSERT); 888 scr_insdel_chars (width, INSERT);
864 889
865 if (width != 0) 890 if (width != 0)
866 { 891 {
867#if !UNICODE_3 892#if !UNICODE_3
… …
873 c = 0xfffd; 898 c = 0xfffd;
874# endif 899# endif
875#endif 900#endif
876 901
877 // nuke the character at this position, if required 902 // nuke the character at this position, if required
903 if (expect_false (
878 if (line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
879 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
880 && line->t[screen.cur.col + 1] == NOCHAR)) 906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
881 { 914 {
882 int col = screen.cur.col; 915 // ... artificially enlargen the previous one
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 = ' '; 916 c = NOCHAR;
905 // and try the same character next loop iteration 917 // and try the same character next loop iteration
906 --str; 918 --str;
907 } 919 }
908 920
909 line->touch (); 921 line->touch ();
… …
911 do 923 do
912 { 924 {
913 line->t[screen.cur.col] = c; 925 line->t[screen.cur.col] = c;
914 line->r[screen.cur.col] = rend; 926 line->r[screen.cur.col] = rend;
915 927
916 if (screen.cur.col < ncol - 1) 928 if (expect_true (screen.cur.col < ncol - 1))
917 screen.cur.col++; 929 screen.cur.col++;
918 else 930 else
919 { 931 {
920 line->l = ncol; 932 line->l = ncol;
921 if (screen.flags & Screen_Autowrap) 933 if (screen.flags & Screen_Autowrap)
… …
923 break; 935 break;
924 } 936 }
925 937
926 c = NOCHAR; 938 c = NOCHAR;
927 } 939 }
928 while (--width > 0); 940 while (expect_false (--width > 0));
929 941
930 // pad with spaces when overwriting wide character with smaller one 942 // pad with spaces when overwriting wide character with smaller one
931 if (!width) 943 if (expect_false (!width))
932 { 944 {
933 line->touch (); 945 line->touch ();
934 946
935 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
936 { 948 {
937 line->t[c] = ' '; 949 line->t[c] = ' ';
938 line->r[c] = rend; 950 line->r[c] = rend;
939 } 951 }
940 } 952 }
941 } 953 }
954#if ENABLE_COMBINING
942 else // width == 0 955 else // width == 0
943 { 956 {
944#if ENABLE_COMBINING 957 if (c != 0xfeff) // ignore BOM
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 { 958 {
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 {
955 linep = line; 969 linep = line;
956 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
957 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
972 }
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 }
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));
958 } 995 }
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 } 996 }
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 997#endif
982 }
983 } 998 }
984 999
985 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
986 1001
987#ifdef DEBUG_STRICT
988 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
989#endif
990} 1003}
991 1004
992/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
993/* 1006/*
994 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1322 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1323 return; 1336 return;
1324 1337
1325 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1326 1339
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1328 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_RVid | RS_Uline))
1329 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1330 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1331 { 1346 {
1332 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1333 1348
1334 if (mapped) 1349 if (mapped && !view_start)
1335 XClearArea (dpy, vt, 0, 1350 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width, 1351 Row2Pixel (row - view_start), (unsigned int)width,
1337 (unsigned int)Height2Pixel (num), False); 1352 (unsigned int)Height2Pixel (num), False);
1338 } 1353 }
1339 else 1354 else
1340 { 1355 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 1357
1358 if (mapped && !view_start)
1359 {
1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1345 XFillRectangle (dpy, vt, gc, 1362 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row), 1363 0, Row2Pixel (row - view_start),
1347 (unsigned int)width, 1364 (unsigned int)width,
1348 (unsigned int)Height2Pixel (num)); 1365 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1351 } 1369 }
1352 1370
1353 for (; num--; row++) 1371 for (; num--; row++)
1354 { 1372 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1377 }
1358} 1378}
1359 1379
1360#if !ENABLE_MINIMAL 1380#if !ENABLE_MINIMAL
1361void 1381void
… …
1435 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1436 */ 1456 */
1437void 1457void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1459{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1460 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1445 1462
1446 if (count <= 0) 1463 if (count <= 0)
1447 return; 1464 return;
… …
1449 scr_do_wrap (); 1466 scr_do_wrap ();
1450 1467
1451 selection_check (1); 1468 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1453 1470
1454 row = screen.cur.row; 1471 int row = screen.cur.row;
1455 1472
1456 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1457 1474
1458 line->touch (); 1475 line->touch ();
1459 line->is_longer (0); 1476 line->is_longer (0);
1460 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1461 switch (insdel) 1482 switch (insdel)
1462 { 1483 {
1463 case INSERT: 1484 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1491 {
1466 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1468 } 1494 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1495
1472 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1498 {
1475 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1490 case ERASE: 1514 case ERASE:
1491 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1492 selection_check (1); 1516 selection_check (1);
1493 screen.cur.col -= count; 1517 screen.cur.col -= count;
1494 1518
1495 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1496 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1497 break; 1524 break;
1498 1525
1499 case DELETE: 1526 case DELETE:
1500 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1501 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1502 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1503 { 1534 {
1504 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1505 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1506 } 1537 }
1507 1538
1508 line->l = max (line->l - count, 0);
1509 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1510 1540
1511 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1543 {
1514 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1835 {
1806 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1808 } 1838 }
1809// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1839
1810 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 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); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1812 1842
1813 num_scr_allow = 0; 1843 num_scr_allow = 0;
1814 1844
… …
1892 XMapWindow (dpy, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1893# endif 1923# endif
1894 1924
1895# if ENABLE_FRILLS 1925# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1926 if (option (Opt_urgentOnBell))
1897 { 1927 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 1928# endif
1905 1929
1906 if (option (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1907 { 1931 {
1908 rvideo_bell = true; 1932 rvideo_bell = true;
… …
1911 1935
1912 bell_ev.start (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1937 }
1914 else 1938 else
1915 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1941#endif
1917} 1942}
1918 1943
1919/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1945/* ARGSUSED */
… …
1939 row_start = view_start; 1964 row_start = view_start;
1940 } 1965 }
1941 1966
1942 wctomb (0, 0); 1967 wctomb (0, 0);
1943 1968
1944 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1970 {
1946 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1948 1973
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1978 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2004 */
1980void 2005void
1981rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1982{ 2007{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2010 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2023 /*
2001 * A: set up vars 2024 * A: set up vars
2002 */ 2025 */
2003 refresh_count = 0; 2026 refresh_count = 0;
2004 2027
2028 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2029 char have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2030#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
2008#endif 2032#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2034
2011 /* 2035 /*
2012 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2013 */ 2037 */
2014 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2015 2046
2016 /* 2047 /*
2017 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2018 */ 2049 */
2019 { 2050 {
2020 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2021 2052
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2054 if (hidden_cursor)
2025 showcursor = 0; 2055 showcursor = 0;
2026#endif 2056#endif
2027 2057
… …
2055 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2056#else 2086#else
2057 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2058#endif 2088#endif
2059 2089
2060 if (showcursor && focus) 2090 if (focus)
2061 { 2091 {
2062 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2064 else 2094 else
2065 { 2095 {
… …
2100 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2101 } 2131 }
2102 } 2132 }
2103 } 2133 }
2104 2134
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 2135#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2136 /*
2112 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2114 */ 2139 */
… …
2203 continue; 2228 continue;
2204 2229
2205 // redraw one or more characters 2230 // redraw one or more characters
2206 2231
2207 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2208 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2209 --col; 2234 --col;
2210 2235
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2237 text_t *text = stp + col;
2213 int count = 1; 2238 int count = 1;
2214 2239
2215 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2216 drp[col] = rend; 2241 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2221 { 2246 {
2222 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2223 { 2248 {
2224 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2225 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2226 count++; 2252 count++;
2227 i++; 2253 i++;
2228 2254
2229 continue; 2255 continue;
2230 } 2256 }
… …
2250 2276
2251 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2253 2279
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2256 count++, i--; 2282 count++, i--;
2257 2283
2258 /* 2284 /*
2259 * Determine the attributes for the string 2285 * Determine the attributes for the string
2260 */ 2286 */
2261 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2263 2289
2264 // only do special processing if any attributes are set, which is unlikely 2290 // 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)) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2292 {
2267 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2268 2294
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2315
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2317 fore = Color_UL;
2292#endif 2318#endif
2293 2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333 back = Color_HC;
2334 invert = 0;
2335 }
2336 }
2337#endif
2338
2294 if (invert) 2339 if (invert)
2295 { 2340 {
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); 2341 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2342
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2343#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) 2344 if (fore == back)
2314 { 2345 {
2315 fore = Color_bg; 2346 fore = Color_bg;
2316 back = Color_fg; 2347 back = Color_fg;
2317 } 2348 }
… …
2353 /* 2384 /*
2354 * Actually do the drawing of the string here 2385 * Actually do the drawing of the string here
2355 */ 2386 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2387 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2388
2358 if (have_bg && back == Color_bg) 2389 if (expect_true (have_bg && back == Color_bg))
2359 { 2390 {
2360 // this is very ugly, maybe push it into ->draw? 2391 // this is very ugly, maybe push it into ->draw?
2361 2392
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2393 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2394 if (text[i] != ' ')
… …
2370 did_clear: ; 2401 did_clear: ;
2371 } 2402 }
2372 else 2403 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2405
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2406 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2407 {
2377#if ENABLE_FRILLS 2408#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2409 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2410 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2411 else
… …
2385 xpixel, ypixel + font->ascent + 1, 2416 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2418 }
2388 } /* for (col....) */ 2419 } /* for (col....) */
2389 } /* for (row....) */ 2420 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2421
2396 /* 2422 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2423 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2424 */
2399 if (showcursor) 2425 if (showcursor)
… …
2438 } 2464 }
2439 2465
2440 /* 2466 /*
2441 * H: cleanup selection 2467 * H: cleanup selection
2442 */ 2468 */
2469#if ENABLE_OVERLAY
2470 scr_swap_overlay ();
2471#endif
2472 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2473
2443 scr_reverse_selection (); 2474 scr_reverse_selection ();
2444 2475
2476 screen.flags = old_screen_flags;
2445 num_scr = 0; 2477 num_scr = 0;
2446 num_scr_allow = 1; 2478 num_scr_allow = 1;
2447} 2479}
2448 2480
2449void 2481void
… …
2569 { 2601 {
2570#if !ENABLE_MINIMAL 2602#if !ENABLE_MINIMAL
2571 if (selection.rect) 2603 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2604 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2605 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2606 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2607 else
2576#endif 2608#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2609 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2610 selection.end.row, selection.end.col,
2579 RS_RVid); 2611 RS_Sel | RS_RVid);
2580 } 2612 }
2581} 2613}
2582 2614
2583/* ------------------------------------------------------------------------- */ 2615/* ------------------------------------------------------------------------- */
2584/* 2616/*
… …
2877 selection_wait = Sel_normal; 2909 selection_wait = Sel_normal;
2878 2910
2879#if X_HAVE_UTF8_STRING 2911#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String; 2912 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return; 2914 return;
2883#else 2915#else
2884 selection_type = Sel_CompoundText; 2916 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return; 2918 return;
2887#endif 2919#endif
2888 } 2920 }
2889 2921
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false); 2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2919/* 2951/*
2920 * Clear all selected text 2952 * Clear all selected text
2921 * EXT: SelectionClear 2953 * EXT: SelectionClear
2922 */ 2954 */
2923void 2955void
2924rxvt_term::selection_clear () NOTHROW 2956rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2957{
2958 if (!clipboard)
2959 {
2926 want_refresh = 1; 2960 want_refresh = 1;
2927 free (selection.text); 2961 free (selection.text);
2928 selection.text = NULL; 2962 selection.text = NULL;
2929 selection.len = 0; 2963 selection.len = 0;
2930 CLEAR_SELECTION (); 2964 CLEAR_SELECTION ();
2931 2965
2932 if (display->selection_owner == this) 2966 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2967 display->selection_owner = 0;
2968 }
2969 else
2970 {
2971 free (selection.clip_text);
2972 selection.clip_text = NULL;
2973 selection.clip_len = 0;
2974
2975 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0;
2977 }
2978}
2979
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2934} 2992}
2935 2993
2936/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2937/* 2995/*
2938 * Copy a selection into the cut buffer 2996 * Copy a selection into the cut buffer
… …
3064 3122
3065 selection_grab (tm); 3123 selection_grab (tm);
3066} 3124}
3067 3125
3068bool 3126bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 3127rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 3128{
3129 Atom sel;
3130
3131 if (!clipboard)
3132 {
3071 selection_time = tm; 3133 selection_time = tm;
3134 sel = XA_PRIMARY;
3135 }
3136 else
3137 {
3138 clipboard_time = tm;
3139 sel = xa[XA_CLIPBOARD];
3140 }
3072 3141
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3142 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3143 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 3144 {
3076 display->set_selection_owner (this); 3145 display->set_selection_owner (this, clipboard);
3077 return true; 3146 return true;
3078 } 3147 }
3079 else 3148 else
3080 { 3149 {
3081 selection_clear (); 3150 selection_clear (clipboard);
3082 return false; 3151 return false;
3083 } 3152 }
3084 3153
3085#if 0 3154#if 0
3086 XTextProperty ct; 3155 XTextProperty ct;
… …
3581 else if (rq.target == xa[XA_MULTIPLE]) 3650 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3651 {
3583 /* TODO: Handle MULTIPLE */ 3652 /* TODO: Handle MULTIPLE */
3584 } 3653 }
3585#endif 3654#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3656 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3658 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3659 ev.property = rq.property;
3660 }
3661 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3662 {
3663 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3664 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3590 ev.property = rq.property; 3665 ev.property = rq.property;
3591 } 3666 }
3592 else if (rq.target == XA_STRING 3667 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3668 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3669 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3627 { 3702 {
3628 target = xa[XA_COMPOUND_TEXT]; 3703 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3704 style = enc_compound_text;
3630 } 3705 }
3631 3706
3632 if (selection.text) 3707 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3708 {
3634 cl = selection.text; 3709 cl = selection.text;
3635 selectlen = selection.len; 3710 selectlen = selection.len;
3711 }
3712 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3713 {
3714 cl = selection.clip_text;
3715 selectlen = selection.clip_len;
3636 } 3716 }
3637 else 3717 else
3638 { 3718 {
3639 cl = L""; 3719 cl = L"";
3640 selectlen = 0; 3720 selectlen = 0;
… …
3708 h += 2; min_it (h, nrow); 3788 h += 2; min_it (h, nrow);
3709 3789
3710 x -= 1; clamp_it (x, 0, ncol - w); 3790 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3791 y -= 1; clamp_it (y, 0, nrow - h);
3712 3792
3713 ov_x = x; ov_y = y; 3793 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3794 ov.w = w; ov.h = h;
3715 3795
3716 ov_text = new text_t *[h]; 3796 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3797 ov.rend = new rend_t *[h];
3718 3798
3719 for (y = 0; y < h; y++) 3799 for (y = 0; y < h; y++)
3720 { 3800 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3801 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3802 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3803
3724 text_t t0, t1, t2; 3804 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3805 rend_t r = OVERLAY_RSTYLE;
3726 3806
3727 if (y == 0) 3807 if (y == 0)
… …
3746} 3826}
3747 3827
3748void 3828void
3749rxvt_term::scr_overlay_off () NOTHROW 3829rxvt_term::scr_overlay_off () NOTHROW
3750{ 3830{
3751 if (!ov_text) 3831 if (!ov.text)
3752 return; 3832 return;
3753 3833
3754 want_refresh = 1; 3834 want_refresh = 1;
3755 3835
3756 for (int y = 0; y < ov_h; y++) 3836 for (int y = 0; y < ov.h; y++)
3757 { 3837 {
3758 delete [] ov_text[y]; 3838 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3839 delete [] ov.rend[y];
3760 } 3840 }
3761 3841
3762 delete [] ov_text; ov_text = 0; 3842 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3843 delete [] ov.rend; ov.rend = 0;
3764} 3844}
3765 3845
3766void 3846void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3847rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3848{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3849 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3850 return;
3771 3851
3772 x++, y++; 3852 x++, y++;
3773 3853
3774 ov_text[y][x] = text; 3854 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3855 ov.rend[y][x] = rend;
3776} 3856}
3777 3857
3778void 3858void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3859rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3860{
… …
3799} 3879}
3800 3880
3801void 3881void
3802rxvt_term::scr_swap_overlay () NOTHROW 3882rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3883{
3804 if (!ov_text) 3884 if (!ov.text)
3805 return; 3885 return;
3806 3886
3887 // hide cursor if it is within the overlay area
3888 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3889 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3890 screen.flags &= ~Screen_VisibleCursor;
3891
3807 // swap screen mem with overlay 3892 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3893 for (int y = ov.h; y--; )
3809 { 3894 {
3810 text_t *t1 = ov_text[y]; 3895 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3896 rend_t *r1 = ov.rend[y];
3812 3897
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3898 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; 3899 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3900
3816 for (int x = ov_w; x--; ) 3901 for (int x = ov.w; x--; )
3817 { 3902 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3903 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3904 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3905 }
3821 } 3906 }

Diff Legend

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