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.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 if (expect_false ( 935 // due to wonderful coincidences everywhere else in this loop
936 // we never have to check for overwriting a wide char itself,
937 // only its tail.
923 line->t[screen.cur.col] == NOCHAR 938 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); 939 scr_kill_char (*line, screen.cur.col);
928 940
929 line->touch (); 941 line->touch ();
930 942
931 do 943 do
932 { 944 {
933 line->t[screen.cur.col] = c; 945 line->t[screen.cur.col] = c;
934 line->r[screen.cur.col] = rend; 946 line->r[screen.cur.col] = rend;
935 947
936 if (expect_true (screen.cur.col < ncol - 1)) 948 if (ecb_likely (screen.cur.col < ncol - 1))
937 screen.cur.col++; 949 screen.cur.col++;
938 else 950 else
939 { 951 {
940 line->l = ncol; 952 line->l = ncol;
941 if (screen.flags & Screen_Autowrap) 953 if (screen.flags & Screen_Autowrap)
… …
944 goto end_of_line; 956 goto end_of_line;
945 } 957 }
946 958
947 c = NOCHAR; 959 c = NOCHAR;
948 } 960 }
949 while (expect_false (--width > 0)); 961 while (ecb_unlikely (--width > 0));
950 962
951 // pad with spaces when overwriting wide character with smaller one 963 // 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++) 964 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
953 { 965 {
954 line->t[c] = ' '; 966 line->t[c] = ' ';
955 line->r[c] = rend; 967 line->r[c] = rend;
956 } 968 }
957 969
… …
1686 { 1698 {
1687 rvideo_state = on; 1699 rvideo_state = on;
1688 1700
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1701 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1702#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1703 if (bg_pixmap == None)
1692#endif 1704#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1705 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1706
1695 XGCValues gcvalue; 1707 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1708 gcvalue.foreground = pix_colors[Color_fg];
… …
1923 1935
1924# ifndef NO_MAPALERT 1936# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1937# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1938 if (option (Opt_mapAlert))
1927# endif 1939# endif
1928 XMapWindow (dpy, parent[0]); 1940 XMapWindow (dpy, parent);
1929# endif 1941# endif
1930 1942
1931# if ENABLE_FRILLS 1943# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1944 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1945 set_urgency (1);
… …
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1958 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947#endif 1959#endif
1948} 1960}
1949 1961
1950/* ------------------------------------------------------------------------- */ 1962/* ------------------------------------------------------------------------- */
1951/* ARGSUSED */
1952void 1963void
1953rxvt_term::scr_printscreen (int fullhist) NOTHROW 1964rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954{ 1965{
1955#ifdef PRINTPIPE 1966#ifdef PRINTPIPE
1956 int nrows, row_start; 1967 int nrows, row_start;
… …
2032 refresh_count = 0; 2043 refresh_count = 0;
2033 2044
2034 unsigned int old_screen_flags = screen.flags; 2045 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2046 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2047#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2048 have_bg = bg_pixmap != None;
2038#endif 2049#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2051
2041 /* 2052 /*
2042 * B: reverse any characters which are selected 2053 * B: reverse any characters which are selected
… …
2234 continue; 2245 continue;
2235 2246
2236 // redraw one or more characters 2247 // redraw one or more characters
2237 2248
2238 // seek to the beginning of wide characters 2249 // seek to the beginning of wide characters
2239 while (expect_false (stp[col] == NOCHAR && col > 0)) 2250 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2240 --col; 2251 --col;
2241 2252
2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2253 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2243 text_t *text = stp + col; 2254 text_t *text = stp + col;
2244 int count = 1; 2255 int count = 1;
… …
2282 2293
2283 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2284 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2285 2296
2286 // sometimes we optimize away the trailing NOCHAR's, add them back 2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (expect_false (i && text[count] == NOCHAR)) 2298 while (ecb_unlikely (i && text[count] == NOCHAR))
2288 count++, i--; 2299 count++, i--;
2289 2300
2290 /* 2301 /*
2291 * Determine the attributes for the string 2302 * Determine the attributes for the string
2292 */ 2303 */
2293 int fore = fgcolor_of (rend); // desired foreground 2304 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2305 int back = bgcolor_of (rend); // desired background
2295 2306
2296 // 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
2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2308 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2309 {
2299 bool invert = rend & RS_RVid; 2310 bool invert = rend & RS_RVid;
2300 2311
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2312#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2313 if (rend & RS_Bold && fore == Color_fg)
… …
2391 /* 2402 /*
2392 * Actually do the drawing of the string here 2403 * Actually do the drawing of the string here
2393 */ 2404 */
2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2405 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2395 2406
2396 if (expect_true (have_bg && back == Color_bg)) 2407 if (ecb_likely (have_bg && back == Color_bg))
2397 { 2408 {
2398 // this is very ugly, maybe push it into ->draw? 2409 // this is very ugly, maybe push it into ->draw?
2399 2410
2400 for (i = 0; i < count; i++) /* don't draw empty strings */ 2411 for (i = 0; i < count; i++) /* don't draw empty strings */
2401 if (text[i] != ' ') 2412 if (text[i] != ' ')
… …
2408 did_clear: ; 2419 did_clear: ;
2409 } 2420 }
2410 else 2421 else
2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2422 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2412 2423
2413 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2424 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2414 { 2425 {
2415#if ENABLE_FRILLS 2426#if ENABLE_FRILLS
2416 if (ISSET_PIXCOLOR (Color_underline)) 2427 if (ISSET_PIXCOLOR (Color_underline))
2417 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2428 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2418 else 2429 else
… …
2509 scr_remap_chars (swap_buf [i]); 2520 scr_remap_chars (swap_buf [i]);
2510 } 2521 }
2511} 2522}
2512 2523
2513void 2524void
2514rxvt_term::scr_recolour () NOTHROW 2525rxvt_term::scr_recolour (bool refresh) NOTHROW
2515{ 2526{
2527 bool transparent = false;
2528
2516#ifdef HAVE_BG_PIXMAP 2529#ifdef HAVE_BG_PIXMAP
2517 bgPixmap.apply (); 2530 if (bg_pixmap != None)
2518#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);
2519 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 {
2520 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2521 XClearWindow (dpy, parent[0]);
2522 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2551 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2552 }
2553
2554 XClearWindow (dpy, parent);
2523 2555
2524 if (scrollBar.win) 2556 if (scrollBar.win)
2525 { 2557 {
2558 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else
2526 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2527 scrollBar.state = STATE_IDLE; 2562 scrollBar.state = SB_STATE_IDLE;
2528 scrollBar.show (0); 2563 scrollBar.show (0);
2529 } 2564 }
2530 2565
2531#endif 2566 if (refresh)
2532 2567 {
2533 /* bgPixmap.apply () does not do the following : */
2534 scr_clear (); 2568 scr_clear ();
2535 scr_touch (true); 2569 scr_touch (true);
2570 }
2536 want_refresh = 1; 2571 want_refresh = 1;
2537} 2572}
2538 2573
2539/* ------------------------------------------------------------------------- */ 2574/* ------------------------------------------------------------------------- */
2540void 2575void
… …
2628void 2663void
2629rxvt_term::scr_dump (int fd) NOTHROW 2664rxvt_term::scr_dump (int fd) NOTHROW
2630{ 2665{
2631 int row, wrote; 2666 int row, wrote;
2632 unsigned int width, towrite; 2667 unsigned int width, towrite;
2633 char r1[] = "\n"; 2668 const char r1[] = "\n";
2634 2669
2635 for (row = saveLines + top_row; 2670 for (row = saveLines + top_row;
2636 row < saveLines + nrow - 1; row++) 2671 row < saveLines + nrow - 1; row++)
2637 { 2672 {
2638 width = row_buf[row].l >= 0 ? row_buf[row].l 2673 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2676 || (check_more == 3 2711 || (check_more == 3
2677 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos))
2678 || (check_more == 4 /* screen width change */ 2713 || (check_more == 4 /* screen width change */
2679 && (selection.beg.row != selection.end.row 2714 && (selection.beg.row != selection.end.row
2680 || selection.end.col > ncol))) 2715 || selection.end.col > ncol)))
2681 CLEAR_SELECTION (); 2716 CLEAR_ALL_SELECTION ();
2682} 2717}
2683 2718
2684/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2685/* 2720/*
2686 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
… …
2711 tt_paste (data, len); 2746 tt_paste (data, len);
2712} 2747}
2713 2748
2714/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2715/* 2750/*
2716 * Respond to a notification that a primary selection has been sent 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2717 * EXT: SelectionNotify 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2718 */ 2753 * 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 2754 * EXT: button 2 release
2910 */ 2755 */
2911void 2756void
2912rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2913{ 2758{
2914 if (selection.text && selnum == Sel_Primary) 2759 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 } 2760 {
2922 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2923 { 2763 }
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} 2764}
2965 2765
2966/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2967/* 2767/*
2968 * Clear all selected text 2768 * Clear all selected text
… …
2999 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
3000 */ 2800 */
3001void 2801void
3002rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
3003{ 2803{
3004 int i; 2804 int size;
3005 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
3006 text_t *t; 2806 text_t *t;
3007 2807
3008 switch (selection.op) 2808 switch (selection.op)
3009 { 2809 {
… …
3025 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
3026 2826
3027 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)))
3028 return; 2828 return;
3029 2829
3030 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031 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));
3032 2832
3033 int ofs = 0; 2833 int ofs = 0;
3034 int extra = 0; 2834 int extra = 0;
3035 2835
3036 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
3042 { 2842 {
3043#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
3044 if (selection.rect) 2844 if (selection.rect)
3045 { 2845 {
3046 col = selection.beg.col; 2846 col = selection.beg.col;
3047 end_col = ncol + 1; 2847 end_col = selection.end.col;
3048 } 2848 }
3049 else 2849 else
3050#endif 2850#endif
3051 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
3052 2852
3053 col = max (col, 0); 2853 col = max (col, 0);
3054 2854
3055 if (row == selection.end.row 2855 if (row == selection.end.row)
3056#if !ENABLE_MINIMAL
3057 || selection.rect
3058#endif
3059 )
3060 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3061 2857
3062 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3063 2859
3064 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3072 2868
3073 extra -= (len - 1); 2869 extra -= (len - 1);
3074 2870
3075 if (extra < 0) 2871 if (extra < 0)
3076 { 2872 {
3077 extra += i; 2873 extra += size;
3078 i += i; 2874 size += size;
3079 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));
3080 } 2876 }
3081 2877
3082 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083 } 2879 }
3084#endif 2880#endif
… …
3096 2892
3097 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3098 } 2894 }
3099 else 2895 else
3100#endif 2896#endif
3101 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))
3102 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3103 } 2901 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 2902
3108 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3109 2904
3110 if (ofs == 0) 2905 if (ofs == 0)
3111 { 2906 {
… …
3617 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3618 */ 3413 */
3619void 3414void
3620rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3621{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3622 XSelectionEvent ev; 3418 XSelectionEvent ev;
3623 3419
3624 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3625 ev.property = None; 3421 ev.property = None;
3626 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3641 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3642#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3643 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3644#endif 3440#endif
3645 3441
3646 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3647 32, PropModeReplace, 3443 32, PropModeReplace,
3648 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3649 ev.property = rq.property; 3445 ev.property = property;
3650 } 3446 }
3651#if TODO // TODO 3447#if TODO // TODO
3652 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3653 { 3449 {
3654 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3655 } 3451 }
3656#endif 3452#endif
3657 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)
3658 { 3454 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property; 3457 ev.property = property;
3662 } 3458 }
3663 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)
3664 { 3460 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3667 ev.property = rq.property; 3463 ev.property = property;
3668 } 3464 }
3669 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3670 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3671 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3672 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3743 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3744 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3745 ct.encoding = target; 3541 ct.encoding = target;
3746 } 3542 }
3747 3543
3748 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3749 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3750 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3751 ev.property = rq.property; 3547 ev.property = property;
3752 3548
3753 if (freect) 3549 if (freect)
3754 XFree (ct.value); 3550 XFree (ct.value);
3755 } 3551 }
3756 3552

Diff Legend

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