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.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.247 by root, Sat Jan 7 20:23:52 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
… …
1562 1562
1563 case SelectionRequest: 1563 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1565 break; 1565 break;
1566 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1567 case UnmapNotify: 1575 case UnmapNotify:
1568 mapped = 0; 1576 mapped = 0;
1569#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1571#endif 1579#endif
1572 break; 1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break; 1581 break;
1580 1582
1581#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1582 case ReparentNotify: 1584 case ReparentNotify:
1583 rootwin_cb (ev); 1585 rootwin_cb (ev);
… …
2724 2726
2725bool 2727bool
2726rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2727{ 2729{
2728 bool flag = false; 2730 bool flag = false;
2729 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2730 char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2731 2733
2732 for (;;) 2734 for (;;)
2733 { 2735 {
2734 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
… …
2755 if (seen_resize && cmd_pid) 2757 if (seen_resize && cmd_pid)
2756 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2757 } 2759 }
2758 2760
2759 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2760 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2761 bool refreshnow = false; 2763 bool refreshnow = false;
2762 int nlines = 0; 2764 int nlines = 0;
2763 unicode_t *str = buf; 2765 wchar_t *str = buf;
2764 unicode_t *eol = str + min (ncol, UBUFSIZ); 2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2765 2767
2766 for (;;) 2768 for (;;)
2767 { 2769 {
2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2769 break; 2771 break;
… …
2787 } 2789 }
2788 2790
2789 // scr_add_lines only works for nlines <= nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2792 if (nlines >= nrow - 1)
2791 { 2793 {
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2793 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2794 2796
2795 nlines = 0; 2797 nlines = 0;
2796 str = buf; 2798 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2799 eol = str + min (ncol, UBUFSIZ);
2798 } 2800 }
… …
2812 2814
2813 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2816 ch = next_char ();
2815 } 2817 }
2816 2818
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2818 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2819 2821
2820 /* 2822 /*
2821 * If there have been a lot of new lines, then update the screen 2823 * If there have been a lot of new lines, then update the screen
2822 * What the heck I'll cheat and only refresh less than every page-full. 2824 * What the heck I'll cheat and only refresh less than every page-full.
2823 * the number of pages between refreshes is refresh_limit, which 2825 * the number of pages between refreshes is refresh_limit, which
… …
2854 } 2856 }
2855 2857
2856 return flag; 2858 return flag;
2857} 2859}
2858 2860
2859// read the next octet
2860unicode_t
2861rxvt_term::next_octet ()
2862{
2863 return cmdbuf_ptr < cmdbuf_endp
2864 ? *cmdbuf_ptr++
2865 : NOCHAR;
2866}
2867
2868// read the next character 2861// read the next character
2869unicode_t 2862wchar_t
2870rxvt_term::next_char () 2863rxvt_term::next_char ()
2871{ 2864{
2872 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2873 { 2866 {
2874 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
… …
2884 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2885 break; 2878 break;
2886 } 2879 }
2887 2880
2888 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2890 2883
2891 // assume wchar == unicode 2884 // assume wchar == unicode
2892 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2893 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2894 } 2887 }
2895 2888
2896 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2897} 2899}
2898 2900
2899/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2900/* 2902/*
2901 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2902 * to the command. 2904 * to the command.
2903 */ 2905 */
2904unicode_t 2906wchar_t
2905rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2906{ 2908{
2907 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2908 2910
2909 if (c == NOCHAR) 2911 if (c == NOCHAR)
2910 throw out_of_input; 2912 throw out_of_input;
2911 2913
2912 return c; 2914 return c;
2913} 2915}
2914 2916
2915unicode_t 2917uint32_t
2916rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2917{ 2919{
2918 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2919 2921
2920 if (c == NOCHAR) 2922 if (c == NOCHAR)
2921 throw out_of_input; 2923 throw out_of_input;
2922 2924
2923 return c; 2925 return c;
… …
3190 break; 3192 break;
3191 3193
3192 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3193 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3194 { 3196 {
3195 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3196 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3197 } 3199 }
3198 break; 3200 break;
3199 3201
3200 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3201 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
4029 break; 4031 break;
4030#endif 4032#endif
4031 4033
4032#if ENABLE_PERL 4034#if ENABLE_PERL
4033 case URxvt_perl: 4035 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035 ; // no responses yet 4037 ; // no responses yet
4036 break; 4038 break;
4037#endif 4039#endif
4038 } 4040 }
4039} 4041}

Diff Legend

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