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.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC vs.
Revision 1.375 by root, Mon Feb 21 07:12:03 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
… …
2328 if (ISSET_PIXCOLOR (Color_HTC)) 2331 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC; 2332 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color 2333 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert) 2334 else if (!invert)
2332 fore = back; 2335 fore = back;
2336
2333 back = Color_HC; 2337 back = Color_HC;
2334 invert = 0; 2338 invert = 0;
2335 } 2339 }
2336 } 2340 }
2337#endif 2341#endif
… …
2502 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2503 } 2507 }
2504} 2508}
2505 2509
2506void 2510void
2507rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2512{
2513 bool transparent = false;
2514
2509#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2511#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);
2512 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 {
2513 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
2514 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2516 2541
2517 if (scrollBar.win) 2542 if (scrollBar.win)
2518 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2521 scrollBar.show (0); 2549 scrollBar.show (0);
2522 } 2550 }
2523 2551
2524#endif 2552 if (refresh)
2525 2553 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2554 scr_clear ();
2528 scr_touch (true); 2555 scr_touch (true);
2556 }
2529 want_refresh = 1; 2557 want_refresh = 1;
2530} 2558}
2531 2559
2532/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2533void 2561void
… …
2621void 2649void
2622rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2651{
2624 int row, wrote; 2652 int row, wrote;
2625 unsigned int width, towrite; 2653 unsigned int width, towrite;
2626 char r1[] = "\n"; 2654 const char r1[] = "\n";
2627 2655
2628 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2630 { 2658 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2677/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2678/* 2706/*
2679 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2680 */ 2708 */
2681void 2709void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2711{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2693 2721
2694 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2696} 2724}
2697 2725
2698/* ------------------------------------------------------------------------- */
2699/*
2700 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify
2702 */
2703void 2726void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2705{ 2728{
2706 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2707 {
2708 if ((selection_type & Sel_CompoundText))
2709 {
2710 int selnum = selection_type & Sel_whereMask;
2711
2712 selection_type = 0;
2713 if (selnum != Sel_direct)
2714 selection_request_other (XA_STRING, selnum);
2715 }
2716
2717 if ((selection_type & Sel_UTF8String))
2718 {
2719 int selnum = selection_type & Sel_whereMask;
2720
2721 selection_type = Sel_CompoundText;
2722 if (selnum != Sel_direct)
2723 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2724 else
2725 selection_type = 0;
2726 }
2727
2728 return;
2729 }
2730
2731 unsigned long bytes_after;
2732 XTextProperty ct;
2733
2734 if (XGetWindowProperty (dpy, win, prop,
2735 0, PROP_SIZE / 4,
2736 delete_prop, AnyPropertyType,
2737 &ct.encoding, &ct.format,
2738 &ct.nitems, &bytes_after,
2739 &ct.value) != Success)
2740 {
2741 ct.value = 0;
2742 goto bailout;
2743 }
2744
2745 if (ct.encoding == None)
2746 goto bailout;
2747
2748 if (bytes_after)
2749 {
2750 // fetch and append remaining data
2751 XTextProperty ct2;
2752
2753 if (XGetWindowProperty (dpy, win, prop,
2754 ct.nitems / 4, (bytes_after + 3) / 4,
2755 delete_prop, AnyPropertyType,
2756 &ct2.encoding, &ct2.format,
2757 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success)
2759 goto bailout;
2760
2761 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems;
2765
2766 XFree (ct2.value);
2767 }
2768
2769 if (ct.value == 0)
2770 goto bailout;
2771
2772 if (ct.encoding == xa[XA_INCR])
2773 {
2774 // INCR selection, start handshake
2775 if (!delete_prop)
2776 XDeleteProperty (dpy, win, prop);
2777
2778 selection_wait = Sel_incr;
2779 incr_buf_fill = 0;
2780 incr_ev.start (10);
2781
2782 goto bailout;
2783 }
2784
2785 if (ct.nitems == 0)
2786 {
2787 if (selection_wait == Sel_incr)
2788 {
2789 XFree (ct.value);
2790
2791 // finally complete, now paste the whole thing
2792 selection_wait = Sel_normal;
2793 ct.value = (unsigned char *)incr_buf;
2794 ct.nitems = incr_buf_fill;
2795 incr_buf = 0;
2796 incr_buf_size = 0;
2797 incr_ev.stop ();
2798 }
2799 else
2800 {
2801 if (selection_wait == Sel_normal
2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2803 {
2804 /*
2805 * pass through again trying CUT_BUFFER0 if we've come from
2806 * XConvertSelection () but nothing was presented
2807 */
2808 selection_paste (display->root, XA_CUT_BUFFER0, False);
2809 }
2810
2811 goto bailout;
2812 }
2813 }
2814 else if (selection_wait == Sel_incr)
2815 {
2816 incr_ev.start (10);
2817
2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2822 }
2823
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems;
2826
2827 goto bailout;
2828 }
2829
2830 char **cl;
2831 int cr;
2832
2833#if !ENABLE_MINIMAL
2834 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2835 // so recode it manually
2836 if (ct.encoding == xa[XA_UTF8_STRING])
2837 {
2838 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2839 char *s = rxvt_wcstombs (w);
2840 free (w);
2841 // TODO: strlen == only the first element will be converted. well...
2842 paste (s, strlen (s));
2843 free (s);
2844 }
2845 else
2846#endif
2847 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2848 && cl)
2849 {
2850 for (int i = 0; i < cr; i++)
2851 paste (cl[i], strlen (cl[i]));
2852
2853 XFreeStringList (cl);
2854 }
2855 else
2856 paste ((char *)ct.value, ct.nitems); // paste raw
2857
2858bailout:
2859 XFree (ct.value);
2860
2861 if (selection_wait == Sel_normal)
2862 selection_wait = Sel_none;
2863}
2864
2865void
2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2867{
2868 selection_wait = Sel_none;
2869
2870 incr_buf_size = 0;
2871 free (incr_buf);
2872
2873 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2874}
2875
2876void
2877rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2878{
2879 if (prop == None || selection_wait != Sel_incr)
2880 return; 2730 return;
2881 2731
2882 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2883} 2733}
2884 2734
2885/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2886/* 2736/*
2887 * Request the current selection: 2737 * Request the current selection:
… …
2901 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2902 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2903 free (str); 2753 free (str);
2904 return; 2754 return;
2905 } 2755 }
2906 else 2756 else if (!selection_req)
2907 {
2908 selection_request_time = tm;
2909 selection_wait = Sel_normal;
2910
2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return;
2915#else
2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return;
2919#endif
2920 } 2757 {
2921 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2759 selection_req->run ();
2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
2924}
2925
2926int
2927rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2928{
2929 Atom sel;
2930
2931 selection_type |= selnum;
2932
2933 if (selnum == Sel_Primary)
2934 sel = XA_PRIMARY;
2935 else if (selnum == Sel_Secondary)
2936 sel = XA_SECONDARY;
2937 else
2938 sel = xa[XA_CLIPBOARD];
2939
2940 if (XGetSelectionOwner (dpy, sel) != None)
2941 { 2760 }
2942 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2943 vt, selection_request_time);
2944 return 1;
2945 }
2946
2947 return 0;
2948} 2761}
2949 2762
2950/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2951/* 2764/*
2952 * Clear all selected text 2765 * Clear all selected text
… …
2975 if (display->clipboard_owner == this) 2788 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0; 2789 display->clipboard_owner = 0;
2977 } 2790 }
2978} 2791}
2979 2792
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2992}
2993
2994/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2995/* 2794/*
2996 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2997 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2998 */ 2797 */
2999void 2798void
3000rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
3001{ 2800{
3002 int i; 2801 int size;
3003 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
3004 text_t *t; 2803 text_t *t;
3005 2804
3006 switch (selection.op) 2805 switch (selection.op)
3007 { 2806 {
… …
3023 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
3024 2823
3025 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3026 return; 2825 return;
3027 2826
3028 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3029 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3030 2829
3031 int ofs = 0; 2830 int ofs = 0;
3032 int extra = 0; 2831 int extra = 0;
3033 2832
3034 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
3040 { 2839 {
3041#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
3042 if (selection.rect) 2841 if (selection.rect)
3043 { 2842 {
3044 col = selection.beg.col; 2843 col = selection.beg.col;
3045 end_col = ncol + 1; 2844 end_col = selection.end.col;
3046 } 2845 }
3047 else 2846 else
3048#endif 2847#endif
3049 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
3050 2849
3051 col = max (col, 0); 2850 col = max (col, 0);
3052 2851
3053 if (row == selection.end.row 2852 if (row == selection.end.row)
3054#if !ENABLE_MINIMAL
3055 || selection.rect
3056#endif
3057 )
3058 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3059 2854
3060 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3061 2856
3062 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3070 2865
3071 extra -= (len - 1); 2866 extra -= (len - 1);
3072 2867
3073 if (extra < 0) 2868 if (extra < 0)
3074 { 2869 {
3075 extra += i; 2870 extra += size;
3076 i += i; 2871 size += size;
3077 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3078 } 2873 }
3079 2874
3080 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3081 } 2876 }
3082#endif 2877#endif
… …
3094 2889
3095 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3096 } 2891 }
3097 else 2892 else
3098#endif 2893#endif
3099 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3100 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3101 } 2898 }
3102
3103 if (end_col != selection.end.col)
3104 new_selection_text[ofs++] = C0_LF;
3105 2899
3106 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3107 2901
3108 if (ofs == 0) 2902 if (ofs == 0)
3109 { 2903 {

Diff Legend

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