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.348 by sf-exg, Sat Oct 9 22:33:45 2010 UTC vs.
Revision 1.388 by root, Fri Jul 8 00:08:40 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 * ------------------------------------------------------------------------- */
… …
144 col--; 142 col--;
145 143
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 146
147 l.touch ();
148
149 // found start, nuke 149 // found start, nuke
150 do { 150 do {
151 l.t[col] = ' '; 151 l.t[col] = ' ';
152 l.r[col] = rend; 152 l.r[col] = rend;
153 col++; 153 col++;
… …
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;
… …
398 } 402 }
399 403
400 free (tabs); 404 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
402 406
403 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
405 409
406 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
407 411
408 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
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 - 1);
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;
662 l.f = 0; 680 l.f = 0;
663 } 681 }
664 else 682 else
665 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
666 }
667
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 } 684 }
679 685
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)
682 { 688 {
… …
795 801
796 while (str < strend) 802 while (str < strend)
797 { 803 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 805
800 if (expect_false (c < 0x20)) 806 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 807 if (c == C0_LF)
802 { 808 {
803 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
804 810
805 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
824 { 830 {
825 scr_tab (1, true); 831 scr_tab (1, true);
826 continue; 832 continue;
827 } 833 }
828 834
829 if (expect_false ( 835 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 839 ))
834 { 840 {
… …
839 * should be a similar check. 845 * should be a similar check.
840 */ 846 */
841 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
842 } 848 }
843 849
844 if (expect_false (screen.flags & Screen_WrapNext)) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 851 {
846 scr_do_wrap (); 852 scr_do_wrap ();
847 853
848 line->l = ncol; 854 line->l = ncol;
849 line->is_longer (1); 855 line->is_longer (1);
… …
851 row = screen.cur.row; 857 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
853 } 859 }
854 860
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 863 c = 0xfffd;
858 864
859 // rely on wcwidth to tell us the character width, do wcwidth before 865 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
862 // locale. 868 // locale.
863 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
864 870
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 872 {
867 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 874 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
885 } 891 }
886 } 892 }
887 893
888 if (expect_false (screen.flags & Screen_Insert)) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
890 896
891 if (width != 0) 897 if (width != 0)
892 { 898 {
893#if !UNICODE_3 899#if !UNICODE_3
… …
898# else 904# else
899 c = 0xfffd; 905 c = 0xfffd;
900# endif 906# endif
901#endif 907#endif
902 908
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 909 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 910
913 // if the character doesn't fit into the remaining columns... 911 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 912 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
915 { 913 {
916 if (screen.flags & Screen_Autowrap) 914 if (screen.flags & Screen_Autowrap)
917 { 915 {
918 // ... artificially enlargen the previous one 916 // ... artificially enlargen the previous one
919 c = NOCHAR; 917 c = NOCHAR;
… …
922 } 920 }
923 else 921 else
924 screen.cur.col = ncol - width; 922 screen.cur.col = ncol - width;
925 } 923 }
926 924
925 // nuke the character at this position, if required
926 // due to wonderful coincidences everywhere else in this loop
927 // we never have to check for overwriting a wide char itself,
928 // only its tail.
929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
930 scr_kill_char (*line, screen.cur.col);
931
927 line->touch (); 932 line->touch ();
928 933
929 do 934 do
930 { 935 {
931 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
933 938
934 if (expect_true (screen.cur.col < ncol - 1)) 939 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 940 screen.cur.col++;
936 else 941 else
937 { 942 {
938 line->l = ncol; 943 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
941 break; 946
947 goto end_of_line;
942 } 948 }
943 949
944 c = NOCHAR; 950 c = NOCHAR;
945 } 951 }
946 while (expect_false (--width > 0)); 952 while (ecb_unlikely (--width > 0));
947 953
948 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 956 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 957 line->t[c] = ' ';
956 line->r[c] = rend; 958 line->r[c] = rend;
957 }
958 } 959 }
960
961end_of_line:
962 ;
959 } 963 }
960#if ENABLE_COMBINING 964#if ENABLE_COMBINING
961 else // width == 0 965 else // width == 0
962 { 966 {
963 if (c != 0xfeff) // ignore BOM 967 if (c != 0xfeff) // ignore BOM
… …
1026 1030
1027 want_refresh = 1; 1031 want_refresh = 1;
1028#endif 1032#endif
1029 } 1033 }
1030 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1031 else 1037 else
1032 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1033} 1039}
1034 1040
1035/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1683 { 1689 {
1684 rvideo_state = on; 1690 rvideo_state = on;
1685 1691
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1689#endif 1695#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1697
1692 XGCValues gcvalue; 1698 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1920 1926
1921# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1924# endif 1930# endif
1925 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1926# endif 1932# endif
1927 1933
1928# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1936 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1950#endif
1945} 1951}
1946 1952
1947/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */
1949void 1954void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951{ 1956{
1952#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1953 int nrows, row_start; 1958 int nrows, row_start;
… …
2029 refresh_count = 0; 2034 refresh_count = 0;
2030 2035
2031 unsigned int old_screen_flags = screen.flags; 2036 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2037 char have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2035#endif 2040#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2042
2038 /* 2043 /*
2039 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
… …
2231 continue; 2236 continue;
2232 2237
2233 // redraw one or more characters 2238 // redraw one or more characters
2234 2239
2235 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2242 --col;
2238 2243
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2245 text_t *text = stp + col;
2241 int count = 1; 2246 int count = 1;
… …
2279 2284
2280 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2282 2287
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2290 count++, i--;
2286 2291
2287 /* 2292 /*
2288 * Determine the attributes for the string 2293 * Determine the attributes for the string
2289 */ 2294 */
2290 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2292 2297
2293 // only do special processing if any attributes are set, which is unlikely 2298 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2299 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2300 {
2296 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2297 2302
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2393 /*
2389 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2390 */ 2395 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2397
2393 if (expect_true (have_bg && back == Color_bg)) 2398 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2399 {
2395 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2396 2401
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2405 did_clear: ; 2410 did_clear: ;
2406 } 2411 }
2407 else 2412 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2414
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2416 {
2412#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2420 else
… …
2506 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2507 } 2512 }
2508} 2513}
2509 2514
2510void 2515void
2511rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2512{ 2517{
2518 bool transparent = false;
2519
2513#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2514 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2515#else 2522 {
2523# ifdef ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT)
2525 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2516 2528
2529 transparent = true;
2530 }
2531 else
2532# endif
2533 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2536 }
2537 }
2538 else
2539#endif
2540 {
2517 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2518 XClearWindow (dpy, parent[0]);
2519 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2520 2546
2521 if (scrollBar.win) 2547 if (scrollBar.win)
2522 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2523 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2524 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2525 scrollBar.show (0); 2554 scrollBar.show (0);
2526 } 2555 }
2527 2556
2528#endif 2557 if (refresh)
2529 2558 {
2530 /* bgPixmap.apply () does not do the following : */
2531 scr_clear (); 2559 scr_clear ();
2532 scr_touch (true); 2560 scr_touch (true);
2561 }
2533 want_refresh = 1; 2562 want_refresh = 1;
2534} 2563}
2535 2564
2536/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2537void 2566void
… …
2625void 2654void
2626rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2627{ 2656{
2628 int row, wrote; 2657 int row, wrote;
2629 unsigned int width, towrite; 2658 unsigned int width, towrite;
2630 char r1[] = "\n"; 2659 const char r1[] = "\n";
2631 2660
2632 for (row = saveLines + top_row; 2661 for (row = saveLines + top_row;
2633 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2634 { 2663 {
2635 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2708 tt_paste (data, len); 2737 tt_paste (data, len);
2709} 2738}
2710 2739
2711/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2712/* 2741/*
2713 * Respond to a notification that a primary selection has been sent 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2714 * EXT: SelectionNotify 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2715 */ 2744 * as fallback
2716void
2717rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2718{
2719 if (prop == None) /* check for failed XConvertSelection */
2720 {
2721 if ((selection_type & Sel_CompoundText))
2722 {
2723 int selnum = selection_type & Sel_whereMask;
2724
2725 selection_type = 0;
2726 if (selnum != Sel_direct)
2727 selection_request_other (XA_STRING, selnum);
2728 }
2729
2730 if ((selection_type & Sel_UTF8String))
2731 {
2732 int selnum = selection_type & Sel_whereMask;
2733
2734 selection_type = Sel_CompoundText;
2735 if (selnum != Sel_direct)
2736 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2737 else
2738 selection_type = 0;
2739 }
2740
2741 return;
2742 }
2743
2744 unsigned long bytes_after;
2745 XTextProperty ct;
2746
2747 if (XGetWindowProperty (dpy, win, prop,
2748 0, PROP_SIZE / 4,
2749 delete_prop, AnyPropertyType,
2750 &ct.encoding, &ct.format,
2751 &ct.nitems, &bytes_after,
2752 &ct.value) != Success)
2753 {
2754 ct.value = 0;
2755 goto bailout;
2756 }
2757
2758 if (ct.encoding == None)
2759 goto bailout;
2760
2761 if (bytes_after)
2762 {
2763 // fetch and append remaining data
2764 XTextProperty ct2;
2765
2766 if (XGetWindowProperty (dpy, win, prop,
2767 ct.nitems / 4, (bytes_after + 3) / 4,
2768 delete_prop, AnyPropertyType,
2769 &ct2.encoding, &ct2.format,
2770 &ct2.nitems, &bytes_after,
2771 &ct2.value) != Success)
2772 goto bailout;
2773
2774 // realloc should be compatible to XFree, here, and elsewhere, too
2775 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2776 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2777 ct.nitems += ct2.nitems;
2778
2779 XFree (ct2.value);
2780 }
2781
2782 if (ct.value == 0)
2783 goto bailout;
2784
2785 if (ct.encoding == xa[XA_INCR])
2786 {
2787 // INCR selection, start handshake
2788 if (!delete_prop)
2789 XDeleteProperty (dpy, win, prop);
2790
2791 selection_wait = Sel_incr;
2792 incr_buf_fill = 0;
2793 incr_ev.start (10);
2794
2795 goto bailout;
2796 }
2797
2798 if (ct.nitems == 0)
2799 {
2800 if (selection_wait == Sel_incr)
2801 {
2802 XFree (ct.value);
2803
2804 // finally complete, now paste the whole thing
2805 selection_wait = Sel_normal;
2806 ct.value = (unsigned char *)incr_buf;
2807 ct.nitems = incr_buf_fill;
2808 incr_buf = 0;
2809 incr_buf_size = 0;
2810 incr_ev.stop ();
2811 }
2812 else
2813 {
2814 if (selection_wait == Sel_normal
2815 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2816 {
2817 /*
2818 * pass through again trying CUT_BUFFER0 if we've come from
2819 * XConvertSelection () but nothing was presented
2820 */
2821 selection_paste (display->root, XA_CUT_BUFFER0, False);
2822 }
2823
2824 goto bailout;
2825 }
2826 }
2827 else if (selection_wait == Sel_incr)
2828 {
2829 incr_ev.start (10);
2830
2831 while (incr_buf_fill + ct.nitems > incr_buf_size)
2832 {
2833 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2834 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2835 }
2836
2837 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2838 incr_buf_fill += ct.nitems;
2839
2840 goto bailout;
2841 }
2842
2843 char **cl;
2844 int cr;
2845
2846#if !ENABLE_MINIMAL
2847 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2848 // so recode it manually
2849 if (ct.encoding == xa[XA_UTF8_STRING])
2850 {
2851 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2852 char *s = rxvt_wcstombs (w);
2853 free (w);
2854 // TODO: strlen == only the first element will be converted. well...
2855 paste (s, strlen (s));
2856 free (s);
2857 }
2858 else
2859#endif
2860 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2861 && cl)
2862 {
2863 for (int i = 0; i < cr; i++)
2864 paste (cl[i], strlen (cl[i]));
2865
2866 XFreeStringList (cl);
2867 }
2868 else
2869 paste ((char *)ct.value, ct.nitems); // paste raw
2870
2871bailout:
2872 XFree (ct.value);
2873
2874 if (selection_wait == Sel_normal)
2875 selection_wait = Sel_none;
2876}
2877
2878void
2879rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2880{
2881 selection_wait = Sel_none;
2882
2883 incr_buf_size = 0;
2884 free (incr_buf);
2885
2886 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2887}
2888
2889void
2890rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2891{
2892 if (prop == None || selection_wait != Sel_incr)
2893 return;
2894
2895 selection_paste (win, prop, true);
2896}
2897
2898/* ------------------------------------------------------------------------- */
2899/*
2900 * Request the current selection:
2901 * Order: > internal selection if available
2902 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2903 * > CUT_BUFFER0
2904 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2905 * will auto fallback to CUT_BUFFER0
2906 * EXT: button 2 release 2745 * EXT: button 2 release
2907 */ 2746 */
2908void 2747void
2909rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2910{ 2749{
2911 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2912 {
2913 /* internal selection */
2914 char *str = rxvt_wcstombs (selection.text, selection.len);
2915 paste (str, strlen (str));
2916 free (str);
2917 return;
2918 } 2751 {
2919 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2920 { 2754 }
2921 selection_request_time = tm;
2922 selection_wait = Sel_normal;
2923
2924#if X_HAVE_UTF8_STRING
2925 selection_type = Sel_UTF8String;
2926 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2927 return;
2928#else
2929 selection_type = Sel_CompoundText;
2930 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2931 return;
2932#endif
2933 }
2934
2935 selection_wait = Sel_none; /* don't loop in selection_paste () */
2936 selection_paste (display->root, XA_CUT_BUFFER0, false);
2937}
2938
2939int
2940rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2941{
2942 Atom sel;
2943
2944 selection_type |= selnum;
2945
2946 if (selnum == Sel_Primary)
2947 sel = XA_PRIMARY;
2948 else if (selnum == Sel_Secondary)
2949 sel = XA_SECONDARY;
2950 else
2951 sel = xa[XA_CLIPBOARD];
2952
2953 if (XGetSelectionOwner (dpy, sel) != None)
2954 {
2955 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2956 vt, selection_request_time);
2957 return 1;
2958 }
2959
2960 return 0;
2961} 2755}
2962 2756
2963/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2964/* 2758/*
2965 * Clear all selected text 2759 * Clear all selected text
… …
2996 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2997 */ 2791 */
2998void 2792void
2999rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
3000{ 2794{
3001 int i; 2795 int size;
3002 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
3003 text_t *t; 2797 text_t *t;
3004 2798
3005 switch (selection.op) 2799 switch (selection.op)
3006 { 2800 {
… …
3022 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
3023 2817
3024 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2818 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3025 return; 2819 return;
3026 2820
3027 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3028 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2822 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3029 2823
3030 int ofs = 0; 2824 int ofs = 0;
3031 int extra = 0; 2825 int extra = 0;
3032 2826
3033 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
3039 { 2833 {
3040#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
3041 if (selection.rect) 2835 if (selection.rect)
3042 { 2836 {
3043 col = selection.beg.col; 2837 col = selection.beg.col;
3044 end_col = ncol + 1; 2838 end_col = selection.end.col;
3045 } 2839 }
3046 else 2840 else
3047#endif 2841#endif
3048 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
3049 2843
3050 col = max (col, 0); 2844 col = max (col, 0);
3051 2845
3052 if (row == selection.end.row 2846 if (row == selection.end.row)
3053#if !ENABLE_MINIMAL
3054 || selection.rect
3055#endif
3056 )
3057 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
3058 2848
3059 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
3060 2850
3061 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3069 2859
3070 extra -= (len - 1); 2860 extra -= (len - 1);
3071 2861
3072 if (extra < 0) 2862 if (extra < 0)
3073 { 2863 {
3074 extra += i; 2864 extra += size;
3075 i += i; 2865 size += size;
3076 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2866 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3077 } 2867 }
3078 2868
3079 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3080 } 2870 }
3081#endif 2871#endif
… …
3093 2883
3094 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3095 } 2885 }
3096 else 2886 else
3097#endif 2887#endif
3098 if (!ROW(row).is_longer () && row != selection.end.row) 2888 if (!ROW(row).is_longer ()
2889 && (row != selection.end.row || end_col != selection.end.col)
2890 && (row != selection.beg.row || selection.beg.col < ncol))
3099 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3100 } 2892 }
3101
3102 if (end_col != selection.end.col)
3103 new_selection_text[ofs++] = C0_LF;
3104 2893
3105 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3106 2895
3107 if (ofs == 0) 2896 if (ofs == 0)
3108 { 2897 {
… …
3614 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3615 */ 3404 */
3616void 3405void
3617rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3618{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3619 XSelectionEvent ev; 3409 XSelectionEvent ev;
3620 3410
3621 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3622 ev.property = None; 3412 ev.property = None;
3623 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3638 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3639#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3640 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3641#endif 3431#endif
3642 3432
3643 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3644 32, PropModeReplace, 3434 32, PropModeReplace,
3645 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3646 ev.property = rq.property; 3436 ev.property = property;
3647 } 3437 }
3648#if TODO // TODO 3438#if TODO // TODO
3649 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3650 { 3440 {
3651 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3652 } 3442 }
3653#endif 3443#endif
3654 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3655 { 3445 {
3656 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3657 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3658 ev.property = rq.property; 3448 ev.property = property;
3659 } 3449 }
3660 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3661 { 3451 {
3662 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3663 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3453 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3664 ev.property = rq.property; 3454 ev.property = property;
3665 } 3455 }
3666 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3667 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3668 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3669 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3740 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3741 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3742 ct.encoding = target; 3532 ct.encoding = target;
3743 } 3533 }
3744 3534
3745 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3746 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3747 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3748 ev.property = rq.property; 3538 ev.property = property;
3749 3539
3750 if (freect) 3540 if (freect)
3751 XFree (ct.value); 3541 XFree (ct.value);
3752 } 3542 }
3753 3543

Diff Legend

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