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.327 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.388 by root, Fri Jul 8 00:08:40 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
231 selection.text = NULL; 236 selection.text = NULL;
232 selection.len = 0; 237 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
235 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
236 } 243 }
237 else 244 else
238 { 245 {
239 /* 246 /*
240 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 294
288 do 295 do
289 { 296 {
290 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 299 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 301
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 303 {
… …
397 } 402 }
398 403
399 free (tabs); 404 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
401 406
402 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
510 } 515 }
511 516
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
518#endif
519} 522}
520 523
521void 524void
522rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
523{ 526{
… …
548 want_refresh = 1; 551 want_refresh = 1;
549 view_start = 0; 552 view_start = 0;
550 553
551 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
552 555
553 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
554 557
555#if NSCREENS 558#if NSCREENS
556 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
557 { 560 {
558 num_scr = 0; 561 num_scr = 0;
… …
635 638
636 if (count > 0 639 if (count > 0
637 && row1 == 0 640 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
640 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 646
645 // sever bottommost line 647 // sever bottommost line
646 { 648 {
647 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2 - 1);
648 l.is_longer (0); 650 l.is_longer (0);
649 l.touch (); 651 l.touch ();
650 } 652 }
651 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
652 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 670 for (int i = count; i--; )
654 { 671 {
655 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
656 673
657 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 { 677 {
661 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 679 l.l = 0;
663 l.f = 0; 680 l.f = 0;
664 } 681 }
665 else 682 else
666 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
667 }
668
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 } 684 }
680 685
681 // move and/or clear selection, if any 686 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
683 { 688 {
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 788 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 789 screen.cur.row -= minlines;
785 } 790 }
786 } 791 }
787 792
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 793 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 794 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 795 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 796 int row = screen.cur.row;
794 797
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 798 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 799
797 line_t *line = &ROW(row); 800 line_t *line = &ROW(row);
798 801
799 while (str < strend) 802 while (str < strend)
800 { 803 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 805
803 if (expect_false (c < 0x20)) 806 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 807 if (c == C0_LF)
805 { 808 {
806 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
807 810
808 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
827 { 830 {
828 scr_tab (1, true); 831 scr_tab (1, true);
829 continue; 832 continue;
830 } 833 }
831 834
832 if (expect_false ( 835 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 839 ))
837 { 840 {
… …
842 * should be a similar check. 845 * should be a similar check.
843 */ 846 */
844 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
845 } 848 }
846 849
847 if (expect_false (screen.flags & Screen_WrapNext)) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 851 {
849 scr_do_wrap (); 852 scr_do_wrap ();
850 853
851 line->l = ncol; 854 line->l = ncol;
852 line->is_longer (1); 855 line->is_longer (1);
… …
854 row = screen.cur.row; 857 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
856 } 859 }
857 860
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 863 c = 0xfffd;
861 864
862 // rely on wcwidth to tell us the character width, do wcwidth before 865 // rely on wcwidth to tell us the character width, do wcwidth before
863 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
865 // locale. 868 // locale.
866 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
867 870
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 872 {
870 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 874 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
888 } 891 }
889 } 892 }
890 893
891 if (expect_false (screen.flags & Screen_Insert)) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
893 896
894 if (width != 0) 897 if (width != 0)
895 { 898 {
896#if !UNICODE_3 899#if !UNICODE_3
… …
901# else 904# else
902 c = 0xfffd; 905 c = 0xfffd;
903# endif 906# endif
904#endif 907#endif
905 908
909 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
910
911 // if the character doesn't fit into the remaining columns...
912 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
913 {
914 if (screen.flags & Screen_Autowrap)
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 else
922 screen.cur.col = ncol - width;
923 }
924
906 // nuke the character at this position, if required 925 // nuke the character at this position, if required
907 if (expect_false ( 926 // due to wonderful coincidences everywhere else in this loop
927 // we never have to check for overwriting a wide char itself,
928 // only its tail.
908 line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 930 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 931
925 line->touch (); 932 line->touch ();
926 933
927 do 934 do
928 { 935 {
929 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
931 938
932 if (expect_true (screen.cur.col < ncol - 1)) 939 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 940 screen.cur.col++;
934 else 941 else
935 { 942 {
936 line->l = ncol; 943 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
939 break; 946
947 goto end_of_line;
940 } 948 }
941 949
942 c = NOCHAR; 950 c = NOCHAR;
943 } 951 }
944 while (expect_false (--width > 0)); 952 while (ecb_unlikely (--width > 0));
945 953
946 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 956 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 957 line->t[c] = ' ';
954 line->r[c] = rend; 958 line->r[c] = rend;
955 }
956 } 959 }
960
961end_of_line:
962 ;
957 } 963 }
958#if ENABLE_COMBINING 964#if ENABLE_COMBINING
959 else // width == 0 965 else // width == 0
960 { 966 {
961 if (c != 0xfeff) // ignore BOM 967 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1007#endif
1002 } 1008 }
1003 1009
1004 max_it (line->l, screen.cur.col); 1010 max_it (line->l, screen.cur.col);
1005 1011
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1012 assert (screen.cur.row >= 0);
1008#endif
1009} 1013}
1010 1014
1011/* ------------------------------------------------------------------------- */ 1015/* ------------------------------------------------------------------------- */
1012/* 1016/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1017 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1030
1027 want_refresh = 1; 1031 want_refresh = 1;
1028#endif 1032#endif
1029 } 1033 }
1030 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1031 else 1037 else
1032 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1033} 1039}
1034 1040
1035/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1342 return; 1348 return;
1343 1349
1344 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1345 1351
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1355 {
1353 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1354 1357
1355 if (mapped && !view_start) 1358 if (mapped)
1356 XClearArea (dpy, vt, 0, 1359 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1360 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1361 (unsigned int)Height2Pixel (num), False);
1359 } 1362 }
1360 else 1363 else
1361 { 1364 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1366
1364 if (mapped && !view_start) 1367 if (mapped)
1365 { 1368 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1371 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1372 0, Row2Pixel (row - view_start),
… …
1376 1379
1377 for (; num--; row++) 1380 for (; num--; row++)
1378 { 1381 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1380 1383
1381 if (!view_start) 1384 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1386 }
1384} 1387}
1385 1388
1386#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1387void 1390void
… …
1686 { 1689 {
1687 rvideo_state = on; 1690 rvideo_state = on;
1688 1691
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1692#endif 1695#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1697
1695 XGCValues gcvalue; 1698 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1843 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1844 {
1842 min_it (rc[i].col, ncol - 1); 1845 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1846 min_it (rc[i].row, nrow - 1);
1844 } 1847 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1848
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1849 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1850 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1851
1849 num_scr_allow = 0; 1852 num_scr_allow = 0;
1850 1853
… …
1923 1926
1924# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1927# endif 1930# endif
1928 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1929# endif 1932# endif
1930 1933
1931# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1936 set_urgency (1);
… …
1941 1944
1942 bell_ev.start (VISUAL_BELL_DURATION); 1945 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1946 }
1944 else 1947 else
1945 XBell (dpy, 0); 1948 XBell (dpy, 0);
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1950#endif
1947} 1951}
1948 1952
1949/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1954void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1956{
1954#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1955 int nrows, row_start; 1958 int nrows, row_start;
… …
1969 row_start = view_start; 1972 row_start = view_start;
1970 } 1973 }
1971 1974
1972 wctomb (0, 0); 1975 wctomb (0, 0);
1973 1976
1974 for (int r1 = 0; r1 < nrows; r1++) 1977 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1978 {
1976 text_t *tp = ROW(r1).t; 1979 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1980 int len = ROW(r1).l;
1978 1981
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1982 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2031 refresh_count = 0; 2034 refresh_count = 0;
2032 2035
2033 unsigned int old_screen_flags = screen.flags; 2036 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2037 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2037#endif 2040#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2042
2040 /* 2043 /*
2041 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
… …
2090 ccol2 = bgcolor_of (rstyle); 2093 ccol2 = bgcolor_of (rstyle);
2091#else 2094#else
2092 ccol2 = Color_bg; 2095 ccol2 = Color_bg;
2093#endif 2096#endif
2094 2097
2095 if (showcursor && focus) 2098 if (focus)
2096 { 2099 {
2097 if (option (Opt_cursorUnderline)) 2100 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2101 *crp ^= RS_Uline;
2099 else 2102 else
2100 { 2103 {
… …
2233 continue; 2236 continue;
2234 2237
2235 // redraw one or more characters 2238 // redraw one or more characters
2236 2239
2237 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2242 --col;
2240 2243
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2245 text_t *text = stp + col;
2243 int count = 1; 2246 int count = 1;
2244 2247
2245 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2246 drp[col] = rend; 2249 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2253 for (i = 0; ++col < ncol; )
2251 { 2254 {
2252 if (stp[col] == NOCHAR) 2255 if (stp[col] == NOCHAR)
2253 { 2256 {
2254 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2255 drp[col] = rend; 2258 drp[col] = srp[col];
2259
2256 count++; 2260 count++;
2257 i++; 2261 i++;
2258 2262
2259 continue; 2263 continue;
2260 } 2264 }
… …
2280 2284
2281 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2282 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2283 2287
2284 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2285 while (expect_false (i && text[count] == NOCHAR)) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2286 count++, i--; 2290 count++, i--;
2287 2291
2288 /* 2292 /*
2289 * Determine the attributes for the string 2293 * Determine the attributes for the string
2290 */ 2294 */
2291 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2293 2297
2294 // only do special processing if any attributes are set, which is unlikely 2298 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2299 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2300 {
2297 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2298 2302
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2323
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2324 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2325 fore = Color_UL;
2322#endif 2326#endif
2323 2327
2328#ifdef OPTION_HC
2329 if (rend & RS_Sel)
2330 {
2331 /* invert the column if no highlightColor is set or it is the
2332 * current cursor column */
2333 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2334 && ISSET_PIXCOLOR (Color_HC))
2335 {
2336 if (ISSET_PIXCOLOR (Color_HTC))
2337 fore = Color_HTC;
2338 // if invert is 0 reverse video is set so we use bg color as fg color
2339 else if (!invert)
2340 fore = back;
2341
2342 back = Color_HC;
2343 invert = 0;
2344 }
2345 }
2346#endif
2347
2324 if (invert) 2348 if (invert)
2325 { 2349 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2350 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2351
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2353 if (fore == back)
2344 { 2354 {
2345 fore = Color_bg; 2355 fore = Color_bg;
2346 back = Color_fg; 2356 back = Color_fg;
2347 } 2357 }
… …
2383 /* 2393 /*
2384 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2385 */ 2395 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2397
2388 if (expect_true (have_bg && back == Color_bg)) 2398 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2399 {
2390 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2391 2401
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2400 did_clear: ; 2410 did_clear: ;
2401 } 2411 }
2402 else 2412 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2414
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2416 {
2407#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2420 else
… …
2501 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2502 } 2512 }
2503} 2513}
2504 2514
2505void 2515void
2506rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2517{
2518 bool transparent = false;
2519
2508#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2509 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2510#else 2522 {
2523# ifdef ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT)
2525 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 2528
2529 transparent = true;
2530 }
2531 else
2532# endif
2533 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2536 }
2537 }
2538 else
2539#endif
2540 {
2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2513 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2515 2546
2516 if (scrollBar.win) 2547 if (scrollBar.win)
2517 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2519 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2520 scrollBar.show (0); 2554 scrollBar.show (0);
2521 } 2555 }
2522 2556
2523#endif 2557 if (refresh)
2524 2558 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2559 scr_clear ();
2527 scr_touch (true); 2560 scr_touch (true);
2561 }
2528 want_refresh = 1; 2562 want_refresh = 1;
2529} 2563}
2530 2564
2531/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2532void 2566void
… …
2600 { 2634 {
2601#if !ENABLE_MINIMAL 2635#if !ENABLE_MINIMAL
2602 if (selection.rect) 2636 if (selection.rect)
2603 scr_xor_rect (selection.beg.row, selection.beg.col, 2637 scr_xor_rect (selection.beg.row, selection.beg.col,
2604 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2605 RS_RVid, RS_RVid | RS_Uline); 2639 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2606 else 2640 else
2607#endif 2641#endif
2608 scr_xor_span (selection.beg.row, selection.beg.col, 2642 scr_xor_span (selection.beg.row, selection.beg.col,
2609 selection.end.row, selection.end.col, 2643 selection.end.row, selection.end.col,
2610 RS_RVid); 2644 RS_Sel | RS_RVid);
2611 } 2645 }
2612} 2646}
2613 2647
2614/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2615/* 2649/*
… …
2620void 2654void
2621rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2656{
2623 int row, wrote; 2657 int row, wrote;
2624 unsigned int width, towrite; 2658 unsigned int width, towrite;
2625 char r1[] = "\n"; 2659 const char r1[] = "\n";
2626 2660
2627 for (row = saveLines + top_row; 2661 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2629 { 2663 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2676/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2677/* 2711/*
2678 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2679 */ 2713 */
2680void 2714void
2681rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2682{ 2716{
2683 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2684 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2685 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2686 data[i] = C0_CR; 2720 data[i] = C0_CR;
… …
2692 2726
2693 if (priv_modes & PrivMode_BracketPaste) 2727 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~"); 2728 tt_printf ("\e[201~");
2695} 2729}
2696 2730
2697/* ------------------------------------------------------------------------- */
2698/*
2699 * Respond to a notification that a primary selection has been sent
2700 * EXT: SelectionNotify
2701 */
2702void 2731void
2703rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{ 2733{
2705 if (prop == None) /* check for failed XConvertSelection */ 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 {
2707 if ((selection_type & Sel_CompoundText))
2708 {
2709 int selnum = selection_type & Sel_whereMask;
2710
2711 selection_type = 0;
2712 if (selnum != Sel_direct)
2713 selection_request_other (XA_STRING, selnum);
2714 }
2715
2716 if ((selection_type & Sel_UTF8String))
2717 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = Sel_CompoundText;
2721 if (selnum != Sel_direct)
2722 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2723 else
2724 selection_type = 0;
2725 }
2726
2727 return;
2728 }
2729
2730 unsigned long bytes_after;
2731 XTextProperty ct;
2732
2733 if (XGetWindowProperty (dpy, win, prop,
2734 0, PROP_SIZE / 4,
2735 delete_prop, AnyPropertyType,
2736 &ct.encoding, &ct.format,
2737 &ct.nitems, &bytes_after,
2738 &ct.value) != Success)
2739 {
2740 ct.value = 0;
2741 goto bailout;
2742 }
2743
2744 if (ct.encoding == None)
2745 goto bailout;
2746
2747 if (bytes_after)
2748 {
2749 // fetch and append remaining data
2750 XTextProperty ct2;
2751
2752 if (XGetWindowProperty (dpy, win, prop,
2753 ct.nitems / 4, (bytes_after + 3) / 4,
2754 delete_prop, AnyPropertyType,
2755 &ct2.encoding, &ct2.format,
2756 &ct2.nitems, &bytes_after,
2757 &ct2.value) != Success)
2758 goto bailout;
2759
2760 // realloc should be compatible to XFree, here, and elsewhere, too
2761 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2762 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2763 ct.nitems += ct2.nitems;
2764
2765 XFree (ct2.value);
2766 }
2767
2768 if (ct.value == 0)
2769 goto bailout;
2770
2771 if (ct.encoding == xa[XA_INCR])
2772 {
2773 // INCR selection, start handshake
2774 if (!delete_prop)
2775 XDeleteProperty (dpy, win, prop);
2776
2777 selection_wait = Sel_incr;
2778 incr_buf_fill = 0;
2779 incr_ev.start (10);
2780
2781 goto bailout;
2782 }
2783
2784 if (ct.nitems == 0)
2785 {
2786 if (selection_wait == Sel_incr)
2787 {
2788 XFree (ct.value);
2789
2790 // finally complete, now paste the whole thing
2791 selection_wait = Sel_normal;
2792 ct.value = (unsigned char *)incr_buf;
2793 ct.nitems = incr_buf_fill;
2794 incr_buf = 0;
2795 incr_buf_size = 0;
2796 incr_ev.stop ();
2797 }
2798 else
2799 {
2800 if (selection_wait == Sel_normal
2801 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2802 {
2803 /*
2804 * pass through again trying CUT_BUFFER0 if we've come from
2805 * XConvertSelection () but nothing was presented
2806 */
2807 selection_paste (display->root, XA_CUT_BUFFER0, False);
2808 }
2809
2810 goto bailout;
2811 }
2812 }
2813 else if (selection_wait == Sel_incr)
2814 {
2815 incr_ev.start (10);
2816
2817 while (incr_buf_fill + ct.nitems > incr_buf_size)
2818 {
2819 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2820 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2821 }
2822
2823 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2824 incr_buf_fill += ct.nitems;
2825
2826 goto bailout;
2827 }
2828
2829 char **cl;
2830 int cr;
2831
2832#if !ENABLE_MINIMAL
2833 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2834 // so recode it manually
2835 if (ct.encoding == xa[XA_UTF8_STRING])
2836 {
2837 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2838 char *s = rxvt_wcstombs (w);
2839 free (w);
2840 // TODO: strlen == only the first element will be converted. well...
2841 paste (s, strlen (s));
2842 free (s);
2843 }
2844 else
2845#endif
2846 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2847 && cl)
2848 {
2849 for (int i = 0; i < cr; i++)
2850 paste (cl[i], strlen (cl[i]));
2851
2852 XFreeStringList (cl);
2853 }
2854 else
2855 paste ((char *)ct.value, ct.nitems); // paste raw
2856
2857bailout:
2858 XFree (ct.value);
2859
2860 if (selection_wait == Sel_normal)
2861 selection_wait = Sel_none;
2862}
2863
2864void
2865rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2866{
2867 selection_wait = Sel_none;
2868
2869 incr_buf_size = 0;
2870 free (incr_buf);
2871
2872 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2873}
2874
2875void
2876rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2877{
2878 if (prop == None || selection_wait != Sel_incr)
2879 return; 2735 return;
2880 2736
2881 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2882} 2738}
2883 2739
2884/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2885/* 2741/*
2886 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2887 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2888 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2889 * > CUT_BUFFER0
2890 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2891 * will auto fallback to CUT_BUFFER0
2892 * EXT: button 2 release 2745 * EXT: button 2 release
2893 */ 2746 */
2894void 2747void
2895rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2896{ 2749{
2897 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2898 {
2899 /* internal selection */
2900 char *str = rxvt_wcstombs (selection.text, selection.len);
2901 paste (str, strlen (str));
2902 free (str);
2903 return;
2904 } 2751 {
2905 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2906 { 2754 }
2907 selection_request_time = tm;
2908 selection_wait = Sel_normal;
2909
2910#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return;
2914#else
2915 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return;
2918#endif
2919 }
2920
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */
2922 selection_paste (display->root, XA_CUT_BUFFER0, false);
2923}
2924
2925int
2926rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2927{
2928 Atom sel;
2929
2930 selection_type |= selnum;
2931
2932 if (selnum == Sel_Primary)
2933 sel = XA_PRIMARY;
2934 else if (selnum == Sel_Secondary)
2935 sel = XA_SECONDARY;
2936 else
2937 sel = xa[XA_CLIPBOARD];
2938
2939 if (XGetSelectionOwner (dpy, sel) != None)
2940 {
2941 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2942 vt, selection_request_time);
2943 return 1;
2944 }
2945
2946 return 0;
2947} 2755}
2948 2756
2949/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2950/* 2758/*
2951 * Clear all selected text 2759 * Clear all selected text
2952 * EXT: SelectionClear 2760 * EXT: SelectionClear
2953 */ 2761 */
2954void 2762void
2955rxvt_term::selection_clear () NOTHROW 2763rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2764{
2765 if (!clipboard)
2766 {
2957 want_refresh = 1; 2767 want_refresh = 1;
2958 free (selection.text); 2768 free (selection.text);
2959 selection.text = NULL; 2769 selection.text = NULL;
2960 selection.len = 0; 2770 selection.len = 0;
2961 CLEAR_SELECTION (); 2771 CLEAR_SELECTION ();
2962 2772
2963 if (display->selection_owner == this) 2773 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2774 display->selection_owner = 0;
2775 }
2776 else
2777 {
2778 free (selection.clip_text);
2779 selection.clip_text = NULL;
2780 selection.clip_len = 0;
2781
2782 if (display->clipboard_owner == this)
2783 display->clipboard_owner = 0;
2784 }
2965} 2785}
2966 2786
2967/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2968/* 2788/*
2969 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2970 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2971 */ 2791 */
2972void 2792void
2973rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
2974{ 2794{
2975 int i; 2795 int size;
2976 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
2977 text_t *t; 2797 text_t *t;
2978 2798
2979 switch (selection.op) 2799 switch (selection.op)
2980 { 2800 {
… …
2996 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
2997 2817
2998 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2818 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2999 return; 2819 return;
3000 2820
3001 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3002 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2822 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3003 2823
3004 int ofs = 0; 2824 int ofs = 0;
3005 int extra = 0; 2825 int extra = 0;
3006 2826
3007 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
3013 { 2833 {
3014#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
3015 if (selection.rect) 2835 if (selection.rect)
3016 { 2836 {
3017 col = selection.beg.col; 2837 col = selection.beg.col;
3018 end_col = ncol + 1; 2838 end_col = selection.end.col;
3019 } 2839 }
3020 else 2840 else
3021#endif 2841#endif
3022 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
3023 2843
3024 col = max (col, 0); 2844 col = max (col, 0);
3025 2845
3026 if (row == selection.end.row 2846 if (row == selection.end.row)
3027#if !ENABLE_MINIMAL
3028 || selection.rect
3029#endif
3030 )
3031 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
3032 2848
3033 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
3034 2850
3035 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3043 2859
3044 extra -= (len - 1); 2860 extra -= (len - 1);
3045 2861
3046 if (extra < 0) 2862 if (extra < 0)
3047 { 2863 {
3048 extra += i; 2864 extra += size;
3049 i += i; 2865 size += size;
3050 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2866 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3051 } 2867 }
3052 2868
3053 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3054 } 2870 }
3055#endif 2871#endif
… …
3067 2883
3068 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3069 } 2885 }
3070 else 2886 else
3071#endif 2887#endif
3072 if (!ROW(row).is_longer () && row != selection.end.row) 2888 if (!ROW(row).is_longer ()
2889 && (row != selection.end.row || end_col != selection.end.col)
2890 && (row != selection.beg.row || selection.beg.col < ncol))
3073 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3074 } 2892 }
3075
3076 if (end_col != selection.end.col)
3077 new_selection_text[ofs++] = C0_LF;
3078 2893
3079 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3080 2895
3081 if (ofs == 0) 2896 if (ofs == 0)
3082 { 2897 {
… …
3095 2910
3096 selection_grab (tm); 2911 selection_grab (tm);
3097} 2912}
3098 2913
3099bool 2914bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 2916{
2917 Atom sel;
2918
2919 if (!clipboard)
2920 {
3102 selection_time = tm; 2921 selection_time = tm;
2922 sel = XA_PRIMARY;
2923 }
2924 else
2925 {
2926 clipboard_time = tm;
2927 sel = xa[XA_CLIPBOARD];
2928 }
3103 2929
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2930 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2931 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 2932 {
3107 display->set_selection_owner (this); 2933 display->set_selection_owner (this, clipboard);
3108 return true; 2934 return true;
3109 } 2935 }
3110 else 2936 else
3111 { 2937 {
3112 selection_clear (); 2938 selection_clear (clipboard);
3113 return false; 2939 return false;
3114 } 2940 }
3115 2941
3116#if 0 2942#if 0
3117 XTextProperty ct; 2943 XTextProperty ct;
… …
3577 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3578 */ 3404 */
3579void 3405void
3580rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3581{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3582 XSelectionEvent ev; 3409 XSelectionEvent ev;
3583 3410
3584 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3585 ev.property = None; 3412 ev.property = None;
3586 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3601 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3602#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3603 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3604#endif 3431#endif
3605 3432
3606 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3607 32, PropModeReplace, 3434 32, PropModeReplace,
3608 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3609 ev.property = rq.property; 3436 ev.property = property;
3610 } 3437 }
3611#if TODO // TODO 3438#if TODO // TODO
3612 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3440 {
3614 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3615 } 3442 }
3616#endif 3443#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3445 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3621 ev.property = rq.property; 3448 ev.property = property;
3449 }
3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3451 {
3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3453 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3454 ev.property = property;
3622 } 3455 }
3623 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3626 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3658 { 3491 {
3659 target = xa[XA_COMPOUND_TEXT]; 3492 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3493 style = enc_compound_text;
3661 } 3494 }
3662 3495
3663 if (selection.text) 3496 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3497 {
3665 cl = selection.text; 3498 cl = selection.text;
3666 selectlen = selection.len; 3499 selectlen = selection.len;
3500 }
3501 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3502 {
3503 cl = selection.clip_text;
3504 selectlen = selection.clip_len;
3667 } 3505 }
3668 else 3506 else
3669 { 3507 {
3670 cl = L""; 3508 cl = L"";
3671 selectlen = 0; 3509 selectlen = 0;
… …
3692 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3693 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3694 ct.encoding = target; 3532 ct.encoding = target;
3695 } 3533 }
3696 3534
3697 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3698 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3699 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3700 ev.property = rq.property; 3538 ev.property = property;
3701 3539
3702 if (freect) 3540 if (freect)
3703 XFree (ct.value); 3541 XFree (ct.value);
3704 } 3542 }
3705 3543

Diff Legend

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