ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.243 by root, Fri Jan 6 05:43:36 2006 UTC vs.
Revision 1.245 by root, Fri Jan 6 18:33:30 2006 UTC

… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 873 return;
874 874
875 if (len <= 0) 875 if (len <= 0)
876 return; /* not mapped */ 876 return; /* not mapped */
877 877
… …
1415 else 1415 else
1416 iso14755buf = 0; 1416 iso14755buf = 0;
1417 } 1417 }
1418#endif 1418#endif
1419 1419
1420 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break; 1422 break;
1422 1423
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
… …
2167 if (priv_modes & PrivMode_mouse_report 2168 if (priv_modes & PrivMode_mouse_report
2168 && bypass_keystate 2169 && bypass_keystate
2169 && ev.button == Button1 && MEvent.clicks <= 1) 2170 && ev.button == Button1 && MEvent.clicks <= 1)
2170 selection_extend (ev.x, ev.y, 0); 2171 selection_extend (ev.x, ev.y, 0);
2171 2172
2172 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2173 return; 2174 return;
2174 2175
2175 switch (ev.button) 2176 switch (ev.button)
2176 { 2177 {
2177 case Button1: 2178 case Button1:
… …
2723 2724
2724bool 2725bool
2725rxvt_term::cmd_parse () 2726rxvt_term::cmd_parse ()
2726{ 2727{
2727 bool flag = false; 2728 bool flag = false;
2728 unicode_t ch = NOCHAR; 2729 wchar_t ch = NOCHAR;
2729 char *seq_begin; // remember start of esc-sequence here 2730 char *seq_begin; // remember start of esc-sequence here
2730 2731
2731 for (;;) 2732 for (;;)
2732 { 2733 {
2733 if (ch == NOCHAR) 2734 if (ch == NOCHAR)
… …
2754 if (seen_resize && cmd_pid) 2755 if (seen_resize && cmd_pid)
2755 kill (-cmd_pid, SIGWINCH); 2756 kill (-cmd_pid, SIGWINCH);
2756 } 2757 }
2757 2758
2758 /* Read a text string from the input buffer */ 2759 /* Read a text string from the input buffer */
2759 unicode_t buf[UBUFSIZ]; 2760 wchar_t buf[UBUFSIZ];
2760 bool refreshnow = false; 2761 bool refreshnow = false;
2761 int nlines = 0; 2762 int nlines = 0;
2762 unicode_t *str = buf; 2763 wchar_t *str = buf;
2763 unicode_t *eol = str + min (ncol, UBUFSIZ); 2764 wchar_t *eol = str + min (ncol, UBUFSIZ);
2764 2765
2765 for (;;) 2766 for (;;)
2766 { 2767 {
2767 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2768 break; 2769 break;
… …
2786 } 2787 }
2787 2788
2788 // scr_add_lines only works for nlines <= nrow - 1. 2789 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2790 if (nlines >= nrow - 1)
2790 { 2791 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2792 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2793 2794
2794 nlines = 0; 2795 nlines = 0;
2795 str = buf; 2796 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2797 eol = str + min (ncol, UBUFSIZ);
2797 } 2798 }
… …
2811 2812
2812 seq_begin = cmdbuf_ptr; 2813 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2814 ch = next_char ();
2814 } 2815 }
2815 2816
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2817 scr_add_lines (buf, nlines, str - buf); 2818 scr_add_lines (buf, str - buf, nlines);
2818 2819
2819 /* 2820 /*
2820 * If there have been a lot of new lines, then update the screen 2821 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2822 * What the heck I'll cheat and only refresh less than every page-full.
2822 * the number of pages between refreshes is refresh_limit, which 2823 * the number of pages between refreshes is refresh_limit, which
… …
2853 } 2854 }
2854 2855
2855 return flag; 2856 return flag;
2856} 2857}
2857 2858
2859// read the next character
2860wchar_t
2861rxvt_term::next_char ()
2862{
2863 while (cmdbuf_ptr < cmdbuf_endp)
2864 {
2865 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2867 return *cmdbuf_ptr++;
2868
2869 wchar_t wc;
2870 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2871
2872 if (len == (size_t)-2)
2873 {
2874 // the mbstate stores incomplete sequences. didn't know this :/
2875 cmdbuf_ptr = cmdbuf_endp;
2876 break;
2877 }
2878
2879 if (len == (size_t)-1)
2880 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2881
2882 // assume wchar == unicode
2883 cmdbuf_ptr += len;
2884 return wc & UNICODE_MASK;
2885 }
2886
2887 return NOCHAR;
2888}
2889
2858// read the next octet 2890// read the next octet
2859unicode_t 2891uint32_t
2860rxvt_term::next_octet () 2892rxvt_term::next_octet ()
2861{ 2893{
2862 return cmdbuf_ptr < cmdbuf_endp 2894 return cmdbuf_ptr < cmdbuf_endp
2863 ? *cmdbuf_ptr++ 2895 ? *cmdbuf_ptr++
2864 : NOCHAR; 2896 : NOCHAR;
2865}
2866
2867// read the next character
2868unicode_t
2869rxvt_term::next_char ()
2870{
2871 while (cmdbuf_ptr < cmdbuf_endp)
2872 {
2873 // assume 7-bit to be ascii ALWAYS
2874 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2875 return *cmdbuf_ptr++;
2876
2877 wchar_t wc;
2878 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2879
2880 if (len == (size_t)-2)
2881 {
2882 // the mbstate stores incomplete sequences. didn't know this :/
2883 cmdbuf_ptr = cmdbuf_endp;
2884 break;
2885 }
2886
2887 if (len == (size_t)-1)
2888 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2889
2890 // assume wchar == unicode
2891 cmdbuf_ptr += len;
2892 return wc & UNICODE_MASK;
2893 }
2894
2895 return NOCHAR;
2896} 2897}
2897 2898
2898/* rxvt_cmd_getc () - Return next input character */ 2899/* rxvt_cmd_getc () - Return next input character */
2899/* 2900/*
2900 * Return the next input character after first passing any keyboard input 2901 * Return the next input character after first passing any keyboard input
2901 * to the command. 2902 * to the command.
2902 */ 2903 */
2903unicode_t 2904wchar_t
2904rxvt_term::cmd_getc () 2905rxvt_term::cmd_getc ()
2905{ 2906{
2906 unicode_t c = next_char (); 2907 wchar_t c = next_char ();
2907 2908
2908 if (c == NOCHAR) 2909 if (c == NOCHAR)
2909 throw out_of_input; 2910 throw out_of_input;
2910 2911
2911 return c; 2912 return c;
2912} 2913}
2913 2914
2914unicode_t 2915uint32_t
2915rxvt_term::cmd_get8 () 2916rxvt_term::cmd_get8 ()
2916{ 2917{
2917 unicode_t c = next_octet (); 2918 uint32_t c = next_octet ();
2918 2919
2919 if (c == NOCHAR) 2920 if (c == NOCHAR)
2920 throw out_of_input; 2921 throw out_of_input;
2921 2922
2922 return c; 2923 return c;
… …
3189 break; 3190 break;
3190 3191
3191 /* 8.3.87: NEXT LINE */ 3192 /* 8.3.87: NEXT LINE */
3192 case C1_NEL: /* ESC E */ 3193 case C1_NEL: /* ESC E */
3193 { 3194 {
3194 unicode_t nlcr[] = { C0_LF, C0_CR }; 3195 wchar_t nlcr[] = { C0_LF, C0_CR };
3195 scr_add_lines (nlcr, 1, 2); 3196 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3196 } 3197 }
3197 break; 3198 break;
3198 3199
3199 /* kidnapped escape sequence: Should be 8.3.48 */ 3200 /* kidnapped escape sequence: Should be 8.3.48 */
3200 case C1_ESA: /* ESC G */ 3201 case C1_ESA: /* ESC G */
… …
4028 break; 4029 break;
4029#endif 4030#endif
4030 4031
4031#if ENABLE_PERL 4032#if ENABLE_PERL
4032 case URxvt_perl: 4033 case URxvt_perl:
4033 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4034 ; // no responses yet 4035 ; // no responses yet
4035 break; 4036 break;
4036#endif 4037#endif
4037 } 4038 }
4038} 4039}

Diff Legend

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