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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.148 by root, Mon Dec 13 01:29:03 2004 UTC

… …
39 while (len--) 39 while (len--)
40 *start++ = value; 40 *start++ = value;
41} 41}
42 42
43/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
… …
566 return scrn; 567 return scrn;
567 568
568 selection_check (2); /* check for boundary cross */ 569 selection_check (2); /* check for boundary cross */
569 570
570 SWAP_IT (current_screen, scrn, int); 571 SWAP_IT (current_screen, scrn, int);
572
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584
571#if NSCREENS 585#if NSCREENS
572 if (options & Opt_secondaryScreen) 586 if (options & Opt_secondaryScreen)
573 { 587 {
574 num_scr = 0; 588 num_scr = 0;
575 offset = TermWin.saveLines; 589 offset = TermWin.saveLines;
590
576 for (i = prev_nrow; i--;) 591 for (i = prev_nrow; i--;)
577 { 592 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 593 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 594 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 595 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 596 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 597
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
597 } 602 }
598 else 603 else
599#endif 604#endif
600 if (options & Opt_secondaryScroll) 605 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
603 return scrn; 608 return scrn;
604} 609}
605 610
606// clear WrapNext indicator, solidifying position on next line 611// clear WrapNext indicator, solidifying position on next line
607void 612void
… …
878 883
879 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
880 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
881 } 886 }
882 887
883 if (screen.flags & Screen_Insert)
884 scr_insdel_chars (1, INSERT);
885
886 // rely on wcwidth to tell us the character width, at least for non-latin1 888 // rely on wcwidth to tell us the character width, at least for non-latin1
887 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
888 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
889 int width = c < 0x100 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
890 892
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 { 894 {
893 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 896 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[63] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
909 c = vt100_0[c - 0x40]; 911 c = vt100_0[c - 0x40];
910 width = 1; 912 width = 1;
911 } 913 }
912 } 914 }
913 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
914 if (width != 0) 919 if (width != 0)
915 { 920 {
916 // some utf-8 decoders decode surrogate characters. 921 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff) 922 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd; 923 c = 0xfffd;
… …
968 c = NOCHAR; 973 c = NOCHAR;
969 } 974 }
970 while (--width > 0); 975 while (--width > 0);
971 976
972 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
973 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
974 { 980 {
975 stp[c] = ' '; 981 stp[c] = ' ';
976 srp[c] = rend; 982 srp[c] = rend;
977 } 983 }
978 } 984 }
979 else if (width == 0) 985 else if (width == 0)
980 { 986 {
981#if ENABLE_COMBINING 987#if ENABLE_COMBINING
982 // handle combining characters 988 // handle combining characters
… …
1095 if (count) 1101 if (count)
1096 x = TermWin.ncol - 1; 1102 x = TermWin.ncol - 1;
1097 1103
1098 // store horizontal tab commands as characters inside the text 1104 // store horizontal tab commands as characters inside the text
1099 // buffer so they can be selected and pasted. 1105 // buffer so they can be selected and pasted.
1100 if (ht) 1106 if (ht && options & Opt_pastableTabs)
1101 { 1107 {
1102 base_rend = SET_FONT (base_rend, 0); 1108 base_rend = SET_FONT (base_rend, 0);
1103 1109
1104 if (screen.tlen[row] != -1) /* XXX: think about this */ 1110 if (screen.tlen[row] != -1) /* XXX: think about this */
1105 MAX_IT (screen.tlen[row], x); 1111 MAX_IT (screen.tlen[row], x);
… …
1378 ren = DEFAULT_RSTYLE; 1384 ren = DEFAULT_RSTYLE;
1379 CLEAR_ROWS (row, num); 1385 CLEAR_ROWS (row, num);
1380 } 1386 }
1381 else 1387 else
1382 { 1388 {
1383 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1384 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1386 ERASE_ROWS (row, num); 1392 ERASE_ROWS (row, num);
1387 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1388 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1389 } 1395 }
1390 1396
1391 for (; num--; row++) 1397 for (; num--; row++)
1392 { 1398 {
1393 scr_blank_screen_mem (screen.text, screen.rend, 1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1394 (unsigned int) (row + row_offset), rstyle);
1395 screen.tlen[row + row_offset] = 0; 1400 screen.tlen[row + row_offset] = 0;
1396 scr_blank_line (drawn_text[row], drawn_rend[row], 1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1397 (unsigned int)TermWin.ncol, ren);
1398 } 1402 }
1399} 1403}
1400 1404
1401/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1402/* 1406/*
… …
2241 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2242 continue; 2246 continue;
2243 2247
2244 // redraw one or more characters 2248 // redraw one or more characters
2245 2249
2246 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2247 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2248 --col; 2252 --col;
2249 2253
2250 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2251 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2395 } 2399 }
2396 else 2400 else
2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2398 2402
2399 if (rend & RS_Uline && font->descent > 1 && fore != back) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2400 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2401 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2403 } /* for (col....) */ 2410 } /* for (col....) */
2404 } /* for (row....) */ 2411 } /* for (row....) */
2405 2412
2406#if ENABLE_OVERLAY 2413#if ENABLE_OVERLAY
2407 scr_swap_overlay (); 2414 scr_swap_overlay ();
… …
2652 */ 2659 */
2653void 2660void
2654rxvt_term::paste (const unsigned char *data, unsigned int len) 2661rxvt_term::paste (const unsigned char *data, unsigned int len)
2655{ 2662{
2656 unsigned int i, j, n; 2663 unsigned int i, j, n;
2657 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2658 2665
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2666 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (i = 0; i < len; i += PROP_SIZE) 2667 for (i = 0; i < len; i += PASTE_SIZE)
2661 { 2668 {
2662 n = min (len - i, PROP_SIZE); 2669 n = min (len - i, PASTE_SIZE);
2663 memcpy (ds, data + i, n); 2670 memcpy (ds, data + i, n);
2664 2671
2665 for (j = 0; j < n; j++) 2672 for (j = 0; j < n; j++)
2666 if (ds[j] == C0_LF) 2673 if (ds[j] == C0_LF)
2667 ds[j] = C0_CR; 2674 ds[j] = C0_CR;
… …
2675/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2676/* 2683/*
2677 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
2678 * EXT: SelectionNotify 2685 * EXT: SelectionNotify
2679 */ 2686 */
2680int 2687void
2681rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2682{ 2689{
2683 long nread = 0;
2684 unsigned long bytes_after;
2685 XTextProperty ct;
2686
2687 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2688 { 2691 {
2689 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2690 { 2693 {
2691 int selnum = selection_type & Sel_whereMask; 2694 int selnum = selection_type & Sel_whereMask;
… …
2704 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2705 else 2708 else
2706 selection_type = 0; 2709 selection_type = 0;
2707 } 2710 }
2708 2711
2709 return 0; 2712 return;
2710 }
2711
2712 for (;;)
2713 { 2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (display->display, win, prop,
2719 0, (long)(PROP_SIZE / 4),
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736 unsigned long bytes_after2;
2737
2714 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2738 if (XGetWindowProperty (display->display, win, prop,
2715 (long) (PROP_SIZE / 4), delete_prop, 2739 ct.nitems / 4, (long) (bytes_after + 3) / 4,
2740 delete_prop, AnyPropertyType,
2716 AnyPropertyType, &ct.encoding, &ct.format, 2741 &ct2.encoding, &ct2.format,
2717 &ct.nitems, &bytes_after, 2742 &ct2.nitems, &bytes_after2,
2718 &ct.value) != Success) 2743 &ct2.value) != Success)
2719 break; 2744 goto bailout;
2720 2745
2721 if (ct.encoding == 0) 2746 // realloc should be compatible to XFree, here, and elsewhere, too
2722 break; 2747 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + bytes_after);
2748 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems);
2749 ct.nitems += ct2.nitems;
2723 2750
2751 XFree (ct2.value);
2752 }
2753 else if (delete_prop)
2754 XDeleteProperty (display->display, win, prop);
2755
2756 if (ct.value == 0)
2757 goto bailout;
2758
2724 if (ct.encoding == xa[XA_INCR]) 2759 if (ct.encoding == xa[XA_INCR])
2725 { 2760 {
2726 // INCR selection, start handshake 2761 // INCR selection, start handshake
2762 if (!delete_prop)
2727 XDeleteProperty (display->display, win, prop); 2763 XDeleteProperty (display->display, win, prop);
2764
2728 selection_wait = Sel_incr; 2765 selection_wait = Sel_incr;
2766 incr_buf_fill = 0;
2729 incr_ev.start (NOW + 10); 2767 incr_ev.start (NOW + 10);
2730 break;
2731 }
2732 2768
2733 if (ct.value == NULL) 2769 goto bailout;
2734 continue; 2770 }
2735 2771
2736 if (ct.nitems == 0) 2772 if (ct.nitems == 0)
2773 {
2774 if (selection_wait == Sel_incr)
2775 {
2776 XFree (ct.value);
2777
2778 // finally complete, now paste the whole thing
2779 selection_wait = Sel_normal;
2780 ct.value = (unsigned char *)incr_buf;
2781 ct.nitems = incr_buf_fill;
2782 incr_buf = 0;
2783 incr_buf_size = 0;
2784 incr_ev.stop ();
2737 { 2785 }
2786 else
2787 {
2738 if (selection_wait == Sel_normal && nread == 0 2788 if (selection_wait == Sel_normal
2739 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2740 { 2790 {
2741 /* 2791 /*
2742 * pass through again trying CUT_BUFFER0 if we've come from 2792 * pass through again trying CUT_BUFFER0 if we've come from
2743 * XConvertSelection () but nothing was presented 2793 * XConvertSelection () but nothing was presented
2744 */ 2794 */
2745 selection_paste (display->root, XA_CUT_BUFFER0, False); 2795 selection_paste (display->root, XA_CUT_BUFFER0, False);
2746 } 2796 }
2747 2797
2748 nread = -1; /* discount any previous stuff */ 2798 goto bailout;
2749 break; 2799 }
2800 }
2801 else if (selection_wait == Sel_incr)
2802 {
2803 incr_ev.start (NOW + 10);
2804
2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2750 } 2806 {
2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2809 }
2751 2810
2811 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2752 nread += ct.nitems; 2812 incr_buf_fill += ct.nitems;
2753 2813
2814 goto bailout;
2815 }
2816
2754 char **cl; 2817 char **cl;
2755 int cr; 2818 int cr;
2819
2820#if ENABLE_FRILLS
2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2822 // so recode it manually
2823 if (ct.encoding == xa[XA_UTF8_STRING])
2824 {
2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2826 char *s = rxvt_wcstombs (w);
2827 free (w);
2828 // TODO: strlen == only the first element will be converted. well...
2829 paste ((unsigned char *)s, strlen (s));
2830 free (s);
2831 }
2832 else
2833#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2834 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2757 { 2835 && cl)
2836 {
2758 for (int i = 0; i < cr; i++) 2837 for (int i = 0; i < cr; i++)
2759 paste ((unsigned char *)cl[i], strlen (cl[i])); 2838 paste ((unsigned char *)cl[i], strlen (cl[i]));
2760 2839
2761 XFreeStringList (cl); 2840 XFreeStringList (cl);
2762 } 2841 }
2763 else 2842 else
2764 paste (ct.value, ct.nitems); 2843 paste (ct.value, ct.nitems); // paste raw
2765 2844
2766 if (bytes_after == 0) 2845bailout:
2767 break;
2768
2769 XFree (ct.value);
2770 }
2771
2772 if (ct.value)
2773 XFree (ct.value); 2846 XFree (ct.value);
2774 2847
2775 if (selection_wait == Sel_normal) 2848 if (selection_wait == Sel_normal)
2776 selection_wait = Sel_none; 2849 selection_wait = Sel_none;
2777
2778 return (int)nread;
2779} 2850}
2780 2851
2781void 2852void
2782rxvt_term::incr_cb (time_watcher &w) 2853rxvt_term::incr_cb (time_watcher &w)
2783{ 2854{
2784 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2785 2856
2857 incr_buf_size = 0;
2858 free (incr_buf);
2859
2786 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2860 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2787} 2861}
2788 2862
2789/*
2790 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2791 */
2792void 2863void
2793rxvt_term::selection_property (Window win, Atom prop) 2864rxvt_term::selection_property (Window win, Atom prop)
2794{ 2865{
2795 if (prop == None || selection_wait != Sel_incr) 2866 if (prop == None || selection_wait != Sel_incr)
2796 return; 2867 return;
2797 2868
2798 if (selection_paste (win, prop, 1) > 0) 2869 selection_paste (win, prop, true);
2799 incr_ev.start (NOW + 10);
2800 else
2801 {
2802 selection_wait = Sel_none;
2803 incr_ev.stop ();
2804 }
2805} 2870}
2806 2871
2807/* ------------------------------------------------------------------------- */ 2872/* ------------------------------------------------------------------------- */
2808/* 2873/*
2809 * Request the current selection: 2874 * Request the current selection:
… …
2843#else 2908#else
2844 selection_type = Sel_CompoundText; 2909 selection_type = Sel_CompoundText;
2845 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2846 return; 2911 return;
2847#endif 2912#endif
2848
2849 } 2913 }
2850 } 2914 }
2851 2915
2852 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2916 selection_wait = Sel_none; /* don't loop in selection_paste () */
2853 selection_paste (display->root, XA_CUT_BUFFER0, False); 2917 selection_paste (display->root, XA_CUT_BUFFER0, false);
2854} 2918}
2855 2919
2856int 2920int
2857rxvt_term::selection_request_other (Atom target, int selnum) 2921rxvt_term::selection_request_other (Atom target, int selnum)
2858{ 2922{
… …
3014#if 0 3078#if 0
3015 XTextProperty ct; 3079 XTextProperty ct;
3016 3080
3017 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3018 { 3082 {
3019 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3020 PropModeReplace, ct.value, ct.nitems);
3021 XFree (ct.value); 3084 XFree (ct.value);
3022 } 3085 }
3023#endif 3086#endif
3024 3087
3025 selection_time = tm; 3088 selection_time = tm;
… …
3367#if ENABLE_FRILLS 3430#if ENABLE_FRILLS
3368 if ((options & Opt_tripleclickwords)) 3431 if ((options & Opt_tripleclickwords))
3369 { 3432 {
3370 int end_row; 3433 int end_row;
3371 3434
3372 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3435 selection_delimit_word (UP, &selection.beg, &selection.beg);
3373 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3436 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3374 3437
3375 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3438 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3376 { 3439 {
3377 end_col = screen.tlen[end_row + TermWin.saveLines]; 3440 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3473 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3536 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3474} 3537}
3475 3538
3476/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3477/* 3540/*
3478 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3479 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3480 * the X11 protocol.
3481 */
3482typedef CARD32 Atom32;
3483
3484/* ------------------------------------------------------------------------- */
3485/*
3486 * Respond to a request for our current selection 3541 * Respond to a request for our current selection
3487 * EXT: SelectionRequest 3542 * EXT: SelectionRequest
3488 */ 3543 */
3489void 3544void
3490rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3545rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3491{ 3546{
3492 XSelectionEvent ev; 3547 XSelectionEvent ev;
3493 XTextProperty ct;
3494 XICCEncodingStyle style;
3495 Atom target;
3496 3548
3497 ev.type = SelectionNotify; 3549 ev.type = SelectionNotify;
3498 ev.property = None; 3550 ev.property = None;
3499 ev.display = rq.display; 3551 ev.display = rq.display;
3500 ev.requestor = rq.requestor; 3552 ev.requestor = rq.requestor;
… …
3502 ev.target = rq.target; 3554 ev.target = rq.target;
3503 ev.time = rq.time; 3555 ev.time = rq.time;
3504 3556
3505 if (rq.target == xa[XA_TARGETS]) 3557 if (rq.target == xa[XA_TARGETS])
3506 { 3558 {
3507 Atom32 target_list[6]; 3559 Atom target_list[6];
3508 Atom32 *target = target_list; 3560 Atom *target = target_list;
3509 3561
3510 *target++ = (Atom32) xa[XA_TARGETS]; 3562 *target++ = xa[XA_TARGETS];
3511 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3563 *target++ = xa[XA_TIMESTAMP];
3512 *target++ = (Atom32) XA_STRING; 3564 *target++ = XA_STRING;
3513 *target++ = (Atom32) xa[XA_TEXT]; 3565 *target++ = xa[XA_TEXT];
3514 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3566 *target++ = xa[XA_COMPOUND_TEXT];
3515#if X_HAVE_UTF8_STRING 3567#if X_HAVE_UTF8_STRING
3516 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3568 *target++ = xa[XA_UTF8_STRING];
3517#endif 3569#endif
3518 3570
3519 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3571 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3520 (8 * sizeof (target_list[0])), PropModeReplace, 3572 32, PropModeReplace,
3521 (unsigned char *)target_list, 3573 (unsigned char *)target_list, target - target_list);
3522 target - target_list);
3523 ev.property = rq.property; 3574 ev.property = rq.property;
3524 } 3575 }
3525#if TODO // TODO 3576#if TODO // TODO
3526 else if (rq.target == xa[XA_MULTIPLE]) 3577 else if (rq.target == xa[XA_MULTIPLE])
3527 { 3578 {
3528 /* TODO: Handle MULTIPLE */ 3579 /* TODO: Handle MULTIPLE */
3529 } 3580 }
3530#endif 3581#endif
3531 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3582 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3532 { 3583 {
3533 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3584 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3534 (8 * sizeof (Time)), PropModeReplace,
3535 (unsigned char *)&selection_time, 1); 3585 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3536 ev.property = rq.property; 3586 ev.property = rq.property;
3537 } 3587 }
3538 else if (rq.target == XA_STRING 3588 else if (rq.target == XA_STRING
3539 || rq.target == xa[XA_TEXT] 3589 || rq.target == xa[XA_TEXT]
3540 || rq.target == xa[XA_COMPOUND_TEXT] 3590 || rq.target == xa[XA_COMPOUND_TEXT]
3541 || rq.target == xa[XA_UTF8_STRING] 3591 || rq.target == xa[XA_UTF8_STRING]
3542 ) 3592 )
3543 { 3593 {
3594 XTextProperty ct;
3595 Atom target = rq.target;
3544 short freect = 0; 3596 short freect = 0;
3545 int selectlen; 3597 int selectlen;
3546 wchar_t *cl; 3598 wchar_t *cl;
3547 3599 enum {
3548 target = rq.target; 3600 enc_string = XStringStyle,
3601 enc_text = XStdICCTextStyle,
3602 enc_compound_text = XCompoundTextStyle,
3603#ifdef X_HAVE_UTF8_STRING
3604 enc_utf8 = XUTF8StringStyle,
3605#else
3606 enc_utf8 = -1,
3607#endif
3608 } style;
3549 3609
3550 if (target == XA_STRING) 3610 if (target == XA_STRING)
3551 // we actually don't do XA_STRING, but who cares, as i18n clients 3611 // we actually don't do XA_STRING, but who cares, as i18n clients
3552 // will ask for another format anyways. 3612 // will ask for another format anyways.
3553 style = XStringStyle; 3613 style = enc_string;
3554 else if (target == xa[XA_TEXT]) 3614 else if (target == xa[XA_TEXT])
3555 style = XStdICCTextStyle; 3615 style = enc_text;
3556 else if (target == xa[XA_COMPOUND_TEXT]) 3616 else if (target == xa[XA_COMPOUND_TEXT])
3557 style = XCompoundTextStyle; 3617 style = enc_compound_text;
3558#if X_HAVE_UTF8_STRING 3618#if ENABLE_FRILLS
3559 else if (target == xa[XA_UTF8_STRING]) 3619 else if (target == xa[XA_UTF8_STRING])
3560 style = XUTF8StringStyle; 3620 style = enc_utf8;
3561#endif 3621#endif
3562 else 3622 else
3563 { 3623 {
3564 target = xa[XA_COMPOUND_TEXT]; 3624 target = xa[XA_COMPOUND_TEXT];
3565 style = XCompoundTextStyle; 3625 style = enc_compound_text;
3566 } 3626 }
3567 3627
3568 if (selection.text) 3628 if (selection.text)
3569 { 3629 {
3570 cl = selection.text; 3630 cl = selection.text;
… …
3574 { 3634 {
3575 cl = L""; 3635 cl = L"";
3576 selectlen = 0; 3636 selectlen = 0;
3577 } 3637 }
3578 3638
3579 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3639#if ENABLE_FRILLS
3580 // manually for XUTF8StringStyle. 3640 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3641 // so recode it manually
3642 if (style == enc_utf8)
3643 {
3644 freect = 1;
3645 ct.encoding = target;
3646 ct.format = 8;
3647 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3648 ct.nitems = strlen ((char *)ct.value);
3649 }
3650 else
3651#endif
3581 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3652 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3582 freect = 1; 3653 freect = 1;
3583 else 3654 else
3584 { 3655 {
3585 /* if we failed to convert then send it raw */ 3656 /* if we failed to convert then send it raw */
3586 ct.value = (unsigned char *)cl; 3657 ct.value = (unsigned char *)cl;
3587 ct.nitems = selectlen; 3658 ct.nitems = selectlen;
3659 ct.encoding = target;
3588 } 3660 }
3589 3661
3590 XChangeProperty (display->display, rq.requestor, rq.property, 3662 XChangeProperty (display->display, rq.requestor, rq.property,
3591 target, 8, PropModeReplace, 3663 ct.encoding, 8, PropModeReplace,
3592 ct.value, (int)ct.nitems); 3664 ct.value, (int)ct.nitems);
3593 ev.property = rq.property; 3665 ev.property = rq.property;
3594 3666
3595 if (freect) 3667 if (freect)
3596 XFree (ct.value); 3668 XFree (ct.value);

Diff Legend

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