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.352 by root, Fri Oct 15 20:52:15 2010 UTC vs.
Revision 1.406 by sf-exg, Wed Nov 16 18:26:47 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.
… …
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
161 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
162 160
163void 161void
164rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
165{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
166 view_start = 0; 168 view_start = 0;
167 num_scr = 0; 169 num_scr = 0;
168 170
169 if (ncol == 0) 171 if (ncol == 0)
170 ncol = 80; 172 ncol = 80;
… …
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 211
210 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
211 { 213 {
… …
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 277 }
276 278
277 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
279 281
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
… …
400 } 402 }
401 403
402 free (tabs); 404 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
404 406
405 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
407 409
408 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
409 411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
636 638
637 if (count > 0 639 if (count > 0
638 && row1 == 0 640 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
641 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 646
646 // sever bottommost line 647 // sever bottommost line
647 { 648 {
648 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
649 l.is_longer (0); 650 l.is_longer (0);
650 l.touch (); 651 l.touch ();
651 } 652 }
652 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
653 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 670 for (int i = count; i--; )
655 { 671 {
656 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
657 673
658 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
660 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)))
661 { 677 {
662 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 679 l.l = 0;
… …
665 } 681 }
666 else 682 else
667 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
668 } 684 }
669 685
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any 686 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
684 { 689 {
685 selection.beg.row -= count; 690 selection.beg.row -= count;
686 selection.end.row -= count; 691 selection.end.row -= count;
687 selection.mark.row -= count; 692 selection.mark.row -= count;
688 693
689 if (selection.beg.row < top_row 694 selection_check (0);
690 || selection.end.row < top_row
691 || selection.mark.row < top_row)
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 } 695 }
697 696
698 // finally move the view window, if desired 697 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 699 && view_start != 0
… …
730 } 729 }
731 730
732 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
734 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
735 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
736 743
737 min_it (count, rows); 744 min_it (count, rows);
738 745
739 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 747
741 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
742 { 749 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 751
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 754 }
748 755
749 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
751 } 765 }
752 766
753 return count; 767 return count;
754} 768}
755 769
… …
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 776{
763 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
764 return; 778 return;
765 779
766 unsigned char checksel; 780 bool checksel;
767 unicode_t c; 781 unicode_t c;
768 int ncol = this->ncol; 782 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
770 784
771 want_refresh = 1; 785 want_refresh = 1;
… …
797 811
798 while (str < strend) 812 while (str < strend)
799 { 813 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 815
802 if (expect_false (c < 0x20)) 816 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 817 if (c == C0_LF)
804 { 818 {
805 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
806 820
807 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
826 { 840 {
827 scr_tab (1, true); 841 scr_tab (1, true);
828 continue; 842 continue;
829 } 843 }
830 844
831 if (expect_false ( 845 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 849 ))
836 { 850 {
… …
841 * should be a similar check. 855 * should be a similar check.
842 */ 856 */
843 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
844 } 858 }
845 859
846 if (expect_false (screen.flags & Screen_WrapNext)) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 861 {
848 scr_do_wrap (); 862 scr_do_wrap ();
849 863
850 line->l = ncol; 864 line->l = ncol;
851 line->is_longer (1); 865 line->is_longer (1);
… …
853 row = screen.cur.row; 867 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
855 } 869 }
856 870
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 873 c = 0xfffd;
860 874
861 // rely on wcwidth to tell us the character width, do wcwidth before 875 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
864 // locale. 878 // locale.
865 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
866 880
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 882 {
869 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 884 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
887 } 901 }
888 } 902 }
889 903
890 if (expect_false (screen.flags & Screen_Insert)) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
892 906
893 if (width != 0) 907 if (width != 0)
894 { 908 {
895#if !UNICODE_3 909#if !UNICODE_3
… …
903#endif 917#endif
904 918
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 920
907 // if the character doesn't fit into the remaining columns... 921 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 923 {
910 if (screen.flags & Screen_Autowrap) 924 if (screen.flags & Screen_Autowrap)
911 { 925 {
912 // ... artificially enlargen the previous one 926 // ... artificially enlargen the previous one
913 c = NOCHAR; 927 c = NOCHAR;
… …
917 else 931 else
918 screen.cur.col = ncol - width; 932 screen.cur.col = ncol - width;
919 } 933 }
920 934
921 // nuke the character at this position, if required 935 // nuke the character at this position, if required
922 if (expect_false ( 936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
923 line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 || (screen.cur.col < ncol - 1
925 && line->t[screen.cur.col + 1] == NOCHAR)
926 ))
927 scr_kill_char (*line, screen.cur.col); 940 scr_kill_char (*line, screen.cur.col);
928 941
929 line->touch (); 942 line->touch ();
930 943
931 do 944 do
932 { 945 {
933 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
934 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
935 948
936 if (expect_true (screen.cur.col < ncol - 1)) 949 if (ecb_likely (screen.cur.col < ncol - 1))
937 screen.cur.col++; 950 screen.cur.col++;
938 else 951 else
939 { 952 {
940 line->l = ncol; 953 line->l = ncol;
941 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
… …
944 goto end_of_line; 957 goto end_of_line;
945 } 958 }
946 959
947 c = NOCHAR; 960 c = NOCHAR;
948 } 961 }
949 while (expect_false (--width > 0)); 962 while (ecb_unlikely (--width > 0));
950 963
951 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
952 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
953 { 966 {
954 line->t[c] = ' '; 967 line->t[c] = ' ';
955 line->r[c] = rend; 968 line->r[c] = rend;
956 } 969 }
957 970
… …
1313 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1314 1327
1315 switch (mode) 1328 switch (mode)
1316 { 1329 {
1317 case 0: /* erase to end of screen */ 1330 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1331 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1332 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1333 num = nrow - row;
1322 break; 1334 break;
1323 case 1: /* erase to beginning of screen */ 1335 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1336 scr_erase_line (1);
1326 row = 0; 1337 row = 0;
1327 num = screen.cur.row; 1338 num = screen.cur.row;
1328 break; 1339 break;
1329 case 2: /* erase whole screen */ 1340 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1341 row = 0;
1332 num = nrow; 1342 num = nrow;
1333 break; 1343 break;
1334 default: 1344 default:
1335 return; 1345 return;
… …
1686 { 1696 {
1687 rvideo_state = on; 1697 rvideo_state = on;
1688 1698
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1699 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1700#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1701 if (bg_pixmap == None)
1692#endif 1702#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1703 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1704
1695 XGCValues gcvalue; 1705 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1706 gcvalue.foreground = pix_colors[Color_fg];
… …
1923 1933
1924# ifndef NO_MAPALERT 1934# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1935# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1936 if (option (Opt_mapAlert))
1927# endif 1937# endif
1928 XMapWindow (dpy, parent[0]); 1938 XMapWindow (dpy, parent);
1929# endif 1939# endif
1930 1940
1931# if ENABLE_FRILLS 1941# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1942 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1943 set_urgency (1);
… …
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1956 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947#endif 1957#endif
1948} 1958}
1949 1959
1950/* ------------------------------------------------------------------------- */ 1960/* ------------------------------------------------------------------------- */
1951/* ARGSUSED */
1952void 1961void
1953rxvt_term::scr_printscreen (int fullhist) NOTHROW 1962rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954{ 1963{
1955#ifdef PRINTPIPE 1964#ifdef PRINTPIPE
1956 int nrows, row_start; 1965 int nrows, row_start;
… …
2030 * A: set up vars 2039 * A: set up vars
2031 */ 2040 */
2032 refresh_count = 0; 2041 refresh_count = 0;
2033 2042
2034 unsigned int old_screen_flags = screen.flags; 2043 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2044 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2045#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2046 have_bg = bg_pixmap != None;
2038#endif 2047#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2048 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2049
2041 /* 2050 /*
2042 * B: reverse any characters which are selected 2051 * B: reverse any characters which are selected
… …
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2048 scr_swap_overlay (); 2057 scr_swap_overlay ();
2049#endif 2058#endif
2050 2059
2051 char showcursor = screen.flags & Screen_VisibleCursor; 2060 bool showcursor = screen.flags & Screen_VisibleCursor;
2052 2061
2053 /* 2062 /*
2054 * C: set the cursor character (s) 2063 * C: set the cursor character (s)
2055 */ 2064 */
2056 { 2065 {
2057 unsigned char setoldcursor; 2066 bool setoldcursor;
2058 2067
2059#ifdef CURSOR_BLINK 2068#ifdef CURSOR_BLINK
2060 if (hidden_cursor) 2069 if (hidden_cursor)
2061 showcursor = 0; 2070 showcursor = 0;
2062#endif 2071#endif
… …
2234 continue; 2243 continue;
2235 2244
2236 // redraw one or more characters 2245 // redraw one or more characters
2237 2246
2238 // seek to the beginning of wide characters 2247 // seek to the beginning of wide characters
2239 while (expect_false (stp[col] == NOCHAR && col > 0)) 2248 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2240 --col; 2249 --col;
2241 2250
2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2251 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2243 text_t *text = stp + col; 2252 text_t *text = stp + col;
2244 int count = 1; 2253 int count = 1;
… …
2282 2291
2283 col--; /* went one too far. move back */ 2292 col--; /* went one too far. move back */
2284 count -= i; /* dump any matching trailing chars */ 2293 count -= i; /* dump any matching trailing chars */
2285 2294
2286 // sometimes we optimize away the trailing NOCHAR's, add them back 2295 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (expect_false (i && text[count] == NOCHAR)) 2296 while (ecb_unlikely (i && text[count] == NOCHAR))
2288 count++, i--; 2297 count++, i--;
2289 2298
2290 /* 2299 /*
2291 * Determine the attributes for the string 2300 * Determine the attributes for the string
2292 */ 2301 */
2293 int fore = fgcolor_of (rend); // desired foreground 2302 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2303 int back = bgcolor_of (rend); // desired background
2295 2304
2296 // only do special processing if any attributes are set, which is unlikely 2305 // only do special processing if any attributes are set, which is unlikely
2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2306 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2307 {
2299 bool invert = rend & RS_RVid; 2308 bool invert = rend & RS_RVid;
2300 2309
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2310#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2311 if (rend & RS_Bold && fore == Color_fg)
… …
2391 /* 2400 /*
2392 * Actually do the drawing of the string here 2401 * Actually do the drawing of the string here
2393 */ 2402 */
2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2403 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2395 2404
2396 if (expect_true (have_bg && back == Color_bg)) 2405 if (ecb_likely (have_bg && back == Color_bg))
2397 { 2406 {
2398 // this is very ugly, maybe push it into ->draw? 2407 // this is very ugly, maybe push it into ->draw?
2399 2408
2400 for (i = 0; i < count; i++) /* don't draw empty strings */ 2409 for (i = 0; i < count; i++) /* don't draw empty strings */
2401 if (text[i] != ' ') 2410 if (text[i] != ' ')
… …
2408 did_clear: ; 2417 did_clear: ;
2409 } 2418 }
2410 else 2419 else
2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2420 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2412 2421
2413 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2422 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2414 { 2423 {
2415#if ENABLE_FRILLS 2424#if ENABLE_FRILLS
2416 if (ISSET_PIXCOLOR (Color_underline)) 2425 if (ISSET_PIXCOLOR (Color_underline))
2417 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2426 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2418 else 2427 else
… …
2509 scr_remap_chars (swap_buf [i]); 2518 scr_remap_chars (swap_buf [i]);
2510 } 2519 }
2511} 2520}
2512 2521
2513void 2522void
2514rxvt_term::scr_recolour () NOTHROW 2523rxvt_term::scr_recolour (bool refresh) NOTHROW
2515{ 2524{
2525 bool transparent = false;
2526
2516#ifdef HAVE_BG_PIXMAP 2527#ifdef HAVE_BG_PIXMAP
2517 bgPixmap.apply (); 2528 if (bg_pixmap != None)
2518#else 2529 {
2530# ifdef ENABLE_TRANSPARENCY
2531 if (bg_flags & BG_IS_TRANSPARENT)
2532 {
2533 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2534 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2519 2535
2536 transparent = true;
2537 }
2538 else
2539# endif
2540 {
2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2542 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2543 }
2544 }
2545 else
2546#endif
2547 {
2520 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2548 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2521 XClearWindow (dpy, parent[0]);
2522 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2549 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2550 }
2551
2552 XClearWindow (dpy, parent);
2523 2553
2524 if (scrollBar.win) 2554 if (scrollBar.win)
2525 { 2555 {
2556 if (transparent)
2557 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2558 else
2526 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2527 scrollBar.state = STATE_IDLE; 2560 scrollBar.state = SB_STATE_IDLE;
2528 scrollBar.show (0); 2561 scrollBar.show (0);
2529 } 2562 }
2530 2563
2531#endif 2564 if (refresh)
2532 2565 {
2533 /* bgPixmap.apply () does not do the following : */
2534 scr_clear (); 2566 scr_clear ();
2535 scr_touch (true); 2567 scr_touch (true);
2568 }
2536 want_refresh = 1; 2569 want_refresh = 1;
2537} 2570}
2538 2571
2539/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2540void 2573void
… …
2628void 2661void
2629rxvt_term::scr_dump (int fd) NOTHROW 2662rxvt_term::scr_dump (int fd) NOTHROW
2630{ 2663{
2631 int row, wrote; 2664 int row, wrote;
2632 unsigned int width, towrite; 2665 unsigned int width, towrite;
2633 char r1[] = "\n"; 2666 const char r1[] = "\n";
2634 2667
2635 for (row = saveLines + top_row; 2668 for (row = saveLines + top_row;
2636 row < saveLines + nrow - 1; row++) 2669 row < saveLines + nrow - 1; row++)
2637 { 2670 {
2638 width = row_buf[row].l >= 0 ? row_buf[row].l 2671 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2655 * CHARACTER SELECTION * 2688 * CHARACTER SELECTION *
2656 * ------------------------------------------------------------------------- */ 2689 * ------------------------------------------------------------------------- */
2657void 2690void
2658rxvt_term::selection_check (int check_more) NOTHROW 2691rxvt_term::selection_check (int check_more) NOTHROW
2659{ 2692{
2660 row_col_t pos;
2661
2662 if (!selection.op) 2693 if (!selection.op)
2663 return; 2694 return;
2664 2695
2696 row_col_t pos;
2665 pos.row = pos.col = 0; 2697 pos.row = pos.col = 0;
2698
2666 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2699 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2700 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2668 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2701 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2669 || (check_more == 1 2702 || (check_more == 1
2670 && current_screen == selection.screen 2703 && current_screen == selection.screen
… …
2672 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2705 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2673 || (check_more == 2 2706 || (check_more == 2
2674 && ROWCOL_IS_BEFORE (selection.beg, pos) 2707 && ROWCOL_IS_BEFORE (selection.beg, pos)
2675 && ROWCOL_IS_AFTER (selection.end, pos)) 2708 && ROWCOL_IS_AFTER (selection.end, pos))
2676 || (check_more == 3 2709 || (check_more == 3
2677 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos)))
2678 || (check_more == 4 /* screen width change */
2679 && (selection.beg.row != selection.end.row
2680 || selection.end.col > ncol)))
2681 CLEAR_SELECTION (); 2711 CLEAR_ALL_SELECTION ();
2682} 2712}
2683 2713
2684/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2685/* 2715/*
2686 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd
… …
2711 tt_paste (data, len); 2741 tt_paste (data, len);
2712} 2742}
2713 2743
2714/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2715/* 2745/*
2716 * Respond to a notification that a primary selection has been sent 2746 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2717 * EXT: SelectionNotify 2747 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2718 */ 2748 * as fallback
2719void
2720rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2721{
2722 if (prop == None) /* check for failed XConvertSelection */
2723 {
2724 if ((selection_type & Sel_CompoundText))
2725 {
2726 int selnum = selection_type & Sel_whereMask;
2727
2728 selection_type = 0;
2729 if (selnum != Sel_direct)
2730 selection_request_other (XA_STRING, selnum);
2731 }
2732
2733 if ((selection_type & Sel_UTF8String))
2734 {
2735 int selnum = selection_type & Sel_whereMask;
2736
2737 selection_type = Sel_CompoundText;
2738 if (selnum != Sel_direct)
2739 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2740 else
2741 selection_type = 0;
2742 }
2743
2744 return;
2745 }
2746
2747 unsigned long bytes_after;
2748 XTextProperty ct;
2749
2750 if (XGetWindowProperty (dpy, win, prop,
2751 0, PROP_SIZE / 4,
2752 delete_prop, AnyPropertyType,
2753 &ct.encoding, &ct.format,
2754 &ct.nitems, &bytes_after,
2755 &ct.value) != Success)
2756 {
2757 ct.value = 0;
2758 goto bailout;
2759 }
2760
2761 if (ct.encoding == None)
2762 goto bailout;
2763
2764 if (bytes_after)
2765 {
2766 // fetch and append remaining data
2767 XTextProperty ct2;
2768
2769 if (XGetWindowProperty (dpy, win, prop,
2770 ct.nitems / 4, (bytes_after + 3) / 4,
2771 delete_prop, AnyPropertyType,
2772 &ct2.encoding, &ct2.format,
2773 &ct2.nitems, &bytes_after,
2774 &ct2.value) != Success)
2775 goto bailout;
2776
2777 // realloc should be compatible to XFree, here, and elsewhere, too
2778 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2779 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2780 ct.nitems += ct2.nitems;
2781
2782 XFree (ct2.value);
2783 }
2784
2785 if (ct.value == 0)
2786 goto bailout;
2787
2788 if (ct.encoding == xa[XA_INCR])
2789 {
2790 // INCR selection, start handshake
2791 if (!delete_prop)
2792 XDeleteProperty (dpy, win, prop);
2793
2794 selection_wait = Sel_incr;
2795 incr_buf_fill = 0;
2796 incr_ev.start (10);
2797
2798 goto bailout;
2799 }
2800
2801 if (ct.nitems == 0)
2802 {
2803 if (selection_wait == Sel_incr)
2804 {
2805 XFree (ct.value);
2806
2807 // finally complete, now paste the whole thing
2808 selection_wait = Sel_normal;
2809 ct.value = (unsigned char *)incr_buf;
2810 ct.nitems = incr_buf_fill;
2811 incr_buf = 0;
2812 incr_buf_size = 0;
2813 incr_ev.stop ();
2814 }
2815 else
2816 {
2817 if (selection_wait == Sel_normal
2818 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2819 {
2820 /*
2821 * pass through again trying CUT_BUFFER0 if we've come from
2822 * XConvertSelection () but nothing was presented
2823 */
2824 selection_paste (display->root, XA_CUT_BUFFER0, False);
2825 }
2826
2827 goto bailout;
2828 }
2829 }
2830 else if (selection_wait == Sel_incr)
2831 {
2832 incr_ev.start (10);
2833
2834 while (incr_buf_fill + ct.nitems > incr_buf_size)
2835 {
2836 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2837 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2838 }
2839
2840 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2841 incr_buf_fill += ct.nitems;
2842
2843 goto bailout;
2844 }
2845
2846 char **cl;
2847 int cr;
2848
2849#if !ENABLE_MINIMAL
2850 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2851 // so recode it manually
2852 if (ct.encoding == xa[XA_UTF8_STRING])
2853 {
2854 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2855 char *s = rxvt_wcstombs (w);
2856 free (w);
2857 // TODO: strlen == only the first element will be converted. well...
2858 paste (s, strlen (s));
2859 free (s);
2860 }
2861 else
2862#endif
2863 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2864 && cl)
2865 {
2866 for (int i = 0; i < cr; i++)
2867 paste (cl[i], strlen (cl[i]));
2868
2869 XFreeStringList (cl);
2870 }
2871 else
2872 paste ((char *)ct.value, ct.nitems); // paste raw
2873
2874bailout:
2875 XFree (ct.value);
2876
2877 if (selection_wait == Sel_normal)
2878 selection_wait = Sel_none;
2879}
2880
2881void
2882rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2883{
2884 selection_wait = Sel_none;
2885
2886 incr_buf_size = 0;
2887 free (incr_buf);
2888
2889 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2890}
2891
2892void
2893rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2894{
2895 if (prop == None || selection_wait != Sel_incr)
2896 return;
2897
2898 selection_paste (win, prop, true);
2899}
2900
2901/* ------------------------------------------------------------------------- */
2902/*
2903 * Request the current selection:
2904 * Order: > internal selection if available
2905 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2906 * > CUT_BUFFER0
2907 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2908 * will auto fallback to CUT_BUFFER0
2909 * EXT: button 2 release 2749 * EXT: button 2 release
2910 */ 2750 */
2911void 2751void
2912rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2752rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2913{ 2753{
2914 if (selection.text && selnum == Sel_Primary) 2754 if (!selection_req)
2915 {
2916 /* internal selection */
2917 char *str = rxvt_wcstombs (selection.text, selection.len);
2918 paste (str, strlen (str));
2919 free (str);
2920 return;
2921 } 2755 {
2922 else 2756 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2757 selection_req->run ();
2923 { 2758 }
2924 selection_request_time = tm;
2925 selection_wait = Sel_normal;
2926
2927#if X_HAVE_UTF8_STRING
2928 selection_type = Sel_UTF8String;
2929 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2930 return;
2931#else
2932 selection_type = Sel_CompoundText;
2933 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2934 return;
2935#endif
2936 }
2937
2938 selection_wait = Sel_none; /* don't loop in selection_paste () */
2939 selection_paste (display->root, XA_CUT_BUFFER0, false);
2940}
2941
2942int
2943rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2944{
2945 Atom sel;
2946
2947 selection_type |= selnum;
2948
2949 if (selnum == Sel_Primary)
2950 sel = XA_PRIMARY;
2951 else if (selnum == Sel_Secondary)
2952 sel = XA_SECONDARY;
2953 else
2954 sel = xa[XA_CLIPBOARD];
2955
2956 if (XGetSelectionOwner (dpy, sel) != None)
2957 {
2958 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2959 vt, selection_request_time);
2960 return 1;
2961 }
2962
2963 return 0;
2964} 2759}
2965 2760
2966/* ------------------------------------------------------------------------- */ 2761/* ------------------------------------------------------------------------- */
2967/* 2762/*
2968 * Clear all selected text 2763 * Clear all selected text
… …
2999 * EXT: button 1 or 3 release 2794 * EXT: button 1 or 3 release
3000 */ 2795 */
3001void 2796void
3002rxvt_term::selection_make (Time tm) 2797rxvt_term::selection_make (Time tm)
3003{ 2798{
3004 int i; 2799 int size;
3005 wchar_t *new_selection_text; 2800 wchar_t *new_selection_text;
3006 text_t *t; 2801 text_t *t;
3007 2802
3008 switch (selection.op) 2803 switch (selection.op)
3009 { 2804 {
… …
3025 return; /* nothing selected, go away */ 2820 return; /* nothing selected, go away */
3026 2821
3027 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2822 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3028 return; 2823 return;
3029 2824
3030 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2825 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2826 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3032 2827
3033 int ofs = 0; 2828 int ofs = 0;
3034 int extra = 0; 2829 int extra = 0;
3035 2830
3036 int col = selection.beg.col; 2831 int col = selection.beg.col;
… …
3042 { 2837 {
3043#if !ENABLE_MINIMAL 2838#if !ENABLE_MINIMAL
3044 if (selection.rect) 2839 if (selection.rect)
3045 { 2840 {
3046 col = selection.beg.col; 2841 col = selection.beg.col;
3047 end_col = ncol + 1; 2842 end_col = selection.end.col;
3048 } 2843 }
3049 else 2844 else
3050#endif 2845#endif
3051 end_col = ROW(row).l; 2846 end_col = ROW(row).l;
3052 2847
3053 col = max (col, 0); 2848 col = max (col, 0);
3054 2849
3055 if (row == selection.end.row 2850 if (row == selection.end.row)
3056#if !ENABLE_MINIMAL
3057 || selection.rect
3058#endif
3059 )
3060 min_it (end_col, selection.end.col); 2851 min_it (end_col, selection.end.col);
3061 2852
3062 t = ROW(row).t + col; 2853 t = ROW(row).t + col;
3063 2854
3064 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
… …
3072 2863
3073 extra -= (len - 1); 2864 extra -= (len - 1);
3074 2865
3075 if (extra < 0) 2866 if (extra < 0)
3076 { 2867 {
3077 extra += i; 2868 extra += size;
3078 i += i; 2869 size += size;
3079 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2870 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3080 } 2871 }
3081 2872
3082 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083 } 2874 }
3084#endif 2875#endif
… …
3096 2887
3097 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3098 } 2889 }
3099 else 2890 else
3100#endif 2891#endif
3101 if (!ROW(row).is_longer () && row != selection.end.row) 2892 if (!ROW(row).is_longer ()
2893 && (row != selection.end.row || end_col != selection.end.col)
2894 && (row != selection.beg.row || selection.beg.col < ncol))
3102 new_selection_text[ofs++] = C0_LF; 2895 new_selection_text[ofs++] = C0_LF;
3103 } 2896 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 2897
3108 new_selection_text[ofs] = 0; 2898 new_selection_text[ofs] = 0;
3109 2899
3110 if (ofs == 0) 2900 if (ofs == 0)
3111 { 2901 {
… …
3617 * EXT: SelectionRequest 3407 * EXT: SelectionRequest
3618 */ 3408 */
3619void 3409void
3620rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3410rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3621{ 3411{
3412 Atom property = rq.property == None ? rq.target : rq.property;
3622 XSelectionEvent ev; 3413 XSelectionEvent ev;
3623 3414
3624 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3625 ev.property = None; 3416 ev.property = None;
3626 ev.display = rq.display; 3417 ev.display = rq.display;
… …
3641 *target++ = xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3642#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3643 *target++ = xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3644#endif 3435#endif
3645 3436
3646 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3647 32, PropModeReplace, 3438 32, PropModeReplace,
3648 (unsigned char *)target_list, target - target_list); 3439 (unsigned char *)target_list, target - target_list);
3649 ev.property = rq.property; 3440 ev.property = property;
3650 } 3441 }
3651#if TODO // TODO 3442#if TODO // TODO
3652 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3653 { 3444 {
3654 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3655 } 3446 }
3656#endif 3447#endif
3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3658 { 3449 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property; 3452 ev.property = property;
3662 } 3453 }
3663 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664 { 3455 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3456 XChangeProperty (dpy, rq.requestor, property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3667 ev.property = rq.property; 3458 ev.property = property;
3668 } 3459 }
3669 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3670 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3671 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3672 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
… …
3743 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3744 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3745 ct.encoding = target; 3536 ct.encoding = target;
3746 } 3537 }
3747 3538
3748 XChangeProperty (dpy, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, property,
3749 ct.encoding, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3750 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3751 ev.property = rq.property; 3542 ev.property = property;
3752 3543
3753 if (freect) 3544 if (freect)
3754 XFree (ct.value); 3545 XFree (ct.value);
3755 } 3546 }
3756 3547

Diff Legend

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