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.340 by sf-exg, Sat Apr 17 23:00: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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
397 } 402 }
398 403
399 free (tabs); 404 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
401 406
402 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
633 638
634 if (count > 0 639 if (count > 0
635 && row1 == 0 640 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
638 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 646
643 // sever bottommost line 647 // sever bottommost line
644 { 648 {
645 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2 - 1);
646 l.is_longer (0); 650 l.is_longer (0);
647 l.touch (); 651 l.touch ();
648 } 652 }
649 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
650 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 670 for (int i = count; i--; )
652 { 671 {
653 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
654 673
655 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
657 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)))
658 { 677 {
659 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 679 l.l = 0;
661 l.f = 0; 680 l.f = 0;
662 } 681 }
663 else 682 else
664 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
665 }
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 } 684 }
678 685
679 // move and/or clear selection, if any 686 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
681 { 688 {
… …
794 801
795 while (str < strend) 802 while (str < strend)
796 { 803 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 805
799 if (expect_false (c < 0x20)) 806 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 807 if (c == C0_LF)
801 { 808 {
802 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
803 810
804 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
823 { 830 {
824 scr_tab (1, true); 831 scr_tab (1, true);
825 continue; 832 continue;
826 } 833 }
827 834
828 if (expect_false ( 835 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 839 ))
833 { 840 {
… …
838 * should be a similar check. 845 * should be a similar check.
839 */ 846 */
840 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
841 } 848 }
842 849
843 if (expect_false (screen.flags & Screen_WrapNext)) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 851 {
845 scr_do_wrap (); 852 scr_do_wrap ();
846 853
847 line->l = ncol; 854 line->l = ncol;
848 line->is_longer (1); 855 line->is_longer (1);
… …
850 row = screen.cur.row; 857 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
852 } 859 }
853 860
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 863 c = 0xfffd;
857 864
858 // 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
859 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
861 // locale. 868 // locale.
862 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
863 870
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 872 {
866 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 874 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
884 } 891 }
885 } 892 }
886 893
887 if (expect_false (screen.flags & Screen_Insert)) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
889 896
890 if (width != 0) 897 if (width != 0)
891 { 898 {
892#if !UNICODE_3 899#if !UNICODE_3
… …
897# else 904# else
898 c = 0xfffd; 905 c = 0xfffd;
899# endif 906# endif
900#endif 907#endif
901 908
909 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
910
911 // if the character doesn't fit into the remaining columns...
912 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
913 {
914 if (screen.flags & Screen_Autowrap)
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 else
922 screen.cur.col = ncol - width;
923 }
924
902 // nuke the character at this position, if required 925 // nuke the character at this position, if required
903 if (expect_false ( 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.
904 line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col); 930 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 {
915 // ... artificially enlargen the previous one
916 c = NOCHAR;
917 // and try the same character next loop iteration
918 --str;
919 }
920 931
921 line->touch (); 932 line->touch ();
922 933
923 do 934 do
924 { 935 {
925 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
927 938
928 if (expect_true (screen.cur.col < ncol - 1)) 939 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 940 screen.cur.col++;
930 else 941 else
931 { 942 {
932 line->l = ncol; 943 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
935 break; 946
947 goto end_of_line;
936 } 948 }
937 949
938 c = NOCHAR; 950 c = NOCHAR;
939 } 951 }
940 while (expect_false (--width > 0)); 952 while (ecb_unlikely (--width > 0));
941 953
942 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 956 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 957 line->t[c] = ' ';
950 line->r[c] = rend; 958 line->r[c] = rend;
951 }
952 } 959 }
960
961end_of_line:
962 ;
953 } 963 }
954#if ENABLE_COMBINING 964#if ENABLE_COMBINING
955 else // width == 0 965 else // width == 0
956 { 966 {
957 if (c != 0xfeff) // ignore BOM 967 if (c != 0xfeff) // ignore BOM
… …
1020 1030
1021 want_refresh = 1; 1031 want_refresh = 1;
1022#endif 1032#endif
1023 } 1033 }
1024 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1025 else 1037 else
1026 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1027} 1039}
1028 1040
1029/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1336 return; 1348 return;
1337 1349
1338 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1339 1351
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1355 {
1347 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1348 1357
1349 if (mapped && !view_start) 1358 if (mapped)
1350 XClearArea (dpy, vt, 0, 1359 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1360 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1361 (unsigned int)Height2Pixel (num), False);
1353 } 1362 }
1354 else 1363 else
1355 { 1364 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1366
1358 if (mapped && !view_start) 1367 if (mapped)
1359 { 1368 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1371 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1372 0, Row2Pixel (row - view_start),
… …
1370 1379
1371 for (; num--; row++) 1380 for (; num--; row++)
1372 { 1381 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1374 1383
1375 if (!view_start) 1384 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1386 }
1378} 1387}
1379 1388
1380#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1381void 1390void
… …
1680 { 1689 {
1681 rvideo_state = on; 1690 rvideo_state = on;
1682 1691
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1686#endif 1695#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1697
1689 XGCValues gcvalue; 1698 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1917 1926
1918# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1921# endif 1930# endif
1922 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1923# endif 1932# endif
1924 1933
1925# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1936 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1950#endif
1942} 1951}
1943 1952
1944/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */
1946void 1954void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1956{
1949#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1950 int nrows, row_start; 1958 int nrows, row_start;
… …
2026 refresh_count = 0; 2034 refresh_count = 0;
2027 2035
2028 unsigned int old_screen_flags = screen.flags; 2036 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2037 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2032#endif 2040#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2042
2035 /* 2043 /*
2036 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
… …
2228 continue; 2236 continue;
2229 2237
2230 // redraw one or more characters 2238 // redraw one or more characters
2231 2239
2232 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2242 --col;
2235 2243
2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2245 text_t *text = stp + col;
2238 int count = 1; 2246 int count = 1;
… …
2276 2284
2277 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2279 2287
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2290 count++, i--;
2283 2291
2284 /* 2292 /*
2285 * Determine the attributes for the string 2293 * Determine the attributes for the string
2286 */ 2294 */
2287 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2289 2297
2290 // 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
2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2299 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2300 {
2293 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2294 2302
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2328 if (ISSET_PIXCOLOR (Color_HTC)) 2336 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC; 2337 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color 2338 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert) 2339 else if (!invert)
2332 fore = back; 2340 fore = back;
2341
2333 back = Color_HC; 2342 back = Color_HC;
2334 invert = 0; 2343 invert = 0;
2335 } 2344 }
2336 } 2345 }
2337#endif 2346#endif
… …
2384 /* 2393 /*
2385 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2386 */ 2395 */
2387 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2388 2397
2389 if (expect_true (have_bg && back == Color_bg)) 2398 if (ecb_likely (have_bg && back == Color_bg))
2390 { 2399 {
2391 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2392 2401
2393 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2394 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2401 did_clear: ; 2410 did_clear: ;
2402 } 2411 }
2403 else 2412 else
2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2405 2414
2406 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2407 { 2416 {
2408#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2411 else 2420 else
… …
2502 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2503 } 2512 }
2504} 2513}
2505 2514
2506void 2515void
2507rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2517{
2518 bool transparent = false;
2519
2509#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2511#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);
2512 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 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2514 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2516 2546
2517 if (scrollBar.win) 2547 if (scrollBar.win)
2518 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2521 scrollBar.show (0); 2554 scrollBar.show (0);
2522 } 2555 }
2523 2556
2524#endif 2557 if (refresh)
2525 2558 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2559 scr_clear ();
2528 scr_touch (true); 2560 scr_touch (true);
2561 }
2529 want_refresh = 1; 2562 want_refresh = 1;
2530} 2563}
2531 2564
2532/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2533void 2566void
… …
2621void 2654void
2622rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2656{
2624 int row, wrote; 2657 int row, wrote;
2625 unsigned int width, towrite; 2658 unsigned int width, towrite;
2626 char r1[] = "\n"; 2659 const char r1[] = "\n";
2627 2660
2628 for (row = saveLines + top_row; 2661 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2630 { 2663 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2677/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2678/* 2711/*
2679 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2680 */ 2713 */
2681void 2714void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2716{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2720 data[i] = C0_CR;
… …
2693 2726
2694 if (priv_modes & PrivMode_BracketPaste) 2727 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2728 tt_printf ("\e[201~");
2696} 2729}
2697 2730
2698/* ------------------------------------------------------------------------- */
2699/*
2700 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify
2702 */
2703void 2731void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2705{ 2733{
2706 if (prop == None) /* check for failed XConvertSelection */ 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2707 {
2708 if ((selection_type & Sel_CompoundText))
2709 {
2710 int selnum = selection_type & Sel_whereMask;
2711
2712 selection_type = 0;
2713 if (selnum != Sel_direct)
2714 selection_request_other (XA_STRING, selnum);
2715 }
2716
2717 if ((selection_type & Sel_UTF8String))
2718 {
2719 int selnum = selection_type & Sel_whereMask;
2720
2721 selection_type = Sel_CompoundText;
2722 if (selnum != Sel_direct)
2723 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2724 else
2725 selection_type = 0;
2726 }
2727
2728 return;
2729 }
2730
2731 unsigned long bytes_after;
2732 XTextProperty ct;
2733
2734 if (XGetWindowProperty (dpy, win, prop,
2735 0, PROP_SIZE / 4,
2736 delete_prop, AnyPropertyType,
2737 &ct.encoding, &ct.format,
2738 &ct.nitems, &bytes_after,
2739 &ct.value) != Success)
2740 {
2741 ct.value = 0;
2742 goto bailout;
2743 }
2744
2745 if (ct.encoding == None)
2746 goto bailout;
2747
2748 if (bytes_after)
2749 {
2750 // fetch and append remaining data
2751 XTextProperty ct2;
2752
2753 if (XGetWindowProperty (dpy, win, prop,
2754 ct.nitems / 4, (bytes_after + 3) / 4,
2755 delete_prop, AnyPropertyType,
2756 &ct2.encoding, &ct2.format,
2757 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success)
2759 goto bailout;
2760
2761 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems;
2765
2766 XFree (ct2.value);
2767 }
2768
2769 if (ct.value == 0)
2770 goto bailout;
2771
2772 if (ct.encoding == xa[XA_INCR])
2773 {
2774 // INCR selection, start handshake
2775 if (!delete_prop)
2776 XDeleteProperty (dpy, win, prop);
2777
2778 selection_wait = Sel_incr;
2779 incr_buf_fill = 0;
2780 incr_ev.start (10);
2781
2782 goto bailout;
2783 }
2784
2785 if (ct.nitems == 0)
2786 {
2787 if (selection_wait == Sel_incr)
2788 {
2789 XFree (ct.value);
2790
2791 // finally complete, now paste the whole thing
2792 selection_wait = Sel_normal;
2793 ct.value = (unsigned char *)incr_buf;
2794 ct.nitems = incr_buf_fill;
2795 incr_buf = 0;
2796 incr_buf_size = 0;
2797 incr_ev.stop ();
2798 }
2799 else
2800 {
2801 if (selection_wait == Sel_normal
2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2803 {
2804 /*
2805 * pass through again trying CUT_BUFFER0 if we've come from
2806 * XConvertSelection () but nothing was presented
2807 */
2808 selection_paste (display->root, XA_CUT_BUFFER0, False);
2809 }
2810
2811 goto bailout;
2812 }
2813 }
2814 else if (selection_wait == Sel_incr)
2815 {
2816 incr_ev.start (10);
2817
2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2822 }
2823
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems;
2826
2827 goto bailout;
2828 }
2829
2830 char **cl;
2831 int cr;
2832
2833#if !ENABLE_MINIMAL
2834 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2835 // so recode it manually
2836 if (ct.encoding == xa[XA_UTF8_STRING])
2837 {
2838 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2839 char *s = rxvt_wcstombs (w);
2840 free (w);
2841 // TODO: strlen == only the first element will be converted. well...
2842 paste (s, strlen (s));
2843 free (s);
2844 }
2845 else
2846#endif
2847 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2848 && cl)
2849 {
2850 for (int i = 0; i < cr; i++)
2851 paste (cl[i], strlen (cl[i]));
2852
2853 XFreeStringList (cl);
2854 }
2855 else
2856 paste ((char *)ct.value, ct.nitems); // paste raw
2857
2858bailout:
2859 XFree (ct.value);
2860
2861 if (selection_wait == Sel_normal)
2862 selection_wait = Sel_none;
2863}
2864
2865void
2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2867{
2868 selection_wait = Sel_none;
2869
2870 incr_buf_size = 0;
2871 free (incr_buf);
2872
2873 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2874}
2875
2876void
2877rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2878{
2879 if (prop == None || selection_wait != Sel_incr)
2880 return; 2735 return;
2881 2736
2882 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2883} 2738}
2884 2739
2885/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2886/* 2741/*
2887 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2888 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2889 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2890 * > CUT_BUFFER0
2891 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2892 * will auto fallback to CUT_BUFFER0
2893 * EXT: button 2 release 2745 * EXT: button 2 release
2894 */ 2746 */
2895void 2747void
2896rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2897{ 2749{
2898 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2899 {
2900 /* internal selection */
2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2902 paste (str, strlen (str));
2903 free (str);
2904 return;
2905 } 2751 {
2906 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2907 { 2754 }
2908 selection_request_time = tm;
2909 selection_wait = Sel_normal;
2910
2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return;
2915#else
2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return;
2919#endif
2920 }
2921
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
2924}
2925
2926int
2927rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2928{
2929 Atom sel;
2930
2931 selection_type |= selnum;
2932
2933 if (selnum == Sel_Primary)
2934 sel = XA_PRIMARY;
2935 else if (selnum == Sel_Secondary)
2936 sel = XA_SECONDARY;
2937 else
2938 sel = xa[XA_CLIPBOARD];
2939
2940 if (XGetSelectionOwner (dpy, sel) != None)
2941 {
2942 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2943 vt, selection_request_time);
2944 return 1;
2945 }
2946
2947 return 0;
2948} 2755}
2949 2756
2950/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2951/* 2758/*
2952 * Clear all selected text 2759 * Clear all selected text
… …
2975 if (display->clipboard_owner == this) 2782 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0; 2783 display->clipboard_owner = 0;
2977 } 2784 }
2978} 2785}
2979 2786
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2992}
2993
2994/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2995/* 2788/*
2996 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2997 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2998 */ 2791 */
2999void 2792void
3000rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
3001{ 2794{
3002 int i; 2795 int size;
3003 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
3004 text_t *t; 2797 text_t *t;
3005 2798
3006 switch (selection.op) 2799 switch (selection.op)
3007 { 2800 {
… …
3023 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
3024 2817
3025 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)))
3026 return; 2819 return;
3027 2820
3028 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3029 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));
3030 2823
3031 int ofs = 0; 2824 int ofs = 0;
3032 int extra = 0; 2825 int extra = 0;
3033 2826
3034 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
3040 { 2833 {
3041#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
3042 if (selection.rect) 2835 if (selection.rect)
3043 { 2836 {
3044 col = selection.beg.col; 2837 col = selection.beg.col;
3045 end_col = ncol + 1; 2838 end_col = selection.end.col;
3046 } 2839 }
3047 else 2840 else
3048#endif 2841#endif
3049 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
3050 2843
3051 col = max (col, 0); 2844 col = max (col, 0);
3052 2845
3053 if (row == selection.end.row 2846 if (row == selection.end.row)
3054#if !ENABLE_MINIMAL
3055 || selection.rect
3056#endif
3057 )
3058 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
3059 2848
3060 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
3061 2850
3062 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3070 2859
3071 extra -= (len - 1); 2860 extra -= (len - 1);
3072 2861
3073 if (extra < 0) 2862 if (extra < 0)
3074 { 2863 {
3075 extra += i; 2864 extra += size;
3076 i += i; 2865 size += size;
3077 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));
3078 } 2867 }
3079 2868
3080 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3081 } 2870 }
3082#endif 2871#endif
… …
3094 2883
3095 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3096 } 2885 }
3097 else 2886 else
3098#endif 2887#endif
3099 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))
3100 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3101 } 2892 }
3102
3103 if (end_col != selection.end.col)
3104 new_selection_text[ofs++] = C0_LF;
3105 2893
3106 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3107 2895
3108 if (ofs == 0) 2896 if (ofs == 0)
3109 { 2897 {
… …
3615 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3616 */ 3404 */
3617void 3405void
3618rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3619{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3620 XSelectionEvent ev; 3409 XSelectionEvent ev;
3621 3410
3622 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3623 ev.property = None; 3412 ev.property = None;
3624 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3639 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3640#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3641 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3642#endif 3431#endif
3643 3432
3644 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3645 32, PropModeReplace, 3434 32, PropModeReplace,
3646 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3647 ev.property = rq.property; 3436 ev.property = property;
3648 } 3437 }
3649#if TODO // TODO 3438#if TODO // TODO
3650 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3651 { 3440 {
3652 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3653 } 3442 }
3654#endif 3443#endif
3655 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)
3656 { 3445 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3659 ev.property = rq.property; 3448 ev.property = property;
3660 } 3449 }
3661 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)
3662 { 3451 {
3663 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3664 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3453 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3665 ev.property = rq.property; 3454 ev.property = property;
3666 } 3455 }
3667 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3668 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3669 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3670 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3741 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3742 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3743 ct.encoding = target; 3532 ct.encoding = target;
3744 } 3533 }
3745 3534
3746 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3747 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3748 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3749 ev.property = rq.property; 3538 ev.property = property;
3750 3539
3751 if (freect) 3540 if (freect)
3752 XFree (ct.value); 3541 XFree (ct.value);
3753 } 3542 }
3754 3543

Diff Legend

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