… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
143 | col--; |
142 | col--; |
144 | |
143 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
148 | // found start, nuke |
149 | // found start, nuke |
149 | do { |
150 | do { |
150 | l.t[col] = ' '; |
151 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
152 | l.r[col] = rend; |
152 | col++; |
153 | col++; |
… | |
… | |
231 | selection.text = NULL; |
232 | selection.text = NULL; |
232 | selection.len = 0; |
233 | selection.len = 0; |
233 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
234 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
235 | selection.clicks = 0; |
236 | selection.clicks = 0; |
|
|
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
236 | } |
239 | } |
237 | else |
240 | else |
238 | { |
241 | { |
239 | /* |
242 | /* |
240 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
395 | } |
398 | } |
396 | |
399 | |
397 | free (tabs); |
400 | free (tabs); |
398 | tabs = (char *)rxvt_malloc (ncol); |
401 | tabs = (char *)rxvt_malloc (ncol); |
399 | |
402 | |
400 | for (int col = ncol; --col; ) |
403 | for (int col = ncol; col--; ) |
401 | tabs [col] = col % TABSIZE == 0; |
404 | tabs [col] = col % TABSIZE == 0; |
402 | |
405 | |
403 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
404 | |
407 | |
405 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
… | |
… | |
544 | want_refresh = 1; |
547 | want_refresh = 1; |
545 | view_start = 0; |
548 | view_start = 0; |
546 | |
549 | |
547 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
548 | |
551 | |
549 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
550 | |
553 | |
551 | #if NSCREENS |
554 | #if NSCREENS |
552 | if (option (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
553 | { |
556 | { |
554 | num_scr = 0; |
557 | num_scr = 0; |
… | |
… | |
895 | # else |
898 | # else |
896 | c = 0xfffd; |
899 | c = 0xfffd; |
897 | # endif |
900 | # endif |
898 | #endif |
901 | #endif |
899 | |
902 | |
900 | // nuke the character at this position, if required |
|
|
901 | if (expect_false ( |
|
|
902 | line->t[screen.cur.col] == NOCHAR |
|
|
903 | || (screen.cur.col < ncol - 1 |
|
|
904 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
905 | )) |
|
|
906 | scr_kill_char (*line, screen.cur.col); |
|
|
907 | |
|
|
908 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
909 | |
904 | |
910 | // if the character doesn't fit into the remaining columns... |
905 | // if the character doesn't fit into the remaining columns... |
911 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
912 | { |
907 | { |
|
|
908 | if (screen.flags & Screen_Autowrap) |
|
|
909 | { |
913 | // ... artificially enlargen the previous one |
910 | // ... artificially enlargen the previous one |
914 | c = NOCHAR; |
911 | c = NOCHAR; |
915 | // and try the same character next loop iteration |
912 | // and try the same character next loop iteration |
916 | --str; |
913 | --str; |
|
|
914 | } |
|
|
915 | else |
|
|
916 | screen.cur.col = ncol - width; |
917 | } |
917 | } |
|
|
918 | |
|
|
919 | // nuke the character at this position, if required |
|
|
920 | // due to wonderful coincidences everywhere else in this loop |
|
|
921 | // we never have to check for overwriting a wide char itself, |
|
|
922 | // only its tail. |
|
|
923 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
|
|
924 | scr_kill_char (*line, screen.cur.col); |
918 | |
925 | |
919 | line->touch (); |
926 | line->touch (); |
920 | |
927 | |
921 | do |
928 | do |
922 | { |
929 | { |
… | |
… | |
928 | else |
935 | else |
929 | { |
936 | { |
930 | line->l = ncol; |
937 | line->l = ncol; |
931 | if (screen.flags & Screen_Autowrap) |
938 | if (screen.flags & Screen_Autowrap) |
932 | screen.flags |= Screen_WrapNext; |
939 | screen.flags |= Screen_WrapNext; |
933 | break; |
940 | |
|
|
941 | goto end_of_line; |
934 | } |
942 | } |
935 | |
943 | |
936 | c = NOCHAR; |
944 | c = NOCHAR; |
937 | } |
945 | } |
938 | while (expect_false (--width > 0)); |
946 | while (expect_false (--width > 0)); |
939 | |
947 | |
940 | // pad with spaces when overwriting wide character with smaller one |
948 | // pad with spaces when overwriting wide character with smaller one |
941 | if (expect_false (!width)) |
949 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
942 | { |
950 | { |
943 | line->touch (); |
|
|
944 | |
|
|
945 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
946 | { |
|
|
947 | line->t[c] = ' '; |
951 | line->t[c] = ' '; |
948 | line->r[c] = rend; |
952 | line->r[c] = rend; |
949 | } |
|
|
950 | } |
953 | } |
|
|
954 | |
|
|
955 | end_of_line: |
|
|
956 | ; |
951 | } |
957 | } |
952 | #if ENABLE_COMBINING |
958 | #if ENABLE_COMBINING |
953 | else // width == 0 |
959 | else // width == 0 |
954 | { |
960 | { |
955 | if (c != 0xfeff) // ignore BOM |
961 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1018 | |
1024 | |
1019 | want_refresh = 1; |
1025 | want_refresh = 1; |
1020 | #endif |
1026 | #endif |
1021 | } |
1027 | } |
1022 | } |
1028 | } |
|
|
1029 | else if (screen.flags & Screen_WrapNext) |
|
|
1030 | screen.flags &= ~Screen_WrapNext; |
1023 | else |
1031 | else |
1024 | scr_gotorc (0, -1, RELATIVE); |
1032 | scr_gotorc (0, -1, RELATIVE); |
1025 | } |
1033 | } |
1026 | |
1034 | |
1027 | /* ------------------------------------------------------------------------- */ |
1035 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1334 | return; |
1342 | return; |
1335 | |
1343 | |
1336 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1337 | |
1345 | |
1338 | // TODO: the code below does not work when view_start != 0 |
|
|
1339 | // the workaround is to disable the clear and use a normal refresh |
|
|
1340 | // when view_start != 0. mysterious. |
|
|
1341 | if (rstyle & (RS_RVid | RS_Uline)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1342 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1343 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1344 | { |
1349 | { |
1345 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1346 | |
1351 | |
1347 | if (mapped && !view_start) |
1352 | if (mapped) |
1348 | XClearArea (dpy, vt, 0, |
1353 | XClearArea (dpy, vt, 0, |
1349 | Row2Pixel (row - view_start), (unsigned int)width, |
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
1350 | (unsigned int)Height2Pixel (num), False); |
1355 | (unsigned int)Height2Pixel (num), False); |
1351 | } |
1356 | } |
1352 | else |
1357 | else |
1353 | { |
1358 | { |
1354 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1355 | |
1360 | |
1356 | if (mapped && !view_start) |
1361 | if (mapped) |
1357 | { |
1362 | { |
1358 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1359 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1360 | XFillRectangle (dpy, vt, gc, |
1365 | XFillRectangle (dpy, vt, gc, |
1361 | 0, Row2Pixel (row - view_start), |
1366 | 0, Row2Pixel (row - view_start), |
… | |
… | |
1368 | |
1373 | |
1369 | for (; num--; row++) |
1374 | for (; num--; row++) |
1370 | { |
1375 | { |
1371 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
1372 | |
1377 | |
1373 | if (!view_start) |
1378 | if (row - view_start < nrow) |
1374 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1375 | } |
1380 | } |
1376 | } |
1381 | } |
1377 | |
1382 | |
1378 | #if !ENABLE_MINIMAL |
1383 | #if !ENABLE_MINIMAL |
1379 | void |
1384 | void |
… | |
… | |
1678 | { |
1683 | { |
1679 | rvideo_state = on; |
1684 | rvideo_state = on; |
1680 | |
1685 | |
1681 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1682 | #ifdef HAVE_BG_PIXMAP |
1687 | #ifdef HAVE_BG_PIXMAP |
1683 | if (bgPixmap.pixmap == None) |
1688 | if (bg_pixmap == None) |
1684 | #endif |
1689 | #endif |
1685 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1686 | |
1691 | |
1687 | XGCValues gcvalue; |
1692 | XGCValues gcvalue; |
1688 | gcvalue.foreground = pix_colors[Color_fg]; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1832 | for (i = PART_BEG; i < RC_COUNT; i++) |
1837 | for (i = PART_BEG; i < RC_COUNT; i++) |
1833 | { |
1838 | { |
1834 | min_it (rc[i].col, ncol - 1); |
1839 | min_it (rc[i].col, ncol - 1); |
1835 | min_it (rc[i].row, nrow - 1); |
1840 | min_it (rc[i].row, nrow - 1); |
1836 | } |
1841 | } |
1837 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1842 | |
1838 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1843 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1839 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1844 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1840 | |
1845 | |
1841 | num_scr_allow = 0; |
1846 | num_scr_allow = 0; |
1842 | |
1847 | |
… | |
… | |
2024 | refresh_count = 0; |
2029 | refresh_count = 0; |
2025 | |
2030 | |
2026 | unsigned int old_screen_flags = screen.flags; |
2031 | unsigned int old_screen_flags = screen.flags; |
2027 | char have_bg = 0; |
2032 | char have_bg = 0; |
2028 | #ifdef HAVE_BG_PIXMAP |
2033 | #ifdef HAVE_BG_PIXMAP |
2029 | have_bg = bgPixmap.pixmap != None; |
2034 | have_bg = bg_pixmap != None; |
2030 | #endif |
2035 | #endif |
2031 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2032 | |
2037 | |
2033 | /* |
2038 | /* |
2034 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
… | |
… | |
2083 | ccol2 = bgcolor_of (rstyle); |
2088 | ccol2 = bgcolor_of (rstyle); |
2084 | #else |
2089 | #else |
2085 | ccol2 = Color_bg; |
2090 | ccol2 = Color_bg; |
2086 | #endif |
2091 | #endif |
2087 | |
2092 | |
2088 | if (showcursor && focus) |
2093 | if (focus) |
2089 | { |
2094 | { |
2090 | if (option (Opt_cursorUnderline)) |
2095 | if (option (Opt_cursorUnderline)) |
2091 | *crp ^= RS_Uline; |
2096 | *crp ^= RS_Uline; |
2092 | else |
2097 | else |
2093 | { |
2098 | { |
… | |
… | |
2229 | |
2234 | |
2230 | // seek to the beginning of wide characters |
2235 | // seek to the beginning of wide characters |
2231 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2232 | --col; |
2237 | --col; |
2233 | |
2238 | |
2234 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2235 | text_t *text = stp + col; |
2240 | text_t *text = stp + col; |
2236 | int count = 1; |
2241 | int count = 1; |
2237 | |
2242 | |
2238 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2239 | drp[col] = rend; |
2244 | drp[col] = rend; |
… | |
… | |
2284 | */ |
2289 | */ |
2285 | int fore = fgcolor_of (rend); // desired foreground |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2286 | int back = bgcolor_of (rend); // desired background |
2291 | int back = bgcolor_of (rend); // desired background |
2287 | |
2292 | |
2288 | // only do special processing if any attributes are set, which is unlikely |
2293 | // only do special processing if any attributes are set, which is unlikely |
2289 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2290 | { |
2295 | { |
2291 | bool invert = rend & RS_RVid; |
2296 | bool invert = rend & RS_RVid; |
2292 | |
2297 | |
2293 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2294 | if (rend & RS_Bold && fore == Color_fg) |
2299 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2313 | |
2318 | |
2314 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2319 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2315 | fore = Color_UL; |
2320 | fore = Color_UL; |
2316 | #endif |
2321 | #endif |
2317 | |
2322 | |
|
|
2323 | #ifdef OPTION_HC |
|
|
2324 | if (rend & RS_Sel) |
|
|
2325 | { |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
|
|
2328 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2329 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2330 | { |
|
|
2331 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2332 | fore = Color_HTC; |
|
|
2333 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2334 | else if (!invert) |
|
|
2335 | fore = back; |
|
|
2336 | |
|
|
2337 | back = Color_HC; |
|
|
2338 | invert = 0; |
|
|
2339 | } |
|
|
2340 | } |
|
|
2341 | #endif |
|
|
2342 | |
2318 | if (invert) |
2343 | if (invert) |
2319 | { |
2344 | { |
2320 | #ifdef OPTION_HC |
|
|
2321 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2322 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2323 | #endif |
|
|
2324 | /* invert the column if no highlightColor is set or it is the |
|
|
2325 | * current cursor column */ |
|
|
2326 | ::swap (fore, back); |
2345 | ::swap (fore, back); |
2327 | #ifdef OPTION_HC |
|
|
2328 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2329 | back = Color_HC; |
|
|
2330 | #endif |
|
|
2331 | |
2346 | |
2332 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2333 | # ifndef OPTION_HC |
|
|
2334 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2335 | back = Color_RV; |
|
|
2336 | # endif |
|
|
2337 | if (fore == back) |
2348 | if (fore == back) |
2338 | { |
2349 | { |
2339 | fore = Color_bg; |
2350 | fore = Color_bg; |
2340 | back = Color_fg; |
2351 | back = Color_fg; |
2341 | } |
2352 | } |
… | |
… | |
2495 | scr_remap_chars (swap_buf [i]); |
2506 | scr_remap_chars (swap_buf [i]); |
2496 | } |
2507 | } |
2497 | } |
2508 | } |
2498 | |
2509 | |
2499 | void |
2510 | void |
2500 | rxvt_term::scr_recolour () NOTHROW |
2511 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2501 | { |
2512 | { |
|
|
2513 | bool transparent = false; |
|
|
2514 | |
2502 | #ifdef HAVE_BG_PIXMAP |
2515 | #ifdef HAVE_BG_PIXMAP |
2503 | bgPixmap.apply (); |
2516 | if (bg_pixmap != None) |
2504 | #else |
2517 | { |
|
|
2518 | # ifdef ENABLE_TRANSPARENCY |
|
|
2519 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2520 | { |
|
|
2521 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
|
|
2522 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2505 | |
2523 | |
|
|
2524 | transparent = true; |
|
|
2525 | } |
|
|
2526 | else |
|
|
2527 | # endif |
|
|
2528 | { |
|
|
2529 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2530 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2531 | } |
|
|
2532 | } |
|
|
2533 | else |
|
|
2534 | #endif |
|
|
2535 | { |
2506 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2536 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2537 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2538 | } |
|
|
2539 | |
2507 | XClearWindow (dpy, parent[0]); |
2540 | XClearWindow (dpy, parent[0]); |
2508 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2509 | |
2541 | |
2510 | if (scrollBar.win) |
2542 | if (scrollBar.win) |
2511 | { |
2543 | { |
|
|
2544 | if (transparent) |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2546 | else |
2512 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2547 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2513 | scrollBar.state = STATE_IDLE; |
2548 | scrollBar.state = STATE_IDLE; |
2514 | scrollBar.show (0); |
2549 | scrollBar.show (0); |
2515 | } |
2550 | } |
2516 | |
2551 | |
2517 | #endif |
2552 | if (refresh) |
2518 | |
2553 | { |
2519 | /* bgPixmap.apply () does not do the following : */ |
|
|
2520 | scr_clear (); |
2554 | scr_clear (); |
2521 | scr_touch (true); |
2555 | scr_touch (true); |
|
|
2556 | } |
2522 | want_refresh = 1; |
2557 | want_refresh = 1; |
2523 | } |
2558 | } |
2524 | |
2559 | |
2525 | /* ------------------------------------------------------------------------- */ |
2560 | /* ------------------------------------------------------------------------- */ |
2526 | void |
2561 | void |
… | |
… | |
2594 | { |
2629 | { |
2595 | #if !ENABLE_MINIMAL |
2630 | #if !ENABLE_MINIMAL |
2596 | if (selection.rect) |
2631 | if (selection.rect) |
2597 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2632 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2598 | selection.end.row, selection.end.col, |
2633 | selection.end.row, selection.end.col, |
2599 | RS_RVid, RS_RVid | RS_Uline); |
2634 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2600 | else |
2635 | else |
2601 | #endif |
2636 | #endif |
2602 | scr_xor_span (selection.beg.row, selection.beg.col, |
2637 | scr_xor_span (selection.beg.row, selection.beg.col, |
2603 | selection.end.row, selection.end.col, |
2638 | selection.end.row, selection.end.col, |
2604 | RS_RVid); |
2639 | RS_Sel | RS_RVid); |
2605 | } |
2640 | } |
2606 | } |
2641 | } |
2607 | |
2642 | |
2608 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2609 | /* |
2644 | /* |
… | |
… | |
2614 | void |
2649 | void |
2615 | rxvt_term::scr_dump (int fd) NOTHROW |
2650 | rxvt_term::scr_dump (int fd) NOTHROW |
2616 | { |
2651 | { |
2617 | int row, wrote; |
2652 | int row, wrote; |
2618 | unsigned int width, towrite; |
2653 | unsigned int width, towrite; |
2619 | char r1[] = "\n"; |
2654 | const char r1[] = "\n"; |
2620 | |
2655 | |
2621 | for (row = saveLines + top_row; |
2656 | for (row = saveLines + top_row; |
2622 | row < saveLines + nrow - 1; row++) |
2657 | row < saveLines + nrow - 1; row++) |
2623 | { |
2658 | { |
2624 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2659 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2670 | /* ------------------------------------------------------------------------- */ |
2705 | /* ------------------------------------------------------------------------- */ |
2671 | /* |
2706 | /* |
2672 | * Paste a selection direct to the command fd |
2707 | * Paste a selection direct to the command fd |
2673 | */ |
2708 | */ |
2674 | void |
2709 | void |
2675 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2710 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2676 | { |
2711 | { |
2677 | /* convert normal newline chars into common keyboard Return key sequence */ |
2712 | /* convert normal newline chars into common keyboard Return key sequence */ |
2678 | for (unsigned int i = 0; i < len; i++) |
2713 | for (unsigned int i = 0; i < len; i++) |
2679 | if (data[i] == C0_LF) |
2714 | if (data[i] == C0_LF) |
2680 | data[i] = C0_CR; |
2715 | data[i] = C0_CR; |
… | |
… | |
2686 | |
2721 | |
2687 | if (priv_modes & PrivMode_BracketPaste) |
2722 | if (priv_modes & PrivMode_BracketPaste) |
2688 | tt_printf ("\e[201~"); |
2723 | tt_printf ("\e[201~"); |
2689 | } |
2724 | } |
2690 | |
2725 | |
2691 | /* ------------------------------------------------------------------------- */ |
|
|
2692 | /* |
|
|
2693 | * Respond to a notification that a primary selection has been sent |
|
|
2694 | * EXT: SelectionNotify |
|
|
2695 | */ |
|
|
2696 | void |
2726 | void |
2697 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2727 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2698 | { |
2728 | { |
2699 | if (prop == None) /* check for failed XConvertSelection */ |
2729 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2700 | { |
|
|
2701 | if ((selection_type & Sel_CompoundText)) |
|
|
2702 | { |
|
|
2703 | int selnum = selection_type & Sel_whereMask; |
|
|
2704 | |
|
|
2705 | selection_type = 0; |
|
|
2706 | if (selnum != Sel_direct) |
|
|
2707 | selection_request_other (XA_STRING, selnum); |
|
|
2708 | } |
|
|
2709 | |
|
|
2710 | if ((selection_type & Sel_UTF8String)) |
|
|
2711 | { |
|
|
2712 | int selnum = selection_type & Sel_whereMask; |
|
|
2713 | |
|
|
2714 | selection_type = Sel_CompoundText; |
|
|
2715 | if (selnum != Sel_direct) |
|
|
2716 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2717 | else |
|
|
2718 | selection_type = 0; |
|
|
2719 | } |
|
|
2720 | |
|
|
2721 | return; |
|
|
2722 | } |
|
|
2723 | |
|
|
2724 | unsigned long bytes_after; |
|
|
2725 | XTextProperty ct; |
|
|
2726 | |
|
|
2727 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2728 | 0, PROP_SIZE / 4, |
|
|
2729 | delete_prop, AnyPropertyType, |
|
|
2730 | &ct.encoding, &ct.format, |
|
|
2731 | &ct.nitems, &bytes_after, |
|
|
2732 | &ct.value) != Success) |
|
|
2733 | { |
|
|
2734 | ct.value = 0; |
|
|
2735 | goto bailout; |
|
|
2736 | } |
|
|
2737 | |
|
|
2738 | if (ct.encoding == None) |
|
|
2739 | goto bailout; |
|
|
2740 | |
|
|
2741 | if (bytes_after) |
|
|
2742 | { |
|
|
2743 | // fetch and append remaining data |
|
|
2744 | XTextProperty ct2; |
|
|
2745 | |
|
|
2746 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2747 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2748 | delete_prop, AnyPropertyType, |
|
|
2749 | &ct2.encoding, &ct2.format, |
|
|
2750 | &ct2.nitems, &bytes_after, |
|
|
2751 | &ct2.value) != Success) |
|
|
2752 | goto bailout; |
|
|
2753 | |
|
|
2754 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2755 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2756 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2757 | ct.nitems += ct2.nitems; |
|
|
2758 | |
|
|
2759 | XFree (ct2.value); |
|
|
2760 | } |
|
|
2761 | |
|
|
2762 | if (ct.value == 0) |
|
|
2763 | goto bailout; |
|
|
2764 | |
|
|
2765 | if (ct.encoding == xa[XA_INCR]) |
|
|
2766 | { |
|
|
2767 | // INCR selection, start handshake |
|
|
2768 | if (!delete_prop) |
|
|
2769 | XDeleteProperty (dpy, win, prop); |
|
|
2770 | |
|
|
2771 | selection_wait = Sel_incr; |
|
|
2772 | incr_buf_fill = 0; |
|
|
2773 | incr_ev.start (10); |
|
|
2774 | |
|
|
2775 | goto bailout; |
|
|
2776 | } |
|
|
2777 | |
|
|
2778 | if (ct.nitems == 0) |
|
|
2779 | { |
|
|
2780 | if (selection_wait == Sel_incr) |
|
|
2781 | { |
|
|
2782 | XFree (ct.value); |
|
|
2783 | |
|
|
2784 | // finally complete, now paste the whole thing |
|
|
2785 | selection_wait = Sel_normal; |
|
|
2786 | ct.value = (unsigned char *)incr_buf; |
|
|
2787 | ct.nitems = incr_buf_fill; |
|
|
2788 | incr_buf = 0; |
|
|
2789 | incr_buf_size = 0; |
|
|
2790 | incr_ev.stop (); |
|
|
2791 | } |
|
|
2792 | else |
|
|
2793 | { |
|
|
2794 | if (selection_wait == Sel_normal |
|
|
2795 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2796 | { |
|
|
2797 | /* |
|
|
2798 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2799 | * XConvertSelection () but nothing was presented |
|
|
2800 | */ |
|
|
2801 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2802 | } |
|
|
2803 | |
|
|
2804 | goto bailout; |
|
|
2805 | } |
|
|
2806 | } |
|
|
2807 | else if (selection_wait == Sel_incr) |
|
|
2808 | { |
|
|
2809 | incr_ev.start (10); |
|
|
2810 | |
|
|
2811 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2812 | { |
|
|
2813 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2814 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2815 | } |
|
|
2816 | |
|
|
2817 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2818 | incr_buf_fill += ct.nitems; |
|
|
2819 | |
|
|
2820 | goto bailout; |
|
|
2821 | } |
|
|
2822 | |
|
|
2823 | char **cl; |
|
|
2824 | int cr; |
|
|
2825 | |
|
|
2826 | #if !ENABLE_MINIMAL |
|
|
2827 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2828 | // so recode it manually |
|
|
2829 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2830 | { |
|
|
2831 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2832 | char *s = rxvt_wcstombs (w); |
|
|
2833 | free (w); |
|
|
2834 | // TODO: strlen == only the first element will be converted. well... |
|
|
2835 | paste (s, strlen (s)); |
|
|
2836 | free (s); |
|
|
2837 | } |
|
|
2838 | else |
|
|
2839 | #endif |
|
|
2840 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2841 | && cl) |
|
|
2842 | { |
|
|
2843 | for (int i = 0; i < cr; i++) |
|
|
2844 | paste (cl[i], strlen (cl[i])); |
|
|
2845 | |
|
|
2846 | XFreeStringList (cl); |
|
|
2847 | } |
|
|
2848 | else |
|
|
2849 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2850 | |
|
|
2851 | bailout: |
|
|
2852 | XFree (ct.value); |
|
|
2853 | |
|
|
2854 | if (selection_wait == Sel_normal) |
|
|
2855 | selection_wait = Sel_none; |
|
|
2856 | } |
|
|
2857 | |
|
|
2858 | void |
|
|
2859 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2860 | { |
|
|
2861 | selection_wait = Sel_none; |
|
|
2862 | |
|
|
2863 | incr_buf_size = 0; |
|
|
2864 | free (incr_buf); |
|
|
2865 | |
|
|
2866 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2867 | } |
|
|
2868 | |
|
|
2869 | void |
|
|
2870 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2871 | { |
|
|
2872 | if (prop == None || selection_wait != Sel_incr) |
|
|
2873 | return; |
2730 | return; |
2874 | |
2731 | |
2875 | selection_paste (win, prop, true); |
2732 | tt_paste (data, len); |
2876 | } |
2733 | } |
2877 | |
2734 | |
2878 | /* ------------------------------------------------------------------------- */ |
2735 | /* ------------------------------------------------------------------------- */ |
2879 | /* |
2736 | /* |
2880 | * Request the current selection: |
2737 | * Request the current selection: |
… | |
… | |
2883 | * > CUT_BUFFER0 |
2740 | * > CUT_BUFFER0 |
2884 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2741 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2885 | * will auto fallback to CUT_BUFFER0 |
2742 | * will auto fallback to CUT_BUFFER0 |
2886 | * EXT: button 2 release |
2743 | * EXT: button 2 release |
2887 | */ |
2744 | */ |
|
|
2745 | |
|
|
2746 | static void |
|
|
2747 | selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr) |
|
|
2748 | { |
|
|
2749 | rxvt_term *term = (rxvt_term *)ptr; |
|
|
2750 | |
|
|
2751 | if (data) |
|
|
2752 | term->paste (data, len); |
|
|
2753 | delete rs; |
|
|
2754 | term->selection_req = 0; |
|
|
2755 | } |
|
|
2756 | |
2888 | void |
2757 | void |
2889 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2758 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2890 | { |
2759 | { |
2891 | if (selection.text && selnum == Sel_Primary) |
2760 | if (selection.text && selnum == Sel_Primary) |
2892 | { |
2761 | { |
… | |
… | |
2894 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2763 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2895 | paste (str, strlen (str)); |
2764 | paste (str, strlen (str)); |
2896 | free (str); |
2765 | free (str); |
2897 | return; |
2766 | return; |
2898 | } |
2767 | } |
2899 | else |
2768 | else if (!selection_req) |
2900 | { |
|
|
2901 | selection_request_time = tm; |
|
|
2902 | selection_wait = Sel_normal; |
|
|
2903 | |
|
|
2904 | #if X_HAVE_UTF8_STRING |
|
|
2905 | selection_type = Sel_UTF8String; |
|
|
2906 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2907 | return; |
|
|
2908 | #else |
|
|
2909 | selection_type = Sel_CompoundText; |
|
|
2910 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2911 | return; |
|
|
2912 | #endif |
|
|
2913 | } |
2769 | { |
2914 | |
2770 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); |
2915 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2771 | selection_req->run (); |
2916 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2917 | } |
|
|
2918 | |
|
|
2919 | int |
|
|
2920 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2921 | { |
|
|
2922 | Atom sel; |
|
|
2923 | |
|
|
2924 | selection_type |= selnum; |
|
|
2925 | |
|
|
2926 | if (selnum == Sel_Primary) |
|
|
2927 | sel = XA_PRIMARY; |
|
|
2928 | else if (selnum == Sel_Secondary) |
|
|
2929 | sel = XA_SECONDARY; |
|
|
2930 | else |
|
|
2931 | sel = xa[XA_CLIPBOARD]; |
|
|
2932 | |
|
|
2933 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2934 | { |
2772 | } |
2935 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2936 | vt, selection_request_time); |
|
|
2937 | return 1; |
|
|
2938 | } |
|
|
2939 | |
|
|
2940 | return 0; |
|
|
2941 | } |
2773 | } |
2942 | |
2774 | |
2943 | /* ------------------------------------------------------------------------- */ |
2775 | /* ------------------------------------------------------------------------- */ |
2944 | /* |
2776 | /* |
2945 | * Clear all selected text |
2777 | * Clear all selected text |
2946 | * EXT: SelectionClear |
2778 | * EXT: SelectionClear |
2947 | */ |
2779 | */ |
2948 | void |
2780 | void |
2949 | rxvt_term::selection_clear () NOTHROW |
2781 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2950 | { |
2782 | { |
|
|
2783 | if (!clipboard) |
|
|
2784 | { |
2951 | want_refresh = 1; |
2785 | want_refresh = 1; |
2952 | free (selection.text); |
2786 | free (selection.text); |
2953 | selection.text = NULL; |
2787 | selection.text = NULL; |
2954 | selection.len = 0; |
2788 | selection.len = 0; |
2955 | CLEAR_SELECTION (); |
2789 | CLEAR_SELECTION (); |
2956 | |
2790 | |
2957 | if (display->selection_owner == this) |
2791 | if (display->selection_owner == this) |
2958 | display->selection_owner = 0; |
2792 | display->selection_owner = 0; |
|
|
2793 | } |
|
|
2794 | else |
|
|
2795 | { |
|
|
2796 | free (selection.clip_text); |
|
|
2797 | selection.clip_text = NULL; |
|
|
2798 | selection.clip_len = 0; |
|
|
2799 | |
|
|
2800 | if (display->clipboard_owner == this) |
|
|
2801 | display->clipboard_owner = 0; |
|
|
2802 | } |
2959 | } |
2803 | } |
2960 | |
2804 | |
2961 | /* ------------------------------------------------------------------------- */ |
2805 | /* ------------------------------------------------------------------------- */ |
2962 | /* |
2806 | /* |
2963 | * Copy a selection into the cut buffer |
2807 | * Copy a selection into the cut buffer |
2964 | * EXT: button 1 or 3 release |
2808 | * EXT: button 1 or 3 release |
2965 | */ |
2809 | */ |
2966 | void |
2810 | void |
2967 | rxvt_term::selection_make (Time tm) |
2811 | rxvt_term::selection_make (Time tm) |
2968 | { |
2812 | { |
2969 | int i; |
2813 | int size; |
2970 | wchar_t *new_selection_text; |
2814 | wchar_t *new_selection_text; |
2971 | text_t *t; |
2815 | text_t *t; |
2972 | |
2816 | |
2973 | switch (selection.op) |
2817 | switch (selection.op) |
2974 | { |
2818 | { |
… | |
… | |
2990 | return; /* nothing selected, go away */ |
2834 | return; /* nothing selected, go away */ |
2991 | |
2835 | |
2992 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2836 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2993 | return; |
2837 | return; |
2994 | |
2838 | |
2995 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2839 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2996 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2840 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2997 | |
2841 | |
2998 | int ofs = 0; |
2842 | int ofs = 0; |
2999 | int extra = 0; |
2843 | int extra = 0; |
3000 | |
2844 | |
3001 | int col = selection.beg.col; |
2845 | int col = selection.beg.col; |
… | |
… | |
3007 | { |
2851 | { |
3008 | #if !ENABLE_MINIMAL |
2852 | #if !ENABLE_MINIMAL |
3009 | if (selection.rect) |
2853 | if (selection.rect) |
3010 | { |
2854 | { |
3011 | col = selection.beg.col; |
2855 | col = selection.beg.col; |
3012 | end_col = ncol + 1; |
2856 | end_col = selection.end.col; |
3013 | } |
2857 | } |
3014 | else |
2858 | else |
3015 | #endif |
2859 | #endif |
3016 | end_col = ROW(row).l; |
2860 | end_col = ROW(row).l; |
3017 | |
2861 | |
3018 | col = max (col, 0); |
2862 | col = max (col, 0); |
3019 | |
2863 | |
3020 | if (row == selection.end.row |
2864 | if (row == selection.end.row) |
3021 | #if !ENABLE_MINIMAL |
|
|
3022 | || selection.rect |
|
|
3023 | #endif |
|
|
3024 | ) |
|
|
3025 | min_it (end_col, selection.end.col); |
2865 | min_it (end_col, selection.end.col); |
3026 | |
2866 | |
3027 | t = ROW(row).t + col; |
2867 | t = ROW(row).t + col; |
3028 | |
2868 | |
3029 | for (; col < end_col; col++) |
2869 | for (; col < end_col; col++) |
… | |
… | |
3037 | |
2877 | |
3038 | extra -= (len - 1); |
2878 | extra -= (len - 1); |
3039 | |
2879 | |
3040 | if (extra < 0) |
2880 | if (extra < 0) |
3041 | { |
2881 | { |
3042 | extra += i; |
2882 | extra += size; |
3043 | i += i; |
2883 | size += size; |
3044 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2884 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3045 | } |
2885 | } |
3046 | |
2886 | |
3047 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2887 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3048 | } |
2888 | } |
3049 | #endif |
2889 | #endif |
… | |
… | |
3061 | |
2901 | |
3062 | new_selection_text[ofs++] = C0_LF; |
2902 | new_selection_text[ofs++] = C0_LF; |
3063 | } |
2903 | } |
3064 | else |
2904 | else |
3065 | #endif |
2905 | #endif |
3066 | if (!ROW(row).is_longer () && row != selection.end.row) |
2906 | if (!ROW(row).is_longer () |
|
|
2907 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2908 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3067 | new_selection_text[ofs++] = C0_LF; |
2909 | new_selection_text[ofs++] = C0_LF; |
3068 | } |
2910 | } |
3069 | |
|
|
3070 | if (end_col != selection.end.col) |
|
|
3071 | new_selection_text[ofs++] = C0_LF; |
|
|
3072 | |
2911 | |
3073 | new_selection_text[ofs] = 0; |
2912 | new_selection_text[ofs] = 0; |
3074 | |
2913 | |
3075 | if (ofs == 0) |
2914 | if (ofs == 0) |
3076 | { |
2915 | { |
… | |
… | |
3089 | |
2928 | |
3090 | selection_grab (tm); |
2929 | selection_grab (tm); |
3091 | } |
2930 | } |
3092 | |
2931 | |
3093 | bool |
2932 | bool |
3094 | rxvt_term::selection_grab (Time tm) NOTHROW |
2933 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3095 | { |
2934 | { |
|
|
2935 | Atom sel; |
|
|
2936 | |
|
|
2937 | if (!clipboard) |
|
|
2938 | { |
3096 | selection_time = tm; |
2939 | selection_time = tm; |
|
|
2940 | sel = XA_PRIMARY; |
|
|
2941 | } |
|
|
2942 | else |
|
|
2943 | { |
|
|
2944 | clipboard_time = tm; |
|
|
2945 | sel = xa[XA_CLIPBOARD]; |
|
|
2946 | } |
3097 | |
2947 | |
3098 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2948 | XSetSelectionOwner (dpy, sel, vt, tm); |
3099 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2949 | if (XGetSelectionOwner (dpy, sel) == vt) |
3100 | { |
2950 | { |
3101 | display->set_selection_owner (this); |
2951 | display->set_selection_owner (this, clipboard); |
3102 | return true; |
2952 | return true; |
3103 | } |
2953 | } |
3104 | else |
2954 | else |
3105 | { |
2955 | { |
3106 | selection_clear (); |
2956 | selection_clear (clipboard); |
3107 | return false; |
2957 | return false; |
3108 | } |
2958 | } |
3109 | |
2959 | |
3110 | #if 0 |
2960 | #if 0 |
3111 | XTextProperty ct; |
2961 | XTextProperty ct; |
… | |
… | |
3606 | else if (rq.target == xa[XA_MULTIPLE]) |
3456 | else if (rq.target == xa[XA_MULTIPLE]) |
3607 | { |
3457 | { |
3608 | /* TODO: Handle MULTIPLE */ |
3458 | /* TODO: Handle MULTIPLE */ |
3609 | } |
3459 | } |
3610 | #endif |
3460 | #endif |
3611 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3461 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3612 | { |
3462 | { |
3613 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3463 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3614 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3464 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3465 | ev.property = rq.property; |
|
|
3466 | } |
|
|
3467 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3468 | { |
|
|
3469 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3470 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3615 | ev.property = rq.property; |
3471 | ev.property = rq.property; |
3616 | } |
3472 | } |
3617 | else if (rq.target == XA_STRING |
3473 | else if (rq.target == XA_STRING |
3618 | || rq.target == xa[XA_TEXT] |
3474 | || rq.target == xa[XA_TEXT] |
3619 | || rq.target == xa[XA_COMPOUND_TEXT] |
3475 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3652 | { |
3508 | { |
3653 | target = xa[XA_COMPOUND_TEXT]; |
3509 | target = xa[XA_COMPOUND_TEXT]; |
3654 | style = enc_compound_text; |
3510 | style = enc_compound_text; |
3655 | } |
3511 | } |
3656 | |
3512 | |
3657 | if (selection.text) |
3513 | if (rq.selection == XA_PRIMARY && selection.text) |
3658 | { |
3514 | { |
3659 | cl = selection.text; |
3515 | cl = selection.text; |
3660 | selectlen = selection.len; |
3516 | selectlen = selection.len; |
|
|
3517 | } |
|
|
3518 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3519 | { |
|
|
3520 | cl = selection.clip_text; |
|
|
3521 | selectlen = selection.clip_len; |
3661 | } |
3522 | } |
3662 | else |
3523 | else |
3663 | { |
3524 | { |
3664 | cl = L""; |
3525 | cl = L""; |
3665 | selectlen = 0; |
3526 | selectlen = 0; |