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.35 by pcg, Tue Feb 24 11:48:40 2004 UTC vs.
Revision 1.59 by pcg, Mon Mar 15 00:08:11 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;
… …
760/* ------------------------------------------------------------------------- */ 762/* ------------------------------------------------------------------------- */
761/* 763/*
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 unicode_t *str, int nlines, int len)
766{ 768{
767 unsigned char checksel, clearsel; 769 unsigned char checksel, clearsel;
768 uint32_t c; 770 unicode_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 unicode_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
… …
2046 int ypixel = (int)Row2Pixel (row); 2108 int ypixel = (int)Row2Pixel (row);
2047 2109
2048 for (col = 0; col < TermWin.ncol; col++) 2110 for (col = 0; col < TermWin.ncol; col++)
2049 { 2111 {
2050 /* 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
2051 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2125 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2052
2053 if (stp[col] == dtp[col] /* Must match characters to skip. */
2054 && (rend == drp[col] /* Either rendition the same or */
2055 || (stp[col] == ' ' /* space w/ no background change */
2056 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2057 continue;
2058
2059 text_t *text = stp + col; 2126 text_t *text = stp + col;
2060 int count = 1; 2127 int count = 1;
2061 2128
2062 /* redraw one or more characters */
2063
2064 dtp[col] = stp[col]; 2129 dtp[col] = stp[col];
2065 drp[col] = rend; 2130 drp[col] = rend;
2066
2067 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2068 continue;
2069 2131
2070 int xpixel = Col2Pixel (col); 2132 int xpixel = Col2Pixel (col);
2071 2133
2072 // this loop looks very messy, it can probably be optimized 2134 // this loop looks very messy, it can probably be optimized
2073 // and cleaned a bit by you? 2135 // and cleaned a bit by you?
… …
2114 int fore = GET_FGCOLOR (rend); // desired foreground 2176 int fore = GET_FGCOLOR (rend); // desired foreground
2115 int back = GET_BGCOLOR (rend); // desired background 2177 int back = GET_BGCOLOR (rend); // desired background
2116 2178
2117 rend = GET_ATTR (rend); 2179 rend = GET_ATTR (rend);
2118 2180
2119 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
2120 if (rvid) 2197 if (rvid)
2121 { 2198 {
2122 SWAP_IT (fore, back, int); 2199 SWAP_IT (fore, back, int);
2123 2200
2124#ifndef NO_BOLD_UNDERLINE_REVERSE 2201#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2127 && !ISSET_PIXCOLOR (Color_cursor) 2204 && !ISSET_PIXCOLOR (Color_cursor)
2128# endif 2205# endif
2129 ) 2206 )
2130 back = Color_RV; 2207 back = Color_RV;
2131#endif 2208#endif
2132
2133 } 2209 }
2210
2134#ifdef TEXT_BLINK 2211#ifdef TEXT_BLINK
2135 if (rend & RS_Blink) 2212 if (rend & RS_Blink && back == Color_bg)
2136 { 2213 {
2137 if (!text_blink_ev.active) 2214 if (!text_blink_ev.active)
2138 { 2215 {
2139 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2216 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2140 hidden_text = 0; 2217 hidden_text = 0;
2141 } 2218 }
2142 else if (hidden_text) 2219 else if (hidden_text)
2143 fore = back; 2220 fore = back;
2144 }
2145#endif
2146#ifndef NO_BOLD_UNDERLINE_REVERSE
2147 else if (rend & RS_Bold)
2148 {
2149 if (ISSET_PIXCOLOR (Color_BD))
2150 fore = Color_BD;
2151 else if (fore == Color_fg)
2152 fore = Color_White;
2153 }
2154 else if (rend & RS_Uline)
2155 {
2156 if (ISSET_PIXCOLOR (Color_UL))
2157 fore = Color_UL;
2158 } 2221 }
2159#endif 2222#endif
2160 2223
2161 /* 2224 /*
2162 * Actually do the drawing of the string here 2225 * Actually do the drawing of the string here
… …
2186 else 2249 else
2187 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2250 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2188 2251
2189 if ((rend & RS_Uline) && (font->descent > 1)) 2252 if ((rend & RS_Uline) && (font->descent > 1))
2190 XDrawLine (display->display, drawBuffer, TermWin.gc, 2253 XDrawLine (display->display, drawBuffer, TermWin.gc,
2191 xpixel, ypixel + font->ascent + 1, 2254 xpixel, ypixel + font->ascent + 1,
2192 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2193 } /* for (col....) */ 2256 } /* for (col....) */
2194 } /* for (row....) */ 2257 } /* for (row....) */
2195 2258
2196 /* 2259 /*
2197 * G: cleanup cursor and display outline cursor if necessary 2260 * G: cleanup cursor and display outline cursor if necessary
… …
2217 while (oldcursor.col + cursorwidth < TermWin.ncol 2280 while (oldcursor.col + cursorwidth < TermWin.ncol
2218 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2281 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2219 cursorwidth++; 2282 cursorwidth++;
2220 2283
2221 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2284 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2222 Col2Pixel (oldcursor.col), 2285 Col2Pixel (oldcursor.col),
2223 Row2Pixel (oldcursor.row), 2286 Row2Pixel (oldcursor.row),
2224 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2287 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2225 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2288 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2226 } 2289 }
2227 } 2290 }
2228 2291
2229 /* 2292 /*
2230 * H: cleanup selection 2293 * H: cleanup selection
… …
2238 /* 2301 /*
2239 * clear the whole screen height, note that width == 0 is treated 2302 * clear the whole screen height, note that width == 0 is treated
2240 * specially by XClearArea 2303 * specially by XClearArea
2241 */ 2304 */
2242 XClearArea (display->display, TermWin.vt, 0, 0, 2305 XClearArea (display->display, TermWin.vt, 0, 0,
2243 (unsigned int)TermWin.int_bwidth, 2306 (unsigned int)TermWin.int_bwidth,
2244 (unsigned int)TermWin_TotalHeight (), False); 2307 (unsigned int)TermWin_TotalHeight (), False);
2308
2245 if (clearlast && TermWin.int_bwidth) 2309 if (clearlast && TermWin.int_bwidth)
2246 /* 2310 /*
2247 * clear the whole screen height, note that width == 0 is treated 2311 * clear the whole screen height, note that width == 0 is treated
2248 * specially by XClearArea 2312 * specially by XClearArea
2249 */ 2313 */
2250 XClearArea (display->display, TermWin.vt, 2314 XClearArea (display->display, TermWin.vt,
2251 TermWin.width + TermWin.int_bwidth, 0, 2315 TermWin.width + TermWin.int_bwidth, 0,
2252 (unsigned int)TermWin.int_bwidth, 2316 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False); 2317 (unsigned int)TermWin_TotalHeight (), False);
2318
2254 if (refresh_type & SMOOTH_REFRESH) 2319 if (refresh_type & SMOOTH_REFRESH)
2255 XSync (display->display, False); 2320 XSync (display->display, False);
2256 2321
2257 num_scr = 0; 2322 num_scr = 0;
2258 num_scr_allow = 1; 2323 num_scr_allow = 1;
… …
2282 } 2347 }
2283} 2348}
2284 2349
2285/* ------------------------------------------------------------------------- */ 2350/* ------------------------------------------------------------------------- */
2286void 2351void
2287rxvt_term::scr_clear () 2352rxvt_term::scr_clear (bool really)
2288{ 2353{
2289 if (!TermWin.mapped) 2354 if (!TermWin.mapped)
2290 return; 2355 return;
2291 2356
2292 num_scr_allow = 0; 2357 num_scr_allow = 0;
2293 want_refresh = 1; 2358 want_refresh = 1;
2359
2294#ifdef TRANSPARENT 2360#ifdef TRANSPARENT
2295 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2296 { 2362 {
2297 int i; 2363 int i;
2298 2364
… …
2305 if (TermWin.parent[i] != None) 2371 if (TermWin.parent[i] != None)
2306 XClearWindow (display->display, TermWin.parent[i]); 2372 XClearWindow (display->display, TermWin.parent[i]);
2307 } 2373 }
2308#endif 2374#endif
2309 2375
2376 if (really)
2310 XClearWindow (display->display, TermWin.vt); 2377 XClearWindow (display->display, TermWin.vt);
2311} 2378}
2312 2379
2313/* ------------------------------------------------------------------------- */ 2380/* ------------------------------------------------------------------------- */
2314void 2381void
2315rxvt_term::scr_reverse_selection () 2382rxvt_term::scr_reverse_selection ()
2316{ 2383{
2317 int i, col, row, end_row;
2318 rend_t *srp;
2319
2320 if (selection.op && current_screen == selection.screen) 2384 if (selection.op && current_screen == selection.screen)
2321 { 2385 {
2322 end_row = TermWin.saveLines - TermWin.view_start; 2386 int end_row = TermWin.saveLines - TermWin.view_start;
2323 i = selection.beg.row + TermWin.saveLines; 2387 int i = selection.beg.row + TermWin.saveLines;
2324 row = selection.end.row + TermWin.saveLines; 2388 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp;
2390
2325 if (i >= end_row) 2391 if (i >= end_row)
2326 col = selection.beg.col; 2392 col = selection.beg.col;
2327 else 2393 else
2328 { 2394 {
2329 col = 0; 2395 col = 0;
2330 i = end_row; 2396 i = end_row;
2331 } 2397 }
2398
2332 end_row += TermWin.nrow; 2399 end_row += TermWin.nrow;
2333 for (; i < row && i < end_row; i++, col = 0) 2400 for (; i < row && i < end_row; i++, col = 0)
2334 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2335 srp[col] ^= RS_RVid; 2402 srp[col] ^= RS_RVid;
2403
2336 if (i == row && i < end_row) 2404 if (i == row && i < end_row)
2337 for (srp = screen.rend[i]; col < selection.end.col; col++) 2405 for (srp = screen.rend[i]; col < selection.end.col; col++)
2338 srp[col] ^= RS_RVid; 2406 srp[col] ^= RS_RVid;
2339 } 2407 }
2340} 2408}
… …
2479 } 2547 }
2480 2548
2481 for (;;) 2549 for (;;)
2482 { 2550 {
2483 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2551 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2484 (long) (PROP_SIZE / 4), delete_prop, 2552 (long) (PROP_SIZE / 4), delete_prop,
2485 AnyPropertyType, &ct.encoding, &ct.format, 2553 AnyPropertyType, &ct.encoding, &ct.format,
2486 &ct.nitems, &bytes_after, 2554 &ct.nitems, &bytes_after,
2487 &ct.value) != Success) 2555 &ct.value) != Success)
2488 break; 2556 break;
2489 2557
2490 if (ct.encoding == 0) 2558 if (ct.encoding == 0)
2491 { 2559 {
2492 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2500 } 2568 }
2501 2569
2502 if (ct.nitems == 0) 2570 if (ct.nitems == 0)
2503 { 2571 {
2504 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2505 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
2506 { 2576 {
2507 /* 2577 /*
2508 * pass through again trying CUT_BUFFER0 if we've come from 2578 * pass through again trying CUT_BUFFER0 if we've come from
2509 * XConvertSelection () but nothing was presented 2579 * XConvertSelection () but nothing was presented
2510 */ 2580 */
… …
2563{ 2633{
2564 int reget_time = 0; 2634 int reget_time = 0;
2565 2635
2566 if (prop == None) 2636 if (prop == None)
2567 return; 2637 return;
2638
2568 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));
2569 if (selection_wait == Sel_normal) 2640 if (selection_wait == Sel_normal)
2570 { 2641 {
2571 int a, afmt; 2642 int a, afmt;
2572 Atom atype; 2643 Atom atype;
2573 unsigned long bytes_after, nitems; 2644 unsigned long bytes_after, nitems;
2574 unsigned char *s = NULL; 2645 unsigned char *s = NULL;
2575 2646
2576 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2647 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2577 xa[XA_INCR], &atype, &afmt, &nitems, 2648 xa[XA_INCR], &atype, &afmt, &nitems,
2578 &bytes_after, &s); 2649 &bytes_after, &s);
2579 if (s) 2650 if (s)
2580 XFree (s); 2651 XFree (s);
2581 if (a != Success) 2652 if (a != Success)
2582 return; 2653 return;
2654
2583#ifndef __CYGWIN32__ 2655#ifndef __CYGWIN32__
2584 if (atype == xa[XA_INCR]) 2656 if (atype == xa[XA_INCR])
2585 { /* start an INCR transfer */ 2657 { /* start an INCR transfer */
2586 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2658 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2587 XDeleteProperty (display->display, win, prop); 2659 XDeleteProperty (display->display, win, prop);
… …
2593 2665
2594 } 2666 }
2595 else if (selection_wait == Sel_incr) 2667 else if (selection_wait == Sel_incr)
2596 { 2668 {
2597 reget_time = 1; 2669 reget_time = 1;
2670
2598 if (selection_paste (win, prop, True) == -1) 2671 if (selection_paste (win, prop, True) == -1)
2599 { 2672 {
2600 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2673 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2601 selection_wait = Sel_none; 2674 selection_wait = Sel_none;
2602 incr_ev.stop (); 2675 incr_ev.stop ();
2603 } 2676 }
2604 } 2677 }
2605 if (reget_time) /* received more data so reget time */ 2678 if (reget_time) /* received more data so reget time */
2606 incr_ev.start (NOW + 10); 2679 incr_ev.start (NOW + 10);
2607} 2680}
2681
2608/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2609/* 2683/*
2610 * Request the current selection: 2684 * Request the current selection:
2611 * Order: > internal selection if available 2685 * Order: > internal selection if available
2612 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2686 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2617 */ 2691 */
2618void 2692void
2619rxvt_term::selection_request (Time tm, int x, int y) 2693rxvt_term::selection_request (Time tm, int x, int y)
2620{ 2694{
2621 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
2622 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2697 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2623 return; /* outside window */ 2698 return; /* outside window */
2624 2699
2625 if (selection.text != NULL) 2700 if (selection.text)
2626 { /* internal selection */ 2701 { /* internal selection */
2627 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2702 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2628 paste (selection.text, selection.len); 2703 char *str = rxvt_wcstombs (selection.text, selection.len);
2704 paste ((unsigned char *)str, strlen (str));
2705 free (str);
2629 return; 2706 return;
2630 } 2707 }
2631 else 2708 else
2632 { 2709 {
2633 int i; 2710 int i;
2634 2711
2635 selection_request_time = tm; 2712 selection_request_time = tm;
2636 selection_wait = Sel_normal; 2713 selection_wait = Sel_normal;
2637 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2638 { 2715 {
… …
2646 return; 2723 return;
2647#endif 2724#endif
2648 2725
2649 } 2726 }
2650 } 2727 }
2728
2651 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2652 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2653 selection_paste (display->root, XA_CUT_BUFFER0, False); 2731 selection_paste (display->root, XA_CUT_BUFFER0, False);
2654} 2732}
2655 2733
2656int 2734int
2657rxvt_term::selection_request_other (Atom target, int selnum) 2735rxvt_term::selection_request_other (Atom target, int selnum)
2658{ 2736{
2659 Atom sel; 2737 Atom sel;
2660#ifdef DEBUG_SELECT 2738#ifdef DEBUG_SELECT
2661 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2662#endif 2740#endif
2663 2741
2664 selection_type |= selnum; 2742 selection_type |= selnum;
2743
2665 if (selnum == Sel_Primary) 2744 if (selnum == Sel_Primary)
2666 sel = XA_PRIMARY; 2745 sel = XA_PRIMARY;
2667 else if (selnum == Sel_Secondary) 2746 else if (selnum == Sel_Secondary)
2668 sel = XA_SECONDARY; 2747 sel = XA_SECONDARY;
2669 else 2748 else
2670 sel = xa[XA_CLIPBOARD]; 2749 sel = xa[XA_CLIPBOARD];
2750
2671 if (XGetSelectionOwner (display->display, sel) != None) 2751 if (XGetSelectionOwner (display->display, sel) != None)
2672 { 2752 {
2673 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]));
2674 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2675 TermWin.vt, selection_request_time); 2755 TermWin.vt, selection_request_time);
2676 return 1; 2756 return 1;
2677 } 2757 }
2758
2678 return 0; 2759 return 0;
2679} 2760}
2680 2761
2681/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2682/* 2763/*
… …
2701 * EXT: button 1 or 3 release 2782 * EXT: button 1 or 3 release
2702 */ 2783 */
2703void 2784void
2704rxvt_term::selection_make (Time tm) 2785rxvt_term::selection_make (Time tm)
2705{ 2786{
2706 int i, col, end_col, row, end_row; 2787 int i, col, end_col, row, end_row;
2707 unsigned char *new_selection_text; 2788 wchar_t *new_selection_text;
2708 char *str;
2709 text_t *t; 2789 text_t *t;
2710#ifdef ACS_ASCII
2711 rend_t *re;
2712#endif
2713 2790
2714 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));
2715 switch (selection.op) 2792 switch (selection.op)
2716 { 2793 {
2717 case SELECTION_CONT: 2794 case SELECTION_CONT:
… …
2723 selection.op = SELECTION_DONE; 2800 selection.op = SELECTION_DONE;
2724 /* FALLTHROUGH */ 2801 /* FALLTHROUGH */
2725 default: 2802 default:
2726 return; 2803 return;
2727 } 2804 }
2805
2728 selection.op = SELECTION_DONE; 2806 selection.op = SELECTION_DONE;
2729 2807
2730 if (selection.clicks == 4) 2808 if (selection.clicks == 4)
2731 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
2732 2810
2733 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2811 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2734 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2812 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2735
2736 new_selection_text = (unsigned char *)str;
2737 2813
2738 col = selection.beg.col; 2814 col = selection.beg.col;
2739 MAX_IT (col, 0); 2815 MAX_IT (col, 0);
2740 row = selection.beg.row + TermWin.saveLines; 2816 row = selection.beg.row + TermWin.saveLines;
2741 end_row = selection.end.row + TermWin.saveLines; 2817 end_row = selection.end.row + TermWin.saveLines;
2818 int ofs = 0;
2819 int extra = 0;
2742 2820
2743 for (; row <= end_row; row++, col = 0) 2821 for (; row <= end_row; row++, col = 0)
2744 { 2822 {
2745 t = & (screen.text[row][col]); 2823 t = &(screen.text[row][col]);
2746 2824
2747 end_col = screen.tlen[row]; 2825 end_col = screen.tlen[row];
2748 2826
2749 if (end_col == -1) 2827 if (end_col == -1)
2750 end_col = TermWin.ncol; 2828 end_col = TermWin.ncol;
2751 2829
2752 if (row == end_row) 2830 if (row == end_row)
2753 MIN_IT (end_col, selection.end.col); 2831 MIN_IT (end_col, selection.end.col);
2754 2832
2755 for (; col < end_col; col++) 2833 for (; col < end_col; col++)
2834 {
2756 if (*t == NOCHAR) 2835 if (*t == NOCHAR)
2757 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
2758 else 2854 else
2759 { 2855 new_selection_text[ofs++] = *t++;
2760 int len = wctomb (str, *t++);
2761 if (len > 0)
2762 str += len;
2763 } 2856 }
2764 2857
2765 if (screen.tlen[row] != -1 && row != end_row) 2858 if (screen.tlen[row] != -1 && row != end_row)
2766 *str++ = '\n'; 2859 new_selection_text[ofs++] = L'\n';
2767 } 2860 }
2768 2861
2769#ifndef NO_OLD_SELECTION
2770 if (selection_style == OLD_SELECT)
2771 if (end_col == TermWin.ncol)
2772 *str++ = '\n';
2773#endif
2774#ifndef NO_NEW_SELECTION
2775 if (selection_style != OLD_SELECT)
2776 if (end_col != selection.end.col) 2862 if (end_col != selection.end.col)
2777 *str++ = '\n'; 2863 new_selection_text[ofs++] = L'\n';
2778#endif
2779 *str = '\0';
2780 2864
2781 i = str - (char *)new_selection_text; 2865 new_selection_text[ofs] = 0;
2866
2782 if (i == 0) 2867 if (ofs == 0)
2783 { 2868 {
2784 free (new_selection_text); 2869 free (new_selection_text);
2785 return; 2870 return;
2786 } 2871 }
2787 2872
2788 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2789 if (str - (char *)new_selection_text > 1024)
2790 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2791
2792 selection.len = i;
2793
2794 if (selection.text)
2795 free (selection.text); 2873 free (selection.text);
2796 2874
2797 selection.text = new_selection_text; 2875 // we usually allocate much more than necessary, so realloc it smaller again
2876 selection.len = ofs;
2877 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2798 2878
2799 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2879 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2800 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2880 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2801 display->set_selection_owner (this); 2881 display->set_selection_owner (this);
2802 else 2882 else
2803 rxvt_print_error ("can't get primary selection"); 2883 rxvt_print_error ("can't get primary selection");
2804 2884
2805 { 2885#if 0
2806 XTextProperty ct; 2886 XTextProperty ct;
2807 char *cl = (char *)selection.text;
2808 2887
2809 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2888 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2810 { 2889 {
2811 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2812 PropModeReplace, ct.value, ct.nitems);
2813 XFree (ct.value);
2814 }
2815 else
2816 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2890 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2817 PropModeReplace, selection.text, (int)selection.len); 2891 PropModeReplace, ct.value, ct.nitems);
2892 XFree (ct.value);
2818 } 2893 }
2894#endif
2819 2895
2820 selection_time = tm; 2896 selection_time = tm;
2821 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2897 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2822} 2898}
2823 2899
… …
2852rxvt_term::selection_start_colrow (int col, int row) 2928rxvt_term::selection_start_colrow (int col, int row)
2853{ 2929{
2854 want_refresh = 1; 2930 want_refresh = 1;
2855 selection.mark.col = col; 2931 selection.mark.col = col;
2856 selection.mark.row = row - TermWin.view_start; 2932 selection.mark.row = row - TermWin.view_start;
2933
2857 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2934 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2858 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2935 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2859 MAX_IT (selection.mark.col, 0); 2936 MAX_IT (selection.mark.col, 0);
2860 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2937 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2861 2938
2939 while (selection.mark.col > 0
2940 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2941 --selection.mark.col;
2942
2862 if (selection.op) 2943 if (selection.op)
2863 { /* clear the old selection */ 2944 { /* clear the old selection */
2864 selection.beg.row = selection.end.row = selection.mark.row; 2945 selection.beg.row = selection.end.row = selection.mark.row;
2865 selection.beg.col = selection.end.col = selection.mark.col; 2946 selection.beg.col = selection.end.col = selection.mark.col;
2866 } 2947 }
2948
2867 selection.op = SELECTION_INIT; 2949 selection.op = SELECTION_INIT;
2868 selection.screen = current_screen; 2950 selection.screen = current_screen;
2869} 2951}
2870 2952
2871/* ------------------------------------------------------------------------- */ 2953/* ------------------------------------------------------------------------- */
… …
2873 * Word select: select text for 2 clicks 2955 * Word select: select text for 2 clicks
2874 * We now only find out the boundary in one direction 2956 * We now only find out the boundary in one direction
2875 */ 2957 */
2876 2958
2877/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2959/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2878#define DELIMIT_TEXT(x) \ 2960#define DELIMIT_TEXT(x) \
2879 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2961 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2880#define DELIMIT_REND(x) 1 2962#define DELIMIT_REND(x) 1
2881 2963
2882void 2964void
2883rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2965rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2884{ 2966{
2885 int col, row, dirnadd, tcol, trow, w1, w2; 2967 int col, row, dirnadd, tcol, trow, w1, w2;
2886 row_col_t bound; 2968 row_col_t bound;
2887 text_t *stp; 2969 text_t *stp;
2888 rend_t *srp; 2970 rend_t *srp;
2889 2971
2890 if (dirn == UP) 2972 if (dirn == UP)
2891 { 2973 {
2892 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2974 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2893 bound.col = 0; 2975 bound.col = 0;
… …
2897 { 2979 {
2898 bound.row = TermWin.saveLines + TermWin.nrow; 2980 bound.row = TermWin.saveLines + TermWin.nrow;
2899 bound.col = TermWin.ncol - 1; 2981 bound.col = TermWin.ncol - 1;
2900 dirnadd = 1; 2982 dirnadd = 1;
2901 } 2983 }
2984
2902 row = mark->row + TermWin.saveLines; 2985 row = mark->row + TermWin.saveLines;
2903 col = mark->col; 2986 col = mark->col;
2904 MAX_IT (col, 0); 2987 MAX_IT (col, 0);
2905 /* find the edge of a word */ 2988 /* find the edge of a word */
2906 stp = & (screen.text[row][col]); 2989 stp = & (screen.text[row][col]);
2907 w1 = DELIMIT_TEXT (*stp); 2990 w1 = DELIMIT_TEXT (*stp);
2908 2991
2909 if (selection_style != NEW_SELECT)
2910 {
2911 if (w1 == 1)
2912 {
2913 stp += dirnadd;
2914 if (DELIMIT_TEXT (*stp) == 1)
2915 goto Old_Word_Selection_You_Die;
2916 col += dirnadd;
2917 }
2918 w1 = 0;
2919 }
2920 srp = (&screen.rend[row][col]); 2992 srp = (&screen.rend[row][col]);
2921 w2 = DELIMIT_REND (*srp); 2993 w2 = DELIMIT_REND (*srp);
2922 2994
2923 for (;;) 2995 for (;;)
2924 { 2996 {
2925 for (; col != bound.col; col += dirnadd) 2997 for (; col != bound.col; col += dirnadd)
2926 { 2998 {
2927 stp += dirnadd; 2999 stp += dirnadd;
3000 srp += dirnadd;
3001
3002 if (*stp == NOCHAR)
3003 continue;
3004
2928 if (DELIMIT_TEXT (*stp) != w1) 3005 if (DELIMIT_TEXT (*stp) != w1)
2929 break; 3006 break;
2930 srp += dirnadd;
2931 if (DELIMIT_REND (*srp) != w2) 3007 if (DELIMIT_REND (*srp) != w2)
2932 break; 3008 break;
2933 } 3009 }
3010
2934 if ((col == bound.col) && (row != bound.row)) 3011 if ((col == bound.col) && (row != bound.row))
2935 { 3012 {
2936 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3013 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2937 { 3014 {
2938 trow = row + dirnadd; 3015 trow = row + dirnadd;
2939 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3016 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3017
2940 if (screen.text[trow] == NULL) 3018 if (screen.text[trow] == NULL)
2941 break; 3019 break;
3020
2942 stp = & (screen.text[trow][tcol]); 3021 stp = & (screen.text[trow][tcol]);
2943 srp = & (screen.rend[trow][tcol]); 3022 srp = & (screen.rend[trow][tcol]);
3023
2944 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3024 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2945 break; 3025 break;
3026
2946 row = trow; 3027 row = trow;
2947 col = tcol; 3028 col = tcol;
2948 continue; 3029 continue;
2949 } 3030 }
2950 } 3031 }
2951 break; 3032 break;
2952 } 3033 }
3034
2953Old_Word_Selection_You_Die: 3035Old_Word_Selection_You_Die:
2954 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); 3036 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2955 3037
2956 if (dirn == DN) 3038 if (dirn == DN)
2957 col++; /* put us on one past the end */ 3039 col++; /* put us on one past the end */
… …
2979 MAX_IT (row, 0); 3061 MAX_IT (row, 0);
2980 MIN_IT (row, (int)TermWin.nrow - 1); 3062 MIN_IT (row, (int)TermWin.nrow - 1);
2981 MAX_IT (col, 0); 3063 MAX_IT (col, 0);
2982 MIN_IT (col, (int)TermWin.ncol); 3064 MIN_IT (col, (int)TermWin.ncol);
2983 3065
2984#ifndef NO_NEW_SELECTION
2985 /* 3066 /*
2986 * If we're selecting characters (single click) then we must check first 3067 * If we're selecting characters (single click) then we must check first
2987 * if we are at the same place as the original mark. If we are then 3068 * if we are at the same place as the original mark. If we are then
2988 * select nothing. Otherwise, if we're to the right of the mark, you have to 3069 * select nothing. Otherwise, if we're to the right of the mark, you have to
2989 * be _past_ a character for it to be selected. 3070 * be _past_ a character for it to be selected.
2990 */ 3071 */
2991 if (selection_style != OLD_SELECT)
2992 {
2993 if (((selection.clicks % 3) == 1) && !flag 3072 if (((selection.clicks % 3) == 1) && !flag
2994 && (col == selection.mark.col 3073 && (col == selection.mark.col
2995 && (row == selection.mark.row + TermWin.view_start))) 3074 && (row == selection.mark.row + TermWin.view_start)))
2996 { 3075 {
2997 /* select nothing */ 3076 /* select nothing */
2998 selection.beg.row = selection.end.row = 0; 3077 selection.beg.row = selection.end.row = 0;
2999 selection.beg.col = selection.end.col = 0; 3078 selection.beg.col = selection.end.col = 0;
3000 selection.clicks = 4; 3079 selection.clicks = 4;
3001 want_refresh = 1; 3080 want_refresh = 1;
3002 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3081 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3003 return; 3082 return;
3004 }
3005 } 3083 }
3006#endif 3084
3007 if (selection.clicks == 4) 3085 if (selection.clicks == 4)
3008 selection.clicks = 1; 3086 selection.clicks = 1;
3009 3087
3010 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3088 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3011 flag == 1 ? 1 : 0, /* ? button press */ 3089 flag == 1 ? 1 : 0, /* ? button press */
… …
3065 pos.col = col; 3143 pos.col = col;
3066 pos.row = row; 3144 pos.row = row;
3067 3145
3068 pos.row -= TermWin.view_start; /* adjust for scroll */ 3146 pos.row -= TermWin.view_start; /* adjust for scroll */
3069 3147
3070#ifndef NO_OLD_SELECTION
3071 /*
3072 * This mimics some of the selection behaviour of version 2.20 and before.
3073 * There are no ``selection modes'', button3 is always character extension.
3074 * Note: button3 drag is always available, c.f. v2.20
3075 * Selection always terminates (left or right as appropriate) at the mark.
3076 */
3077 if (selection_style == OLD_SELECT)
3078 {
3079 if (selection.clicks == 1 || button3)
3080 {
3081 if (hate_those_clicks)
3082 {
3083 hate_those_clicks = 0;
3084 if (selection.clicks == 1)
3085 {
3086 selection.beg.row = selection.mark.row;
3087 selection.beg.col = selection.mark.col;
3088 }
3089 else
3090 {
3091 selection.mark.row = selection.beg.row;
3092 selection.mark.col = selection.beg.col;
3093 }
3094 }
3095 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3096 {
3097 selection.end.row = selection.mark.row;
3098 selection.end.col = selection.mark.col + 1;
3099 selection.beg.row = pos.row;
3100 selection.beg.col = pos.col;
3101 }
3102 else
3103 {
3104 selection.beg.row = selection.mark.row;
3105 selection.beg.col = selection.mark.col;
3106 selection.end.row = pos.row;
3107 selection.end.col = pos.col + 1;
3108 }
3109 }
3110 else if (selection.clicks == 2)
3111 {
3112 selection_delimit_word (UP, & (selection.mark),
3113 & (selection.beg));
3114 selection_delimit_word (DN, & (selection.mark),
3115 & (selection.end));
3116 hate_those_clicks = 1;
3117 }
3118 else if (selection.clicks == 3)
3119 {
3120 selection.beg.row = selection.end.row = selection.mark.row;
3121 selection.beg.col = 0;
3122 selection.end.col = ncol;
3123 hate_those_clicks = 1;
3124 }
3125 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3126 return;
3127 }
3128#endif /* ! NO_OLD_SELECTION */
3129#ifndef NO_NEW_SELECTION
3130 /* selection_style must not be OLD_SELECT to get here */
3131 /* 3148 /*
3132 * This is mainly xterm style selection with a couple of differences, mainly 3149 * This is mainly xterm style selection with a couple of differences, mainly
3133 * in the way button3 drag extension works. 3150 * in the way button3 drag extension works.
3134 * We're either doing: button1 drag; button3 press; or button3 drag 3151 * We're either doing: button1 drag; button3 press; or button3 drag
3135 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3152 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3140 * a point/word/line which is either the start or end of the selection 3157 * a point/word/line which is either the start or end of the selection
3141 * and it was decided by whichever point/word/line was `fixed' at the 3158 * and it was decided by whichever point/word/line was `fixed' at the
3142 * time of the most recent button3 press 3159 * time of the most recent button3 press
3143 */ 3160 */
3144 if (button3 && buttonpress) 3161 if (button3 && buttonpress)
3145 { /* button3 press */ 3162 { /* button3 press */
3146 /* 3163 /*
3147 * first determine which edge of the selection we are closest to 3164 * first determine which edge of the selection we are closest to
3148 */ 3165 */
3149 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3166 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3150 || (!ROWCOL_IS_AFTER (pos, selection.end) 3167 || (!ROWCOL_IS_AFTER (pos, selection.end)
3151 && (((pos.col - selection.beg.col) 3168 && (((pos.col - selection.beg.col)
3152 + ((pos.row - selection.beg.row) * ncol)) 3169 + ((pos.row - selection.beg.row) * ncol))
3153 < ((selection.end.col - pos.col) 3170 < ((selection.end.col - pos.col)
3154 + ((selection.end.row - pos.row) * ncol))))) 3171 + ((selection.end.row - pos.row) * ncol)))))
3155 closeto = LEFT; 3172 closeto = LEFT;
3173
3156 if (closeto == LEFT) 3174 if (closeto == LEFT)
3157 { 3175 {
3158 selection.beg.row = pos.row; 3176 selection.beg.row = pos.row;
3159 selection.beg.col = pos.col; 3177 selection.beg.col = pos.col;
3160 selection.mark.row = selection.end.row; 3178 selection.mark.row = selection.end.row;
3161 selection.mark.col = selection.end.col 3179 selection.mark.col = selection.end.col - (selection.clicks == 2);
3162 - (selection.clicks == 2);
3163 } 3180 }
3164 else 3181 else
3165 { 3182 {
3166 selection.end.row = pos.row; 3183 selection.end.row = pos.row;
3167 selection.end.col = pos.col; 3184 selection.end.col = pos.col;
3168 selection.mark.row = selection.beg.row; 3185 selection.mark.row = selection.beg.row;
3169 selection.mark.col = selection.beg.col; 3186 selection.mark.col = selection.beg.col;
3170 } 3187 }
3171 } 3188 }
3172 else 3189 else
3173 { /* button1 drag or button3 drag */ 3190 { /* button1 drag or button3 drag */
3174 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3191 if (ROWCOL_IS_AFTER (selection.mark, pos))
3175 { 3192 {
3176 if ((selection.mark.row == selection.end.row) 3193 if ((selection.mark.row == selection.end.row)
3177 && (selection.mark.col == selection.end.col) 3194 && (selection.mark.col == selection.end.col)
3178 && clickchange && selection.clicks == 2) 3195 && clickchange && selection.clicks == 2)
3179 selection.mark.col--; 3196 selection.mark.col--;
3197
3180 selection.beg.row = pos.row; 3198 selection.beg.row = pos.row;
3181 selection.beg.col = pos.col; 3199 selection.beg.col = pos.col;
3182 selection.end.row = selection.mark.row; 3200 selection.end.row = selection.mark.row;
3183 selection.end.col = selection.mark.col 3201 selection.end.col = selection.mark.col + (selection.clicks == 2);
3184 + (selection.clicks == 2);
3185 } 3202 }
3186 else 3203 else
3187 { 3204 {
3188 selection.beg.row = selection.mark.row; 3205 selection.beg.row = selection.mark.row;
3189 selection.beg.col = selection.mark.col; 3206 selection.beg.col = selection.mark.col;
… …
3193 } 3210 }
3194 3211
3195 if (selection.clicks == 1) 3212 if (selection.clicks == 1)
3196 { 3213 {
3197 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3214 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3215
3198 if (end_col != -1 && selection.beg.col > end_col) 3216 if (end_col != -1 && selection.beg.col > end_col)
3199 { 3217 {
3200#if 1 3218#if 1
3201 selection.beg.col = ncol; 3219 selection.beg.col = ncol;
3202#else 3220#else
3203 if (selection.beg.row != selection.end.row) 3221 if (selection.beg.row != selection.end.row)
3204 selection.beg.col = ncol; 3222 selection.beg.col = ncol;
3205 else 3223 else
3206 selection.beg.col = selection.mark.col; 3224 selection.beg.col = selection.mark.col;
3207#endif 3225#endif
3208
3209 } 3226 }
3227
3210 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3228 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3229
3211 if (end_col != -1 && selection.end.col > end_col) 3230 if (end_col != -1 && selection.end.col > end_col)
3212 selection.end.col = ncol; 3231 selection.end.col = ncol;
3213
3214 } 3232 }
3215 else if (selection.clicks == 2) 3233 else if (selection.clicks == 2)
3216 { 3234 {
3217 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3235 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3218 selection.end.col--; 3236 selection.end.col--;
3237
3219 selection_delimit_word (UP, & (selection.beg), 3238 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3220 & (selection.beg));
3221 selection_delimit_word (DN, & (selection.end), 3239 selection_delimit_word (DN, & (selection.end), & (selection.end));
3222 & (selection.end));
3223 } 3240 }
3224 else if (selection.clicks == 3) 3241 else if (selection.clicks == 3)
3225 { 3242 {
3226#ifndef NO_FRILLS 3243#ifndef NO_FRILLS
3227 if ((Options & Opt_tripleclickwords)) 3244 if ((Options & Opt_tripleclickwords))
3228 { 3245 {
3229 int end_row; 3246 int end_row;
3230 3247
3231 selection_delimit_word (UP, & (selection.beg), 3248 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3232 & (selection.beg));
3233 end_row = screen.tlen[selection.mark.row 3249 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3234 + TermWin.saveLines]; 3250
3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3251 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3236 end_row++)
3237 { 3252 {
3238 end_col = screen.tlen[end_row + TermWin.saveLines]; 3253 end_col = screen.tlen[end_row + TermWin.saveLines];
3254
3239 if (end_col != -1) 3255 if (end_col != -1)
3240 { 3256 {
3241 selection.end.row = end_row; 3257 selection.end.row = end_row;
3242 selection.end.col = end_col; 3258 selection.end.col = end_col;
3243 selection_remove_trailing_spaces (); 3259 selection_remove_trailing_spaces ();
… …
3245 } 3261 }
3246 } 3262 }
3247 } 3263 }
3248 else 3264 else
3249#endif 3265#endif
3250
3251 { 3266 {
3252 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3267 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3253 selection.mark.col++; 3268 selection.mark.col++;
3254 selection.beg.col = 0; 3269 selection.beg.col = 0;
3255 selection.end.col = ncol; 3270 selection.end.col = ncol;
3256 } 3271 }
3257 } 3272 }
3273
3258 if (button3 && buttonpress) 3274 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3275 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3276 if (closeto == LEFT)
3261 { 3277 {
3262 selection.mark.row = selection.end.row; 3278 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3279 selection.mark.col = selection.end.col
3264 - (selection.clicks == 2); 3280 - (selection.clicks == 2);
… …
3268 selection.mark.row = selection.beg.row; 3284 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3285 selection.mark.col = selection.beg.col;
3270 } 3286 }
3271 } 3287 }
3272 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3288 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3273#endif /* ! NO_NEW_SELECTION */
3274} 3289}
3275 3290
3276#ifndef NO_FRILLS 3291#ifndef NO_FRILLS
3277void 3292void
3278rxvt_term::selection_remove_trailing_spaces () 3293rxvt_term::selection_remove_trailing_spaces ()
… …
3352 ev.target = rq.target; 3367 ev.target = rq.target;
3353 ev.time = rq.time; 3368 ev.time = rq.time;
3354 3369
3355 if (rq.target == xa[XA_TARGETS]) 3370 if (rq.target == xa[XA_TARGETS])
3356 { 3371 {
3357 Atom32 target_list[5]; 3372 Atom32 target_list[6];
3358 Atom32 *target = target_list; 3373 Atom32 *target = target_list;
3359 3374
3360 *target++ = (Atom32) xa[XA_TARGETS]; 3375 *target++ = (Atom32) xa[XA_TARGETS];
3376 *target++ = (Atom32) xa[XA_TIMESTAMP];
3361 *target++ = (Atom32) XA_STRING; 3377 *target++ = (Atom32) XA_STRING;
3362 *target++ = (Atom32) xa[XA_TEXT]; 3378 *target++ = (Atom32) xa[XA_TEXT];
3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3379 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3364#if X_HAVE_UTF8_STRING 3380#if X_HAVE_UTF8_STRING
3365 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3381 *target++ = (Atom32) xa[XA_UTF8_STRING];
3366#endif 3382#endif
3383
3367 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3384 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3368 (8 * sizeof (target_list[0])), PropModeReplace, 3385 (8 * sizeof (target_list[0])), PropModeReplace,
3369 (unsigned char *)target_list, 3386 (unsigned char *)target_list,
3370 target - target_list); 3387 target - target_list);
3371 ev.property = rq.property; 3388 ev.property = rq.property;
3372 } 3389 }
3373 else if (rq.target == xa[XA_MULTIPLE]) 3390 else if (rq.target == xa[XA_MULTIPLE])
3374 { 3391 {
3375 /* TODO: Handle MULTIPLE */ 3392 /* TODO: Handle MULTIPLE */
… …
3387 || rq.target == xa[XA_UTF8_STRING] 3404 || rq.target == xa[XA_UTF8_STRING]
3388 ) 3405 )
3389 { 3406 {
3390 short freect = 0; 3407 short freect = 0;
3391 int selectlen; 3408 int selectlen;
3392 char *cl; 3409 wchar_t *cl;
3393 3410
3394 target = rq.target; 3411 target = rq.target;
3395 3412
3396 if (target == XA_STRING) 3413 if (target == XA_STRING)
3397 // we actually don't do XA_STRING, but who cares, as i18n clients 3414 // we actually don't do XA_STRING, but who cares, as i18n clients
3398 // will ask for another format anyways. 3415 // will ask for another format anyways.
3399 style = XStringStyle; 3416 style = XStringStyle;
3400 else if (target == xa[XA_TEXT]) 3417 else if (target == xa[XA_TEXT])
3401 style = XTextStyle; 3418 style = XStdICCTextStyle;
3402 else if (target == xa[XA_COMPOUND_TEXT]) 3419 else if (target == xa[XA_COMPOUND_TEXT])
3403 style = XCompoundTextStyle; 3420 style = XCompoundTextStyle;
3404#if X_HAVE_UTF8_STRING 3421#if X_HAVE_UTF8_STRING
3405 else if (target == xa[XA_UTF8_STRING]) 3422 else if (target == xa[XA_UTF8_STRING])
3406 style = XUTF8StringStyle; 3423 style = XUTF8StringStyle;
… …
3411 style = XCompoundTextStyle; 3428 style = XCompoundTextStyle;
3412 } 3429 }
3413 3430
3414 if (selection.text) 3431 if (selection.text)
3415 { 3432 {
3416 cl = (char *)selection.text; 3433 cl = selection.text;
3417 selectlen = selection.len; 3434 selectlen = selection.len;
3418 } 3435 }
3419 else 3436 else
3420 { 3437 {
3421 cl = ""; 3438 cl = L"";
3422 selectlen = 0; 3439 selectlen = 0;
3423 } 3440 }
3424 3441
3442 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3443 // manually for XUTF8StringStyle.
3425 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3444 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3426 freect = 1; 3445 freect = 1;
3427 else 3446 else
3428 { 3447 {
3429 /* if we failed to convert then send it raw */ 3448 /* if we failed to convert then send it raw */
3430 ct.value = (unsigned char *)cl; 3449 ct.value = (unsigned char *)cl;
… …
3437 ev.property = rq.property; 3456 ev.property = rq.property;
3438 3457
3439 if (freect) 3458 if (freect)
3440 XFree (ct.value); 3459 XFree (ct.value);
3441 } 3460 }
3461
3442 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3462 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3443} 3463}
3444 3464
3445/* ------------------------------------------------------------------------- * 3465/* ------------------------------------------------------------------------- *
3446 * MOUSE ROUTINES * 3466 * MOUSE ROUTINES *

Diff Legend

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