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.277 by root, Fri Jan 20 12:16:28 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;
… …
1405 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1406 break; 1403 break;
1407 1404
1408 case ClientMessage: 1405 case ClientMessage:
1409 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1408 {
1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1410 {
1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1412 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1414 {
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1416 destroy ();
1417 }
1414#if ENABLE_EWMH 1418#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1422 &ev);
1423#endif
1424 }
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1419#endif 1434#endif
1420 } 1435 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break; 1436 break;
1457 1437
1458 case MappingNotify: 1438 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1440 break;
… …
1502 { 1482 {
1503 seen_resize = 1; 1483 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1485 }
1506 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1509 check_our_parents (); 1491 check_our_parents ();
1510#endif 1492#endif
1511 } 1493 }
… …
1711 { 1693 {
1712 hidden_cursor = 0; 1694 hidden_cursor = 0;
1713 want_refresh = 1; 1695 want_refresh = 1;
1714 } 1696 }
1715 1697
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717 } 1699 }
1718#endif 1700#endif
1719 1701
1720#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1749 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1750 } 1732 }
1751#endif 1733#endif
1752#if CURSOR_BLINK 1734#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1735 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755#endif 1737#endif
1756#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1758 { 1740 {
1759 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
… …
2153 { 2135 {
2154 case Button1: 2136 case Button1:
2155 case Button3: 2137 case Button3:
2156 selection_make (ev.time); 2138 selection_make (ev.time);
2157 break; 2139 break;
2140
2158 case Button2: 2141 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2144 break;
2145
2161#ifdef MOUSE_WHEEL 2146#ifdef MOUSE_WHEEL
2162 case Button4: 2147 case Button4:
2163 case Button5: 2148 case Button5:
2164 { 2149 {
2165 int i; 2150 int i;
… …
2820 return flag; 2805 return flag;
2821} 2806}
2822 2807
2823// read the next character 2808// read the next character
2824wchar_t 2809wchar_t
2825rxvt_term::next_char () 2810rxvt_term::next_char () NOTHROW
2826{ 2811{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2812 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2813 {
2829 // assume 7-bit to be ascii ALWAYS 2814 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2815 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2851 return NOCHAR; 2836 return NOCHAR;
2852} 2837}
2853 2838
2854// read the next octet 2839// read the next octet
2855uint32_t 2840uint32_t
2856rxvt_term::next_octet () 2841rxvt_term::next_octet () NOTHROW
2857{ 2842{
2858 return cmdbuf_ptr < cmdbuf_endp 2843 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2844 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2845 : NOCHAR;
2861} 2846}
2847
2848static class out_of_input out_of_input;
2862 2849
2863/* rxvt_cmd_getc () - Return next input character */ 2850/* rxvt_cmd_getc () - Return next input character */
2864/* 2851/*
2865 * Return the next input character after first passing any keyboard input 2852 * Return the next input character after first passing any keyboard input
2866 * to the command. 2853 * to the command.
2867 */ 2854 */
2868wchar_t 2855wchar_t
2869rxvt_term::cmd_getc () 2856rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2857{
2871 wchar_t c = next_char (); 2858 wchar_t c = next_char ();
2872 2859
2873 if (c == NOCHAR) 2860 if (c == NOCHAR)
2874 throw out_of_input; 2861 throw out_of_input;
2875 2862
2876 return c; 2863 return c;
2877} 2864}
2878 2865
2879uint32_t 2866uint32_t
2880rxvt_term::cmd_get8 () 2867rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2868{
2882 uint32_t c = next_octet (); 2869 uint32_t c = next_octet ();
2883 2870
2884 if (c == NOCHAR) 2871 if (c == NOCHAR)
2885 throw out_of_input; 2872 throw out_of_input;
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3751 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3752 */
3766void 3753void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3754rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3755{
3769 int changed = 0;
3770 int color; 3756 int color;
3771 char *buf, *name; 3757 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3758 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3759 int saveop = op;
3774 dDisp; 3760 dDisp;
… …
3890 want_full_refresh = want_refresh = 1; 3876 want_full_refresh = want_refresh = 1;
3891 break; 3877 break;
3892#endif 3878#endif
3893 3879
3894 case Rxvt_Pixmap: 3880 case Rxvt_Pixmap:
3881 {
3895 if (*str != ';') 3882 if (*str != ';')
3896 { 3883 {
3897#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3898 scale_pixmap (""); /* reset to default scaling */ 3885 scale_pixmap (""); /* reset to default scaling */
3899 set_bgPixmap (str); /* change pixmap */ 3886 set_bgPixmap (str); /* change pixmap */
3900 scr_touch (true); 3887 scr_touch (true);
3901#endif 3888#endif
3902 } 3889 }
3903 3890
3891 int changed = 0;
3892
3904 while ((str = strchr (str, ';')) != NULL) 3893 while ((str = strchr (str, ';')) != NULL)
3905 { 3894 {
3906 str++; 3895 str++;
3907#if XPM_BACKGROUND 3896#if XPM_BACKGROUND
3908 changed += scale_pixmap (str); 3897 changed += scale_pixmap (str);
3909#endif 3898#endif
3910 } 3899 }
3911 3900
3912 if (changed) 3901 if (changed)
3913 { 3902 {
3914#ifdef XPM_BACKGROUND 3903#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3904 resize_pixmap ();
3916 scr_touch (true); 3905 scr_touch (true);
3917#endif 3906#endif
3918 } 3907 }
3908 }
3919 break; 3909 break;
3920 3910
3921 case Rxvt_restoreFG: 3911 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3912 set_window_color (Color_fg, str);
3923 break; 3913 break;
… …
3969 if (query) 3959 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3971 else 3961 else
3972 { 3962 {
3973 set_locale (str); 3963 set_locale (str);
3974 pty.set_utf8_mode (enc_utf8); 3964 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3965 init_xlocale ();
3976 } 3966 }
3977 break; 3967 break;
3978 3968
3979 case URxvt_view_up: 3969 case URxvt_view_up:
… …
4032 return state; 4022 return state;
4033} 4023}
4034 4024
4035/* we're not using priv _yet_ */ 4025/* we're not using priv _yet_ */
4036void 4026void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4027rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 4028{
4039 unsigned int i, j; 4029 unsigned int i, j;
4040 int state; 4030 int state;
4041 4031
4042 static const struct 4032 static const struct
… …
4411rxvt_term::tt_write (const char *data, unsigned int len) 4401rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 4402{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4403 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return; 4404 return;
4415 4405
4416 if (pty.pty < 0) 4406 if (pty->pty < 0)
4417 return; 4407 return;
4418 4408
4419 if (v_buflen == 0) 4409 if (v_buflen == 0)
4420 { 4410 {
4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4411 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422 4412
4423 if ((unsigned int)written == len) 4413 if ((unsigned int)written == len)
4424 return; 4414 return;
4425 4415
4426 data += written; 4416 data += written;
… …
4435 pty_ev.set (EVENT_READ | EVENT_WRITE); 4425 pty_ev.set (EVENT_READ | EVENT_WRITE);
4436} 4426}
4437 4427
4438void rxvt_term::pty_write () 4428void rxvt_term::pty_write ()
4439{ 4429{
4440 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4430 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441 4431
4442 if (written > 0) 4432 if (written > 0)
4443 { 4433 {
4444 v_buflen -= written; 4434 v_buflen -= written;
4445 4435

Diff Legend

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