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.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC vs.
Revision 1.382 by sf-exg, Tue Apr 26 16:19:45 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];
… …
1918 1924
1919# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1920# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1921 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1922# endif 1928# endif
1923 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1924# endif 1930# endif
1925 1931
1926# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1928 set_urgency (1); 1934 set_urgency (1);
… …
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, bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2514 2527
2528 transparent = true;
2529 }
2530 else
2531# endif
2532 {
2533 XSetWindowBackground (dpy, parent, 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, pix_colors[Color_border]);
2516 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 }
2543
2544 XClearWindow (dpy, parent);
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
… …
2706 tt_paste (data, len); 2736 tt_paste (data, len);
2707} 2737}
2708 2738
2709/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2710/* 2740/*
2711 * Respond to a notification that a primary selection has been sent 2741 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2712 * EXT: SelectionNotify 2742 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2713 */ 2743 * as fallback
2714void
2715rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2716{
2717 if (prop == None) /* check for failed XConvertSelection */
2718 {
2719 if ((selection_type & Sel_CompoundText))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = 0;
2724 if (selnum != Sel_direct)
2725 selection_request_other (XA_STRING, selnum);
2726 }
2727
2728 if ((selection_type & Sel_UTF8String))
2729 {
2730 int selnum = selection_type & Sel_whereMask;
2731
2732 selection_type = Sel_CompoundText;
2733 if (selnum != Sel_direct)
2734 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2735 else
2736 selection_type = 0;
2737 }
2738
2739 return;
2740 }
2741
2742 unsigned long bytes_after;
2743 XTextProperty ct;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 0, PROP_SIZE / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct.encoding, &ct.format,
2749 &ct.nitems, &bytes_after,
2750 &ct.value) != Success)
2751 {
2752 ct.value = 0;
2753 goto bailout;
2754 }
2755
2756 if (ct.encoding == None)
2757 goto bailout;
2758
2759 if (bytes_after)
2760 {
2761 // fetch and append remaining data
2762 XTextProperty ct2;
2763
2764 if (XGetWindowProperty (dpy, win, prop,
2765 ct.nitems / 4, (bytes_after + 3) / 4,
2766 delete_prop, AnyPropertyType,
2767 &ct2.encoding, &ct2.format,
2768 &ct2.nitems, &bytes_after,
2769 &ct2.value) != Success)
2770 goto bailout;
2771
2772 // realloc should be compatible to XFree, here, and elsewhere, too
2773 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2774 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2775 ct.nitems += ct2.nitems;
2776
2777 XFree (ct2.value);
2778 }
2779
2780 if (ct.value == 0)
2781 goto bailout;
2782
2783 if (ct.encoding == xa[XA_INCR])
2784 {
2785 // INCR selection, start handshake
2786 if (!delete_prop)
2787 XDeleteProperty (dpy, win, prop);
2788
2789 selection_wait = Sel_incr;
2790 incr_buf_fill = 0;
2791 incr_ev.start (10);
2792
2793 goto bailout;
2794 }
2795
2796 if (ct.nitems == 0)
2797 {
2798 if (selection_wait == Sel_incr)
2799 {
2800 XFree (ct.value);
2801
2802 // finally complete, now paste the whole thing
2803 selection_wait = Sel_normal;
2804 ct.value = (unsigned char *)incr_buf;
2805 ct.nitems = incr_buf_fill;
2806 incr_buf = 0;
2807 incr_buf_size = 0;
2808 incr_ev.stop ();
2809 }
2810 else
2811 {
2812 if (selection_wait == Sel_normal
2813 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2814 {
2815 /*
2816 * pass through again trying CUT_BUFFER0 if we've come from
2817 * XConvertSelection () but nothing was presented
2818 */
2819 selection_paste (display->root, XA_CUT_BUFFER0, False);
2820 }
2821
2822 goto bailout;
2823 }
2824 }
2825 else if (selection_wait == Sel_incr)
2826 {
2827 incr_ev.start (10);
2828
2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2830 {
2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2832 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2833 }
2834
2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2836 incr_buf_fill += ct.nitems;
2837
2838 goto bailout;
2839 }
2840
2841 char **cl;
2842 int cr;
2843
2844#if !ENABLE_MINIMAL
2845 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2846 // so recode it manually
2847 if (ct.encoding == xa[XA_UTF8_STRING])
2848 {
2849 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2850 char *s = rxvt_wcstombs (w);
2851 free (w);
2852 // TODO: strlen == only the first element will be converted. well...
2853 paste (s, strlen (s));
2854 free (s);
2855 }
2856 else
2857#endif
2858 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2859 && cl)
2860 {
2861 for (int i = 0; i < cr; i++)
2862 paste (cl[i], strlen (cl[i]));
2863
2864 XFreeStringList (cl);
2865 }
2866 else
2867 paste ((char *)ct.value, ct.nitems); // paste raw
2868
2869bailout:
2870 XFree (ct.value);
2871
2872 if (selection_wait == Sel_normal)
2873 selection_wait = Sel_none;
2874}
2875
2876void
2877rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2878{
2879 selection_wait = Sel_none;
2880
2881 incr_buf_size = 0;
2882 free (incr_buf);
2883
2884 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2885}
2886
2887void
2888rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2889{
2890 if (prop == None || selection_wait != Sel_incr)
2891 return;
2892
2893 selection_paste (win, prop, true);
2894}
2895
2896/* ------------------------------------------------------------------------- */
2897/*
2898 * Request the current selection:
2899 * Order: > internal selection if available
2900 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2901 * > CUT_BUFFER0
2902 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2903 * will auto fallback to CUT_BUFFER0
2904 * EXT: button 2 release 2744 * EXT: button 2 release
2905 */ 2745 */
2906void 2746void
2907rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2747rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2908{ 2748{
2909 if (selection.text && selnum == Sel_Primary) 2749 if (!selection_req)
2910 {
2911 /* internal selection */
2912 char *str = rxvt_wcstombs (selection.text, selection.len);
2913 paste (str, strlen (str));
2914 free (str);
2915 return;
2916 } 2750 {
2917 else 2751 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2752 selection_req->run ();
2918 { 2753 }
2919 selection_request_time = tm;
2920 selection_wait = Sel_normal;
2921
2922#if X_HAVE_UTF8_STRING
2923 selection_type = Sel_UTF8String;
2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2925 return;
2926#else
2927 selection_type = Sel_CompoundText;
2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2929 return;
2930#endif
2931 }
2932
2933 selection_wait = Sel_none; /* don't loop in selection_paste () */
2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
2935}
2936
2937int
2938rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2939{
2940 Atom sel;
2941
2942 selection_type |= selnum;
2943
2944 if (selnum == Sel_Primary)
2945 sel = XA_PRIMARY;
2946 else if (selnum == Sel_Secondary)
2947 sel = XA_SECONDARY;
2948 else
2949 sel = xa[XA_CLIPBOARD];
2950
2951 if (XGetSelectionOwner (dpy, sel) != None)
2952 {
2953 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2954 vt, selection_request_time);
2955 return 1;
2956 }
2957
2958 return 0;
2959} 2754}
2960 2755
2961/* ------------------------------------------------------------------------- */ 2756/* ------------------------------------------------------------------------- */
2962/* 2757/*
2963 * Clear all selected text 2758 * Clear all selected text
… …
2994 * EXT: button 1 or 3 release 2789 * EXT: button 1 or 3 release
2995 */ 2790 */
2996void 2791void
2997rxvt_term::selection_make (Time tm) 2792rxvt_term::selection_make (Time tm)
2998{ 2793{
2999 int i; 2794 int size;
3000 wchar_t *new_selection_text; 2795 wchar_t *new_selection_text;
3001 text_t *t; 2796 text_t *t;
3002 2797
3003 switch (selection.op) 2798 switch (selection.op)
3004 { 2799 {
… …
3020 return; /* nothing selected, go away */ 2815 return; /* nothing selected, go away */
3021 2816
3022 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2817 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3023 return; 2818 return;
3024 2819
3025 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2820 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3026 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2821 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3027 2822
3028 int ofs = 0; 2823 int ofs = 0;
3029 int extra = 0; 2824 int extra = 0;
3030 2825
3031 int col = selection.beg.col; 2826 int col = selection.beg.col;
… …
3037 { 2832 {
3038#if !ENABLE_MINIMAL 2833#if !ENABLE_MINIMAL
3039 if (selection.rect) 2834 if (selection.rect)
3040 { 2835 {
3041 col = selection.beg.col; 2836 col = selection.beg.col;
3042 end_col = ncol + 1; 2837 end_col = selection.end.col;
3043 } 2838 }
3044 else 2839 else
3045#endif 2840#endif
3046 end_col = ROW(row).l; 2841 end_col = ROW(row).l;
3047 2842
3048 col = max (col, 0); 2843 col = max (col, 0);
3049 2844
3050 if (row == selection.end.row 2845 if (row == selection.end.row)
3051#if !ENABLE_MINIMAL
3052 || selection.rect
3053#endif
3054 )
3055 min_it (end_col, selection.end.col); 2846 min_it (end_col, selection.end.col);
3056 2847
3057 t = ROW(row).t + col; 2848 t = ROW(row).t + col;
3058 2849
3059 for (; col < end_col; col++) 2850 for (; col < end_col; col++)
… …
3067 2858
3068 extra -= (len - 1); 2859 extra -= (len - 1);
3069 2860
3070 if (extra < 0) 2861 if (extra < 0)
3071 { 2862 {
3072 extra += i; 2863 extra += size;
3073 i += i; 2864 size += size;
3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2865 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3075 } 2866 }
3076 2867
3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2868 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3078 } 2869 }
3079#endif 2870#endif
… …
3091 2882
3092 new_selection_text[ofs++] = C0_LF; 2883 new_selection_text[ofs++] = C0_LF;
3093 } 2884 }
3094 else 2885 else
3095#endif 2886#endif
3096 if (!ROW(row).is_longer () && row != selection.end.row) 2887 if (!ROW(row).is_longer ()
2888 && (row != selection.end.row || end_col != selection.end.col)
2889 && (row != selection.beg.row || selection.beg.col < ncol))
3097 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3098 } 2891 }
3099
3100 if (end_col != selection.end.col)
3101 new_selection_text[ofs++] = C0_LF;
3102 2892
3103 new_selection_text[ofs] = 0; 2893 new_selection_text[ofs] = 0;
3104 2894
3105 if (ofs == 0) 2895 if (ofs == 0)
3106 { 2896 {
… …
3612 * EXT: SelectionRequest 3402 * EXT: SelectionRequest
3613 */ 3403 */
3614void 3404void
3615rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3616{ 3406{
3407 Atom property = rq.property == None ? rq.target : rq.property;
3617 XSelectionEvent ev; 3408 XSelectionEvent ev;
3618 3409
3619 ev.type = SelectionNotify; 3410 ev.type = SelectionNotify;
3620 ev.property = None; 3411 ev.property = None;
3621 ev.display = rq.display; 3412 ev.display = rq.display;
… …
3636 *target++ = xa[XA_COMPOUND_TEXT]; 3427 *target++ = xa[XA_COMPOUND_TEXT];
3637#if X_HAVE_UTF8_STRING 3428#if X_HAVE_UTF8_STRING
3638 *target++ = xa[XA_UTF8_STRING]; 3429 *target++ = xa[XA_UTF8_STRING];
3639#endif 3430#endif
3640 3431
3641 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3432 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3642 32, PropModeReplace, 3433 32, PropModeReplace,
3643 (unsigned char *)target_list, target - target_list); 3434 (unsigned char *)target_list, target - target_list);
3644 ev.property = rq.property; 3435 ev.property = property;
3645 } 3436 }
3646#if TODO // TODO 3437#if TODO // TODO
3647 else if (rq.target == xa[XA_MULTIPLE]) 3438 else if (rq.target == xa[XA_MULTIPLE])
3648 { 3439 {
3649 /* TODO: Handle MULTIPLE */ 3440 /* TODO: Handle MULTIPLE */
3650 } 3441 }
3651#endif 3442#endif
3652 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3653 { 3444 {
3654 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3655 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3446 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3656 ev.property = rq.property; 3447 ev.property = property;
3657 } 3448 }
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3659 { 3450 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3452 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3662 ev.property = rq.property; 3453 ev.property = property;
3663 } 3454 }
3664 else if (rq.target == XA_STRING 3455 else if (rq.target == XA_STRING
3665 || rq.target == xa[XA_TEXT] 3456 || rq.target == xa[XA_TEXT]
3666 || rq.target == xa[XA_COMPOUND_TEXT] 3457 || rq.target == xa[XA_COMPOUND_TEXT]
3667 || rq.target == xa[XA_UTF8_STRING] 3458 || rq.target == xa[XA_UTF8_STRING]
… …
3738 ct.value = (unsigned char *)cl; 3529 ct.value = (unsigned char *)cl;
3739 ct.nitems = selectlen; 3530 ct.nitems = selectlen;
3740 ct.encoding = target; 3531 ct.encoding = target;
3741 } 3532 }
3742 3533
3743 XChangeProperty (dpy, rq.requestor, rq.property, 3534 XChangeProperty (dpy, rq.requestor, property,
3744 ct.encoding, 8, PropModeReplace, 3535 ct.encoding, 8, PropModeReplace,
3745 ct.value, (int)ct.nitems); 3536 ct.value, (int)ct.nitems);
3746 ev.property = rq.property; 3537 ev.property = property;
3747 3538
3748 if (freect) 3539 if (freect)
3749 XFree (ct.value); 3540 XFree (ct.value);
3750 } 3541 }
3751 3542

Diff Legend

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