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.343 by sf-exg, Thu Jul 1 21:52:52 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
36fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
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
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
903 // nuke the character at this position, if required 925 // nuke the character at this position, if required
904 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.
905 line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (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); 930 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 931
922 line->touch (); 932 line->touch ();
923 933
924 do 934 do
925 { 935 {
926 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
928 938
929 if (expect_true (screen.cur.col < ncol - 1)) 939 if (ecb_likely (screen.cur.col < ncol - 1))
930 screen.cur.col++; 940 screen.cur.col++;
931 else 941 else
932 { 942 {
933 line->l = ncol; 943 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
936 break; 946
947 goto end_of_line;
937 } 948 }
938 949
939 c = NOCHAR; 950 c = NOCHAR;
940 } 951 }
941 while (expect_false (--width > 0)); 952 while (ecb_unlikely (--width > 0));
942 953
943 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945 { 956 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 957 line->t[c] = ' ';
951 line->r[c] = rend; 958 line->r[c] = rend;
952 }
953 } 959 }
960
961end_of_line:
962 ;
954 } 963 }
955#if ENABLE_COMBINING 964#if ENABLE_COMBINING
956 else // width == 0 965 else // width == 0
957 { 966 {
958 if (c != 0xfeff) // ignore BOM 967 if (c != 0xfeff) // ignore BOM
… …
1021 1030
1022 want_refresh = 1; 1031 want_refresh = 1;
1023#endif 1032#endif
1024 } 1033 }
1025 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1026 else 1037 else
1027 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1028} 1039}
1029 1040
1030/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1337 return; 1348 return;
1338 1349
1339 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1340 1351
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1355 {
1348 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1349 1357
1350 if (mapped && !view_start) 1358 if (mapped)
1351 XClearArea (dpy, vt, 0, 1359 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1360 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1361 (unsigned int)Height2Pixel (num), False);
1354 } 1362 }
1355 else 1363 else
1356 { 1364 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1366
1359 if (mapped && !view_start) 1367 if (mapped)
1360 { 1368 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1371 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1372 0, Row2Pixel (row - view_start),
… …
1371 1379
1372 for (; num--; row++) 1380 for (; num--; row++)
1373 { 1381 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1375 1383
1376 if (!view_start) 1384 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1386 }
1379} 1387}
1380 1388
1381#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1382void 1390void
… …
1681 { 1689 {
1682 rvideo_state = on; 1690 rvideo_state = on;
1683 1691
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1686 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1687#endif 1695#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1697
1690 XGCValues gcvalue; 1698 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1918 1926
1919# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1920# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1921 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1922# endif 1930# endif
1923 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1924# endif 1932# endif
1925 1933
1926# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1928 set_urgency (1); 1936 set_urgency (1);
… …
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1942#endif 1950#endif
1943} 1951}
1944 1952
1945/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1946/* ARGSUSED */
1947void 1954void
1948rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1949{ 1956{
1950#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1951 int nrows, row_start; 1958 int nrows, row_start;
… …
2027 refresh_count = 0; 2034 refresh_count = 0;
2028 2035
2029 unsigned int old_screen_flags = screen.flags; 2036 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0; 2037 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2033#endif 2040#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2042
2036 /* 2043 /*
2037 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
… …
2229 continue; 2236 continue;
2230 2237
2231 // redraw one or more characters 2238 // redraw one or more characters
2232 2239
2233 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2234 while (expect_false (stp[col] == NOCHAR && col > 0)) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2235 --col; 2242 --col;
2236 2243
2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2238 text_t *text = stp + col; 2245 text_t *text = stp + col;
2239 int count = 1; 2246 int count = 1;
… …
2277 2284
2278 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2280 2287
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2290 count++, i--;
2284 2291
2285 /* 2292 /*
2286 * Determine the attributes for the string 2293 * Determine the attributes for the string
2287 */ 2294 */
2288 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2290 2297
2291 // 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
2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2299 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2300 {
2294 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2295 2302
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2386 /* 2393 /*
2387 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2388 */ 2395 */
2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2390 2397
2391 if (expect_true (have_bg && back == Color_bg)) 2398 if (ecb_likely (have_bg && back == Color_bg))
2392 { 2399 {
2393 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2394 2401
2395 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2396 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2403 did_clear: ; 2410 did_clear: ;
2404 } 2411 }
2405 else 2412 else
2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2407 2414
2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2409 { 2416 {
2410#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2411 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2412 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2413 else 2420 else
… …
2504 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2505 } 2512 }
2506} 2513}
2507 2514
2508void 2515void
2509rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2510{ 2517{
2518 bool transparent = false;
2519
2511#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2512 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2513#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);
2514 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 {
2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2516 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2518 2546
2519 if (scrollBar.win) 2547 if (scrollBar.win)
2520 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2522 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2523 scrollBar.show (0); 2554 scrollBar.show (0);
2524 } 2555 }
2525 2556
2526#endif 2557 if (refresh)
2527 2558 {
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear (); 2559 scr_clear ();
2530 scr_touch (true); 2560 scr_touch (true);
2561 }
2531 want_refresh = 1; 2562 want_refresh = 1;
2532} 2563}
2533 2564
2534/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2535void 2566void
… …
2623void 2654void
2624rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2656{
2626 int row, wrote; 2657 int row, wrote;
2627 unsigned int width, towrite; 2658 unsigned int width, towrite;
2628 char r1[] = "\n"; 2659 const char r1[] = "\n";
2629 2660
2630 for (row = saveLines + top_row; 2661 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2632 { 2663 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2679/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2680/* 2711/*
2681 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2682 */ 2713 */
2683void 2714void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2716{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2720 data[i] = C0_CR;
… …
2695 2726
2696 if (priv_modes & PrivMode_BracketPaste) 2727 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~"); 2728 tt_printf ("\e[201~");
2698} 2729}
2699 2730
2700/* ------------------------------------------------------------------------- */
2701/*
2702 * Respond to a notification that a primary selection has been sent
2703 * EXT: SelectionNotify
2704 */
2705void 2731void
2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{ 2733{
2708 if (prop == None) /* check for failed XConvertSelection */ 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 {
2710 if ((selection_type & Sel_CompoundText))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = 0;
2715 if (selnum != Sel_direct)
2716 selection_request_other (XA_STRING, selnum);
2717 }
2718
2719 if ((selection_type & Sel_UTF8String))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = Sel_CompoundText;
2724 if (selnum != Sel_direct)
2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2726 else
2727 selection_type = 0;
2728 }
2729
2730 return;
2731 }
2732
2733 unsigned long bytes_after;
2734 XTextProperty ct;
2735
2736 if (XGetWindowProperty (dpy, win, prop,
2737 0, PROP_SIZE / 4,
2738 delete_prop, AnyPropertyType,
2739 &ct.encoding, &ct.format,
2740 &ct.nitems, &bytes_after,
2741 &ct.value) != Success)
2742 {
2743 ct.value = 0;
2744 goto bailout;
2745 }
2746
2747 if (ct.encoding == None)
2748 goto bailout;
2749
2750 if (bytes_after)
2751 {
2752 // fetch and append remaining data
2753 XTextProperty ct2;
2754
2755 if (XGetWindowProperty (dpy, win, prop,
2756 ct.nitems / 4, (bytes_after + 3) / 4,
2757 delete_prop, AnyPropertyType,
2758 &ct2.encoding, &ct2.format,
2759 &ct2.nitems, &bytes_after,
2760 &ct2.value) != Success)
2761 goto bailout;
2762
2763 // realloc should be compatible to XFree, here, and elsewhere, too
2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems;
2767
2768 XFree (ct2.value);
2769 }
2770
2771 if (ct.value == 0)
2772 goto bailout;
2773
2774 if (ct.encoding == xa[XA_INCR])
2775 {
2776 // INCR selection, start handshake
2777 if (!delete_prop)
2778 XDeleteProperty (dpy, win, prop);
2779
2780 selection_wait = Sel_incr;
2781 incr_buf_fill = 0;
2782 incr_ev.start (10);
2783
2784 goto bailout;
2785 }
2786
2787 if (ct.nitems == 0)
2788 {
2789 if (selection_wait == Sel_incr)
2790 {
2791 XFree (ct.value);
2792
2793 // finally complete, now paste the whole thing
2794 selection_wait = Sel_normal;
2795 ct.value = (unsigned char *)incr_buf;
2796 ct.nitems = incr_buf_fill;
2797 incr_buf = 0;
2798 incr_buf_size = 0;
2799 incr_ev.stop ();
2800 }
2801 else
2802 {
2803 if (selection_wait == Sel_normal
2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2805 {
2806 /*
2807 * pass through again trying CUT_BUFFER0 if we've come from
2808 * XConvertSelection () but nothing was presented
2809 */
2810 selection_paste (display->root, XA_CUT_BUFFER0, False);
2811 }
2812
2813 goto bailout;
2814 }
2815 }
2816 else if (selection_wait == Sel_incr)
2817 {
2818 incr_ev.start (10);
2819
2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2821 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2824 }
2825
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2827 incr_buf_fill += ct.nitems;
2828
2829 goto bailout;
2830 }
2831
2832 char **cl;
2833 int cr;
2834
2835#if !ENABLE_MINIMAL
2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2837 // so recode it manually
2838 if (ct.encoding == xa[XA_UTF8_STRING])
2839 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w);
2842 free (w);
2843 // TODO: strlen == only the first element will be converted. well...
2844 paste (s, strlen (s));
2845 free (s);
2846 }
2847 else
2848#endif
2849 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2850 && cl)
2851 {
2852 for (int i = 0; i < cr; i++)
2853 paste (cl[i], strlen (cl[i]));
2854
2855 XFreeStringList (cl);
2856 }
2857 else
2858 paste ((char *)ct.value, ct.nitems); // paste raw
2859
2860bailout:
2861 XFree (ct.value);
2862
2863 if (selection_wait == Sel_normal)
2864 selection_wait = Sel_none;
2865}
2866
2867void
2868rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2869{
2870 selection_wait = Sel_none;
2871
2872 incr_buf_size = 0;
2873 free (incr_buf);
2874
2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2876}
2877
2878void
2879rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2880{
2881 if (prop == None || selection_wait != Sel_incr)
2882 return; 2735 return;
2883 2736
2884 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2885} 2738}
2886 2739
2887/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2888/* 2741/*
2889 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2890 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2891 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2892 * > CUT_BUFFER0
2893 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2894 * will auto fallback to CUT_BUFFER0
2895 * EXT: button 2 release 2745 * EXT: button 2 release
2896 */ 2746 */
2897void 2747void
2898rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2899{ 2749{
2900 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2901 {
2902 /* internal selection */
2903 char *str = rxvt_wcstombs (selection.text, selection.len);
2904 paste (str, strlen (str));
2905 free (str);
2906 return;
2907 } 2751 {
2908 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2909 { 2754 }
2910 selection_request_time = tm;
2911 selection_wait = Sel_normal;
2912
2913#if X_HAVE_UTF8_STRING
2914 selection_type = Sel_UTF8String;
2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2916 return;
2917#else
2918 selection_type = Sel_CompoundText;
2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2920 return;
2921#endif
2922 }
2923
2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
2926}
2927
2928int
2929rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2930{
2931 Atom sel;
2932
2933 selection_type |= selnum;
2934
2935 if (selnum == Sel_Primary)
2936 sel = XA_PRIMARY;
2937 else if (selnum == Sel_Secondary)
2938 sel = XA_SECONDARY;
2939 else
2940 sel = xa[XA_CLIPBOARD];
2941
2942 if (XGetSelectionOwner (dpy, sel) != None)
2943 {
2944 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2945 vt, selection_request_time);
2946 return 1;
2947 }
2948
2949 return 0;
2950} 2755}
2951 2756
2952/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2953/* 2758/*
2954 * Clear all selected text 2759 * Clear all selected text
… …
2977 if (display->clipboard_owner == this) 2782 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0; 2783 display->clipboard_owner = 0;
2979 } 2784 }
2980} 2785}
2981 2786
2982void
2983rxvt_term::clipboard_copy (Time tm)
2984{
2985 if (selection.len > 0)
2986 {
2987 free (selection.clip_text);
2988 selection.clip_len = selection.len;
2989 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2990 memcpy (selection.clip_text, selection.text,
2991 sizeof (wchar_t) * selection.clip_len);
2992 selection_grab (tm, true);
2993 }
2994}
2995
2996/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2997/* 2788/*
2998 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2999 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
3000 */ 2791 */
3001void 2792void
3002rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
3003{ 2794{
3004 int i; 2795 int size;
3005 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
3006 text_t *t; 2797 text_t *t;
3007 2798
3008 switch (selection.op) 2799 switch (selection.op)
3009 { 2800 {
… …
3025 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
3026 2817
3027 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)))
3028 return; 2819 return;
3029 2820
3030 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031 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));
3032 2823
3033 int ofs = 0; 2824 int ofs = 0;
3034 int extra = 0; 2825 int extra = 0;
3035 2826
3036 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
3042 { 2833 {
3043#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
3044 if (selection.rect) 2835 if (selection.rect)
3045 { 2836 {
3046 col = selection.beg.col; 2837 col = selection.beg.col;
3047 end_col = ncol + 1; 2838 end_col = selection.end.col;
3048 } 2839 }
3049 else 2840 else
3050#endif 2841#endif
3051 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
3052 2843
3053 col = max (col, 0); 2844 col = max (col, 0);
3054 2845
3055 if (row == selection.end.row 2846 if (row == selection.end.row)
3056#if !ENABLE_MINIMAL
3057 || selection.rect
3058#endif
3059 )
3060 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
3061 2848
3062 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
3063 2850
3064 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3072 2859
3073 extra -= (len - 1); 2860 extra -= (len - 1);
3074 2861
3075 if (extra < 0) 2862 if (extra < 0)
3076 { 2863 {
3077 extra += i; 2864 extra += size;
3078 i += i; 2865 size += size;
3079 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));
3080 } 2867 }
3081 2868
3082 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083 } 2870 }
3084#endif 2871#endif
… …
3096 2883
3097 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3098 } 2885 }
3099 else 2886 else
3100#endif 2887#endif
3101 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))
3102 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3103 } 2892 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 2893
3108 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3109 2895
3110 if (ofs == 0) 2896 if (ofs == 0)
3111 { 2897 {
… …
3617 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3618 */ 3404 */
3619void 3405void
3620rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3621{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3622 XSelectionEvent ev; 3409 XSelectionEvent ev;
3623 3410
3624 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3625 ev.property = None; 3412 ev.property = None;
3626 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3641 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3642#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3643 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3644#endif 3431#endif
3645 3432
3646 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3647 32, PropModeReplace, 3434 32, PropModeReplace,
3648 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3649 ev.property = rq.property; 3436 ev.property = property;
3650 } 3437 }
3651#if TODO // TODO 3438#if TODO // TODO
3652 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3653 { 3440 {
3654 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3655 } 3442 }
3656#endif 3443#endif
3657 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)
3658 { 3445 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property; 3448 ev.property = property;
3662 } 3449 }
3663 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)
3664 { 3451 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3453 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3667 ev.property = rq.property; 3454 ev.property = property;
3668 } 3455 }
3669 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3670 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3671 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3672 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3743 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3744 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3745 ct.encoding = target; 3532 ct.encoding = target;
3746 } 3533 }
3747 3534
3748 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3749 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3750 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3751 ev.property = rq.property; 3538 ev.property = property;
3752 3539
3753 if (freect) 3540 if (freect)
3754 XFree (ct.value); 3541 XFree (ct.value);
3755 } 3542 }
3756 3543

Diff Legend

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