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.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC

… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
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)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
464 { 461 {
465 switch (keysym) 462 switch (keysym)
466 { 463 {
467 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
470 return; 467 return;
471#if TODO 468#if TODO
472 /* rxvt extras */ 469 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
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
… …
1137 1134
1138 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1139 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1140 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1141 1138
1142 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143 1140
1144 if (r > 0) 1141 if (r > 0)
1145 { 1142 {
1146 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1147 return true; 1144 return true;
… …
1502 { 1499 {
1503 seen_resize = 1; 1500 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1502 }
1506 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent)) 1507 if (OPTION (Opt_transparent))
1509 check_our_parents (); 1508 check_our_parents ();
1510#endif 1509#endif
1511 } 1510 }
… …
1711 { 1710 {
1712 hidden_cursor = 0; 1711 hidden_cursor = 0;
1713 want_refresh = 1; 1712 want_refresh = 1;
1714 } 1713 }
1715 1714
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717 } 1716 }
1718#endif 1717#endif
1719 1718
1720#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1749 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1750 } 1749 }
1751#endif 1750#endif
1752#if CURSOR_BLINK 1751#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755#endif 1754#endif
1756#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1758 { 1757 {
1759 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
2153 { 2152 {
2154 case Button1: 2153 case Button1:
2155 case Button3: 2154 case Button3:
2156 selection_make (ev.time); 2155 selection_make (ev.time);
2157 break; 2156 break;
2157
2158 case Button2: 2158 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2161 break;
2162
2161#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2162 case Button4: 2164 case Button4:
2163 case Button5: 2165 case Button5:
2164 { 2166 {
2165 int i; 2167 int i;
… …
2820 return flag; 2822 return flag;
2821} 2823}
2822 2824
2823// read the next character 2825// read the next character
2824wchar_t 2826wchar_t
2825rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2826{ 2828{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2830 {
2829 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2851 return NOCHAR; 2853 return NOCHAR;
2852} 2854}
2853 2855
2854// read the next octet 2856// read the next octet
2855uint32_t 2857uint32_t
2856rxvt_term::next_octet () 2858rxvt_term::next_octet () NOTHROW
2857{ 2859{
2858 return cmdbuf_ptr < cmdbuf_endp 2860 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2861 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2862 : NOCHAR;
2861} 2863}
2864
2865static class out_of_input out_of_input;
2862 2866
2863/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2864/* 2868/*
2865 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2866 * to the command. 2870 * to the command.
2867 */ 2871 */
2868wchar_t 2872wchar_t
2869rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2874{
2871 wchar_t c = next_char (); 2875 wchar_t c = next_char ();
2872 2876
2873 if (c == NOCHAR) 2877 if (c == NOCHAR)
2874 throw out_of_input; 2878 throw out_of_input;
2875 2879
2876 return c; 2880 return c;
2877} 2881}
2878 2882
2879uint32_t 2883uint32_t
2880rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2885{
2882 uint32_t c = next_octet (); 2886 uint32_t c = next_octet ();
2883 2887
2884 if (c == NOCHAR) 2888 if (c == NOCHAR)
2885 throw out_of_input; 2889 throw out_of_input;
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3769 */
3766void 3770void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3772{
3769 int changed = 0;
3770 int color; 3773 int color;
3771 char *buf, *name; 3774 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3776 int saveop = op;
3774 dDisp; 3777 dDisp;
… …
3890 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3891 break; 3894 break;
3892#endif 3895#endif
3893 3896
3894 case Rxvt_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3895 if (*str != ';') 3899 if (*str != ';')
3896 { 3900 {
3897#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3898 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3899 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3900 scr_touch (true); 3904 scr_touch (true);
3901#endif 3905#endif
3902 } 3906 }
3903 3907
3908 int changed = 0;
3909
3904 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3905 { 3911 {
3906 str++; 3912 str++;
3907#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3908 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3909#endif 3915#endif
3910 } 3916 }
3911 3917
3912 if (changed) 3918 if (changed)
3913 { 3919 {
3914#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3921 resize_pixmap ();
3916 scr_touch (true); 3922 scr_touch (true);
3917#endif 3923#endif
3918 } 3924 }
3925 }
3919 break; 3926 break;
3920 3927
3921 case Rxvt_restoreFG: 3928 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3923 break; 3930 break;
… …
3969 if (query) 3976 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3971 else 3978 else
3972 { 3979 {
3973 set_locale (str); 3980 set_locale (str);
3974 pty.set_utf8_mode (enc_utf8); 3981 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3982 init_xlocale ();
3976 } 3983 }
3977 break; 3984 break;
3978 3985
3979 case URxvt_view_up: 3986 case URxvt_view_up:
… …
4032 return state; 4039 return state;
4033} 4040}
4034 4041
4035/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
4036void 4043void
4037rxvt_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)
4038{ 4045{
4039 unsigned int i, j; 4046 unsigned int i, j;
4040 int state; 4047 int state;
4041 4048
4042 static const struct 4049 static const struct
… …
4411rxvt_term::tt_write (const char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 4419{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return; 4421 return;
4415 4422
4416 if (pty.pty < 0) 4423 if (pty->pty < 0)
4417 return; 4424 return;
4418 4425
4419 if (v_buflen == 0) 4426 if (v_buflen == 0)
4420 { 4427 {
4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422 4429
4423 if ((unsigned int)written == len) 4430 if ((unsigned int)written == len)
4424 return; 4431 return;
4425 4432
4426 data += written; 4433 data += written;
… …
4435 pty_ev.set (EVENT_READ | EVENT_WRITE); 4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4436} 4443}
4437 4444
4438void rxvt_term::pty_write () 4445void rxvt_term::pty_write ()
4439{ 4446{
4440 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441 4448
4442 if (written > 0) 4449 if (written > 0)
4443 { 4450 {
4444 v_buflen -= written; 4451 v_buflen -= written;
4445 4452

Diff Legend

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