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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC

… …
63#include <csignal> 63#include <csignal>
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1042{
1046 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1044 want_refresh = 1;
1048 1045
1049 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1047}
1051#endif 1048#endif
1052 1049
1053#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1054void 1051void
… …
1713 { 1710 {
1714 hidden_cursor = 0; 1711 hidden_cursor = 0;
1715 want_refresh = 1; 1712 want_refresh = 1;
1716 } 1713 }
1717 1714
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1716 }
1720#endif 1717#endif
1721 1718
1722#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1751 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1752 } 1749 }
1753#endif 1750#endif
1754#if CURSOR_BLINK 1751#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1754#endif
1758#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1760 { 1757 {
1761 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
2157 case Button3: 2154 case Button3:
2158 selection_make (ev.time); 2155 selection_make (ev.time);
2159 break; 2156 break;
2160 2157
2161 case Button2: 2158 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2161 break;
2167 2162
2168#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2169 case Button4: 2164 case Button4:
2170 case Button5: 2165 case Button5:
… …
2827 return flag; 2822 return flag;
2828} 2823}
2829 2824
2830// read the next character 2825// read the next character
2831wchar_t 2826wchar_t
2832rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2833{ 2828{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2830 {
2836 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2858 return NOCHAR; 2853 return NOCHAR;
2859} 2854}
2860 2855
2861// read the next octet 2856// read the next octet
2862uint32_t 2857uint32_t
2863rxvt_term::next_octet () 2858rxvt_term::next_octet () NOTHROW
2864{ 2859{
2865 return cmdbuf_ptr < cmdbuf_endp 2860 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2861 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2862 : NOCHAR;
2868} 2863}
2864
2865static class out_of_input out_of_input;
2869 2866
2870/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2871/* 2868/*
2872 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2873 * to the command. 2870 * to the command.
2874 */ 2871 */
2875wchar_t 2872wchar_t
2876rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2874{
2878 wchar_t c = next_char (); 2875 wchar_t c = next_char ();
2879 2876
2880 if (c == NOCHAR) 2877 if (c == NOCHAR)
2881 throw out_of_input; 2878 throw out_of_input;
2882 2879
2883 return c; 2880 return c;
2884} 2881}
2885 2882
2886uint32_t 2883uint32_t
2887rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2885{
2889 uint32_t c = next_octet (); 2886 uint32_t c = next_octet ();
2890 2887
2891 if (c == NOCHAR) 2888 if (c == NOCHAR)
2892 throw out_of_input; 2889 throw out_of_input;
… …
4042 return state; 4039 return state;
4043} 4040}
4044 4041
4045/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
4046void 4043void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 4045{
4049 unsigned int i, j; 4046 unsigned int i, j;
4050 int state; 4047 int state;
4051 4048
4052 static const struct 4049 static const struct

Diff Legend

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