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.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC vs.
Revision 1.367 by sf-exg, Mon Jan 31 15:40:22 2011 UTC

… …
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
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_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
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 148
149 l.touch ();
150
148 // found start, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
… …
231 selection.text = NULL; 234 selection.text = NULL;
232 selection.len = 0; 235 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
235 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
236 } 241 }
237 else 242 else
238 { 243 {
239 /* 244 /*
240 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
395 } 400 }
396 401
397 free (tabs); 402 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
399 404
400 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
402 407
403 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
404 409
405 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
544 want_refresh = 1; 549 want_refresh = 1;
545 view_start = 0; 550 view_start = 0;
546 551
547 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
548 553
549 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
550 555
551#if NSCREENS 556#if NSCREENS
552 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
553 { 558 {
554 num_scr = 0; 559 num_scr = 0;
… …
895# else 900# else
896 c = 0xfffd; 901 c = 0xfffd;
897# endif 902# endif
898#endif 903#endif
899 904
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)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909 906
910 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
913 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
914 c = NOCHAR; 913 c = NOCHAR;
915 // and try the same character next loop iteration 914 // and try the same character next loop iteration
916 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
917 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
918 927
919 line->touch (); 928 line->touch ();
920 929
921 do 930 do
922 { 931 {
… …
928 else 937 else
929 { 938 {
930 line->l = ncol; 939 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
933 break; 942
943 goto end_of_line;
934 } 944 }
935 945
936 c = NOCHAR; 946 c = NOCHAR;
937 } 947 }
938 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
939 949
940 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
942 { 952 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 953 line->t[c] = ' ';
948 line->r[c] = rend; 954 line->r[c] = rend;
949 }
950 } 955 }
956
957end_of_line:
958 ;
951 } 959 }
952#if ENABLE_COMBINING 960#if ENABLE_COMBINING
953 else // width == 0 961 else // width == 0
954 { 962 {
955 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1018 1026
1019 want_refresh = 1; 1027 want_refresh = 1;
1020#endif 1028#endif
1021 } 1029 }
1022 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1023 else 1033 else
1024 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1025} 1035}
1026 1036
1027/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1334 return; 1344 return;
1335 1345
1336 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1337 1347
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)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1351 {
1345 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1346 1353
1347 if (mapped && !view_start) 1354 if (mapped)
1348 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1351 } 1358 }
1352 else 1359 else
1353 { 1360 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1362
1356 if (mapped && !view_start) 1363 if (mapped)
1357 { 1364 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1368 1375
1369 for (; num--; row++) 1376 for (; num--; row++)
1370 { 1377 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1372 1379
1373 if (!view_start) 1380 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1382 }
1376} 1383}
1377 1384
1378#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1379void 1386void
… …
1678 { 1685 {
1679 rvideo_state = on; 1686 rvideo_state = on;
1680 1687
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1684#endif 1691#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1693
1687 XGCValues gcvalue; 1694 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1840 {
1834 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1836 } 1843 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 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); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1847
1841 num_scr_allow = 0; 1848 num_scr_allow = 0;
1842 1849
… …
2024 refresh_count = 0; 2031 refresh_count = 0;
2025 2032
2026 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2034 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2029 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2030#endif 2037#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2039
2033 /* 2040 /*
2034 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2083 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2084#else 2091#else
2085 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2086#endif 2093#endif
2087 2094
2088 if (showcursor && focus) 2095 if (focus)
2089 { 2096 {
2090 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2092 else 2099 else
2093 { 2100 {
… …
2229 2236
2230 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2232 --col; 2239 --col;
2233 2240
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2242 text_t *text = stp + col;
2236 int count = 1; 2243 int count = 1;
2237 2244
2238 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2239 drp[col] = rend; 2246 drp[col] = rend;
… …
2284 */ 2291 */
2285 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2287 2294
2288 // only do special processing if any attributes are set, which is unlikely 2295 // 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))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2297 {
2291 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2292 2299
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2320
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2322 fore = Color_UL;
2316#endif 2323#endif
2317 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2318 if (invert) 2345 if (invert)
2319 { 2346 {
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); 2347 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2348
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#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) 2350 if (fore == back)
2338 { 2351 {
2339 fore = Color_bg; 2352 fore = Color_bg;
2340 back = Color_fg; 2353 back = Color_fg;
2341 } 2354 }
… …
2495 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2496 } 2509 }
2497} 2510}
2498 2511
2499void 2512void
2500rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2501{ 2514{
2515 bool transparent = false;
2516
2502#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2503 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2504#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2505 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2507 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2509 2543
2510 if (scrollBar.win) 2544 if (scrollBar.win)
2511 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2513 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2514 scrollBar.show (0); 2551 scrollBar.show (0);
2515 } 2552 }
2516 2553
2517#endif 2554 if (refresh)
2518 2555 {
2519 /* bgPixmap.apply () does not do the following : */
2520 scr_clear (); 2556 scr_clear ();
2521 scr_touch (true); 2557 scr_touch (true);
2558 }
2522 want_refresh = 1; 2559 want_refresh = 1;
2523} 2560}
2524 2561
2525/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2526void 2563void
… …
2594 { 2631 {
2595#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2596 if (selection.rect) 2633 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2637 else
2601#endif 2638#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2604 RS_RVid); 2641 RS_Sel | RS_RVid);
2605 } 2642 }
2606} 2643}
2607 2644
2608/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2609/* 2646/*
… …
2614void 2651void
2615rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2616{ 2653{
2617 int row, wrote; 2654 int row, wrote;
2618 unsigned int width, towrite; 2655 unsigned int width, towrite;
2619 char r1[] = "\n"; 2656 const char r1[] = "\n";
2620 2657
2621 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2622 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2623 { 2660 {
2624 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2670/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2671/* 2708/*
2672 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2673 */ 2710 */
2674void 2711void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2713{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2686 2723
2687 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2689} 2726}
2690 2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2735}
2736
2691/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2692/* 2738/*
2693 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
2694 * EXT: SelectionNotify 2740 * EXT: SelectionNotify
2695 */ 2741 */
2696void 2742void
2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2698{ 2744{
2699 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2700 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2701 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2702 { 2753 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = 0; 2754 selection_type = 0;
2706 if (selnum != Sel_direct)
2707 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2708 } 2756 }
2709 2757
2710 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2711 { 2759 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2715 if (selnum != Sel_direct)
2716 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2717 else
2718 selection_type = 0;
2719 } 2762 }
2720 2763
2721 return; 2764 return;
2722 } 2765 }
2723 2766
… …
2750 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2751 &ct2.value) != Success) 2794 &ct2.value) != Success)
2752 goto bailout; 2795 goto bailout;
2753 2796
2754 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2755 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2756 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2757 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2758 2801
2759 XFree (ct2.value); 2802 XFree (ct2.value);
2760 } 2803 }
… …
2809 incr_ev.start (10); 2852 incr_ev.start (10);
2810 2853
2811 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2812 { 2855 {
2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2815 } 2858 }
2816 2859
2817 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2818 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2819 2862
… …
2902 selection_wait = Sel_normal; 2945 selection_wait = Sel_normal;
2903 2946
2904#if X_HAVE_UTF8_STRING 2947#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2948 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2950 return;
2908#else 2951#else
2909 selection_type = Sel_CompoundText; 2952 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2954 return;
2912#endif 2955#endif
2913 } 2956 }
2914 2957
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2944/* 2987/*
2945 * Clear all selected text 2988 * Clear all selected text
2946 * EXT: SelectionClear 2989 * EXT: SelectionClear
2947 */ 2990 */
2948void 2991void
2949rxvt_term::selection_clear () NOTHROW 2992rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2993{
2994 if (!clipboard)
2995 {
2951 want_refresh = 1; 2996 want_refresh = 1;
2952 free (selection.text); 2997 free (selection.text);
2953 selection.text = NULL; 2998 selection.text = NULL;
2954 selection.len = 0; 2999 selection.len = 0;
2955 CLEAR_SELECTION (); 3000 CLEAR_SELECTION ();
2956 3001
2957 if (display->selection_owner == this) 3002 if (display->selection_owner == this)
2958 display->selection_owner = 0; 3003 display->selection_owner = 0;
3004 }
3005 else
3006 {
3007 free (selection.clip_text);
3008 selection.clip_text = NULL;
3009 selection.clip_len = 0;
3010
3011 if (display->clipboard_owner == this)
3012 display->clipboard_owner = 0;
3013 }
2959} 3014}
2960 3015
2961/* ------------------------------------------------------------------------- */ 3016/* ------------------------------------------------------------------------- */
2962/* 3017/*
2963 * Copy a selection into the cut buffer 3018 * Copy a selection into the cut buffer
2964 * EXT: button 1 or 3 release 3019 * EXT: button 1 or 3 release
2965 */ 3020 */
2966void 3021void
2967rxvt_term::selection_make (Time tm) 3022rxvt_term::selection_make (Time tm)
2968{ 3023{
2969 int i; 3024 int size;
2970 wchar_t *new_selection_text; 3025 wchar_t *new_selection_text;
2971 text_t *t; 3026 text_t *t;
2972 3027
2973 switch (selection.op) 3028 switch (selection.op)
2974 { 3029 {
… …
2990 return; /* nothing selected, go away */ 3045 return; /* nothing selected, go away */
2991 3046
2992 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3047 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2993 return; 3048 return;
2994 3049
2995 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3050 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3051 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2997 3052
2998 int ofs = 0; 3053 int ofs = 0;
2999 int extra = 0; 3054 int extra = 0;
3000 3055
3001 int col = selection.beg.col; 3056 int col = selection.beg.col;
… …
3007 { 3062 {
3008#if !ENABLE_MINIMAL 3063#if !ENABLE_MINIMAL
3009 if (selection.rect) 3064 if (selection.rect)
3010 { 3065 {
3011 col = selection.beg.col; 3066 col = selection.beg.col;
3012 end_col = ncol + 1; 3067 end_col = selection.end.col;
3013 } 3068 }
3014 else 3069 else
3015#endif 3070#endif
3016 end_col = ROW(row).l; 3071 end_col = ROW(row).l;
3017 3072
3018 col = max (col, 0); 3073 col = max (col, 0);
3019 3074
3020 if (row == selection.end.row 3075 if (row == selection.end.row)
3021#if !ENABLE_MINIMAL
3022 || selection.rect
3023#endif
3024 )
3025 min_it (end_col, selection.end.col); 3076 min_it (end_col, selection.end.col);
3026 3077
3027 t = ROW(row).t + col; 3078 t = ROW(row).t + col;
3028 3079
3029 for (; col < end_col; col++) 3080 for (; col < end_col; col++)
… …
3037 3088
3038 extra -= (len - 1); 3089 extra -= (len - 1);
3039 3090
3040 if (extra < 0) 3091 if (extra < 0)
3041 { 3092 {
3042 extra += i; 3093 extra += size;
3043 i += i; 3094 size += size;
3044 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3095 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3045 } 3096 }
3046 3097
3047 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3098 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3048 } 3099 }
3049#endif 3100#endif
… …
3061 3112
3062 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3063 } 3114 }
3064 else 3115 else
3065#endif 3116#endif
3066 if (!ROW(row).is_longer () && row != selection.end.row) 3117 if (!ROW(row).is_longer ()
3118 && (row != selection.end.row || end_col != selection.end.col)
3119 && (row != selection.beg.row || selection.beg.col < ncol))
3067 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3068 } 3121 }
3069
3070 if (end_col != selection.end.col)
3071 new_selection_text[ofs++] = C0_LF;
3072 3122
3073 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3074 3124
3075 if (ofs == 0) 3125 if (ofs == 0)
3076 { 3126 {
… …
3089 3139
3090 selection_grab (tm); 3140 selection_grab (tm);
3091} 3141}
3092 3142
3093bool 3143bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 3144rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 3145{
3146 Atom sel;
3147
3148 if (!clipboard)
3149 {
3096 selection_time = tm; 3150 selection_time = tm;
3151 sel = XA_PRIMARY;
3152 }
3153 else
3154 {
3155 clipboard_time = tm;
3156 sel = xa[XA_CLIPBOARD];
3157 }
3097 3158
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3159 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3160 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 3161 {
3101 display->set_selection_owner (this); 3162 display->set_selection_owner (this, clipboard);
3102 return true; 3163 return true;
3103 } 3164 }
3104 else 3165 else
3105 { 3166 {
3106 selection_clear (); 3167 selection_clear (clipboard);
3107 return false; 3168 return false;
3108 } 3169 }
3109 3170
3110#if 0 3171#if 0
3111 XTextProperty ct; 3172 XTextProperty ct;
… …
3606 else if (rq.target == xa[XA_MULTIPLE]) 3667 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3668 {
3608 /* TODO: Handle MULTIPLE */ 3669 /* TODO: Handle MULTIPLE */
3609 } 3670 }
3610#endif 3671#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3672 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3673 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3674 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3675 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3676 ev.property = rq.property;
3677 }
3678 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3679 {
3680 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3681 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3615 ev.property = rq.property; 3682 ev.property = rq.property;
3616 } 3683 }
3617 else if (rq.target == XA_STRING 3684 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3685 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3686 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3652 { 3719 {
3653 target = xa[XA_COMPOUND_TEXT]; 3720 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3721 style = enc_compound_text;
3655 } 3722 }
3656 3723
3657 if (selection.text) 3724 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3725 {
3659 cl = selection.text; 3726 cl = selection.text;
3660 selectlen = selection.len; 3727 selectlen = selection.len;
3728 }
3729 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3730 {
3731 cl = selection.clip_text;
3732 selectlen = selection.clip_len;
3661 } 3733 }
3662 else 3734 else
3663 { 3735 {
3664 cl = L""; 3736 cl = L"";
3665 selectlen = 0; 3737 selectlen = 0;

Diff Legend

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