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.160 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC

… …
441 */ 441 */
442void 442void
443rxvt_term::scr_release () 443rxvt_term::scr_release ()
444{ 444{
445 unsigned int total_rows; 445 unsigned int total_rows;
446 int i;
447 446
448 total_rows = TermWin.nrow + TermWin.saveLines; 447 total_rows = TermWin.nrow + TermWin.saveLines;
449 448
450 delete talloc; talloc = 0; 449 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 450 delete ralloc; ralloc = 0;
… …
773 * Add text given in <str> of length <len> to screen struct 772 * Add text given in <str> of length <len> to screen struct
774 */ 773 */
775void 774void
776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 775rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
777{ 776{
777 if (len <= 0) /* sanity */
778 return;
779
778 unsigned char checksel; 780 unsigned char checksel;
779 unicode_t c; 781 unicode_t c;
780 int i, row, last_col; 782 int row, last_col;
781 text_t *stp; 783 text_t *stp;
782 rend_t *srp; 784 rend_t *srp;
783 785 const unicode_t *strend = str + len;
784 if (len <= 0) /* sanity */
785 return;
786 786
787 want_refresh = 1; 787 want_refresh = 1;
788 ZERO_SCROLLBACK (); 788 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol; 789 last_col = TermWin.ncol;
790 790
… …
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 815 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 816
817 stp = screen.text[row]; 817 stp = screen.text[row];
818 srp = screen.rend[row]; 818 srp = screen.rend[row];
819 819
820 while (len--) 820 while (str < strend)
821 { 821 {
822 c = *str++; 822 c = *str++;
823 823
824 if (c < 0x20) 824 if (c < 0x20)
825 switch (c) 825 if (c == C0_LF)
826 {
827 if (screen.tlen[row] != -1) /* XXX: think about this */
828 MAX_IT (screen.tlen[row], screen.cur.col);
829
830 screen.flags &= ~Screen_WrapNext;
831
832 if (screen.cur.row == screen.bscroll)
833 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
834 else if (screen.cur.row < (TermWin.nrow - 1))
835 row = (++screen.cur.row) + TermWin.saveLines;
836
837 stp = screen.text[row]; /* _must_ refresh */
838 srp = screen.rend[row]; /* _must_ refresh */
839 continue;
840 }
841 else if (c == C0_CR)
826 { 842 {
827 case C0_HT:
828 scr_tab (1, true);
829 continue;
830
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */ 843 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col); 844 MAX_IT (screen.tlen[row], screen.cur.col);
834 845
835 screen.flags &= ~Screen_WrapNext; 846 screen.flags &= ~Screen_WrapNext;
836
837 if (screen.cur.row == screen.bscroll)
838 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
839 else if (screen.cur.row < (TermWin.nrow - 1))
840 row = (++screen.cur.row) + TermWin.saveLines;
841
842 stp = screen.text[row]; /* _must_ refresh */
843 srp = screen.rend[row]; /* _must_ refresh */
844 continue;
845
846 case C0_CR:
847 if (screen.tlen[row] != -1) /* XXX: think about this */
848 MAX_IT (screen.tlen[row], screen.cur.col);
849
850 screen.flags &= ~Screen_WrapNext;
851 screen.cur.col = 0; 847 screen.cur.col = 0;
852 continue; 848 continue;
849 }
850 else if (c == C0_HT)
851 {
852 scr_tab (1, true);
853 continue;
853 } 854 }
854 855
855 if (checksel /* see if we're writing within selection */ 856 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
867 868
868 if (screen.flags & Screen_WrapNext) 869 if (screen.flags & Screen_WrapNext)
869 { 870 {
870 screen.tlen[row] = -1; 871 screen.tlen[row] = -1;
871 872
873 scr_do_wrap ();
874
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 875 row = screen.cur.row + TermWin.saveLines;
873
874 stp = screen.text[row]; /* _must_ refresh */ 876 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */ 877 srp = screen.rend[row]; /* _must_ refresh */
876 } 878 }
877 879
880 // some utf-8 decoders "decode" surrogate characters: let's fix this.
881 if (IN_RANGE (c, 0xd800, 0xdfff))
882 c = 0xfffd;
883
878 // rely on wcwidth to tell us the character width, at least for non-latin1 884 // rely on wcwidth to tell us the character width, at least for non-latin1
879 // do wcwidth before further replacements, as wcwidth says that line-drawing 885 // do wcwidth before further replacements, as wcwidth might return -1
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 886 // for the line drawing characters below as they might be invalid in the current
887 // locale.
881 int width = c < 0x100 ? 1 : wcwidth (c); 888 int width = c < 0x100 ? 1 : wcwidth (c);
882 889
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 890 if (charsets[screen.charset] == '0') // DEC SPECIAL
884 { 891 {
885 // vt100 special graphics and line drawing 892 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 893 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 894 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 895 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 896 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 897 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 898 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 899 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 900 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 901 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 902 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 903 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 904 };
898 905
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 906 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 907 {
901 c = vt100_0[c - 0x40]; 908 c = vt100_0[c - 0x41];
902 width = 1; 909 width = 1; // vt100 line drawing characters are always single-width
903 } 910 }
904 } 911 }
905 912
906 if (screen.flags & Screen_Insert) 913 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 914 scr_insdel_chars (width, INSERT);
908 915
909 if (width != 0) 916 if (width != 0)
910 { 917 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 918#if !UNICODE_3
916 // trim characters we can't store directly :( 919 // trim characters we can't store directly :(
917 if (c >= 0x10000) 920 if (c >= 0x10000)
918# if ENABLE_COMBINING 921# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 922 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
942 col++; 945 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 946 } while (col < TermWin.ncol && stp[col] == NOCHAR);
944 } 947 }
945 948
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 949 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
950
951 // if the character doesn't fit into the remaining columns...
952 if (screen.cur.col > last_col - width && last_col >= width)
953 {
954 // ...output spaces
955 c = ' ';
956 // and try the same character next loop iteration
957 --str;
958 }
947 959
948 do 960 do
949 { 961 {
950 stp[screen.cur.col] = c; 962 stp[screen.cur.col] = c;
951 srp[screen.cur.col] = rend; 963 srp[screen.cur.col] = rend;
… …
970 { 982 {
971 stp[c] = ' '; 983 stp[c] = ' ';
972 srp[c] = rend; 984 srp[c] = rend;
973 } 985 }
974 } 986 }
975 else if (width == 0) 987 else // width == 0
976 { 988 {
977#if ENABLE_COMBINING 989#if ENABLE_COMBINING
978 // handle combining characters 990 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 991 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 992 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 993 // we don't handle double-width characters nicely yet.
982
983 text_t *tp; 994 text_t *tp;
984 rend_t *rp; 995 rend_t *rp;
985 996
986 if (screen.cur.col > 0) 997 if (screen.cur.col > 0)
987 { 998 {
… …
1397rxvt_term::scr_erase_savelines () 1408rxvt_term::scr_erase_savelines ()
1398{ 1409{
1399 want_refresh = 1; 1410 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1411 ZERO_SCROLLBACK ();
1401 1412
1402 for (int i = 0; i < TermWin.saveLines; ++i) 1413 TermWin.nscrolled = 0;
1403 if (screen.text [i])
1404 {
1405 screen.tlen[i] = 0;
1406 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1407 }
1408} 1414}
1409#endif 1415#endif
1410 1416
1411/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1412/* 1418/*
… …
1941/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1942void 1948void
1943rxvt_term::scr_bell () 1949rxvt_term::scr_bell ()
1944{ 1950{
1945#ifndef NO_BELL 1951#ifndef NO_BELL
1952
1946# ifndef NO_MAPALERT 1953# ifndef NO_MAPALERT
1947# ifdef MAPALERT_OPTION 1954# ifdef MAPALERT_OPTION
1948 if (options & Opt_mapAlert) 1955 if (options & Opt_mapAlert)
1949# endif 1956# endif
1950 XMapWindow (display->display, TermWin.parent[0]); 1957 XMapWindow (display->display, TermWin.parent[0]);
1951# endif 1958# endif
1959
1952 if (options & Opt_visualBell) 1960 if (options & Opt_visualBell)
1953 { 1961 {
1954 scr_rvideo_mode (!rvideo); /* refresh also done */ 1962 scr_rvideo_mode (!rvideo); /* refresh also done */
1963 rxvt_usleep (VISUAL_BELL_DURATION);
1955 scr_rvideo_mode (!rvideo); /* refresh also done */ 1964 scr_rvideo_mode (!rvideo); /* refresh also done */
1956 } 1965 }
1957 else 1966 else
1958 XBell (display->display, 0); 1967 XBell (display->display, 0);
1968
1959#endif 1969#endif
1960} 1970}
1961 1971
1962/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1963/* ARGSUSED */ 1973/* ARGSUSED */
… …
2018/* 2028/*
2019 * Refresh the screen 2029 * Refresh the screen
2020 * drawn_text/drawn_rend contain the screen information before the update. 2030 * drawn_text/drawn_rend contain the screen information before the update.
2021 * screen.text/screen.rend contain what the screen will change to. 2031 * screen.text/screen.rend contain what the screen will change to.
2022 */ 2032 */
2023
2024#define FONT_WIDTH(X, Y) \
2025 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2026#define FONT_RBEAR(X, Y) \
2027 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2028#define FONT_LBEAR(X, Y) \
2029 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2030#define IS_FONT_CHAR(X, Y) \
2031 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2032
2033void 2033void
2034rxvt_term::scr_refresh (unsigned char refresh_type) 2034rxvt_term::scr_refresh (unsigned char refresh_type)
2035{ 2035{
2036 unsigned char must_clear, /* use draw_string not draw_image_string */ 2036 unsigned char must_clear, /* use draw_string not draw_image_string */
2037 showcursor; /* show the cursor */ 2037 showcursor; /* show the cursor */
… …
2056 refresh_count = 0; 2056 refresh_count = 0;
2057 2057
2058 row_offset = TermWin.saveLines - TermWin.view_start; 2058 row_offset = TermWin.saveLines - TermWin.view_start;
2059 2059
2060#if XPM_BACKGROUND 2060#if XPM_BACKGROUND
2061 must_clear |= (bgPixmap.pixmap != None); 2061 must_clear |= bgPixmap.pixmap != None;
2062#endif 2062#endif
2063#if TRANSPARENT 2063#if TRANSPARENT
2064 must_clear |= ((options & Opt_transparent) && am_transparent); 2064 must_clear |= (options & Opt_transparent) && am_transparent;
2065#endif 2065#endif
2066 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2066 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2067 2067
2068 /* 2068 /*
2069 * B: reverse any characters which are selected 2069 * B: reverse any characters which are selected
… …
2093 2093
2094 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2094 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2095 2095
2096 if (showcursor && TermWin.focus) 2096 if (showcursor && TermWin.focus)
2097 { 2097 {
2098 if (options & Opt_cursorUnderline)
2099 *crp ^= RS_Uline;
2100 else
2101 {
2098 *crp ^= RS_RVid; 2102 *crp ^= RS_RVid;
2103
2099#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2100 cc1 = *crp & (RS_fgMask | RS_bgMask); 2105 cc1 = *crp & (RS_fgMask | RS_bgMask);
2101 if (ISSET_PIXCOLOR (Color_cursor)) 2106 if (ISSET_PIXCOLOR (Color_cursor))
2102 ccol1 = Color_cursor; 2107 ccol1 = Color_cursor;
2103 else 2108 else
2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2105 ccol1 = GET_FGCOLOR (rstyle); 2110 ccol1 = GET_FGCOLOR (rstyle);
2106#else 2111#else
2107 ccol1 = Color_fg; 2112 ccol1 = Color_fg;
2108#endif 2113#endif
2109 if (ISSET_PIXCOLOR (Color_cursor2)) 2114 if (ISSET_PIXCOLOR (Color_cursor2))
2110 ccol2 = Color_cursor2; 2115 ccol2 = Color_cursor2;
2111 else 2116 else
2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2117#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2113 ccol2 = GET_BGCOLOR (rstyle); 2118 ccol2 = GET_BGCOLOR (rstyle);
2114#else 2119#else
2115 ccol2 = Color_bg; 2120 ccol2 = Color_bg;
2116#endif 2121#endif
2117 *crp = SET_FGCOLOR (*crp, ccol1); 2122 *crp = SET_FGCOLOR (*crp, ccol1);
2118 *crp = SET_BGCOLOR (*crp, ccol2); 2123 *crp = SET_BGCOLOR (*crp, ccol2);
2119#endif 2124#endif
2125 }
2120 } 2126 }
2121 } 2127 }
2122 2128
2123 /* make sure no outline cursor is left around */ 2129 /* make sure no outline cursor is left around */
2124 setoldcursor = 0; 2130 setoldcursor = 0;
… …
2154 2160
2155#if ENABLE_OVERLAY 2161#if ENABLE_OVERLAY
2156 scr_swap_overlay (); 2162 scr_swap_overlay ();
2157#endif 2163#endif
2158 2164
2159 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2160 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2161
2162#ifndef NO_SLOW_LINK_SUPPORT 2165#ifndef NO_SLOW_LINK_SUPPORT
2163 /* 2166 /*
2164 * D: CopyArea pass - very useful for slower links 2167 * D: CopyArea pass - very useful for slower links
2165 * This has been deliberately kept simple. 2168 * This has been deliberately kept simple.
2166 */ 2169 */
… …
2301 2304
2302 // sometimes we optimize away the trailing NOCHAR's, add them back 2305 // sometimes we optimize away the trailing NOCHAR's, add them back
2303 while (i && text[count] == NOCHAR) 2306 while (i && text[count] == NOCHAR)
2304 count++, i--; 2307 count++, i--;
2305 2308
2306#if ENABLE_STYLES
2307 // force redraw after "careful" characters to avoid pixel droppings
2308 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2309 drp[col + 1] = ~srp[col + 1];
2310
2311 // include previous careful character(s) if possible, looks nicer (best effort...)
2312 while (text > stp
2313 && srp[text - stp - 1] & RS_Careful
2314 && RS_SAME (rend, srp[text - stp - 1]))
2315 text--, count++, xpixel -= TermWin.fwidth;
2316#endif
2317
2318 /* 2309 /*
2319 * Determine the attributes for the string 2310 * Determine the attributes for the string
2320 */ 2311 */
2321 int fore = GET_FGCOLOR (rend); // desired foreground 2312 int fore = GET_FGCOLOR (rend); // desired foreground
2322 int back = GET_BGCOLOR (rend); // desired background 2313 int back = GET_BGCOLOR (rend); // desired background
2323 2314
2324 // only do special processing if ana attributes are set, which is rare 2315 // only do special processing if any attributes are set, which is rare
2325 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2316 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2326 { 2317 {
2318#if ENABLE_STYLES
2319 // force redraw after "careful" characters to avoid pixel droppings
2320 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2321 drp[col + 1] = ~srp[col + 1];
2322
2323 // include previous careful character(s) if possible, looks nicer (best effort...)
2324 while (text > stp
2325 && srp[text - stp - 1] & RS_Careful
2326 && RS_SAME (rend, srp[text - stp - 1]))
2327 text--, count++, xpixel -= TermWin.fwidth;
2328#endif
2329
2327 bool invert = rend & RS_RVid; 2330 bool invert = rend & RS_RVid;
2328 2331
2329#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2330 if (rend & RS_Bold 2333 if (rend & RS_Bold
2331 && fore == Color_fg) 2334 && fore == Color_fg)
… …
2358 SWAP_IT (fore, back, int); 2361 SWAP_IT (fore, back, int);
2359 2362
2360#ifndef NO_BOLD_UNDERLINE_REVERSE 2363#ifndef NO_BOLD_UNDERLINE_REVERSE
2361 if (ISSET_PIXCOLOR (Color_RV)) 2364 if (ISSET_PIXCOLOR (Color_RV))
2362 back = Color_RV; 2365 back = Color_RV;
2366
2367 if (fore == back)
2368 {
2369 fore = Color_bg;
2370 back = Color_fg;
2371 }
2363#endif 2372#endif
2364 } 2373 }
2365 2374
2366#ifdef TEXT_BLINK 2375#ifdef TEXT_BLINK
2367 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2376 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2430 */ 2439 */
2431 if (showcursor) 2440 if (showcursor)
2432 { 2441 {
2433 if (TermWin.focus) 2442 if (TermWin.focus)
2434 { 2443 {
2444 if (options & Opt_cursorUnderline)
2445 *crp ^= RS_Uline;
2446 else
2447 {
2435 *crp ^= RS_RVid; 2448 *crp ^= RS_RVid;
2436#ifndef NO_CURSORCOLOR 2449#ifndef NO_CURSORCOLOR
2437 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2450 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2438#endif 2451#endif
2452 }
2439 } 2453 }
2440 else if (oldcursor.row >= 0) 2454 else if (oldcursor.row >= 0)
2441 { 2455 {
2456 int cursorwidth = 1;
2457 int col = oldcursor.col;
2458
2459 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2460 col--;
2461
2462 while (col + cursorwidth < TermWin.ncol
2463 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2464 cursorwidth++;
2465
2442#ifndef NO_CURSORCOLOR 2466#ifndef NO_CURSORCOLOR
2443 if (ISSET_PIXCOLOR (Color_cursor)) 2467 if (ISSET_PIXCOLOR (Color_cursor))
2444 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2468 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2445#endif 2469#endif
2446 int cursorwidth = 1;
2447 while (oldcursor.col + cursorwidth < TermWin.ncol
2448 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2449 cursorwidth++;
2450 2470
2451 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2471 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2452 Col2Pixel (oldcursor.col), 2472 Col2Pixel (col),
2453 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2454 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2455 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2456 } 2476 }
2457 } 2477 }
… …
2528 if (!TermWin.mapped) 2548 if (!TermWin.mapped)
2529 return; 2549 return;
2530 2550
2531 num_scr_allow = 0; 2551 num_scr_allow = 0;
2532 want_refresh = 1; 2552 want_refresh = 1;
2533
2534#if TRANSPARENT
2535 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2536 {
2537 int i;
2538
2539 if (!(options & Opt_transparent_all))
2540 i = 0;
2541 else
2542 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2543
2544 while (i--)
2545 if (TermWin.parent[i] != None)
2546 XClearWindow (display->display, TermWin.parent[i]);
2547 }
2548#endif
2549 2553
2550 if (really) 2554 if (really)
2551 XClearWindow (display->display, TermWin.vt); 2555 XClearWindow (display->display, TermWin.vt);
2552} 2556}
2553 2557
… …
2916 2920
2917int 2921int
2918rxvt_term::selection_request_other (Atom target, int selnum) 2922rxvt_term::selection_request_other (Atom target, int selnum)
2919{ 2923{
2920 Atom sel; 2924 Atom sel;
2921#ifdef DEBUG_SELECT
2922 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2923#endif
2924 2925
2925 selection_type |= selnum; 2926 selection_type |= selnum;
2926 2927
2927 if (selnum == Sel_Primary) 2928 if (selnum == Sel_Primary)
2928 sel = XA_PRIMARY; 2929 sel = XA_PRIMARY;
… …
3803 while (*s) 3804 while (*s)
3804 scr_overlay_set (x++, y, *s++); 3805 scr_overlay_set (x++, y, *s++);
3805} 3806}
3806 3807
3807void 3808void
3809rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3810{
3811 while (*s)
3812 {
3813 text_t t = *s++;
3814 int width = wcwidth (t);
3815
3816 while (width--)
3817 {
3818 scr_overlay_set (x++, y, t);
3819 t = NOCHAR;
3820 }
3821 }
3822}
3823
3824void
3808rxvt_term::scr_swap_overlay () 3825rxvt_term::scr_swap_overlay ()
3809{ 3826{
3810 if (!ov_text) 3827 if (!ov_text)
3811 return; 3828 return;
3812 3829

Diff Legend

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