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.337 by root, Thu Apr 1 00:58:38 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++;
… …
397 } 400 }
398 401
399 free (tabs); 402 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
401 404
402 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
404 407
405 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
406 409
407 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
897# else 900# else
898 c = 0xfffd; 901 c = 0xfffd;
899# endif 902# endif
900#endif 903#endif
901 904
902 // nuke the character at this position, if required
903 if (expect_false (
904 line->t[screen.cur.col] == NOCHAR
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911 906
912 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
915 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
916 c = NOCHAR; 913 c = NOCHAR;
917 // and try the same character next loop iteration 914 // and try the same character next loop iteration
918 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 } 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);
920 927
921 line->touch (); 928 line->touch ();
922 929
923 do 930 do
924 { 931 {
… …
930 else 937 else
931 { 938 {
932 line->l = ncol; 939 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
935 break; 942
943 goto end_of_line;
936 } 944 }
937 945
938 c = NOCHAR; 946 c = NOCHAR;
939 } 947 }
940 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
941 949
942 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
944 { 952 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 953 line->t[c] = ' ';
950 line->r[c] = rend; 954 line->r[c] = rend;
951 }
952 } 955 }
956
957end_of_line:
958 ;
953 } 959 }
954#if ENABLE_COMBINING 960#if ENABLE_COMBINING
955 else // width == 0 961 else // width == 0
956 { 962 {
957 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1020 1026
1021 want_refresh = 1; 1027 want_refresh = 1;
1022#endif 1028#endif
1023 } 1029 }
1024 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1025 else 1033 else
1026 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1027} 1035}
1028 1036
1029/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1336 return; 1344 return;
1337 1345
1338 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1339 1347
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1351 {
1347 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1348 1353
1349 if (mapped && !view_start) 1354 if (mapped)
1350 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1353 } 1358 }
1354 else 1359 else
1355 { 1360 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1362
1358 if (mapped && !view_start) 1363 if (mapped)
1359 { 1364 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1370 1375
1371 for (; num--; row++) 1376 for (; num--; row++)
1372 { 1377 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1374 1379
1375 if (!view_start) 1380 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1382 }
1378} 1383}
1379 1384
1380#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1381void 1386void
… …
1680 { 1685 {
1681 rvideo_state = on; 1686 rvideo_state = on;
1682 1687
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1686#endif 1691#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1693
1689 XGCValues gcvalue; 1694 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
2026 refresh_count = 0; 2031 refresh_count = 0;
2027 2032
2028 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2034 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2032#endif 2037#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2039
2035 /* 2040 /*
2036 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2231 2236
2232 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2234 --col; 2239 --col;
2235 2240
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2242 text_t *text = stp + col;
2238 int count = 1; 2243 int count = 1;
2239 2244
2240 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2241 drp[col] = rend; 2246 drp[col] = rend;
… …
2286 */ 2291 */
2287 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2289 2294
2290 // 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
2291 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)))
2292 { 2297 {
2293 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2294 2299
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2320
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2322 fore = Color_UL;
2318#endif 2323#endif
2319 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
2320 if (invert) 2345 if (invert)
2321 { 2346 {
2322#ifdef OPTION_HC
2323 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 || !ISSET_PIXCOLOR (Color_HC))
2325#endif
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 ::swap (fore, back); 2347 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2348
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2335# ifndef OPTION_HC
2336 if (ISSET_PIXCOLOR (Color_RV))
2337 back = Color_RV;
2338# endif
2339 if (fore == back) 2350 if (fore == back)
2340 { 2351 {
2341 fore = Color_bg; 2352 fore = Color_bg;
2342 back = Color_fg; 2353 back = Color_fg;
2343 } 2354 }
… …
2497 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2498 } 2509 }
2499} 2510}
2500 2511
2501void 2512void
2502rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2514{
2515 bool transparent = false;
2516
2504#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2506#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);
2507 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 {
2508 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
2509 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2511 2543
2512 if (scrollBar.win) 2544 if (scrollBar.win)
2513 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2516 scrollBar.show (0); 2551 scrollBar.show (0);
2517 } 2552 }
2518 2553
2519#endif 2554 if (refresh)
2520 2555 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2556 scr_clear ();
2523 scr_touch (true); 2557 scr_touch (true);
2558 }
2524 want_refresh = 1; 2559 want_refresh = 1;
2525} 2560}
2526 2561
2527/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2528void 2563void
… …
2596 { 2631 {
2597#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2598 if (selection.rect) 2633 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2637 else
2603#endif 2638#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2606 RS_RVid); 2641 RS_Sel | RS_RVid);
2607 } 2642 }
2608} 2643}
2609 2644
2610/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2611/* 2646/*
… …
2616void 2651void
2617rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2653{
2619 int row, wrote; 2654 int row, wrote;
2620 unsigned int width, towrite; 2655 unsigned int width, towrite;
2621 char r1[] = "\n"; 2656 const char r1[] = "\n";
2622 2657
2623 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2625 { 2660 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2672/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2673/* 2708/*
2674 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2675 */ 2710 */
2676void 2711void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2713{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2688 2723
2689 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2691} 2726}
2692 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
2693/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2694/* 2738/*
2695 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify 2740 * EXT: SelectionNotify
2697 */ 2741 */
2698void 2742void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2700{ 2744{
2701 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2702 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2703 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2704 { 2753 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0; 2754 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2710 } 2756 }
2711 2757
2712 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2713 { 2759 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 } 2762 }
2722 2763
2723 return; 2764 return;
2724 } 2765 }
2725 2766
… …
2752 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success) 2794 &ct2.value) != Success)
2754 goto bailout; 2795 goto bailout;
2755 2796
2756 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2757 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);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2760 2801
2761 XFree (ct2.value); 2802 XFree (ct2.value);
2762 } 2803 }
… …
2811 incr_ev.start (10); 2852 incr_ev.start (10);
2812 2853
2813 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 { 2855 {
2815 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;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2817 } 2858 }
2818 2859
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2821 2862
… …
2904 selection_wait = Sel_normal; 2945 selection_wait = Sel_normal;
2905 2946
2906#if X_HAVE_UTF8_STRING 2947#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String; 2948 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return; 2950 return;
2910#else 2951#else
2911 selection_type = Sel_CompoundText; 2952 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return; 2954 return;
2914#endif 2955#endif
2915 } 2956 }
2916 2957
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false); 2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2970 if (display->clipboard_owner == this) 3011 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 3012 display->clipboard_owner = 0;
2972 } 3013 }
2973} 3014}
2974 3015
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2987}
2988
2989/* ------------------------------------------------------------------------- */ 3016/* ------------------------------------------------------------------------- */
2990/* 3017/*
2991 * Copy a selection into the cut buffer 3018 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 3019 * EXT: button 1 or 3 release
2993 */ 3020 */
2994void 3021void
2995rxvt_term::selection_make (Time tm) 3022rxvt_term::selection_make (Time tm)
2996{ 3023{
2997 int i; 3024 int size;
2998 wchar_t *new_selection_text; 3025 wchar_t *new_selection_text;
2999 text_t *t; 3026 text_t *t;
3000 3027
3001 switch (selection.op) 3028 switch (selection.op)
3002 { 3029 {
… …
3018 return; /* nothing selected, go away */ 3045 return; /* nothing selected, go away */
3019 3046
3020 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)))
3021 return; 3048 return;
3022 3049
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3050 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 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));
3025 3052
3026 int ofs = 0; 3053 int ofs = 0;
3027 int extra = 0; 3054 int extra = 0;
3028 3055
3029 int col = selection.beg.col; 3056 int col = selection.beg.col;
… …
3035 { 3062 {
3036#if !ENABLE_MINIMAL 3063#if !ENABLE_MINIMAL
3037 if (selection.rect) 3064 if (selection.rect)
3038 { 3065 {
3039 col = selection.beg.col; 3066 col = selection.beg.col;
3040 end_col = ncol + 1; 3067 end_col = selection.end.col;
3041 } 3068 }
3042 else 3069 else
3043#endif 3070#endif
3044 end_col = ROW(row).l; 3071 end_col = ROW(row).l;
3045 3072
3046 col = max (col, 0); 3073 col = max (col, 0);
3047 3074
3048 if (row == selection.end.row 3075 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 3076 min_it (end_col, selection.end.col);
3054 3077
3055 t = ROW(row).t + col; 3078 t = ROW(row).t + col;
3056 3079
3057 for (; col < end_col; col++) 3080 for (; col < end_col; col++)
… …
3065 3088
3066 extra -= (len - 1); 3089 extra -= (len - 1);
3067 3090
3068 if (extra < 0) 3091 if (extra < 0)
3069 { 3092 {
3070 extra += i; 3093 extra += size;
3071 i += i; 3094 size += size;
3072 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));
3073 } 3096 }
3074 3097
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3098 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 3099 }
3077#endif 3100#endif
… …
3089 3112
3090 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3091 } 3114 }
3092 else 3115 else
3093#endif 3116#endif
3094 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))
3095 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3096 } 3121 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 3122
3101 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3102 3124
3103 if (ofs == 0) 3125 if (ofs == 0)
3104 { 3126 {

Diff Legend

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