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.33 by pcg, Sun Feb 22 17:13:21 2004 UTC vs.
Revision 1.57 by pcg, Sun Mar 14 17:33:08 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 // rely on wcwidth to tell us the character width, at least for non-latin1
870 // do wcwidth before further replacements, as wcwidth says that line-drawing
871 // characters have width -1 (DOH!) on gnu/linux sometimes.
872 int width = c < 256 ? 1 : wcwidth (c);
863 873
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 874 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c) 875 switch (c)
866 { 876 {
867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 877 // vt100 special graphics and line drawing
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 878 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 879 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; 880 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
881 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; 882 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; 883 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; 884 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; 885 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; 886 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
887 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 888 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
878 } 889 }
879 890
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) 891 if (width > 0)
892 {
893#if !UNICODE_3 && ENABLE_COMBINING
894 // trim characters we can't store directly :(
895 if (c >= 0x10000)
896 c = rxvt_composite.compose (c); // map to lower 16 bits
897#endif
898 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
899
886 do 900 do
887 { 901 {
888 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
889 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
890 904
891 if (screen.cur.col < last_col - 1) 905 if (screen.cur.col < last_col - 1)
892 screen.cur.col++; 906 screen.cur.col++;
893 else 907 else
894 { 908 {
895 screen.tlen[row] = last_col; 909 screen.tlen[row] = last_col;
896 if (screen.flags & Screen_Autowrap) 910 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 911 screen.flags |= Screen_WrapNext;
898 break; 912 break;
899 } 913 }
900 914
901 c = NOCHAR; 915 c = NOCHAR;
902 } 916 }
903 while (--width > 0); 917 while (--width > 0);
918
919 // pad with spaces when overwriting wide character with smaller one
920 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
921 {
922 stp[c] = ' ';
923 srp[c] = rend;
924 }
925 }
926 else if (width == 0)
927 {
928#if ENABLE_COMBINING
929 // handle combining characters
930 // we just tag the accent on the previous on-screen character.
931 // this is arguably not correct, but also arguably not wrong.
932 // we don't handle double-width characters nicely yet.
933
934 text_t *tp;
935 rend_t *rp;
936
937 if (screen.cur.col > 0)
938 {
939 tp = stp + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1;
941 }
942 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
944 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
946 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
947 }
904 else 948 else
905 (void)0; /* handle combining character etc. here. */ 949 continue;
950
951 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp;
954
955 // first try to find a precomposed character
956 uint32_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c);
959
960 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
962#endif
963 }
906 } 964 }
907 965
908 if (screen.tlen[row] != -1) /* XXX: think about this */ 966 if (screen.tlen[row] != -1) /* XXX: think about this */
909 MAX_IT (screen.tlen[row], screen.cur.col); 967 MAX_IT (screen.tlen[row], screen.cur.col);
910 968
… …
1090 else 1148 else
1091 screen.cur.row = row; 1149 screen.cur.row = row;
1092 } 1150 }
1093 MAX_IT (screen.cur.row, 0); 1151 MAX_IT (screen.cur.row, 0);
1094 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1152 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1153
1154 while (screen.cur.col > 0
1155 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1156 screen.cur.col--;
1095} 1157}
1096 1158
1097/* ------------------------------------------------------------------------- */ 1159/* ------------------------------------------------------------------------- */
1098/* 1160/*
1099 * direction should be UP or DN 1161 * direction should be UP or DN
… …
1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1897 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1836 1898
1837void 1899void
1838rxvt_term::scr_refresh (unsigned char refresh_type) 1900rxvt_term::scr_refresh (unsigned char refresh_type)
1839{ 1901{
1840 unsigned char clearfirst, /* first character writes before cell */ 1902 unsigned char clearfirst, /* first character writes before cell */
1841 clearlast, /* last character writes beyond cell */ 1903 clearlast, /* last character writes beyond cell */
1842 must_clear, /* use draw_string not draw_image_string */ 1904 must_clear, /* use draw_string not draw_image_string */
1843 rvid, /* reverse video this position */ 1905 rvid, /* reverse video this position */
1844 showcursor; /* show the cursor */ 1906 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 1907 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 1908 ocrow; /* old cursor row */
1847 int cursorwidth;
1848 int i, /* tmp */ 1909 int i, /* tmp */
1849 row_offset; /* basic offset in screen structure */ 1910 row_offset; /* basic offset in screen structure */
1850#ifndef NO_CURSORCOLOR 1911#ifndef NO_CURSORCOLOR
1851 rend_t cc1; /* store colours at cursor position (s) */ 1912 rend_t cc1; /* store colours at cursor position (s) */
1852#endif 1913#endif
1853 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1914 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1854 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1915 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1855 1916
1856 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1917 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1857 return; 1918 return;
1858 1919
1859 /* 1920 /*
… …
1891 unsigned char setoldcursor; 1952 unsigned char setoldcursor;
1892 rend_t ccol1, /* Cursor colour */ 1953 rend_t ccol1, /* Cursor colour */
1893 ccol2; /* Cursor colour2 */ 1954 ccol2; /* Cursor colour2 */
1894 1955
1895 showcursor = (screen.flags & Screen_VisibleCursor); 1956 showcursor = (screen.flags & Screen_VisibleCursor);
1896 cursorwidth = 0;
1897#ifdef CURSOR_BLINK 1957#ifdef CURSOR_BLINK
1898 if (hidden_cursor) 1958 if (hidden_cursor)
1899 showcursor = 0; 1959 showcursor = 0;
1900#endif 1960#endif
1901 1961
1902 cursorwidth = 0;
1903
1904 if (showcursor) 1962 if (showcursor)
1905 { 1963 {
1906 cursorwidth++;
1907
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1909 [screen.cur.col]); 1965 [screen.cur.col]);
1910 1966
1911 if (showcursor && TermWin.focus) 1967 if (showcursor && TermWin.focus)
1912 { 1968 {
… …
1930 ccol2 = Color_bg; 1986 ccol2 = Color_bg;
1931#endif 1987#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 1988 *srp = SET_FGCOLOR (*srp, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 1989 *srp = SET_BGCOLOR (*srp, ccol2);
1934#endif 1990#endif
1935
1936 } 1991 }
1937 } 1992 }
1938 1993
1939 /* make sure no outline cursor is left around */ 1994 /* make sure no outline cursor is left around */
1940 setoldcursor = 0; 1995 setoldcursor = 0;
… …
2053 int ypixel = (int)Row2Pixel (row); 2108 int ypixel = (int)Row2Pixel (row);
2054 2109
2055 for (col = 0; col < TermWin.ncol; col++) 2110 for (col = 0; col < TermWin.ncol; col++)
2056 { 2111 {
2057 /* compare new text with old - if exactly the same then continue */ 2112 /* compare new text with old - if exactly the same then continue */
2113 if (stp[col] == dtp[col] /* Must match characters to skip. */
2114 && (srp[col] == drp[col] /* Either rendition the same or */
2115 || (stp[col] == ' ' /* space w/ no background change */
2116 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2117 continue;
2118
2119 // redraw one or more characters
2120
2121 // seek to the beginning if wide characters
2122 while (stp[col] == NOCHAR && col > 0)
2123 --col;
2124
2058 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2125 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; 2126 text_t *text = stp + col;
2067 int count = 1; 2127 int count = 1;
2068 2128
2069 /* redraw one or more characters */
2070
2071 dtp[col] = stp[col]; 2129 dtp[col] = stp[col];
2072 drp[col] = rend; 2130 drp[col] = rend;
2073
2074 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2075 continue;
2076 2131
2077 int xpixel = Col2Pixel (col); 2132 int xpixel = Col2Pixel (col);
2078 2133
2079 // this loop looks very messy, it can probably be optimized 2134 // this loop looks very messy, it can probably be optimized
2080 // and cleaned a bit by you? 2135 // and cleaned a bit by you?
… …
2121 int fore = GET_FGCOLOR (rend); // desired foreground 2176 int fore = GET_FGCOLOR (rend); // desired foreground
2122 int back = GET_BGCOLOR (rend); // desired background 2177 int back = GET_BGCOLOR (rend); // desired background
2123 2178
2124 rend = GET_ATTR (rend); 2179 rend = GET_ATTR (rend);
2125 2180
2126 rvid = !! (rend & RS_RVid); 2181 rvid = !!(rend & RS_RVid);
2182
2183#ifndef NO_BOLD_UNDERLINE_REVERSE
2184 if (rend & RS_Bold && fore == Color_fg)
2185 {
2186 if (ISSET_PIXCOLOR (Color_BD))
2187 fore = Color_BD;
2188 else
2189 rvid = !rvid;
2190 }
2191
2192 if (rend & RS_Uline)
2193 if (ISSET_PIXCOLOR (Color_UL))
2194 fore = Color_UL;
2195#endif
2196
2127 if (rvid) 2197 if (rvid)
2128 { 2198 {
2129 SWAP_IT (fore, back, int); 2199 SWAP_IT (fore, back, int);
2130 2200
2131#ifndef NO_BOLD_UNDERLINE_REVERSE 2201#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2134 && !ISSET_PIXCOLOR (Color_cursor) 2204 && !ISSET_PIXCOLOR (Color_cursor)
2135# endif 2205# endif
2136 ) 2206 )
2137 back = Color_RV; 2207 back = Color_RV;
2138#endif 2208#endif
2139
2140 } 2209 }
2210
2141#ifdef TEXT_BLINK 2211#ifdef TEXT_BLINK
2142 if (rend & RS_Blink) 2212 if (rend & RS_Blink && back == Color_bg)
2143 { 2213 {
2144 if (!text_blink_ev.active) 2214 if (!text_blink_ev.active)
2145 { 2215 {
2146 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2216 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2147 hidden_text = 0; 2217 hidden_text = 0;
2148 } 2218 }
2149 else if (hidden_text) 2219 else if (hidden_text)
2150 fore = back; 2220 fore = back;
2151 } 2221 }
2152#endif 2222#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 2223
2168 /* 2224 /*
2169 * Actually do the drawing of the string here 2225 * Actually do the drawing of the string here
2170 */ 2226 */
2171 rxvt_font *font = (*TermWin.fontset)[fid]; 2227 rxvt_font *font = (*TermWin.fontset)[fid];
2172 2228
2173 if (back == fore) 2229 if (back == fore)
2174 font->clear_rect (xpixel, ypixel, 2230 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2175 TermWin.fwidth * count, TermWin.fheight, 2231 TermWin.fwidth * count, TermWin.fheight,
2176 back); 2232 back);
2177 else if (back == Color_bg) 2233 else if (back == Color_bg)
2178 { 2234 {
2179 if (must_clear) 2235 if (must_clear)
… …
2181 CLEAR_CHARS (xpixel, ypixel, count); 2237 CLEAR_CHARS (xpixel, ypixel, count);
2182 2238
2183 for (i = 0; i < count; i++) /* don't draw empty strings */ 2239 for (i = 0; i < count; i++) /* don't draw empty strings */
2184 if (text[i] != ' ') 2240 if (text[i] != ' ')
2185 { 2241 {
2186 font->draw (xpixel, ypixel, text, count, fore, -1); 2242 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2187 break; 2243 break;
2188 } 2244 }
2189 } 2245 }
2190 else 2246 else
2191 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2247 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2192 } 2248 }
2193 else 2249 else
2194 font->draw (xpixel, ypixel, text, count, fore, back); 2250 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2195 2251
2196 if ((rend & RS_Uline) && (font->descent > 1)) 2252 if ((rend & RS_Uline) && (font->descent > 1))
2197 XDrawLine (display->display, drawBuffer, TermWin.gc, 2253 XDrawLine (display->display, drawBuffer, TermWin.gc,
2198 xpixel, ypixel + font->ascent + 1, 2254 xpixel, ypixel + font->ascent + 1,
2199 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2200 } /* for (col....) */ 2256 } /* for (col....) */
2201 } /* for (row....) */ 2257 } /* for (row....) */
2202 2258
2203 /* 2259 /*
2204 * G: cleanup cursor and display outline cursor if necessary 2260 * G: cleanup cursor and display outline cursor if necessary
… …
2211 [screen.cur.col]); 2267 [screen.cur.col]);
2212 *srp ^= RS_RVid; 2268 *srp ^= RS_RVid;
2213#ifndef NO_CURSORCOLOR 2269#ifndef NO_CURSORCOLOR
2214 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2215#endif 2271#endif
2216
2217 } 2272 }
2218 else if (oldcursor.row >= 0) 2273 else if (oldcursor.row >= 0)
2219 { 2274 {
2220#ifndef NO_CURSORCOLOR 2275#ifndef NO_CURSORCOLOR
2221 if (ISSET_PIXCOLOR (Color_cursor)) 2276 if (ISSET_PIXCOLOR (Color_cursor))
2222 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2277 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2223#endif 2278#endif
2279 int cursorwidth = 1;
2280 while (oldcursor.col + cursorwidth < TermWin.ncol
2281 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2282 cursorwidth++;
2283
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2284 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col), 2285 Col2Pixel (oldcursor.col),
2226 Row2Pixel (oldcursor.row), 2286 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2287 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2288 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2229 } 2289 }
2230 } 2290 }
2231 2291
2232 /* 2292 /*
2233 * H: cleanup selection 2293 * H: cleanup selection
… …
2241 /* 2301 /*
2242 * clear the whole screen height, note that width == 0 is treated 2302 * clear the whole screen height, note that width == 0 is treated
2243 * specially by XClearArea 2303 * specially by XClearArea
2244 */ 2304 */
2245 XClearArea (display->display, TermWin.vt, 0, 0, 2305 XClearArea (display->display, TermWin.vt, 0, 0,
2246 (unsigned int)TermWin.int_bwidth, 2306 (unsigned int)TermWin.int_bwidth,
2247 (unsigned int)TermWin_TotalHeight (), False); 2307 (unsigned int)TermWin_TotalHeight (), False);
2308
2248 if (clearlast && TermWin.int_bwidth) 2309 if (clearlast && TermWin.int_bwidth)
2249 /* 2310 /*
2250 * clear the whole screen height, note that width == 0 is treated 2311 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea 2312 * specially by XClearArea
2252 */ 2313 */
2253 XClearArea (display->display, TermWin.vt, 2314 XClearArea (display->display, TermWin.vt,
2254 TermWin.width + TermWin.int_bwidth, 0, 2315 TermWin.width + TermWin.int_bwidth, 0,
2255 (unsigned int)TermWin.int_bwidth, 2316 (unsigned int)TermWin.int_bwidth,
2256 (unsigned int)TermWin_TotalHeight (), False); 2317 (unsigned int)TermWin_TotalHeight (), False);
2318
2257 if (refresh_type & SMOOTH_REFRESH) 2319 if (refresh_type & SMOOTH_REFRESH)
2258 XSync (display->display, False); 2320 XSync (display->display, False);
2259 2321
2260 num_scr = 0; 2322 num_scr = 0;
2261 num_scr_allow = 1; 2323 num_scr_allow = 1;
… …
2285 } 2347 }
2286} 2348}
2287 2349
2288/* ------------------------------------------------------------------------- */ 2350/* ------------------------------------------------------------------------- */
2289void 2351void
2290rxvt_term::scr_clear () 2352rxvt_term::scr_clear (bool really)
2291{ 2353{
2292 if (!TermWin.mapped) 2354 if (!TermWin.mapped)
2293 return; 2355 return;
2294 2356
2295 num_scr_allow = 0; 2357 num_scr_allow = 0;
2296 want_refresh = 1; 2358 want_refresh = 1;
2359
2297#ifdef TRANSPARENT 2360#ifdef TRANSPARENT
2298 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2299 { 2362 {
2300 int i; 2363 int i;
2301 2364
… …
2308 if (TermWin.parent[i] != None) 2371 if (TermWin.parent[i] != None)
2309 XClearWindow (display->display, TermWin.parent[i]); 2372 XClearWindow (display->display, TermWin.parent[i]);
2310 } 2373 }
2311#endif 2374#endif
2312 2375
2376 if (really)
2313 XClearWindow (display->display, TermWin.vt); 2377 XClearWindow (display->display, TermWin.vt);
2314} 2378}
2315 2379
2316/* ------------------------------------------------------------------------- */ 2380/* ------------------------------------------------------------------------- */
2317void 2381void
2318rxvt_term::scr_reverse_selection () 2382rxvt_term::scr_reverse_selection ()
2319{ 2383{
2320 int i, col, row, end_row;
2321 rend_t *srp;
2322
2323 if (selection.op && current_screen == selection.screen) 2384 if (selection.op && current_screen == selection.screen)
2324 { 2385 {
2325 end_row = TermWin.saveLines - TermWin.view_start; 2386 int end_row = TermWin.saveLines - TermWin.view_start;
2326 i = selection.beg.row + TermWin.saveLines; 2387 int i = selection.beg.row + TermWin.saveLines;
2327 row = selection.end.row + TermWin.saveLines; 2388 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp;
2390
2328 if (i >= end_row) 2391 if (i >= end_row)
2329 col = selection.beg.col; 2392 col = selection.beg.col;
2330 else 2393 else
2331 { 2394 {
2332 col = 0; 2395 col = 0;
2333 i = end_row; 2396 i = end_row;
2334 } 2397 }
2398
2335 end_row += TermWin.nrow; 2399 end_row += TermWin.nrow;
2336 for (; i < row && i < end_row; i++, col = 0) 2400 for (; i < row && i < end_row; i++, col = 0)
2337 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2338 srp[col] ^= RS_RVid; 2402 srp[col] ^= RS_RVid;
2403
2339 if (i == row && i < end_row) 2404 if (i == row && i < end_row)
2340 for (srp = screen.rend[i]; col < selection.end.col; col++) 2405 for (srp = screen.rend[i]; col < selection.end.col; col++)
2341 srp[col] ^= RS_RVid; 2406 srp[col] ^= RS_RVid;
2342 } 2407 }
2343} 2408}
… …
2482 } 2547 }
2483 2548
2484 for (;;) 2549 for (;;)
2485 { 2550 {
2486 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2551 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2487 (long) (PROP_SIZE / 4), delete_prop, 2552 (long) (PROP_SIZE / 4), delete_prop,
2488 AnyPropertyType, &ct.encoding, &ct.format, 2553 AnyPropertyType, &ct.encoding, &ct.format,
2489 &ct.nitems, &bytes_after, 2554 &ct.nitems, &bytes_after,
2490 &ct.value) != Success) 2555 &ct.value) != Success)
2491 break; 2556 break;
2492 2557
2493 if (ct.encoding == 0) 2558 if (ct.encoding == 0)
2494 { 2559 {
2495 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2503 } 2568 }
2504 2569
2505 if (ct.nitems == 0) 2570 if (ct.nitems == 0)
2506 { 2571 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2508 if (selection_wait == Sel_normal && nread == 0) 2574 if (selection_wait == Sel_normal && nread == 0
2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2509 { 2576 {
2510 /* 2577 /*
2511 * pass through again trying CUT_BUFFER0 if we've come from 2578 * pass through again trying CUT_BUFFER0 if we've come from
2512 * XConvertSelection () but nothing was presented 2579 * XConvertSelection () but nothing was presented
2513 */ 2580 */
… …
2566{ 2633{
2567 int reget_time = 0; 2634 int reget_time = 0;
2568 2635
2569 if (prop == None) 2636 if (prop == None)
2570 return; 2637 return;
2638
2571 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2639 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2572 if (selection_wait == Sel_normal) 2640 if (selection_wait == Sel_normal)
2573 { 2641 {
2574 int a, afmt; 2642 int a, afmt;
2575 Atom atype; 2643 Atom atype;
2576 unsigned long bytes_after, nitems; 2644 unsigned long bytes_after, nitems;
2577 unsigned char *s = NULL; 2645 unsigned char *s = NULL;
2578 2646
2579 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2647 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2580 xa[XA_INCR], &atype, &afmt, &nitems, 2648 xa[XA_INCR], &atype, &afmt, &nitems,
2581 &bytes_after, &s); 2649 &bytes_after, &s);
2582 if (s) 2650 if (s)
2583 XFree (s); 2651 XFree (s);
2584 if (a != Success) 2652 if (a != Success)
2585 return; 2653 return;
2654
2586#ifndef __CYGWIN32__ 2655#ifndef __CYGWIN32__
2587 if (atype == xa[XA_INCR]) 2656 if (atype == xa[XA_INCR])
2588 { /* start an INCR transfer */ 2657 { /* start an INCR transfer */
2589 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2658 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2590 XDeleteProperty (display->display, win, prop); 2659 XDeleteProperty (display->display, win, prop);
… …
2596 2665
2597 } 2666 }
2598 else if (selection_wait == Sel_incr) 2667 else if (selection_wait == Sel_incr)
2599 { 2668 {
2600 reget_time = 1; 2669 reget_time = 1;
2670
2601 if (selection_paste (win, prop, True) == -1) 2671 if (selection_paste (win, prop, True) == -1)
2602 { 2672 {
2603 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2673 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2604 selection_wait = Sel_none; 2674 selection_wait = Sel_none;
2605 incr_ev.stop (); 2675 incr_ev.stop ();
2606 } 2676 }
2607 } 2677 }
2608 if (reget_time) /* received more data so reget time */ 2678 if (reget_time) /* received more data so reget time */
2609 incr_ev.start (NOW + 10); 2679 incr_ev.start (NOW + 10);
2610} 2680}
2681
2611/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2612/* 2683/*
2613 * Request the current selection: 2684 * Request the current selection:
2614 * Order: > internal selection if available 2685 * Order: > internal selection if available
2615 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2686 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2620 */ 2691 */
2621void 2692void
2622rxvt_term::selection_request (Time tm, int x, int y) 2693rxvt_term::selection_request (Time tm, int x, int y)
2623{ 2694{
2624 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2695 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2696
2625 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2697 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2626 return; /* outside window */ 2698 return; /* outside window */
2627 2699
2628 if (selection.text != NULL) 2700 if (selection.text)
2629 { /* internal selection */ 2701 { /* internal selection */
2630 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2702 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2631 paste (selection.text, selection.len); 2703 char *str = rxvt_wcstombs (selection.text, selection.len);
2704 paste ((unsigned char *)str, strlen (str));
2705 free (str);
2632 return; 2706 return;
2633 } 2707 }
2634 else 2708 else
2635 { 2709 {
2636 int i; 2710 int i;
2637 2711
2638 selection_request_time = tm; 2712 selection_request_time = tm;
2639 selection_wait = Sel_normal; 2713 selection_wait = Sel_normal;
2640 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2641 { 2715 {
… …
2649 return; 2723 return;
2650#endif 2724#endif
2651 2725
2652 } 2726 }
2653 } 2727 }
2728
2654 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2655 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2656 selection_paste (display->root, XA_CUT_BUFFER0, False); 2731 selection_paste (display->root, XA_CUT_BUFFER0, False);
2657} 2732}
2658 2733
2659int 2734int
2660rxvt_term::selection_request_other (Atom target, int selnum) 2735rxvt_term::selection_request_other (Atom target, int selnum)
2661{ 2736{
2662 Atom sel; 2737 Atom sel;
2663#ifdef DEBUG_SELECT 2738#ifdef DEBUG_SELECT
2664 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2665#endif 2740#endif
2666 2741
2667 selection_type |= selnum; 2742 selection_type |= selnum;
2743
2668 if (selnum == Sel_Primary) 2744 if (selnum == Sel_Primary)
2669 sel = XA_PRIMARY; 2745 sel = XA_PRIMARY;
2670 else if (selnum == Sel_Secondary) 2746 else if (selnum == Sel_Secondary)
2671 sel = XA_SECONDARY; 2747 sel = XA_SECONDARY;
2672 else 2748 else
2673 sel = xa[XA_CLIPBOARD]; 2749 sel = xa[XA_CLIPBOARD];
2750
2674 if (XGetSelectionOwner (display->display, sel) != None) 2751 if (XGetSelectionOwner (display->display, sel) != None)
2675 { 2752 {
2676 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2677 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2678 TermWin.vt, selection_request_time); 2755 TermWin.vt, selection_request_time);
2679 return 1; 2756 return 1;
2680 } 2757 }
2758
2681 return 0; 2759 return 0;
2682} 2760}
2683 2761
2684/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2685/* 2763/*
… …
2704 * EXT: button 1 or 3 release 2782 * EXT: button 1 or 3 release
2705 */ 2783 */
2706void 2784void
2707rxvt_term::selection_make (Time tm) 2785rxvt_term::selection_make (Time tm)
2708{ 2786{
2709 int i, col, end_col, row, end_row; 2787 int i, col, end_col, row, end_row;
2710 unsigned char *new_selection_text; 2788 wchar_t *new_selection_text;
2711 char *str;
2712 text_t *t; 2789 text_t *t;
2713#ifdef ACS_ASCII
2714 rend_t *re;
2715#endif
2716 2790
2717 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2791 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2718 switch (selection.op) 2792 switch (selection.op)
2719 { 2793 {
2720 case SELECTION_CONT: 2794 case SELECTION_CONT:
… …
2726 selection.op = SELECTION_DONE; 2800 selection.op = SELECTION_DONE;
2727 /* FALLTHROUGH */ 2801 /* FALLTHROUGH */
2728 default: 2802 default:
2729 return; 2803 return;
2730 } 2804 }
2805
2731 selection.op = SELECTION_DONE; 2806 selection.op = SELECTION_DONE;
2732 2807
2733 if (selection.clicks == 4) 2808 if (selection.clicks == 4)
2734 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
2735 2810
2736 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2811 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2737 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2812 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2738
2739 new_selection_text = (unsigned char *)str;
2740 2813
2741 col = selection.beg.col; 2814 col = selection.beg.col;
2742 MAX_IT (col, 0); 2815 MAX_IT (col, 0);
2743 row = selection.beg.row + TermWin.saveLines; 2816 row = selection.beg.row + TermWin.saveLines;
2744 end_row = selection.end.row + TermWin.saveLines; 2817 end_row = selection.end.row + TermWin.saveLines;
2818 int ofs = 0;
2819 int extra = 0;
2745 2820
2746 for (; row <= end_row; row++, col = 0) 2821 for (; row <= end_row; row++, col = 0)
2747 { 2822 {
2748 t = & (screen.text[row][col]); 2823 t = &(screen.text[row][col]);
2749 2824
2750 end_col = screen.tlen[row]; 2825 end_col = screen.tlen[row];
2751 2826
2752 if (end_col == -1) 2827 if (end_col == -1)
2753 end_col = TermWin.ncol; 2828 end_col = TermWin.ncol;
2754 2829
2755 if (row == end_row) 2830 if (row == end_row)
2756 MIN_IT (end_col, selection.end.col); 2831 MIN_IT (end_col, selection.end.col);
2757 2832
2758 for (; col < end_col; col++) 2833 for (; col < end_col; col++)
2834 {
2759 if (*t == NOCHAR) 2835 if (*t == NOCHAR)
2760 t++; 2836 t++;
2837#if ENABLE_COMBINING
2838 else if (IS_COMPOSE (*t))
2839 {
2840 int len = rxvt_composite.expand (*t, 0);
2841
2842 extra -= (len - 1);
2843
2844 if (extra < 0)
2845 {
2846 extra += i;
2847 i += i;
2848 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2849 }
2850
2851 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2852 }
2853#endif
2761 else 2854 else
2762 { 2855 new_selection_text[ofs++] = *t++;
2763 int len = wctomb (str, *t++);
2764 if (len > 0)
2765 str += len;
2766 } 2856 }
2767 2857
2768 if (screen.tlen[row] != -1 && row != end_row) 2858 if (screen.tlen[row] != -1 && row != end_row)
2769 *str++ = '\n'; 2859 new_selection_text[ofs++] = L'\n';
2770 } 2860 }
2771 2861
2772#ifndef NO_OLD_SELECTION 2862#ifndef NO_OLD_SELECTION
2773 if (selection_style == OLD_SELECT) 2863 if (selection_style == OLD_SELECT)
2774 if (end_col == TermWin.ncol) 2864 if (end_col == TermWin.ncol)
2775 *str++ = '\n'; 2865 new_selection_text[ofs++] = L'\n';
2776#endif 2866#endif
2777#ifndef NO_NEW_SELECTION 2867#ifndef NO_NEW_SELECTION
2778 if (selection_style != OLD_SELECT) 2868 if (selection_style != OLD_SELECT)
2779 if (end_col != selection.end.col) 2869 if (end_col != selection.end.col)
2780 *str++ = '\n'; 2870 new_selection_text[ofs++] = L'\n';
2781#endif 2871#endif
2782 *str = '\0'; 2872 new_selection_text[ofs] = 0;
2783 2873
2784 i = str - (char *)new_selection_text;
2785 if (i == 0) 2874 if (ofs == 0)
2786 { 2875 {
2787 free (new_selection_text); 2876 free (new_selection_text);
2788 return; 2877 return;
2789 } 2878 }
2790 2879
2791 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2792 if (str - (char *)new_selection_text > 1024)
2793 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2794
2795 selection.len = i;
2796
2797 if (selection.text)
2798 free (selection.text); 2880 free (selection.text);
2799 2881
2800 selection.text = new_selection_text; 2882 // we usually allocate much more than necessary, so realloc it smaller again
2883 selection.len = ofs;
2884 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2801 2885
2802 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2886 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2803 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2887 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2804 display->set_selection_owner (this); 2888 display->set_selection_owner (this);
2805 else 2889 else
2806 rxvt_print_error ("can't get primary selection"); 2890 rxvt_print_error ("can't get primary selection");
2807 2891
2808 { 2892#if 0
2809 XTextProperty ct; 2893 XTextProperty ct;
2810 char *cl = (char *)selection.text;
2811 2894
2812 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2895 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2813 { 2896 {
2814 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2815 PropModeReplace, ct.value, ct.nitems);
2816 XFree (ct.value);
2817 }
2818 else
2819 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2897 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2820 PropModeReplace, selection.text, (int)selection.len); 2898 PropModeReplace, ct.value, ct.nitems);
2899 XFree (ct.value);
2821 } 2900 }
2901#endif
2822 2902
2823 selection_time = tm; 2903 selection_time = tm;
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2904 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2825} 2905}
2826 2906
… …
3355 ev.target = rq.target; 3435 ev.target = rq.target;
3356 ev.time = rq.time; 3436 ev.time = rq.time;
3357 3437
3358 if (rq.target == xa[XA_TARGETS]) 3438 if (rq.target == xa[XA_TARGETS])
3359 { 3439 {
3360 Atom32 target_list[5]; 3440 Atom32 target_list[6];
3361 Atom32 *target = target_list; 3441 Atom32 *target = target_list;
3362 3442
3363 *target++ = (Atom32) xa[XA_TARGETS]; 3443 *target++ = (Atom32) xa[XA_TARGETS];
3444 *target++ = (Atom32) xa[XA_TIMESTAMP];
3364 *target++ = (Atom32) XA_STRING; 3445 *target++ = (Atom32) XA_STRING;
3365 *target++ = (Atom32) xa[XA_TEXT]; 3446 *target++ = (Atom32) xa[XA_TEXT];
3366 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3447 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3367#if X_HAVE_UTF8_STRING 3448#if X_HAVE_UTF8_STRING
3368 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3449 *target++ = (Atom32) xa[XA_UTF8_STRING];
3369#endif 3450#endif
3451
3370 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3452 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3371 (8 * sizeof (target_list[0])), PropModeReplace, 3453 (8 * sizeof (target_list[0])), PropModeReplace,
3372 (unsigned char *)target_list, 3454 (unsigned char *)target_list,
3373 target - target_list); 3455 target - target_list);
3374 ev.property = rq.property; 3456 ev.property = rq.property;
3375 } 3457 }
3376 else if (rq.target == xa[XA_MULTIPLE]) 3458 else if (rq.target == xa[XA_MULTIPLE])
3377 { 3459 {
3378 /* TODO: Handle MULTIPLE */ 3460 /* TODO: Handle MULTIPLE */
… …
3390 || rq.target == xa[XA_UTF8_STRING] 3472 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3473 )
3392 { 3474 {
3393 short freect = 0; 3475 short freect = 0;
3394 int selectlen; 3476 int selectlen;
3395 char *cl; 3477 wchar_t *cl;
3396 3478
3397 target = rq.target; 3479 target = rq.target;
3398 3480
3399 if (target == XA_STRING) 3481 if (target == XA_STRING)
3400 // we actually don't do XA_STRING, but who cares, as i18n clients 3482 // we actually don't do XA_STRING, but who cares, as i18n clients
3401 // will ask for another format anyways. 3483 // will ask for another format anyways.
3402 style = XStringStyle; 3484 style = XStringStyle;
3403 else if (target == xa[XA_TEXT]) 3485 else if (target == xa[XA_TEXT])
3404 style = XTextStyle; 3486 style = XStdICCTextStyle;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3487 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3488 style = XCompoundTextStyle;
3407#if X_HAVE_UTF8_STRING 3489#if X_HAVE_UTF8_STRING
3408 else if (target == xa[XA_UTF8_STRING]) 3490 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3491 style = XUTF8StringStyle;
… …
3414 style = XCompoundTextStyle; 3496 style = XCompoundTextStyle;
3415 } 3497 }
3416 3498
3417 if (selection.text) 3499 if (selection.text)
3418 { 3500 {
3419 cl = (char *)selection.text; 3501 cl = selection.text;
3420 selectlen = selection.len; 3502 selectlen = selection.len;
3421 } 3503 }
3422 else 3504 else
3423 { 3505 {
3424 cl = ""; 3506 cl = L"";
3425 selectlen = 0; 3507 selectlen = 0;
3426 } 3508 }
3427 3509
3510 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3511 // manually for XUTF8StringStyle.
3428 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3512 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3429 freect = 1; 3513 freect = 1;
3430 else 3514 else
3431 { 3515 {
3432 /* if we failed to convert then send it raw */ 3516 /* if we failed to convert then send it raw */
3433 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
… …
3440 ev.property = rq.property; 3524 ev.property = rq.property;
3441 3525
3442 if (freect) 3526 if (freect)
3443 XFree (ct.value); 3527 XFree (ct.value);
3444 } 3528 }
3529
3445 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3530 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3446} 3531}
3447 3532
3448/* ------------------------------------------------------------------------- * 3533/* ------------------------------------------------------------------------- *
3449 * MOUSE ROUTINES * 3534 * MOUSE ROUTINES *

Diff Legend

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