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.143 by root, Sat Dec 4 04:06:03 2004 UTC vs.
Revision 1.158 by root, Sat Feb 19 19:37:34 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
… …
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
… …
1901rxvt_term::scr_page (enum page_dirn direction, int nlines) 1892rxvt_term::scr_page (enum page_dirn direction, int nlines)
1902{ 1893{
1903 int n; 1894 int n;
1904 unsigned int oldviewstart; 1895 unsigned int oldviewstart;
1905 1896
1906#ifdef DEBUG_STRICT
1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1908#endif
1909 oldviewstart = TermWin.view_start; 1897 oldviewstart = TermWin.view_start;
1898
1910 if (direction == UP) 1899 if (direction == UP)
1911 { 1900 {
1912 n = TermWin.view_start + nlines; 1901 n = TermWin.view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled); 1902 TermWin.view_start = min (n, TermWin.nscrolled);
1914 } 1903 }
1915 else 1904 else
1916 { 1905 {
1917 n = TermWin.view_start - nlines; 1906 n = TermWin.view_start - nlines;
1918 TermWin.view_start = max (n, 0); 1907 TermWin.view_start = max (n, 0);
1919 } 1908 }
1909
1920 return scr_changeview (oldviewstart); 1910 return scr_changeview (oldviewstart);
1921} 1911}
1922 1912
1923int 1913int
1924rxvt_term::scr_changeview (unsigned int oldviewstart) 1914rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
2398 } 2388 }
2399 else 2389 else
2400 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2390 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2401 2391
2402 if (rend & RS_Uline && font->descent > 1 && fore != back) 2392 if (rend & RS_Uline && font->descent > 1 && fore != back)
2393 {
2394#if ENABLE_FRILLS
2395 if (ISSET_PIXCOLOR (Color_underline))
2396 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2397 else
2398#endif
2399 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2400
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2401 XDrawLine (display->display, drawBuffer, TermWin.gc,
2404 xpixel, ypixel + font->ascent + 1, 2402 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2404 }
2406 } /* for (col....) */ 2405 } /* for (col....) */
2407 } /* for (row....) */ 2406 } /* for (row....) */
2408 2407
2409#if ENABLE_OVERLAY 2408#if ENABLE_OVERLAY
2410 scr_swap_overlay (); 2409 scr_swap_overlay ();
… …
2652/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2653/* 2652/*
2654 * Paste a selection direct to the command fd 2653 * Paste a selection direct to the command fd
2655 */ 2654 */
2656void 2655void
2657rxvt_term::paste (const unsigned char *data, unsigned int len) 2656rxvt_term::paste (unsigned char *data, unsigned int len)
2658{ 2657{
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 */ 2658 /* convert normal newline chars into common keyboard Return key sequence */
2663 for (i = 0; i < len; i += PROP_SIZE) 2659 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) 2660 if (data[i] == C0_LF)
2670 ds[j] = C0_CR; 2661 data[i] = C0_CR;
2671 2662
2672 tt_write (ds, (int)n); 2663 tt_write (data, len);
2673 }
2674
2675 free (ds);
2676} 2664}
2677 2665
2678/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2679/* 2667/*
2680 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
2681 * EXT: SelectionNotify 2669 * EXT: SelectionNotify
2682 */ 2670 */
2683int 2671void
2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2685{ 2673{
2686 long nread = 0;
2687 unsigned long bytes_after;
2688 XTextProperty ct;
2689
2690 if (prop == None) /* check for failed XConvertSelection */ 2674 if (prop == None) /* check for failed XConvertSelection */
2691 { 2675 {
2692 if ((selection_type & Sel_CompoundText)) 2676 if ((selection_type & Sel_CompoundText))
2693 { 2677 {
2694 int selnum = selection_type & Sel_whereMask; 2678 int selnum = selection_type & Sel_whereMask;
… …
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else 2692 else
2709 selection_type = 0; 2693 selection_type = 0;
2710 } 2694 }
2711 2695
2712 return 0; 2696 return;
2713 }
2714
2715 for (;;)
2716 { 2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (display->display, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2717 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2721 if (XGetWindowProperty (display->display, win, prop,
2718 (long) (PROP_SIZE / 4), delete_prop, 2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2719 AnyPropertyType, &ct.encoding, &ct.format, 2724 &ct2.encoding, &ct2.format,
2720 &ct.nitems, &bytes_after, 2725 &ct2.nitems, &bytes_after,
2721 &ct.value) != Success) 2726 &ct2.value) != Success)
2722 break; 2727 goto bailout;
2723 2728
2724 if (ct.encoding == 0) 2729 // realloc should be compatible to XFree, here, and elsewhere, too
2725 break; 2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems;
2726 2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2727 if (ct.encoding == xa[XA_INCR]) 2740 if (ct.encoding == xa[XA_INCR])
2728 { 2741 {
2729 // INCR selection, start handshake 2742 // INCR selection, start handshake
2743 if (!delete_prop)
2730 XDeleteProperty (display->display, win, prop); 2744 XDeleteProperty (display->display, win, prop);
2745
2731 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2732 incr_ev.start (NOW + 10); 2748 incr_ev.start (NOW + 10);
2733 break;
2734 }
2735 2749
2736 if (ct.value == NULL) 2750 goto bailout;
2737 continue; 2751 }
2738 2752
2739 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2740 { 2766 }
2767 else
2768 {
2741 if (selection_wait == Sel_normal && nread == 0 2769 if (selection_wait == Sel_normal
2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2743 { 2771 {
2744 /* 2772 /*
2745 * pass through again trying CUT_BUFFER0 if we've come from 2773 * pass through again trying CUT_BUFFER0 if we've come from
2746 * XConvertSelection () but nothing was presented 2774 * XConvertSelection () but nothing was presented
2747 */ 2775 */
2748 selection_paste (display->root, XA_CUT_BUFFER0, False); 2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2749 } 2777 }
2750 2778
2751 nread = -1; /* discount any previous stuff */ 2779 goto bailout;
2752 break; 2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (NOW + 10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2753 } 2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2754 2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2755 nread += ct.nitems; 2793 incr_buf_fill += ct.nitems;
2756 2794
2795 goto bailout;
2796 }
2797
2757 char **cl; 2798 char **cl;
2758 int cr; 2799 int cr;
2800
2801#if ENABLE_FRILLS
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste ((unsigned char *)s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2815 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2760 { 2816 && cl)
2817 {
2761 for (int i = 0; i < cr; i++) 2818 for (int i = 0; i < cr; i++)
2762 paste ((unsigned char *)cl[i], strlen (cl[i])); 2819 paste ((unsigned char *)cl[i], strlen (cl[i]));
2763 2820
2764 XFreeStringList (cl); 2821 XFreeStringList (cl);
2765 } 2822 }
2766 else 2823 else
2767 paste (ct.value, ct.nitems); 2824 paste (ct.value, ct.nitems); // paste raw
2768 2825
2769 if (bytes_after == 0) 2826bailout:
2770 break;
2771
2772 XFree (ct.value);
2773 }
2774
2775 if (ct.value)
2776 XFree (ct.value); 2827 XFree (ct.value);
2777 2828
2778 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2779 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2780
2781 return (int)nread;
2782} 2831}
2783 2832
2784void 2833void
2785rxvt_term::incr_cb (time_watcher &w) 2834rxvt_term::incr_cb (time_watcher &w)
2786{ 2835{
2787 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2788 2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2789 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2790} 2842}
2791 2843
2792/*
2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2794 */
2795void 2844void
2796rxvt_term::selection_property (Window win, Atom prop) 2845rxvt_term::selection_property (Window win, Atom prop)
2797{ 2846{
2798 if (prop == None || selection_wait != Sel_incr) 2847 if (prop == None || selection_wait != Sel_incr)
2799 return; 2848 return;
2800 2849
2801 if (selection_paste (win, prop, 1) > 0) 2850 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} 2851}
2809 2852
2810/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2811/* 2854/*
2812 * Request the current selection: 2855 * Request the current selection:
… …
2846#else 2889#else
2847 selection_type = Sel_CompoundText; 2890 selection_type = Sel_CompoundText;
2848 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849 return; 2892 return;
2850#endif 2893#endif
2851
2852 } 2894 }
2853 } 2895 }
2854 2896
2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2897 selection_wait = Sel_none; /* don't loop in selection_paste () */
2856 selection_paste (display->root, XA_CUT_BUFFER0, False); 2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2857} 2899}
2858 2900
2859int 2901int
2860rxvt_term::selection_request_other (Atom target, int selnum) 2902rxvt_term::selection_request_other (Atom target, int selnum)
2861{ 2903{
… …
3017#if 0 3059#if 0
3018 XTextProperty ct; 3060 XTextProperty ct;
3019 3061
3020 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3062 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021 { 3063 {
3022 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023 PropModeReplace, ct.value, ct.nitems);
3024 XFree (ct.value); 3065 XFree (ct.value);
3025 } 3066 }
3026#endif 3067#endif
3027 3068
3028 selection_time = tm; 3069 selection_time = tm;
… …
3366 selection_delimit_word (DN, &selection.end, &selection.end); 3407 selection_delimit_word (DN, &selection.end, &selection.end);
3367 } 3408 }
3368 else if (selection.clicks == 3) 3409 else if (selection.clicks == 3)
3369 { 3410 {
3370#if ENABLE_FRILLS 3411#if ENABLE_FRILLS
3371 if ((options & Opt_tripleclickwords)) 3412 if (options & Opt_tripleclickwords)
3372 { 3413 {
3373 int end_row; 3414 int end_row;
3374 3415
3375 selection_delimit_word (UP, &selection.beg, &selection.beg); 3416 selection_delimit_word (UP, &selection.beg, &selection.beg);
3376 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3417 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3394 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3435 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3395 selection.mark.col++; 3436 selection.mark.col++;
3396 3437
3397 selection.beg.col = 0; 3438 selection.beg.col = 0;
3398 selection.end.col = ncol; 3439 selection.end.col = ncol;
3440
3441 // select a complete logical line
3442 while (selection.beg.row > -TermWin.saveLines
3443 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3444 selection.beg.row--;
3445
3446 while (selection.end.row < TermWin.nrow
3447 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3448 selection.end.row++;
3399 } 3449 }
3400 } 3450 }
3401 3451
3402 if (button3 && buttonpress) 3452 if (button3 && buttonpress)
3403 { /* mark may need to be changed */ 3453 { /* mark may need to be changed */
… …
3483 */ 3533 */
3484void 3534void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3535rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486{ 3536{
3487 XSelectionEvent ev; 3537 XSelectionEvent ev;
3488 XTextProperty ct; 3538 dDisp;
3489 XICCEncodingStyle style;
3490 Atom target;
3491 3539
3492 ev.type = SelectionNotify; 3540 ev.type = SelectionNotify;
3493 ev.property = None; 3541 ev.property = None;
3494 ev.display = rq.display; 3542 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3543 ev.requestor = rq.requestor;
… …
3509 *target++ = xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3510#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3511 *target++ = xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3512#endif 3560#endif
3513 3561
3514 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3515 32, PropModeReplace, 3563 32, PropModeReplace,
3516 (unsigned char *)target_list, target - target_list); 3564 (unsigned char *)target_list, target - target_list);
3517 ev.property = rq.property; 3565 ev.property = rq.property;
3518 } 3566 }
3519#if TODO // TODO 3567#if TODO // TODO
… …
3522 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3523 } 3571 }
3524#endif 3572#endif
3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526 { 3574 {
3527 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3575 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3528 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529 ev.property = rq.property; 3577 ev.property = rq.property;
3530 } 3578 }
3531 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3532 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
3533 || rq.target == xa[XA_COMPOUND_TEXT] 3581 || rq.target == xa[XA_COMPOUND_TEXT]
3534 || rq.target == xa[XA_UTF8_STRING] 3582 || rq.target == xa[XA_UTF8_STRING]
3535 ) 3583 )
3536 { 3584 {
3585 XTextProperty ct;
3586 Atom target = rq.target;
3537 short freect = 0; 3587 short freect = 0;
3538 int selectlen; 3588 int selectlen;
3539 wchar_t *cl; 3589 wchar_t *cl;
3540 3590 enum {
3541 target = rq.target; 3591 enc_string = XStringStyle,
3592 enc_text = XStdICCTextStyle,
3593 enc_compound_text = XCompoundTextStyle,
3594#ifdef X_HAVE_UTF8_STRING
3595 enc_utf8 = XUTF8StringStyle,
3596#else
3597 enc_utf8 = -1,
3598#endif
3599 } style;
3542 3600
3543 if (target == XA_STRING) 3601 if (target == XA_STRING)
3544 // we actually don't do XA_STRING, but who cares, as i18n clients 3602 // we actually don't do XA_STRING, but who cares, as i18n clients
3545 // will ask for another format anyways. 3603 // will ask for another format anyways.
3546 style = XStringStyle; 3604 style = enc_string;
3547 else if (target == xa[XA_TEXT]) 3605 else if (target == xa[XA_TEXT])
3548 style = XStdICCTextStyle; 3606 style = enc_text;
3549 else if (target == xa[XA_COMPOUND_TEXT]) 3607 else if (target == xa[XA_COMPOUND_TEXT])
3550 style = XCompoundTextStyle; 3608 style = enc_compound_text;
3551#if X_HAVE_UTF8_STRING 3609#if ENABLE_FRILLS
3552 else if (target == xa[XA_UTF8_STRING]) 3610 else if (target == xa[XA_UTF8_STRING])
3553 style = XUTF8StringStyle; 3611 style = enc_utf8;
3554#endif 3612#endif
3555 else 3613 else
3556 { 3614 {
3557 target = xa[XA_COMPOUND_TEXT]; 3615 target = xa[XA_COMPOUND_TEXT];
3558 style = XCompoundTextStyle; 3616 style = enc_compound_text;
3559 } 3617 }
3560 3618
3561 if (selection.text) 3619 if (selection.text)
3562 { 3620 {
3563 cl = selection.text; 3621 cl = selection.text;
… …
3567 { 3625 {
3568 cl = L""; 3626 cl = L"";
3569 selectlen = 0; 3627 selectlen = 0;
3570 } 3628 }
3571 3629
3572 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3630#if ENABLE_FRILLS
3573 // manually for XUTF8StringStyle. 3631 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3632 // so recode it manually
3633 if (style == enc_utf8)
3634 {
3635 freect = 1;
3636 ct.encoding = target;
3637 ct.format = 8;
3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3639 ct.nitems = strlen ((char *)ct.value);
3640 }
3641 else
3642#endif
3574 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575 freect = 1; 3644 freect = 1;
3576 else 3645 else
3577 { 3646 {
3578 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3579 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3580 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3650 ct.encoding = target;
3581 } 3651 }
3582 3652
3583 XChangeProperty (display->display, rq.requestor, rq.property, 3653 XChangeProperty (disp, rq.requestor, rq.property,
3584 target, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3585 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3586 ev.property = rq.property; 3656 ev.property = rq.property;
3587 3657
3588 if (freect) 3658 if (freect)
3589 XFree (ct.value); 3659 XFree (ct.value);
3590 } 3660 }
3591 3661
3592 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3593} 3663}
3594 3664
3595/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3596 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3597 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */

Diff Legend

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