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.374 by sf-exg, Sat Feb 12 00:50:04 2011 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.
… …
159 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160 160
161void 161void
162rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
163{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
164 view_start = 0; 168 view_start = 0;
165 num_scr = 0; 169 num_scr = 0;
166 170
167 if (ncol == 0) 171 if (ncol == 0)
168 ncol = 80; 172 ncol = 80;
… …
199 term_start = 0; 203 term_start = 0;
200 204
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 207
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 211
208 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
209 { 213 {
… …
271 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);
272 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);
273 } 277 }
274 278
275 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277 281
278 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
279 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
281 285
… …
634 638
635 if (count > 0 639 if (count > 0
636 && row1 == 0 640 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
639 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 646
644 // sever bottommost line 647 // sever bottommost line
645 { 648 {
646 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
647 l.is_longer (0); 650 l.is_longer (0);
648 l.touch (); 651 l.touch ();
649 } 652 }
650 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
651 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 670 for (int i = count; i--; )
653 { 671 {
654 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
655 673
656 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
658 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)))
659 { 677 {
660 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 679 l.l = 0;
… …
663 } 681 }
664 else 682 else
665 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
666 } 684 }
667 685
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 686 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
682 { 689 {
683 selection.beg.row -= count; 690 selection.beg.row -= count;
684 selection.end.row -= count; 691 selection.end.row -= count;
685 selection.mark.row -= count; 692 selection.mark.row -= count;
686 693
687 if (selection.beg.row < top_row 694 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 695 }
695 696
696 // finally move the view window, if desired 697 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 699 && view_start != 0
… …
728 } 729 }
729 730
730 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
732 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
733 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
734 743
735 min_it (count, rows); 744 min_it (count, rows);
736 745
737 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 747
739 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
740 { 749 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 751
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 754 }
746 755
747 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
748 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 }
749 } 765 }
750 766
751 return count; 767 return count;
752} 768}
753 769
… …
759rxvt_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
760{ 776{
761 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
762 return; 778 return;
763 779
764 unsigned char checksel; 780 bool checksel;
765 unicode_t c; 781 unicode_t c;
766 int ncol = this->ncol; 782 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
768 784
769 want_refresh = 1; 785 want_refresh = 1;
… …
795 811
796 while (str < strend) 812 while (str < strend)
797 { 813 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 815
800 if (expect_false (c < 0x20)) 816 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 817 if (c == C0_LF)
802 { 818 {
803 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
804 820
805 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
824 { 840 {
825 scr_tab (1, true); 841 scr_tab (1, true);
826 continue; 842 continue;
827 } 843 }
828 844
829 if (expect_false ( 845 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 849 ))
834 { 850 {
… …
839 * should be a similar check. 855 * should be a similar check.
840 */ 856 */
841 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
842 } 858 }
843 859
844 if (expect_false (screen.flags & Screen_WrapNext)) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 861 {
846 scr_do_wrap (); 862 scr_do_wrap ();
847 863
848 line->l = ncol; 864 line->l = ncol;
849 line->is_longer (1); 865 line->is_longer (1);
… …
851 row = screen.cur.row; 867 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
853 } 869 }
854 870
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 873 c = 0xfffd;
858 874
859 // 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
860 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
862 // locale. 878 // locale.
863 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
864 880
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 882 {
867 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 884 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
885 } 901 }
886 } 902 }
887 903
888 if (expect_false (screen.flags & Screen_Insert)) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
890 906
891 if (width != 0) 907 if (width != 0)
892 { 908 {
893#if !UNICODE_3 909#if !UNICODE_3
… …
901#endif 917#endif
902 918
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 920
905 // if the character doesn't fit into the remaining columns... 921 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 923 {
908 if (screen.flags & Screen_Autowrap) 924 if (screen.flags & Screen_Autowrap)
909 { 925 {
910 // ... artificially enlargen the previous one 926 // ... artificially enlargen the previous one
911 c = NOCHAR; 927 c = NOCHAR;
… …
918 934
919 // nuke the character at this position, if required 935 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 936 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 937 // we never have to check for overwriting a wide char itself,
922 // only its tail. 938 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 940 scr_kill_char (*line, screen.cur.col);
925 941
926 line->touch (); 942 line->touch ();
927 943
928 do 944 do
929 { 945 {
930 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
932 948
933 if (expect_true (screen.cur.col < ncol - 1)) 949 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 950 screen.cur.col++;
935 else 951 else
936 { 952 {
937 line->l = ncol; 953 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
… …
941 goto end_of_line; 957 goto end_of_line;
942 } 958 }
943 959
944 c = NOCHAR; 960 c = NOCHAR;
945 } 961 }
946 while (expect_false (--width > 0)); 962 while (ecb_unlikely (--width > 0));
947 963
948 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
949 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++)
950 { 966 {
951 line->t[c] = ' '; 967 line->t[c] = ' ';
952 line->r[c] = rend; 968 line->r[c] = rend;
953 } 969 }
954 970
… …
1310 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1311 1327
1312 switch (mode) 1328 switch (mode)
1313 { 1329 {
1314 case 0: /* erase to end of screen */ 1330 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1331 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1332 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1333 num = nrow - row;
1319 break; 1334 break;
1320 case 1: /* erase to beginning of screen */ 1335 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1336 scr_erase_line (1);
1323 row = 0; 1337 row = 0;
1324 num = screen.cur.row; 1338 num = screen.cur.row;
1325 break; 1339 break;
1326 case 2: /* erase whole screen */ 1340 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1341 row = 0;
1329 num = nrow; 1342 num = nrow;
1330 break; 1343 break;
1331 default: 1344 default:
1332 return; 1345 return;
… …
1920 1933
1921# ifndef NO_MAPALERT 1934# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1935# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1936 if (option (Opt_mapAlert))
1924# endif 1937# endif
1925 XMapWindow (dpy, parent[0]); 1938 XMapWindow (dpy, parent);
1926# endif 1939# endif
1927 1940
1928# if ENABLE_FRILLS 1941# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1942 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1943 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1956 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1957#endif
1945} 1958}
1946 1959
1947/* ------------------------------------------------------------------------- */ 1960/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */
1949void 1961void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1962rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951{ 1963{
1952#ifdef PRINTPIPE 1964#ifdef PRINTPIPE
1953 int nrows, row_start; 1965 int nrows, row_start;
… …
2027 * A: set up vars 2039 * A: set up vars
2028 */ 2040 */
2029 refresh_count = 0; 2041 refresh_count = 0;
2030 2042
2031 unsigned int old_screen_flags = screen.flags; 2043 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2044 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2045#ifdef HAVE_BG_PIXMAP
2034 have_bg = bg_pixmap != None; 2046 have_bg = bg_pixmap != None;
2035#endif 2047#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2048 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2049
… …
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2057 scr_swap_overlay ();
2046#endif 2058#endif
2047 2059
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2060 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2061
2050 /* 2062 /*
2051 * C: set the cursor character (s) 2063 * C: set the cursor character (s)
2052 */ 2064 */
2053 { 2065 {
2054 unsigned char setoldcursor; 2066 bool setoldcursor;
2055 2067
2056#ifdef CURSOR_BLINK 2068#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2069 if (hidden_cursor)
2058 showcursor = 0; 2070 showcursor = 0;
2059#endif 2071#endif
… …
2231 continue; 2243 continue;
2232 2244
2233 // redraw one or more characters 2245 // redraw one or more characters
2234 2246
2235 // seek to the beginning of wide characters 2247 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2248 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2249 --col;
2238 2250
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2251 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2252 text_t *text = stp + col;
2241 int count = 1; 2253 int count = 1;
… …
2279 2291
2280 col--; /* went one too far. move back */ 2292 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2293 count -= i; /* dump any matching trailing chars */
2282 2294
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2295 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2296 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2297 count++, i--;
2286 2298
2287 /* 2299 /*
2288 * Determine the attributes for the string 2300 * Determine the attributes for the string
2289 */ 2301 */
2290 int fore = fgcolor_of (rend); // desired foreground 2302 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2303 int back = bgcolor_of (rend); // desired background
2292 2304
2293 // 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
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2306 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2307 {
2296 bool invert = rend & RS_RVid; 2308 bool invert = rend & RS_RVid;
2297 2309
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2310#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2311 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2400 /*
2389 * Actually do the drawing of the string here 2401 * Actually do the drawing of the string here
2390 */ 2402 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2403 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2404
2393 if (expect_true (have_bg && back == Color_bg)) 2405 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2406 {
2395 // this is very ugly, maybe push it into ->draw? 2407 // this is very ugly, maybe push it into ->draw?
2396 2408
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2409 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2410 if (text[i] != ' ')
… …
2405 did_clear: ; 2417 did_clear: ;
2406 } 2418 }
2407 else 2419 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2420 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2421
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2422 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2423 {
2412#if ENABLE_FRILLS 2424#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2425 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2426 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2427 else
… …
2516 if (bg_pixmap != None) 2528 if (bg_pixmap != None)
2517 { 2529 {
2518# ifdef ENABLE_TRANSPARENCY 2530# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2531 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2532 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2533 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2534 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2535
2524 transparent = true; 2536 transparent = true;
2525 } 2537 }
2526 else 2538 else
2527# endif 2539# endif
2528 { 2540 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2542 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 } 2543 }
2532 } 2544 }
2533 else 2545 else
2534#endif 2546#endif
2535 { 2547 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2548 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2549 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2550 }
2539 2551
2540 XClearWindow (dpy, parent[0]); 2552 XClearWindow (dpy, parent);
2541 2553
2542 if (scrollBar.win) 2554 if (scrollBar.win)
2543 { 2555 {
2544 if (transparent) 2556 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2557 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2558 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2548 scrollBar.state = STATE_IDLE; 2560 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2561 scrollBar.show (0);
2550 } 2562 }
2551 2563
2552 if (refresh) 2564 if (refresh)
2553 { 2565 {
… …
2676 * CHARACTER SELECTION * 2688 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2689 * ------------------------------------------------------------------------- */
2678void 2690void
2679rxvt_term::selection_check (int check_more) NOTHROW 2691rxvt_term::selection_check (int check_more) NOTHROW
2680{ 2692{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2693 if (!selection.op)
2684 return; 2694 return;
2685 2695
2696 row_col_t pos;
2686 pos.row = pos.col = 0; 2697 pos.row = pos.col = 0;
2698
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2699 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2700 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2701 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2702 || (check_more == 1
2691 && current_screen == selection.screen 2703 && current_screen == selection.screen
… …
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2705 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2694 || (check_more == 2 2706 || (check_more == 2
2695 && ROWCOL_IS_BEFORE (selection.beg, pos) 2707 && ROWCOL_IS_BEFORE (selection.beg, pos)
2696 && ROWCOL_IS_AFTER (selection.end, pos)) 2708 && ROWCOL_IS_AFTER (selection.end, pos))
2697 || (check_more == 3 2709 || (check_more == 3
2698 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos)))
2699 || (check_more == 4 /* screen width change */
2700 && (selection.beg.row != selection.end.row
2701 || selection.end.col > ncol)))
2702 CLEAR_SELECTION (); 2711 CLEAR_ALL_SELECTION ();
2703} 2712}
2704 2713
2705/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2706/* 2715/*
2707 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd
… …
2732 tt_paste (data, len); 2741 tt_paste (data, len);
2733} 2742}
2734 2743
2735/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2736/* 2745/*
2737 * Request the current selection: 2746 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2747 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2748 * as fallback
2740 * > CUT_BUFFER0
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2749 * EXT: button 2 release
2744 */ 2750 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs)
2748{
2749 rxvt_term *term = (rxvt_term *)rs->user_data;
2750
2751 if (data)
2752 term->paste (data, len);
2753 delete rs;
2754 term->selection_req = 0;
2755}
2756
2757void 2751void
2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2752rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2759{ 2753{
2760 if (selection.text && selnum == Sel_Primary)
2761 {
2762 /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste (str, strlen (str));
2765 free (str);
2766 return;
2767 }
2768 else if (!selection_req) 2754 if (!selection_req)
2769 { 2755 {
2770 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); 2756 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2771 selection_req->run (); 2757 selection_req->run ();
2772 } 2758 }
2773} 2759}
2774 2760
2775/* ------------------------------------------------------------------------- */ 2761/* ------------------------------------------------------------------------- */
… …
3421 * EXT: SelectionRequest 3407 * EXT: SelectionRequest
3422 */ 3408 */
3423void 3409void
3424rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3410rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3425{ 3411{
3412 Atom property = rq.property == None ? rq.target : rq.property;
3426 XSelectionEvent ev; 3413 XSelectionEvent ev;
3427 3414
3428 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3429 ev.property = None; 3416 ev.property = None;
3430 ev.display = rq.display; 3417 ev.display = rq.display;
… …
3445 *target++ = xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3446#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3447 *target++ = xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3448#endif 3435#endif
3449 3436
3450 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3451 32, PropModeReplace, 3438 32, PropModeReplace,
3452 (unsigned char *)target_list, target - target_list); 3439 (unsigned char *)target_list, target - target_list);
3453 ev.property = rq.property; 3440 ev.property = property;
3454 } 3441 }
3455#if TODO // TODO 3442#if TODO // TODO
3456 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3457 { 3444 {
3458 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3459 } 3446 }
3460#endif 3447#endif
3461 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)
3462 { 3449 {
3463 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3464 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3465 ev.property = rq.property; 3452 ev.property = property;
3466 } 3453 }
3467 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)
3468 { 3455 {
3469 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3456 XChangeProperty (dpy, rq.requestor, property, rq.target,
3470 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3471 ev.property = rq.property; 3458 ev.property = property;
3472 } 3459 }
3473 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3476 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
… …
3547 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3548 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3549 ct.encoding = target; 3536 ct.encoding = target;
3550 } 3537 }
3551 3538
3552 XChangeProperty (dpy, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, property,
3553 ct.encoding, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3554 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3555 ev.property = rq.property; 3542 ev.property = property;
3556 3543
3557 if (freect) 3544 if (freect)
3558 XFree (ct.value); 3545 XFree (ct.value);
3559 } 3546 }
3560 3547

Diff Legend

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