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.141 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
… …
293 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
294 } 294 }
295 295
296 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 298
300 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
301 } 300 }
302 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
303 { 302 {
… …
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k; 334 screen.cur.row += k;
336 screen.s_cur.row += k; 335 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
338 } 337 }
338
339#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 343#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348 } 345 }
349 346
350 /* resize columns */ 347 /* resize columns */
… …
393 } 390 }
394 391
395 } 392 }
396 393
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399 395
400 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
401 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
402 } 398 }
403 399
… …
565 if (current_screen == scrn) 561 if (current_screen == scrn)
566 return scrn; 562 return scrn;
567 563
568 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
569 565
570 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
571 567
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574# ifdef DEBUG_STRICT
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0); 570 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0); 572 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583 574
584#if NSCREENS 575#if NSCREENS
585 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
586 { 577 {
587 num_scr = 0; 578 num_scr = 0;
… …
600 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
601 } 592 }
602 else 593 else
603#endif 594#endif
604 if (options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
605 //if (current_screen == PRIMARY)
606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607 597
608 return scrn; 598 return scrn;
609} 599}
610 600
611// clear WrapNext indicator, solidifying position on next line 601// clear WrapNext indicator, solidifying position on next line
… …
888 // rely on wcwidth to tell us the character width, at least for non-latin1 878 // rely on wcwidth to tell us the character width, at least for non-latin1
889 // do wcwidth before further replacements, as wcwidth says that line-drawing 879 // do wcwidth before further replacements, as wcwidth says that line-drawing
890 // characters have width -1 (DOH!) on GNU/Linux sometimes. 880 // characters have width -1 (DOH!) on GNU/Linux sometimes.
891 int width = c < 0x100 ? 1 : wcwidth (c); 881 int width = c < 0x100 ? 1 : wcwidth (c);
892 882
893 if (screen.flags & Screen_Insert)
894 scr_insdel_chars (width, INSERT);
895
896 if (charsets[screen.charset] == '0') // DEC SPECIAL 883 if (charsets[screen.charset] == '0') // DEC SPECIAL
897 { 884 {
898 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
899 // 5f-7e standard vt100 886 // 5f-7e standard vt100
900 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
901 static uint16_t vt100_0[63] = { // 5f .. 7e 888 static uint16_t vt100_0[63] = { // 40 .. 7e
902 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
903 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
904 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
905 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
906 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
914 c = vt100_0[c - 0x40]; 901 c = vt100_0[c - 0x40];
915 width = 1; 902 width = 1;
916 } 903 }
917 } 904 }
918 905
906 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT);
908
919 if (width != 0) 909 if (width != 0)
920 { 910 {
921 // some utf-8 decoders decode surrogate characters. 911 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff) 912 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd; 913 c = 0xfffd;
… …
973 c = NOCHAR; 963 c = NOCHAR;
974 } 964 }
975 while (--width > 0); 965 while (--width > 0);
976 966
977 // pad with spaces when overwriting wide character with smaller one 967 // pad with spaces when overwriting wide character with smaller one
968 if (!width)
978 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
979 { 970 {
980 stp[c] = ' '; 971 stp[c] = ' ';
981 srp[c] = rend; 972 srp[c] = rend;
982 } 973 }
983 } 974 }
984 else if (width == 0) 975 else if (width == 0)
985 { 976 {
986#if ENABLE_COMBINING 977#if ENABLE_COMBINING
987 // handle combining characters 978 // handle combining characters
… …
2398 } 2389 }
2399 else 2390 else
2400 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2391 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2401 2392
2402 if (rend & RS_Uline && font->descent > 1 && fore != back) 2393 if (rend & RS_Uline && font->descent > 1 && fore != back)
2394 {
2395#if ENABLE_FRILLS
2396 if (ISSET_PIXCOLOR (Color_underline))
2397 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2398 else
2399#endif
2400 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2401
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2402 XDrawLine (display->display, drawBuffer, TermWin.gc,
2404 xpixel, ypixel + font->ascent + 1, 2403 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2404 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2405 }
2406 } /* for (col....) */ 2406 } /* for (col....) */
2407 } /* for (row....) */ 2407 } /* for (row....) */
2408 2408
2409#if ENABLE_OVERLAY 2409#if ENABLE_OVERLAY
2410 scr_swap_overlay (); 2410 scr_swap_overlay ();
… …
2652/* ------------------------------------------------------------------------- */ 2652/* ------------------------------------------------------------------------- */
2653/* 2653/*
2654 * Paste a selection direct to the command fd 2654 * Paste a selection direct to the command fd
2655 */ 2655 */
2656void 2656void
2657rxvt_term::paste (const unsigned char *data, unsigned int len) 2657rxvt_term::paste (unsigned char *data, unsigned int len)
2658{ 2658{
2659 unsigned int i, j, n;
2660 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2661
2662 /* convert normal newline chars into common keyboard Return key sequence */ 2659 /* convert normal newline chars into common keyboard Return key sequence */
2663 for (i = 0; i < len; i += PROP_SIZE) 2660 for (unsigned int i = 0; i < len; i++)
2664 {
2665 n = min (len - i, PROP_SIZE);
2666 memcpy (ds, data + i, n);
2667
2668 for (j = 0; j < n; j++)
2669 if (ds[j] == C0_LF) 2661 if (data[i] == C0_LF)
2670 ds[j] = C0_CR; 2662 data[i] = C0_CR;
2671 2663
2672 tt_write (ds, (int)n); 2664 tt_write (data, len);
2673 }
2674
2675 free (ds);
2676} 2665}
2677 2666
2678/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2679/* 2668/*
2680 * Respond to a notification that a primary selection has been sent 2669 * Respond to a notification that a primary selection has been sent
2681 * EXT: SelectionNotify 2670 * EXT: SelectionNotify
2682 */ 2671 */
2683int 2672void
2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2673rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2685{ 2674{
2686 long nread = 0;
2687 unsigned long bytes_after;
2688 XTextProperty ct;
2689
2690 if (prop == None) /* check for failed XConvertSelection */ 2675 if (prop == None) /* check for failed XConvertSelection */
2691 { 2676 {
2692 if ((selection_type & Sel_CompoundText)) 2677 if ((selection_type & Sel_CompoundText))
2693 { 2678 {
2694 int selnum = selection_type & Sel_whereMask; 2679 int selnum = selection_type & Sel_whereMask;
… …
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else 2693 else
2709 selection_type = 0; 2694 selection_type = 0;
2710 } 2695 }
2711 2696
2712 return 0; 2697 return;
2713 }
2714
2715 for (;;)
2716 { 2698 }
2699
2700 unsigned long bytes_after;
2701 XTextProperty ct;
2702
2703 if (XGetWindowProperty (display->display, win, prop,
2704 0, PROP_SIZE / 4,
2705 delete_prop, AnyPropertyType,
2706 &ct.encoding, &ct.format,
2707 &ct.nitems, &bytes_after,
2708 &ct.value) != Success)
2709 {
2710 ct.value = 0;
2711 goto bailout;
2712 }
2713
2714 if (ct.encoding == None)
2715 goto bailout;
2716
2717 if (bytes_after)
2718 {
2719 // fetch and append remaining data
2720 XTextProperty ct2;
2721
2717 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2722 if (XGetWindowProperty (display->display, win, prop,
2718 (long) (PROP_SIZE / 4), delete_prop, 2723 ct.nitems / 4, (bytes_after + 3) / 4,
2724 delete_prop, AnyPropertyType,
2719 AnyPropertyType, &ct.encoding, &ct.format, 2725 &ct2.encoding, &ct2.format,
2720 &ct.nitems, &bytes_after, 2726 &ct2.nitems, &bytes_after,
2721 &ct.value) != Success) 2727 &ct2.value) != Success)
2722 break; 2728 goto bailout;
2723 2729
2724 if (ct.encoding == 0) 2730 // realloc should be compatible to XFree, here, and elsewhere, too
2725 break; 2731 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2732 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2733 ct.nitems += ct2.nitems;
2726 2734
2735 XFree (ct2.value);
2736 }
2737
2738 if (ct.value == 0)
2739 goto bailout;
2740
2727 if (ct.encoding == xa[XA_INCR]) 2741 if (ct.encoding == xa[XA_INCR])
2728 { 2742 {
2729 // INCR selection, start handshake 2743 // INCR selection, start handshake
2744 if (!delete_prop)
2730 XDeleteProperty (display->display, win, prop); 2745 XDeleteProperty (display->display, win, prop);
2746
2731 selection_wait = Sel_incr; 2747 selection_wait = Sel_incr;
2748 incr_buf_fill = 0;
2732 incr_ev.start (NOW + 10); 2749 incr_ev.start (NOW + 10);
2733 break;
2734 }
2735 2750
2736 if (ct.value == NULL) 2751 goto bailout;
2737 continue; 2752 }
2738 2753
2739 if (ct.nitems == 0) 2754 if (ct.nitems == 0)
2755 {
2756 if (selection_wait == Sel_incr)
2757 {
2758 XFree (ct.value);
2759
2760 // finally complete, now paste the whole thing
2761 selection_wait = Sel_normal;
2762 ct.value = (unsigned char *)incr_buf;
2763 ct.nitems = incr_buf_fill;
2764 incr_buf = 0;
2765 incr_buf_size = 0;
2766 incr_ev.stop ();
2740 { 2767 }
2768 else
2769 {
2741 if (selection_wait == Sel_normal && nread == 0 2770 if (selection_wait == Sel_normal
2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2771 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2743 { 2772 {
2744 /* 2773 /*
2745 * pass through again trying CUT_BUFFER0 if we've come from 2774 * pass through again trying CUT_BUFFER0 if we've come from
2746 * XConvertSelection () but nothing was presented 2775 * XConvertSelection () but nothing was presented
2747 */ 2776 */
2748 selection_paste (display->root, XA_CUT_BUFFER0, False); 2777 selection_paste (display->root, XA_CUT_BUFFER0, False);
2749 } 2778 }
2750 2779
2751 nread = -1; /* discount any previous stuff */ 2780 goto bailout;
2752 break; 2781 }
2782 }
2783 else if (selection_wait == Sel_incr)
2784 {
2785 incr_ev.start (NOW + 10);
2786
2787 while (incr_buf_fill + ct.nitems > incr_buf_size)
2753 } 2788 {
2789 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2790 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2791 }
2754 2792
2793 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2755 nread += ct.nitems; 2794 incr_buf_fill += ct.nitems;
2756 2795
2796 goto bailout;
2797 }
2798
2757 char **cl; 2799 char **cl;
2758 int cr; 2800 int cr;
2801
2802#if ENABLE_FRILLS
2803 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2804 // so recode it manually
2805 if (ct.encoding == xa[XA_UTF8_STRING])
2806 {
2807 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2808 char *s = rxvt_wcstombs (w);
2809 free (w);
2810 // TODO: strlen == only the first element will be converted. well...
2811 paste ((unsigned char *)s, strlen (s));
2812 free (s);
2813 }
2814 else
2815#endif
2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2816 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2760 { 2817 && cl)
2818 {
2761 for (int i = 0; i < cr; i++) 2819 for (int i = 0; i < cr; i++)
2762 paste ((unsigned char *)cl[i], strlen (cl[i])); 2820 paste ((unsigned char *)cl[i], strlen (cl[i]));
2763 2821
2764 XFreeStringList (cl); 2822 XFreeStringList (cl);
2765 } 2823 }
2766 else 2824 else
2767 paste (ct.value, ct.nitems); 2825 paste (ct.value, ct.nitems); // paste raw
2768 2826
2769 if (bytes_after == 0) 2827bailout:
2770 break;
2771
2772 XFree (ct.value);
2773 }
2774
2775 if (ct.value)
2776 XFree (ct.value); 2828 XFree (ct.value);
2777 2829
2778 if (selection_wait == Sel_normal) 2830 if (selection_wait == Sel_normal)
2779 selection_wait = Sel_none; 2831 selection_wait = Sel_none;
2780
2781 return (int)nread;
2782} 2832}
2783 2833
2784void 2834void
2785rxvt_term::incr_cb (time_watcher &w) 2835rxvt_term::incr_cb (time_watcher &w)
2786{ 2836{
2787 selection_wait = Sel_none; 2837 selection_wait = Sel_none;
2788 2838
2839 incr_buf_size = 0;
2840 free (incr_buf);
2841
2789 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2842 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2790} 2843}
2791 2844
2792/*
2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2794 */
2795void 2845void
2796rxvt_term::selection_property (Window win, Atom prop) 2846rxvt_term::selection_property (Window win, Atom prop)
2797{ 2847{
2798 if (prop == None || selection_wait != Sel_incr) 2848 if (prop == None || selection_wait != Sel_incr)
2799 return; 2849 return;
2800 2850
2801 if (selection_paste (win, prop, 1) > 0) 2851 selection_paste (win, prop, true);
2802 incr_ev.start (NOW + 10);
2803 else
2804 {
2805 selection_wait = Sel_none;
2806 incr_ev.stop ();
2807 }
2808} 2852}
2809 2853
2810/* ------------------------------------------------------------------------- */ 2854/* ------------------------------------------------------------------------- */
2811/* 2855/*
2812 * Request the current selection: 2856 * Request the current selection:
… …
2846#else 2890#else
2847 selection_type = Sel_CompoundText; 2891 selection_type = Sel_CompoundText;
2848 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849 return; 2893 return;
2850#endif 2894#endif
2851
2852 } 2895 }
2853 } 2896 }
2854 2897
2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2898 selection_wait = Sel_none; /* don't loop in selection_paste () */
2856 selection_paste (display->root, XA_CUT_BUFFER0, False); 2899 selection_paste (display->root, XA_CUT_BUFFER0, false);
2857} 2900}
2858 2901
2859int 2902int
2860rxvt_term::selection_request_other (Atom target, int selnum) 2903rxvt_term::selection_request_other (Atom target, int selnum)
2861{ 2904{
… …
3017#if 0 3060#if 0
3018 XTextProperty ct; 3061 XTextProperty ct;
3019 3062
3020 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3063 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021 { 3064 {
3022 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3065 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023 PropModeReplace, ct.value, ct.nitems);
3024 XFree (ct.value); 3066 XFree (ct.value);
3025 } 3067 }
3026#endif 3068#endif
3027 3069
3028 selection_time = tm; 3070 selection_time = tm;
… …
3366 selection_delimit_word (DN, &selection.end, &selection.end); 3408 selection_delimit_word (DN, &selection.end, &selection.end);
3367 } 3409 }
3368 else if (selection.clicks == 3) 3410 else if (selection.clicks == 3)
3369 { 3411 {
3370#if ENABLE_FRILLS 3412#if ENABLE_FRILLS
3371 if ((options & Opt_tripleclickwords)) 3413 if (options & Opt_tripleclickwords)
3372 { 3414 {
3373 int end_row; 3415 int end_row;
3374 3416
3375 selection_delimit_word (UP, &selection.beg, &selection.beg); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3376 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3418 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3394 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3436 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3395 selection.mark.col++; 3437 selection.mark.col++;
3396 3438
3397 selection.beg.col = 0; 3439 selection.beg.col = 0;
3398 selection.end.col = ncol; 3440 selection.end.col = ncol;
3441
3442 // select a complete logical line
3443 while (selection.beg.row > -TermWin.saveLines
3444 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3445 selection.beg.row--;
3446
3447 while (selection.end.row < TermWin.nrow
3448 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3449 selection.end.row++;
3399 } 3450 }
3400 } 3451 }
3401 3452
3402 if (button3 && buttonpress) 3453 if (button3 && buttonpress)
3403 { /* mark may need to be changed */ 3454 { /* mark may need to be changed */
… …
3483 */ 3534 */
3484void 3535void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3536rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486{ 3537{
3487 XSelectionEvent ev; 3538 XSelectionEvent ev;
3488 XTextProperty ct; 3539 dDisp;
3489 XICCEncodingStyle style;
3490 Atom target;
3491 3540
3492 ev.type = SelectionNotify; 3541 ev.type = SelectionNotify;
3493 ev.property = None; 3542 ev.property = None;
3494 ev.display = rq.display; 3543 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3544 ev.requestor = rq.requestor;
… …
3509 *target++ = xa[XA_COMPOUND_TEXT]; 3558 *target++ = xa[XA_COMPOUND_TEXT];
3510#if X_HAVE_UTF8_STRING 3559#if X_HAVE_UTF8_STRING
3511 *target++ = xa[XA_UTF8_STRING]; 3560 *target++ = xa[XA_UTF8_STRING];
3512#endif 3561#endif
3513 3562
3514 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3563 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3515 32, PropModeReplace, 3564 32, PropModeReplace,
3516 (unsigned char *)target_list, target - target_list); 3565 (unsigned char *)target_list, target - target_list);
3517 ev.property = rq.property; 3566 ev.property = rq.property;
3518 } 3567 }
3519#if TODO // TODO 3568#if TODO // TODO
… …
3522 /* TODO: Handle MULTIPLE */ 3571 /* TODO: Handle MULTIPLE */
3523 } 3572 }
3524#endif 3573#endif
3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526 { 3575 {
3527 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3576 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3528 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3577 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529 ev.property = rq.property; 3578 ev.property = rq.property;
3530 } 3579 }
3531 else if (rq.target == XA_STRING 3580 else if (rq.target == XA_STRING
3532 || rq.target == xa[XA_TEXT] 3581 || rq.target == xa[XA_TEXT]
3533 || rq.target == xa[XA_COMPOUND_TEXT] 3582 || rq.target == xa[XA_COMPOUND_TEXT]
3534 || rq.target == xa[XA_UTF8_STRING] 3583 || rq.target == xa[XA_UTF8_STRING]
3535 ) 3584 )
3536 { 3585 {
3586 XTextProperty ct;
3587 Atom target = rq.target;
3537 short freect = 0; 3588 short freect = 0;
3538 int selectlen; 3589 int selectlen;
3539 wchar_t *cl; 3590 wchar_t *cl;
3540 3591 enum {
3541 target = rq.target; 3592 enc_string = XStringStyle,
3593 enc_text = XStdICCTextStyle,
3594 enc_compound_text = XCompoundTextStyle,
3595#ifdef X_HAVE_UTF8_STRING
3596 enc_utf8 = XUTF8StringStyle,
3597#else
3598 enc_utf8 = -1,
3599#endif
3600 } style;
3542 3601
3543 if (target == XA_STRING) 3602 if (target == XA_STRING)
3544 // we actually don't do XA_STRING, but who cares, as i18n clients 3603 // we actually don't do XA_STRING, but who cares, as i18n clients
3545 // will ask for another format anyways. 3604 // will ask for another format anyways.
3546 style = XStringStyle; 3605 style = enc_string;
3547 else if (target == xa[XA_TEXT]) 3606 else if (target == xa[XA_TEXT])
3548 style = XStdICCTextStyle; 3607 style = enc_text;
3549 else if (target == xa[XA_COMPOUND_TEXT]) 3608 else if (target == xa[XA_COMPOUND_TEXT])
3550 style = XCompoundTextStyle; 3609 style = enc_compound_text;
3551#if X_HAVE_UTF8_STRING 3610#if ENABLE_FRILLS
3552 else if (target == xa[XA_UTF8_STRING]) 3611 else if (target == xa[XA_UTF8_STRING])
3553 style = XUTF8StringStyle; 3612 style = enc_utf8;
3554#endif 3613#endif
3555 else 3614 else
3556 { 3615 {
3557 target = xa[XA_COMPOUND_TEXT]; 3616 target = xa[XA_COMPOUND_TEXT];
3558 style = XCompoundTextStyle; 3617 style = enc_compound_text;
3559 } 3618 }
3560 3619
3561 if (selection.text) 3620 if (selection.text)
3562 { 3621 {
3563 cl = selection.text; 3622 cl = selection.text;
… …
3567 { 3626 {
3568 cl = L""; 3627 cl = L"";
3569 selectlen = 0; 3628 selectlen = 0;
3570 } 3629 }
3571 3630
3572 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3631#if ENABLE_FRILLS
3573 // manually for XUTF8StringStyle. 3632 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3633 // so recode it manually
3634 if (style == enc_utf8)
3635 {
3636 freect = 1;
3637 ct.encoding = target;
3638 ct.format = 8;
3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640 ct.nitems = strlen ((char *)ct.value);
3641 }
3642 else
3643#endif
3574 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3644 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575 freect = 1; 3645 freect = 1;
3576 else 3646 else
3577 { 3647 {
3578 /* if we failed to convert then send it raw */ 3648 /* if we failed to convert then send it raw */
3579 ct.value = (unsigned char *)cl; 3649 ct.value = (unsigned char *)cl;
3580 ct.nitems = selectlen; 3650 ct.nitems = selectlen;
3651 ct.encoding = target;
3581 } 3652 }
3582 3653
3583 XChangeProperty (display->display, rq.requestor, rq.property, 3654 XChangeProperty (disp, rq.requestor, rq.property,
3584 target, 8, PropModeReplace, 3655 ct.encoding, 8, PropModeReplace,
3585 ct.value, (int)ct.nitems); 3656 ct.value, (int)ct.nitems);
3586 ev.property = rq.property; 3657 ev.property = rq.property;
3587 3658
3588 if (freect) 3659 if (freect)
3589 XFree (ct.value); 3660 XFree (ct.value);
3590 } 3661 }
3591 3662
3592 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3663 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3593} 3664}
3594 3665
3595/* ------------------------------------------------------------------------- * 3666/* ------------------------------------------------------------------------- *
3596 * MOUSE ROUTINES * 3667 * MOUSE ROUTINES *
3597 * ------------------------------------------------------------------------- */ 3668 * ------------------------------------------------------------------------- */

Diff Legend

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