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.149 by root, Mon Dec 13 06:44:18 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 * ------------------------------------------------------------------------- */
… …
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
… …
888 // 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
889 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
890 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
891 int width = c < 0x100 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
892 892
893 if (screen.flags & Screen_Insert)
894 scr_insdel_chars (width, INSERT);
895
896 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
897 { 894 {
898 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
899 // 5f-7e standard vt100 896 // 5f-7e standard vt100
900 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
901 static uint16_t vt100_0[63] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
902 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!
903 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
904 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
905 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
906 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
914 c = vt100_0[c - 0x40]; 911 c = vt100_0[c - 0x40];
915 width = 1; 912 width = 1;
916 } 913 }
917 } 914 }
918 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
919 if (width != 0) 919 if (width != 0)
920 { 920 {
921 // some utf-8 decoders decode surrogate characters. 921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff) 922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd; 923 c = 0xfffd;
… …
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 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2404 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2406 } /* for (col....) */ 2410 } /* for (col....) */
2407 } /* for (row....) */ 2411 } /* for (row....) */
2408 2412
2409#if ENABLE_OVERLAY 2413#if ENABLE_OVERLAY
2410 scr_swap_overlay (); 2414 scr_swap_overlay ();
… …
2655 */ 2659 */
2656void 2660void
2657rxvt_term::paste (const unsigned char *data, unsigned int len) 2661rxvt_term::paste (const unsigned char *data, unsigned int len)
2658{ 2662{
2659 unsigned int i, j, n; 2663 unsigned int i, j, n;
2660 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2661 2665
2662 /* convert normal newline chars into common keyboard Return key sequence */ 2666 /* convert normal newline chars into common keyboard Return key sequence */
2663 for (i = 0; i < len; i += PROP_SIZE) 2667 for (i = 0; i < len; i += PASTE_SIZE)
2664 { 2668 {
2665 n = min (len - i, PROP_SIZE); 2669 n = min (len - i, PASTE_SIZE);
2666 memcpy (ds, data + i, n); 2670 memcpy (ds, data + i, n);
2667 2671
2668 for (j = 0; j < n; j++) 2672 for (j = 0; j < n; j++)
2669 if (ds[j] == C0_LF) 2673 if (ds[j] == C0_LF)
2670 ds[j] = C0_CR; 2674 ds[j] = C0_CR;
… …
2678/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2679/* 2683/*
2680 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
2681 * EXT: SelectionNotify 2685 * EXT: SelectionNotify
2682 */ 2686 */
2683int 2687void
2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2685{ 2689{
2686 long nread = 0;
2687 unsigned long bytes_after;
2688 XTextProperty ct;
2689
2690 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2691 { 2691 {
2692 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2693 { 2693 {
2694 int selnum = selection_type & Sel_whereMask; 2694 int selnum = selection_type & Sel_whereMask;
… …
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else 2708 else
2709 selection_type = 0; 2709 selection_type = 0;
2710 } 2710 }
2711 2711
2712 return 0; 2712 return;
2713 }
2714
2715 for (;;)
2716 { 2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (display->display, win, prop,
2719 0, 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
2717 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2737 if (XGetWindowProperty (display->display, win, prop,
2718 (long) (PROP_SIZE / 4), delete_prop, 2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2719 AnyPropertyType, &ct.encoding, &ct.format, 2740 &ct2.encoding, &ct2.format,
2720 &ct.nitems, &bytes_after, 2741 &ct2.nitems, &bytes_after,
2721 &ct.value) != Success) 2742 &ct2.value) != Success)
2722 break; 2743 goto bailout;
2723 2744
2724 if (ct.encoding == 0) 2745 // realloc should be compatible to XFree, here, and elsewhere, too
2725 break; 2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2748 ct.nitems += ct2.nitems;
2726 2749
2750 XFree (ct2.value);
2751 }
2752
2753 if (ct.value == 0)
2754 goto bailout;
2755
2727 if (ct.encoding == xa[XA_INCR]) 2756 if (ct.encoding == xa[XA_INCR])
2728 { 2757 {
2729 // INCR selection, start handshake 2758 // INCR selection, start handshake
2759 if (!delete_prop)
2730 XDeleteProperty (display->display, win, prop); 2760 XDeleteProperty (display->display, win, prop);
2761
2731 selection_wait = Sel_incr; 2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2732 incr_ev.start (NOW + 10); 2764 incr_ev.start (NOW + 10);
2733 break;
2734 }
2735 2765
2736 if (ct.value == NULL) 2766 goto bailout;
2737 continue; 2767 }
2738 2768
2739 if (ct.nitems == 0) 2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2740 { 2782 }
2783 else
2784 {
2741 if (selection_wait == Sel_normal && nread == 0 2785 if (selection_wait == Sel_normal
2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2743 { 2787 {
2744 /* 2788 /*
2745 * pass through again trying CUT_BUFFER0 if we've come from 2789 * pass through again trying CUT_BUFFER0 if we've come from
2746 * XConvertSelection () but nothing was presented 2790 * XConvertSelection () but nothing was presented
2747 */ 2791 */
2748 selection_paste (display->root, XA_CUT_BUFFER0, False); 2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2749 } 2793 }
2750 2794
2751 nread = -1; /* discount any previous stuff */ 2795 goto bailout;
2752 break; 2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (NOW + 10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2753 } 2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2754 2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2755 nread += ct.nitems; 2809 incr_buf_fill += ct.nitems;
2756 2810
2811 goto bailout;
2812 }
2813
2757 char **cl; 2814 char **cl;
2758 int cr; 2815 int cr;
2816
2817#if ENABLE_FRILLS
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste ((unsigned char *)s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2831 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2760 { 2832 && cl)
2833 {
2761 for (int i = 0; i < cr; i++) 2834 for (int i = 0; i < cr; i++)
2762 paste ((unsigned char *)cl[i], strlen (cl[i])); 2835 paste ((unsigned char *)cl[i], strlen (cl[i]));
2763 2836
2764 XFreeStringList (cl); 2837 XFreeStringList (cl);
2765 } 2838 }
2766 else 2839 else
2767 paste (ct.value, ct.nitems); 2840 paste (ct.value, ct.nitems); // paste raw
2768 2841
2769 if (bytes_after == 0) 2842bailout:
2770 break;
2771
2772 XFree (ct.value);
2773 }
2774
2775 if (ct.value)
2776 XFree (ct.value); 2843 XFree (ct.value);
2777 2844
2778 if (selection_wait == Sel_normal) 2845 if (selection_wait == Sel_normal)
2779 selection_wait = Sel_none; 2846 selection_wait = Sel_none;
2780
2781 return (int)nread;
2782} 2847}
2783 2848
2784void 2849void
2785rxvt_term::incr_cb (time_watcher &w) 2850rxvt_term::incr_cb (time_watcher &w)
2786{ 2851{
2787 selection_wait = Sel_none; 2852 selection_wait = Sel_none;
2788 2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2789 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2790} 2858}
2791 2859
2792/*
2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2794 */
2795void 2860void
2796rxvt_term::selection_property (Window win, Atom prop) 2861rxvt_term::selection_property (Window win, Atom prop)
2797{ 2862{
2798 if (prop == None || selection_wait != Sel_incr) 2863 if (prop == None || selection_wait != Sel_incr)
2799 return; 2864 return;
2800 2865
2801 if (selection_paste (win, prop, 1) > 0) 2866 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} 2867}
2809 2868
2810/* ------------------------------------------------------------------------- */ 2869/* ------------------------------------------------------------------------- */
2811/* 2870/*
2812 * Request the current selection: 2871 * Request the current selection:
… …
2846#else 2905#else
2847 selection_type = Sel_CompoundText; 2906 selection_type = Sel_CompoundText;
2848 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2907 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849 return; 2908 return;
2850#endif 2909#endif
2851
2852 } 2910 }
2853 } 2911 }
2854 2912
2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2913 selection_wait = Sel_none; /* don't loop in selection_paste () */
2856 selection_paste (display->root, XA_CUT_BUFFER0, False); 2914 selection_paste (display->root, XA_CUT_BUFFER0, false);
2857} 2915}
2858 2916
2859int 2917int
2860rxvt_term::selection_request_other (Atom target, int selnum) 2918rxvt_term::selection_request_other (Atom target, int selnum)
2861{ 2919{
… …
3017#if 0 3075#if 0
3018 XTextProperty ct; 3076 XTextProperty ct;
3019 3077
3020 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021 { 3079 {
3022 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023 PropModeReplace, ct.value, ct.nitems);
3024 XFree (ct.value); 3081 XFree (ct.value);
3025 } 3082 }
3026#endif 3083#endif
3027 3084
3028 selection_time = tm; 3085 selection_time = tm;
… …
3483 */ 3540 */
3484void 3541void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3542rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486{ 3543{
3487 XSelectionEvent ev; 3544 XSelectionEvent ev;
3488 XTextProperty ct;
3489 XICCEncodingStyle style;
3490 Atom target;
3491 3545
3492 ev.type = SelectionNotify; 3546 ev.type = SelectionNotify;
3493 ev.property = None; 3547 ev.property = None;
3494 ev.display = rq.display; 3548 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3549 ev.requestor = rq.requestor;
… …
3532 || rq.target == xa[XA_TEXT] 3586 || rq.target == xa[XA_TEXT]
3533 || rq.target == xa[XA_COMPOUND_TEXT] 3587 || rq.target == xa[XA_COMPOUND_TEXT]
3534 || rq.target == xa[XA_UTF8_STRING] 3588 || rq.target == xa[XA_UTF8_STRING]
3535 ) 3589 )
3536 { 3590 {
3591 XTextProperty ct;
3592 Atom target = rq.target;
3537 short freect = 0; 3593 short freect = 0;
3538 int selectlen; 3594 int selectlen;
3539 wchar_t *cl; 3595 wchar_t *cl;
3540 3596 enum {
3541 target = rq.target; 3597 enc_string = XStringStyle,
3598 enc_text = XStdICCTextStyle,
3599 enc_compound_text = XCompoundTextStyle,
3600#ifdef X_HAVE_UTF8_STRING
3601 enc_utf8 = XUTF8StringStyle,
3602#else
3603 enc_utf8 = -1,
3604#endif
3605 } style;
3542 3606
3543 if (target == XA_STRING) 3607 if (target == XA_STRING)
3544 // we actually don't do XA_STRING, but who cares, as i18n clients 3608 // we actually don't do XA_STRING, but who cares, as i18n clients
3545 // will ask for another format anyways. 3609 // will ask for another format anyways.
3546 style = XStringStyle; 3610 style = enc_string;
3547 else if (target == xa[XA_TEXT]) 3611 else if (target == xa[XA_TEXT])
3548 style = XStdICCTextStyle; 3612 style = enc_text;
3549 else if (target == xa[XA_COMPOUND_TEXT]) 3613 else if (target == xa[XA_COMPOUND_TEXT])
3550 style = XCompoundTextStyle; 3614 style = enc_compound_text;
3551#if X_HAVE_UTF8_STRING 3615#if ENABLE_FRILLS
3552 else if (target == xa[XA_UTF8_STRING]) 3616 else if (target == xa[XA_UTF8_STRING])
3553 style = XUTF8StringStyle; 3617 style = enc_utf8;
3554#endif 3618#endif
3555 else 3619 else
3556 { 3620 {
3557 target = xa[XA_COMPOUND_TEXT]; 3621 target = xa[XA_COMPOUND_TEXT];
3558 style = XCompoundTextStyle; 3622 style = enc_compound_text;
3559 } 3623 }
3560 3624
3561 if (selection.text) 3625 if (selection.text)
3562 { 3626 {
3563 cl = selection.text; 3627 cl = selection.text;
… …
3567 { 3631 {
3568 cl = L""; 3632 cl = L"";
3569 selectlen = 0; 3633 selectlen = 0;
3570 } 3634 }
3571 3635
3572 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3636#if ENABLE_FRILLS
3573 // manually for XUTF8StringStyle. 3637 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3638 // so recode it manually
3639 if (style == enc_utf8)
3640 {
3641 freect = 1;
3642 ct.encoding = target;
3643 ct.format = 8;
3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3645 ct.nitems = strlen ((char *)ct.value);
3646 }
3647 else
3648#endif
3574 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3649 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575 freect = 1; 3650 freect = 1;
3576 else 3651 else
3577 { 3652 {
3578 /* if we failed to convert then send it raw */ 3653 /* if we failed to convert then send it raw */
3579 ct.value = (unsigned char *)cl; 3654 ct.value = (unsigned char *)cl;
3580 ct.nitems = selectlen; 3655 ct.nitems = selectlen;
3656 ct.encoding = target;
3581 } 3657 }
3582 3658
3583 XChangeProperty (display->display, rq.requestor, rq.property, 3659 XChangeProperty (display->display, rq.requestor, rq.property,
3584 target, 8, PropModeReplace, 3660 ct.encoding, 8, PropModeReplace,
3585 ct.value, (int)ct.nitems); 3661 ct.value, (int)ct.nitems);
3586 ev.property = rq.property; 3662 ev.property = rq.property;
3587 3663
3588 if (freect) 3664 if (freect)
3589 XFree (ct.value); 3665 XFree (ct.value);

Diff Legend

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