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.267 by root, Mon Jan 16 15:00:20 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);
… …
1006 while (l->is_longer () && row < end_row); 1003 while (l->is_longer () && row < end_row);
1007 } 1004 }
1008 while (row < end_row); 1005 while (row < end_row);
1009 } 1006 }
1010 1007
1011 scr_refresh (refresh_type); 1008 scr_refresh ();
1012 scrollbar_show (1); 1009 scrollbar_show (1);
1013#ifdef USE_XIM 1010#ifdef USE_XIM
1014 IMSendSpot (); 1011 IMSendSpot ();
1015#endif 1012#endif
1016 } 1013 }
… …
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
… …
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1069{ 1066{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 { 1069 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1070 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076 } 1072 }
1077} 1073}
1078#endif 1074#endif
… …
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1083{ 1079{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1081 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1083 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1085 }
1091} 1086}
1092#endif 1087#endif
… …
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1096 {
1102 if (view_start == top_row || view_start == 0) 1097 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1104 1099
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1100 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1102 }
1109} 1103}
1110#endif 1104#endif
… …
1140 1134
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1144 1138
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1140
1147 if (r > 0) 1141 if (r > 0)
1148 { 1142 {
1149 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1150 return true; 1144 return true;
… …
1505 { 1499 {
1506 seen_resize = 1; 1500 seen_resize = 1;
1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508 } 1502 }
1509 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1511 if (OPTION (Opt_transparent)) 1507 if (OPTION (Opt_transparent))
1512 check_our_parents (); 1508 check_our_parents ();
1513#endif 1509#endif
1514 } 1510 }
… …
1714 { 1710 {
1715 hidden_cursor = 0; 1711 hidden_cursor = 0;
1716 want_refresh = 1; 1712 want_refresh = 1;
1717 } 1713 }
1718 1714
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720 } 1716 }
1721#endif 1717#endif
1722 1718
1723#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1752 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1753 } 1749 }
1754#endif 1750#endif
1755#if CURSOR_BLINK 1751#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1754#endif
1759#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1761 { 1757 {
1762 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
2100 2096
2101 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2102 { 2098 {
2103 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2104 scrollbar_show (0); 2100 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2101 }
2109 2102
2110#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
… …
2159 { 2152 {
2160 case Button1: 2153 case Button1:
2161 case Button3: 2154 case Button3:
2162 selection_make (ev.time); 2155 selection_make (ev.time);
2163 break; 2156 break;
2157
2164 case Button2: 2158 case Button2:
2165 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);
2166 break; 2161 break;
2162
2167#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2168 case Button4: 2164 case Button4:
2169 case Button5: 2165 case Button5:
2170 { 2166 {
2171 int i; 2167 int i;
… …
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2795 refresh_limit++;
2800 else 2796 else
2801 { 2797 {
2802 flag = true; 2798 flag = true;
2803 scr_refresh (refresh_type); 2799 scr_refresh ();
2804 want_refresh = 1; 2800 want_refresh = 1;
2805 } 2801 }
2806 } 2802 }
2807 2803
2808 } 2804 }
… …
2826 return flag; 2822 return flag;
2827} 2823}
2828 2824
2829// read the next character 2825// read the next character
2830wchar_t 2826wchar_t
2831rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2832{ 2828{
2833 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2834 { 2830 {
2835 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2857 return NOCHAR; 2853 return NOCHAR;
2858} 2854}
2859 2855
2860// read the next octet 2856// read the next octet
2861uint32_t 2857uint32_t
2862rxvt_term::next_octet () 2858rxvt_term::next_octet () NOTHROW
2863{ 2859{
2864 return cmdbuf_ptr < cmdbuf_endp 2860 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++ 2861 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR; 2862 : NOCHAR;
2867} 2863}
2864
2865static class out_of_input out_of_input;
2868 2866
2869/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2870/* 2868/*
2871 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2872 * to the command. 2870 * to the command.
2873 */ 2871 */
2874wchar_t 2872wchar_t
2875rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2876{ 2874{
2877 wchar_t c = next_char (); 2875 wchar_t c = next_char ();
2878 2876
2879 if (c == NOCHAR) 2877 if (c == NOCHAR)
2880 throw out_of_input; 2878 throw out_of_input;
2881 2879
2882 return c; 2880 return c;
2883} 2881}
2884 2882
2885uint32_t 2883uint32_t
2886rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887{ 2885{
2888 uint32_t c = next_octet (); 2886 uint32_t c = next_octet ();
2889 2887
2890 if (c == NOCHAR) 2888 if (c == NOCHAR)
2891 throw out_of_input; 2889 throw out_of_input;
… …
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3769 */
3772void 3770void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3772{
3775 int changed = 0;
3776 int color; 3773 int color;
3777 char *buf, *name; 3774 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3776 int saveop = op;
3780 dDisp; 3777 dDisp;
… …
3896 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3897 break; 3894 break;
3898#endif 3895#endif
3899 3896
3900 case Rxvt_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3901 if (*str != ';') 3899 if (*str != ';')
3902 { 3900 {
3903#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 3904 scr_touch (true);
3907#endif 3905#endif
3908 } 3906 }
3909 3907
3908 int changed = 0;
3909
3910 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3911 { 3911 {
3912 str++; 3912 str++;
3913#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3915#endif 3915#endif
3916 } 3916 }
3917 3917
3918 if (changed) 3918 if (changed)
3919 { 3919 {
3920#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 3921 resize_pixmap ();
3922 scr_touch (true); 3922 scr_touch (true);
3923#endif 3923#endif
3924 } 3924 }
3925 }
3925 break; 3926 break;
3926 3927
3927 case Rxvt_restoreFG: 3928 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3929 break; 3930 break;
… …
3975 if (query) 3976 if (query)
3976 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);
3977 else 3978 else
3978 { 3979 {
3979 set_locale (str); 3980 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3981 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3982 init_xlocale ();
3982 } 3983 }
3983 break; 3984 break;
3984 3985
3985 case URxvt_view_up: 3986 case URxvt_view_up:
… …
4038 return state; 4039 return state;
4039} 4040}
4040 4041
4041/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
4042void 4043void
4043rxvt_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)
4044{ 4045{
4045 unsigned int i, j; 4046 unsigned int i, j;
4046 int state; 4047 int state;
4047 4048
4048 static const struct 4049 static const struct
… …
4417rxvt_term::tt_write (const char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4419{
4419 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)))
4420 return; 4421 return;
4421 4422
4422 if (pty.pty < 0) 4423 if (pty->pty < 0)
4423 return; 4424 return;
4424 4425
4425 if (v_buflen == 0) 4426 if (v_buflen == 0)
4426 { 4427 {
4427 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));
4428 4429
4429 if ((unsigned int)written == len) 4430 if ((unsigned int)written == len)
4430 return; 4431 return;
4431 4432
4432 data += written; 4433 data += written;
… …
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4443}
4443 4444
4444void rxvt_term::pty_write () 4445void rxvt_term::pty_write ()
4445{ 4446{
4446 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));
4447 4448
4448 if (written > 0) 4449 if (written > 0)
4449 { 4450 {
4450 v_buflen -= written; 4451 v_buflen -= written;
4451 4452

Diff Legend

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