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.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC vs.
Revision 1.379 by sf-exg, Fri Apr 1 11:06:42 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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
36fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
144 col--; 142 col--;
145 143
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 146
147 l.touch ();
148
149 // found start, nuke 149 // found start, nuke
150 do { 150 do {
151 l.t[col] = ' '; 151 l.t[col] = ' ';
152 l.r[col] = rend; 152 l.r[col] = rend;
153 col++; 153 col++;
… …
159 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160 160
161void 161void
162rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
163{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
164 view_start = 0; 168 view_start = 0;
165 num_scr = 0; 169 num_scr = 0;
166 170
167 if (ncol == 0) 171 if (ncol == 0)
168 ncol = 80; 172 ncol = 80;
… …
398 } 402 }
399 403
400 free (tabs); 404 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
402 406
403 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
405 409
406 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
407 411
408 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
898# else 902# else
899 c = 0xfffd; 903 c = 0xfffd;
900# endif 904# endif
901#endif 905#endif
902 906
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 908
913 // if the character doesn't fit into the remaining columns... 909 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 911 {
912 if (screen.flags & Screen_Autowrap)
913 {
916 // ... artificially enlargen the previous one 914 // ... artificially enlargen the previous one
917 c = NOCHAR; 915 c = NOCHAR;
918 // and try the same character next loop iteration 916 // and try the same character next loop iteration
919 --str; 917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
920 } 921 }
922
923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col);
921 929
922 line->touch (); 930 line->touch ();
923 931
924 do 932 do
925 { 933 {
… …
931 else 939 else
932 { 940 {
933 line->l = ncol; 941 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
936 break; 944
945 goto end_of_line;
937 } 946 }
938 947
939 c = NOCHAR; 948 c = NOCHAR;
940 } 949 }
941 while (expect_false (--width > 0)); 950 while (expect_false (--width > 0));
942 951
943 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945 { 954 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 955 line->t[c] = ' ';
951 line->r[c] = rend; 956 line->r[c] = rend;
952 }
953 } 957 }
958
959end_of_line:
960 ;
954 } 961 }
955#if ENABLE_COMBINING 962#if ENABLE_COMBINING
956 else // width == 0 963 else // width == 0
957 { 964 {
958 if (c != 0xfeff) // ignore BOM 965 if (c != 0xfeff) // ignore BOM
… …
1021 1028
1022 want_refresh = 1; 1029 want_refresh = 1;
1023#endif 1030#endif
1024 } 1031 }
1025 } 1032 }
1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1026 else 1035 else
1027 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1028} 1037}
1029 1038
1030/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1337 return; 1346 return;
1338 1347
1339 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1340 1349
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1353 {
1348 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1349 1355
1350 if (mapped && !view_start) 1356 if (mapped)
1351 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1354 } 1360 }
1355 else 1361 else
1356 { 1362 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1364
1359 if (mapped && !view_start) 1365 if (mapped)
1360 { 1366 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1370 0, Row2Pixel (row - view_start),
… …
1371 1377
1372 for (; num--; row++) 1378 for (; num--; row++)
1373 { 1379 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1375 1381
1376 if (!view_start) 1382 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1384 }
1379} 1385}
1380 1386
1381#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1382void 1388void
… …
1681 { 1687 {
1682 rvideo_state = on; 1688 rvideo_state = on;
1683 1689
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1686 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1687#endif 1693#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1695
1690 XGCValues gcvalue; 1696 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
2027 refresh_count = 0; 2033 refresh_count = 0;
2028 2034
2029 unsigned int old_screen_flags = screen.flags; 2035 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0; 2036 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bg_pixmap != None;
2033#endif 2039#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2041
2036 /* 2042 /*
2037 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
… …
2504 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2505 } 2511 }
2506} 2512}
2507 2513
2508void 2514void
2509rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2510{ 2516{
2517 bool transparent = false;
2518
2511#ifdef HAVE_BG_PIXMAP 2519#ifdef HAVE_BG_PIXMAP
2512 bgPixmap.apply (); 2520 if (bg_pixmap != None)
2513#else 2521 {
2522# ifdef ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2514 2527
2528 transparent = true;
2529 }
2530 else
2531# endif
2532 {
2533 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2535 }
2536 }
2537 else
2538#endif
2539 {
2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 }
2543
2516 XClearWindow (dpy, parent[0]); 2544 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2518 2545
2519 if (scrollBar.win) 2546 if (scrollBar.win)
2520 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2522 scrollBar.state = STATE_IDLE; 2552 scrollBar.state = STATE_IDLE;
2523 scrollBar.show (0); 2553 scrollBar.show (0);
2524 } 2554 }
2525 2555
2526#endif 2556 if (refresh)
2527 2557 {
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear (); 2558 scr_clear ();
2530 scr_touch (true); 2559 scr_touch (true);
2560 }
2531 want_refresh = 1; 2561 want_refresh = 1;
2532} 2562}
2533 2563
2534/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2535void 2565void
… …
2623void 2653void
2624rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2655{
2626 int row, wrote; 2656 int row, wrote;
2627 unsigned int width, towrite; 2657 unsigned int width, towrite;
2628 char r1[] = "\n"; 2658 const char r1[] = "\n";
2629 2659
2630 for (row = saveLines + top_row; 2660 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2632 { 2662 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2679/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2680/* 2710/*
2681 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2682 */ 2712 */
2683void 2713void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2715{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2719 data[i] = C0_CR;
… …
2695 2725
2696 if (priv_modes & PrivMode_BracketPaste) 2726 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~"); 2727 tt_printf ("\e[201~");
2698} 2728}
2699 2729
2700/* ------------------------------------------------------------------------- */
2701/*
2702 * Respond to a notification that a primary selection has been sent
2703 * EXT: SelectionNotify
2704 */
2705void 2730void
2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{ 2732{
2708 if (prop == None) /* check for failed XConvertSelection */ 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 {
2710 if ((selection_type & Sel_CompoundText))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = 0;
2715 if (selnum != Sel_direct)
2716 selection_request_other (XA_STRING, selnum);
2717 }
2718
2719 if ((selection_type & Sel_UTF8String))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = Sel_CompoundText;
2724 if (selnum != Sel_direct)
2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2726 else
2727 selection_type = 0;
2728 }
2729
2730 return;
2731 }
2732
2733 unsigned long bytes_after;
2734 XTextProperty ct;
2735
2736 if (XGetWindowProperty (dpy, win, prop,
2737 0, PROP_SIZE / 4,
2738 delete_prop, AnyPropertyType,
2739 &ct.encoding, &ct.format,
2740 &ct.nitems, &bytes_after,
2741 &ct.value) != Success)
2742 {
2743 ct.value = 0;
2744 goto bailout;
2745 }
2746
2747 if (ct.encoding == None)
2748 goto bailout;
2749
2750 if (bytes_after)
2751 {
2752 // fetch and append remaining data
2753 XTextProperty ct2;
2754
2755 if (XGetWindowProperty (dpy, win, prop,
2756 ct.nitems / 4, (bytes_after + 3) / 4,
2757 delete_prop, AnyPropertyType,
2758 &ct2.encoding, &ct2.format,
2759 &ct2.nitems, &bytes_after,
2760 &ct2.value) != Success)
2761 goto bailout;
2762
2763 // realloc should be compatible to XFree, here, and elsewhere, too
2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems;
2767
2768 XFree (ct2.value);
2769 }
2770
2771 if (ct.value == 0)
2772 goto bailout;
2773
2774 if (ct.encoding == xa[XA_INCR])
2775 {
2776 // INCR selection, start handshake
2777 if (!delete_prop)
2778 XDeleteProperty (dpy, win, prop);
2779
2780 selection_wait = Sel_incr;
2781 incr_buf_fill = 0;
2782 incr_ev.start (10);
2783
2784 goto bailout;
2785 }
2786
2787 if (ct.nitems == 0)
2788 {
2789 if (selection_wait == Sel_incr)
2790 {
2791 XFree (ct.value);
2792
2793 // finally complete, now paste the whole thing
2794 selection_wait = Sel_normal;
2795 ct.value = (unsigned char *)incr_buf;
2796 ct.nitems = incr_buf_fill;
2797 incr_buf = 0;
2798 incr_buf_size = 0;
2799 incr_ev.stop ();
2800 }
2801 else
2802 {
2803 if (selection_wait == Sel_normal
2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2805 {
2806 /*
2807 * pass through again trying CUT_BUFFER0 if we've come from
2808 * XConvertSelection () but nothing was presented
2809 */
2810 selection_paste (display->root, XA_CUT_BUFFER0, False);
2811 }
2812
2813 goto bailout;
2814 }
2815 }
2816 else if (selection_wait == Sel_incr)
2817 {
2818 incr_ev.start (10);
2819
2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2821 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2824 }
2825
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2827 incr_buf_fill += ct.nitems;
2828
2829 goto bailout;
2830 }
2831
2832 char **cl;
2833 int cr;
2834
2835#if !ENABLE_MINIMAL
2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2837 // so recode it manually
2838 if (ct.encoding == xa[XA_UTF8_STRING])
2839 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w);
2842 free (w);
2843 // TODO: strlen == only the first element will be converted. well...
2844 paste (s, strlen (s));
2845 free (s);
2846 }
2847 else
2848#endif
2849 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2850 && cl)
2851 {
2852 for (int i = 0; i < cr; i++)
2853 paste (cl[i], strlen (cl[i]));
2854
2855 XFreeStringList (cl);
2856 }
2857 else
2858 paste ((char *)ct.value, ct.nitems); // paste raw
2859
2860bailout:
2861 XFree (ct.value);
2862
2863 if (selection_wait == Sel_normal)
2864 selection_wait = Sel_none;
2865}
2866
2867void
2868rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2869{
2870 selection_wait = Sel_none;
2871
2872 incr_buf_size = 0;
2873 free (incr_buf);
2874
2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2876}
2877
2878void
2879rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2880{
2881 if (prop == None || selection_wait != Sel_incr)
2882 return; 2734 return;
2883 2735
2884 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2885} 2737}
2886 2738
2887/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2888/* 2740/*
2889 * Request the current selection: 2741 * Request the current selection:
… …
2895 * EXT: button 2 release 2747 * EXT: button 2 release
2896 */ 2748 */
2897void 2749void
2898rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2899{ 2751{
2900 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2901 {
2902 /* internal selection */
2903 char *str = rxvt_wcstombs (selection.text, selection.len);
2904 paste (str, strlen (str));
2905 free (str);
2906 return;
2907 } 2753 {
2908 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2909 { 2756 }
2910 selection_request_time = tm;
2911 selection_wait = Sel_normal;
2912
2913#if X_HAVE_UTF8_STRING
2914 selection_type = Sel_UTF8String;
2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2916 return;
2917#else
2918 selection_type = Sel_CompoundText;
2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2920 return;
2921#endif
2922 }
2923
2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
2926}
2927
2928int
2929rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2930{
2931 Atom sel;
2932
2933 selection_type |= selnum;
2934
2935 if (selnum == Sel_Primary)
2936 sel = XA_PRIMARY;
2937 else if (selnum == Sel_Secondary)
2938 sel = XA_SECONDARY;
2939 else
2940 sel = xa[XA_CLIPBOARD];
2941
2942 if (XGetSelectionOwner (dpy, sel) != None)
2943 {
2944 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2945 vt, selection_request_time);
2946 return 1;
2947 }
2948
2949 return 0;
2950} 2757}
2951 2758
2952/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2953/* 2760/*
2954 * Clear all selected text 2761 * Clear all selected text
… …
2985 * EXT: button 1 or 3 release 2792 * EXT: button 1 or 3 release
2986 */ 2793 */
2987void 2794void
2988rxvt_term::selection_make (Time tm) 2795rxvt_term::selection_make (Time tm)
2989{ 2796{
2990 int i; 2797 int size;
2991 wchar_t *new_selection_text; 2798 wchar_t *new_selection_text;
2992 text_t *t; 2799 text_t *t;
2993 2800
2994 switch (selection.op) 2801 switch (selection.op)
2995 { 2802 {
… …
3011 return; /* nothing selected, go away */ 2818 return; /* nothing selected, go away */
3012 2819
3013 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2820 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3014 return; 2821 return;
3015 2822
3016 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2823 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3017 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2824 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3018 2825
3019 int ofs = 0; 2826 int ofs = 0;
3020 int extra = 0; 2827 int extra = 0;
3021 2828
3022 int col = selection.beg.col; 2829 int col = selection.beg.col;
… …
3028 { 2835 {
3029#if !ENABLE_MINIMAL 2836#if !ENABLE_MINIMAL
3030 if (selection.rect) 2837 if (selection.rect)
3031 { 2838 {
3032 col = selection.beg.col; 2839 col = selection.beg.col;
3033 end_col = ncol + 1; 2840 end_col = selection.end.col;
3034 } 2841 }
3035 else 2842 else
3036#endif 2843#endif
3037 end_col = ROW(row).l; 2844 end_col = ROW(row).l;
3038 2845
3039 col = max (col, 0); 2846 col = max (col, 0);
3040 2847
3041 if (row == selection.end.row 2848 if (row == selection.end.row)
3042#if !ENABLE_MINIMAL
3043 || selection.rect
3044#endif
3045 )
3046 min_it (end_col, selection.end.col); 2849 min_it (end_col, selection.end.col);
3047 2850
3048 t = ROW(row).t + col; 2851 t = ROW(row).t + col;
3049 2852
3050 for (; col < end_col; col++) 2853 for (; col < end_col; col++)
… …
3058 2861
3059 extra -= (len - 1); 2862 extra -= (len - 1);
3060 2863
3061 if (extra < 0) 2864 if (extra < 0)
3062 { 2865 {
3063 extra += i; 2866 extra += size;
3064 i += i; 2867 size += size;
3065 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2868 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3066 } 2869 }
3067 2870
3068 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2871 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3069 } 2872 }
3070#endif 2873#endif
… …
3082 2885
3083 new_selection_text[ofs++] = C0_LF; 2886 new_selection_text[ofs++] = C0_LF;
3084 } 2887 }
3085 else 2888 else
3086#endif 2889#endif
3087 if (!ROW(row).is_longer () && row != selection.end.row) 2890 if (!ROW(row).is_longer ()
2891 && (row != selection.end.row || end_col != selection.end.col)
2892 && (row != selection.beg.row || selection.beg.col < ncol))
3088 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3089 } 2894 }
3090
3091 if (end_col != selection.end.col)
3092 new_selection_text[ofs++] = C0_LF;
3093 2895
3094 new_selection_text[ofs] = 0; 2896 new_selection_text[ofs] = 0;
3095 2897
3096 if (ofs == 0) 2898 if (ofs == 0)
3097 { 2899 {

Diff Legend

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