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.260 by root, Fri Jan 13 05:04:33 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)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
… …
443 scr_move_to (0, 1); 440 scr_move_to (0, 1);
444 return; 441 return;
445 } 442 }
446 else if (keysym == XK_End) 443 else if (keysym == XK_End)
447 { 444 {
448 scr_move_to (1, 0); 445 scr_move_to (1, 1);
449 return; 446 return;
450 } 447 }
451 } 448 }
452#endif 449#endif
453 } 450 }
… …
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);
… …
919#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
921} 918}
922/*}}} */ 919/*}}} */
923 920
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 922unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 924{
930 unsigned int n, s; 925 unsigned int n, s;
931 926
… …
972 967
973 if (want_refresh) 968 if (want_refresh)
974 { 969 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 971 {
977 int row = -view_start; 972 int row = view_start;
978 int end_row = row + nrow; 973 int end_row = row + nrow;
979 974
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 975 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 976 --row;
982 977
983 do 978 do
984 { 979 {
985 int start_row = row; 980 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1003 while (l->is_longer () && row < end_row);
1009 } 1004 }
1010 while (row < end_row); 1005 while (row < end_row);
1011 } 1006 }
1012 1007
1013 scr_refresh (refresh_type); 1008 scr_refresh ();
1014 scrollbar_show (1); 1009 scrollbar_show (1);
1015#ifdef USE_XIM 1010#ifdef USE_XIM
1016 IMSendSpot (); 1011 IMSendSpot ();
1017#endif 1012#endif
1018 } 1013 }
… …
1021} 1016}
1022 1017
1023void 1018void
1024rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
1025{ 1020{
1026 SET_R (this); 1021 make_current ();
1027 SET_LOCALE (locale);
1028 1022
1029 display->flush (); 1023 display->flush ();
1030 1024
1031 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1027}
1034 1028
1035void 1029void
1036rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
1037{ 1031{
1038 SET_R (this); 1032 make_current ();
1039 SET_LOCALE (locale);
1040 1033
1041 refresh_limit = 1; 1034 refresh_limit = 1;
1042 refresh_count = 0; 1035 refresh_count = 0;
1043 flush (); 1036 flush ();
1044} 1037}
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1042{
1050 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1044 want_refresh = 1;
1052 1045
1053 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1047}
1055#endif 1048#endif
1056 1049
1057#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1058void 1051void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1066{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1069 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1070 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1072 }
1081} 1073}
1082#endif 1074#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1079{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1081 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1083 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1085 }
1095} 1086}
1096#endif 1087#endif
… …
1101{ 1092{
1102 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1096 {
1106 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1109 1099
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1100 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1102 }
1114} 1103}
1115#endif 1104#endif
… …
1145 1134
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1149 1138
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1140
1152 if (r > 0) 1141 if (r > 0)
1153 { 1142 {
1154 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1155 return true; 1144 return true;
… …
1173} 1162}
1174 1163
1175void 1164void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1166{
1178 SET_R (this); 1167 make_current ();
1179 SET_LOCALE (locale);
1180 1168
1181 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1171 while (pty_fill ())
1184 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1216} 1204}
1217 1205
1218void 1206void
1219rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1220{ 1208{
1221 SET_R (this); 1209 make_current ();
1222 SET_LOCALE (locale);
1223 1210
1224 pointer_blank (); 1211 pointer_blank ();
1225} 1212}
1226#endif 1213#endif
1227 1214
… …
1306 1293
1307/*{{{ process an X event */ 1294/*{{{ process an X event */
1308void 1295void
1309rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1310{ 1297{
1298 make_current ();
1299
1311 dDisp; 1300 dDisp;
1312 1301
1313 SET_R (this);
1314 SET_LOCALE (locale);
1315
1316 if (ev.xany.window == vt 1302 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1305 return;
1319 1306
1320 // for XQueryPointer 1307 // for XQueryPointer
1321 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
… …
1415 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1416 break; 1403 break;
1417 1404
1418 case ClientMessage: 1405 case ClientMessage:
1419 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1420 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1421 { 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 {
1422 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)))
1423 destroy (); 1416 destroy ();
1417 }
1424#if ENABLE_EWMH 1418#if ENABLE_EWMH
1425 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])
1426 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1427 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1428 &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 }
1429#endif 1434#endif
1430 } 1435 }
1431#if ENABLE_XEMBED
1432 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1433 {
1434 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1435 focus_in ();
1436 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1437 focus_out ();
1438 }
1439#endif
1440#ifdef OFFIX_DND
1441 /* OffiX Dnd (drag 'n' drop) protocol */
1442 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1443 && (ev.xclient.data.l[0] == DndFile
1444 || ev.xclient.data.l[0] == DndDir
1445 || ev.xclient.data.l[0] == DndLink))
1446 {
1447 /* Get Dnd data */
1448 Atom ActualType;
1449 int ActualFormat;
1450 unsigned char *data;
1451 unsigned long Size, RemainingBytes;
1452
1453 XGetWindowProperty (disp, display->root,
1454 xa[XA_DNDSELECTION],
1455 0L, 1000000L,
1456 False, AnyPropertyType,
1457 &ActualType, &ActualFormat,
1458 &Size, &RemainingBytes,
1459 &data);
1460 set_string_property (XA_CUT_BUFFER0, data);
1461 XFree (data);
1462 selection_paste (display->root, XA_CUT_BUFFER0, true);
1463 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1464 }
1465#endif /* OFFIX_DND */
1466 break; 1436 break;
1467 1437
1468 case MappingNotify: 1438 case MappingNotify:
1469 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1470 break; 1440 break;
… …
1512 { 1482 {
1513 seen_resize = 1; 1483 seen_resize = 1;
1514 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1515 } 1485 }
1516 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1517#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1518 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1519 check_our_parents (); 1491 check_our_parents ();
1520#endif 1492#endif
1521 } 1493 }
… …
1592 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1593 { 1565 {
1594 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1595 scrollbar_show (0); 1567 scrollbar_show (0);
1596 } 1568 }
1597#ifdef MENUBAR
1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599 menubar_expose ();
1600#endif
1601 1569
1602#ifdef TRANSPARENT 1570#ifdef TRANSPARENT
1603 if (am_transparent && ev.xany.window == parent[0]) 1571 if (am_transparent && ev.xany.window == parent[0])
1604 XClearWindow (disp, ev.xany.window); 1572 XClearWindow (disp, ev.xany.window);
1605#endif 1573#endif
1606 } 1574 }
1607 break; 1575 break;
1608 1576
1609 case MotionNotify: 1577 case MotionNotify:
1610 printf ("motion notify\n");//D
1611#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1612 if (hidden_pointer) 1579 if (hidden_pointer)
1613 pointer_unblank (); 1580 pointer_unblank ();
1614#endif 1581#endif
1615#if MENUBAR
1616 if (isMenuBarWindow (ev.xany.window))
1617 {
1618 menubar_control (ev.xbutton);
1619 break;
1620 }
1621#endif
1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1623 break; 1583 break;
1624 1584
1625 if (ev.xany.window == vt) 1585 if (ev.xany.window == vt)
1626 { 1586 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop 1589 ; // nop
1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1630 { 1591 {
1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1632 ; 1593 ;
… …
1732 { 1693 {
1733 hidden_cursor = 0; 1694 hidden_cursor = 0;
1734 want_refresh = 1; 1695 want_refresh = 1;
1735 } 1696 }
1736 1697
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738 } 1699 }
1739#endif 1700#endif
1740 1701
1741#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1770 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1771 } 1732 }
1772#endif 1733#endif
1773#if CURSOR_BLINK 1734#if CURSOR_BLINK
1774 if (OPTION (Opt_cursorBlink)) 1735 if (OPTION (Opt_cursorBlink))
1775 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1776#endif 1737#endif
1777#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1779 { 1740 {
1780 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
… …
1824 1785
1825#if TRANSPARENT 1786#if TRANSPARENT
1826void 1787void
1827rxvt_term::rootwin_cb (XEvent &ev) 1788rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1789{
1829 SET_R (this); 1790 make_current ();
1830 SET_LOCALE (locale);
1831 1791
1832 switch (ev.type) 1792 switch (ev.type)
1833 { 1793 {
1834 case PropertyNotify: 1794 case PropertyNotify:
1835 /* 1795 /*
… …
2104 } 2064 }
2105 } 2065 }
2106 2066
2107 return; 2067 return;
2108 } 2068 }
2109
2110#if MENUBAR
2111 /*
2112 * Menubar window processing of button press
2113 */
2114 if (isMenuBarWindow (ev.window))
2115 menubar_control (ev);
2116#endif
2117} 2069}
2118 2070
2119void 2071void
2120rxvt_term::button_release (XButtonEvent &ev) 2072rxvt_term::button_release (XButtonEvent &ev)
2121{ 2073{
… …
2127 2079
2128 if (scrollbar_isUpDn ()) 2080 if (scrollbar_isUpDn ())
2129 { 2081 {
2130 scrollBar.setIdle (); 2082 scrollBar.setIdle ();
2131 scrollbar_show (0); 2083 scrollbar_show (0);
2132#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2133 refresh_type &= ~SMOOTH_REFRESH;
2134#endif
2135 } 2084 }
2136 2085
2137#ifdef SELECTION_SCROLLING 2086#ifdef SELECTION_SCROLLING
2138 if (sel_scroll_ev.active) 2087 if (sel_scroll_ev.active)
2139 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
… …
2186 { 2135 {
2187 case Button1: 2136 case Button1:
2188 case Button3: 2137 case Button3:
2189 selection_make (ev.time); 2138 selection_make (ev.time);
2190 break; 2139 break;
2140
2191 case Button2: 2141 case Button2:
2192 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);
2193 break; 2144 break;
2145
2194#ifdef MOUSE_WHEEL 2146#ifdef MOUSE_WHEEL
2195 case Button4: 2147 case Button4:
2196 case Button5: 2148 case Button5:
2197 { 2149 {
2198 int i; 2150 int i;
… …
2230 } 2182 }
2231 break; 2183 break;
2232#endif 2184#endif
2233 } 2185 }
2234 } 2186 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2187}
2240 2188
2241#ifdef TRANSPARENT 2189#ifdef TRANSPARENT
2242#if TINTING 2190#if TINTING
2243/* taken from aterm-0.4.2 */ 2191/* taken from aterm-0.4.2 */
… …
2786 } 2734 }
2787 2735
2788 // scr_add_lines only works for nlines <= nrow - 1. 2736 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2737 if (nlines >= nrow - 1)
2790 { 2738 {
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, str - buf, nlines); 2741 scr_add_lines (buf, str - buf, nlines);
2793 2742
2794 nlines = 0; 2743 nlines = 0;
2795 str = buf; 2744 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2745 eol = str + min (ncol, UBUFSIZ);
… …
2811 2760
2812 seq_begin = cmdbuf_ptr; 2761 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2762 ch = next_char ();
2814 } 2763 }
2815 2764
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, str - buf, nlines); 2767 scr_add_lines (buf, str - buf, nlines);
2818 2768
2819 /* 2769 /*
2820 * If there have been a lot of new lines, then update the screen 2770 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2771 * What the heck I'll cheat and only refresh less than every page-full.
… …
2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828 refresh_limit++; 2778 refresh_limit++;
2829 else 2779 else
2830 { 2780 {
2831 flag = true; 2781 flag = true;
2832 scr_refresh (refresh_type); 2782 scr_refresh ();
2833 want_refresh = 1; 2783 want_refresh = 1;
2834 } 2784 }
2835 } 2785 }
2836 2786
2837 } 2787 }
… …
2855 return flag; 2805 return flag;
2856} 2806}
2857 2807
2858// read the next character 2808// read the next character
2859wchar_t 2809wchar_t
2860rxvt_term::next_char () 2810rxvt_term::next_char () NOTHROW
2861{ 2811{
2862 while (cmdbuf_ptr < cmdbuf_endp) 2812 while (cmdbuf_ptr < cmdbuf_endp)
2863 { 2813 {
2864 // assume 7-bit to be ascii ALWAYS 2814 // assume 7-bit to be ascii ALWAYS
2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2815 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2886 return NOCHAR; 2836 return NOCHAR;
2887} 2837}
2888 2838
2889// read the next octet 2839// read the next octet
2890uint32_t 2840uint32_t
2891rxvt_term::next_octet () 2841rxvt_term::next_octet () NOTHROW
2892{ 2842{
2893 return cmdbuf_ptr < cmdbuf_endp 2843 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++ 2844 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR; 2845 : NOCHAR;
2896} 2846}
2847
2848static class out_of_input out_of_input;
2897 2849
2898/* rxvt_cmd_getc () - Return next input character */ 2850/* rxvt_cmd_getc () - Return next input character */
2899/* 2851/*
2900 * Return the next input character after first passing any keyboard input 2852 * Return the next input character after first passing any keyboard input
2901 * to the command. 2853 * to the command.
2902 */ 2854 */
2903wchar_t 2855wchar_t
2904rxvt_term::cmd_getc () 2856rxvt_term::cmd_getc () THROW ((class out_of_input))
2905{ 2857{
2906 wchar_t c = next_char (); 2858 wchar_t c = next_char ();
2907 2859
2908 if (c == NOCHAR) 2860 if (c == NOCHAR)
2909 throw out_of_input; 2861 throw out_of_input;
2910 2862
2911 return c; 2863 return c;
2912} 2864}
2913 2865
2914uint32_t 2866uint32_t
2915rxvt_term::cmd_get8 () 2867rxvt_term::cmd_get8 () THROW ((class out_of_input))
2916{ 2868{
2917 uint32_t c = next_octet (); 2869 uint32_t c = next_octet ();
2918 2870
2919 if (c == NOCHAR) 2871 if (c == NOCHAR)
2920 throw out_of_input; 2872 throw out_of_input;
… …
3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3751 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3800 */ 3752 */
3801void 3753void
3802rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3754rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803{ 3755{
3804 int changed = 0;
3805 int color; 3756 int color;
3806 char *buf, *name; 3757 char *buf, *name;
3807 bool query = str[0] == '?' && !str[1]; 3758 bool query = str[0] == '?' && !str[1];
3808 int saveop = op; 3759 int saveop = op;
3809 dDisp; 3760 dDisp;
… …
3925 want_full_refresh = want_refresh = 1; 3876 want_full_refresh = want_refresh = 1;
3926 break; 3877 break;
3927#endif 3878#endif
3928 3879
3929 case Rxvt_Pixmap: 3880 case Rxvt_Pixmap:
3881 {
3930 if (*str != ';') 3882 if (*str != ';')
3931 { 3883 {
3932#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3933 scale_pixmap (""); /* reset to default scaling */ 3885 scale_pixmap (""); /* reset to default scaling */
3934 set_bgPixmap (str); /* change pixmap */ 3886 set_bgPixmap (str); /* change pixmap */
3935 scr_touch (true); 3887 scr_touch (true);
3936#endif 3888#endif
3937 } 3889 }
3938 3890
3891 int changed = 0;
3892
3939 while ((str = strchr (str, ';')) != NULL) 3893 while ((str = strchr (str, ';')) != NULL)
3940 { 3894 {
3941 str++; 3895 str++;
3942#if XPM_BACKGROUND 3896#if XPM_BACKGROUND
3943 changed += scale_pixmap (str); 3897 changed += scale_pixmap (str);
3944#endif 3898#endif
3945 } 3899 }
3946 3900
3947 if (changed) 3901 if (changed)
3948 { 3902 {
3949#ifdef XPM_BACKGROUND 3903#ifdef XPM_BACKGROUND
3950 resize_pixmap (); 3904 resize_pixmap ();
3951 scr_touch (true); 3905 scr_touch (true);
3952#endif 3906#endif
3953 } 3907 }
3908 }
3954 break; 3909 break;
3955 3910
3956 case Rxvt_restoreFG: 3911 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3912 set_window_color (Color_fg, str);
3958 break; 3913 break;
… …
3962 3917
3963 case XTerm_logfile: 3918 case XTerm_logfile:
3964 // TODO, when secure mode? 3919 // TODO, when secure mode?
3965 break; 3920 break;
3966 3921
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3922#if 0
3974 case Rxvt_dumpscreen: /* no error notices */ 3923 case Rxvt_dumpscreen: /* no error notices */
3975 { 3924 {
3976 int fd; 3925 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3926 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4010 if (query) 3959 if (query)
4011 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);
4012 else 3961 else
4013 { 3962 {
4014 set_locale (str); 3963 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3964 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3965 init_xlocale ();
4017 } 3966 }
4018 break; 3967 break;
4019 3968
4020 case URxvt_view_up: 3969 case URxvt_view_up:
… …
4073 return state; 4022 return state;
4074} 4023}
4075 4024
4076/* we're not using priv _yet_ */ 4025/* we're not using priv _yet_ */
4077void 4026void
4078rxvt_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)
4079{ 4028{
4080 unsigned int i, j; 4029 unsigned int i, j;
4081 int state; 4030 int state;
4082 4031
4083 static const struct 4032 static const struct
… …
4094 { 5, PrivMode_rVideo }, 4043 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 4044 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 4045 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 4046 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 4047 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 4048 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 4049 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 4050#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 4051 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 4052#endif
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4147 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4148 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4149 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4150 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4151 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4152#ifdef scrollBar_esc
4214 case scrollBar_esc: 4153 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4154 if (scrollbar_mapping (state))
4216 { 4155 {
4217 resize_all_windows (0, 0, 0); 4156 resize_all_windows (0, 0, 0);
… …
4462rxvt_term::tt_write (const char *data, unsigned int len) 4401rxvt_term::tt_write (const char *data, unsigned int len)
4463{ 4402{
4464 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)))
4465 return; 4404 return;
4466 4405
4467 if (pty.pty < 0) 4406 if (pty->pty < 0)
4468 return; 4407 return;
4469 4408
4470 if (v_buflen == 0) 4409 if (v_buflen == 0)
4471 { 4410 {
4472 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));
4473 4412
4474 if ((unsigned int)written == len) 4413 if ((unsigned int)written == len)
4475 return; 4414 return;
4476 4415
4477 data += written; 4416 data += written;
… …
4486 pty_ev.set (EVENT_READ | EVENT_WRITE); 4425 pty_ev.set (EVENT_READ | EVENT_WRITE);
4487} 4426}
4488 4427
4489void rxvt_term::pty_write () 4428void rxvt_term::pty_write ()
4490{ 4429{
4491 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));
4492 4431
4493 if (written > 0) 4432 if (written > 0)
4494 { 4433 {
4495 v_buflen -= written; 4434 v_buflen -= written;
4496 4435

Diff Legend

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