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.283 by root, Tue Jan 24 19:40:12 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)
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
303{ 300{
304 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
305 unsigned int newlen; 302 unsigned int newlen;
306 KeySym keysym; 303 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 304 int valid_keysym;
311 char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
312 306
313 /* 307 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
464 { 458 {
465 switch (keysym) 459 switch (keysym)
466 { 460 {
467 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
470 return; 464 return;
471#if TODO 465#if TODO
472 /* rxvt extras */ 466 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 468 change_font (FONT_UP);
… …
905 { 899 {
906 const char ch = C0_ESC; 900 const char ch = C0_ESC;
907 tt_write (&ch, 1); 901 tt_write (&ch, 1);
908 } 902 }
909 903
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 904 tt_write (kbuf, (unsigned int)len);
921} 905}
922/*}}} */ 906/*}}} */
923 907
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 909unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 910rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 911{
930 unsigned int n, s; 912 unsigned int n, s;
931 913
… …
1008 while (l->is_longer () && row < end_row); 990 while (l->is_longer () && row < end_row);
1009 } 991 }
1010 while (row < end_row); 992 while (row < end_row);
1011 } 993 }
1012 994
1013 scr_refresh (refresh_type); 995 scr_refresh ();
1014 scrollbar_show (1); 996 scrollbar_show (1);
1015#ifdef USE_XIM 997#ifdef USE_XIM
1016 IMSendSpot (); 998 IMSendSpot ();
1017#endif 999#endif
1018 } 1000 }
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1029{
1048 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1031 want_refresh = 1;
1050 1032
1051 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1034}
1053#endif 1035#endif
1054 1036
1055#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
1056void 1038void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1053{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1056 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1057 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1059 }
1079} 1060}
1080#endif 1061#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1066{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1068 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1070 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1072 }
1093} 1073}
1094#endif 1074#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1083 {
1104 if (view_start == top_row || view_start == 0) 1084 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1106 1086
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1087 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1089 }
1111} 1090}
1112#endif 1091#endif
… …
1142 1121
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1146 1125
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1127
1149 if (r > 0) 1128 if (r > 0)
1150 { 1129 {
1151 cmdbuf_endp += r; 1130 cmdbuf_endp += r;
1152 return true; 1131 return true;
… …
1306 make_current (); 1285 make_current ();
1307 1286
1308 dDisp; 1287 dDisp;
1309 1288
1310 if (ev.xany.window == vt 1289 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1292 return;
1313 1293
1314 // for XQueryPointer 1294 // for XQueryPointer
1315 Window unused_root, unused_child; 1295 Window unused_root, unused_child;
… …
1409 button_release (ev.xbutton); 1389 button_release (ev.xbutton);
1410 break; 1390 break;
1411 1391
1412 case ClientMessage: 1392 case ClientMessage:
1413 if (ev.xclient.format == 32 1393 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1394 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415 { 1395 {
1396 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1397 {
1398 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1399 {
1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1400 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1401 {
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1417 destroy (); 1403 destroy ();
1404 }
1418#if ENABLE_EWMH 1405#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1407 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1408 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1409 &ev);
1410#endif
1411 }
1412 }
1413#if ENABLE_XEMBED
1414 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1415 {
1416 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1417 focus_in ();
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out ();
1420 }
1423#endif 1421#endif
1424 } 1422 }
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; 1423 break;
1461 1424
1462 case MappingNotify: 1425 case MappingNotify:
1463 XRefreshKeyboardMapping (&ev.xmapping); 1426 XRefreshKeyboardMapping (&ev.xmapping);
1464 break; 1427 break;
… …
1506 { 1469 {
1507 seen_resize = 1; 1470 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1472 }
1510 1473
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1512 if (OPTION (Opt_transparent)) 1477 if (OPTION (Opt_transparent))
1513 check_our_parents (); 1478 check_our_parents ();
1514#endif 1479#endif
1515 } 1480 }
1516 break; 1481 break;
1517 1482
1518 case PropertyNotify: 1483 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1485 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520 && ev.xproperty.state == PropertyNewValue) 1486 && ev.xproperty.state == PropertyNewValue)
1521 selection_property (ev.xproperty.window, ev.xproperty.atom); 1487 selection_property (ev.xproperty.window, ev.xproperty.atom);
1522 1488
1523 break; 1489 break;
1524 1490
1525 case SelectionClear: 1491 case SelectionClear:
1526 selection_clear (); 1492 selection_clear ();
… …
1586 if (isScrollbarWindow (ev.xany.window)) 1552 if (isScrollbarWindow (ev.xany.window))
1587 { 1553 {
1588 scrollBar.setIdle (); 1554 scrollBar.setIdle ();
1589 scrollbar_show (0); 1555 scrollbar_show (0);
1590 } 1556 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595 1557
1596#ifdef TRANSPARENT 1558#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0]) 1559 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window); 1560 XClearWindow (disp, ev.xany.window);
1599#endif 1561#endif
… …
1603 case MotionNotify: 1565 case MotionNotify:
1604#ifdef POINTER_BLANK 1566#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1567 if (hidden_pointer)
1606 pointer_unblank (); 1568 pointer_unblank ();
1607#endif 1569#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) 1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1571 break;
1617 1572
1618 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1619 { 1574 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1577 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1579 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1625 ; 1581 ;
… …
1725 { 1681 {
1726 hidden_cursor = 0; 1682 hidden_cursor = 0;
1727 want_refresh = 1; 1683 want_refresh = 1;
1728 } 1684 }
1729 1685
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731 } 1687 }
1732#endif 1688#endif
1733 1689
1734#if defined(POINTER_BLANK) 1690#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1763 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1764 } 1720 }
1765#endif 1721#endif
1766#if CURSOR_BLINK 1722#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1723 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769#endif 1725#endif
1770#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1772 { 1728 {
1773 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
… …
1854 /* 1810 /*
1855 * VT window processing of button press 1811 * VT window processing of button press
1856 */ 1812 */
1857 if (ev.window == vt) 1813 if (ev.window == vt)
1858 { 1814 {
1815 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1816 return;
1817
1859#if ISO_14755 1818#if ISO_14755
1860 // 5.4 1819 // 5.4
1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1820 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862 { 1821 {
1863 iso14755_54 (ev.x, ev.y); 1822 iso14755_54 (ev.x, ev.y);
… …
1905 else 1864 else
1906 { 1865 {
1907 if (ev.button != MEvent.button) 1866 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0; 1867 MEvent.clicks = 0;
1909 1868
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button) 1869 switch (ev.button)
1912 { 1870 {
1913 case Button1: 1871 case Button1:
1914 /* allow meta + click to select rectangular areas */ 1872 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */ 1873 /* should be done in screen.C */
1916#if ENABLE_FRILLS 1874#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask); 1875 selection.rect = !!(ev.state & ModMetaMask);
1918#else 1876#else
1919 selection.rect = false; 1877 selection.rect = false;
1920#endif 1878#endif
1921 1879
1922 /* allow shift+left click to extend selection */ 1880 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1881 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 { 1882 {
1925 if (MEvent.button == Button1 && clickintime) 1883 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y); 1884 selection_rotate (ev.x, ev.y);
1927 else 1885 else
1928 selection_extend (ev.x, ev.y, 1); 1886 selection_extend (ev.x, ev.y, 1);
1929 } 1887 }
1930 else 1888 else
1931 { 1889 {
1932 if (MEvent.button == Button1 && clickintime) 1890 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++; 1891 MEvent.clicks++;
1934 else 1892 else
1935 MEvent.clicks = 1; 1893 MEvent.clicks = 1;
1936 1894
1937 selection_click (MEvent.clicks, ev.x, ev.y); 1895 selection_click (MEvent.clicks, ev.x, ev.y);
1938 } 1896 }
1939 1897
1940 MEvent.button = Button1; 1898 MEvent.button = Button1;
1941 break; 1899 break;
1942 1900
1943 case Button3: 1901 case Button3:
1944 if (MEvent.button == Button3 && clickintime) 1902 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y); 1903 selection_rotate (ev.x, ev.y);
1946 else 1904 else
1947 selection_extend (ev.x, ev.y, 1); 1905 selection_extend (ev.x, ev.y, 1);
1948 1906
1949 MEvent.button = Button3; 1907 MEvent.button = Button3;
1950 break; 1908 break;
1951 } 1909 }
1952 } 1910 }
1953 1911
1954 MEvent.time = ev.time; 1912 MEvent.time = ev.time;
1955 return; 1913 return;
1956 } 1914 }
1957 1915
… …
2096 } 2054 }
2097 } 2055 }
2098 2056
2099 return; 2057 return;
2100 } 2058 }
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} 2059}
2110 2060
2111void 2061void
2112rxvt_term::button_release (XButtonEvent &ev) 2062rxvt_term::button_release (XButtonEvent &ev)
2113{ 2063{
… …
2119 2069
2120 if (scrollbar_isUpDn ()) 2070 if (scrollbar_isUpDn ())
2121 { 2071 {
2122 scrollBar.setIdle (); 2072 scrollBar.setIdle ();
2123 scrollbar_show (0); 2073 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2074 }
2128 2075
2129#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2077 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2078 sel_scroll_ev.stop();
2132#endif 2079#endif
2133 2080
2134 if (ev.window == vt) 2081 if (ev.window == vt)
2135 { 2082 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2084 return;
2085
2136#if ISO_14755 2086#if ISO_14755
2137 // 5.4 2087 // 5.4
2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2088 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139 return; 2089 return;
2140#endif 2090#endif
2091
2141 if (reportmode) 2092 if (reportmode)
2142 { 2093 {
2143 /* mouse report from vt window */ 2094 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */ 2095 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4) 2096 if (ev.button >= 4)
… …
2169 if (priv_modes & PrivMode_mouse_report 2120 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate 2121 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1) 2122 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0); 2123 selection_extend (ev.x, ev.y, 0);
2173 2124
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button) 2125 switch (ev.button)
2178 { 2126 {
2179 case Button1: 2127 case Button1:
2180 case Button3: 2128 case Button3:
2181 selection_make (ev.time); 2129 selection_make (ev.time);
2182 break; 2130 break;
2131
2183 case Button2: 2132 case Button2:
2184 selection_request (ev.time, ev.x, ev.y); 2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2185 break; 2135 break;
2136
2186#ifdef MOUSE_WHEEL 2137#ifdef MOUSE_WHEEL
2187 case Button4: 2138 case Button4:
2188 case Button5: 2139 case Button5:
2189 { 2140 {
2190 int i; 2141 int i;
… …
2222 } 2173 }
2223 break; 2174 break;
2224#endif 2175#endif
2225 } 2176 }
2226 } 2177 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2178}
2232 2179
2233#ifdef TRANSPARENT 2180#ifdef TRANSPARENT
2234#if TINTING 2181#if TINTING
2235/* taken from aterm-0.4.2 */ 2182/* taken from aterm-0.4.2 */
… …
2672 am_transparent = 0; 2619 am_transparent = 0;
2673 /* XXX: also turn off Opt_transparent? */ 2620 /* XXX: also turn off Opt_transparent? */
2674 } 2621 }
2675 else 2622 else
2676 { 2623 {
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++) 2624 for (n = 0; n < (unsigned int)i; n++)
2683 { 2625 {
2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2685 XClearWindow (disp, parent[n]); 2627 XClearWindow (disp, parent[n]);
2686 } 2628 }
… …
2778 } 2720 }
2779 2721
2780 // scr_add_lines only works for nlines <= nrow - 1. 2722 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2723 if (nlines >= nrow - 1)
2782 { 2724 {
2725 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2726 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2727 scr_add_lines (buf, str - buf, nlines);
2785 2728
2786 nlines = 0; 2729 nlines = 0;
2787 str = buf; 2730 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2731 eol = str + min (ncol, UBUFSIZ);
… …
2803 2746
2804 seq_begin = cmdbuf_ptr; 2747 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2748 ch = next_char ();
2806 } 2749 }
2807 2750
2751 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2809 scr_add_lines (buf, str - buf, nlines); 2753 scr_add_lines (buf, str - buf, nlines);
2810 2754
2811 /* 2755 /*
2812 * If there have been a lot of new lines, then update the screen 2756 * 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. 2757 * What the heck I'll cheat and only refresh less than every page-full.
… …
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++; 2764 refresh_limit++;
2821 else 2765 else
2822 { 2766 {
2823 flag = true; 2767 flag = true;
2824 scr_refresh (refresh_type); 2768 scr_refresh ();
2825 want_refresh = 1; 2769 want_refresh = 1;
2826 } 2770 }
2827 } 2771 }
2828 2772
2829 } 2773 }
… …
2847 return flag; 2791 return flag;
2848} 2792}
2849 2793
2850// read the next character 2794// read the next character
2851wchar_t 2795wchar_t
2852rxvt_term::next_char () 2796rxvt_term::next_char () NOTHROW
2853{ 2797{
2854 while (cmdbuf_ptr < cmdbuf_endp) 2798 while (cmdbuf_ptr < cmdbuf_endp)
2855 { 2799 {
2856 // assume 7-bit to be ascii ALWAYS 2800 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2878 return NOCHAR; 2822 return NOCHAR;
2879} 2823}
2880 2824
2881// read the next octet 2825// read the next octet
2882uint32_t 2826uint32_t
2883rxvt_term::next_octet () 2827rxvt_term::next_octet () NOTHROW
2884{ 2828{
2885 return cmdbuf_ptr < cmdbuf_endp 2829 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++ 2830 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR; 2831 : NOCHAR;
2888} 2832}
2833
2834static class out_of_input out_of_input;
2889 2835
2890/* rxvt_cmd_getc () - Return next input character */ 2836/* rxvt_cmd_getc () - Return next input character */
2891/* 2837/*
2892 * Return the next input character after first passing any keyboard input 2838 * Return the next input character after first passing any keyboard input
2893 * to the command. 2839 * to the command.
2894 */ 2840 */
2895wchar_t 2841wchar_t
2896rxvt_term::cmd_getc () 2842rxvt_term::cmd_getc () THROW ((class out_of_input))
2897{ 2843{
2898 wchar_t c = next_char (); 2844 wchar_t c = next_char ();
2899 2845
2900 if (c == NOCHAR) 2846 if (c == NOCHAR)
2901 throw out_of_input; 2847 throw out_of_input;
2902 2848
2903 return c; 2849 return c;
2904} 2850}
2905 2851
2906uint32_t 2852uint32_t
2907rxvt_term::cmd_get8 () 2853rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908{ 2854{
2909 uint32_t c = next_octet (); 2855 uint32_t c = next_octet ();
2910 2856
2911 if (c == NOCHAR) 2857 if (c == NOCHAR)
2912 throw out_of_input; 2858 throw out_of_input;
… …
3333 ndef = get_byte_array_bit (csi_defaults, i); 3279 ndef = get_byte_array_bit (csi_defaults, i);
3334 for (p = 0; p < nargs; p++) 3280 for (p = 0; p < nargs; p++)
3335 if (arg[p] == -1) 3281 if (arg[p] == -1)
3336 arg[p] = ndef; 3282 arg[p] = ndef;
3337 3283
3338#ifdef DEBUG_CMD
3339 fprintf (stderr, "CSI ");
3340 for (p = 0; p < nargs; p++)
3341 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3342 fprintf (stderr, "%c\n", ch);
3343#endif
3344
3345 /* 3284 /*
3346 * private mode handling 3285 * private mode handling
3347 */ 3286 */
3348 if (priv) 3287 if (priv)
3349 { 3288 {
3350 switch (priv) 3289 switch (priv)
3351 { 3290 {
3352 case '>': 3291 case '>':
3353 if (ch == CSI_DA) /* secondary device attributes */ 3292 if (ch == CSI_DA) /* secondary device attributes */
3293 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3296 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 //
3354 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3302 }
3355 break; 3303 break;
3356 case '?': 3304 case '?':
3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3358 process_terminal_mode (ch, priv, nargs, arg); 3306 process_terminal_mode (ch, priv, nargs, arg);
3359 break; 3307 break;
… …
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3740 */
3793void 3741void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3742rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3743{
3796 int changed = 0;
3797 int color; 3744 int color;
3798 char *buf, *name; 3745 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3746 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3747 int saveop = op;
3801 dDisp; 3748 dDisp;
… …
3917 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3918 break; 3865 break;
3919#endif 3866#endif
3920 3867
3921 case Rxvt_Pixmap: 3868 case Rxvt_Pixmap:
3869 {
3922 if (*str != ';') 3870 if (*str != ';')
3923 { 3871 {
3924#if XPM_BACKGROUND 3872#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3873 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3874 set_bgPixmap (str); /* change pixmap */
3927 scr_touch (true); 3875 scr_touch (true);
3928#endif 3876#endif
3929 } 3877 }
3930 3878
3879 int changed = 0;
3880
3931 while ((str = strchr (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3932 { 3882 {
3933 str++; 3883 str++;
3934#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3935 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3936#endif 3886#endif
3937 } 3887 }
3938 3888
3939 if (changed) 3889 if (changed)
3940 { 3890 {
3941#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3942 resize_pixmap (); 3892 resize_pixmap ();
3943 scr_touch (true); 3893 scr_touch (true);
3944#endif 3894#endif
3945 } 3895 }
3896 }
3946 break; 3897 break;
3947 3898
3948 case Rxvt_restoreFG: 3899 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3900 set_window_color (Color_fg, str);
3950 break; 3901 break;
… …
3954 3905
3955 case XTerm_logfile: 3906 case XTerm_logfile:
3956 // TODO, when secure mode? 3907 // TODO, when secure mode?
3957 break; 3908 break;
3958 3909
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 3910#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3911 case Rxvt_dumpscreen: /* no error notices */
3967 { 3912 {
3968 int fd; 3913 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3914 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4002 if (query) 3947 if (query)
4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4004 else 3949 else
4005 { 3950 {
4006 set_locale (str); 3951 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3952 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3953 init_xlocale ();
4009 } 3954 }
4010 break; 3955 break;
4011 3956
4012 case URxvt_view_up: 3957 case URxvt_view_up:
… …
4065 return state; 4010 return state;
4066} 4011}
4067 4012
4068/* we're not using priv _yet_ */ 4013/* we're not using priv _yet_ */
4069void 4014void
4070rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4015rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4071{ 4016{
4072 unsigned int i, j; 4017 unsigned int i, j;
4073 int state; 4018 int state;
4074 4019
4075 static const struct 4020 static const struct
… …
4086 { 5, PrivMode_rVideo }, 4031 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 4032 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 4033 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 4034 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 4035 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 4036 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 4037 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 4038#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 4039 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 4040#endif
… …
4193 /* case 8: - auto repeat, can't do on a per window basis */ 4135 /* case 8: - auto repeat, can't do on a per window basis */
4194 case 9: /* X10 mouse reporting */ 4136 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 4137 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 4138 priv_modes &= ~PrivMode_MouseX11;
4197 break; 4139 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 4140#ifdef scrollBar_esc
4206 case scrollBar_esc: 4141 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 4142 if (scrollbar_mapping (state))
4208 { 4143 {
4209 resize_all_windows (0, 0, 0); 4144 resize_all_windows (0, 0, 0);
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 4389rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 4390{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4391 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return; 4392 return;
4458 4393
4459 if (pty.pty < 0) 4394 if (pty->pty < 0)
4460 return; 4395 return;
4461 4396
4462 if (v_buflen == 0) 4397 if (v_buflen == 0)
4463 { 4398 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4399 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465 4400
4466 if ((unsigned int)written == len) 4401 if ((unsigned int)written == len)
4467 return; 4402 return;
4468 4403
4469 data += written; 4404 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 4413 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4414}
4480 4415
4481void rxvt_term::pty_write () 4416void rxvt_term::pty_write ()
4482{ 4417{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484 4419
4485 if (written > 0) 4420 if (written > 0)
4486 { 4421 {
4487 v_buflen -= written; 4422 v_buflen -= written;
4488 4423

Diff Legend

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