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.278 by root, Fri Jan 20 18:50:49 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;
… …
1408 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1409 break; 1403 break;
1410 1404
1411 case ClientMessage: 1405 case ClientMessage:
1412 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414 { 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 {
1415 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)))
1416 destroy (); 1416 destroy ();
1417 }
1417#if ENABLE_EWMH 1418#if ENABLE_EWMH
1418 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])
1419 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &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 }
1422#endif 1434#endif
1423 } 1435 }
1424#if ENABLE_XEMBED
1425 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426 {
1427 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428 focus_in ();
1429 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430 focus_out ();
1431 }
1432#endif
1433#ifdef OFFIX_DND
1434 /* OffiX Dnd (drag 'n' drop) protocol */
1435 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1436 && (ev.xclient.data.l[0] == DndFile
1437 || ev.xclient.data.l[0] == DndDir
1438 || ev.xclient.data.l[0] == DndLink))
1439 {
1440 /* Get Dnd data */
1441 Atom ActualType;
1442 int ActualFormat;
1443 unsigned char *data;
1444 unsigned long Size, RemainingBytes;
1445
1446 XGetWindowProperty (disp, display->root,
1447 xa[XA_DNDSELECTION],
1448 0L, 1000000L,
1449 False, AnyPropertyType,
1450 &ActualType, &ActualFormat,
1451 &Size, &RemainingBytes,
1452 &data);
1453 set_string_property (XA_CUT_BUFFER0, data);
1454 XFree (data);
1455 selection_paste (display->root, XA_CUT_BUFFER0, true);
1456 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1457 }
1458#endif /* OFFIX_DND */
1459 break; 1436 break;
1460 1437
1461 case MappingNotify: 1438 case MappingNotify:
1462 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1463 break; 1440 break;
… …
1505 { 1482 {
1506 seen_resize = 1; 1483 seen_resize = 1;
1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508 } 1485 }
1509 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1511 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1512 check_our_parents (); 1491 check_our_parents ();
1513#endif 1492#endif
1514 } 1493 }
1515 break; 1494 break;
1516 1495
1517 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1520 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1521 1501
1522 break; 1502 break;
1523 1503
1524 case SelectionClear: 1504 case SelectionClear:
1525 selection_clear (); 1505 selection_clear ();
… …
1714 { 1694 {
1715 hidden_cursor = 0; 1695 hidden_cursor = 0;
1716 want_refresh = 1; 1696 want_refresh = 1;
1717 } 1697 }
1718 1698
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720 } 1700 }
1721#endif 1701#endif
1722 1702
1723#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1752 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1753 } 1733 }
1754#endif 1734#endif
1755#if CURSOR_BLINK 1735#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1736 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1738#endif
1759#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1761 { 1741 {
1762 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
2100 2080
2101 if (scrollbar_isUpDn ()) 2081 if (scrollbar_isUpDn ())
2102 { 2082 {
2103 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2104 scrollbar_show (0); 2084 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2085 }
2109 2086
2110#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2088 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
… …
2159 { 2136 {
2160 case Button1: 2137 case Button1:
2161 case Button3: 2138 case Button3:
2162 selection_make (ev.time); 2139 selection_make (ev.time);
2163 break; 2140 break;
2141
2164 case Button2: 2142 case Button2:
2165 selection_request (ev.time, ev.x, ev.y); 2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2166 break; 2145 break;
2146
2167#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2168 case Button4: 2148 case Button4:
2169 case Button5: 2149 case Button5:
2170 { 2150 {
2171 int i; 2151 int i;
… …
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2779 refresh_limit++;
2800 else 2780 else
2801 { 2781 {
2802 flag = true; 2782 flag = true;
2803 scr_refresh (refresh_type); 2783 scr_refresh ();
2804 want_refresh = 1; 2784 want_refresh = 1;
2805 } 2785 }
2806 } 2786 }
2807 2787
2808 } 2788 }
… …
2826 return flag; 2806 return flag;
2827} 2807}
2828 2808
2829// read the next character 2809// read the next character
2830wchar_t 2810wchar_t
2831rxvt_term::next_char () 2811rxvt_term::next_char () NOTHROW
2832{ 2812{
2833 while (cmdbuf_ptr < cmdbuf_endp) 2813 while (cmdbuf_ptr < cmdbuf_endp)
2834 { 2814 {
2835 // assume 7-bit to be ascii ALWAYS 2815 // assume 7-bit to be ascii ALWAYS
2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2816 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2857 return NOCHAR; 2837 return NOCHAR;
2858} 2838}
2859 2839
2860// read the next octet 2840// read the next octet
2861uint32_t 2841uint32_t
2862rxvt_term::next_octet () 2842rxvt_term::next_octet () NOTHROW
2863{ 2843{
2864 return cmdbuf_ptr < cmdbuf_endp 2844 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++ 2845 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR; 2846 : NOCHAR;
2867} 2847}
2848
2849static class out_of_input out_of_input;
2868 2850
2869/* rxvt_cmd_getc () - Return next input character */ 2851/* rxvt_cmd_getc () - Return next input character */
2870/* 2852/*
2871 * Return the next input character after first passing any keyboard input 2853 * Return the next input character after first passing any keyboard input
2872 * to the command. 2854 * to the command.
2873 */ 2855 */
2874wchar_t 2856wchar_t
2875rxvt_term::cmd_getc () 2857rxvt_term::cmd_getc () THROW ((class out_of_input))
2876{ 2858{
2877 wchar_t c = next_char (); 2859 wchar_t c = next_char ();
2878 2860
2879 if (c == NOCHAR) 2861 if (c == NOCHAR)
2880 throw out_of_input; 2862 throw out_of_input;
2881 2863
2882 return c; 2864 return c;
2883} 2865}
2884 2866
2885uint32_t 2867uint32_t
2886rxvt_term::cmd_get8 () 2868rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887{ 2869{
2888 uint32_t c = next_octet (); 2870 uint32_t c = next_octet ();
2889 2871
2890 if (c == NOCHAR) 2872 if (c == NOCHAR)
2891 throw out_of_input; 2873 throw out_of_input;
… …
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3752 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3753 */
3772void 3754void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3755rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3756{
3775 int changed = 0;
3776 int color; 3757 int color;
3777 char *buf, *name; 3758 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3759 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3760 int saveop = op;
3780 dDisp; 3761 dDisp;
… …
3896 want_full_refresh = want_refresh = 1; 3877 want_full_refresh = want_refresh = 1;
3897 break; 3878 break;
3898#endif 3879#endif
3899 3880
3900 case Rxvt_Pixmap: 3881 case Rxvt_Pixmap:
3882 {
3901 if (*str != ';') 3883 if (*str != ';')
3902 { 3884 {
3903#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 3886 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 3887 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 3888 scr_touch (true);
3907#endif 3889#endif
3908 } 3890 }
3909 3891
3892 int changed = 0;
3893
3910 while ((str = strchr (str, ';')) != NULL) 3894 while ((str = strchr (str, ';')) != NULL)
3911 { 3895 {
3912 str++; 3896 str++;
3913#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 3898 changed += scale_pixmap (str);
3915#endif 3899#endif
3916 } 3900 }
3917 3901
3918 if (changed) 3902 if (changed)
3919 { 3903 {
3920#ifdef XPM_BACKGROUND 3904#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 3905 resize_pixmap ();
3922 scr_touch (true); 3906 scr_touch (true);
3923#endif 3907#endif
3924 } 3908 }
3909 }
3925 break; 3910 break;
3926 3911
3927 case Rxvt_restoreFG: 3912 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3913 set_window_color (Color_fg, str);
3929 break; 3914 break;
… …
3975 if (query) 3960 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3961 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3977 else 3962 else
3978 { 3963 {
3979 set_locale (str); 3964 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3965 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3966 init_xlocale ();
3982 } 3967 }
3983 break; 3968 break;
3984 3969
3985 case URxvt_view_up: 3970 case URxvt_view_up:
… …
4038 return state; 4023 return state;
4039} 4024}
4040 4025
4041/* we're not using priv _yet_ */ 4026/* we're not using priv _yet_ */
4042void 4027void
4043rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4028rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044{ 4029{
4045 unsigned int i, j; 4030 unsigned int i, j;
4046 int state; 4031 int state;
4047 4032
4048 static const struct 4033 static const struct
… …
4417rxvt_term::tt_write (const char *data, unsigned int len) 4402rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4403{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4404 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 4405 return;
4421 4406
4422 if (pty.pty < 0) 4407 if (pty->pty < 0)
4423 return; 4408 return;
4424 4409
4425 if (v_buflen == 0) 4410 if (v_buflen == 0)
4426 { 4411 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4412 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 4413
4429 if ((unsigned int)written == len) 4414 if ((unsigned int)written == len)
4430 return; 4415 return;
4431 4416
4432 data += written; 4417 data += written;
… …
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4427}
4443 4428
4444void rxvt_term::pty_write () 4429void rxvt_term::pty_write ()
4445{ 4430{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4432
4448 if (written > 0) 4433 if (written > 0)
4449 { 4434 {
4450 v_buflen -= written; 4435 v_buflen -= written;
4451 4436

Diff Legend

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