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.37 by pcg, Tue Feb 24 23:58:13 2004 UTC vs.
Revision 1.54 by pcg, Thu Mar 11 00:53:19 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
6 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
… …
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 33
32#include <stdint.h> 34#include <stdint.h>
33#include <wchar.h> 35#include <wchar.h>
34 36
35#include "salloc.C" // HACK!! 37#include "salloc.C" // HACK, should be a seperate compile!
36 38
37inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
38{ 40{
39 while (len--) 41 while (len--)
40 *start++ = value; 42 *start++ = value;
… …
762 * Add text given in <str> of length <len> to screen struct 764 * Add text given in <str> of length <len> to screen struct
763 */ 765 */
764void 766void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
766{ 768{
767 unsigned char checksel, clearsel; 769 unsigned char checksel, clearsel;
768 uint32_t c; 770 uint32_t c;
769 int i, row, last_col; 771 int i, row, last_col;
770 text_t *stp; 772 text_t *stp;
771 rend_t *srp; 773 rend_t *srp;
772 774
773 if (len <= 0) /* sanity */ 775 if (len <= 0) /* sanity */
774 return; 776 return;
775 777
776 want_refresh = 1; 778 want_refresh = 1;
… …
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 846 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 847 {
846 checksel = 0; 848 checksel = 0;
847 clearsel = 1; 849 clearsel = 1;
848 } 850 }
851
849 if (screen.flags & Screen_WrapNext) 852 if (screen.flags & Screen_WrapNext)
850 { 853 {
851 screen.tlen[row] = -1; 854 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 855 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1)) 857 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines; 858 row = (++screen.cur.row) + TermWin.saveLines;
859
856 stp = screen.text[row]; /* _must_ refresh */ 860 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 861 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 862 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext; 863 screen.flags &= ~Screen_WrapNext;
860 } 864 }
865
861 if (screen.flags & Screen_Insert) 866 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 867 scr_insdel_chars (1, INSERT);
868
869 if (IS_COMPOSE (c))
870 c = REPLACEMENT_CHAR;
871
872 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c);
863 876
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 877 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c) 878 switch (c)
866 { 879 {
867 // dunno where these come from
868#if 0
869 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
870 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
871#endif
872 // vt100 special graphics and line drawing 880 // vt100 special graphics and line drawing
873 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
874 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
875 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
876 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
… …
880 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; 888 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
881 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; 889 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
882 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; 890 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
883 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 891 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
884 } 892 }
893
885 894
886 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
887 // rely on wcwidth to tell us the character width, at least for non-ascii
888 int width = c <= 128 ? 1 : wcwidth (c);
889
890 // width -1 characters (e.g. combining chars) are ignored currently.
891 if (width > 0) 895 if (width > 0)
896 {
897#if !UNICODE_3
898 // trim characters we can't store directly :(
899 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
903
892 do 904 do
893 { 905 {
894 stp[screen.cur.col] = c; 906 stp[screen.cur.col] = c;
895 srp[screen.cur.col] = rend; 907 srp[screen.cur.col] = rend;
896 908
897 if (screen.cur.col < last_col - 1) 909 if (screen.cur.col < last_col - 1)
898 screen.cur.col++; 910 screen.cur.col++;
899 else 911 else
900 { 912 {
901 screen.tlen[row] = last_col; 913 screen.tlen[row] = last_col;
902 if (screen.flags & Screen_Autowrap) 914 if (screen.flags & Screen_Autowrap)
903 screen.flags |= Screen_WrapNext; 915 screen.flags |= Screen_WrapNext;
904 break; 916 break;
905 } 917 }
906 918
907 c = NOCHAR; 919 c = NOCHAR;
908 } 920 }
909 while (--width > 0); 921 while (--width > 0);
922
923 // pad with spaces when overwriting wide character with smaller one
924 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
925 {
926 stp[c] = ' ';
927 srp[c] = rend;
928 }
929 }
930 else if (width == 0)
931 {
932#if ENCODING_COMPOSE
933 // handle combining characters
934 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet.
937
938 text_t *tp;
939 rend_t *rp;
940
941 if (screen.cur.col > 0)
942 {
943 tp = stp + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1;
945 }
946 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
948 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
951 }
910 else 952 else
911 (void)0; /* handle combining character etc. here. */ 953 continue;
954
955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958
959 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c);
963
964 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
966#endif
967 }
912 } 968 }
913 969
914 if (screen.tlen[row] != -1) /* XXX: think about this */ 970 if (screen.tlen[row] != -1) /* XXX: think about this */
915 MAX_IT (screen.tlen[row], screen.cur.col); 971 MAX_IT (screen.tlen[row], screen.cur.col);
916 972
… …
1096 else 1152 else
1097 screen.cur.row = row; 1153 screen.cur.row = row;
1098 } 1154 }
1099 MAX_IT (screen.cur.row, 0); 1155 MAX_IT (screen.cur.row, 0);
1100 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1156 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1157
1158 while (screen.cur.col > 0
1159 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1160 screen.cur.col--;
1101} 1161}
1102 1162
1103/* ------------------------------------------------------------------------- */ 1163/* ------------------------------------------------------------------------- */
1104/* 1164/*
1105 * direction should be UP or DN 1165 * direction should be UP or DN
… …
2052 int ypixel = (int)Row2Pixel (row); 2112 int ypixel = (int)Row2Pixel (row);
2053 2113
2054 for (col = 0; col < TermWin.ncol; col++) 2114 for (col = 0; col < TermWin.ncol; col++)
2055 { 2115 {
2056 /* compare new text with old - if exactly the same then continue */ 2116 /* compare new text with old - if exactly the same then continue */
2117 if (stp[col] == dtp[col] /* Must match characters to skip. */
2118 && (srp[col] == drp[col] /* Either rendition the same or */
2119 || (stp[col] == ' ' /* space w/ no background change */
2120 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2121 continue;
2122
2123 // redraw one or more characters
2124
2125 // seek to the beginning if wide characters
2126 while (stp[col] == NOCHAR && col > 0)
2127 --col;
2128
2057 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2129 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2058
2059 if (stp[col] == dtp[col] /* Must match characters to skip. */
2060 && (rend == drp[col] /* Either rendition the same or */
2061 || (stp[col] == ' ' /* space w/ no background change */
2062 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2063 continue;
2064
2065 text_t *text = stp + col; 2130 text_t *text = stp + col;
2066 int count = 1; 2131 int count = 1;
2067 2132
2068 /* redraw one or more characters */
2069
2070 dtp[col] = stp[col]; 2133 dtp[col] = stp[col];
2071 drp[col] = rend; 2134 drp[col] = rend;
2072
2073 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2074 continue;
2075 2135
2076 int xpixel = Col2Pixel (col); 2136 int xpixel = Col2Pixel (col);
2077 2137
2078 // this loop looks very messy, it can probably be optimized 2138 // this loop looks very messy, it can probably be optimized
2079 // and cleaned a bit by you? 2139 // and cleaned a bit by you?
… …
2153 back = Color_RV; 2213 back = Color_RV;
2154#endif 2214#endif
2155 } 2215 }
2156 2216
2157#ifdef TEXT_BLINK 2217#ifdef TEXT_BLINK
2158 if (rend & RS_Blink) 2218 if (rend & RS_Blink && back == Color_bg)
2159 { 2219 {
2160 if (!text_blink_ev.active) 2220 if (!text_blink_ev.active)
2161 { 2221 {
2162 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2222 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2163 hidden_text = 0; 2223 hidden_text = 0;
… …
2195 else 2255 else
2196 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2256 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2197 2257
2198 if ((rend & RS_Uline) && (font->descent > 1)) 2258 if ((rend & RS_Uline) && (font->descent > 1))
2199 XDrawLine (display->display, drawBuffer, TermWin.gc, 2259 XDrawLine (display->display, drawBuffer, TermWin.gc,
2200 xpixel, ypixel + font->ascent + 1, 2260 xpixel, ypixel + font->ascent + 1,
2201 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2261 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2202 } /* for (col....) */ 2262 } /* for (col....) */
2203 } /* for (row....) */ 2263 } /* for (row....) */
2204 2264
2205 /* 2265 /*
2206 * G: cleanup cursor and display outline cursor if necessary 2266 * G: cleanup cursor and display outline cursor if necessary
… …
2226 while (oldcursor.col + cursorwidth < TermWin.ncol 2286 while (oldcursor.col + cursorwidth < TermWin.ncol
2227 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2287 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2228 cursorwidth++; 2288 cursorwidth++;
2229 2289
2230 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2290 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2231 Col2Pixel (oldcursor.col), 2291 Col2Pixel (oldcursor.col),
2232 Row2Pixel (oldcursor.row), 2292 Row2Pixel (oldcursor.row),
2233 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2293 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2234 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2294 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2235 } 2295 }
2236 } 2296 }
2237 2297
2238 /* 2298 /*
2239 * H: cleanup selection 2299 * H: cleanup selection
… …
2247 /* 2307 /*
2248 * clear the whole screen height, note that width == 0 is treated 2308 * clear the whole screen height, note that width == 0 is treated
2249 * specially by XClearArea 2309 * specially by XClearArea
2250 */ 2310 */
2251 XClearArea (display->display, TermWin.vt, 0, 0, 2311 XClearArea (display->display, TermWin.vt, 0, 0,
2252 (unsigned int)TermWin.int_bwidth, 2312 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False); 2313 (unsigned int)TermWin_TotalHeight (), False);
2314
2254 if (clearlast && TermWin.int_bwidth) 2315 if (clearlast && TermWin.int_bwidth)
2255 /* 2316 /*
2256 * clear the whole screen height, note that width == 0 is treated 2317 * clear the whole screen height, note that width == 0 is treated
2257 * specially by XClearArea 2318 * specially by XClearArea
2258 */ 2319 */
2259 XClearArea (display->display, TermWin.vt, 2320 XClearArea (display->display, TermWin.vt,
2260 TermWin.width + TermWin.int_bwidth, 0, 2321 TermWin.width + TermWin.int_bwidth, 0,
2261 (unsigned int)TermWin.int_bwidth, 2322 (unsigned int)TermWin.int_bwidth,
2262 (unsigned int)TermWin_TotalHeight (), False); 2323 (unsigned int)TermWin_TotalHeight (), False);
2324
2263 if (refresh_type & SMOOTH_REFRESH) 2325 if (refresh_type & SMOOTH_REFRESH)
2264 XSync (display->display, False); 2326 XSync (display->display, False);
2265 2327
2266 num_scr = 0; 2328 num_scr = 0;
2267 num_scr_allow = 1; 2329 num_scr_allow = 1;
… …
2291 } 2353 }
2292} 2354}
2293 2355
2294/* ------------------------------------------------------------------------- */ 2356/* ------------------------------------------------------------------------- */
2295void 2357void
2296rxvt_term::scr_clear () 2358rxvt_term::scr_clear (bool really)
2297{ 2359{
2298 if (!TermWin.mapped) 2360 if (!TermWin.mapped)
2299 return; 2361 return;
2300 2362
2301 num_scr_allow = 0; 2363 num_scr_allow = 0;
2302 want_refresh = 1; 2364 want_refresh = 1;
2365
2303#ifdef TRANSPARENT 2366#ifdef TRANSPARENT
2304 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2367 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2305 { 2368 {
2306 int i; 2369 int i;
2307 2370
… …
2314 if (TermWin.parent[i] != None) 2377 if (TermWin.parent[i] != None)
2315 XClearWindow (display->display, TermWin.parent[i]); 2378 XClearWindow (display->display, TermWin.parent[i]);
2316 } 2379 }
2317#endif 2380#endif
2318 2381
2382 if (really)
2319 XClearWindow (display->display, TermWin.vt); 2383 XClearWindow (display->display, TermWin.vt);
2320} 2384}
2321 2385
2322/* ------------------------------------------------------------------------- */ 2386/* ------------------------------------------------------------------------- */
2323void 2387void
2324rxvt_term::scr_reverse_selection () 2388rxvt_term::scr_reverse_selection ()
2325{ 2389{
2326 int i, col, row, end_row;
2327 rend_t *srp;
2328
2329 if (selection.op && current_screen == selection.screen) 2390 if (selection.op && current_screen == selection.screen)
2330 { 2391 {
2331 end_row = TermWin.saveLines - TermWin.view_start; 2392 int end_row = TermWin.saveLines - TermWin.view_start;
2332 i = selection.beg.row + TermWin.saveLines; 2393 int i = selection.beg.row + TermWin.saveLines;
2333 row = selection.end.row + TermWin.saveLines; 2394 int col, row = selection.end.row + TermWin.saveLines;
2395 rend_t *srp;
2396
2334 if (i >= end_row) 2397 if (i >= end_row)
2335 col = selection.beg.col; 2398 col = selection.beg.col;
2336 else 2399 else
2337 { 2400 {
2338 col = 0; 2401 col = 0;
2339 i = end_row; 2402 i = end_row;
2340 } 2403 }
2404
2341 end_row += TermWin.nrow; 2405 end_row += TermWin.nrow;
2342 for (; i < row && i < end_row; i++, col = 0) 2406 for (; i < row && i < end_row; i++, col = 0)
2343 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2407 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2344 srp[col] ^= RS_RVid; 2408 srp[col] ^= RS_RVid;
2409
2345 if (i == row && i < end_row) 2410 if (i == row && i < end_row)
2346 for (srp = screen.rend[i]; col < selection.end.col; col++) 2411 for (srp = screen.rend[i]; col < selection.end.col; col++)
2347 srp[col] ^= RS_RVid; 2412 srp[col] ^= RS_RVid;
2348 } 2413 }
2349} 2414}
… …
2488 } 2553 }
2489 2554
2490 for (;;) 2555 for (;;)
2491 { 2556 {
2492 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2557 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2493 (long) (PROP_SIZE / 4), delete_prop, 2558 (long) (PROP_SIZE / 4), delete_prop,
2494 AnyPropertyType, &ct.encoding, &ct.format, 2559 AnyPropertyType, &ct.encoding, &ct.format,
2495 &ct.nitems, &bytes_after, 2560 &ct.nitems, &bytes_after,
2496 &ct.value) != Success) 2561 &ct.value) != Success)
2497 break; 2562 break;
2498 2563
2499 if (ct.encoding == 0) 2564 if (ct.encoding == 0)
2500 { 2565 {
2501 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2566 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2509 } 2574 }
2510 2575
2511 if (ct.nitems == 0) 2576 if (ct.nitems == 0)
2512 { 2577 {
2513 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2578 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2579
2514 if (selection_wait == Sel_normal && nread == 0) 2580 if (selection_wait == Sel_normal && nread == 0
2581 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2515 { 2582 {
2516 /* 2583 /*
2517 * pass through again trying CUT_BUFFER0 if we've come from 2584 * pass through again trying CUT_BUFFER0 if we've come from
2518 * XConvertSelection () but nothing was presented 2585 * XConvertSelection () but nothing was presented
2519 */ 2586 */
… …
2572{ 2639{
2573 int reget_time = 0; 2640 int reget_time = 0;
2574 2641
2575 if (prop == None) 2642 if (prop == None)
2576 return; 2643 return;
2644
2577 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2645 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2578 if (selection_wait == Sel_normal) 2646 if (selection_wait == Sel_normal)
2579 { 2647 {
2580 int a, afmt; 2648 int a, afmt;
2581 Atom atype; 2649 Atom atype;
2582 unsigned long bytes_after, nitems; 2650 unsigned long bytes_after, nitems;
2583 unsigned char *s = NULL; 2651 unsigned char *s = NULL;
2584 2652
2585 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2653 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2586 xa[XA_INCR], &atype, &afmt, &nitems, 2654 xa[XA_INCR], &atype, &afmt, &nitems,
2587 &bytes_after, &s); 2655 &bytes_after, &s);
2588 if (s) 2656 if (s)
2589 XFree (s); 2657 XFree (s);
2590 if (a != Success) 2658 if (a != Success)
2591 return; 2659 return;
2660
2592#ifndef __CYGWIN32__ 2661#ifndef __CYGWIN32__
2593 if (atype == xa[XA_INCR]) 2662 if (atype == xa[XA_INCR])
2594 { /* start an INCR transfer */ 2663 { /* start an INCR transfer */
2595 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2664 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2596 XDeleteProperty (display->display, win, prop); 2665 XDeleteProperty (display->display, win, prop);
… …
2602 2671
2603 } 2672 }
2604 else if (selection_wait == Sel_incr) 2673 else if (selection_wait == Sel_incr)
2605 { 2674 {
2606 reget_time = 1; 2675 reget_time = 1;
2676
2607 if (selection_paste (win, prop, True) == -1) 2677 if (selection_paste (win, prop, True) == -1)
2608 { 2678 {
2609 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2610 selection_wait = Sel_none; 2680 selection_wait = Sel_none;
2611 incr_ev.stop (); 2681 incr_ev.stop ();
2612 } 2682 }
2613 } 2683 }
2614 if (reget_time) /* received more data so reget time */ 2684 if (reget_time) /* received more data so reget time */
2615 incr_ev.start (NOW + 10); 2685 incr_ev.start (NOW + 10);
2616} 2686}
2687
2617/* ------------------------------------------------------------------------- */ 2688/* ------------------------------------------------------------------------- */
2618/* 2689/*
2619 * Request the current selection: 2690 * Request the current selection:
2620 * Order: > internal selection if available 2691 * Order: > internal selection if available
2621 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2692 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2626 */ 2697 */
2627void 2698void
2628rxvt_term::selection_request (Time tm, int x, int y) 2699rxvt_term::selection_request (Time tm, int x, int y)
2629{ 2700{
2630 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2701 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2702
2631 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2703 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2632 return; /* outside window */ 2704 return; /* outside window */
2633 2705
2634 if (selection.text != NULL) 2706 if (selection.text)
2635 { /* internal selection */ 2707 { /* internal selection */
2636 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2708 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2637 paste (selection.text, selection.len); 2709 char *str = rxvt_wcstombs (selection.text, selection.len);
2710 paste ((unsigned char *)str, strlen (str));
2711 free (str);
2638 return; 2712 return;
2639 } 2713 }
2640 else 2714 else
2641 { 2715 {
2642 int i; 2716 int i;
2643 2717
2644 selection_request_time = tm; 2718 selection_request_time = tm;
2645 selection_wait = Sel_normal; 2719 selection_wait = Sel_normal;
2646 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2647 { 2721 {
… …
2655 return; 2729 return;
2656#endif 2730#endif
2657 2731
2658 } 2732 }
2659 } 2733 }
2734
2660 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2735 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2661 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2736 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2662 selection_paste (display->root, XA_CUT_BUFFER0, False); 2737 selection_paste (display->root, XA_CUT_BUFFER0, False);
2663} 2738}
2664 2739
2665int 2740int
2666rxvt_term::selection_request_other (Atom target, int selnum) 2741rxvt_term::selection_request_other (Atom target, int selnum)
2667{ 2742{
2668 Atom sel; 2743 Atom sel;
2669#ifdef DEBUG_SELECT 2744#ifdef DEBUG_SELECT
2670 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2745 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2671#endif 2746#endif
2672 2747
2673 selection_type |= selnum; 2748 selection_type |= selnum;
2749
2674 if (selnum == Sel_Primary) 2750 if (selnum == Sel_Primary)
2675 sel = XA_PRIMARY; 2751 sel = XA_PRIMARY;
2676 else if (selnum == Sel_Secondary) 2752 else if (selnum == Sel_Secondary)
2677 sel = XA_SECONDARY; 2753 sel = XA_SECONDARY;
2678 else 2754 else
2679 sel = xa[XA_CLIPBOARD]; 2755 sel = xa[XA_CLIPBOARD];
2756
2680 if (XGetSelectionOwner (display->display, sel) != None) 2757 if (XGetSelectionOwner (display->display, sel) != None)
2681 { 2758 {
2682 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2759 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2683 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2760 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2684 TermWin.vt, selection_request_time); 2761 TermWin.vt, selection_request_time);
2685 return 1; 2762 return 1;
2686 } 2763 }
2764
2687 return 0; 2765 return 0;
2688} 2766}
2689 2767
2690/* ------------------------------------------------------------------------- */ 2768/* ------------------------------------------------------------------------- */
2691/* 2769/*
… …
2710 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2711 */ 2789 */
2712void 2790void
2713rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2714{ 2792{
2715 int i, col, end_col, row, end_row; 2793 int i, col, end_col, row, end_row;
2716 unsigned char *new_selection_text; 2794 wchar_t *new_selection_text;
2717 char *str;
2718 text_t *t; 2795 text_t *t;
2719#ifdef ACS_ASCII
2720 rend_t *re;
2721#endif
2722 2796
2723 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2797 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2724 switch (selection.op) 2798 switch (selection.op)
2725 { 2799 {
2726 case SELECTION_CONT: 2800 case SELECTION_CONT:
… …
2732 selection.op = SELECTION_DONE; 2806 selection.op = SELECTION_DONE;
2733 /* FALLTHROUGH */ 2807 /* FALLTHROUGH */
2734 default: 2808 default:
2735 return; 2809 return;
2736 } 2810 }
2811
2737 selection.op = SELECTION_DONE; 2812 selection.op = SELECTION_DONE;
2738 2813
2739 if (selection.clicks == 4) 2814 if (selection.clicks == 4)
2740 return; /* nothing selected, go away */ 2815 return; /* nothing selected, go away */
2741 2816
2742 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2817 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2743 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2818 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2744
2745 new_selection_text = (unsigned char *)str;
2746 2819
2747 col = selection.beg.col; 2820 col = selection.beg.col;
2748 MAX_IT (col, 0); 2821 MAX_IT (col, 0);
2749 row = selection.beg.row + TermWin.saveLines; 2822 row = selection.beg.row + TermWin.saveLines;
2750 end_row = selection.end.row + TermWin.saveLines; 2823 end_row = selection.end.row + TermWin.saveLines;
2824 int ofs = 0;
2825 int extra = 0;
2751 2826
2752 for (; row <= end_row; row++, col = 0) 2827 for (; row <= end_row; row++, col = 0)
2753 { 2828 {
2754 t = & (screen.text[row][col]); 2829 t = &(screen.text[row][col]);
2755 2830
2756 end_col = screen.tlen[row]; 2831 end_col = screen.tlen[row];
2757 2832
2758 if (end_col == -1) 2833 if (end_col == -1)
2759 end_col = TermWin.ncol; 2834 end_col = TermWin.ncol;
2760 2835
2761 if (row == end_row) 2836 if (row == end_row)
2762 MIN_IT (end_col, selection.end.col); 2837 MIN_IT (end_col, selection.end.col);
2763 2838
2764 for (; col < end_col; col++) 2839 for (; col < end_col; col++)
2840 {
2765 if (*t == NOCHAR) 2841 if (*t == NOCHAR)
2766 t++; 2842 t++;
2843 else if (IS_COMPOSE (*t))
2844 {
2845 int len = rxvt_composite.expand (*t, 0);
2846
2847 extra -= (len - 1);
2848
2849 if (extra < 0)
2850 {
2851 extra += i;
2852 i += i;
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 }
2855
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 }
2767 else 2858 else
2768 { 2859 new_selection_text[ofs++] = *t++;
2769 int len = wctomb (str, *t++);
2770 if (len > 0)
2771 str += len;
2772 } 2860 }
2773 2861
2774 if (screen.tlen[row] != -1 && row != end_row) 2862 if (screen.tlen[row] != -1 && row != end_row)
2775 *str++ = '\n'; 2863 new_selection_text[ofs++] = L'\n';
2776 } 2864 }
2777 2865
2778#ifndef NO_OLD_SELECTION 2866#ifndef NO_OLD_SELECTION
2779 if (selection_style == OLD_SELECT) 2867 if (selection_style == OLD_SELECT)
2780 if (end_col == TermWin.ncol) 2868 if (end_col == TermWin.ncol)
2781 *str++ = '\n'; 2869 new_selection_text[ofs++] = L'\n';
2782#endif 2870#endif
2783#ifndef NO_NEW_SELECTION 2871#ifndef NO_NEW_SELECTION
2784 if (selection_style != OLD_SELECT) 2872 if (selection_style != OLD_SELECT)
2785 if (end_col != selection.end.col) 2873 if (end_col != selection.end.col)
2786 *str++ = '\n'; 2874 new_selection_text[ofs++] = L'\n';
2787#endif 2875#endif
2788 *str = '\0'; 2876 new_selection_text[ofs] = 0;
2789 2877
2790 i = str - (char *)new_selection_text;
2791 if (i == 0) 2878 if (ofs == 0)
2792 { 2879 {
2793 free (new_selection_text); 2880 free (new_selection_text);
2794 return; 2881 return;
2795 } 2882 }
2796 2883
2797 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2798 if (str - (char *)new_selection_text > 1024)
2799 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2800
2801 selection.len = i;
2802
2803 if (selection.text)
2804 free (selection.text); 2884 free (selection.text);
2805 2885
2806 selection.text = new_selection_text; 2886 // we usually allocate much more than necessary, so realloc it smaller again
2887 selection.len = ofs;
2888 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2807 2889
2808 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2809 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2810 display->set_selection_owner (this); 2892 display->set_selection_owner (this);
2811 else 2893 else
2812 rxvt_print_error ("can't get primary selection"); 2894 rxvt_print_error ("can't get primary selection");
2813 2895
2814 { 2896#if 0
2815 XTextProperty ct; 2897 XTextProperty ct;
2816 char *cl = (char *)selection.text;
2817 2898
2818 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2819 { 2900 {
2820 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2821 PropModeReplace, ct.value, ct.nitems);
2822 XFree (ct.value);
2823 }
2824 else
2825 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2901 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2826 PropModeReplace, selection.text, (int)selection.len); 2902 PropModeReplace, ct.value, ct.nitems);
2903 XFree (ct.value);
2827 } 2904 }
2905#endif
2828 2906
2829 selection_time = tm; 2907 selection_time = tm;
2830 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2908 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2831} 2909}
2832 2910
… …
3361 ev.target = rq.target; 3439 ev.target = rq.target;
3362 ev.time = rq.time; 3440 ev.time = rq.time;
3363 3441
3364 if (rq.target == xa[XA_TARGETS]) 3442 if (rq.target == xa[XA_TARGETS])
3365 { 3443 {
3366 Atom32 target_list[5]; 3444 Atom32 target_list[6];
3367 Atom32 *target = target_list; 3445 Atom32 *target = target_list;
3368 3446
3369 *target++ = (Atom32) xa[XA_TARGETS]; 3447 *target++ = (Atom32) xa[XA_TARGETS];
3448 *target++ = (Atom32) xa[XA_TIMESTAMP];
3370 *target++ = (Atom32) XA_STRING; 3449 *target++ = (Atom32) XA_STRING;
3371 *target++ = (Atom32) xa[XA_TEXT]; 3450 *target++ = (Atom32) xa[XA_TEXT];
3372 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3451 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3373#if X_HAVE_UTF8_STRING 3452#if X_HAVE_UTF8_STRING
3374 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3453 *target++ = (Atom32) xa[XA_UTF8_STRING];
3375#endif 3454#endif
3455
3376 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3456 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3377 (8 * sizeof (target_list[0])), PropModeReplace, 3457 (8 * sizeof (target_list[0])), PropModeReplace,
3378 (unsigned char *)target_list, 3458 (unsigned char *)target_list,
3379 target - target_list); 3459 target - target_list);
3380 ev.property = rq.property; 3460 ev.property = rq.property;
3381 } 3461 }
3382 else if (rq.target == xa[XA_MULTIPLE]) 3462 else if (rq.target == xa[XA_MULTIPLE])
3383 { 3463 {
3384 /* TODO: Handle MULTIPLE */ 3464 /* TODO: Handle MULTIPLE */
… …
3396 || rq.target == xa[XA_UTF8_STRING] 3476 || rq.target == xa[XA_UTF8_STRING]
3397 ) 3477 )
3398 { 3478 {
3399 short freect = 0; 3479 short freect = 0;
3400 int selectlen; 3480 int selectlen;
3401 char *cl; 3481 wchar_t *cl;
3402 3482
3403 target = rq.target; 3483 target = rq.target;
3404 3484
3405 if (target == XA_STRING) 3485 if (target == XA_STRING)
3406 // we actually don't do XA_STRING, but who cares, as i18n clients 3486 // we actually don't do XA_STRING, but who cares, as i18n clients
3407 // will ask for another format anyways. 3487 // will ask for another format anyways.
3408 style = XStringStyle; 3488 style = XStringStyle;
3409 else if (target == xa[XA_TEXT]) 3489 else if (target == xa[XA_TEXT])
3410 style = XTextStyle; 3490 style = XStdICCTextStyle;
3411 else if (target == xa[XA_COMPOUND_TEXT]) 3491 else if (target == xa[XA_COMPOUND_TEXT])
3412 style = XCompoundTextStyle; 3492 style = XCompoundTextStyle;
3413#if X_HAVE_UTF8_STRING 3493#if X_HAVE_UTF8_STRING
3414 else if (target == xa[XA_UTF8_STRING]) 3494 else if (target == xa[XA_UTF8_STRING])
3415 style = XUTF8StringStyle; 3495 style = XUTF8StringStyle;
… …
3420 style = XCompoundTextStyle; 3500 style = XCompoundTextStyle;
3421 } 3501 }
3422 3502
3423 if (selection.text) 3503 if (selection.text)
3424 { 3504 {
3425 cl = (char *)selection.text; 3505 cl = selection.text;
3426 selectlen = selection.len; 3506 selectlen = selection.len;
3427 } 3507 }
3428 else 3508 else
3429 { 3509 {
3430 cl = ""; 3510 cl = L"";
3431 selectlen = 0; 3511 selectlen = 0;
3432 } 3512 }
3433 3513
3514 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3515 // manually for XUTF8StringStyle.
3434 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3516 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3435 freect = 1; 3517 freect = 1;
3436 else 3518 else
3437 { 3519 {
3438 /* if we failed to convert then send it raw */ 3520 /* if we failed to convert then send it raw */
3439 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
… …
3446 ev.property = rq.property; 3528 ev.property = rq.property;
3447 3529
3448 if (freect) 3530 if (freect)
3449 XFree (ct.value); 3531 XFree (ct.value);
3450 } 3532 }
3533
3451 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3452} 3535}
3453 3536
3454/* ------------------------------------------------------------------------- * 3537/* ------------------------------------------------------------------------- *
3455 * MOUSE ROUTINES * 3538 * MOUSE ROUTINES *

Diff Legend

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