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.31 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.54 by pcg, Thu Mar 11 00:53:19 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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-2004 Marc Lehmann <pcg@goof.com>
6 * 7 *
7 * 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
8 * 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
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
… …
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 33
32#include <stdint.h> 34#include <stdint.h>
33#include <wchar.h> 35#include <wchar.h>
34 36
35#include "salloc.C" // HACK!! 37#include "salloc.C" // HACK, should be a seperate compile!
36 38
37inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
38{ 40{
39 while (len--) 41 while (len--)
40 *start++ = value; 42 *start++ = value;
… …
762 * Add text given in <str> of length <len> to screen struct 764 * Add text given in <str> of length <len> to screen struct
763 */ 765 */
764void 766void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
766{ 768{
767 unsigned char checksel, clearsel; 769 unsigned char checksel, clearsel;
768 uint32_t c; 770 uint32_t c;
769 int i, row, last_col; 771 int i, row, last_col;
770 text_t *stp; 772 text_t *stp;
771 rend_t *srp; 773 rend_t *srp;
772 774
773 if (len <= 0) /* sanity */ 775 if (len <= 0) /* sanity */
774 return; 776 return;
775 777
776 want_refresh = 1; 778 want_refresh = 1;
… …
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 846 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 847 {
846 checksel = 0; 848 checksel = 0;
847 clearsel = 1; 849 clearsel = 1;
848 } 850 }
851
849 if (screen.flags & Screen_WrapNext) 852 if (screen.flags & Screen_WrapNext)
850 { 853 {
851 screen.tlen[row] = -1; 854 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 855 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1)) 857 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines; 858 row = (++screen.cur.row) + TermWin.saveLines;
859
856 stp = screen.text[row]; /* _must_ refresh */ 860 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 861 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 862 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext; 863 screen.flags &= ~Screen_WrapNext;
860 } 864 }
865
861 if (screen.flags & Screen_Insert) 866 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 867 scr_insdel_chars (1, INSERT);
868
869 if (IS_COMPOSE (c))
870 c = REPLACEMENT_CHAR;
871
872 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c);
863 876
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 877 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c) 878 switch (c)
866 { 879 {
867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 880 // vt100 special graphics and line drawing
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 885 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 886 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 887 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 888 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 889 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
890 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 891 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
878 } 892 }
893
879 894
880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
881 // rely on wcwidth to tell us the character width, at least for non-ascii
882 int width = c <= 128 ? 1 : wcwidth (c);
883
884 // width -1 characters (e.g. combining chars) are ignored currently.
885 if (width > 0) 895 if (width > 0)
896 {
897#if !UNICODE_3
898 // trim characters we can't store directly :(
899 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
903
886 do 904 do
887 { 905 {
888 stp[screen.cur.col] = c; 906 stp[screen.cur.col] = c;
889 srp[screen.cur.col] = rend; 907 srp[screen.cur.col] = rend;
890 908
891 if (screen.cur.col < last_col - 1) 909 if (screen.cur.col < last_col - 1)
892 screen.cur.col++; 910 screen.cur.col++;
893 else 911 else
894 { 912 {
895 screen.tlen[row] = last_col; 913 screen.tlen[row] = last_col;
896 if (screen.flags & Screen_Autowrap) 914 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 915 screen.flags |= Screen_WrapNext;
898 break; 916 break;
899 } 917 }
900 918
901 c = NOCHAR; 919 c = NOCHAR;
902 } 920 }
903 while (--width > 0); 921 while (--width > 0);
922
923 // pad with spaces when overwriting wide character with smaller one
924 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
925 {
926 stp[c] = ' ';
927 srp[c] = rend;
928 }
929 }
930 else if (width == 0)
931 {
932#if ENCODING_COMPOSE
933 // handle combining characters
934 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet.
937
938 text_t *tp;
939 rend_t *rp;
940
941 if (screen.cur.col > 0)
942 {
943 tp = stp + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1;
945 }
946 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
948 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
951 }
904 else 952 else
905 (void)0; /* handle combining character etc. here. */ 953 continue;
954
955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958
959 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c);
963
964 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
966#endif
967 }
906 } 968 }
907 969
908 if (screen.tlen[row] != -1) /* XXX: think about this */ 970 if (screen.tlen[row] != -1) /* XXX: think about this */
909 MAX_IT (screen.tlen[row], screen.cur.col); 971 MAX_IT (screen.tlen[row], screen.cur.col);
910 972
… …
1090 else 1152 else
1091 screen.cur.row = row; 1153 screen.cur.row = row;
1092 } 1154 }
1093 MAX_IT (screen.cur.row, 0); 1155 MAX_IT (screen.cur.row, 0);
1094 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1156 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1157
1158 while (screen.cur.col > 0
1159 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1160 screen.cur.col--;
1095} 1161}
1096 1162
1097/* ------------------------------------------------------------------------- */ 1163/* ------------------------------------------------------------------------- */
1098/* 1164/*
1099 * direction should be UP or DN 1165 * direction should be UP or DN
… …
1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1901 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1836 1902
1837void 1903void
1838rxvt_term::scr_refresh (unsigned char refresh_type) 1904rxvt_term::scr_refresh (unsigned char refresh_type)
1839{ 1905{
1840 unsigned char clearfirst, /* first character writes before cell */ 1906 unsigned char clearfirst, /* first character writes before cell */
1841 clearlast, /* last character writes beyond cell */ 1907 clearlast, /* last character writes beyond cell */
1842 must_clear, /* use draw_string not draw_image_string */ 1908 must_clear, /* use draw_string not draw_image_string */
1843 rvid, /* reverse video this position */ 1909 rvid, /* reverse video this position */
1844 showcursor; /* show the cursor */ 1910 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 1911 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 1912 ocrow; /* old cursor row */
1847 int cursorwidth;
1848 int i, /* tmp */ 1913 int i, /* tmp */
1849 row_offset; /* basic offset in screen structure */ 1914 row_offset; /* basic offset in screen structure */
1850#ifndef NO_CURSORCOLOR 1915#ifndef NO_CURSORCOLOR
1851 rend_t cc1; /* store colours at cursor position (s) */ 1916 rend_t cc1; /* store colours at cursor position (s) */
1852#endif 1917#endif
1853 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1918 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1854 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1919 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1855 1920
1856 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1921 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1857 return; 1922 return;
1858 1923
1859 /* 1924 /*
… …
1891 unsigned char setoldcursor; 1956 unsigned char setoldcursor;
1892 rend_t ccol1, /* Cursor colour */ 1957 rend_t ccol1, /* Cursor colour */
1893 ccol2; /* Cursor colour2 */ 1958 ccol2; /* Cursor colour2 */
1894 1959
1895 showcursor = (screen.flags & Screen_VisibleCursor); 1960 showcursor = (screen.flags & Screen_VisibleCursor);
1896 cursorwidth = 0;
1897#ifdef CURSOR_BLINK 1961#ifdef CURSOR_BLINK
1898 if (hidden_cursor) 1962 if (hidden_cursor)
1899 showcursor = 0; 1963 showcursor = 0;
1900#endif 1964#endif
1901 1965
1902 cursorwidth = 0;
1903
1904 if (showcursor) 1966 if (showcursor)
1905 { 1967 {
1906 cursorwidth++;
1907
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1968 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1909 [screen.cur.col]); 1969 [screen.cur.col]);
1910 1970
1911 if (showcursor && TermWin.focus) 1971 if (showcursor && TermWin.focus)
1912 { 1972 {
… …
1930 ccol2 = Color_bg; 1990 ccol2 = Color_bg;
1931#endif 1991#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 1992 *srp = SET_FGCOLOR (*srp, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 1993 *srp = SET_BGCOLOR (*srp, ccol2);
1934#endif 1994#endif
1935
1936 } 1995 }
1937 } 1996 }
1938 1997
1939 /* make sure no outline cursor is left around */ 1998 /* make sure no outline cursor is left around */
1940 setoldcursor = 0; 1999 setoldcursor = 0;
… …
2053 int ypixel = (int)Row2Pixel (row); 2112 int ypixel = (int)Row2Pixel (row);
2054 2113
2055 for (col = 0; col < TermWin.ncol; col++) 2114 for (col = 0; col < TermWin.ncol; col++)
2056 { 2115 {
2057 /* compare new text with old - if exactly the same then continue */ 2116 /* compare new text with old - if exactly the same then continue */
2117 if (stp[col] == dtp[col] /* Must match characters to skip. */
2118 && (srp[col] == drp[col] /* Either rendition the same or */
2119 || (stp[col] == ' ' /* space w/ no background change */
2120 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2121 continue;
2122
2123 // redraw one or more characters
2124
2125 // seek to the beginning if wide characters
2126 while (stp[col] == NOCHAR && col > 0)
2127 --col;
2128
2058 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2129 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2059
2060 if (stp[col] == dtp[col] /* Must match characters to skip. */
2061 && (rend == drp[col] /* Either rendition the same or */
2062 || (stp[col] == ' ' /* space w/ no background change */
2063 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2064 continue;
2065
2066 text_t *text = stp + col; 2130 text_t *text = stp + col;
2067 int count = 1; 2131 int count = 1;
2068 2132
2069 /* redraw one or more characters */
2070
2071 dtp[col] = stp[col]; 2133 dtp[col] = stp[col];
2072 drp[col] = rend; 2134 drp[col] = rend;
2073
2074 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2075 continue;
2076 2135
2077 int xpixel = Col2Pixel (col); 2136 int xpixel = Col2Pixel (col);
2078 2137
2079 // this loop looks very messy, it can probably be optimized 2138 // this loop looks very messy, it can probably be optimized
2080 // and cleaned a bit by you? 2139 // and cleaned a bit by you?
… …
2121 int fore = GET_FGCOLOR (rend); // desired foreground 2180 int fore = GET_FGCOLOR (rend); // desired foreground
2122 int back = GET_BGCOLOR (rend); // desired background 2181 int back = GET_BGCOLOR (rend); // desired background
2123 2182
2124 rend = GET_ATTR (rend); 2183 rend = GET_ATTR (rend);
2125 2184
2126 rvid = !! (rend & RS_RVid); 2185 rvid = !!(rend & RS_RVid);
2186
2187#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (rend & RS_Bold && fore == Color_fg)
2189 {
2190 if (ISSET_PIXCOLOR (Color_BD))
2191 fore = Color_BD;
2192 else
2193 rvid = !rvid;
2194 }
2195
2196 if (rend & RS_Uline)
2197 {
2198 if (ISSET_PIXCOLOR (Color_UL))
2199 fore = Color_UL;
2200 }
2201#endif
2202
2127 if (rvid) 2203 if (rvid)
2128 { 2204 {
2129 SWAP_IT (fore, back, int); 2205 SWAP_IT (fore, back, int);
2130 2206
2131#ifndef NO_BOLD_UNDERLINE_REVERSE 2207#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2134 && !ISSET_PIXCOLOR (Color_cursor) 2210 && !ISSET_PIXCOLOR (Color_cursor)
2135# endif 2211# endif
2136 ) 2212 )
2137 back = Color_RV; 2213 back = Color_RV;
2138#endif 2214#endif
2139
2140 } 2215 }
2216
2141#ifdef TEXT_BLINK 2217#ifdef TEXT_BLINK
2142 if (rend & RS_Blink) 2218 if (rend & RS_Blink && back == Color_bg)
2143 { 2219 {
2144 if (!text_blink_ev.active) 2220 if (!text_blink_ev.active)
2145 { 2221 {
2146 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2222 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2147 hidden_text = 0; 2223 hidden_text = 0;
2148 } 2224 }
2149 else if (hidden_text) 2225 else if (hidden_text)
2150 fore = back; 2226 fore = back;
2151 } 2227 }
2152#endif 2228#endif
2153#ifndef NO_BOLD_UNDERLINE_REVERSE
2154 else if (rend & RS_Bold)
2155 {
2156 if (ISSET_PIXCOLOR (Color_BD))
2157 fore = Color_BD;
2158 else if (fore == Color_fg)
2159 fore = Color_White;
2160 }
2161 else if (rend & RS_Uline)
2162 {
2163 if (ISSET_PIXCOLOR (Color_UL))
2164 fore = Color_UL;
2165 }
2166#endif
2167 2229
2168 /* 2230 /*
2169 * Actually do the drawing of the string here 2231 * Actually do the drawing of the string here
2170 */ 2232 */
2171 rxvt_font *font = (*TermWin.fontset)[fid]; 2233 rxvt_font *font = (*TermWin.fontset)[fid];
2172 2234
2173 if (back == fore) 2235 if (back == fore)
2174 font->clear_rect (xpixel, ypixel, 2236 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2175 TermWin.fwidth * count, TermWin.fheight, 2237 TermWin.fwidth * count, TermWin.fheight,
2176 back); 2238 back);
2177 else if (back == Color_bg) 2239 else if (back == Color_bg)
2178 { 2240 {
2179 if (must_clear) 2241 if (must_clear)
… …
2181 CLEAR_CHARS (xpixel, ypixel, count); 2243 CLEAR_CHARS (xpixel, ypixel, count);
2182 2244
2183 for (i = 0; i < count; i++) /* don't draw empty strings */ 2245 for (i = 0; i < count; i++) /* don't draw empty strings */
2184 if (text[i] != ' ') 2246 if (text[i] != ' ')
2185 { 2247 {
2186 font->draw (xpixel, ypixel, text, count, fore, -1); 2248 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2187 break; 2249 break;
2188 } 2250 }
2189 } 2251 }
2190 else 2252 else
2191 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2253 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2192 } 2254 }
2193 else 2255 else
2194 font->draw (xpixel, ypixel, text, count, fore, back); 2256 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2195 2257
2196 if ((rend & RS_Uline) && (font->descent > 1)) 2258 if ((rend & RS_Uline) && (font->descent > 1))
2197 XDrawLine (display->display, drawBuffer, TermWin.gc, 2259 XDrawLine (display->display, drawBuffer, TermWin.gc,
2198 xpixel, ypixel + font->ascent + 1, 2260 xpixel, ypixel + font->ascent + 1,
2199 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2261 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2200 } /* for (col....) */ 2262 } /* for (col....) */
2201 } /* for (row....) */ 2263 } /* for (row....) */
2202 2264
2203 /* 2265 /*
2204 * G: cleanup cursor and display outline cursor if necessary 2266 * G: cleanup cursor and display outline cursor if necessary
… …
2211 [screen.cur.col]); 2273 [screen.cur.col]);
2212 *srp ^= RS_RVid; 2274 *srp ^= RS_RVid;
2213#ifndef NO_CURSORCOLOR 2275#ifndef NO_CURSORCOLOR
2214 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2276 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2215#endif 2277#endif
2216
2217 } 2278 }
2218 else if (oldcursor.row >= 0) 2279 else if (oldcursor.row >= 0)
2219 { 2280 {
2220#ifndef NO_CURSORCOLOR 2281#ifndef NO_CURSORCOLOR
2221 if (ISSET_PIXCOLOR (Color_cursor)) 2282 if (ISSET_PIXCOLOR (Color_cursor))
2222 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2283 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2223#endif 2284#endif
2285 int cursorwidth = 1;
2286 while (oldcursor.col + cursorwidth < TermWin.ncol
2287 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2288 cursorwidth++;
2289
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2290 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col), 2291 Col2Pixel (oldcursor.col),
2226 Row2Pixel (oldcursor.row), 2292 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2293 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2294 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2229 } 2295 }
2230 } 2296 }
2231 2297
2232 /* 2298 /*
2233 * H: cleanup selection 2299 * H: cleanup selection
… …
2241 /* 2307 /*
2242 * clear the whole screen height, note that width == 0 is treated 2308 * clear the whole screen height, note that width == 0 is treated
2243 * specially by XClearArea 2309 * specially by XClearArea
2244 */ 2310 */
2245 XClearArea (display->display, TermWin.vt, 0, 0, 2311 XClearArea (display->display, TermWin.vt, 0, 0,
2246 (unsigned int)TermWin.int_bwidth, 2312 (unsigned int)TermWin.int_bwidth,
2247 (unsigned int)TermWin_TotalHeight (), False); 2313 (unsigned int)TermWin_TotalHeight (), False);
2314
2248 if (clearlast && TermWin.int_bwidth) 2315 if (clearlast && TermWin.int_bwidth)
2249 /* 2316 /*
2250 * clear the whole screen height, note that width == 0 is treated 2317 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea 2318 * specially by XClearArea
2252 */ 2319 */
2253 XClearArea (display->display, TermWin.vt, 2320 XClearArea (display->display, TermWin.vt,
2254 TermWin.width + TermWin.int_bwidth, 0, 2321 TermWin.width + TermWin.int_bwidth, 0,
2255 (unsigned int)TermWin.int_bwidth, 2322 (unsigned int)TermWin.int_bwidth,
2256 (unsigned int)TermWin_TotalHeight (), False); 2323 (unsigned int)TermWin_TotalHeight (), False);
2324
2257 if (refresh_type & SMOOTH_REFRESH) 2325 if (refresh_type & SMOOTH_REFRESH)
2258 XSync (display->display, False); 2326 XSync (display->display, False);
2259 2327
2260 num_scr = 0; 2328 num_scr = 0;
2261 num_scr_allow = 1; 2329 num_scr_allow = 1;
2262 want_refresh = 0; /* screen is current */ 2330 want_refresh = 0; /* screen is current */
2263} 2331}
2264 2332
2265/* ------------------------------------------------------------------------- */
2266void 2333void
2334rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2335{
2336 if (!rp || !tp)
2337 return;
2338
2339 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2340 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2341}
2342
2343void
2267rxvt_term::scr_clear () 2344rxvt_term::scr_remap_chars ()
2345{
2346 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2347 scr_remap_chars (screen.text[i], screen.rend[i]);
2348
2349 for (int i = TermWin.nrow; i--; )
2350 {
2351 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2352 scr_remap_chars (swap.text[i], swap.rend[i]);
2353 }
2354}
2355
2356/* ------------------------------------------------------------------------- */
2357void
2358rxvt_term::scr_clear (bool really)
2268{ 2359{
2269 if (!TermWin.mapped) 2360 if (!TermWin.mapped)
2270 return; 2361 return;
2271 2362
2272 num_scr_allow = 0; 2363 num_scr_allow = 0;
2273 want_refresh = 1; 2364 want_refresh = 1;
2365
2274#ifdef TRANSPARENT 2366#ifdef TRANSPARENT
2275 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2367 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2276 { 2368 {
2277 int i; 2369 int i;
2278 2370
… …
2285 if (TermWin.parent[i] != None) 2377 if (TermWin.parent[i] != None)
2286 XClearWindow (display->display, TermWin.parent[i]); 2378 XClearWindow (display->display, TermWin.parent[i]);
2287 } 2379 }
2288#endif 2380#endif
2289 2381
2382 if (really)
2290 XClearWindow (display->display, TermWin.vt); 2383 XClearWindow (display->display, TermWin.vt);
2291} 2384}
2292 2385
2293/* ------------------------------------------------------------------------- */ 2386/* ------------------------------------------------------------------------- */
2294void 2387void
2295rxvt_term::scr_reverse_selection () 2388rxvt_term::scr_reverse_selection ()
2296{ 2389{
2297 int i, col, row, end_row;
2298 rend_t *srp;
2299
2300 if (selection.op && current_screen == selection.screen) 2390 if (selection.op && current_screen == selection.screen)
2301 { 2391 {
2302 end_row = TermWin.saveLines - TermWin.view_start; 2392 int end_row = TermWin.saveLines - TermWin.view_start;
2303 i = selection.beg.row + TermWin.saveLines; 2393 int i = selection.beg.row + TermWin.saveLines;
2304 row = selection.end.row + TermWin.saveLines; 2394 int col, row = selection.end.row + TermWin.saveLines;
2395 rend_t *srp;
2396
2305 if (i >= end_row) 2397 if (i >= end_row)
2306 col = selection.beg.col; 2398 col = selection.beg.col;
2307 else 2399 else
2308 { 2400 {
2309 col = 0; 2401 col = 0;
2310 i = end_row; 2402 i = end_row;
2311 } 2403 }
2404
2312 end_row += TermWin.nrow; 2405 end_row += TermWin.nrow;
2313 for (; i < row && i < end_row; i++, col = 0) 2406 for (; i < row && i < end_row; i++, col = 0)
2314 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2407 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2315 srp[col] ^= RS_RVid; 2408 srp[col] ^= RS_RVid;
2409
2316 if (i == row && i < end_row) 2410 if (i == row && i < end_row)
2317 for (srp = screen.rend[i]; col < selection.end.col; col++) 2411 for (srp = screen.rend[i]; col < selection.end.col; col++)
2318 srp[col] ^= RS_RVid; 2412 srp[col] ^= RS_RVid;
2319 } 2413 }
2320} 2414}
… …
2459 } 2553 }
2460 2554
2461 for (;;) 2555 for (;;)
2462 { 2556 {
2463 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2557 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2464 (long) (PROP_SIZE / 4), delete_prop, 2558 (long) (PROP_SIZE / 4), delete_prop,
2465 AnyPropertyType, &ct.encoding, &ct.format, 2559 AnyPropertyType, &ct.encoding, &ct.format,
2466 &ct.nitems, &bytes_after, 2560 &ct.nitems, &bytes_after,
2467 &ct.value) != Success) 2561 &ct.value) != Success)
2468 break; 2562 break;
2469 2563
2470 if (ct.encoding == 0) 2564 if (ct.encoding == 0)
2471 { 2565 {
2472 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2566 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2480 } 2574 }
2481 2575
2482 if (ct.nitems == 0) 2576 if (ct.nitems == 0)
2483 { 2577 {
2484 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2578 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2579
2485 if (selection_wait == Sel_normal && nread == 0) 2580 if (selection_wait == Sel_normal && nread == 0
2581 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2486 { 2582 {
2487 /* 2583 /*
2488 * pass through again trying CUT_BUFFER0 if we've come from 2584 * pass through again trying CUT_BUFFER0 if we've come from
2489 * XConvertSelection () but nothing was presented 2585 * XConvertSelection () but nothing was presented
2490 */ 2586 */
… …
2543{ 2639{
2544 int reget_time = 0; 2640 int reget_time = 0;
2545 2641
2546 if (prop == None) 2642 if (prop == None)
2547 return; 2643 return;
2644
2548 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2645 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2549 if (selection_wait == Sel_normal) 2646 if (selection_wait == Sel_normal)
2550 { 2647 {
2551 int a, afmt; 2648 int a, afmt;
2552 Atom atype; 2649 Atom atype;
2553 unsigned long bytes_after, nitems; 2650 unsigned long bytes_after, nitems;
2554 unsigned char *s = NULL; 2651 unsigned char *s = NULL;
2555 2652
2556 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2653 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2557 xa[XA_INCR], &atype, &afmt, &nitems, 2654 xa[XA_INCR], &atype, &afmt, &nitems,
2558 &bytes_after, &s); 2655 &bytes_after, &s);
2559 if (s) 2656 if (s)
2560 XFree (s); 2657 XFree (s);
2561 if (a != Success) 2658 if (a != Success)
2562 return; 2659 return;
2660
2563#ifndef __CYGWIN32__ 2661#ifndef __CYGWIN32__
2564 if (atype == xa[XA_INCR]) 2662 if (atype == xa[XA_INCR])
2565 { /* start an INCR transfer */ 2663 { /* start an INCR transfer */
2566 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2664 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2567 XDeleteProperty (display->display, win, prop); 2665 XDeleteProperty (display->display, win, prop);
… …
2573 2671
2574 } 2672 }
2575 else if (selection_wait == Sel_incr) 2673 else if (selection_wait == Sel_incr)
2576 { 2674 {
2577 reget_time = 1; 2675 reget_time = 1;
2676
2578 if (selection_paste (win, prop, True) == -1) 2677 if (selection_paste (win, prop, True) == -1)
2579 { 2678 {
2580 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2581 selection_wait = Sel_none; 2680 selection_wait = Sel_none;
2582 incr_ev.stop (); 2681 incr_ev.stop ();
2583 } 2682 }
2584 } 2683 }
2585 if (reget_time) /* received more data so reget time */ 2684 if (reget_time) /* received more data so reget time */
2586 incr_ev.start (NOW + 10); 2685 incr_ev.start (NOW + 10);
2587} 2686}
2687
2588/* ------------------------------------------------------------------------- */ 2688/* ------------------------------------------------------------------------- */
2589/* 2689/*
2590 * Request the current selection: 2690 * Request the current selection:
2591 * Order: > internal selection if available 2691 * Order: > internal selection if available
2592 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2692 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2597 */ 2697 */
2598void 2698void
2599rxvt_term::selection_request (Time tm, int x, int y) 2699rxvt_term::selection_request (Time tm, int x, int y)
2600{ 2700{
2601 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2701 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2702
2602 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2703 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2603 return; /* outside window */ 2704 return; /* outside window */
2604 2705
2605 if (selection.text != NULL) 2706 if (selection.text)
2606 { /* internal selection */ 2707 { /* internal selection */
2607 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2708 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2608 paste (selection.text, selection.len); 2709 char *str = rxvt_wcstombs (selection.text, selection.len);
2710 paste ((unsigned char *)str, strlen (str));
2711 free (str);
2609 return; 2712 return;
2610 } 2713 }
2611 else 2714 else
2612 { 2715 {
2613 int i; 2716 int i;
2614 2717
2615 selection_request_time = tm; 2718 selection_request_time = tm;
2616 selection_wait = Sel_normal; 2719 selection_wait = Sel_normal;
2617 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2618 { 2721 {
… …
2626 return; 2729 return;
2627#endif 2730#endif
2628 2731
2629 } 2732 }
2630 } 2733 }
2734
2631 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2735 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2632 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2736 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2633 selection_paste (display->root, XA_CUT_BUFFER0, False); 2737 selection_paste (display->root, XA_CUT_BUFFER0, False);
2634} 2738}
2635 2739
2636int 2740int
2637rxvt_term::selection_request_other (Atom target, int selnum) 2741rxvt_term::selection_request_other (Atom target, int selnum)
2638{ 2742{
2639 Atom sel; 2743 Atom sel;
2640#ifdef DEBUG_SELECT 2744#ifdef DEBUG_SELECT
2641 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2745 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2642#endif 2746#endif
2643 2747
2644 selection_type |= selnum; 2748 selection_type |= selnum;
2749
2645 if (selnum == Sel_Primary) 2750 if (selnum == Sel_Primary)
2646 sel = XA_PRIMARY; 2751 sel = XA_PRIMARY;
2647 else if (selnum == Sel_Secondary) 2752 else if (selnum == Sel_Secondary)
2648 sel = XA_SECONDARY; 2753 sel = XA_SECONDARY;
2649 else 2754 else
2650 sel = xa[XA_CLIPBOARD]; 2755 sel = xa[XA_CLIPBOARD];
2756
2651 if (XGetSelectionOwner (display->display, sel) != None) 2757 if (XGetSelectionOwner (display->display, sel) != None)
2652 { 2758 {
2653 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2759 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2654 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2760 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2655 TermWin.vt, selection_request_time); 2761 TermWin.vt, selection_request_time);
2656 return 1; 2762 return 1;
2657 } 2763 }
2764
2658 return 0; 2765 return 0;
2659} 2766}
2660 2767
2661/* ------------------------------------------------------------------------- */ 2768/* ------------------------------------------------------------------------- */
2662/* 2769/*
… …
2667rxvt_term::selection_clear () 2774rxvt_term::selection_clear ()
2668{ 2775{
2669 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2776 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2670 2777
2671 want_refresh = 1; 2778 want_refresh = 1;
2672 if (selection.text)
2673 free (selection.text); 2779 free (selection.text);
2674 selection.text = NULL; 2780 selection.text = NULL;
2675 selection.len = 0; 2781 selection.len = 0;
2676 CLEAR_SELECTION (); 2782 CLEAR_SELECTION ();
2677} 2783}
2678 2784
… …
2682 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2683 */ 2789 */
2684void 2790void
2685rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2686{ 2792{
2687 int i, col, end_col, row, end_row; 2793 int i, col, end_col, row, end_row;
2688 unsigned char *new_selection_text; 2794 wchar_t *new_selection_text;
2689 char *str;
2690 text_t *t; 2795 text_t *t;
2691#ifdef ACS_ASCII
2692 rend_t *re;
2693#endif
2694 2796
2695 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2797 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2696 switch (selection.op) 2798 switch (selection.op)
2697 { 2799 {
2698 case SELECTION_CONT: 2800 case SELECTION_CONT:
… …
2704 selection.op = SELECTION_DONE; 2806 selection.op = SELECTION_DONE;
2705 /* FALLTHROUGH */ 2807 /* FALLTHROUGH */
2706 default: 2808 default:
2707 return; 2809 return;
2708 } 2810 }
2811
2709 selection.op = SELECTION_DONE; 2812 selection.op = SELECTION_DONE;
2710 2813
2711 if (selection.clicks == 4) 2814 if (selection.clicks == 4)
2712 return; /* nothing selected, go away */ 2815 return; /* nothing selected, go away */
2713 2816
2714 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2817 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2715 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2818 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2716
2717 new_selection_text = (unsigned char *)str;
2718 2819
2719 col = selection.beg.col; 2820 col = selection.beg.col;
2720 MAX_IT (col, 0); 2821 MAX_IT (col, 0);
2721 row = selection.beg.row + TermWin.saveLines; 2822 row = selection.beg.row + TermWin.saveLines;
2722 end_row = selection.end.row + TermWin.saveLines; 2823 end_row = selection.end.row + TermWin.saveLines;
2824 int ofs = 0;
2825 int extra = 0;
2723 2826
2724 for (; row <= end_row; row++, col = 0) 2827 for (; row <= end_row; row++, col = 0)
2725 { 2828 {
2726 t = & (screen.text[row][col]); 2829 t = &(screen.text[row][col]);
2727 2830
2728 end_col = screen.tlen[row]; 2831 end_col = screen.tlen[row];
2729 2832
2730 if (end_col == -1) 2833 if (end_col == -1)
2731 end_col = TermWin.ncol; 2834 end_col = TermWin.ncol;
2732 2835
2733 if (row == end_row) 2836 if (row == end_row)
2734 MIN_IT (end_col, selection.end.col); 2837 MIN_IT (end_col, selection.end.col);
2735 2838
2736 for (; col < end_col; col++) 2839 for (; col < end_col; col++)
2840 {
2737 if (*t == NOCHAR) 2841 if (*t == NOCHAR)
2738 t++; 2842 t++;
2843 else if (IS_COMPOSE (*t))
2844 {
2845 int len = rxvt_composite.expand (*t, 0);
2846
2847 extra -= (len - 1);
2848
2849 if (extra < 0)
2850 {
2851 extra += i;
2852 i += i;
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 }
2855
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 }
2739 else 2858 else
2740 { 2859 new_selection_text[ofs++] = *t++;
2741 int len = wctomb (str, *t++);
2742 if (len > 0)
2743 str += len;
2744 } 2860 }
2745 2861
2746 if (screen.tlen[row] != -1 && row != end_row) 2862 if (screen.tlen[row] != -1 && row != end_row)
2747 *str++ = '\n'; 2863 new_selection_text[ofs++] = L'\n';
2748 } 2864 }
2749 2865
2750#ifndef NO_OLD_SELECTION 2866#ifndef NO_OLD_SELECTION
2751 if (selection_style == OLD_SELECT) 2867 if (selection_style == OLD_SELECT)
2752 if (end_col == TermWin.ncol) 2868 if (end_col == TermWin.ncol)
2753 *str++ = '\n'; 2869 new_selection_text[ofs++] = L'\n';
2754#endif 2870#endif
2755#ifndef NO_NEW_SELECTION 2871#ifndef NO_NEW_SELECTION
2756 if (selection_style != OLD_SELECT) 2872 if (selection_style != OLD_SELECT)
2757 if (end_col != selection.end.col) 2873 if (end_col != selection.end.col)
2758 *str++ = '\n'; 2874 new_selection_text[ofs++] = L'\n';
2759#endif 2875#endif
2760 *str = '\0'; 2876 new_selection_text[ofs] = 0;
2761 2877
2762 i = str - (char *)new_selection_text;
2763 if (i == 0) 2878 if (ofs == 0)
2764 { 2879 {
2765 free (new_selection_text); 2880 free (new_selection_text);
2766 return; 2881 return;
2767 } 2882 }
2768 2883
2769 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2770 if (str - (char *)new_selection_text > 1024)
2771 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2772
2773 selection.len = i;
2774
2775 if (selection.text)
2776 free (selection.text); 2884 free (selection.text);
2777 2885
2778 selection.text = new_selection_text; 2886 // we usually allocate much more than necessary, so realloc it smaller again
2887 selection.len = ofs;
2888 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2779 2889
2780 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2781 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2782 display->set_selection_owner (this); 2892 display->set_selection_owner (this);
2783 else 2893 else
2784 rxvt_print_error ("can't get primary selection"); 2894 rxvt_print_error ("can't get primary selection");
2785 2895
2786 { 2896#if 0
2787 XTextProperty ct; 2897 XTextProperty ct;
2788 char *cl = (char *)selection.text;
2789 2898
2790 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2791 { 2900 {
2792 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2793 PropModeReplace, ct.value, ct.nitems);
2794 XFree (ct.value);
2795 }
2796 else
2797 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2901 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2798 PropModeReplace, selection.text, (int)selection.len); 2902 PropModeReplace, ct.value, ct.nitems);
2903 XFree (ct.value);
2799 } 2904 }
2905#endif
2800 2906
2801 selection_time = tm; 2907 selection_time = tm;
2802 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2908 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2803} 2909}
2804 2910
… …
3333 ev.target = rq.target; 3439 ev.target = rq.target;
3334 ev.time = rq.time; 3440 ev.time = rq.time;
3335 3441
3336 if (rq.target == xa[XA_TARGETS]) 3442 if (rq.target == xa[XA_TARGETS])
3337 { 3443 {
3338 Atom32 target_list[5]; 3444 Atom32 target_list[6];
3339 Atom32 *target = target_list; 3445 Atom32 *target = target_list;
3340 3446
3341 *target++ = (Atom32) xa[XA_TARGETS]; 3447 *target++ = (Atom32) xa[XA_TARGETS];
3448 *target++ = (Atom32) xa[XA_TIMESTAMP];
3342 *target++ = (Atom32) XA_STRING; 3449 *target++ = (Atom32) XA_STRING;
3343 *target++ = (Atom32) xa[XA_TEXT]; 3450 *target++ = (Atom32) xa[XA_TEXT];
3344 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3451 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3345#if X_HAVE_UTF8_STRING 3452#if X_HAVE_UTF8_STRING
3346 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3453 *target++ = (Atom32) xa[XA_UTF8_STRING];
3347#endif 3454#endif
3455
3348 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3456 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3349 (8 * sizeof (target_list[0])), PropModeReplace, 3457 (8 * sizeof (target_list[0])), PropModeReplace,
3350 (unsigned char *)target_list, 3458 (unsigned char *)target_list,
3351 target - target_list); 3459 target - target_list);
3352 ev.property = rq.property; 3460 ev.property = rq.property;
3353 } 3461 }
3354 else if (rq.target == xa[XA_MULTIPLE]) 3462 else if (rq.target == xa[XA_MULTIPLE])
3355 { 3463 {
3356 /* TODO: Handle MULTIPLE */ 3464 /* TODO: Handle MULTIPLE */
… …
3368 || rq.target == xa[XA_UTF8_STRING] 3476 || rq.target == xa[XA_UTF8_STRING]
3369 ) 3477 )
3370 { 3478 {
3371 short freect = 0; 3479 short freect = 0;
3372 int selectlen; 3480 int selectlen;
3373 char *cl; 3481 wchar_t *cl;
3374 3482
3375 target = rq.target; 3483 target = rq.target;
3376 3484
3377 if (target == XA_STRING) 3485 if (target == XA_STRING)
3378 // we actually don't do XA_STRING, but who cares, as i18n clients 3486 // we actually don't do XA_STRING, but who cares, as i18n clients
3379 // will ask for another format anyways. 3487 // will ask for another format anyways.
3380 style = XStringStyle; 3488 style = XStringStyle;
3381 else if (target == xa[XA_TEXT]) 3489 else if (target == xa[XA_TEXT])
3382 style = XTextStyle; 3490 style = XStdICCTextStyle;
3383 else if (target == xa[XA_COMPOUND_TEXT]) 3491 else if (target == xa[XA_COMPOUND_TEXT])
3384 style = XCompoundTextStyle; 3492 style = XCompoundTextStyle;
3385#if X_HAVE_UTF8_STRING 3493#if X_HAVE_UTF8_STRING
3386 else if (target == xa[XA_UTF8_STRING]) 3494 else if (target == xa[XA_UTF8_STRING])
3387 style = XUTF8StringStyle; 3495 style = XUTF8StringStyle;
… …
3392 style = XCompoundTextStyle; 3500 style = XCompoundTextStyle;
3393 } 3501 }
3394 3502
3395 if (selection.text) 3503 if (selection.text)
3396 { 3504 {
3397 cl = (char *)selection.text; 3505 cl = selection.text;
3398 selectlen = selection.len; 3506 selectlen = selection.len;
3399 } 3507 }
3400 else 3508 else
3401 { 3509 {
3402 cl = ""; 3510 cl = L"";
3403 selectlen = 0; 3511 selectlen = 0;
3404 } 3512 }
3405 3513
3514 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3515 // manually for XUTF8StringStyle.
3406 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3516 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3407 freect = 1; 3517 freect = 1;
3408 else 3518 else
3409 { 3519 {
3410 /* if we failed to convert then send it raw */ 3520 /* if we failed to convert then send it raw */
3411 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
… …
3418 ev.property = rq.property; 3528 ev.property = rq.property;
3419 3529
3420 if (freect) 3530 if (freect)
3421 XFree (ct.value); 3531 XFree (ct.value);
3422 } 3532 }
3533
3423 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3424} 3535}
3425 3536
3426/* ------------------------------------------------------------------------- * 3537/* ------------------------------------------------------------------------- *
3427 * MOUSE ROUTINES * 3538 * MOUSE ROUTINES *

Diff Legend

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