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.256 by root, Wed Jan 11 05:14:26 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)
… …
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); 1302 if (ev.xany.window == vt
1314 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1315 1306
1307 // for XQueryPointer
1316 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1310 unsigned int unused_mask;
1319 1311
1320 switch (ev.type) 1312 switch (ev.type)
… …
1410 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1411 break; 1403 break;
1412 1404
1413 case ClientMessage: 1405 case ClientMessage:
1414 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 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 {
1417 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)))
1418 destroy (); 1416 destroy ();
1417 }
1419#if ENABLE_EWMH 1418#if ENABLE_EWMH
1420 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])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &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 }
1424#endif 1434#endif
1425 } 1435 }
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 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break; 1436 break;
1462 1437
1463 case MappingNotify: 1438 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1440 break;
… …
1507 { 1482 {
1508 seen_resize = 1; 1483 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1485 }
1511 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1491 check_our_parents ();
1515#endif 1492#endif
1516 } 1493 }
1517 break; 1494 break;
1518 1495
1519 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1501
1524 break; 1502 break;
1525 1503
1526 case SelectionClear: 1504 case SelectionClear:
1527 selection_clear (); 1505 selection_clear ();
… …
1587 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1588 { 1566 {
1589 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1590 scrollbar_show (0); 1568 scrollbar_show (0);
1591 } 1569 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1570
1597#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1600#endif 1574#endif
… …
1604 case MotionNotify: 1578 case MotionNotify:
1605#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1580 if (hidden_pointer)
1607 pointer_unblank (); 1581 pointer_unblank ();
1608#endif 1582#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1584 break;
1618 1585
1619 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1620 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1590 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1592 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1626 ; 1594 ;
… …
1726 { 1694 {
1727 hidden_cursor = 0; 1695 hidden_cursor = 0;
1728 want_refresh = 1; 1696 want_refresh = 1;
1729 } 1697 }
1730 1698
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732 } 1700 }
1733#endif 1701#endif
1734 1702
1735#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1764 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1765 } 1733 }
1766#endif 1734#endif
1767#if CURSOR_BLINK 1735#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1736 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770#endif 1738#endif
1771#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1773 { 1741 {
1774 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
1818 1786
1819#if TRANSPARENT 1787#if TRANSPARENT
1820void 1788void
1821rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1790{
1823 SET_R (this); 1791 make_current ();
1824 SET_LOCALE (locale);
1825 1792
1826 switch (ev.type) 1793 switch (ev.type)
1827 { 1794 {
1828 case PropertyNotify: 1795 case PropertyNotify:
1829 /* 1796 /*
… …
1920#else 1887#else
1921 selection.rect = false; 1888 selection.rect = false;
1922#endif 1889#endif
1923 1890
1924 /* allow shift+left click to extend selection */ 1891 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1893 {
1927 if (MEvent.button == Button1 && clickintime) 1894 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1929 else 1896 else
1930 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
… …
2098 } 2065 }
2099 } 2066 }
2100 2067
2101 return; 2068 return;
2102 } 2069 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2070}
2112 2071
2113void 2072void
2114rxvt_term::button_release (XButtonEvent &ev) 2073rxvt_term::button_release (XButtonEvent &ev)
2115{ 2074{
… …
2121 2080
2122 if (scrollbar_isUpDn ()) 2081 if (scrollbar_isUpDn ())
2123 { 2082 {
2124 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2125 scrollbar_show (0); 2084 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2085 }
2130 2086
2131#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2088 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
… …
2180 { 2136 {
2181 case Button1: 2137 case Button1:
2182 case Button3: 2138 case Button3:
2183 selection_make (ev.time); 2139 selection_make (ev.time);
2184 break; 2140 break;
2141
2185 case Button2: 2142 case Button2:
2186 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);
2187 break; 2145 break;
2146
2188#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2189 case Button4: 2148 case Button4:
2190 case Button5: 2149 case Button5:
2191 { 2150 {
2192 int i; 2151 int i;
… …
2224 } 2183 }
2225 break; 2184 break;
2226#endif 2185#endif
2227 } 2186 }
2228 } 2187 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2188}
2234 2189
2235#ifdef TRANSPARENT 2190#ifdef TRANSPARENT
2236#if TINTING 2191#if TINTING
2237/* taken from aterm-0.4.2 */ 2192/* taken from aterm-0.4.2 */
… …
2780 } 2735 }
2781 2736
2782 // scr_add_lines only works for nlines <= nrow - 1. 2737 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2738 if (nlines >= nrow - 1)
2784 { 2739 {
2740 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2741 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, str - buf, nlines); 2742 scr_add_lines (buf, str - buf, nlines);
2787 2743
2788 nlines = 0; 2744 nlines = 0;
2789 str = buf; 2745 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2746 eol = str + min (ncol, UBUFSIZ);
… …
2805 2761
2806 seq_begin = cmdbuf_ptr; 2762 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2763 ch = next_char ();
2808 } 2764 }
2809 2765
2766 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, str - buf, nlines); 2768 scr_add_lines (buf, str - buf, nlines);
2812 2769
2813 /* 2770 /*
2814 * If there have been a lot of new lines, then update the screen 2771 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2772 * What the heck I'll cheat and only refresh less than every page-full.
… …
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++; 2779 refresh_limit++;
2823 else 2780 else
2824 { 2781 {
2825 flag = true; 2782 flag = true;
2826 scr_refresh (refresh_type); 2783 scr_refresh ();
2827 want_refresh = 1; 2784 want_refresh = 1;
2828 } 2785 }
2829 } 2786 }
2830 2787
2831 } 2788 }
… …
2849 return flag; 2806 return flag;
2850} 2807}
2851 2808
2852// read the next character 2809// read the next character
2853wchar_t 2810wchar_t
2854rxvt_term::next_char () 2811rxvt_term::next_char () NOTHROW
2855{ 2812{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2813 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2814 {
2858 // assume 7-bit to be ascii ALWAYS 2815 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2816 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 return NOCHAR; 2837 return NOCHAR;
2881} 2838}
2882 2839
2883// read the next octet 2840// read the next octet
2884uint32_t 2841uint32_t
2885rxvt_term::next_octet () 2842rxvt_term::next_octet () NOTHROW
2886{ 2843{
2887 return cmdbuf_ptr < cmdbuf_endp 2844 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 2845 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 2846 : NOCHAR;
2890} 2847}
2848
2849static class out_of_input out_of_input;
2891 2850
2892/* rxvt_cmd_getc () - Return next input character */ 2851/* rxvt_cmd_getc () - Return next input character */
2893/* 2852/*
2894 * Return the next input character after first passing any keyboard input 2853 * Return the next input character after first passing any keyboard input
2895 * to the command. 2854 * to the command.
2896 */ 2855 */
2897wchar_t 2856wchar_t
2898rxvt_term::cmd_getc () 2857rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 2858{
2900 wchar_t c = next_char (); 2859 wchar_t c = next_char ();
2901 2860
2902 if (c == NOCHAR) 2861 if (c == NOCHAR)
2903 throw out_of_input; 2862 throw out_of_input;
2904 2863
2905 return c; 2864 return c;
2906} 2865}
2907 2866
2908uint32_t 2867uint32_t
2909rxvt_term::cmd_get8 () 2868rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2869{
2911 uint32_t c = next_octet (); 2870 uint32_t c = next_octet ();
2912 2871
2913 if (c == NOCHAR) 2872 if (c == NOCHAR)
2914 throw out_of_input; 2873 throw out_of_input;
… …
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3752 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3753 */
3795void 3754void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3755rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797{ 3756{
3798 int changed = 0;
3799 int color; 3757 int color;
3800 char *buf, *name; 3758 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3759 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3760 int saveop = op;
3803 dDisp; 3761 dDisp;
… …
3860 break; 3818 break;
3861 3819
3862 *name++ = '\0'; 3820 *name++ = '\0';
3863 color = atoi (buf) + minCOLOR; 3821 color = atoi (buf) + minCOLOR;
3864 3822
3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS)) 3823 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3824 break;
3867 3825
3868 if ((buf = strchr (name, ';')) != NULL) 3826 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3827 *buf++ = '\0';
3870 3828
… …
3894 break; 3852 break;
3895 case XTerm_Color_pointer_bg: 3853 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897 break; 3855 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3856#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
3905 case XTerm_Color_RV: 3857 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3859 break;
3860 case Rxvt_Color_BD:
3861 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp);
3863 break;
3864 case Rxvt_Color_UL:
3865 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp);
3907 break; 3867 break;
3908 case URxvt_Color_IT: 3868 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break; 3870 break;
3911#endif 3871#endif
… …
3916 if (am_transparent) 3876 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3877 want_full_refresh = want_refresh = 1;
3918 break; 3878 break;
3919#endif 3879#endif
3920 3880
3921 case XTerm_Pixmap: 3881 case Rxvt_Pixmap:
3882 {
3922 if (*str != ';') 3883 if (*str != ';')
3923 { 3884 {
3924#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3886 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3887 set_bgPixmap (str); /* change pixmap */
3927 scr_touch (true); 3888 scr_touch (true);
3928#endif 3889#endif
3929 } 3890 }
3930 3891
3892 int changed = 0;
3893
3931 while ((str = strchr (str, ';')) != NULL) 3894 while ((str = strchr (str, ';')) != NULL)
3932 { 3895 {
3933 str++; 3896 str++;
3934#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3935 changed += scale_pixmap (str); 3898 changed += scale_pixmap (str);
3936#endif 3899#endif
3937 } 3900 }
3938 3901
3939 if (changed) 3902 if (changed)
3940 { 3903 {
3941#ifdef XPM_BACKGROUND 3904#ifdef XPM_BACKGROUND
3942 resize_pixmap (); 3905 resize_pixmap ();
3943 scr_touch (true); 3906 scr_touch (true);
3944#endif 3907#endif
3945 } 3908 }
3909 }
3946 break; 3910 break;
3947 3911
3948 case XTerm_restoreFG: 3912 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3913 set_window_color (Color_fg, str);
3950 break; 3914 break;
3951 case XTerm_restoreBG: 3915 case Rxvt_restoreBG:
3952 set_window_color (Color_bg, str); 3916 set_window_color (Color_bg, str);
3953 break; 3917 break;
3954 3918
3955 case XTerm_logfile: 3919 case XTerm_logfile:
3956 // TODO, when secure mode? 3920 // TODO, when secure mode?
3957 break; 3921 break;
3958 3922
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3923#if 0
3966 case XTerm_dumpscreen: /* no error notices */ 3924 case Rxvt_dumpscreen: /* no error notices */
3967 { 3925 {
3968 int fd; 3926 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3927 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3970 { 3928 {
3971 scr_dump (fd); 3929 scr_dump (fd);
… …
4002 if (query) 3960 if (query)
4003 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);
4004 else 3962 else
4005 { 3963 {
4006 set_locale (str); 3964 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3965 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3966 init_xlocale ();
4009 } 3967 }
4010 break; 3968 break;
4011 3969
4012 case URxvt_view_up: 3970 case URxvt_view_up:
… …
4065 return state; 4023 return state;
4066} 4024}
4067 4025
4068/* we're not using priv _yet_ */ 4026/* we're not using priv _yet_ */
4069void 4027void
4070rxvt_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)
4071{ 4029{
4072 unsigned int i, j; 4030 unsigned int i, j;
4073 int state; 4031 int state;
4074 4032
4075 static const struct 4033 static const struct
… …
4086 { 5, PrivMode_rVideo }, 4044 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 4045 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 4046 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 4047 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 4048 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 4049 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 4050 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 4051#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 4052 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 4053#endif
… …
4193 /* case 8: - auto repeat, can't do on a per window basis */ 4148 /* case 8: - auto repeat, can't do on a per window basis */
4194 case 9: /* X10 mouse reporting */ 4149 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 4151 priv_modes &= ~PrivMode_MouseX11;
4197 break; 4152 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 4153#ifdef scrollBar_esc
4206 case scrollBar_esc: 4154 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 4155 if (scrollbar_mapping (state))
4208 { 4156 {
4209 resize_all_windows (0, 0, 0); 4157 resize_all_windows (0, 0, 0);
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 4402rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 4403{
4456 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)))
4457 return; 4405 return;
4458 4406
4459 if (pty.pty < 0) 4407 if (pty->pty < 0)
4460 return; 4408 return;
4461 4409
4462 if (v_buflen == 0) 4410 if (v_buflen == 0)
4463 { 4411 {
4464 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));
4465 4413
4466 if ((unsigned int)written == len) 4414 if ((unsigned int)written == len)
4467 return; 4415 return;
4468 4416
4469 data += written; 4417 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4427}
4480 4428
4481void rxvt_term::pty_write () 4429void rxvt_term::pty_write ()
4482{ 4430{
4483 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));
4484 4432
4485 if (written > 0) 4433 if (written > 0)
4486 { 4434 {
4487 v_buflen -= written; 4435 v_buflen -= written;
4488 4436

Diff Legend

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