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.329 by root, Sat Dec 26 10:24:04 2009 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
… …
395 } 402 }
396 403
397 free (tabs); 404 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
399 406
400 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
402 409
403 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
404 411
405 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
544 want_refresh = 1; 551 want_refresh = 1;
545 view_start = 0; 552 view_start = 0;
546 553
547 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
548 555
549 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
550 557
551#if NSCREENS 558#if NSCREENS
552 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
553 { 560 {
554 num_scr = 0; 561 num_scr = 0;
… …
631 638
632 if (count > 0 639 if (count > 0
633 && row1 == 0 640 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
636 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 646
641 // sever bottommost line 647 // sever bottommost line
642 { 648 {
643 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2 - 1);
644 l.is_longer (0); 650 l.is_longer (0);
645 l.touch (); 651 l.touch ();
646 } 652 }
647 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
648 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 670 for (int i = count; i--; )
650 { 671 {
651 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
652 673
653 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
655 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)))
656 { 677 {
657 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 679 l.l = 0;
659 l.f = 0; 680 l.f = 0;
660 } 681 }
661 else 682 else
662 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
663 }
664
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 } 684 }
676 685
677 // move and/or clear selection, if any 686 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
679 { 688 {
… …
792 801
793 while (str < strend) 802 while (str < strend)
794 { 803 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 805
797 if (expect_false (c < 0x20)) 806 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 807 if (c == C0_LF)
799 { 808 {
800 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
801 810
802 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
821 { 830 {
822 scr_tab (1, true); 831 scr_tab (1, true);
823 continue; 832 continue;
824 } 833 }
825 834
826 if (expect_false ( 835 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 839 ))
831 { 840 {
… …
836 * should be a similar check. 845 * should be a similar check.
837 */ 846 */
838 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
839 } 848 }
840 849
841 if (expect_false (screen.flags & Screen_WrapNext)) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 851 {
843 scr_do_wrap (); 852 scr_do_wrap ();
844 853
845 line->l = ncol; 854 line->l = ncol;
846 line->is_longer (1); 855 line->is_longer (1);
… …
848 row = screen.cur.row; 857 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
850 } 859 }
851 860
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 863 c = 0xfffd;
855 864
856 // 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
857 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
859 // locale. 868 // locale.
860 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
861 870
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 872 {
864 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 874 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
882 } 891 }
883 } 892 }
884 893
885 if (expect_false (screen.flags & Screen_Insert)) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
887 896
888 if (width != 0) 897 if (width != 0)
889 { 898 {
890#if !UNICODE_3 899#if !UNICODE_3
… …
895# else 904# else
896 c = 0xfffd; 905 c = 0xfffd;
897# endif 906# endif
898#endif 907#endif
899 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
900 // nuke the character at this position, if required 925 // nuke the character at this position, if required
901 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.
902 line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col); 930 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 931
919 line->touch (); 932 line->touch ();
920 933
921 do 934 do
922 { 935 {
923 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
925 938
926 if (expect_true (screen.cur.col < ncol - 1)) 939 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 940 screen.cur.col++;
928 else 941 else
929 { 942 {
930 line->l = ncol; 943 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
933 break; 946
947 goto end_of_line;
934 } 948 }
935 949
936 c = NOCHAR; 950 c = NOCHAR;
937 } 951 }
938 while (expect_false (--width > 0)); 952 while (ecb_unlikely (--width > 0));
939 953
940 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 956 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 957 line->t[c] = ' ';
948 line->r[c] = rend; 958 line->r[c] = rend;
949 }
950 } 959 }
960
961end_of_line:
962 ;
951 } 963 }
952#if ENABLE_COMBINING 964#if ENABLE_COMBINING
953 else // width == 0 965 else // width == 0
954 { 966 {
955 if (c != 0xfeff) // ignore BOM 967 if (c != 0xfeff) // ignore BOM
… …
1018 1030
1019 want_refresh = 1; 1031 want_refresh = 1;
1020#endif 1032#endif
1021 } 1033 }
1022 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1023 else 1037 else
1024 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1025} 1039}
1026 1040
1027/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1334 return; 1348 return;
1335 1349
1336 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1337 1351
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1355 {
1345 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1346 1357
1347 if (mapped && !view_start) 1358 if (mapped)
1348 XClearArea (dpy, vt, 0, 1359 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1360 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1361 (unsigned int)Height2Pixel (num), False);
1351 } 1362 }
1352 else 1363 else
1353 { 1364 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1366
1356 if (mapped && !view_start) 1367 if (mapped)
1357 { 1368 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1371 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1372 0, Row2Pixel (row - view_start),
… …
1368 1379
1369 for (; num--; row++) 1380 for (; num--; row++)
1370 { 1381 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1372 1383
1373 if (!view_start) 1384 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1386 }
1376} 1387}
1377 1388
1378#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1379void 1390void
… …
1678 { 1689 {
1679 rvideo_state = on; 1690 rvideo_state = on;
1680 1691
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1684#endif 1695#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1697
1687 XGCValues gcvalue; 1698 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1843 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1844 {
1834 min_it (rc[i].col, ncol - 1); 1845 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1846 min_it (rc[i].row, nrow - 1);
1836 } 1847 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1848
1838 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++)
1839 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);
1840 1851
1841 num_scr_allow = 0; 1852 num_scr_allow = 0;
1842 1853
… …
1915 1926
1916# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1919# endif 1930# endif
1920 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1921# endif 1932# endif
1922 1933
1923# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1936 set_urgency (1);
… …
1933 1944
1934 bell_ev.start (VISUAL_BELL_DURATION); 1945 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1946 }
1936 else 1947 else
1937 XBell (dpy, 0); 1948 XBell (dpy, 0);
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1950#endif
1939} 1951}
1940 1952
1941/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */
1943void 1954void
1944rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1945{ 1956{
1946#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1947 int nrows, row_start; 1958 int nrows, row_start;
… …
1961 row_start = view_start; 1972 row_start = view_start;
1962 } 1973 }
1963 1974
1964 wctomb (0, 0); 1975 wctomb (0, 0);
1965 1976
1966 for (int r1 = 0; r1 < nrows; r1++) 1977 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1967 { 1978 {
1968 text_t *tp = ROW(r1).t; 1979 text_t *tp = ROW(r1).t;
1969 int len = ROW(r1).l; 1980 int len = ROW(r1).l;
1970 1981
1971 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
… …
2023 refresh_count = 0; 2034 refresh_count = 0;
2024 2035
2025 unsigned int old_screen_flags = screen.flags; 2036 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0; 2037 char have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2028 have_bg = bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2029#endif 2040#endif
2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2031 2042
2032 /* 2043 /*
2033 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
… …
2082 ccol2 = bgcolor_of (rstyle); 2093 ccol2 = bgcolor_of (rstyle);
2083#else 2094#else
2084 ccol2 = Color_bg; 2095 ccol2 = Color_bg;
2085#endif 2096#endif
2086 2097
2087 if (showcursor && focus) 2098 if (focus)
2088 { 2099 {
2089 if (option (Opt_cursorUnderline)) 2100 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2101 *crp ^= RS_Uline;
2091 else 2102 else
2092 { 2103 {
… …
2225 continue; 2236 continue;
2226 2237
2227 // redraw one or more characters 2238 // redraw one or more characters
2228 2239
2229 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2231 --col; 2242 --col;
2232 2243
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2245 text_t *text = stp + col;
2235 int count = 1; 2246 int count = 1;
2236 2247
2237 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2238 drp[col] = rend; 2249 drp[col] = rend;
… …
2273 2284
2274 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2275 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2276 2287
2277 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2278 while (expect_false (i && text[count] == NOCHAR)) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2279 count++, i--; 2290 count++, i--;
2280 2291
2281 /* 2292 /*
2282 * Determine the attributes for the string 2293 * Determine the attributes for the string
2283 */ 2294 */
2284 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2286 2297
2287 // 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
2288 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)))
2289 { 2300 {
2290 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2291 2302
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2323
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2324 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2325 fore = Color_UL;
2315#endif 2326#endif
2316 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
2317 if (invert) 2348 if (invert)
2318 { 2349 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 ::swap (fore, back); 2350 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2351
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2333 if (ISSET_PIXCOLOR (Color_RV))
2334 back = Color_RV;
2335# endif
2336 if (fore == back) 2353 if (fore == back)
2337 { 2354 {
2338 fore = Color_bg; 2355 fore = Color_bg;
2339 back = Color_fg; 2356 back = Color_fg;
2340 } 2357 }
… …
2376 /* 2393 /*
2377 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2378 */ 2395 */
2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2380 2397
2381 if (expect_true (have_bg && back == Color_bg)) 2398 if (ecb_likely (have_bg && back == Color_bg))
2382 { 2399 {
2383 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2384 2401
2385 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2386 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2393 did_clear: ; 2410 did_clear: ;
2394 } 2411 }
2395 else 2412 else
2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2397 2414
2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2399 { 2416 {
2400#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2401 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2402 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2403 else 2420 else
… …
2494 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2495 } 2512 }
2496} 2513}
2497 2514
2498void 2515void
2499rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2500{ 2517{
2518 bool transparent = false;
2519
2501#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2502 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2503#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);
2504 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 {
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2508 2546
2509 if (scrollBar.win) 2547 if (scrollBar.win)
2510 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2513 scrollBar.show (0); 2554 scrollBar.show (0);
2514 } 2555 }
2515 2556
2516#endif 2557 if (refresh)
2517 2558 {
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear (); 2559 scr_clear ();
2520 scr_touch (true); 2560 scr_touch (true);
2561 }
2521 want_refresh = 1; 2562 want_refresh = 1;
2522} 2563}
2523 2564
2524/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2525void 2566void
… …
2593 { 2634 {
2594#if !ENABLE_MINIMAL 2635#if !ENABLE_MINIMAL
2595 if (selection.rect) 2636 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2637 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2639 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2640 else
2600#endif 2641#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2642 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2643 selection.end.row, selection.end.col,
2603 RS_RVid); 2644 RS_Sel | RS_RVid);
2604 } 2645 }
2605} 2646}
2606 2647
2607/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2608/* 2649/*
… …
2613void 2654void
2614rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2656{
2616 int row, wrote; 2657 int row, wrote;
2617 unsigned int width, towrite; 2658 unsigned int width, towrite;
2618 char r1[] = "\n"; 2659 const char r1[] = "\n";
2619 2660
2620 for (row = saveLines + top_row; 2661 for (row = saveLines + top_row;
2621 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2622 { 2663 {
2623 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2669/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2670/* 2711/*
2671 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2672 */ 2713 */
2673void 2714void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2716{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2720 data[i] = C0_CR;
… …
2685 2726
2686 if (priv_modes & PrivMode_BracketPaste) 2727 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2728 tt_printf ("\e[201~");
2688} 2729}
2689 2730
2690/* ------------------------------------------------------------------------- */
2691/*
2692 * Respond to a notification that a primary selection has been sent
2693 * EXT: SelectionNotify
2694 */
2695void 2731void
2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697{ 2733{
2698 if (prop == None) /* check for failed XConvertSelection */ 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2699 {
2700 if ((selection_type & Sel_CompoundText))
2701 {
2702 int selnum = selection_type & Sel_whereMask;
2703
2704 selection_type = 0;
2705 if (selnum != Sel_direct)
2706 selection_request_other (XA_STRING, selnum);
2707 }
2708
2709 if ((selection_type & Sel_UTF8String))
2710 {
2711 int selnum = selection_type & Sel_whereMask;
2712
2713 selection_type = Sel_CompoundText;
2714 if (selnum != Sel_direct)
2715 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2716 else
2717 selection_type = 0;
2718 }
2719
2720 return;
2721 }
2722
2723 unsigned long bytes_after;
2724 XTextProperty ct;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 0, PROP_SIZE / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct.encoding, &ct.format,
2730 &ct.nitems, &bytes_after,
2731 &ct.value) != Success)
2732 {
2733 ct.value = 0;
2734 goto bailout;
2735 }
2736
2737 if (ct.encoding == None)
2738 goto bailout;
2739
2740 if (bytes_after)
2741 {
2742 // fetch and append remaining data
2743 XTextProperty ct2;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 ct.nitems / 4, (bytes_after + 3) / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct2.encoding, &ct2.format,
2749 &ct2.nitems, &bytes_after,
2750 &ct2.value) != Success)
2751 goto bailout;
2752
2753 // realloc should be compatible to XFree, here, and elsewhere, too
2754 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2755 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2756 ct.nitems += ct2.nitems;
2757
2758 XFree (ct2.value);
2759 }
2760
2761 if (ct.value == 0)
2762 goto bailout;
2763
2764 if (ct.encoding == xa[XA_INCR])
2765 {
2766 // INCR selection, start handshake
2767 if (!delete_prop)
2768 XDeleteProperty (dpy, win, prop);
2769
2770 selection_wait = Sel_incr;
2771 incr_buf_fill = 0;
2772 incr_ev.start (10);
2773
2774 goto bailout;
2775 }
2776
2777 if (ct.nitems == 0)
2778 {
2779 if (selection_wait == Sel_incr)
2780 {
2781 XFree (ct.value);
2782
2783 // finally complete, now paste the whole thing
2784 selection_wait = Sel_normal;
2785 ct.value = (unsigned char *)incr_buf;
2786 ct.nitems = incr_buf_fill;
2787 incr_buf = 0;
2788 incr_buf_size = 0;
2789 incr_ev.stop ();
2790 }
2791 else
2792 {
2793 if (selection_wait == Sel_normal
2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2795 {
2796 /*
2797 * pass through again trying CUT_BUFFER0 if we've come from
2798 * XConvertSelection () but nothing was presented
2799 */
2800 selection_paste (display->root, XA_CUT_BUFFER0, False);
2801 }
2802
2803 goto bailout;
2804 }
2805 }
2806 else if (selection_wait == Sel_incr)
2807 {
2808 incr_ev.start (10);
2809
2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2811 {
2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814 }
2815
2816 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817 incr_buf_fill += ct.nitems;
2818
2819 goto bailout;
2820 }
2821
2822 char **cl;
2823 int cr;
2824
2825#if !ENABLE_MINIMAL
2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827 // so recode it manually
2828 if (ct.encoding == xa[XA_UTF8_STRING])
2829 {
2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831 char *s = rxvt_wcstombs (w);
2832 free (w);
2833 // TODO: strlen == only the first element will be converted. well...
2834 paste (s, strlen (s));
2835 free (s);
2836 }
2837 else
2838#endif
2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840 && cl)
2841 {
2842 for (int i = 0; i < cr; i++)
2843 paste (cl[i], strlen (cl[i]));
2844
2845 XFreeStringList (cl);
2846 }
2847 else
2848 paste ((char *)ct.value, ct.nitems); // paste raw
2849
2850bailout:
2851 XFree (ct.value);
2852
2853 if (selection_wait == Sel_normal)
2854 selection_wait = Sel_none;
2855}
2856
2857void
2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2859{
2860 selection_wait = Sel_none;
2861
2862 incr_buf_size = 0;
2863 free (incr_buf);
2864
2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2866}
2867
2868void
2869rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2870{
2871 if (prop == None || selection_wait != Sel_incr)
2872 return; 2735 return;
2873 2736
2874 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2875} 2738}
2876 2739
2877/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2878/* 2741/*
2879 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2882 * > CUT_BUFFER0
2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2884 * will auto fallback to CUT_BUFFER0
2885 * EXT: button 2 release 2745 * EXT: button 2 release
2886 */ 2746 */
2887void 2747void
2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889{ 2749{
2890 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2891 {
2892 /* internal selection */
2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2894 paste (str, strlen (str));
2895 free (str);
2896 return;
2897 } 2751 {
2898 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2899 { 2754 }
2900 selection_request_time = tm;
2901 selection_wait = Sel_normal;
2902
2903#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return;
2907#else
2908 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return;
2911#endif
2912 }
2913
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false);
2916}
2917
2918int
2919rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2920{
2921 Atom sel;
2922
2923 selection_type |= selnum;
2924
2925 if (selnum == Sel_Primary)
2926 sel = XA_PRIMARY;
2927 else if (selnum == Sel_Secondary)
2928 sel = XA_SECONDARY;
2929 else
2930 sel = xa[XA_CLIPBOARD];
2931
2932 if (XGetSelectionOwner (dpy, sel) != None)
2933 {
2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2935 vt, selection_request_time);
2936 return 1;
2937 }
2938
2939 return 0;
2940} 2755}
2941 2756
2942/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2943/* 2758/*
2944 * Clear all selected text 2759 * Clear all selected text
2945 * EXT: SelectionClear 2760 * EXT: SelectionClear
2946 */ 2761 */
2947void 2762void
2948rxvt_term::selection_clear () NOTHROW 2763rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2764{
2765 if (!clipboard)
2766 {
2950 want_refresh = 1; 2767 want_refresh = 1;
2951 free (selection.text); 2768 free (selection.text);
2952 selection.text = NULL; 2769 selection.text = NULL;
2953 selection.len = 0; 2770 selection.len = 0;
2954 CLEAR_SELECTION (); 2771 CLEAR_SELECTION ();
2955 2772
2956 if (display->selection_owner == this) 2773 if (display->selection_owner == this)
2957 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 }
2958} 2785}
2959 2786
2960/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2961/* 2788/*
2962 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2964 */ 2791 */
2965void 2792void
2966rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
2967{ 2794{
2968 int i; 2795 int size;
2969 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
2970 text_t *t; 2797 text_t *t;
2971 2798
2972 switch (selection.op) 2799 switch (selection.op)
2973 { 2800 {
… …
2989 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
2990 2817
2991 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)))
2992 return; 2819 return;
2993 2820
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 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));
2996 2823
2997 int ofs = 0; 2824 int ofs = 0;
2998 int extra = 0; 2825 int extra = 0;
2999 2826
3000 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
3006 { 2833 {
3007#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
3008 if (selection.rect) 2835 if (selection.rect)
3009 { 2836 {
3010 col = selection.beg.col; 2837 col = selection.beg.col;
3011 end_col = ncol + 1; 2838 end_col = selection.end.col;
3012 } 2839 }
3013 else 2840 else
3014#endif 2841#endif
3015 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
3016 2843
3017 col = max (col, 0); 2844 col = max (col, 0);
3018 2845
3019 if (row == selection.end.row 2846 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
3025 2848
3026 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
3027 2850
3028 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3036 2859
3037 extra -= (len - 1); 2860 extra -= (len - 1);
3038 2861
3039 if (extra < 0) 2862 if (extra < 0)
3040 { 2863 {
3041 extra += i; 2864 extra += size;
3042 i += i; 2865 size += size;
3043 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));
3044 } 2867 }
3045 2868
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 2870 }
3048#endif 2871#endif
… …
3060 2883
3061 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3062 } 2885 }
3063 else 2886 else
3064#endif 2887#endif
3065 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))
3066 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3067 } 2892 }
3068
3069 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF;
3071 2893
3072 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3073 2895
3074 if (ofs == 0) 2896 if (ofs == 0)
3075 { 2897 {
… …
3088 2910
3089 selection_grab (tm); 2911 selection_grab (tm);
3090} 2912}
3091 2913
3092bool 2914bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 2916{
2917 Atom sel;
2918
2919 if (!clipboard)
2920 {
3095 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 }
3096 2929
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2930 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2931 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 2932 {
3100 display->set_selection_owner (this); 2933 display->set_selection_owner (this, clipboard);
3101 return true; 2934 return true;
3102 } 2935 }
3103 else 2936 else
3104 { 2937 {
3105 selection_clear (); 2938 selection_clear (clipboard);
3106 return false; 2939 return false;
3107 } 2940 }
3108 2941
3109#if 0 2942#if 0
3110 XTextProperty ct; 2943 XTextProperty ct;
… …
3570 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3571 */ 3404 */
3572void 3405void
3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3575 XSelectionEvent ev; 3409 XSelectionEvent ev;
3576 3410
3577 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3578 ev.property = None; 3412 ev.property = None;
3579 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3594 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3595#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3596 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3597#endif 3431#endif
3598 3432
3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600 32, PropModeReplace, 3434 32, PropModeReplace,
3601 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3602 ev.property = rq.property; 3436 ev.property = property;
3603 } 3437 }
3604#if TODO // TODO 3438#if TODO // TODO
3605 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3440 {
3607 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3608 } 3442 }
3609#endif 3443#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3445 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614 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;
3615 } 3455 }
3616 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3619 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3651 { 3491 {
3652 target = xa[XA_COMPOUND_TEXT]; 3492 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3493 style = enc_compound_text;
3654 } 3494 }
3655 3495
3656 if (selection.text) 3496 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3497 {
3658 cl = selection.text; 3498 cl = selection.text;
3659 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;
3660 } 3505 }
3661 else 3506 else
3662 { 3507 {
3663 cl = L""; 3508 cl = L"";
3664 selectlen = 0; 3509 selectlen = 0;
… …
3685 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3686 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3687 ct.encoding = target; 3532 ct.encoding = target;
3688 } 3533 }
3689 3534
3690 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3691 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3692 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3693 ev.property = rq.property; 3538 ev.property = property;
3694 3539
3695 if (freect) 3540 if (freect)
3696 XFree (ct.value); 3541 XFree (ct.value);
3697 } 3542 }
3698 3543

Diff Legend

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