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.39 by pcg, Wed Feb 25 15:06:05 2004 UTC vs.
Revision 1.59 by pcg, Mon Mar 15 00:08:11 2004 UTC

… …
762/* ------------------------------------------------------------------------- */ 762/* ------------------------------------------------------------------------- */
763/* 763/*
764 * Add text given in <str> of length <len> to screen struct 764 * Add text given in <str> of length <len> to screen struct
765 */ 765 */
766void 766void
767rxvt_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)
768{ 768{
769 unsigned char checksel, clearsel; 769 unsigned char checksel, clearsel;
770 uint32_t c; 770 unicode_t c;
771 int i, row, last_col; 771 int i, row, last_col;
772 text_t *stp; 772 text_t *stp;
773 rend_t *srp; 773 rend_t *srp;
774 774
775 if (len <= 0) /* sanity */ 775 if (len <= 0) /* sanity */
776 return; 776 return;
777 777
778 want_refresh = 1; 778 want_refresh = 1;
… …
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 846 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 847 {
848 checksel = 0; 848 checksel = 0;
849 clearsel = 1; 849 clearsel = 1;
850 } 850 }
851
851 if (screen.flags & Screen_WrapNext) 852 if (screen.flags & Screen_WrapNext)
852 { 853 {
853 screen.tlen[row] = -1; 854 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 855 if (screen.cur.row == screen.bscroll)
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1)) 857 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 858 row = (++screen.cur.row) + TermWin.saveLines;
859
858 stp = screen.text[row]; /* _must_ refresh */ 860 stp = screen.text[row]; /* _must_ refresh */
859 srp = screen.rend[row]; /* _must_ refresh */ 861 srp = screen.rend[row]; /* _must_ refresh */
860 screen.cur.col = 0; 862 screen.cur.col = 0;
861 screen.flags &= ~Screen_WrapNext; 863 screen.flags &= ~Screen_WrapNext;
862 } 864 }
865
863 if (screen.flags & Screen_Insert) 866 if (screen.flags & Screen_Insert)
864 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);
865 873
866 if (charsets[screen.charset] == '0') // DEC SPECIAL 874 if (charsets[screen.charset] == '0') // DEC SPECIAL
867 switch (c) 875 switch (c)
868 { 876 {
869 // dunno where these come from
870#if 0
871 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
872 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
873#endif
874 // vt100 special graphics and line drawing 877 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 878 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 879 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 880 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 881 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
… …
883 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; 886 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
884 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; 887 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
885 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 888 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
886 } 889 }
887 890
888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
889 // rely on wcwidth to tell us the character width, at least for non-ascii
890 int width = c <= 128 ? 1 : wcwidth (c);
891
892 // width -1 characters (e.g. combining chars) are ignored currently.
893 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
894 do 900 do
895 { 901 {
896 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
897 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
898 904
899 if (screen.cur.col < last_col - 1) 905 if (screen.cur.col < last_col - 1)
900 screen.cur.col++; 906 screen.cur.col++;
901 else 907 else
902 { 908 {
903 screen.tlen[row] = last_col; 909 screen.tlen[row] = last_col;
904 if (screen.flags & Screen_Autowrap) 910 if (screen.flags & Screen_Autowrap)
905 screen.flags |= Screen_WrapNext; 911 screen.flags |= Screen_WrapNext;
906 break; 912 break;
907 } 913 }
908 914
909 c = NOCHAR; 915 c = NOCHAR;
910 } 916 }
911 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 }
912 else 948 else
913 (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 }
914 } 964 }
915 965
916 if (screen.tlen[row] != -1) /* XXX: think about this */ 966 if (screen.tlen[row] != -1) /* XXX: think about this */
917 MAX_IT (screen.tlen[row], screen.cur.col); 967 MAX_IT (screen.tlen[row], screen.cur.col);
918 968
… …
1098 else 1148 else
1099 screen.cur.row = row; 1149 screen.cur.row = row;
1100 } 1150 }
1101 MAX_IT (screen.cur.row, 0); 1151 MAX_IT (screen.cur.row, 0);
1102 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--;
1103} 1157}
1104 1158
1105/* ------------------------------------------------------------------------- */ 1159/* ------------------------------------------------------------------------- */
1106/* 1160/*
1107 * direction should be UP or DN 1161 * direction should be UP or DN
… …
2054 int ypixel = (int)Row2Pixel (row); 2108 int ypixel = (int)Row2Pixel (row);
2055 2109
2056 for (col = 0; col < TermWin.ncol; col++) 2110 for (col = 0; col < TermWin.ncol; col++)
2057 { 2111 {
2058 /* 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
2059 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2125 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2060
2061 if (stp[col] == dtp[col] /* Must match characters to skip. */
2062 && (rend == drp[col] /* Either rendition the same or */
2063 || (stp[col] == ' ' /* space w/ no background change */
2064 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2065 continue;
2066
2067 text_t *text = stp + col; 2126 text_t *text = stp + col;
2068 int count = 1; 2127 int count = 1;
2069 2128
2070 /* redraw one or more characters */
2071
2072 dtp[col] = stp[col]; 2129 dtp[col] = stp[col];
2073 drp[col] = rend; 2130 drp[col] = rend;
2074
2075 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2076 continue;
2077 2131
2078 int xpixel = Col2Pixel (col); 2132 int xpixel = Col2Pixel (col);
2079 2133
2080 // this loop looks very messy, it can probably be optimized 2134 // this loop looks very messy, it can probably be optimized
2081 // and cleaned a bit by you? 2135 // and cleaned a bit by you?
… …
2134 else 2188 else
2135 rvid = !rvid; 2189 rvid = !rvid;
2136 } 2190 }
2137 2191
2138 if (rend & RS_Uline) 2192 if (rend & RS_Uline)
2139 {
2140 if (ISSET_PIXCOLOR (Color_UL)) 2193 if (ISSET_PIXCOLOR (Color_UL))
2141 fore = Color_UL; 2194 fore = Color_UL;
2142 }
2143#endif 2195#endif
2144 2196
2145 if (rvid) 2197 if (rvid)
2146 { 2198 {
2147 SWAP_IT (fore, back, int); 2199 SWAP_IT (fore, back, int);
… …
2155 back = Color_RV; 2207 back = Color_RV;
2156#endif 2208#endif
2157 } 2209 }
2158 2210
2159#ifdef TEXT_BLINK 2211#ifdef TEXT_BLINK
2160 if (rend & RS_Blink) 2212 if (rend & RS_Blink && back == Color_bg)
2161 { 2213 {
2162 if (!text_blink_ev.active) 2214 if (!text_blink_ev.active)
2163 { 2215 {
2164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2216 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2165 hidden_text = 0; 2217 hidden_text = 0;
… …
2197 else 2249 else
2198 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2250 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2199 2251
2200 if ((rend & RS_Uline) && (font->descent > 1)) 2252 if ((rend & RS_Uline) && (font->descent > 1))
2201 XDrawLine (display->display, drawBuffer, TermWin.gc, 2253 XDrawLine (display->display, drawBuffer, TermWin.gc,
2202 xpixel, ypixel + font->ascent + 1, 2254 xpixel, ypixel + font->ascent + 1,
2203 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2204 } /* for (col....) */ 2256 } /* for (col....) */
2205 } /* for (row....) */ 2257 } /* for (row....) */
2206 2258
2207 /* 2259 /*
2208 * G: cleanup cursor and display outline cursor if necessary 2260 * G: cleanup cursor and display outline cursor if necessary
… …
2228 while (oldcursor.col + cursorwidth < TermWin.ncol 2280 while (oldcursor.col + cursorwidth < TermWin.ncol
2229 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2281 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2230 cursorwidth++; 2282 cursorwidth++;
2231 2283
2232 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2284 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2233 Col2Pixel (oldcursor.col), 2285 Col2Pixel (oldcursor.col),
2234 Row2Pixel (oldcursor.row), 2286 Row2Pixel (oldcursor.row),
2235 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2287 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2236 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2288 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2237 } 2289 }
2238 } 2290 }
2239 2291
2240 /* 2292 /*
2241 * H: cleanup selection 2293 * H: cleanup selection
… …
2249 /* 2301 /*
2250 * clear the whole screen height, note that width == 0 is treated 2302 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea 2303 * specially by XClearArea
2252 */ 2304 */
2253 XClearArea (display->display, TermWin.vt, 0, 0, 2305 XClearArea (display->display, TermWin.vt, 0, 0,
2254 (unsigned int)TermWin.int_bwidth, 2306 (unsigned int)TermWin.int_bwidth,
2255 (unsigned int)TermWin_TotalHeight (), False); 2307 (unsigned int)TermWin_TotalHeight (), False);
2308
2256 if (clearlast && TermWin.int_bwidth) 2309 if (clearlast && TermWin.int_bwidth)
2257 /* 2310 /*
2258 * clear the whole screen height, note that width == 0 is treated 2311 * clear the whole screen height, note that width == 0 is treated
2259 * specially by XClearArea 2312 * specially by XClearArea
2260 */ 2313 */
2261 XClearArea (display->display, TermWin.vt, 2314 XClearArea (display->display, TermWin.vt,
2262 TermWin.width + TermWin.int_bwidth, 0, 2315 TermWin.width + TermWin.int_bwidth, 0,
2263 (unsigned int)TermWin.int_bwidth, 2316 (unsigned int)TermWin.int_bwidth,
2264 (unsigned int)TermWin_TotalHeight (), False); 2317 (unsigned int)TermWin_TotalHeight (), False);
2318
2265 if (refresh_type & SMOOTH_REFRESH) 2319 if (refresh_type & SMOOTH_REFRESH)
2266 XSync (display->display, False); 2320 XSync (display->display, False);
2267 2321
2268 num_scr = 0; 2322 num_scr = 0;
2269 num_scr_allow = 1; 2323 num_scr_allow = 1;
… …
2293 } 2347 }
2294} 2348}
2295 2349
2296/* ------------------------------------------------------------------------- */ 2350/* ------------------------------------------------------------------------- */
2297void 2351void
2298rxvt_term::scr_clear () 2352rxvt_term::scr_clear (bool really)
2299{ 2353{
2300 if (!TermWin.mapped) 2354 if (!TermWin.mapped)
2301 return; 2355 return;
2302 2356
2303 num_scr_allow = 0; 2357 num_scr_allow = 0;
2304 want_refresh = 1; 2358 want_refresh = 1;
2359
2305#ifdef TRANSPARENT 2360#ifdef TRANSPARENT
2306 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2307 { 2362 {
2308 int i; 2363 int i;
2309 2364
… …
2316 if (TermWin.parent[i] != None) 2371 if (TermWin.parent[i] != None)
2317 XClearWindow (display->display, TermWin.parent[i]); 2372 XClearWindow (display->display, TermWin.parent[i]);
2318 } 2373 }
2319#endif 2374#endif
2320 2375
2376 if (really)
2321 XClearWindow (display->display, TermWin.vt); 2377 XClearWindow (display->display, TermWin.vt);
2322} 2378}
2323 2379
2324/* ------------------------------------------------------------------------- */ 2380/* ------------------------------------------------------------------------- */
2325void 2381void
2326rxvt_term::scr_reverse_selection () 2382rxvt_term::scr_reverse_selection ()
2327{ 2383{
2328 int i, col, row, end_row;
2329 rend_t *srp;
2330
2331 if (selection.op && current_screen == selection.screen) 2384 if (selection.op && current_screen == selection.screen)
2332 { 2385 {
2333 end_row = TermWin.saveLines - TermWin.view_start; 2386 int end_row = TermWin.saveLines - TermWin.view_start;
2334 i = selection.beg.row + TermWin.saveLines; 2387 int i = selection.beg.row + TermWin.saveLines;
2335 row = selection.end.row + TermWin.saveLines; 2388 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp;
2390
2336 if (i >= end_row) 2391 if (i >= end_row)
2337 col = selection.beg.col; 2392 col = selection.beg.col;
2338 else 2393 else
2339 { 2394 {
2340 col = 0; 2395 col = 0;
2341 i = end_row; 2396 i = end_row;
2342 } 2397 }
2398
2343 end_row += TermWin.nrow; 2399 end_row += TermWin.nrow;
2344 for (; i < row && i < end_row; i++, col = 0) 2400 for (; i < row && i < end_row; i++, col = 0)
2345 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2346 srp[col] ^= RS_RVid; 2402 srp[col] ^= RS_RVid;
2403
2347 if (i == row && i < end_row) 2404 if (i == row && i < end_row)
2348 for (srp = screen.rend[i]; col < selection.end.col; col++) 2405 for (srp = screen.rend[i]; col < selection.end.col; col++)
2349 srp[col] ^= RS_RVid; 2406 srp[col] ^= RS_RVid;
2350 } 2407 }
2351} 2408}
… …
2511 } 2568 }
2512 2569
2513 if (ct.nitems == 0) 2570 if (ct.nitems == 0)
2514 { 2571 {
2515 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2573
2516 if (selection_wait == Sel_normal && nread == 0 2574 if (selection_wait == Sel_normal && nread == 0
2517 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2518 { 2576 {
2519 /* 2577 /*
2520 * pass through again trying CUT_BUFFER0 if we've come from 2578 * pass through again trying CUT_BUFFER0 if we've come from
… …
2575{ 2633{
2576 int reget_time = 0; 2634 int reget_time = 0;
2577 2635
2578 if (prop == None) 2636 if (prop == None)
2579 return; 2637 return;
2638
2580 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));
2581 if (selection_wait == Sel_normal) 2640 if (selection_wait == Sel_normal)
2582 { 2641 {
2583 int a, afmt; 2642 int a, afmt;
2584 Atom atype; 2643 Atom atype;
2585 unsigned long bytes_after, nitems; 2644 unsigned long bytes_after, nitems;
2586 unsigned char *s = NULL; 2645 unsigned char *s = NULL;
2587 2646
2588 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2647 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2589 xa[XA_INCR], &atype, &afmt, &nitems, 2648 xa[XA_INCR], &atype, &afmt, &nitems,
2590 &bytes_after, &s); 2649 &bytes_after, &s);
2591 if (s) 2650 if (s)
2592 XFree (s); 2651 XFree (s);
2593 if (a != Success) 2652 if (a != Success)
2594 return; 2653 return;
2654
2595#ifndef __CYGWIN32__ 2655#ifndef __CYGWIN32__
2596 if (atype == xa[XA_INCR]) 2656 if (atype == xa[XA_INCR])
2597 { /* start an INCR transfer */ 2657 { /* start an INCR transfer */
2598 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2658 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2599 XDeleteProperty (display->display, win, prop); 2659 XDeleteProperty (display->display, win, prop);
… …
2605 2665
2606 } 2666 }
2607 else if (selection_wait == Sel_incr) 2667 else if (selection_wait == Sel_incr)
2608 { 2668 {
2609 reget_time = 1; 2669 reget_time = 1;
2670
2610 if (selection_paste (win, prop, True) == -1) 2671 if (selection_paste (win, prop, True) == -1)
2611 { 2672 {
2612 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2673 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2613 selection_wait = Sel_none; 2674 selection_wait = Sel_none;
2614 incr_ev.stop (); 2675 incr_ev.stop ();
2615 } 2676 }
2616 } 2677 }
2617 if (reget_time) /* received more data so reget time */ 2678 if (reget_time) /* received more data so reget time */
2618 incr_ev.start (NOW + 10); 2679 incr_ev.start (NOW + 10);
2619} 2680}
2681
2620/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2621/* 2683/*
2622 * Request the current selection: 2684 * Request the current selection:
2623 * Order: > internal selection if available 2685 * Order: > internal selection if available
2624 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2686 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2629 */ 2691 */
2630void 2692void
2631rxvt_term::selection_request (Time tm, int x, int y) 2693rxvt_term::selection_request (Time tm, int x, int y)
2632{ 2694{
2633 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
2634 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2697 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2635 return; /* outside window */ 2698 return; /* outside window */
2636 2699
2637 if (selection.text != NULL) 2700 if (selection.text)
2638 { /* internal selection */ 2701 { /* internal selection */
2639 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2702 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2640 paste (selection.text, selection.len); 2703 char *str = rxvt_wcstombs (selection.text, selection.len);
2704 paste ((unsigned char *)str, strlen (str));
2705 free (str);
2641 return; 2706 return;
2642 } 2707 }
2643 else 2708 else
2644 { 2709 {
2645 int i; 2710 int i;
2646 2711
2647 selection_request_time = tm; 2712 selection_request_time = tm;
2648 selection_wait = Sel_normal; 2713 selection_wait = Sel_normal;
2649 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2650 { 2715 {
… …
2658 return; 2723 return;
2659#endif 2724#endif
2660 2725
2661 } 2726 }
2662 } 2727 }
2728
2663 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2664 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2665 selection_paste (display->root, XA_CUT_BUFFER0, False); 2731 selection_paste (display->root, XA_CUT_BUFFER0, False);
2666} 2732}
2667 2733
2668int 2734int
2669rxvt_term::selection_request_other (Atom target, int selnum) 2735rxvt_term::selection_request_other (Atom target, int selnum)
2670{ 2736{
2671 Atom sel; 2737 Atom sel;
2672#ifdef DEBUG_SELECT 2738#ifdef DEBUG_SELECT
2673 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2674#endif 2740#endif
2675 2741
2676 selection_type |= selnum; 2742 selection_type |= selnum;
2743
2677 if (selnum == Sel_Primary) 2744 if (selnum == Sel_Primary)
2678 sel = XA_PRIMARY; 2745 sel = XA_PRIMARY;
2679 else if (selnum == Sel_Secondary) 2746 else if (selnum == Sel_Secondary)
2680 sel = XA_SECONDARY; 2747 sel = XA_SECONDARY;
2681 else 2748 else
2682 sel = xa[XA_CLIPBOARD]; 2749 sel = xa[XA_CLIPBOARD];
2750
2683 if (XGetSelectionOwner (display->display, sel) != None) 2751 if (XGetSelectionOwner (display->display, sel) != None)
2684 { 2752 {
2685 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]));
2686 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2687 TermWin.vt, selection_request_time); 2755 TermWin.vt, selection_request_time);
2688 return 1; 2756 return 1;
2689 } 2757 }
2758
2690 return 0; 2759 return 0;
2691} 2760}
2692 2761
2693/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2694/* 2763/*
… …
2713 * EXT: button 1 or 3 release 2782 * EXT: button 1 or 3 release
2714 */ 2783 */
2715void 2784void
2716rxvt_term::selection_make (Time tm) 2785rxvt_term::selection_make (Time tm)
2717{ 2786{
2718 int i, col, end_col, row, end_row; 2787 int i, col, end_col, row, end_row;
2719 unsigned char *new_selection_text; 2788 wchar_t *new_selection_text;
2720 char *str;
2721 text_t *t; 2789 text_t *t;
2722#ifdef ACS_ASCII
2723 rend_t *re;
2724#endif
2725 2790
2726 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));
2727 switch (selection.op) 2792 switch (selection.op)
2728 { 2793 {
2729 case SELECTION_CONT: 2794 case SELECTION_CONT:
… …
2741 selection.op = SELECTION_DONE; 2806 selection.op = SELECTION_DONE;
2742 2807
2743 if (selection.clicks == 4) 2808 if (selection.clicks == 4)
2744 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
2745 2810
2746 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2811 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2747 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2812 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2748
2749 new_selection_text = (unsigned char *)str;
2750 2813
2751 col = selection.beg.col; 2814 col = selection.beg.col;
2752 MAX_IT (col, 0); 2815 MAX_IT (col, 0);
2753 row = selection.beg.row + TermWin.saveLines; 2816 row = selection.beg.row + TermWin.saveLines;
2754 end_row = selection.end.row + TermWin.saveLines; 2817 end_row = selection.end.row + TermWin.saveLines;
2818 int ofs = 0;
2819 int extra = 0;
2755 2820
2756 for (; row <= end_row; row++, col = 0) 2821 for (; row <= end_row; row++, col = 0)
2757 { 2822 {
2758 t = & (screen.text[row][col]); 2823 t = &(screen.text[row][col]);
2759 2824
2760 end_col = screen.tlen[row]; 2825 end_col = screen.tlen[row];
2761 2826
2762 if (end_col == -1) 2827 if (end_col == -1)
2763 end_col = TermWin.ncol; 2828 end_col = TermWin.ncol;
2764 2829
2765 if (row == end_row) 2830 if (row == end_row)
2766 MIN_IT (end_col, selection.end.col); 2831 MIN_IT (end_col, selection.end.col);
2767 2832
2768 for (; col < end_col; col++) 2833 for (; col < end_col; col++)
2834 {
2769 if (*t == NOCHAR) 2835 if (*t == NOCHAR)
2770 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
2771 else 2854 else
2772 { 2855 new_selection_text[ofs++] = *t++;
2773 int len = wctomb (str, *t++);
2774 if (len > 0)
2775 str += len;
2776 } 2856 }
2777 2857
2778 if (screen.tlen[row] != -1 && row != end_row) 2858 if (screen.tlen[row] != -1 && row != end_row)
2779 *str++ = '\n'; 2859 new_selection_text[ofs++] = L'\n';
2780 } 2860 }
2781 2861
2782#ifndef NO_OLD_SELECTION
2783 if (selection_style == OLD_SELECT)
2784 if (end_col == TermWin.ncol)
2785 *str++ = '\n';
2786#endif
2787#ifndef NO_NEW_SELECTION
2788 if (selection_style != OLD_SELECT)
2789 if (end_col != selection.end.col) 2862 if (end_col != selection.end.col)
2790 *str++ = '\n'; 2863 new_selection_text[ofs++] = L'\n';
2791#endif
2792 *str = '\0';
2793 2864
2794 i = str - (char *)new_selection_text; 2865 new_selection_text[ofs] = 0;
2866
2795 if (i == 0) 2867 if (ofs == 0)
2796 { 2868 {
2797 free (new_selection_text); 2869 free (new_selection_text);
2798 return; 2870 return;
2799 } 2871 }
2800 2872
2801 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2802 if (str - (char *)new_selection_text > 1024)
2803 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2804
2805 selection.len = i;
2806
2807 if (selection.text)
2808 free (selection.text); 2873 free (selection.text);
2809 2874
2810 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));
2811 2878
2812 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2879 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2813 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2880 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2814 display->set_selection_owner (this); 2881 display->set_selection_owner (this);
2815 else 2882 else
2816 rxvt_print_error ("can't get primary selection"); 2883 rxvt_print_error ("can't get primary selection");
2817 2884
2818 { 2885#if 0
2819 XTextProperty ct; 2886 XTextProperty ct;
2820 char *cl = (char *)selection.text;
2821 2887
2822 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2888 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2823 { 2889 {
2824 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2825 PropModeReplace, ct.value, ct.nitems);
2826 XFree (ct.value);
2827 }
2828 else
2829 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2890 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2830 PropModeReplace, selection.text, (int)selection.len); 2891 PropModeReplace, ct.value, ct.nitems);
2892 XFree (ct.value);
2831 } 2893 }
2894#endif
2832 2895
2833 selection_time = tm; 2896 selection_time = tm;
2834 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2897 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2835} 2898}
2836 2899
… …
2865rxvt_term::selection_start_colrow (int col, int row) 2928rxvt_term::selection_start_colrow (int col, int row)
2866{ 2929{
2867 want_refresh = 1; 2930 want_refresh = 1;
2868 selection.mark.col = col; 2931 selection.mark.col = col;
2869 selection.mark.row = row - TermWin.view_start; 2932 selection.mark.row = row - TermWin.view_start;
2933
2870 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2934 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2871 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2935 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2872 MAX_IT (selection.mark.col, 0); 2936 MAX_IT (selection.mark.col, 0);
2873 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2937 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2874 2938
2939 while (selection.mark.col > 0
2940 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2941 --selection.mark.col;
2942
2875 if (selection.op) 2943 if (selection.op)
2876 { /* clear the old selection */ 2944 { /* clear the old selection */
2877 selection.beg.row = selection.end.row = selection.mark.row; 2945 selection.beg.row = selection.end.row = selection.mark.row;
2878 selection.beg.col = selection.end.col = selection.mark.col; 2946 selection.beg.col = selection.end.col = selection.mark.col;
2879 } 2947 }
2948
2880 selection.op = SELECTION_INIT; 2949 selection.op = SELECTION_INIT;
2881 selection.screen = current_screen; 2950 selection.screen = current_screen;
2882} 2951}
2883 2952
2884/* ------------------------------------------------------------------------- */ 2953/* ------------------------------------------------------------------------- */
… …
2886 * Word select: select text for 2 clicks 2955 * Word select: select text for 2 clicks
2887 * We now only find out the boundary in one direction 2956 * We now only find out the boundary in one direction
2888 */ 2957 */
2889 2958
2890/* 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 */
2891#define DELIMIT_TEXT(x) \ 2960#define DELIMIT_TEXT(x) \
2892 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2961 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2893#define DELIMIT_REND(x) 1 2962#define DELIMIT_REND(x) 1
2894 2963
2895void 2964void
2896rxvt_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)
2897{ 2966{
2898 int col, row, dirnadd, tcol, trow, w1, w2; 2967 int col, row, dirnadd, tcol, trow, w1, w2;
2899 row_col_t bound; 2968 row_col_t bound;
2900 text_t *stp; 2969 text_t *stp;
2901 rend_t *srp; 2970 rend_t *srp;
2902 2971
2903 if (dirn == UP) 2972 if (dirn == UP)
2904 { 2973 {
2905 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2974 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2906 bound.col = 0; 2975 bound.col = 0;
… …
2910 { 2979 {
2911 bound.row = TermWin.saveLines + TermWin.nrow; 2980 bound.row = TermWin.saveLines + TermWin.nrow;
2912 bound.col = TermWin.ncol - 1; 2981 bound.col = TermWin.ncol - 1;
2913 dirnadd = 1; 2982 dirnadd = 1;
2914 } 2983 }
2984
2915 row = mark->row + TermWin.saveLines; 2985 row = mark->row + TermWin.saveLines;
2916 col = mark->col; 2986 col = mark->col;
2917 MAX_IT (col, 0); 2987 MAX_IT (col, 0);
2918 /* find the edge of a word */ 2988 /* find the edge of a word */
2919 stp = & (screen.text[row][col]); 2989 stp = & (screen.text[row][col]);
2920 w1 = DELIMIT_TEXT (*stp); 2990 w1 = DELIMIT_TEXT (*stp);
2921 2991
2922 if (selection_style != NEW_SELECT)
2923 {
2924 if (w1 == 1)
2925 {
2926 stp += dirnadd;
2927 if (DELIMIT_TEXT (*stp) == 1)
2928 goto Old_Word_Selection_You_Die;
2929 col += dirnadd;
2930 }
2931 w1 = 0;
2932 }
2933 srp = (&screen.rend[row][col]); 2992 srp = (&screen.rend[row][col]);
2934 w2 = DELIMIT_REND (*srp); 2993 w2 = DELIMIT_REND (*srp);
2935 2994
2936 for (;;) 2995 for (;;)
2937 { 2996 {
2938 for (; col != bound.col; col += dirnadd) 2997 for (; col != bound.col; col += dirnadd)
2939 { 2998 {
2940 stp += dirnadd; 2999 stp += dirnadd;
3000 srp += dirnadd;
3001
3002 if (*stp == NOCHAR)
3003 continue;
3004
2941 if (DELIMIT_TEXT (*stp) != w1) 3005 if (DELIMIT_TEXT (*stp) != w1)
2942 break; 3006 break;
2943 srp += dirnadd;
2944 if (DELIMIT_REND (*srp) != w2) 3007 if (DELIMIT_REND (*srp) != w2)
2945 break; 3008 break;
2946 } 3009 }
3010
2947 if ((col == bound.col) && (row != bound.row)) 3011 if ((col == bound.col) && (row != bound.row))
2948 { 3012 {
2949 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3013 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2950 { 3014 {
2951 trow = row + dirnadd; 3015 trow = row + dirnadd;
2952 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3016 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3017
2953 if (screen.text[trow] == NULL) 3018 if (screen.text[trow] == NULL)
2954 break; 3019 break;
3020
2955 stp = & (screen.text[trow][tcol]); 3021 stp = & (screen.text[trow][tcol]);
2956 srp = & (screen.rend[trow][tcol]); 3022 srp = & (screen.rend[trow][tcol]);
3023
2957 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3024 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2958 break; 3025 break;
3026
2959 row = trow; 3027 row = trow;
2960 col = tcol; 3028 col = tcol;
2961 continue; 3029 continue;
2962 } 3030 }
2963 } 3031 }
2964 break; 3032 break;
2965 } 3033 }
3034
2966Old_Word_Selection_You_Die: 3035Old_Word_Selection_You_Die:
2967 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));
2968 3037
2969 if (dirn == DN) 3038 if (dirn == DN)
2970 col++; /* put us on one past the end */ 3039 col++; /* put us on one past the end */
… …
2992 MAX_IT (row, 0); 3061 MAX_IT (row, 0);
2993 MIN_IT (row, (int)TermWin.nrow - 1); 3062 MIN_IT (row, (int)TermWin.nrow - 1);
2994 MAX_IT (col, 0); 3063 MAX_IT (col, 0);
2995 MIN_IT (col, (int)TermWin.ncol); 3064 MIN_IT (col, (int)TermWin.ncol);
2996 3065
2997#ifndef NO_NEW_SELECTION
2998 /* 3066 /*
2999 * 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
3000 * 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
3001 * 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
3002 * be _past_ a character for it to be selected. 3070 * be _past_ a character for it to be selected.
3003 */ 3071 */
3004 if (selection_style != OLD_SELECT)
3005 {
3006 if (((selection.clicks % 3) == 1) && !flag 3072 if (((selection.clicks % 3) == 1) && !flag
3007 && (col == selection.mark.col 3073 && (col == selection.mark.col
3008 && (row == selection.mark.row + TermWin.view_start))) 3074 && (row == selection.mark.row + TermWin.view_start)))
3009 { 3075 {
3010 /* select nothing */ 3076 /* select nothing */
3011 selection.beg.row = selection.end.row = 0; 3077 selection.beg.row = selection.end.row = 0;
3012 selection.beg.col = selection.end.col = 0; 3078 selection.beg.col = selection.end.col = 0;
3013 selection.clicks = 4; 3079 selection.clicks = 4;
3014 want_refresh = 1; 3080 want_refresh = 1;
3015 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3081 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3016 return; 3082 return;
3017 }
3018 } 3083 }
3019#endif 3084
3020 if (selection.clicks == 4) 3085 if (selection.clicks == 4)
3021 selection.clicks = 1; 3086 selection.clicks = 1;
3022 3087
3023 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3088 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3024 flag == 1 ? 1 : 0, /* ? button press */ 3089 flag == 1 ? 1 : 0, /* ? button press */
… …
3078 pos.col = col; 3143 pos.col = col;
3079 pos.row = row; 3144 pos.row = row;
3080 3145
3081 pos.row -= TermWin.view_start; /* adjust for scroll */ 3146 pos.row -= TermWin.view_start; /* adjust for scroll */
3082 3147
3083#ifndef NO_OLD_SELECTION
3084 /*
3085 * This mimics some of the selection behaviour of version 2.20 and before.
3086 * There are no ``selection modes'', button3 is always character extension.
3087 * Note: button3 drag is always available, c.f. v2.20
3088 * Selection always terminates (left or right as appropriate) at the mark.
3089 */
3090 if (selection_style == OLD_SELECT)
3091 {
3092 if (selection.clicks == 1 || button3)
3093 {
3094 if (hate_those_clicks)
3095 {
3096 hate_those_clicks = 0;
3097 if (selection.clicks == 1)
3098 {
3099 selection.beg.row = selection.mark.row;
3100 selection.beg.col = selection.mark.col;
3101 }
3102 else
3103 {
3104 selection.mark.row = selection.beg.row;
3105 selection.mark.col = selection.beg.col;
3106 }
3107 }
3108 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3109 {
3110 selection.end.row = selection.mark.row;
3111 selection.end.col = selection.mark.col + 1;
3112 selection.beg.row = pos.row;
3113 selection.beg.col = pos.col;
3114 }
3115 else
3116 {
3117 selection.beg.row = selection.mark.row;
3118 selection.beg.col = selection.mark.col;
3119 selection.end.row = pos.row;
3120 selection.end.col = pos.col + 1;
3121 }
3122 }
3123 else if (selection.clicks == 2)
3124 {
3125 selection_delimit_word (UP, & (selection.mark),
3126 & (selection.beg));
3127 selection_delimit_word (DN, & (selection.mark),
3128 & (selection.end));
3129 hate_those_clicks = 1;
3130 }
3131 else if (selection.clicks == 3)
3132 {
3133 selection.beg.row = selection.end.row = selection.mark.row;
3134 selection.beg.col = 0;
3135 selection.end.col = ncol;
3136 hate_those_clicks = 1;
3137 }
3138 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));
3139 return;
3140 }
3141#endif /* ! NO_OLD_SELECTION */
3142#ifndef NO_NEW_SELECTION
3143 /* selection_style must not be OLD_SELECT to get here */
3144 /* 3148 /*
3145 * 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
3146 * in the way button3 drag extension works. 3150 * in the way button3 drag extension works.
3147 * We're either doing: button1 drag; button3 press; or button3 drag 3151 * We're either doing: button1 drag; button3 press; or button3 drag
3148 * 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
… …
3153 * 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
3154 * 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
3155 * time of the most recent button3 press 3159 * time of the most recent button3 press
3156 */ 3160 */
3157 if (button3 && buttonpress) 3161 if (button3 && buttonpress)
3158 { /* button3 press */ 3162 { /* button3 press */
3159 /* 3163 /*
3160 * first determine which edge of the selection we are closest to 3164 * first determine which edge of the selection we are closest to
3161 */ 3165 */
3162 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3166 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3163 || (!ROWCOL_IS_AFTER (pos, selection.end) 3167 || (!ROWCOL_IS_AFTER (pos, selection.end)
3164 && (((pos.col - selection.beg.col) 3168 && (((pos.col - selection.beg.col)
3165 + ((pos.row - selection.beg.row) * ncol)) 3169 + ((pos.row - selection.beg.row) * ncol))
3166 < ((selection.end.col - pos.col) 3170 < ((selection.end.col - pos.col)
3167 + ((selection.end.row - pos.row) * ncol))))) 3171 + ((selection.end.row - pos.row) * ncol)))))
3168 closeto = LEFT; 3172 closeto = LEFT;
3173
3169 if (closeto == LEFT) 3174 if (closeto == LEFT)
3170 { 3175 {
3171 selection.beg.row = pos.row; 3176 selection.beg.row = pos.row;
3172 selection.beg.col = pos.col; 3177 selection.beg.col = pos.col;
3173 selection.mark.row = selection.end.row; 3178 selection.mark.row = selection.end.row;
3174 selection.mark.col = selection.end.col 3179 selection.mark.col = selection.end.col - (selection.clicks == 2);
3175 - (selection.clicks == 2);
3176 } 3180 }
3177 else 3181 else
3178 { 3182 {
3179 selection.end.row = pos.row; 3183 selection.end.row = pos.row;
3180 selection.end.col = pos.col; 3184 selection.end.col = pos.col;
3181 selection.mark.row = selection.beg.row; 3185 selection.mark.row = selection.beg.row;
3182 selection.mark.col = selection.beg.col; 3186 selection.mark.col = selection.beg.col;
3183 } 3187 }
3184 } 3188 }
3185 else 3189 else
3186 { /* button1 drag or button3 drag */ 3190 { /* button1 drag or button3 drag */
3187 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3191 if (ROWCOL_IS_AFTER (selection.mark, pos))
3188 { 3192 {
3189 if ((selection.mark.row == selection.end.row) 3193 if ((selection.mark.row == selection.end.row)
3190 && (selection.mark.col == selection.end.col) 3194 && (selection.mark.col == selection.end.col)
3191 && clickchange && selection.clicks == 2) 3195 && clickchange && selection.clicks == 2)
3192 selection.mark.col--; 3196 selection.mark.col--;
3197
3193 selection.beg.row = pos.row; 3198 selection.beg.row = pos.row;
3194 selection.beg.col = pos.col; 3199 selection.beg.col = pos.col;
3195 selection.end.row = selection.mark.row; 3200 selection.end.row = selection.mark.row;
3196 selection.end.col = selection.mark.col 3201 selection.end.col = selection.mark.col + (selection.clicks == 2);
3197 + (selection.clicks == 2);
3198 } 3202 }
3199 else 3203 else
3200 { 3204 {
3201 selection.beg.row = selection.mark.row; 3205 selection.beg.row = selection.mark.row;
3202 selection.beg.col = selection.mark.col; 3206 selection.beg.col = selection.mark.col;
… …
3206 } 3210 }
3207 3211
3208 if (selection.clicks == 1) 3212 if (selection.clicks == 1)
3209 { 3213 {
3210 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3214 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3215
3211 if (end_col != -1 && selection.beg.col > end_col) 3216 if (end_col != -1 && selection.beg.col > end_col)
3212 { 3217 {
3213#if 1 3218#if 1
3214 selection.beg.col = ncol; 3219 selection.beg.col = ncol;
3215#else 3220#else
3216 if (selection.beg.row != selection.end.row) 3221 if (selection.beg.row != selection.end.row)
3217 selection.beg.col = ncol; 3222 selection.beg.col = ncol;
3218 else 3223 else
3219 selection.beg.col = selection.mark.col; 3224 selection.beg.col = selection.mark.col;
3220#endif 3225#endif
3221
3222 } 3226 }
3227
3223 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3228 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3229
3224 if (end_col != -1 && selection.end.col > end_col) 3230 if (end_col != -1 && selection.end.col > end_col)
3225 selection.end.col = ncol; 3231 selection.end.col = ncol;
3226
3227 } 3232 }
3228 else if (selection.clicks == 2) 3233 else if (selection.clicks == 2)
3229 { 3234 {
3230 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3235 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3231 selection.end.col--; 3236 selection.end.col--;
3237
3232 selection_delimit_word (UP, & (selection.beg), 3238 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3233 & (selection.beg));
3234 selection_delimit_word (DN, & (selection.end), 3239 selection_delimit_word (DN, & (selection.end), & (selection.end));
3235 & (selection.end));
3236 } 3240 }
3237 else if (selection.clicks == 3) 3241 else if (selection.clicks == 3)
3238 { 3242 {
3239#ifndef NO_FRILLS 3243#ifndef NO_FRILLS
3240 if ((Options & Opt_tripleclickwords)) 3244 if ((Options & Opt_tripleclickwords))
3241 { 3245 {
3242 int end_row; 3246 int end_row;
3243 3247
3244 selection_delimit_word (UP, & (selection.beg), 3248 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3245 & (selection.beg));
3246 end_row = screen.tlen[selection.mark.row 3249 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3247 + TermWin.saveLines]; 3250
3248 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3251 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3249 end_row++)
3250 { 3252 {
3251 end_col = screen.tlen[end_row + TermWin.saveLines]; 3253 end_col = screen.tlen[end_row + TermWin.saveLines];
3254
3252 if (end_col != -1) 3255 if (end_col != -1)
3253 { 3256 {
3254 selection.end.row = end_row; 3257 selection.end.row = end_row;
3255 selection.end.col = end_col; 3258 selection.end.col = end_col;
3256 selection_remove_trailing_spaces (); 3259 selection_remove_trailing_spaces ();
… …
3258 } 3261 }
3259 } 3262 }
3260 } 3263 }
3261 else 3264 else
3262#endif 3265#endif
3263
3264 { 3266 {
3265 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3267 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3266 selection.mark.col++; 3268 selection.mark.col++;
3267 selection.beg.col = 0; 3269 selection.beg.col = 0;
3268 selection.end.col = ncol; 3270 selection.end.col = ncol;
3269 } 3271 }
3270 } 3272 }
3273
3271 if (button3 && buttonpress) 3274 if (button3 && buttonpress)
3272 { /* mark may need to be changed */ 3275 { /* mark may need to be changed */
3273 if (closeto == LEFT) 3276 if (closeto == LEFT)
3274 { 3277 {
3275 selection.mark.row = selection.end.row; 3278 selection.mark.row = selection.end.row;
3276 selection.mark.col = selection.end.col 3279 selection.mark.col = selection.end.col
3277 - (selection.clicks == 2); 3280 - (selection.clicks == 2);
… …
3281 selection.mark.row = selection.beg.row; 3284 selection.mark.row = selection.beg.row;
3282 selection.mark.col = selection.beg.col; 3285 selection.mark.col = selection.beg.col;
3283 } 3286 }
3284 } 3287 }
3285 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));
3286#endif /* ! NO_NEW_SELECTION */
3287} 3289}
3288 3290
3289#ifndef NO_FRILLS 3291#ifndef NO_FRILLS
3290void 3292void
3291rxvt_term::selection_remove_trailing_spaces () 3293rxvt_term::selection_remove_trailing_spaces ()
… …
3365 ev.target = rq.target; 3367 ev.target = rq.target;
3366 ev.time = rq.time; 3368 ev.time = rq.time;
3367 3369
3368 if (rq.target == xa[XA_TARGETS]) 3370 if (rq.target == xa[XA_TARGETS])
3369 { 3371 {
3370 Atom32 target_list[5]; 3372 Atom32 target_list[6];
3371 Atom32 *target = target_list; 3373 Atom32 *target = target_list;
3372 3374
3373 *target++ = (Atom32) xa[XA_TARGETS]; 3375 *target++ = (Atom32) xa[XA_TARGETS];
3376 *target++ = (Atom32) xa[XA_TIMESTAMP];
3374 *target++ = (Atom32) XA_STRING; 3377 *target++ = (Atom32) XA_STRING;
3375 *target++ = (Atom32) xa[XA_TEXT]; 3378 *target++ = (Atom32) xa[XA_TEXT];
3376 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3379 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3377#if X_HAVE_UTF8_STRING 3380#if X_HAVE_UTF8_STRING
3378 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3381 *target++ = (Atom32) xa[XA_UTF8_STRING];
3379#endif 3382#endif
3383
3380 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3384 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3381 (8 * sizeof (target_list[0])), PropModeReplace, 3385 (8 * sizeof (target_list[0])), PropModeReplace,
3382 (unsigned char *)target_list, 3386 (unsigned char *)target_list,
3383 target - target_list); 3387 target - target_list);
3384 ev.property = rq.property; 3388 ev.property = rq.property;
3385 } 3389 }
3386 else if (rq.target == xa[XA_MULTIPLE]) 3390 else if (rq.target == xa[XA_MULTIPLE])
3387 { 3391 {
3388 /* TODO: Handle MULTIPLE */ 3392 /* TODO: Handle MULTIPLE */
… …
3400 || rq.target == xa[XA_UTF8_STRING] 3404 || rq.target == xa[XA_UTF8_STRING]
3401 ) 3405 )
3402 { 3406 {
3403 short freect = 0; 3407 short freect = 0;
3404 int selectlen; 3408 int selectlen;
3405 char *cl; 3409 wchar_t *cl;
3406 3410
3407 target = rq.target; 3411 target = rq.target;
3408 3412
3409 if (target == XA_STRING) 3413 if (target == XA_STRING)
3410 // 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
3411 // will ask for another format anyways. 3415 // will ask for another format anyways.
3412 style = XStringStyle; 3416 style = XStringStyle;
3413 else if (target == xa[XA_TEXT]) 3417 else if (target == xa[XA_TEXT])
3414 style = XTextStyle; 3418 style = XStdICCTextStyle;
3415 else if (target == xa[XA_COMPOUND_TEXT]) 3419 else if (target == xa[XA_COMPOUND_TEXT])
3416 style = XCompoundTextStyle; 3420 style = XCompoundTextStyle;
3417#if X_HAVE_UTF8_STRING 3421#if X_HAVE_UTF8_STRING
3418 else if (target == xa[XA_UTF8_STRING]) 3422 else if (target == xa[XA_UTF8_STRING])
3419 style = XUTF8StringStyle; 3423 style = XUTF8StringStyle;
… …
3424 style = XCompoundTextStyle; 3428 style = XCompoundTextStyle;
3425 } 3429 }
3426 3430
3427 if (selection.text) 3431 if (selection.text)
3428 { 3432 {
3429 cl = (char *)selection.text; 3433 cl = selection.text;
3430 selectlen = selection.len; 3434 selectlen = selection.len;
3431 } 3435 }
3432 else 3436 else
3433 { 3437 {
3434 cl = ""; 3438 cl = L"";
3435 selectlen = 0; 3439 selectlen = 0;
3436 } 3440 }
3437 3441
3442 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3443 // manually for XUTF8StringStyle.
3438 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3444 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3439 freect = 1; 3445 freect = 1;
3440 else 3446 else
3441 { 3447 {
3442 /* if we failed to convert then send it raw */ 3448 /* if we failed to convert then send it raw */
3443 ct.value = (unsigned char *)cl; 3449 ct.value = (unsigned char *)cl;
… …
3450 ev.property = rq.property; 3456 ev.property = rq.property;
3451 3457
3452 if (freect) 3458 if (freect)
3453 XFree (ct.value); 3459 XFree (ct.value);
3454 } 3460 }
3461
3455 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3462 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3456} 3463}
3457 3464
3458/* ------------------------------------------------------------------------- * 3465/* ------------------------------------------------------------------------- *
3459 * MOUSE ROUTINES * 3466 * MOUSE ROUTINES *

Diff Legend

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