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.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.281 by root, Tue Jan 24 17:28:06 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);
… …
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
… …
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
… …
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1096 {
1106 if (view_start == top_row || view_start == 0) 1097 if (view_start == top_row || view_start == 0)
1107 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1108 1099
1109 refresh_type |= SMOOTH_REFRESH;
1110 want_refresh = 1; 1100 want_refresh = 1;
1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112 } 1102 }
1113} 1103}
1114#endif 1104#endif
… …
1144 1134
1145 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1146 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1147 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1148 1138
1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150 1140
1151 if (r > 0) 1141 if (r > 0)
1152 { 1142 {
1153 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1154 return true; 1144 return true;
… …
1172} 1162}
1173 1163
1174void 1164void
1175rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1176{ 1166{
1177 SET_R (this); 1167 make_current ();
1178 SET_LOCALE (locale);
1179 1168
1180 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1181 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1182 while (pty_fill ()) 1171 while (pty_fill ())
1183 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1215} 1204}
1216 1205
1217void 1206void
1218rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1219{ 1208{
1220 SET_R (this); 1209 make_current ();
1221 SET_LOCALE (locale);
1222 1210
1223 pointer_blank (); 1211 pointer_blank ();
1224} 1212}
1225#endif 1213#endif
1226 1214
… …
1305 1293
1306/*{{{ process an X event */ 1294/*{{{ process an X event */
1307void 1295void
1308rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1309{ 1297{
1298 make_current ();
1299
1310 dDisp; 1300 dDisp;
1311 1301
1312 SET_R (this);
1313 SET_LOCALE (locale);
1314
1315 if (ev.xany.window == vt 1302 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return; 1305 return;
1318 1306
1319 // for XQueryPointer 1307 // for XQueryPointer
1320 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
… …
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
… …
1608 case MotionNotify: 1578 case MotionNotify:
1609#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1610 if (hidden_pointer) 1580 if (hidden_pointer)
1611 pointer_unblank (); 1581 pointer_unblank ();
1612#endif 1582#endif
1613#if MENUBAR
1614 if (isMenuBarWindow (ev.xany.window))
1615 {
1616 menubar_control (ev.xbutton);
1617 break;
1618 }
1619#endif
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break; 1584 break;
1622 1585
1623 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1624 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop 1590 ; // nop
1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628 { 1592 {
1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1630 ; 1594 ;
… …
1730 { 1694 {
1731 hidden_cursor = 0; 1695 hidden_cursor = 0;
1732 want_refresh = 1; 1696 want_refresh = 1;
1733 } 1697 }
1734 1698
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736 } 1700 }
1737#endif 1701#endif
1738 1702
1739#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1768 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1769 } 1733 }
1770#endif 1734#endif
1771#if CURSOR_BLINK 1735#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1736 if (OPTION (Opt_cursorBlink))
1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774#endif 1738#endif
1775#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1777 { 1741 {
1778 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
1822 1786
1823#if TRANSPARENT 1787#if TRANSPARENT
1824void 1788void
1825rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1826{ 1790{
1827 SET_R (this); 1791 make_current ();
1828 SET_LOCALE (locale);
1829 1792
1830 switch (ev.type) 1793 switch (ev.type)
1831 { 1794 {
1832 case PropertyNotify: 1795 case PropertyNotify:
1833 /* 1796 /*
… …
1860 /* 1823 /*
1861 * VT window processing of button press 1824 * VT window processing of button press
1862 */ 1825 */
1863 if (ev.window == vt) 1826 if (ev.window == vt)
1864 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1865#if ISO_14755 1831#if ISO_14755
1866 // 5.4 1832 // 5.4
1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1868 { 1834 {
1869 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1911 else 1877 else
1912 { 1878 {
1913 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1914 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1915 1881
1916 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917 switch (ev.button) 1882 switch (ev.button)
1918 { 1883 {
1919 case Button1: 1884 case Button1:
1920 /* allow meta + click to select rectangular areas */ 1885 /* allow meta + click to select rectangular areas */
1921 /* should be done in screen.C */ 1886 /* should be done in screen.C */
1922#if ENABLE_FRILLS 1887#if ENABLE_FRILLS
1923 selection.rect = !!(ev.state & ModMetaMask); 1888 selection.rect = !!(ev.state & ModMetaMask);
1924#else 1889#else
1925 selection.rect = false; 1890 selection.rect = false;
1926#endif 1891#endif
1927 1892
1928 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930 { 1895 {
1931 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1932 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1933 else 1898 else
1934 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1935 } 1900 }
1936 else 1901 else
1937 { 1902 {
1938 if (MEvent.button == Button1 && clickintime) 1903 if (MEvent.button == Button1 && clickintime)
1939 MEvent.clicks++; 1904 MEvent.clicks++;
1940 else 1905 else
1941 MEvent.clicks = 1; 1906 MEvent.clicks = 1;
1942 1907
1943 selection_click (MEvent.clicks, ev.x, ev.y); 1908 selection_click (MEvent.clicks, ev.x, ev.y);
1944 } 1909 }
1945 1910
1946 MEvent.button = Button1; 1911 MEvent.button = Button1;
1947 break; 1912 break;
1948 1913
1949 case Button3: 1914 case Button3:
1950 if (MEvent.button == Button3 && clickintime) 1915 if (MEvent.button == Button3 && clickintime)
1951 selection_rotate (ev.x, ev.y); 1916 selection_rotate (ev.x, ev.y);
1952 else 1917 else
1953 selection_extend (ev.x, ev.y, 1); 1918 selection_extend (ev.x, ev.y, 1);
1954 1919
1955 MEvent.button = Button3; 1920 MEvent.button = Button3;
1956 break; 1921 break;
1957 } 1922 }
1958 } 1923 }
1959 1924
1960 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1961 return; 1926 return;
1962 } 1927 }
1963 1928
… …
2102 } 2067 }
2103 } 2068 }
2104 2069
2105 return; 2070 return;
2106 } 2071 }
2107
2108#if MENUBAR
2109 /*
2110 * Menubar window processing of button press
2111 */
2112 if (isMenuBarWindow (ev.window))
2113 menubar_control (ev);
2114#endif
2115} 2072}
2116 2073
2117void 2074void
2118rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
2119{ 2076{
… …
2125 2082
2126 if (scrollbar_isUpDn ()) 2083 if (scrollbar_isUpDn ())
2127 { 2084 {
2128 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
2129 scrollbar_show (0); 2086 scrollbar_show (0);
2130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131 refresh_type &= ~SMOOTH_REFRESH;
2132#endif
2133 } 2087 }
2134 2088
2135#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active) 2090 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2138#endif 2092#endif
2139 2093
2140 if (ev.window == vt) 2094 if (ev.window == vt)
2141 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
2142#if ISO_14755 2099#if ISO_14755
2143 // 5.4 2100 // 5.4
2144 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2145 return; 2102 return;
2146#endif 2103#endif
2104
2147 if (reportmode) 2105 if (reportmode)
2148 { 2106 {
2149 /* mouse report from vt window */ 2107 /* mouse report from vt window */
2150 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
2151 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2175 if (priv_modes & PrivMode_mouse_report 2133 if (priv_modes & PrivMode_mouse_report
2176 && bypass_keystate 2134 && bypass_keystate
2177 && ev.button == Button1 && MEvent.clicks <= 1) 2135 && ev.button == Button1 && MEvent.clicks <= 1)
2178 selection_extend (ev.x, ev.y, 0); 2136 selection_extend (ev.x, ev.y, 0);
2179 2137
2180 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181 return;
2182
2183 switch (ev.button) 2138 switch (ev.button)
2184 { 2139 {
2185 case Button1: 2140 case Button1:
2186 case Button3: 2141 case Button3:
2187 selection_make (ev.time); 2142 selection_make (ev.time);
2188 break; 2143 break;
2144
2189 case Button2: 2145 case Button2:
2190 selection_request (ev.time, ev.x, ev.y); 2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2191 break; 2148 break;
2149
2192#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2193 case Button4: 2151 case Button4:
2194 case Button5: 2152 case Button5:
2195 { 2153 {
2196 int i; 2154 int i;
… …
2228 } 2186 }
2229 break; 2187 break;
2230#endif 2188#endif
2231 } 2189 }
2232 } 2190 }
2233#ifdef MENUBAR
2234 else if (isMenuBarWindow (ev.window))
2235 menubar_control (ev);
2236#endif
2237} 2191}
2238 2192
2239#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2240#if TINTING 2194#if TINTING
2241/* taken from aterm-0.4.2 */ 2195/* taken from aterm-0.4.2 */
… …
2678 am_transparent = 0; 2632 am_transparent = 0;
2679 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2680 } 2634 }
2681 else 2635 else
2682 { 2636 {
2683#if WAIT_FOR_WM
2684 /* wait (an arbitrary period) for the WM to do its thing
2685 * needed for fvwm2.2.2 (and before?) */
2686 sleep (1);
2687#endif
2688 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2689 { 2638 {
2690 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2691 XClearWindow (disp, parent[n]); 2640 XClearWindow (disp, parent[n]);
2692 } 2641 }
… …
2784 } 2733 }
2785 2734
2786 // scr_add_lines only works for nlines <= nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2787 if (nlines >= nrow - 1) 2736 if (nlines >= nrow - 1)
2788 { 2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2739 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790 scr_add_lines (buf, str - buf, nlines); 2740 scr_add_lines (buf, str - buf, nlines);
2791 2741
2792 nlines = 0; 2742 nlines = 0;
2793 str = buf; 2743 str = buf;
2794 eol = str + min (ncol, UBUFSIZ); 2744 eol = str + min (ncol, UBUFSIZ);
… …
2809 2759
2810 seq_begin = cmdbuf_ptr; 2760 seq_begin = cmdbuf_ptr;
2811 ch = next_char (); 2761 ch = next_char ();
2812 } 2762 }
2813 2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2815 scr_add_lines (buf, str - buf, nlines); 2766 scr_add_lines (buf, str - buf, nlines);
2816 2767
2817 /* 2768 /*
2818 * If there have been a lot of new lines, then update the screen 2769 * If there have been a lot of new lines, then update the screen
2819 * What the heck I'll cheat and only refresh less than every page-full. 2770 * What the heck I'll cheat and only refresh less than every page-full.
… …
2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826 refresh_limit++; 2777 refresh_limit++;
2827 else 2778 else
2828 { 2779 {
2829 flag = true; 2780 flag = true;
2830 scr_refresh (refresh_type); 2781 scr_refresh ();
2831 want_refresh = 1; 2782 want_refresh = 1;
2832 } 2783 }
2833 } 2784 }
2834 2785
2835 } 2786 }
… …
2853 return flag; 2804 return flag;
2854} 2805}
2855 2806
2856// read the next character 2807// read the next character
2857wchar_t 2808wchar_t
2858rxvt_term::next_char () 2809rxvt_term::next_char () NOTHROW
2859{ 2810{
2860 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
2861 { 2812 {
2862 // assume 7-bit to be ascii ALWAYS 2813 // assume 7-bit to be ascii ALWAYS
2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2884 return NOCHAR; 2835 return NOCHAR;
2885} 2836}
2886 2837
2887// read the next octet 2838// read the next octet
2888uint32_t 2839uint32_t
2889rxvt_term::next_octet () 2840rxvt_term::next_octet () NOTHROW
2890{ 2841{
2891 return cmdbuf_ptr < cmdbuf_endp 2842 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++ 2843 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR; 2844 : NOCHAR;
2894} 2845}
2846
2847static class out_of_input out_of_input;
2895 2848
2896/* rxvt_cmd_getc () - Return next input character */ 2849/* rxvt_cmd_getc () - Return next input character */
2897/* 2850/*
2898 * Return the next input character after first passing any keyboard input 2851 * Return the next input character after first passing any keyboard input
2899 * to the command. 2852 * to the command.
2900 */ 2853 */
2901wchar_t 2854wchar_t
2902rxvt_term::cmd_getc () 2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2903{ 2856{
2904 wchar_t c = next_char (); 2857 wchar_t c = next_char ();
2905 2858
2906 if (c == NOCHAR) 2859 if (c == NOCHAR)
2907 throw out_of_input; 2860 throw out_of_input;
2908 2861
2909 return c; 2862 return c;
2910} 2863}
2911 2864
2912uint32_t 2865uint32_t
2913rxvt_term::cmd_get8 () 2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914{ 2867{
2915 uint32_t c = next_octet (); 2868 uint32_t c = next_octet ();
2916 2869
2917 if (c == NOCHAR) 2870 if (c == NOCHAR)
2918 throw out_of_input; 2871 throw out_of_input;
… …
3797 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3750 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3798 */ 3751 */
3799void 3752void
3800rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3753rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801{ 3754{
3802 int changed = 0;
3803 int color; 3755 int color;
3804 char *buf, *name; 3756 char *buf, *name;
3805 bool query = str[0] == '?' && !str[1]; 3757 bool query = str[0] == '?' && !str[1];
3806 int saveop = op; 3758 int saveop = op;
3807 dDisp; 3759 dDisp;
… …
3923 want_full_refresh = want_refresh = 1; 3875 want_full_refresh = want_refresh = 1;
3924 break; 3876 break;
3925#endif 3877#endif
3926 3878
3927 case Rxvt_Pixmap: 3879 case Rxvt_Pixmap:
3880 {
3928 if (*str != ';') 3881 if (*str != ';')
3929 { 3882 {
3930#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3931 scale_pixmap (""); /* reset to default scaling */ 3884 scale_pixmap (""); /* reset to default scaling */
3932 set_bgPixmap (str); /* change pixmap */ 3885 set_bgPixmap (str); /* change pixmap */
3933 scr_touch (true); 3886 scr_touch (true);
3934#endif 3887#endif
3935 } 3888 }
3936 3889
3890 int changed = 0;
3891
3937 while ((str = strchr (str, ';')) != NULL) 3892 while ((str = strchr (str, ';')) != NULL)
3938 { 3893 {
3939 str++; 3894 str++;
3940#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3941 changed += scale_pixmap (str); 3896 changed += scale_pixmap (str);
3942#endif 3897#endif
3943 } 3898 }
3944 3899
3945 if (changed) 3900 if (changed)
3946 { 3901 {
3947#ifdef XPM_BACKGROUND 3902#ifdef XPM_BACKGROUND
3948 resize_pixmap (); 3903 resize_pixmap ();
3949 scr_touch (true); 3904 scr_touch (true);
3950#endif 3905#endif
3951 } 3906 }
3907 }
3952 break; 3908 break;
3953 3909
3954 case Rxvt_restoreFG: 3910 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3911 set_window_color (Color_fg, str);
3956 break; 3912 break;
… …
3960 3916
3961 case XTerm_logfile: 3917 case XTerm_logfile:
3962 // TODO, when secure mode? 3918 // TODO, when secure mode?
3963 break; 3919 break;
3964 3920
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3921#if 0
3972 case Rxvt_dumpscreen: /* no error notices */ 3922 case Rxvt_dumpscreen: /* no error notices */
3973 { 3923 {
3974 int fd; 3924 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3925 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4008 if (query) 3958 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4010 else 3960 else
4011 { 3961 {
4012 set_locale (str); 3962 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3963 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3964 init_xlocale ();
4015 } 3965 }
4016 break; 3966 break;
4017 3967
4018 case URxvt_view_up: 3968 case URxvt_view_up:
… …
4071 return state; 4021 return state;
4072} 4022}
4073 4023
4074/* we're not using priv _yet_ */ 4024/* we're not using priv _yet_ */
4075void 4025void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4026rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 4027{
4078 unsigned int i, j; 4028 unsigned int i, j;
4079 int state; 4029 int state;
4080 4030
4081 static const struct 4031 static const struct
… …
4092 { 5, PrivMode_rVideo }, 4042 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 4043 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 4044 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 4045 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 4046 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 4047 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 4048 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 4050 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 4051#endif
… …
4199 /* case 8: - auto repeat, can't do on a per window basis */ 4146 /* case 8: - auto repeat, can't do on a per window basis */
4200 case 9: /* X10 mouse reporting */ 4147 case 9: /* X10 mouse reporting */
4201 if (state) /* orthogonal */ 4148 if (state) /* orthogonal */
4202 priv_modes &= ~PrivMode_MouseX11; 4149 priv_modes &= ~PrivMode_MouseX11;
4203 break; 4150 break;
4204#ifdef menuBar_esc
4205 case menuBar_esc:
4206#ifdef MENUBAR
4207 map_menuBar (state);
4208#endif
4209 break;
4210#endif
4211#ifdef scrollBar_esc 4151#ifdef scrollBar_esc
4212 case scrollBar_esc: 4152 case scrollBar_esc:
4213 if (scrollbar_mapping (state)) 4153 if (scrollbar_mapping (state))
4214 { 4154 {
4215 resize_all_windows (0, 0, 0); 4155 resize_all_windows (0, 0, 0);
… …
4460rxvt_term::tt_write (const char *data, unsigned int len) 4400rxvt_term::tt_write (const char *data, unsigned int len)
4461{ 4401{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4402 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return; 4403 return;
4464 4404
4465 if (pty.pty < 0) 4405 if (pty->pty < 0)
4466 return; 4406 return;
4467 4407
4468 if (v_buflen == 0) 4408 if (v_buflen == 0)
4469 { 4409 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4410 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 4411
4472 if ((unsigned int)written == len) 4412 if ((unsigned int)written == len)
4473 return; 4413 return;
4474 4414
4475 data += written; 4415 data += written;
… …
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 4424 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485} 4425}
4486 4426
4487void rxvt_term::pty_write () 4427void rxvt_term::pty_write ()
4488{ 4428{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 4430
4491 if (written > 0) 4431 if (written > 0)
4492 { 4432 {
4493 v_buflen -= written; 4433 v_buflen -= written;
4494 4434

Diff Legend

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