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.354 by root, Fri Oct 15 21:14:12 2010 UTC vs.
Revision 1.396 by root, Wed Nov 2 10:53:12 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)
684 { 688 {
685 selection.beg.row -= count; 689 selection.beg.row -= count;
686 selection.end.row -= count; 690 selection.end.row -= count;
687 selection.mark.row -= count; 691 selection.mark.row -= count;
688 692
689 if (selection.beg.row < top_row 693 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 } 694 }
697 695
698 // finally move the view window, if desired 696 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 698 && view_start != 0
… …
730 } 728 }
731 729
732 // use a simple and robust scrolling algorithm, this 730 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 731 // part of scr_scroll_text is not time-critical.
734 732
733 // sever line above scroll region
734 if (row1)
735 {
736 line_t &l = ROW(row1 - 1);
737 l.is_longer (0);
738 l.touch ();
739 }
740
735 int rows = row2 - row1 + 1; 741 int rows = row2 - row1 + 1;
736 742
737 min_it (count, rows); 743 min_it (count, rows);
738 744
739 line_t *temp_buf = row_buf + total_rows; 745 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 746
741 for (int row = 0; row < rows; row++) 747 for (int row = 0; row < rows; row++)
742 { 748 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 749 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 750
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 752 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 753 }
748 754
749 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 756 ROW(row1 + row) = temp_buf [row];
757
758 // sever bottommost line
759 {
760 line_t &l = ROW(row2);
761 l.is_longer (0);
762 l.touch ();
763 }
751 } 764 }
752 765
753 return count; 766 return count;
754} 767}
755 768
… …
797 810
798 while (str < strend) 811 while (str < strend)
799 { 812 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 813 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 814
802 if (expect_false (c < 0x20)) 815 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 816 if (c == C0_LF)
804 { 817 {
805 max_it (line->l, screen.cur.col); 818 max_it (line->l, screen.cur.col);
806 819
807 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
… …
826 { 839 {
827 scr_tab (1, true); 840 scr_tab (1, true);
828 continue; 841 continue;
829 } 842 }
830 843
831 if (expect_false ( 844 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 845 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 846 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 847 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 848 ))
836 { 849 {
… …
841 * should be a similar check. 854 * should be a similar check.
842 */ 855 */
843 CLEAR_SELECTION (); 856 CLEAR_SELECTION ();
844 } 857 }
845 858
846 if (expect_false (screen.flags & Screen_WrapNext)) 859 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 860 {
848 scr_do_wrap (); 861 scr_do_wrap ();
849 862
850 line->l = ncol; 863 line->l = ncol;
851 line->is_longer (1); 864 line->is_longer (1);
… …
853 row = screen.cur.row; 866 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 867 line = &ROW(row); /* _must_ refresh */
855 } 868 }
856 869
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 870 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 871 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 872 c = 0xfffd;
860 873
861 // rely on wcwidth to tell us the character width, do wcwidth before 874 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 875 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 876 // drawing characters below as they might be invalid in the current
864 // locale. 877 // locale.
865 int width = WCWIDTH (c); 878 int width = WCWIDTH (c);
866 879
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 880 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 881 {
869 // vt100 special graphics and line drawing 882 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 883 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 884 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 885 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 898 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 899 width = 1; // vt100 line drawing characters are always single-width
887 } 900 }
888 } 901 }
889 902
890 if (expect_false (screen.flags & Screen_Insert)) 903 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 904 scr_insdel_chars (width, INSERT);
892 905
893 if (width != 0) 906 if (width != 0)
894 { 907 {
895#if !UNICODE_3 908#if !UNICODE_3
… …
903#endif 916#endif
904 917
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 918 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 919
907 // if the character doesn't fit into the remaining columns... 920 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 921 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 922 {
910 if (screen.flags & Screen_Autowrap) 923 if (screen.flags & Screen_Autowrap)
911 { 924 {
912 // ... artificially enlargen the previous one 925 // ... artificially enlargen the previous one
913 c = NOCHAR; 926 c = NOCHAR;
… …
917 else 930 else
918 screen.cur.col = ncol - width; 931 screen.cur.col = ncol - width;
919 } 932 }
920 933
921 // nuke the character at this position, if required 934 // nuke the character at this position, if required
922 // due to wonderful coincidents everywhere else in this loop 935 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 936 // we never have to check for overwriting a wide char itself,
924 // only its tail. 937 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 938 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 939 scr_kill_char (*line, screen.cur.col);
927 940
928 line->touch (); 941 line->touch ();
929 942
930 do 943 do
931 { 944 {
932 line->t[screen.cur.col] = c; 945 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 946 line->r[screen.cur.col] = rend;
934 947
935 if (expect_true (screen.cur.col < ncol - 1)) 948 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 949 screen.cur.col++;
937 else 950 else
938 { 951 {
939 line->l = ncol; 952 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 953 if (screen.flags & Screen_Autowrap)
… …
943 goto end_of_line; 956 goto end_of_line;
944 } 957 }
945 958
946 c = NOCHAR; 959 c = NOCHAR;
947 } 960 }
948 while (expect_false (--width > 0)); 961 while (ecb_unlikely (--width > 0));
949 962
950 // pad with spaces when overwriting wide character with smaller one 963 // pad with spaces when overwriting wide character with smaller one
951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 964 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 965 {
953 line->t[c] = ' '; 966 line->t[c] = ' ';
954 line->r[c] = rend; 967 line->r[c] = rend;
955 } 968 }
956 969
… …
1685 { 1698 {
1686 rvideo_state = on; 1699 rvideo_state = on;
1687 1700
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1701 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1702#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1703 if (bg_pixmap == None)
1691#endif 1704#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1705 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1706
1694 XGCValues gcvalue; 1707 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1708 gcvalue.foreground = pix_colors[Color_fg];
… …
1922 1935
1923# ifndef NO_MAPALERT 1936# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1937# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1938 if (option (Opt_mapAlert))
1926# endif 1939# endif
1927 XMapWindow (dpy, parent[0]); 1940 XMapWindow (dpy, parent);
1928# endif 1941# endif
1929 1942
1930# if ENABLE_FRILLS 1943# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1944 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1945 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1958 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1959#endif
1947} 1960}
1948 1961
1949/* ------------------------------------------------------------------------- */ 1962/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1963void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1964rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1965{
1954#ifdef PRINTPIPE 1966#ifdef PRINTPIPE
1955 int nrows, row_start; 1967 int nrows, row_start;
… …
2031 refresh_count = 0; 2043 refresh_count = 0;
2032 2044
2033 unsigned int old_screen_flags = screen.flags; 2045 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2046 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2047#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2048 have_bg = bg_pixmap != None;
2037#endif 2049#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2051
2040 /* 2052 /*
2041 * B: reverse any characters which are selected 2053 * B: reverse any characters which are selected
… …
2233 continue; 2245 continue;
2234 2246
2235 // redraw one or more characters 2247 // redraw one or more characters
2236 2248
2237 // seek to the beginning of wide characters 2249 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2250 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2251 --col;
2240 2252
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2253 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2254 text_t *text = stp + col;
2243 int count = 1; 2255 int count = 1;
… …
2281 2293
2282 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2284 2296
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2298 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2299 count++, i--;
2288 2300
2289 /* 2301 /*
2290 * Determine the attributes for the string 2302 * Determine the attributes for the string
2291 */ 2303 */
2292 int fore = fgcolor_of (rend); // desired foreground 2304 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2305 int back = bgcolor_of (rend); // desired background
2294 2306
2295 // only do special processing if any attributes are set, which is unlikely 2307 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2308 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2309 {
2298 bool invert = rend & RS_RVid; 2310 bool invert = rend & RS_RVid;
2299 2311
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2312#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2313 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2402 /*
2391 * Actually do the drawing of the string here 2403 * Actually do the drawing of the string here
2392 */ 2404 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2405 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2406
2395 if (expect_true (have_bg && back == Color_bg)) 2407 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2408 {
2397 // this is very ugly, maybe push it into ->draw? 2409 // this is very ugly, maybe push it into ->draw?
2398 2410
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2411 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2412 if (text[i] != ' ')
… …
2407 did_clear: ; 2419 did_clear: ;
2408 } 2420 }
2409 else 2421 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2422 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2423
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2424 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2425 {
2414#if ENABLE_FRILLS 2426#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2427 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2428 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2429 else
… …
2508 scr_remap_chars (swap_buf [i]); 2520 scr_remap_chars (swap_buf [i]);
2509 } 2521 }
2510} 2522}
2511 2523
2512void 2524void
2513rxvt_term::scr_recolour () NOTHROW 2525rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2526{
2527 bool transparent = false;
2528
2515#ifdef HAVE_BG_PIXMAP 2529#ifdef HAVE_BG_PIXMAP
2516 bgPixmap.apply (); 2530 if (bg_pixmap != None)
2517#else 2531 {
2532# ifdef ENABLE_TRANSPARENCY
2533 if (bg_flags & BG_IS_TRANSPARENT)
2534 {
2535 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2536 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2518 2537
2538 transparent = true;
2539 }
2540 else
2541# endif
2542 {
2543 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2544 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2545 }
2546 }
2547 else
2548#endif
2549 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2551 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2552 }
2553
2554 XClearWindow (dpy, parent);
2522 2555
2523 if (scrollBar.win) 2556 if (scrollBar.win)
2524 { 2557 {
2558 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526 scrollBar.state = STATE_IDLE; 2562 scrollBar.state = SB_STATE_IDLE;
2527 scrollBar.show (0); 2563 scrollBar.show (0);
2528 } 2564 }
2529 2565
2530#endif 2566 if (refresh)
2531 2567 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2568 scr_clear ();
2534 scr_touch (true); 2569 scr_touch (true);
2570 }
2535 want_refresh = 1; 2571 want_refresh = 1;
2536} 2572}
2537 2573
2538/* ------------------------------------------------------------------------- */ 2574/* ------------------------------------------------------------------------- */
2539void 2575void
… …
2627void 2663void
2628rxvt_term::scr_dump (int fd) NOTHROW 2664rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2665{
2630 int row, wrote; 2666 int row, wrote;
2631 unsigned int width, towrite; 2667 unsigned int width, towrite;
2632 char r1[] = "\n"; 2668 const char r1[] = "\n";
2633 2669
2634 for (row = saveLines + top_row; 2670 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++) 2671 row < saveLines + nrow - 1; row++)
2636 { 2672 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l 2673 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2675 || (check_more == 3 2711 || (check_more == 3
2676 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 4 /* screen width change */ 2713 || (check_more == 4 /* screen width change */
2678 && (selection.beg.row != selection.end.row 2714 && (selection.beg.row != selection.end.row
2679 || selection.end.col > ncol))) 2715 || selection.end.col > ncol)))
2680 CLEAR_SELECTION (); 2716 CLEAR_ALL_SELECTION ();
2681} 2717}
2682 2718
2683/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2684/* 2720/*
2685 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
… …
2710 tt_paste (data, len); 2746 tt_paste (data, len);
2711} 2747}
2712 2748
2713/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2714/* 2750/*
2715 * Respond to a notification that a primary selection has been sent 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2753 * as fallback
2718void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{
2721 if (prop == None) /* check for failed XConvertSelection */
2722 {
2723 if ((selection_type & Sel_CompoundText))
2724 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum);
2730 }
2731
2732 if ((selection_type & Sel_UTF8String))
2733 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 }
2742
2743 return;
2744 }
2745
2746 unsigned long bytes_after;
2747 XTextProperty ct;
2748
2749 if (XGetWindowProperty (dpy, win, prop,
2750 0, PROP_SIZE / 4,
2751 delete_prop, AnyPropertyType,
2752 &ct.encoding, &ct.format,
2753 &ct.nitems, &bytes_after,
2754 &ct.value) != Success)
2755 {
2756 ct.value = 0;
2757 goto bailout;
2758 }
2759
2760 if (ct.encoding == None)
2761 goto bailout;
2762
2763 if (bytes_after)
2764 {
2765 // fetch and append remaining data
2766 XTextProperty ct2;
2767
2768 if (XGetWindowProperty (dpy, win, prop,
2769 ct.nitems / 4, (bytes_after + 3) / 4,
2770 delete_prop, AnyPropertyType,
2771 &ct2.encoding, &ct2.format,
2772 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success)
2774 goto bailout;
2775
2776 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems;
2780
2781 XFree (ct2.value);
2782 }
2783
2784 if (ct.value == 0)
2785 goto bailout;
2786
2787 if (ct.encoding == xa[XA_INCR])
2788 {
2789 // INCR selection, start handshake
2790 if (!delete_prop)
2791 XDeleteProperty (dpy, win, prop);
2792
2793 selection_wait = Sel_incr;
2794 incr_buf_fill = 0;
2795 incr_ev.start (10);
2796
2797 goto bailout;
2798 }
2799
2800 if (ct.nitems == 0)
2801 {
2802 if (selection_wait == Sel_incr)
2803 {
2804 XFree (ct.value);
2805
2806 // finally complete, now paste the whole thing
2807 selection_wait = Sel_normal;
2808 ct.value = (unsigned char *)incr_buf;
2809 ct.nitems = incr_buf_fill;
2810 incr_buf = 0;
2811 incr_buf_size = 0;
2812 incr_ev.stop ();
2813 }
2814 else
2815 {
2816 if (selection_wait == Sel_normal
2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2818 {
2819 /*
2820 * pass through again trying CUT_BUFFER0 if we've come from
2821 * XConvertSelection () but nothing was presented
2822 */
2823 selection_paste (display->root, XA_CUT_BUFFER0, False);
2824 }
2825
2826 goto bailout;
2827 }
2828 }
2829 else if (selection_wait == Sel_incr)
2830 {
2831 incr_ev.start (10);
2832
2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2837 }
2838
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems;
2841
2842 goto bailout;
2843 }
2844
2845 char **cl;
2846 int cr;
2847
2848#if !ENABLE_MINIMAL
2849 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2850 // so recode it manually
2851 if (ct.encoding == xa[XA_UTF8_STRING])
2852 {
2853 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2854 char *s = rxvt_wcstombs (w);
2855 free (w);
2856 // TODO: strlen == only the first element will be converted. well...
2857 paste (s, strlen (s));
2858 free (s);
2859 }
2860 else
2861#endif
2862 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2863 && cl)
2864 {
2865 for (int i = 0; i < cr; i++)
2866 paste (cl[i], strlen (cl[i]));
2867
2868 XFreeStringList (cl);
2869 }
2870 else
2871 paste ((char *)ct.value, ct.nitems); // paste raw
2872
2873bailout:
2874 XFree (ct.value);
2875
2876 if (selection_wait == Sel_normal)
2877 selection_wait = Sel_none;
2878}
2879
2880void
2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2882{
2883 selection_wait = Sel_none;
2884
2885 incr_buf_size = 0;
2886 free (incr_buf);
2887
2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889}
2890
2891void
2892rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2893{
2894 if (prop == None || selection_wait != Sel_incr)
2895 return;
2896
2897 selection_paste (win, prop, true);
2898}
2899
2900/* ------------------------------------------------------------------------- */
2901/*
2902 * Request the current selection:
2903 * Order: > internal selection if available
2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905 * > CUT_BUFFER0
2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2907 * will auto fallback to CUT_BUFFER0
2908 * EXT: button 2 release 2754 * EXT: button 2 release
2909 */ 2755 */
2910void 2756void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912{ 2758{
2913 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2914 {
2915 /* internal selection */
2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2917 paste (str, strlen (str));
2918 free (str);
2919 return;
2920 } 2760 {
2921 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2922 { 2763 }
2923 selection_request_time = tm;
2924 selection_wait = Sel_normal;
2925
2926#if X_HAVE_UTF8_STRING
2927 selection_type = Sel_UTF8String;
2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2929 return;
2930#else
2931 selection_type = Sel_CompoundText;
2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2933 return;
2934#endif
2935 }
2936
2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2939}
2940
2941int
2942rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2943{
2944 Atom sel;
2945
2946 selection_type |= selnum;
2947
2948 if (selnum == Sel_Primary)
2949 sel = XA_PRIMARY;
2950 else if (selnum == Sel_Secondary)
2951 sel = XA_SECONDARY;
2952 else
2953 sel = xa[XA_CLIPBOARD];
2954
2955 if (XGetSelectionOwner (dpy, sel) != None)
2956 {
2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958 vt, selection_request_time);
2959 return 1;
2960 }
2961
2962 return 0;
2963} 2764}
2964 2765
2965/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2966/* 2767/*
2967 * Clear all selected text 2768 * Clear all selected text
… …
2998 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2999 */ 2800 */
3000void 2801void
3001rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
3002{ 2803{
3003 int i; 2804 int size;
3004 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
3005 text_t *t; 2806 text_t *t;
3006 2807
3007 switch (selection.op) 2808 switch (selection.op)
3008 { 2809 {
… …
3024 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
3025 2826
3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027 return; 2828 return;
3028 2829
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3031 2832
3032 int ofs = 0; 2833 int ofs = 0;
3033 int extra = 0; 2834 int extra = 0;
3034 2835
3035 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
3041 { 2842 {
3042#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
3043 if (selection.rect) 2844 if (selection.rect)
3044 { 2845 {
3045 col = selection.beg.col; 2846 col = selection.beg.col;
3046 end_col = ncol + 1; 2847 end_col = selection.end.col;
3047 } 2848 }
3048 else 2849 else
3049#endif 2850#endif
3050 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
3051 2852
3052 col = max (col, 0); 2853 col = max (col, 0);
3053 2854
3054 if (row == selection.end.row 2855 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3060 2857
3061 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3062 2859
3063 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3071 2868
3072 extra -= (len - 1); 2869 extra -= (len - 1);
3073 2870
3074 if (extra < 0) 2871 if (extra < 0)
3075 { 2872 {
3076 extra += i; 2873 extra += size;
3077 i += i; 2874 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 2876 }
3080 2877
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 2879 }
3083#endif 2880#endif
… …
3095 2892
3096 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3097 } 2894 }
3098 else 2895 else
3099#endif 2896#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3102 } 2901 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 2902
3107 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3108 2904
3109 if (ofs == 0) 2905 if (ofs == 0)
3110 { 2906 {
… …
3616 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3617 */ 3413 */
3618void 3414void
3619rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3620{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3621 XSelectionEvent ev; 3418 XSelectionEvent ev;
3622 3419
3623 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3624 ev.property = None; 3421 ev.property = None;
3625 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3640 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3641#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3642 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3643#endif 3440#endif
3644 3441
3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3646 32, PropModeReplace, 3443 32, PropModeReplace,
3647 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3648 ev.property = rq.property; 3445 ev.property = property;
3649 } 3446 }
3650#if TODO // TODO 3447#if TODO // TODO
3651 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3652 { 3449 {
3653 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3654 } 3451 }
3655#endif 3452#endif
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3657 { 3454 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property; 3457 ev.property = property;
3661 } 3458 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 { 3460 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3666 ev.property = rq.property; 3463 ev.property = property;
3667 } 3464 }
3668 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3669 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3670 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3671 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3742 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3743 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3744 ct.encoding = target; 3541 ct.encoding = target;
3745 } 3542 }
3746 3543
3747 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3748 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3749 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3750 ev.property = rq.property; 3547 ev.property = property;
3751 3548
3752 if (freect) 3549 if (freect)
3753 XFree (ct.value); 3550 XFree (ct.value);
3754 } 3551 }
3755 3552

Diff Legend

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