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.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.279 by root, Sat Jan 21 14:25:05 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
1307 // for XQueryPointer
1320 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1321 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1322 unsigned int unused_mask; 1310 unsigned int unused_mask;
1323 1311
1324 switch (ev.type) 1312 switch (ev.type)
… …
1414 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1415 break; 1403 break;
1416 1404
1417 case ClientMessage: 1405 case ClientMessage:
1418 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 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 {
1421 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)))
1422 destroy (); 1416 destroy ();
1417 }
1423#if ENABLE_EWMH 1418#if ENABLE_EWMH
1424 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])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &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 }
1428#endif 1434#endif
1429 } 1435 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break; 1436 break;
1466 1437
1467 case MappingNotify: 1438 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1440 break;
… …
1511 { 1482 {
1512 seen_resize = 1; 1483 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1485 }
1515 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1518 check_our_parents (); 1491 check_our_parents ();
1519#endif 1492#endif
1520 } 1493 }
1521 break; 1494 break;
1522 1495
1523 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527 1501
1528 break; 1502 break;
1529 1503
1530 case SelectionClear: 1504 case SelectionClear:
1531 selection_clear (); 1505 selection_clear ();
… …
1591 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1592 { 1566 {
1593 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1594 scrollbar_show (0); 1568 scrollbar_show (0);
1595 } 1569 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600 1570
1601#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1604#endif 1574#endif
1605 } 1575 }
1606 break; 1576 break;
1607 1577
1608 case MotionNotify: 1578 case MotionNotify:
1609 printf ("motion notify\n");//D
1610#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1580 if (hidden_pointer)
1612 pointer_unblank (); 1581 pointer_unblank ();
1613#endif 1582#endif
1614#if MENUBAR
1615 if (isMenuBarWindow (ev.xany.window))
1616 {
1617 menubar_control (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1584 break;
1623 1585
1624 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1625 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1590 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1592 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1631 ; 1594 ;
… …
1731 { 1694 {
1732 hidden_cursor = 0; 1695 hidden_cursor = 0;
1733 want_refresh = 1; 1696 want_refresh = 1;
1734 } 1697 }
1735 1698
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737 } 1700 }
1738#endif 1701#endif
1739 1702
1740#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1769 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1770 } 1733 }
1771#endif 1734#endif
1772#if CURSOR_BLINK 1735#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1736 if (OPTION (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1775#endif 1738#endif
1776#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1778 { 1741 {
1779 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
1823 1786
1824#if TRANSPARENT 1787#if TRANSPARENT
1825void 1788void
1826rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1790{
1828 SET_R (this); 1791 make_current ();
1829 SET_LOCALE (locale);
1830 1792
1831 switch (ev.type) 1793 switch (ev.type)
1832 { 1794 {
1833 case PropertyNotify: 1795 case PropertyNotify:
1834 /* 1796 /*
… …
2103 } 2065 }
2104 } 2066 }
2105 2067
2106 return; 2068 return;
2107 } 2069 }
2108
2109#if MENUBAR
2110 /*
2111 * Menubar window processing of button press
2112 */
2113 if (isMenuBarWindow (ev.window))
2114 menubar_control (ev);
2115#endif
2116} 2070}
2117 2071
2118void 2072void
2119rxvt_term::button_release (XButtonEvent &ev) 2073rxvt_term::button_release (XButtonEvent &ev)
2120{ 2074{
… …
2126 2080
2127 if (scrollbar_isUpDn ()) 2081 if (scrollbar_isUpDn ())
2128 { 2082 {
2129 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2130 scrollbar_show (0); 2084 scrollbar_show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2085 }
2135 2086
2136#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active) 2088 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
… …
2185 { 2136 {
2186 case Button1: 2137 case Button1:
2187 case Button3: 2138 case Button3:
2188 selection_make (ev.time); 2139 selection_make (ev.time);
2189 break; 2140 break;
2141
2190 case Button2: 2142 case Button2:
2191 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);
2192 break; 2145 break;
2146
2193#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2194 case Button4: 2148 case Button4:
2195 case Button5: 2149 case Button5:
2196 { 2150 {
2197 int i; 2151 int i;
… …
2229 } 2183 }
2230 break; 2184 break;
2231#endif 2185#endif
2232 } 2186 }
2233 } 2187 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2188}
2239 2189
2240#ifdef TRANSPARENT 2190#ifdef TRANSPARENT
2241#if TINTING 2191#if TINTING
2242/* taken from aterm-0.4.2 */ 2192/* taken from aterm-0.4.2 */
… …
2679 am_transparent = 0; 2629 am_transparent = 0;
2680 /* XXX: also turn off Opt_transparent? */ 2630 /* XXX: also turn off Opt_transparent? */
2681 } 2631 }
2682 else 2632 else
2683 { 2633 {
2684#if WAIT_FOR_WM
2685 /* wait (an arbitrary period) for the WM to do its thing
2686 * needed for fvwm2.2.2 (and before?) */
2687 sleep (1);
2688#endif
2689 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2690 { 2635 {
2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2692 XClearWindow (disp, parent[n]); 2637 XClearWindow (disp, parent[n]);
2693 } 2638 }
… …
2785 } 2730 }
2786 2731
2787 // scr_add_lines only works for nlines <= nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2733 if (nlines >= nrow - 1)
2789 { 2734 {
2735 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2736 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2737 scr_add_lines (buf, str - buf, nlines);
2792 2738
2793 nlines = 0; 2739 nlines = 0;
2794 str = buf; 2740 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2741 eol = str + min (ncol, UBUFSIZ);
… …
2810 2756
2811 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2758 ch = next_char ();
2813 } 2759 }
2814 2760
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2763 scr_add_lines (buf, str - buf, nlines);
2817 2764
2818 /* 2765 /*
2819 * If there have been a lot of new lines, then update the screen 2766 * If there have been a lot of new lines, then update the screen
2820 * What the heck I'll cheat and only refresh less than every page-full. 2767 * What the heck I'll cheat and only refresh less than every page-full.
… …
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++; 2774 refresh_limit++;
2828 else 2775 else
2829 { 2776 {
2830 flag = true; 2777 flag = true;
2831 scr_refresh (refresh_type); 2778 scr_refresh ();
2832 want_refresh = 1; 2779 want_refresh = 1;
2833 } 2780 }
2834 } 2781 }
2835 2782
2836 } 2783 }
… …
2854 return flag; 2801 return flag;
2855} 2802}
2856 2803
2857// read the next character 2804// read the next character
2858wchar_t 2805wchar_t
2859rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2860{ 2807{
2861 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2862 { 2809 {
2863 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2885 return NOCHAR; 2832 return NOCHAR;
2886} 2833}
2887 2834
2888// read the next octet 2835// read the next octet
2889uint32_t 2836uint32_t
2890rxvt_term::next_octet () 2837rxvt_term::next_octet () NOTHROW
2891{ 2838{
2892 return cmdbuf_ptr < cmdbuf_endp 2839 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++ 2840 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR; 2841 : NOCHAR;
2895} 2842}
2843
2844static class out_of_input out_of_input;
2896 2845
2897/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2898/* 2847/*
2899 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2900 * to the command. 2849 * to the command.
2901 */ 2850 */
2902wchar_t 2851wchar_t
2903rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2904{ 2853{
2905 wchar_t c = next_char (); 2854 wchar_t c = next_char ();
2906 2855
2907 if (c == NOCHAR) 2856 if (c == NOCHAR)
2908 throw out_of_input; 2857 throw out_of_input;
2909 2858
2910 return c; 2859 return c;
2911} 2860}
2912 2861
2913uint32_t 2862uint32_t
2914rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915{ 2864{
2916 uint32_t c = next_octet (); 2865 uint32_t c = next_octet ();
2917 2866
2918 if (c == NOCHAR) 2867 if (c == NOCHAR)
2919 throw out_of_input; 2868 throw out_of_input;
… …
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3748 */
3800void 3749void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802{ 3751{
3803 int changed = 0;
3804 int color; 3752 int color;
3805 char *buf, *name; 3753 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3755 int saveop = op;
3808 dDisp; 3756 dDisp;
… …
3924 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3925 break; 3873 break;
3926#endif 3874#endif
3927 3875
3928 case Rxvt_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3929 if (*str != ';') 3878 if (*str != ';')
3930 { 3879 {
3931#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3934 scr_touch (true); 3883 scr_touch (true);
3935#endif 3884#endif
3936 } 3885 }
3937 3886
3887 int changed = 0;
3888
3938 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3939 { 3890 {
3940 str++; 3891 str++;
3941#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3942 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3943#endif 3894#endif
3944 } 3895 }
3945 3896
3946 if (changed) 3897 if (changed)
3947 { 3898 {
3948#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3949 resize_pixmap (); 3900 resize_pixmap ();
3950 scr_touch (true); 3901 scr_touch (true);
3951#endif 3902#endif
3952 } 3903 }
3904 }
3953 break; 3905 break;
3954 3906
3955 case Rxvt_restoreFG: 3907 case Rxvt_restoreFG:
3956 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3957 break; 3909 break;
… …
3961 3913
3962 case XTerm_logfile: 3914 case XTerm_logfile:
3963 // TODO, when secure mode? 3915 // TODO, when secure mode?
3964 break; 3916 break;
3965 3917
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0 3918#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3919 case Rxvt_dumpscreen: /* no error notices */
3974 { 3920 {
3975 int fd; 3921 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4009 if (query) 3955 if (query)
4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4011 else 3957 else
4012 { 3958 {
4013 set_locale (str); 3959 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 3960 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 3961 init_xlocale ();
4016 } 3962 }
4017 break; 3963 break;
4018 3964
4019 case URxvt_view_up: 3965 case URxvt_view_up:
… …
4072 return state; 4018 return state;
4073} 4019}
4074 4020
4075/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
4076void 4022void
4077rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4078{ 4024{
4079 unsigned int i, j; 4025 unsigned int i, j;
4080 int state; 4026 int state;
4081 4027
4082 static const struct 4028 static const struct
… …
4093 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
4094 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
4095 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
4096 // 8, bi-directional support mode 4042 // 8, bi-directional support mode
4097 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc
4099 { menuBar_esc, PrivMode_menuBar },
4100#endif
4101 // 18, 19 printing-related 4044 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 4045 { 25, PrivMode_VisibleCursor },
4103#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 4048#endif
… …
4200 /* case 8: - auto repeat, can't do on a per window basis */ 4143 /* case 8: - auto repeat, can't do on a per window basis */
4201 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
4204 break; 4147 break;
4205#ifdef menuBar_esc
4206 case menuBar_esc:
4207#ifdef MENUBAR
4208 map_menuBar (state);
4209#endif
4210 break;
4211#endif
4212#ifdef scrollBar_esc 4148#ifdef scrollBar_esc
4213 case scrollBar_esc: 4149 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
4215 { 4151 {
4216 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
4461rxvt_term::tt_write (const char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 4398{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 4400 return;
4465 4401
4466 if (pty.pty < 0) 4402 if (pty->pty < 0)
4467 return; 4403 return;
4468 4404
4469 if (v_buflen == 0) 4405 if (v_buflen == 0)
4470 { 4406 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 4408
4473 if ((unsigned int)written == len) 4409 if ((unsigned int)written == len)
4474 return; 4410 return;
4475 4411
4476 data += written; 4412 data += written;
… …
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486} 4422}
4487 4423
4488void rxvt_term::pty_write () 4424void rxvt_term::pty_write ()
4489{ 4425{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 4427
4492 if (written > 0) 4428 if (written > 0)
4493 { 4429 {
4494 v_buflen -= written; 4430 v_buflen -= written;
4495 4431

Diff Legend

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