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.334 by sf-exg, Sun Feb 14 11:04:11 2010 UTC vs.
Revision 1.371 by sf-exg, Wed Feb 9 23:07:18 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
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++;
… …
397 } 398 }
398 399
399 free (tabs); 400 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
401 402
402 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
404 405
405 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
406 407
407 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
897# else 898# else
898 c = 0xfffd; 899 c = 0xfffd;
899# endif 900# endif
900#endif 901#endif
901 902
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)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911 904
912 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 { 907 {
908 if (screen.flags & Screen_Autowrap)
909 {
915 // ... artificially enlargen the previous one 910 // ... artificially enlargen the previous one
916 c = NOCHAR; 911 c = NOCHAR;
917 // and try the same character next loop iteration 912 // and try the same character next loop iteration
918 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
919 } 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);
920 925
921 line->touch (); 926 line->touch ();
922 927
923 do 928 do
924 { 929 {
… …
930 else 935 else
931 { 936 {
932 line->l = ncol; 937 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
935 break; 940
941 goto end_of_line;
936 } 942 }
937 943
938 c = NOCHAR; 944 c = NOCHAR;
939 } 945 }
940 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
941 947
942 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
944 { 950 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 951 line->t[c] = ' ';
950 line->r[c] = rend; 952 line->r[c] = rend;
951 }
952 } 953 }
954
955end_of_line:
956 ;
953 } 957 }
954#if ENABLE_COMBINING 958#if ENABLE_COMBINING
955 else // width == 0 959 else // width == 0
956 { 960 {
957 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1020 1024
1021 want_refresh = 1; 1025 want_refresh = 1;
1022#endif 1026#endif
1023 } 1027 }
1024 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1025 else 1031 else
1026 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1027} 1033}
1028 1034
1029/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1336 return; 1342 return;
1337 1343
1338 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1339 1345
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)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1349 {
1347 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1348 1351
1349 if (mapped && !view_start) 1352 if (mapped)
1350 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1353 } 1356 }
1354 else 1357 else
1355 { 1358 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1360
1358 if (mapped && !view_start) 1361 if (mapped)
1359 { 1362 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1370 1373
1371 for (; num--; row++) 1374 for (; num--; row++)
1372 { 1375 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1374 1377
1375 if (!view_start) 1378 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1380 }
1378} 1381}
1379 1382
1380#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1381void 1384void
… …
1680 { 1683 {
1681 rvideo_state = on; 1684 rvideo_state = on;
1682 1685
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1686#endif 1689#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1691
1689 XGCValues gcvalue; 1692 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
2026 refresh_count = 0; 2029 refresh_count = 0;
2027 2030
2028 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2032 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2032#endif 2035#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2037
2035 /* 2038 /*
2036 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2085 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2086#else 2089#else
2087 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2088#endif 2091#endif
2089 2092
2090 if (showcursor && focus) 2093 if (focus)
2091 { 2094 {
2092 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2094 else 2097 else
2095 { 2098 {
… …
2231 2234
2232 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2234 --col; 2237 --col;
2235 2238
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2240 text_t *text = stp + col;
2238 int count = 1; 2241 int count = 1;
2239 2242
2240 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2241 drp[col] = rend; 2244 drp[col] = rend;
… …
2286 */ 2289 */
2287 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2289 2292
2290 // 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
2291 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)))
2292 { 2295 {
2293 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2294 2297
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2318
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2320 fore = Color_UL;
2318#endif 2321#endif
2319 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
2320 if (invert) 2343 if (invert)
2321 { 2344 {
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); 2345 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2346
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#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) 2348 if (fore == back)
2340 { 2349 {
2341 fore = Color_bg; 2350 fore = Color_bg;
2342 back = Color_fg; 2351 back = Color_fg;
2343 } 2352 }
… …
2497 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2498 } 2507 }
2499} 2508}
2500 2509
2501void 2510void
2502rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2512{
2513 bool transparent = false;
2514
2504#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2506#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);
2507 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 {
2508 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
2509 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2511 2541
2512 if (scrollBar.win) 2542 if (scrollBar.win)
2513 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2516 scrollBar.show (0); 2549 scrollBar.show (0);
2517 } 2550 }
2518 2551
2519#endif 2552 if (refresh)
2520 2553 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2554 scr_clear ();
2523 scr_touch (true); 2555 scr_touch (true);
2556 }
2524 want_refresh = 1; 2557 want_refresh = 1;
2525} 2558}
2526 2559
2527/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2528void 2561void
… …
2596 { 2629 {
2597#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2598 if (selection.rect) 2631 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2635 else
2603#endif 2636#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2606 RS_RVid); 2639 RS_Sel | RS_RVid);
2607 } 2640 }
2608} 2641}
2609 2642
2610/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2611/* 2644/*
… …
2616void 2649void
2617rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2651{
2619 int row, wrote; 2652 int row, wrote;
2620 unsigned int width, towrite; 2653 unsigned int width, towrite;
2621 char r1[] = "\n"; 2654 const char r1[] = "\n";
2622 2655
2623 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2625 { 2658 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2672/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2673/* 2706/*
2674 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2675 */ 2708 */
2676void 2709void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2711{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2688 2721
2689 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2691} 2724}
2692 2725
2726void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728{
2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2730 return;
2731
2732 tt_paste (data, len);
2733}
2734
2693/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2694/* 2736/*
2695 * Respond to a notification that a primary selection has been sent 2737 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify 2738 * EXT: SelectionNotify
2697 */ 2739 */
2698void 2740void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2700{ 2742{
2701 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2702 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2703 if ((selection_type & Sel_CompoundText)) 2747 if ((selection_type & Sel_CompoundText))
2704 { 2748 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0; 2749 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum); 2750 selection_request_other (XA_STRING, selnum);
2710 } 2751 }
2711 2752
2712 if ((selection_type & Sel_UTF8String)) 2753 if ((selection_type & Sel_UTF8String))
2713 { 2754 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText; 2755 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2756 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 } 2757 }
2722 2758
2723 return; 2759 return;
2724 } 2760 }
2725 2761
2726 unsigned long bytes_after; 2762 unsigned long bytes_after;
2727 XTextProperty ct; 2763 XTextProperty ct;
2728 2764
2765 // length == (2^31 - 1) / 4, as gdk
2729 if (XGetWindowProperty (dpy, win, prop, 2766 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4, 2767 0, 0x1fffffff,
2731 delete_prop, AnyPropertyType, 2768 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format, 2769 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after, 2770 &ct.nitems, &bytes_after,
2734 &ct.value) != Success) 2771 &ct.value) != Success)
2735 { 2772 {
… …
2737 goto bailout; 2774 goto bailout;
2738 } 2775 }
2739 2776
2740 if (ct.encoding == None) 2777 if (ct.encoding == None)
2741 goto bailout; 2778 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763 2779
2764 if (ct.value == 0) 2780 if (ct.value == 0)
2765 goto bailout; 2781 goto bailout;
2766 2782
2767 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
… …
2798 { 2814 {
2799 /* 2815 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2802 */ 2818 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, false);
2804 } 2820 }
2805 2821
2806 goto bailout; 2822 goto bailout;
2807 } 2823 }
2808 } 2824 }
… …
2811 incr_ev.start (10); 2827 incr_ev.start (10);
2812 2828
2813 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 { 2830 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2817 } 2833 }
2818 2834
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems; 2836 incr_buf_fill += ct.nitems;
2821 2837
… …
2862{ 2878{
2863 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2864 2880
2865 incr_buf_size = 0; 2881 incr_buf_size = 0;
2866 free (incr_buf); 2882 free (incr_buf);
2883 incr_buf = 0;
2867 2884
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2885 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869} 2886}
2870 2887
2871void 2888void
… …
2904 selection_wait = Sel_normal; 2921 selection_wait = Sel_normal;
2905 2922
2906#if X_HAVE_UTF8_STRING 2923#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String; 2924 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2925 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return; 2926 return;
2910#else 2927#else
2911 selection_type = Sel_CompoundText; 2928 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2929 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return; 2930 return;
2914#endif 2931#endif
2915 } 2932 }
2916 2933
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2934 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false); 2935 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2970 if (display->clipboard_owner == this) 2987 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2988 display->clipboard_owner = 0;
2972 } 2989 }
2973} 2990}
2974 2991
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/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
2990/* 2993/*
2991 * Copy a selection into the cut buffer 2994 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 2995 * EXT: button 1 or 3 release
2993 */ 2996 */
2994void 2997void
2995rxvt_term::selection_make (Time tm) 2998rxvt_term::selection_make (Time tm)
2996{ 2999{
2997 int i; 3000 int size;
2998 wchar_t *new_selection_text; 3001 wchar_t *new_selection_text;
2999 text_t *t; 3002 text_t *t;
3000 3003
3001 switch (selection.op) 3004 switch (selection.op)
3002 { 3005 {
… …
3018 return; /* nothing selected, go away */ 3021 return; /* nothing selected, go away */
3019 3022
3020 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3023 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3021 return; 3024 return;
3022 3025
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3026 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3027 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3025 3028
3026 int ofs = 0; 3029 int ofs = 0;
3027 int extra = 0; 3030 int extra = 0;
3028 3031
3029 int col = selection.beg.col; 3032 int col = selection.beg.col;
… …
3035 { 3038 {
3036#if !ENABLE_MINIMAL 3039#if !ENABLE_MINIMAL
3037 if (selection.rect) 3040 if (selection.rect)
3038 { 3041 {
3039 col = selection.beg.col; 3042 col = selection.beg.col;
3040 end_col = ncol + 1; 3043 end_col = selection.end.col;
3041 } 3044 }
3042 else 3045 else
3043#endif 3046#endif
3044 end_col = ROW(row).l; 3047 end_col = ROW(row).l;
3045 3048
3046 col = max (col, 0); 3049 col = max (col, 0);
3047 3050
3048 if (row == selection.end.row 3051 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 3052 min_it (end_col, selection.end.col);
3054 3053
3055 t = ROW(row).t + col; 3054 t = ROW(row).t + col;
3056 3055
3057 for (; col < end_col; col++) 3056 for (; col < end_col; col++)
… …
3065 3064
3066 extra -= (len - 1); 3065 extra -= (len - 1);
3067 3066
3068 if (extra < 0) 3067 if (extra < 0)
3069 { 3068 {
3070 extra += i; 3069 extra += size;
3071 i += i; 3070 size += size;
3072 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3071 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3073 } 3072 }
3074 3073
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 3075 }
3077#endif 3076#endif
… …
3089 3088
3090 new_selection_text[ofs++] = C0_LF; 3089 new_selection_text[ofs++] = C0_LF;
3091 } 3090 }
3092 else 3091 else
3093#endif 3092#endif
3094 if (!ROW(row).is_longer () && row != selection.end.row) 3093 if (!ROW(row).is_longer ()
3094 && (row != selection.end.row || end_col != selection.end.col)
3095 && (row != selection.beg.row || selection.beg.col < ncol))
3095 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3096 } 3097 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 3098
3101 new_selection_text[ofs] = 0; 3099 new_selection_text[ofs] = 0;
3102 3100
3103 if (ofs == 0) 3101 if (ofs == 0)
3104 { 3102 {

Diff Legend

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