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.377 by root, Mon Mar 21 13:46:17 2011 UTC vs.
Revision 1.398 by sf-exg, Wed Nov 2 15:11:51 2011 UTC

… …
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
681 if (selection.op && current_screen == selection.screen)
682 {
683 selection.beg.row -= count;
684 selection.end.row -= count;
685 selection.mark.row -= count;
686
687 if (selection.beg.row < top_row
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
696 // finally move the view window, if desired 686 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 688 && view_start != 0
699 && view_start != -saveLines) 689 && view_start != -saveLines)
700 scr_page (UP, count); 690 scr_page (UP, count);
… …
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
704 } 694 }
705 else 695 else
706 { 696 {
707 if (selection.op && current_screen == selection.screen)
708 {
709 if ((selection.beg.row < row1 && selection.end.row > row1)
710 || (selection.beg.row < row2 && selection.end.row > row2)
711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
713 || (selection.end.row - count < row1 && selection.end.row >= row1)
714 || (selection.end.row - count > row2 && selection.end.row <= row2))
715 {
716 CLEAR_ALL_SELECTION ();
717 selection.op = SELECTION_CLEAR;
718 }
719 else if (selection.end.row >= row1 && selection.end.row <= row2)
720 {
721 /* move selected region too */
722 selection.beg.row -= count;
723 selection.end.row -= count;
724 selection.mark.row -= count;
725
726 selection_check (0);
727 }
728 }
729
730 // use a simple and robust scrolling algorithm, this 697 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 698 // part of scr_scroll_text is not time-critical.
732 699
700 // sever line above scroll region
701 if (row1)
702 {
703 line_t &l = ROW(row1 - 1);
704 l.is_longer (0);
705 l.touch ();
706 }
707
733 int rows = row2 - row1 + 1; 708 int rows = row2 - row1 + 1;
734 709
735 min_it (count, rows); 710 min_it (count, rows);
736 711
737 line_t *temp_buf = row_buf + total_rows; 712 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 713
739 for (int row = 0; row < rows; row++) 714 for (int row = 0; row < rows; row++)
740 { 715 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 716 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 717
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 719 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 720 }
746 721
747 for (int row = 0; row < rows; row++) 722 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 723 ROW(row1 + row) = temp_buf [row];
724
725 // sever bottommost line
726 {
727 line_t &l = ROW(row2);
728 l.is_longer (0);
729 l.touch ();
730 }
731 }
732
733 // move and/or clear selection, if any
734 if (selection.op && current_screen == selection.screen)
735 {
736 if ((selection.beg.row < row1 && selection.end.row > row1)
737 || (selection.beg.row < row2 && selection.end.row > row2)
738 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
739 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
740 || (selection.end.row - count < row1 && selection.end.row >= row1)
741 || (selection.end.row - count > row2 && selection.end.row <= row2))
742 CLEAR_ALL_SELECTION ();
743 else if (selection.end.row >= row1 && selection.end.row <= row2)
744 {
745 /* move selected region too */
746 selection.beg.row -= count;
747 selection.end.row -= count;
748 selection.mark.row -= count;
749
750 selection_check (0);
751 }
749 } 752 }
750 753
751 return count; 754 return count;
752} 755}
753 756
… …
795 798
796 while (str < strend) 799 while (str < strend)
797 { 800 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 802
800 if (expect_false (c < 0x20)) 803 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 804 if (c == C0_LF)
802 { 805 {
803 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
804 807
805 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
824 { 827 {
825 scr_tab (1, true); 828 scr_tab (1, true);
826 continue; 829 continue;
827 } 830 }
828 831
829 if (expect_false ( 832 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 836 ))
834 { 837 {
… …
839 * should be a similar check. 842 * should be a similar check.
840 */ 843 */
841 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
842 } 845 }
843 846
844 if (expect_false (screen.flags & Screen_WrapNext)) 847 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 848 {
846 scr_do_wrap (); 849 scr_do_wrap ();
847 850
848 line->l = ncol; 851 line->l = ncol;
849 line->is_longer (1); 852 line->is_longer (1);
… …
851 row = screen.cur.row; 854 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
853 } 856 }
854 857
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 859 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 860 c = 0xfffd;
858 861
859 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
862 // locale. 865 // locale.
863 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
864 867
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 868 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 869 {
867 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 871 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
885 } 888 }
886 } 889 }
887 890
888 if (expect_false (screen.flags & Screen_Insert)) 891 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
890 893
891 if (width != 0) 894 if (width != 0)
892 { 895 {
893#if !UNICODE_3 896#if !UNICODE_3
… …
901#endif 904#endif
902 905
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 907
905 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 909 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 910 {
908 if (screen.flags & Screen_Autowrap) 911 if (screen.flags & Screen_Autowrap)
909 { 912 {
910 // ... artificially enlargen the previous one 913 // ... artificially enlargen the previous one
911 c = NOCHAR; 914 c = NOCHAR;
… …
918 921
919 // nuke the character at this position, if required 922 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 923 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 924 // we never have to check for overwriting a wide char itself,
922 // only its tail. 925 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 926 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 927 scr_kill_char (*line, screen.cur.col);
925 928
926 line->touch (); 929 line->touch ();
927 930
928 do 931 do
929 { 932 {
930 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 934 line->r[screen.cur.col] = rend;
932 935
933 if (expect_true (screen.cur.col < ncol - 1)) 936 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 937 screen.cur.col++;
935 else 938 else
936 { 939 {
937 line->l = ncol; 940 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
… …
941 goto end_of_line; 944 goto end_of_line;
942 } 945 }
943 946
944 c = NOCHAR; 947 c = NOCHAR;
945 } 948 }
946 while (expect_false (--width > 0)); 949 while (ecb_unlikely (--width > 0));
947 950
948 // pad with spaces when overwriting wide character with smaller one 951 // 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++) 952 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 953 {
951 line->t[c] = ' '; 954 line->t[c] = ' ';
952 line->r[c] = rend; 955 line->r[c] = rend;
953 } 956 }
954 957
… …
1920 1923
1921# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1924# endif 1927# endif
1925 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent);
1926# endif 1929# endif
1927 1930
1928# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1933 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1947#endif
1945} 1948}
1946 1949
1947/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */
1949void 1951void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951{ 1953{
1952#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1953 int nrows, row_start; 1955 int nrows, row_start;
… …
2231 continue; 2233 continue;
2232 2234
2233 // redraw one or more characters 2235 // redraw one or more characters
2234 2236
2235 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2239 --col;
2238 2240
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2242 text_t *text = stp + col;
2241 int count = 1; 2243 int count = 1;
… …
2279 2281
2280 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2282 2284
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2286 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2287 count++, i--;
2286 2288
2287 /* 2289 /*
2288 * Determine the attributes for the string 2290 * Determine the attributes for the string
2289 */ 2291 */
2290 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2292 2294
2293 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2296 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2297 {
2296 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2297 2299
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2390 /*
2389 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2390 */ 2392 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2394
2393 if (expect_true (have_bg && back == Color_bg)) 2395 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2396 {
2395 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2396 2398
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2405 did_clear: ; 2407 did_clear: ;
2406 } 2408 }
2407 else 2409 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2411
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2412 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2413 {
2412#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2417 else
… …
2516 if (bg_pixmap != None) 2518 if (bg_pixmap != None)
2517 { 2519 {
2518# ifdef ENABLE_TRANSPARENCY 2520# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2521 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2522 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2523 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2525
2524 transparent = true; 2526 transparent = true;
2525 } 2527 }
2526 else 2528 else
2527# endif 2529# endif
2528 { 2530 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2531 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 } 2533 }
2532 } 2534 }
2533 else 2535 else
2534#endif 2536#endif
2535 { 2537 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2540 }
2539 2541
2540 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent);
2541 2543
2542 if (scrollBar.win) 2544 if (scrollBar.win)
2543 { 2545 {
2544 if (transparent) 2546 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2548 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2548 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2551 scrollBar.show (0);
2550 } 2552 }
2551 2553
2552 if (refresh) 2554 if (refresh)
2553 { 2555 {
… …
2676 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2678void 2680void
2679rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2680{ 2682{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2683 if (!selection.op)
2684 return; 2684 return;
2685 2685
2686 row_col_t pos;
2686 pos.row = pos.col = 0; 2687 pos.row = pos.col = 0;
2688
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2692 || (check_more == 1
2691 && current_screen == selection.screen 2693 && current_screen == selection.screen
… …
2697 || (check_more == 3 2699 || (check_more == 3
2698 && ROWCOL_IS_AFTER (selection.end, pos)) 2700 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 4 /* screen width change */ 2701 || (check_more == 4 /* screen width change */
2700 && (selection.beg.row != selection.end.row 2702 && (selection.beg.row != selection.end.row
2701 || selection.end.col > ncol))) 2703 || selection.end.col > ncol)))
2702 CLEAR_SELECTION (); 2704 CLEAR_ALL_SELECTION ();
2703} 2705}
2704 2706
2705/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2706/* 2708/*
2707 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
… …
2732 tt_paste (data, len); 2734 tt_paste (data, len);
2733} 2735}
2734 2736
2735/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2736/* 2738/*
2737 * Request the current selection: 2739 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2741 * 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 2742 * EXT: button 2 release
2744 */ 2743 */
2745void 2744void
2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2747{ 2746{
2748 if (selection.text && selnum == Sel_Primary)
2749 {
2750 /* internal selection */
2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2752 paste (str, strlen (str));
2753 free (str);
2754 }
2755 else if (!selection_req) 2747 if (!selection_req)
2756 { 2748 {
2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2758 selection_req->run (); 2750 selection_req->run ();
2759 } 2751 }
2760} 2752}
… …
3408 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3409 */ 3401 */
3410void 3402void
3411rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3412{ 3404{
3405 Atom property = rq.property == None ? rq.target : rq.property;
3413 XSelectionEvent ev; 3406 XSelectionEvent ev;
3414 3407
3415 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3416 ev.property = None; 3409 ev.property = None;
3417 ev.display = rq.display; 3410 ev.display = rq.display;
… …
3432 *target++ = xa[XA_COMPOUND_TEXT]; 3425 *target++ = xa[XA_COMPOUND_TEXT];
3433#if X_HAVE_UTF8_STRING 3426#if X_HAVE_UTF8_STRING
3434 *target++ = xa[XA_UTF8_STRING]; 3427 *target++ = xa[XA_UTF8_STRING];
3435#endif 3428#endif
3436 3429
3437 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3430 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3438 32, PropModeReplace, 3431 32, PropModeReplace,
3439 (unsigned char *)target_list, target - target_list); 3432 (unsigned char *)target_list, target - target_list);
3440 ev.property = rq.property; 3433 ev.property = property;
3441 } 3434 }
3442#if TODO // TODO 3435#if TODO // TODO
3443 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3444 { 3437 {
3445 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3446 } 3439 }
3447#endif 3440#endif
3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3449 { 3442 {
3450 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3451 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3452 ev.property = rq.property; 3445 ev.property = property;
3453 } 3446 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 { 3448 {
3456 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3458 ev.property = rq.property; 3451 ev.property = property;
3459 } 3452 }
3460 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3461 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3462 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
3463 || rq.target == xa[XA_UTF8_STRING] 3456 || rq.target == xa[XA_UTF8_STRING]
… …
3534 ct.value = (unsigned char *)cl; 3527 ct.value = (unsigned char *)cl;
3535 ct.nitems = selectlen; 3528 ct.nitems = selectlen;
3536 ct.encoding = target; 3529 ct.encoding = target;
3537 } 3530 }
3538 3531
3539 XChangeProperty (dpy, rq.requestor, rq.property, 3532 XChangeProperty (dpy, rq.requestor, property,
3540 ct.encoding, 8, PropModeReplace, 3533 ct.encoding, 8, PropModeReplace,
3541 ct.value, (int)ct.nitems); 3534 ct.value, (int)ct.nitems);
3542 ev.property = rq.property; 3535 ev.property = property;
3543 3536
3544 if (freect) 3537 if (freect)
3545 XFree (ct.value); 3538 XFree (ct.value);
3546 } 3539 }
3547 3540

Diff Legend

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