… | |
… | |
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 | * ------------------------------------------------------------------------- */ |
… | |
… | |
600 | swap.flags |= Screen_VisibleCursor; |
601 | swap.flags |= Screen_VisibleCursor; |
601 | } |
602 | } |
602 | else |
603 | else |
603 | #endif |
604 | #endif |
604 | if (options & Opt_secondaryScroll) |
605 | if (options & Opt_secondaryScroll) |
605 | //if (current_screen == PRIMARY) |
|
|
606 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
606 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
607 | |
607 | |
608 | return scrn; |
608 | return scrn; |
609 | } |
609 | } |
610 | |
610 | |
611 | // clear WrapNext indicator, solidifying position on next line |
611 | // clear WrapNext indicator, solidifying position on next line |
… | |
… | |
973 | c = NOCHAR; |
973 | c = NOCHAR; |
974 | } |
974 | } |
975 | while (--width > 0); |
975 | while (--width > 0); |
976 | |
976 | |
977 | // pad with spaces when overwriting wide character with smaller one |
977 | // pad with spaces when overwriting wide character with smaller one |
|
|
978 | if (!width) |
978 | 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++) |
979 | { |
980 | { |
980 | stp[c] = ' '; |
981 | stp[c] = ' '; |
981 | srp[c] = rend; |
982 | srp[c] = rend; |
982 | } |
983 | } |
983 | } |
984 | } |
984 | else if (width == 0) |
985 | else if (width == 0) |
985 | { |
986 | { |
986 | #if ENABLE_COMBINING |
987 | #if ENABLE_COMBINING |
987 | // handle combining characters |
988 | // handle combining characters |
… | |
… | |
2398 | } |
2399 | } |
2399 | else |
2400 | else |
2400 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2401 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2401 | |
2402 | |
2402 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2403 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
|
|
2404 | { |
|
|
2405 | #if ENABLE_FRILLS |
|
|
2406 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2407 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2408 | else |
|
|
2409 | #endif |
|
|
2410 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2411 | |
2403 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2412 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2404 | xpixel, ypixel + font->ascent + 1, |
2413 | xpixel, ypixel + font->ascent + 1, |
2405 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2414 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
|
|
2415 | } |
2406 | } /* for (col....) */ |
2416 | } /* for (col....) */ |
2407 | } /* for (row....) */ |
2417 | } /* for (row....) */ |
2408 | |
2418 | |
2409 | #if ENABLE_OVERLAY |
2419 | #if ENABLE_OVERLAY |
2410 | scr_swap_overlay (); |
2420 | scr_swap_overlay (); |
… | |
… | |
2652 | /* ------------------------------------------------------------------------- */ |
2662 | /* ------------------------------------------------------------------------- */ |
2653 | /* |
2663 | /* |
2654 | * Paste a selection direct to the command fd |
2664 | * Paste a selection direct to the command fd |
2655 | */ |
2665 | */ |
2656 | void |
2666 | void |
2657 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2667 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2658 | { |
2668 | { |
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 */ |
2669 | /* convert normal newline chars into common keyboard Return key sequence */ |
2663 | for (i = 0; i < len; i += PROP_SIZE) |
2670 | 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) |
2671 | if (data[i] == C0_LF) |
2670 | ds[j] = C0_CR; |
2672 | data[i] = C0_CR; |
2671 | |
2673 | |
2672 | tt_write (ds, (int)n); |
2674 | tt_write (data, len); |
2673 | } |
|
|
2674 | |
|
|
2675 | free (ds); |
|
|
2676 | } |
2675 | } |
2677 | |
2676 | |
2678 | /* ------------------------------------------------------------------------- */ |
2677 | /* ------------------------------------------------------------------------- */ |
2679 | /* |
2678 | /* |
2680 | * Respond to a notification that a primary selection has been sent |
2679 | * Respond to a notification that a primary selection has been sent |
2681 | * EXT: SelectionNotify |
2680 | * EXT: SelectionNotify |
2682 | */ |
2681 | */ |
2683 | int |
2682 | void |
2684 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2683 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2685 | { |
2684 | { |
2686 | long nread = 0; |
|
|
2687 | unsigned long bytes_after; |
|
|
2688 | XTextProperty ct; |
|
|
2689 | |
|
|
2690 | if (prop == None) /* check for failed XConvertSelection */ |
2685 | if (prop == None) /* check for failed XConvertSelection */ |
2691 | { |
2686 | { |
2692 | if ((selection_type & Sel_CompoundText)) |
2687 | if ((selection_type & Sel_CompoundText)) |
2693 | { |
2688 | { |
2694 | int selnum = selection_type & Sel_whereMask; |
2689 | int selnum = selection_type & Sel_whereMask; |
… | |
… | |
2707 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2702 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2708 | else |
2703 | else |
2709 | selection_type = 0; |
2704 | selection_type = 0; |
2710 | } |
2705 | } |
2711 | |
2706 | |
2712 | return 0; |
2707 | return; |
2713 | } |
|
|
2714 | |
|
|
2715 | for (;;) |
|
|
2716 | { |
2708 | } |
|
|
2709 | |
|
|
2710 | unsigned long bytes_after; |
|
|
2711 | XTextProperty ct; |
|
|
2712 | |
|
|
2713 | if (XGetWindowProperty (display->display, win, prop, |
|
|
2714 | 0, PROP_SIZE / 4, |
|
|
2715 | delete_prop, AnyPropertyType, |
|
|
2716 | &ct.encoding, &ct.format, |
|
|
2717 | &ct.nitems, &bytes_after, |
|
|
2718 | &ct.value) != Success) |
|
|
2719 | { |
|
|
2720 | ct.value = 0; |
|
|
2721 | goto bailout; |
|
|
2722 | } |
|
|
2723 | |
|
|
2724 | if (ct.encoding == None) |
|
|
2725 | goto bailout; |
|
|
2726 | |
|
|
2727 | if (bytes_after) |
|
|
2728 | { |
|
|
2729 | // fetch and append remaining data |
|
|
2730 | XTextProperty ct2; |
|
|
2731 | |
2717 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2732 | if (XGetWindowProperty (display->display, win, prop, |
2718 | (long) (PROP_SIZE / 4), delete_prop, |
2733 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2734 | delete_prop, AnyPropertyType, |
2719 | AnyPropertyType, &ct.encoding, &ct.format, |
2735 | &ct2.encoding, &ct2.format, |
2720 | &ct.nitems, &bytes_after, |
2736 | &ct2.nitems, &bytes_after, |
2721 | &ct.value) != Success) |
2737 | &ct2.value) != Success) |
2722 | break; |
2738 | goto bailout; |
2723 | |
2739 | |
2724 | if (ct.encoding == 0) |
2740 | // realloc should be compatible to XFree, here, and elsewhere, too |
2725 | break; |
2741 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2742 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2743 | ct.nitems += ct2.nitems; |
2726 | |
2744 | |
|
|
2745 | XFree (ct2.value); |
|
|
2746 | } |
|
|
2747 | |
|
|
2748 | if (ct.value == 0) |
|
|
2749 | goto bailout; |
|
|
2750 | |
2727 | if (ct.encoding == xa[XA_INCR]) |
2751 | if (ct.encoding == xa[XA_INCR]) |
2728 | { |
2752 | { |
2729 | // INCR selection, start handshake |
2753 | // INCR selection, start handshake |
|
|
2754 | if (!delete_prop) |
2730 | XDeleteProperty (display->display, win, prop); |
2755 | XDeleteProperty (display->display, win, prop); |
|
|
2756 | |
2731 | selection_wait = Sel_incr; |
2757 | selection_wait = Sel_incr; |
|
|
2758 | incr_buf_fill = 0; |
2732 | incr_ev.start (NOW + 10); |
2759 | incr_ev.start (NOW + 10); |
2733 | break; |
|
|
2734 | } |
|
|
2735 | |
2760 | |
2736 | if (ct.value == NULL) |
2761 | goto bailout; |
2737 | continue; |
2762 | } |
2738 | |
2763 | |
2739 | if (ct.nitems == 0) |
2764 | if (ct.nitems == 0) |
|
|
2765 | { |
|
|
2766 | if (selection_wait == Sel_incr) |
|
|
2767 | { |
|
|
2768 | XFree (ct.value); |
|
|
2769 | |
|
|
2770 | // finally complete, now paste the whole thing |
|
|
2771 | selection_wait = Sel_normal; |
|
|
2772 | ct.value = (unsigned char *)incr_buf; |
|
|
2773 | ct.nitems = incr_buf_fill; |
|
|
2774 | incr_buf = 0; |
|
|
2775 | incr_buf_size = 0; |
|
|
2776 | incr_ev.stop (); |
2740 | { |
2777 | } |
|
|
2778 | else |
|
|
2779 | { |
2741 | if (selection_wait == Sel_normal && nread == 0 |
2780 | if (selection_wait == Sel_normal |
2742 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2781 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2743 | { |
2782 | { |
2744 | /* |
2783 | /* |
2745 | * pass through again trying CUT_BUFFER0 if we've come from |
2784 | * pass through again trying CUT_BUFFER0 if we've come from |
2746 | * XConvertSelection () but nothing was presented |
2785 | * XConvertSelection () but nothing was presented |
2747 | */ |
2786 | */ |
2748 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2787 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2749 | } |
2788 | } |
2750 | |
2789 | |
2751 | nread = -1; /* discount any previous stuff */ |
2790 | goto bailout; |
2752 | break; |
2791 | } |
|
|
2792 | } |
|
|
2793 | else if (selection_wait == Sel_incr) |
|
|
2794 | { |
|
|
2795 | incr_ev.start (NOW + 10); |
|
|
2796 | |
|
|
2797 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2753 | } |
2798 | { |
|
|
2799 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2800 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2801 | } |
2754 | |
2802 | |
|
|
2803 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2755 | nread += ct.nitems; |
2804 | incr_buf_fill += ct.nitems; |
2756 | |
2805 | |
|
|
2806 | goto bailout; |
|
|
2807 | } |
|
|
2808 | |
2757 | char **cl; |
2809 | char **cl; |
2758 | int cr; |
2810 | int cr; |
|
|
2811 | |
|
|
2812 | #if ENABLE_FRILLS |
|
|
2813 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2814 | // so recode it manually |
|
|
2815 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2816 | { |
|
|
2817 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2818 | char *s = rxvt_wcstombs (w); |
|
|
2819 | free (w); |
|
|
2820 | // TODO: strlen == only the first element will be converted. well... |
|
|
2821 | paste ((unsigned char *)s, strlen (s)); |
|
|
2822 | free (s); |
|
|
2823 | } |
|
|
2824 | else |
|
|
2825 | #endif |
2759 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2826 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2760 | { |
2827 | && cl) |
|
|
2828 | { |
2761 | for (int i = 0; i < cr; i++) |
2829 | for (int i = 0; i < cr; i++) |
2762 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2830 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2763 | |
2831 | |
2764 | XFreeStringList (cl); |
2832 | XFreeStringList (cl); |
2765 | } |
2833 | } |
2766 | else |
2834 | else |
2767 | paste (ct.value, ct.nitems); |
2835 | paste (ct.value, ct.nitems); // paste raw |
2768 | |
2836 | |
2769 | if (bytes_after == 0) |
2837 | bailout: |
2770 | break; |
|
|
2771 | |
|
|
2772 | XFree (ct.value); |
|
|
2773 | } |
|
|
2774 | |
|
|
2775 | if (ct.value) |
|
|
2776 | XFree (ct.value); |
2838 | XFree (ct.value); |
2777 | |
2839 | |
2778 | if (selection_wait == Sel_normal) |
2840 | if (selection_wait == Sel_normal) |
2779 | selection_wait = Sel_none; |
2841 | selection_wait = Sel_none; |
2780 | |
|
|
2781 | return (int)nread; |
|
|
2782 | } |
2842 | } |
2783 | |
2843 | |
2784 | void |
2844 | void |
2785 | rxvt_term::incr_cb (time_watcher &w) |
2845 | rxvt_term::incr_cb (time_watcher &w) |
2786 | { |
2846 | { |
2787 | selection_wait = Sel_none; |
2847 | selection_wait = Sel_none; |
2788 | |
2848 | |
|
|
2849 | incr_buf_size = 0; |
|
|
2850 | free (incr_buf); |
|
|
2851 | |
2789 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2852 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2790 | } |
2853 | } |
2791 | |
2854 | |
2792 | /* |
|
|
2793 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
|
|
2794 | */ |
|
|
2795 | void |
2855 | void |
2796 | rxvt_term::selection_property (Window win, Atom prop) |
2856 | rxvt_term::selection_property (Window win, Atom prop) |
2797 | { |
2857 | { |
2798 | if (prop == None || selection_wait != Sel_incr) |
2858 | if (prop == None || selection_wait != Sel_incr) |
2799 | return; |
2859 | return; |
2800 | |
2860 | |
2801 | if (selection_paste (win, prop, 1) > 0) |
2861 | 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 | } |
2862 | } |
2809 | |
2863 | |
2810 | /* ------------------------------------------------------------------------- */ |
2864 | /* ------------------------------------------------------------------------- */ |
2811 | /* |
2865 | /* |
2812 | * Request the current selection: |
2866 | * Request the current selection: |
… | |
… | |
2846 | #else |
2900 | #else |
2847 | selection_type = Sel_CompoundText; |
2901 | selection_type = Sel_CompoundText; |
2848 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2902 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2849 | return; |
2903 | return; |
2850 | #endif |
2904 | #endif |
2851 | |
|
|
2852 | } |
2905 | } |
2853 | } |
2906 | } |
2854 | |
2907 | |
2855 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2908 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2856 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2909 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2857 | } |
2910 | } |
2858 | |
2911 | |
2859 | int |
2912 | int |
2860 | rxvt_term::selection_request_other (Atom target, int selnum) |
2913 | rxvt_term::selection_request_other (Atom target, int selnum) |
2861 | { |
2914 | { |
… | |
… | |
3017 | #if 0 |
3070 | #if 0 |
3018 | XTextProperty ct; |
3071 | XTextProperty ct; |
3019 | |
3072 | |
3020 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3073 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3021 | { |
3074 | { |
3022 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
3075 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3023 | PropModeReplace, ct.value, ct.nitems); |
|
|
3024 | XFree (ct.value); |
3076 | XFree (ct.value); |
3025 | } |
3077 | } |
3026 | #endif |
3078 | #endif |
3027 | |
3079 | |
3028 | selection_time = tm; |
3080 | selection_time = tm; |
… | |
… | |
3483 | */ |
3535 | */ |
3484 | void |
3536 | void |
3485 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3537 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3486 | { |
3538 | { |
3487 | XSelectionEvent ev; |
3539 | XSelectionEvent ev; |
3488 | XTextProperty ct; |
|
|
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; |
… | |
… | |
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 (display->display, &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 (display->display, 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); |