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.264 by root, Mon Jan 16 06:37:51 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 }
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1042{
1048 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1044 want_refresh = 1;
1050 1045
1051 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1047}
1053#endif 1048#endif
1054 1049
1055#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1056void 1051void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1066{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1069 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1070 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1072 }
1079} 1073}
1080#endif 1074#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1079{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1081 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1083 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1085 }
1093} 1086}
1094#endif 1087#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1096 {
1104 if (view_start == top_row || view_start == 0) 1097 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1106 1099
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1100 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1102 }
1111} 1103}
1112#endif 1104#endif
… …
1142 1134
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1146 1138
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1140
1149 if (r > 0) 1141 if (r > 0)
1150 { 1142 {
1151 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1152 return true; 1144 return true;
… …
1306 make_current (); 1298 make_current ();
1307 1299
1308 dDisp; 1300 dDisp;
1309 1301
1310 if (ev.xany.window == vt 1302 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1305 return;
1313 1306
1314 // for XQueryPointer 1307 // for XQueryPointer
1315 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
… …
1409 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1410 break; 1403 break;
1411 1404
1412 case ClientMessage: 1405 case ClientMessage:
1413 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415 { 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 {
1416 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)))
1417 destroy (); 1416 destroy ();
1417 }
1418#if ENABLE_EWMH 1418#if ENABLE_EWMH
1419 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])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &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 }
1423#endif 1434#endif
1424 } 1435 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1433#endif
1434#ifdef OFFIX_DND
1435 /* OffiX Dnd (drag 'n' drop) protocol */
1436 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1437 && (ev.xclient.data.l[0] == DndFile
1438 || ev.xclient.data.l[0] == DndDir
1439 || ev.xclient.data.l[0] == DndLink))
1440 {
1441 /* Get Dnd data */
1442 Atom ActualType;
1443 int ActualFormat;
1444 unsigned char *data;
1445 unsigned long Size, RemainingBytes;
1446
1447 XGetWindowProperty (disp, display->root,
1448 xa[XA_DNDSELECTION],
1449 0L, 1000000L,
1450 False, AnyPropertyType,
1451 &ActualType, &ActualFormat,
1452 &Size, &RemainingBytes,
1453 &data);
1454 set_string_property (XA_CUT_BUFFER0, data);
1455 XFree (data);
1456 selection_paste (display->root, XA_CUT_BUFFER0, true);
1457 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1458 }
1459#endif /* OFFIX_DND */
1460 break; 1436 break;
1461 1437
1462 case MappingNotify: 1438 case MappingNotify:
1463 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1464 break; 1440 break;
… …
1506 { 1482 {
1507 seen_resize = 1; 1483 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1485 }
1510 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1512 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1513 check_our_parents (); 1491 check_our_parents ();
1514#endif 1492#endif
1515 } 1493 }
1516 break; 1494 break;
1517 1495
1518 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1521 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1522 1501
1523 break; 1502 break;
1524 1503
1525 case SelectionClear: 1504 case SelectionClear:
1526 selection_clear (); 1505 selection_clear ();
… …
1586 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1587 { 1566 {
1588 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1589 scrollbar_show (0); 1568 scrollbar_show (0);
1590 } 1569 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595 1570
1596#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1599#endif 1574#endif
… …
1603 case MotionNotify: 1578 case MotionNotify:
1604#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1580 if (hidden_pointer)
1606 pointer_unblank (); 1581 pointer_unblank ();
1607#endif 1582#endif
1608#if MENUBAR
1609 if (isMenuBarWindow (ev.xany.window))
1610 {
1611 menubar_control (ev.xbutton);
1612 break;
1613 }
1614#endif
1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1584 break;
1617 1585
1618 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1619 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1590 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1592 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1625 ; 1594 ;
… …
1725 { 1694 {
1726 hidden_cursor = 0; 1695 hidden_cursor = 0;
1727 want_refresh = 1; 1696 want_refresh = 1;
1728 } 1697 }
1729 1698
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731 } 1700 }
1732#endif 1701#endif
1733 1702
1734#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1763 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1764 } 1733 }
1765#endif 1734#endif
1766#if CURSOR_BLINK 1735#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1736 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769#endif 1738#endif
1770#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1772 { 1741 {
1773 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
1854 /* 1823 /*
1855 * VT window processing of button press 1824 * VT window processing of button press
1856 */ 1825 */
1857 if (ev.window == vt) 1826 if (ev.window == vt)
1858 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1859#if ISO_14755 1831#if ISO_14755
1860 // 5.4 1832 // 5.4
1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862 { 1834 {
1863 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1905 else 1877 else
1906 { 1878 {
1907 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1909 1881
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button) 1882 switch (ev.button)
1912 { 1883 {
1913 case Button1: 1884 case Button1:
1914 /* allow meta + click to select rectangular areas */ 1885 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */ 1886 /* should be done in screen.C */
1916#if ENABLE_FRILLS 1887#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask); 1888 selection.rect = !!(ev.state & ModMetaMask);
1918#else 1889#else
1919 selection.rect = false; 1890 selection.rect = false;
1920#endif 1891#endif
1921 1892
1922 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 { 1895 {
1925 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1927 else 1898 else
1928 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1929 } 1900 }
1930 else 1901 else
1931 { 1902 {
1932 if (MEvent.button == Button1 && clickintime) 1903 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++; 1904 MEvent.clicks++;
1934 else 1905 else
1935 MEvent.clicks = 1; 1906 MEvent.clicks = 1;
1936 1907
1937 selection_click (MEvent.clicks, ev.x, ev.y); 1908 selection_click (MEvent.clicks, ev.x, ev.y);
1938 } 1909 }
1939 1910
1940 MEvent.button = Button1; 1911 MEvent.button = Button1;
1941 break; 1912 break;
1942 1913
1943 case Button3: 1914 case Button3:
1944 if (MEvent.button == Button3 && clickintime) 1915 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y); 1916 selection_rotate (ev.x, ev.y);
1946 else 1917 else
1947 selection_extend (ev.x, ev.y, 1); 1918 selection_extend (ev.x, ev.y, 1);
1948 1919
1949 MEvent.button = Button3; 1920 MEvent.button = Button3;
1950 break; 1921 break;
1951 } 1922 }
1952 } 1923 }
1953 1924
1954 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1955 return; 1926 return;
1956 } 1927 }
1957 1928
… …
2096 } 2067 }
2097 } 2068 }
2098 2069
2099 return; 2070 return;
2100 } 2071 }
2101
2102#if MENUBAR
2103 /*
2104 * Menubar window processing of button press
2105 */
2106 if (isMenuBarWindow (ev.window))
2107 menubar_control (ev);
2108#endif
2109} 2072}
2110 2073
2111void 2074void
2112rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
2113{ 2076{
… …
2119 2082
2120 if (scrollbar_isUpDn ()) 2083 if (scrollbar_isUpDn ())
2121 { 2084 {
2122 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
2123 scrollbar_show (0); 2086 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2087 }
2128 2088
2129#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2090 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2132#endif 2092#endif
2133 2093
2134 if (ev.window == vt) 2094 if (ev.window == vt)
2135 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
2136#if ISO_14755 2099#if ISO_14755
2137 // 5.4 2100 // 5.4
2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139 return; 2102 return;
2140#endif 2103#endif
2104
2141 if (reportmode) 2105 if (reportmode)
2142 { 2106 {
2143 /* mouse report from vt window */ 2107 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2169 if (priv_modes & PrivMode_mouse_report 2133 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate 2134 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1) 2135 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0); 2136 selection_extend (ev.x, ev.y, 0);
2173 2137
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button) 2138 switch (ev.button)
2178 { 2139 {
2179 case Button1: 2140 case Button1:
2180 case Button3: 2141 case Button3:
2181 selection_make (ev.time); 2142 selection_make (ev.time);
2182 break; 2143 break;
2144
2183 case Button2: 2145 case Button2:
2184 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);
2185 break; 2148 break;
2149
2186#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2187 case Button4: 2151 case Button4:
2188 case Button5: 2152 case Button5:
2189 { 2153 {
2190 int i; 2154 int i;
… …
2222 } 2186 }
2223 break; 2187 break;
2224#endif 2188#endif
2225 } 2189 }
2226 } 2190 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2191}
2232 2192
2233#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2234#if TINTING 2194#if TINTING
2235/* taken from aterm-0.4.2 */ 2195/* taken from aterm-0.4.2 */
… …
2672 am_transparent = 0; 2632 am_transparent = 0;
2673 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2674 } 2634 }
2675 else 2635 else
2676 { 2636 {
2677#if WAIT_FOR_WM
2678 /* wait (an arbitrary period) for the WM to do its thing
2679 * needed for fvwm2.2.2 (and before?) */
2680 sleep (1);
2681#endif
2682 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2683 { 2638 {
2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2685 XClearWindow (disp, parent[n]); 2640 XClearWindow (disp, parent[n]);
2686 } 2641 }
… …
2778 } 2733 }
2779 2734
2780 // scr_add_lines only works for nlines <= nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2736 if (nlines >= nrow - 1)
2782 { 2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 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))))
2784 scr_add_lines (buf, str - buf, nlines); 2740 scr_add_lines (buf, str - buf, nlines);
2785 2741
2786 nlines = 0; 2742 nlines = 0;
2787 str = buf; 2743 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2744 eol = str + min (ncol, UBUFSIZ);
… …
2803 2759
2804 seq_begin = cmdbuf_ptr; 2760 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2761 ch = next_char ();
2806 } 2762 }
2807 2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 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))))
2809 scr_add_lines (buf, str - buf, nlines); 2766 scr_add_lines (buf, str - buf, nlines);
2810 2767
2811 /* 2768 /*
2812 * 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
2813 * 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.
… …
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++; 2777 refresh_limit++;
2821 else 2778 else
2822 { 2779 {
2823 flag = true; 2780 flag = true;
2824 scr_refresh (refresh_type); 2781 scr_refresh ();
2825 want_refresh = 1; 2782 want_refresh = 1;
2826 } 2783 }
2827 } 2784 }
2828 2785
2829 } 2786 }
… …
2847 return flag; 2804 return flag;
2848} 2805}
2849 2806
2850// read the next character 2807// read the next character
2851wchar_t 2808wchar_t
2852rxvt_term::next_char () 2809rxvt_term::next_char () NOTHROW
2853{ 2810{
2854 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
2855 { 2812 {
2856 // assume 7-bit to be ascii ALWAYS 2813 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2878 return NOCHAR; 2835 return NOCHAR;
2879} 2836}
2880 2837
2881// read the next octet 2838// read the next octet
2882uint32_t 2839uint32_t
2883rxvt_term::next_octet () 2840rxvt_term::next_octet () NOTHROW
2884{ 2841{
2885 return cmdbuf_ptr < cmdbuf_endp 2842 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++ 2843 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR; 2844 : NOCHAR;
2888} 2845}
2846
2847static class out_of_input out_of_input;
2889 2848
2890/* rxvt_cmd_getc () - Return next input character */ 2849/* rxvt_cmd_getc () - Return next input character */
2891/* 2850/*
2892 * Return the next input character after first passing any keyboard input 2851 * Return the next input character after first passing any keyboard input
2893 * to the command. 2852 * to the command.
2894 */ 2853 */
2895wchar_t 2854wchar_t
2896rxvt_term::cmd_getc () 2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2897{ 2856{
2898 wchar_t c = next_char (); 2857 wchar_t c = next_char ();
2899 2858
2900 if (c == NOCHAR) 2859 if (c == NOCHAR)
2901 throw out_of_input; 2860 throw out_of_input;
2902 2861
2903 return c; 2862 return c;
2904} 2863}
2905 2864
2906uint32_t 2865uint32_t
2907rxvt_term::cmd_get8 () 2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908{ 2867{
2909 uint32_t c = next_octet (); 2868 uint32_t c = next_octet ();
2910 2869
2911 if (c == NOCHAR) 2870 if (c == NOCHAR)
2912 throw out_of_input; 2871 throw out_of_input;
… …
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3750 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3751 */
3793void 3752void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3753rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3754{
3796 int changed = 0;
3797 int color; 3755 int color;
3798 char *buf, *name; 3756 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3757 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3758 int saveop = op;
3801 dDisp; 3759 dDisp;
… …
3917 want_full_refresh = want_refresh = 1; 3875 want_full_refresh = want_refresh = 1;
3918 break; 3876 break;
3919#endif 3877#endif
3920 3878
3921 case Rxvt_Pixmap: 3879 case Rxvt_Pixmap:
3880 {
3922 if (*str != ';') 3881 if (*str != ';')
3923 { 3882 {
3924#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3884 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3885 set_bgPixmap (str); /* change pixmap */
3927 scr_touch (true); 3886 scr_touch (true);
3928#endif 3887#endif
3929 } 3888 }
3930 3889
3890 int changed = 0;
3891
3931 while ((str = strchr (str, ';')) != NULL) 3892 while ((str = strchr (str, ';')) != NULL)
3932 { 3893 {
3933 str++; 3894 str++;
3934#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3935 changed += scale_pixmap (str); 3896 changed += scale_pixmap (str);
3936#endif 3897#endif
3937 } 3898 }
3938 3899
3939 if (changed) 3900 if (changed)
3940 { 3901 {
3941#ifdef XPM_BACKGROUND 3902#ifdef XPM_BACKGROUND
3942 resize_pixmap (); 3903 resize_pixmap ();
3943 scr_touch (true); 3904 scr_touch (true);
3944#endif 3905#endif
3945 } 3906 }
3907 }
3946 break; 3908 break;
3947 3909
3948 case Rxvt_restoreFG: 3910 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3911 set_window_color (Color_fg, str);
3950 break; 3912 break;
… …
3954 3916
3955 case XTerm_logfile: 3917 case XTerm_logfile:
3956 // TODO, when secure mode? 3918 // TODO, when secure mode?
3957 break; 3919 break;
3958 3920
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 3921#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3922 case Rxvt_dumpscreen: /* no error notices */
3967 { 3923 {
3968 int fd; 3924 int fd;
3969 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)
… …
4002 if (query) 3958 if (query)
4003 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);
4004 else 3960 else
4005 { 3961 {
4006 set_locale (str); 3962 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3963 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3964 init_xlocale ();
4009 } 3965 }
4010 break; 3966 break;
4011 3967
4012 case URxvt_view_up: 3968 case URxvt_view_up:
… …
4065 return state; 4021 return state;
4066} 4022}
4067 4023
4068/* we're not using priv _yet_ */ 4024/* we're not using priv _yet_ */
4069void 4025void
4070rxvt_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)
4071{ 4027{
4072 unsigned int i, j; 4028 unsigned int i, j;
4073 int state; 4029 int state;
4074 4030
4075 static const struct 4031 static const struct
… …
4086 { 5, PrivMode_rVideo }, 4042 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 4043 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 4044 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 4045 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 4046 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 4047 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 4048 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 4050 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 4051#endif
… …
4193 /* 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 */
4194 case 9: /* X10 mouse reporting */ 4147 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 4148 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 4149 priv_modes &= ~PrivMode_MouseX11;
4197 break; 4150 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 4151#ifdef scrollBar_esc
4206 case scrollBar_esc: 4152 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 4153 if (scrollbar_mapping (state))
4208 { 4154 {
4209 resize_all_windows (0, 0, 0); 4155 resize_all_windows (0, 0, 0);
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 4400rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 4401{
4456 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)))
4457 return; 4403 return;
4458 4404
4459 if (pty.pty < 0) 4405 if (pty->pty < 0)
4460 return; 4406 return;
4461 4407
4462 if (v_buflen == 0) 4408 if (v_buflen == 0)
4463 { 4409 {
4464 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));
4465 4411
4466 if ((unsigned int)written == len) 4412 if ((unsigned int)written == len)
4467 return; 4413 return;
4468 4414
4469 data += written; 4415 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4424 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4425}
4480 4426
4481void rxvt_term::pty_write () 4427void rxvt_term::pty_write ()
4482{ 4428{
4483 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));
4484 4430
4485 if (written > 0) 4431 if (written > 0)
4486 { 4432 {
4487 v_buflen -= written; 4433 v_buflen -= written;
4488 4434

Diff Legend

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