… | |
… | |
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 | */ |
766 | void |
766 | void |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
768 | { |
768 | { |
769 | unsigned char checksel, clearsel; |
769 | unsigned char checksel, clearsel; |
770 | uint32_t c; |
770 | uint32_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 | 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); |
865 | |
876 | |
866 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
877 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
867 | switch (c) |
878 | switch (c) |
868 | { |
879 | { |
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 |
880 | // vt100 special graphics and line drawing |
875 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
881 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
876 | 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; |
877 | 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; |
878 | 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; |
… | |
… | |
882 | 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; |
883 | 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; |
884 | 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; |
885 | 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; |
886 | } |
892 | } |
|
|
893 | |
887 | |
894 | |
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) |
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 | |
894 | do |
904 | do |
895 | { |
905 | { |
896 | stp[screen.cur.col] = c; |
906 | stp[screen.cur.col] = c; |
897 | srp[screen.cur.col] = rend; |
907 | srp[screen.cur.col] = rend; |
898 | |
908 | |
899 | if (screen.cur.col < last_col - 1) |
909 | if (screen.cur.col < last_col - 1) |
900 | screen.cur.col++; |
910 | screen.cur.col++; |
901 | else |
911 | else |
902 | { |
912 | { |
903 | screen.tlen[row] = last_col; |
913 | screen.tlen[row] = last_col; |
904 | if (screen.flags & Screen_Autowrap) |
914 | if (screen.flags & Screen_Autowrap) |
905 | screen.flags |= Screen_WrapNext; |
915 | screen.flags |= Screen_WrapNext; |
906 | break; |
916 | break; |
907 | } |
917 | } |
908 | |
918 | |
909 | c = NOCHAR; |
919 | c = NOCHAR; |
910 | } |
920 | } |
911 | 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 | } |
912 | else |
952 | else |
913 | (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 | } |
914 | } |
968 | } |
915 | |
969 | |
916 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
970 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
917 | MAX_IT (screen.tlen[row], screen.cur.col); |
971 | MAX_IT (screen.tlen[row], screen.cur.col); |
918 | |
972 | |
… | |
… | |
1098 | else |
1152 | else |
1099 | screen.cur.row = row; |
1153 | screen.cur.row = row; |
1100 | } |
1154 | } |
1101 | MAX_IT (screen.cur.row, 0); |
1155 | MAX_IT (screen.cur.row, 0); |
1102 | 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--; |
1103 | } |
1161 | } |
1104 | |
1162 | |
1105 | /* ------------------------------------------------------------------------- */ |
1163 | /* ------------------------------------------------------------------------- */ |
1106 | /* |
1164 | /* |
1107 | * direction should be UP or DN |
1165 | * direction should be UP or DN |
… | |
… | |
2054 | int ypixel = (int)Row2Pixel (row); |
2112 | int ypixel = (int)Row2Pixel (row); |
2055 | |
2113 | |
2056 | for (col = 0; col < TermWin.ncol; col++) |
2114 | for (col = 0; col < TermWin.ncol; col++) |
2057 | { |
2115 | { |
2058 | /* 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 | |
2059 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2129 | 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; |
2130 | text_t *text = stp + col; |
2068 | int count = 1; |
2131 | int count = 1; |
2069 | |
2132 | |
2070 | /* redraw one or more characters */ |
|
|
2071 | |
|
|
2072 | dtp[col] = stp[col]; |
2133 | dtp[col] = stp[col]; |
2073 | drp[col] = rend; |
2134 | drp[col] = rend; |
2074 | |
|
|
2075 | if (*text == NOCHAR) // never start redrawing at invisible characters. */ |
|
|
2076 | continue; |
|
|
2077 | |
2135 | |
2078 | int xpixel = Col2Pixel (col); |
2136 | int xpixel = Col2Pixel (col); |
2079 | |
2137 | |
2080 | // this loop looks very messy, it can probably be optimized |
2138 | // this loop looks very messy, it can probably be optimized |
2081 | // and cleaned a bit by you? |
2139 | // and cleaned a bit by you? |
… | |
… | |
2197 | else |
2255 | else |
2198 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2256 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2199 | |
2257 | |
2200 | if ((rend & RS_Uline) && (font->descent > 1)) |
2258 | if ((rend & RS_Uline) && (font->descent > 1)) |
2201 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2259 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2202 | xpixel, ypixel + font->ascent + 1, |
2260 | xpixel, ypixel + font->ascent + 1, |
2203 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2261 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2204 | } /* for (col....) */ |
2262 | } /* for (col....) */ |
2205 | } /* for (row....) */ |
2263 | } /* for (row....) */ |
2206 | |
2264 | |
2207 | /* |
2265 | /* |
2208 | * G: cleanup cursor and display outline cursor if necessary |
2266 | * G: cleanup cursor and display outline cursor if necessary |
… | |
… | |
2228 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2286 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2229 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2287 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2230 | cursorwidth++; |
2288 | cursorwidth++; |
2231 | |
2289 | |
2232 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2290 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2233 | Col2Pixel (oldcursor.col), |
2291 | Col2Pixel (oldcursor.col), |
2234 | Row2Pixel (oldcursor.row), |
2292 | Row2Pixel (oldcursor.row), |
2235 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2293 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2236 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2294 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2237 | } |
2295 | } |
2238 | } |
2296 | } |
2239 | |
2297 | |
2240 | /* |
2298 | /* |
2241 | * H: cleanup selection |
2299 | * H: cleanup selection |
… | |
… | |
2249 | /* |
2307 | /* |
2250 | * clear the whole screen height, note that width == 0 is treated |
2308 | * clear the whole screen height, note that width == 0 is treated |
2251 | * specially by XClearArea |
2309 | * specially by XClearArea |
2252 | */ |
2310 | */ |
2253 | XClearArea (display->display, TermWin.vt, 0, 0, |
2311 | XClearArea (display->display, TermWin.vt, 0, 0, |
2254 | (unsigned int)TermWin.int_bwidth, |
2312 | (unsigned int)TermWin.int_bwidth, |
2255 | (unsigned int)TermWin_TotalHeight (), False); |
2313 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2314 | |
2256 | if (clearlast && TermWin.int_bwidth) |
2315 | if (clearlast && TermWin.int_bwidth) |
2257 | /* |
2316 | /* |
2258 | * clear the whole screen height, note that width == 0 is treated |
2317 | * clear the whole screen height, note that width == 0 is treated |
2259 | * specially by XClearArea |
2318 | * specially by XClearArea |
2260 | */ |
2319 | */ |
2261 | XClearArea (display->display, TermWin.vt, |
2320 | XClearArea (display->display, TermWin.vt, |
2262 | TermWin.width + TermWin.int_bwidth, 0, |
2321 | TermWin.width + TermWin.int_bwidth, 0, |
2263 | (unsigned int)TermWin.int_bwidth, |
2322 | (unsigned int)TermWin.int_bwidth, |
2264 | (unsigned int)TermWin_TotalHeight (), False); |
2323 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2324 | |
2265 | if (refresh_type & SMOOTH_REFRESH) |
2325 | if (refresh_type & SMOOTH_REFRESH) |
2266 | XSync (display->display, False); |
2326 | XSync (display->display, False); |
2267 | |
2327 | |
2268 | num_scr = 0; |
2328 | num_scr = 0; |
2269 | num_scr_allow = 1; |
2329 | num_scr_allow = 1; |
… | |
… | |
2293 | } |
2353 | } |
2294 | } |
2354 | } |
2295 | |
2355 | |
2296 | /* ------------------------------------------------------------------------- */ |
2356 | /* ------------------------------------------------------------------------- */ |
2297 | void |
2357 | void |
2298 | rxvt_term::scr_clear () |
2358 | rxvt_term::scr_clear (bool really) |
2299 | { |
2359 | { |
2300 | if (!TermWin.mapped) |
2360 | if (!TermWin.mapped) |
2301 | return; |
2361 | return; |
2302 | |
2362 | |
2303 | num_scr_allow = 0; |
2363 | num_scr_allow = 0; |
2304 | want_refresh = 1; |
2364 | want_refresh = 1; |
|
|
2365 | |
2305 | #ifdef TRANSPARENT |
2366 | #ifdef TRANSPARENT |
2306 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2367 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2307 | { |
2368 | { |
2308 | int i; |
2369 | int i; |
2309 | |
2370 | |
… | |
… | |
2316 | if (TermWin.parent[i] != None) |
2377 | if (TermWin.parent[i] != None) |
2317 | XClearWindow (display->display, TermWin.parent[i]); |
2378 | XClearWindow (display->display, TermWin.parent[i]); |
2318 | } |
2379 | } |
2319 | #endif |
2380 | #endif |
2320 | |
2381 | |
|
|
2382 | if (really) |
2321 | XClearWindow (display->display, TermWin.vt); |
2383 | XClearWindow (display->display, TermWin.vt); |
2322 | } |
2384 | } |
2323 | |
2385 | |
2324 | /* ------------------------------------------------------------------------- */ |
2386 | /* ------------------------------------------------------------------------- */ |
2325 | void |
2387 | void |
2326 | rxvt_term::scr_reverse_selection () |
2388 | rxvt_term::scr_reverse_selection () |
2327 | { |
2389 | { |
2328 | int i, col, row, end_row; |
|
|
2329 | rend_t *srp; |
|
|
2330 | |
|
|
2331 | if (selection.op && current_screen == selection.screen) |
2390 | if (selection.op && current_screen == selection.screen) |
2332 | { |
2391 | { |
2333 | end_row = TermWin.saveLines - TermWin.view_start; |
2392 | int end_row = TermWin.saveLines - TermWin.view_start; |
2334 | i = selection.beg.row + TermWin.saveLines; |
2393 | int i = selection.beg.row + TermWin.saveLines; |
2335 | row = selection.end.row + TermWin.saveLines; |
2394 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2395 | rend_t *srp; |
|
|
2396 | |
2336 | if (i >= end_row) |
2397 | if (i >= end_row) |
2337 | col = selection.beg.col; |
2398 | col = selection.beg.col; |
2338 | else |
2399 | else |
2339 | { |
2400 | { |
2340 | col = 0; |
2401 | col = 0; |
2341 | i = end_row; |
2402 | i = end_row; |
2342 | } |
2403 | } |
|
|
2404 | |
2343 | end_row += TermWin.nrow; |
2405 | end_row += TermWin.nrow; |
2344 | for (; i < row && i < end_row; i++, col = 0) |
2406 | for (; i < row && i < end_row; i++, col = 0) |
2345 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2407 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2346 | srp[col] ^= RS_RVid; |
2408 | srp[col] ^= RS_RVid; |
|
|
2409 | |
2347 | if (i == row && i < end_row) |
2410 | if (i == row && i < end_row) |
2348 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2411 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2349 | srp[col] ^= RS_RVid; |
2412 | srp[col] ^= RS_RVid; |
2350 | } |
2413 | } |
2351 | } |
2414 | } |
… | |
… | |
2511 | } |
2574 | } |
2512 | |
2575 | |
2513 | if (ct.nitems == 0) |
2576 | if (ct.nitems == 0) |
2514 | { |
2577 | { |
2515 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2578 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2579 | |
2516 | if (selection_wait == Sel_normal && nread == 0 |
2580 | if (selection_wait == Sel_normal && nread == 0 |
2517 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2581 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2518 | { |
2582 | { |
2519 | /* |
2583 | /* |
2520 | * pass through again trying CUT_BUFFER0 if we've come from |
2584 | * pass through again trying CUT_BUFFER0 if we've come from |
… | |
… | |
2575 | { |
2639 | { |
2576 | int reget_time = 0; |
2640 | int reget_time = 0; |
2577 | |
2641 | |
2578 | if (prop == None) |
2642 | if (prop == None) |
2579 | return; |
2643 | return; |
|
|
2644 | |
2580 | 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)); |
2581 | if (selection_wait == Sel_normal) |
2646 | if (selection_wait == Sel_normal) |
2582 | { |
2647 | { |
2583 | int a, afmt; |
2648 | int a, afmt; |
2584 | Atom atype; |
2649 | Atom atype; |
2585 | unsigned long bytes_after, nitems; |
2650 | unsigned long bytes_after, nitems; |
2586 | unsigned char *s = NULL; |
2651 | unsigned char *s = NULL; |
2587 | |
2652 | |
2588 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2653 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2589 | xa[XA_INCR], &atype, &afmt, &nitems, |
2654 | xa[XA_INCR], &atype, &afmt, &nitems, |
2590 | &bytes_after, &s); |
2655 | &bytes_after, &s); |
2591 | if (s) |
2656 | if (s) |
2592 | XFree (s); |
2657 | XFree (s); |
2593 | if (a != Success) |
2658 | if (a != Success) |
2594 | return; |
2659 | return; |
|
|
2660 | |
2595 | #ifndef __CYGWIN32__ |
2661 | #ifndef __CYGWIN32__ |
2596 | if (atype == xa[XA_INCR]) |
2662 | if (atype == xa[XA_INCR]) |
2597 | { /* start an INCR transfer */ |
2663 | { /* start an INCR transfer */ |
2598 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2664 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2599 | XDeleteProperty (display->display, win, prop); |
2665 | XDeleteProperty (display->display, win, prop); |
… | |
… | |
2605 | |
2671 | |
2606 | } |
2672 | } |
2607 | else if (selection_wait == Sel_incr) |
2673 | else if (selection_wait == Sel_incr) |
2608 | { |
2674 | { |
2609 | reget_time = 1; |
2675 | reget_time = 1; |
|
|
2676 | |
2610 | if (selection_paste (win, prop, True) == -1) |
2677 | if (selection_paste (win, prop, True) == -1) |
2611 | { |
2678 | { |
2612 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2679 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2613 | selection_wait = Sel_none; |
2680 | selection_wait = Sel_none; |
2614 | incr_ev.stop (); |
2681 | incr_ev.stop (); |
2615 | } |
2682 | } |
2616 | } |
2683 | } |
2617 | if (reget_time) /* received more data so reget time */ |
2684 | if (reget_time) /* received more data so reget time */ |
2618 | incr_ev.start (NOW + 10); |
2685 | incr_ev.start (NOW + 10); |
2619 | } |
2686 | } |
|
|
2687 | |
2620 | /* ------------------------------------------------------------------------- */ |
2688 | /* ------------------------------------------------------------------------- */ |
2621 | /* |
2689 | /* |
2622 | * Request the current selection: |
2690 | * Request the current selection: |
2623 | * Order: > internal selection if available |
2691 | * Order: > internal selection if available |
2624 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2692 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
… | |
… | |
2629 | */ |
2697 | */ |
2630 | void |
2698 | void |
2631 | rxvt_term::selection_request (Time tm, int x, int y) |
2699 | rxvt_term::selection_request (Time tm, int x, int y) |
2632 | { |
2700 | { |
2633 | 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 | |
2634 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2703 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2635 | return; /* outside window */ |
2704 | return; /* outside window */ |
2636 | |
2705 | |
2637 | if (selection.text != NULL) |
2706 | if (selection.text) |
2638 | { /* internal selection */ |
2707 | { /* internal selection */ |
2639 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2708 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2640 | paste (selection.text, selection.len); |
2709 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2710 | paste ((unsigned char *)str, strlen (str)); |
|
|
2711 | free (str); |
2641 | return; |
2712 | return; |
2642 | } |
2713 | } |
2643 | else |
2714 | else |
2644 | { |
2715 | { |
2645 | int i; |
2716 | int i; |
2646 | |
2717 | |
2647 | selection_request_time = tm; |
2718 | selection_request_time = tm; |
2648 | selection_wait = Sel_normal; |
2719 | selection_wait = Sel_normal; |
2649 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2720 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2650 | { |
2721 | { |
… | |
… | |
2658 | return; |
2729 | return; |
2659 | #endif |
2730 | #endif |
2660 | |
2731 | |
2661 | } |
2732 | } |
2662 | } |
2733 | } |
|
|
2734 | |
2663 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2735 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2664 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2736 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2665 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2737 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2666 | } |
2738 | } |
2667 | |
2739 | |
2668 | int |
2740 | int |
2669 | rxvt_term::selection_request_other (Atom target, int selnum) |
2741 | rxvt_term::selection_request_other (Atom target, int selnum) |
2670 | { |
2742 | { |
2671 | Atom sel; |
2743 | Atom sel; |
2672 | #ifdef DEBUG_SELECT |
2744 | #ifdef DEBUG_SELECT |
2673 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2745 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2674 | #endif |
2746 | #endif |
2675 | |
2747 | |
2676 | selection_type |= selnum; |
2748 | selection_type |= selnum; |
|
|
2749 | |
2677 | if (selnum == Sel_Primary) |
2750 | if (selnum == Sel_Primary) |
2678 | sel = XA_PRIMARY; |
2751 | sel = XA_PRIMARY; |
2679 | else if (selnum == Sel_Secondary) |
2752 | else if (selnum == Sel_Secondary) |
2680 | sel = XA_SECONDARY; |
2753 | sel = XA_SECONDARY; |
2681 | else |
2754 | else |
2682 | sel = xa[XA_CLIPBOARD]; |
2755 | sel = xa[XA_CLIPBOARD]; |
|
|
2756 | |
2683 | if (XGetSelectionOwner (display->display, sel) != None) |
2757 | if (XGetSelectionOwner (display->display, sel) != None) |
2684 | { |
2758 | { |
2685 | 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])); |
2686 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2760 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2687 | TermWin.vt, selection_request_time); |
2761 | TermWin.vt, selection_request_time); |
2688 | return 1; |
2762 | return 1; |
2689 | } |
2763 | } |
|
|
2764 | |
2690 | return 0; |
2765 | return 0; |
2691 | } |
2766 | } |
2692 | |
2767 | |
2693 | /* ------------------------------------------------------------------------- */ |
2768 | /* ------------------------------------------------------------------------- */ |
2694 | /* |
2769 | /* |
… | |
… | |
2713 | * EXT: button 1 or 3 release |
2788 | * EXT: button 1 or 3 release |
2714 | */ |
2789 | */ |
2715 | void |
2790 | void |
2716 | rxvt_term::selection_make (Time tm) |
2791 | rxvt_term::selection_make (Time tm) |
2717 | { |
2792 | { |
2718 | int i, col, end_col, row, end_row; |
2793 | int i, col, end_col, row, end_row; |
2719 | unsigned char *new_selection_text; |
2794 | wchar_t *new_selection_text; |
2720 | char *str; |
|
|
2721 | text_t *t; |
2795 | text_t *t; |
2722 | #ifdef ACS_ASCII |
|
|
2723 | rend_t *re; |
|
|
2724 | #endif |
|
|
2725 | |
2796 | |
2726 | 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)); |
2727 | switch (selection.op) |
2798 | switch (selection.op) |
2728 | { |
2799 | { |
2729 | case SELECTION_CONT: |
2800 | case SELECTION_CONT: |
… | |
… | |
2741 | selection.op = SELECTION_DONE; |
2812 | selection.op = SELECTION_DONE; |
2742 | |
2813 | |
2743 | if (selection.clicks == 4) |
2814 | if (selection.clicks == 4) |
2744 | return; /* nothing selected, go away */ |
2815 | return; /* nothing selected, go away */ |
2745 | |
2816 | |
2746 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; |
2817 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2747 | str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); |
2818 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2748 | |
|
|
2749 | new_selection_text = (unsigned char *)str; |
|
|
2750 | |
2819 | |
2751 | col = selection.beg.col; |
2820 | col = selection.beg.col; |
2752 | MAX_IT (col, 0); |
2821 | MAX_IT (col, 0); |
2753 | row = selection.beg.row + TermWin.saveLines; |
2822 | row = selection.beg.row + TermWin.saveLines; |
2754 | end_row = selection.end.row + TermWin.saveLines; |
2823 | end_row = selection.end.row + TermWin.saveLines; |
|
|
2824 | int ofs = 0; |
|
|
2825 | int extra = 0; |
2755 | |
2826 | |
2756 | for (; row <= end_row; row++, col = 0) |
2827 | for (; row <= end_row; row++, col = 0) |
2757 | { |
2828 | { |
2758 | t = & (screen.text[row][col]); |
2829 | t = &(screen.text[row][col]); |
2759 | |
2830 | |
2760 | end_col = screen.tlen[row]; |
2831 | end_col = screen.tlen[row]; |
2761 | |
2832 | |
2762 | if (end_col == -1) |
2833 | if (end_col == -1) |
2763 | end_col = TermWin.ncol; |
2834 | end_col = TermWin.ncol; |
2764 | |
2835 | |
2765 | if (row == end_row) |
2836 | if (row == end_row) |
2766 | MIN_IT (end_col, selection.end.col); |
2837 | MIN_IT (end_col, selection.end.col); |
2767 | |
2838 | |
2768 | for (; col < end_col; col++) |
2839 | for (; col < end_col; col++) |
|
|
2840 | { |
2769 | if (*t == NOCHAR) |
2841 | if (*t == NOCHAR) |
2770 | 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 | } |
2771 | else |
2858 | else |
2772 | { |
2859 | new_selection_text[ofs++] = *t++; |
2773 | int len = wctomb (str, *t++); |
|
|
2774 | if (len > 0) |
|
|
2775 | str += len; |
|
|
2776 | } |
2860 | } |
2777 | |
2861 | |
2778 | if (screen.tlen[row] != -1 && row != end_row) |
2862 | if (screen.tlen[row] != -1 && row != end_row) |
2779 | *str++ = '\n'; |
2863 | new_selection_text[ofs++] = L'\n'; |
2780 | } |
2864 | } |
2781 | |
2865 | |
2782 | #ifndef NO_OLD_SELECTION |
2866 | #ifndef NO_OLD_SELECTION |
2783 | if (selection_style == OLD_SELECT) |
2867 | if (selection_style == OLD_SELECT) |
2784 | if (end_col == TermWin.ncol) |
2868 | if (end_col == TermWin.ncol) |
2785 | *str++ = '\n'; |
2869 | new_selection_text[ofs++] = L'\n'; |
2786 | #endif |
2870 | #endif |
2787 | #ifndef NO_NEW_SELECTION |
2871 | #ifndef NO_NEW_SELECTION |
2788 | if (selection_style != OLD_SELECT) |
2872 | if (selection_style != OLD_SELECT) |
2789 | if (end_col != selection.end.col) |
2873 | if (end_col != selection.end.col) |
2790 | *str++ = '\n'; |
2874 | new_selection_text[ofs++] = L'\n'; |
2791 | #endif |
2875 | #endif |
2792 | *str = '\0'; |
2876 | new_selection_text[ofs] = 0; |
2793 | |
2877 | |
2794 | i = str - (char *)new_selection_text; |
|
|
2795 | if (i == 0) |
2878 | if (ofs == 0) |
2796 | { |
2879 | { |
2797 | free (new_selection_text); |
2880 | free (new_selection_text); |
2798 | return; |
2881 | return; |
2799 | } |
2882 | } |
2800 | |
2883 | |
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); |
2884 | free (selection.text); |
2809 | |
2885 | |
2810 | 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)); |
2811 | |
2889 | |
2812 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2890 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2813 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2891 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2814 | display->set_selection_owner (this); |
2892 | display->set_selection_owner (this); |
2815 | else |
2893 | else |
2816 | rxvt_print_error ("can't get primary selection"); |
2894 | rxvt_print_error ("can't get primary selection"); |
2817 | |
2895 | |
2818 | { |
2896 | #if 0 |
2819 | XTextProperty ct; |
2897 | XTextProperty ct; |
2820 | char *cl = (char *)selection.text; |
|
|
2821 | |
2898 | |
2822 | if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) |
2899 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2823 | { |
2900 | { |
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, |
2901 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2830 | PropModeReplace, selection.text, (int)selection.len); |
2902 | PropModeReplace, ct.value, ct.nitems); |
|
|
2903 | XFree (ct.value); |
2831 | } |
2904 | } |
|
|
2905 | #endif |
2832 | |
2906 | |
2833 | selection_time = tm; |
2907 | selection_time = tm; |
2834 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2908 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2835 | } |
2909 | } |
2836 | |
2910 | |
… | |
… | |
3365 | ev.target = rq.target; |
3439 | ev.target = rq.target; |
3366 | ev.time = rq.time; |
3440 | ev.time = rq.time; |
3367 | |
3441 | |
3368 | if (rq.target == xa[XA_TARGETS]) |
3442 | if (rq.target == xa[XA_TARGETS]) |
3369 | { |
3443 | { |
3370 | Atom32 target_list[5]; |
3444 | Atom32 target_list[6]; |
3371 | Atom32 *target = target_list; |
3445 | Atom32 *target = target_list; |
3372 | |
3446 | |
3373 | *target++ = (Atom32) xa[XA_TARGETS]; |
3447 | *target++ = (Atom32) xa[XA_TARGETS]; |
|
|
3448 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3374 | *target++ = (Atom32) XA_STRING; |
3449 | *target++ = (Atom32) XA_STRING; |
3375 | *target++ = (Atom32) xa[XA_TEXT]; |
3450 | *target++ = (Atom32) xa[XA_TEXT]; |
3376 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3451 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3377 | #if X_HAVE_UTF8_STRING |
3452 | #if X_HAVE_UTF8_STRING |
3378 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3453 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3379 | #endif |
3454 | #endif |
|
|
3455 | |
3380 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3456 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3381 | (8 * sizeof (target_list[0])), PropModeReplace, |
3457 | (8 * sizeof (target_list[0])), PropModeReplace, |
3382 | (unsigned char *)target_list, |
3458 | (unsigned char *)target_list, |
3383 | target - target_list); |
3459 | target - target_list); |
3384 | ev.property = rq.property; |
3460 | ev.property = rq.property; |
3385 | } |
3461 | } |
3386 | else if (rq.target == xa[XA_MULTIPLE]) |
3462 | else if (rq.target == xa[XA_MULTIPLE]) |
3387 | { |
3463 | { |
3388 | /* TODO: Handle MULTIPLE */ |
3464 | /* TODO: Handle MULTIPLE */ |
… | |
… | |
3400 | || rq.target == xa[XA_UTF8_STRING] |
3476 | || rq.target == xa[XA_UTF8_STRING] |
3401 | ) |
3477 | ) |
3402 | { |
3478 | { |
3403 | short freect = 0; |
3479 | short freect = 0; |
3404 | int selectlen; |
3480 | int selectlen; |
3405 | char *cl; |
3481 | wchar_t *cl; |
3406 | |
3482 | |
3407 | target = rq.target; |
3483 | target = rq.target; |
3408 | |
3484 | |
3409 | if (target == XA_STRING) |
3485 | if (target == XA_STRING) |
3410 | // 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 |
3411 | // will ask for another format anyways. |
3487 | // will ask for another format anyways. |
3412 | style = XStringStyle; |
3488 | style = XStringStyle; |
3413 | else if (target == xa[XA_TEXT]) |
3489 | else if (target == xa[XA_TEXT]) |
3414 | style = XTextStyle; |
3490 | style = XStdICCTextStyle; |
3415 | else if (target == xa[XA_COMPOUND_TEXT]) |
3491 | else if (target == xa[XA_COMPOUND_TEXT]) |
3416 | style = XCompoundTextStyle; |
3492 | style = XCompoundTextStyle; |
3417 | #if X_HAVE_UTF8_STRING |
3493 | #if X_HAVE_UTF8_STRING |
3418 | else if (target == xa[XA_UTF8_STRING]) |
3494 | else if (target == xa[XA_UTF8_STRING]) |
3419 | style = XUTF8StringStyle; |
3495 | style = XUTF8StringStyle; |
… | |
… | |
3424 | style = XCompoundTextStyle; |
3500 | style = XCompoundTextStyle; |
3425 | } |
3501 | } |
3426 | |
3502 | |
3427 | if (selection.text) |
3503 | if (selection.text) |
3428 | { |
3504 | { |
3429 | cl = (char *)selection.text; |
3505 | cl = selection.text; |
3430 | selectlen = selection.len; |
3506 | selectlen = selection.len; |
3431 | } |
3507 | } |
3432 | else |
3508 | else |
3433 | { |
3509 | { |
3434 | cl = ""; |
3510 | cl = L""; |
3435 | selectlen = 0; |
3511 | selectlen = 0; |
3436 | } |
3512 | } |
3437 | |
3513 | |
|
|
3514 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
|
|
3515 | // manually for XUTF8StringStyle. |
3438 | if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3516 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3439 | freect = 1; |
3517 | freect = 1; |
3440 | else |
3518 | else |
3441 | { |
3519 | { |
3442 | /* if we failed to convert then send it raw */ |
3520 | /* if we failed to convert then send it raw */ |
3443 | ct.value = (unsigned char *)cl; |
3521 | ct.value = (unsigned char *)cl; |
… | |
… | |
3450 | ev.property = rq.property; |
3528 | ev.property = rq.property; |
3451 | |
3529 | |
3452 | if (freect) |
3530 | if (freect) |
3453 | XFree (ct.value); |
3531 | XFree (ct.value); |
3454 | } |
3532 | } |
|
|
3533 | |
3455 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3534 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3456 | } |
3535 | } |
3457 | |
3536 | |
3458 | /* ------------------------------------------------------------------------- * |
3537 | /* ------------------------------------------------------------------------- * |
3459 | * MOUSE ROUTINES * |
3538 | * MOUSE ROUTINES * |