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.266 by root, Mon Jan 16 08:57:02 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;
… …
1410 button_release (ev.xbutton); 1389 button_release (ev.xbutton);
1411 break; 1390 break;
1412 1391
1413 case ClientMessage: 1392 case ClientMessage:
1414 if (ev.xclient.format == 32 1393 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1394 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 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 {
1417 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)))
1418 destroy (); 1403 destroy ();
1404 }
1419#if ENABLE_EWMH 1405#if ENABLE_EWMH
1420 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])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1407 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1408 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &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 }
1424#endif 1421#endif
1425 } 1422 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break; 1423 break;
1462 1424
1463 case MappingNotify: 1425 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping); 1426 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1427 break;
… …
1507 { 1469 {
1508 seen_resize = 1; 1470 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1472 }
1511 1473
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent)) 1477 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1478 check_our_parents ();
1515#endif 1479#endif
1516 } 1480 }
1517 break; 1481 break;
1518 1482
1519 case PropertyNotify: 1483 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1485 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1486 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1487 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1488
1524 break; 1489 break;
1525 1490
1526 case SelectionClear: 1491 case SelectionClear:
1527 selection_clear (); 1492 selection_clear ();
… …
1587 if (isScrollbarWindow (ev.xany.window)) 1552 if (isScrollbarWindow (ev.xany.window))
1588 { 1553 {
1589 scrollBar.setIdle (); 1554 scrollBar.setIdle ();
1590 scrollbar_show (0); 1555 scrollbar_show (0);
1591 } 1556 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1557
1597#ifdef TRANSPARENT 1558#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1559 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1560 XClearWindow (disp, ev.xany.window);
1600#endif 1561#endif
… …
1603 1564
1604 case MotionNotify: 1565 case MotionNotify:
1605#ifdef POINTER_BLANK 1566#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1567 if (hidden_pointer)
1607 pointer_unblank (); 1568 pointer_unblank ();
1608#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif 1569#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1571 break;
1618 1572
1619 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
… …
1727 { 1681 {
1728 hidden_cursor = 0; 1682 hidden_cursor = 0;
1729 want_refresh = 1; 1683 want_refresh = 1;
1730 } 1684 }
1731 1685
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733 } 1687 }
1734#endif 1688#endif
1735 1689
1736#if defined(POINTER_BLANK) 1690#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1765 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1766 } 1720 }
1767#endif 1721#endif
1768#if CURSOR_BLINK 1722#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1723 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771#endif 1725#endif
1772#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1774 { 1728 {
1775 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
… …
1856 /* 1810 /*
1857 * VT window processing of button press 1811 * VT window processing of button press
1858 */ 1812 */
1859 if (ev.window == vt) 1813 if (ev.window == vt)
1860 { 1814 {
1815 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1816 return;
1817
1861#if ISO_14755 1818#if ISO_14755
1862 // 5.4 1819 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1820 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1821 {
1865 iso14755_54 (ev.x, ev.y); 1822 iso14755_54 (ev.x, ev.y);
… …
1907 else 1864 else
1908 { 1865 {
1909 if (ev.button != MEvent.button) 1866 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1867 MEvent.clicks = 0;
1911 1868
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1869 switch (ev.button)
1914 { 1870 {
1915 case Button1: 1871 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1872 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1873 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1874#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1875 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1876#else
1921 selection.rect = false; 1877 selection.rect = false;
1922#endif 1878#endif
1923 1879
1924 /* allow shift+left click to extend selection */ 1880 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1881 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1882 {
1927 if (MEvent.button == Button1 && clickintime) 1883 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1884 selection_rotate (ev.x, ev.y);
1929 else 1885 else
1930 selection_extend (ev.x, ev.y, 1); 1886 selection_extend (ev.x, ev.y, 1);
1931 } 1887 }
1932 else 1888 else
1933 { 1889 {
1934 if (MEvent.button == Button1 && clickintime) 1890 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1891 MEvent.clicks++;
1936 else 1892 else
1937 MEvent.clicks = 1; 1893 MEvent.clicks = 1;
1938 1894
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1895 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1896 }
1941 1897
1942 MEvent.button = Button1; 1898 MEvent.button = Button1;
1943 break; 1899 break;
1944 1900
1945 case Button3: 1901 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1902 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1903 selection_rotate (ev.x, ev.y);
1948 else 1904 else
1949 selection_extend (ev.x, ev.y, 1); 1905 selection_extend (ev.x, ev.y, 1);
1950 1906
1951 MEvent.button = Button3; 1907 MEvent.button = Button3;
1952 break; 1908 break;
1953 } 1909 }
1954 } 1910 }
1955 1911
1956 MEvent.time = ev.time; 1912 MEvent.time = ev.time;
1957 return; 1913 return;
1958 } 1914 }
1959 1915
… …
2098 } 2054 }
2099 } 2055 }
2100 2056
2101 return; 2057 return;
2102 } 2058 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2059}
2112 2060
2113void 2061void
2114rxvt_term::button_release (XButtonEvent &ev) 2062rxvt_term::button_release (XButtonEvent &ev)
2115{ 2063{
… …
2121 2069
2122 if (scrollbar_isUpDn ()) 2070 if (scrollbar_isUpDn ())
2123 { 2071 {
2124 scrollBar.setIdle (); 2072 scrollBar.setIdle ();
2125 scrollbar_show (0); 2073 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2074 }
2130 2075
2131#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2077 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2078 sel_scroll_ev.stop();
2134#endif 2079#endif
2135 2080
2136 if (ev.window == vt) 2081 if (ev.window == vt)
2137 { 2082 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2084 return;
2085
2138#if ISO_14755 2086#if ISO_14755
2139 // 5.4 2087 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2088 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2089 return;
2142#endif 2090#endif
2091
2143 if (reportmode) 2092 if (reportmode)
2144 { 2093 {
2145 /* mouse report from vt window */ 2094 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2095 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2096 if (ev.button >= 4)
… …
2171 if (priv_modes & PrivMode_mouse_report 2120 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2121 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2122 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2123 selection_extend (ev.x, ev.y, 0);
2175 2124
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2125 switch (ev.button)
2180 { 2126 {
2181 case Button1: 2127 case Button1:
2182 case Button3: 2128 case Button3:
2183 selection_make (ev.time); 2129 selection_make (ev.time);
2184 break; 2130 break;
2131
2185 case Button2: 2132 case Button2:
2186 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);
2187 break; 2135 break;
2136
2188#ifdef MOUSE_WHEEL 2137#ifdef MOUSE_WHEEL
2189 case Button4: 2138 case Button4:
2190 case Button5: 2139 case Button5:
2191 { 2140 {
2192 int i; 2141 int i;
… …
2224 } 2173 }
2225 break; 2174 break;
2226#endif 2175#endif
2227 } 2176 }
2228 } 2177 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2178}
2234 2179
2235#ifdef TRANSPARENT 2180#ifdef TRANSPARENT
2236#if TINTING 2181#if TINTING
2237/* taken from aterm-0.4.2 */ 2182/* taken from aterm-0.4.2 */
… …
2674 am_transparent = 0; 2619 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */ 2620 /* XXX: also turn off Opt_transparent? */
2676 } 2621 }
2677 else 2622 else
2678 { 2623 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++) 2624 for (n = 0; n < (unsigned int)i; n++)
2685 { 2625 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]); 2627 XClearWindow (disp, parent[n]);
2688 } 2628 }
… …
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++; 2764 refresh_limit++;
2825 else 2765 else
2826 { 2766 {
2827 flag = true; 2767 flag = true;
2828 scr_refresh (refresh_type); 2768 scr_refresh ();
2829 want_refresh = 1; 2769 want_refresh = 1;
2830 } 2770 }
2831 } 2771 }
2832 2772
2833 } 2773 }
… …
2851 return flag; 2791 return flag;
2852} 2792}
2853 2793
2854// read the next character 2794// read the next character
2855wchar_t 2795wchar_t
2856rxvt_term::next_char () 2796rxvt_term::next_char () NOTHROW
2857{ 2797{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2798 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2799 {
2860 // assume 7-bit to be ascii ALWAYS 2800 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2882 return NOCHAR; 2822 return NOCHAR;
2883} 2823}
2884 2824
2885// read the next octet 2825// read the next octet
2886uint32_t 2826uint32_t
2887rxvt_term::next_octet () 2827rxvt_term::next_octet () NOTHROW
2888{ 2828{
2889 return cmdbuf_ptr < cmdbuf_endp 2829 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2830 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2831 : NOCHAR;
2892} 2832}
2833
2834static class out_of_input out_of_input;
2893 2835
2894/* rxvt_cmd_getc () - Return next input character */ 2836/* rxvt_cmd_getc () - Return next input character */
2895/* 2837/*
2896 * Return the next input character after first passing any keyboard input 2838 * Return the next input character after first passing any keyboard input
2897 * to the command. 2839 * to the command.
2898 */ 2840 */
2899wchar_t 2841wchar_t
2900rxvt_term::cmd_getc () 2842rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2843{
2902 wchar_t c = next_char (); 2844 wchar_t c = next_char ();
2903 2845
2904 if (c == NOCHAR) 2846 if (c == NOCHAR)
2905 throw out_of_input; 2847 throw out_of_input;
2906 2848
2907 return c; 2849 return c;
2908} 2850}
2909 2851
2910uint32_t 2852uint32_t
2911rxvt_term::cmd_get8 () 2853rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2854{
2913 uint32_t c = next_octet (); 2855 uint32_t c = next_octet ();
2914 2856
2915 if (c == NOCHAR) 2857 if (c == NOCHAR)
2916 throw out_of_input; 2858 throw out_of_input;
… …
3337 ndef = get_byte_array_bit (csi_defaults, i); 3279 ndef = get_byte_array_bit (csi_defaults, i);
3338 for (p = 0; p < nargs; p++) 3280 for (p = 0; p < nargs; p++)
3339 if (arg[p] == -1) 3281 if (arg[p] == -1)
3340 arg[p] = ndef; 3282 arg[p] = ndef;
3341 3283
3342#ifdef DEBUG_CMD
3343 fprintf (stderr, "CSI ");
3344 for (p = 0; p < nargs; p++)
3345 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346 fprintf (stderr, "%c\n", ch);
3347#endif
3348
3349 /* 3284 /*
3350 * private mode handling 3285 * private mode handling
3351 */ 3286 */
3352 if (priv) 3287 if (priv)
3353 { 3288 {
3354 switch (priv) 3289 switch (priv)
3355 { 3290 {
3356 case '>': 3291 case '>':
3357 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 //
3358 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 }
3359 break; 3303 break;
3360 case '?': 3304 case '?':
3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362 process_terminal_mode (ch, priv, nargs, arg); 3306 process_terminal_mode (ch, priv, nargs, arg);
3363 break; 3307 break;
… …
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3740 */
3797void 3741void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3742rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3743{
3800 int changed = 0;
3801 int color; 3744 int color;
3802 char *buf, *name; 3745 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3746 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3747 int saveop = op;
3805 dDisp; 3748 dDisp;
… …
3921 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3922 break; 3865 break;
3923#endif 3866#endif
3924 3867
3925 case Rxvt_Pixmap: 3868 case Rxvt_Pixmap:
3869 {
3926 if (*str != ';') 3870 if (*str != ';')
3927 { 3871 {
3928#if XPM_BACKGROUND 3872#if XPM_BACKGROUND
3929 scale_pixmap (""); /* reset to default scaling */ 3873 scale_pixmap (""); /* reset to default scaling */
3930 set_bgPixmap (str); /* change pixmap */ 3874 set_bgPixmap (str); /* change pixmap */
3931 scr_touch (true); 3875 scr_touch (true);
3932#endif 3876#endif
3933 } 3877 }
3934 3878
3879 int changed = 0;
3880
3935 while ((str = strchr (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3936 { 3882 {
3937 str++; 3883 str++;
3938#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3939 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3940#endif 3886#endif
3941 } 3887 }
3942 3888
3943 if (changed) 3889 if (changed)
3944 { 3890 {
3945#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3946 resize_pixmap (); 3892 resize_pixmap ();
3947 scr_touch (true); 3893 scr_touch (true);
3948#endif 3894#endif
3949 } 3895 }
3896 }
3950 break; 3897 break;
3951 3898
3952 case Rxvt_restoreFG: 3899 case Rxvt_restoreFG:
3953 set_window_color (Color_fg, str); 3900 set_window_color (Color_fg, str);
3954 break; 3901 break;
… …
3958 3905
3959 case XTerm_logfile: 3906 case XTerm_logfile:
3960 // TODO, when secure mode? 3907 // TODO, when secure mode?
3961 break; 3908 break;
3962 3909
3963#ifdef MENUBAR
3964 case URxvt_Menu:
3965 if (OPTION (Opt_insecure))
3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967 break;
3968#endif
3969#if 0 3910#if 0
3970 case Rxvt_dumpscreen: /* no error notices */ 3911 case Rxvt_dumpscreen: /* no error notices */
3971 { 3912 {
3972 int fd; 3913 int fd;
3973 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)
… …
4006 if (query) 3947 if (query)
4007 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);
4008 else 3949 else
4009 { 3950 {
4010 set_locale (str); 3951 set_locale (str);
4011 pty.set_utf8_mode (enc_utf8); 3952 pty->set_utf8_mode (enc_utf8);
4012 init_xlocale (); 3953 init_xlocale ();
4013 } 3954 }
4014 break; 3955 break;
4015 3956
4016 case URxvt_view_up: 3957 case URxvt_view_up:
… …
4069 return state; 4010 return state;
4070} 4011}
4071 4012
4072/* we're not using priv _yet_ */ 4013/* we're not using priv _yet_ */
4073void 4014void
4074rxvt_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)
4075{ 4016{
4076 unsigned int i, j; 4017 unsigned int i, j;
4077 int state; 4018 int state;
4078 4019
4079 static const struct 4020 static const struct
… …
4090 { 5, PrivMode_rVideo }, 4031 { 5, PrivMode_rVideo },
4091 { 6, PrivMode_relOrigin }, 4032 { 6, PrivMode_relOrigin },
4092 { 7, PrivMode_Autowrap }, 4033 { 7, PrivMode_Autowrap },
4093 // 8, bi-directional support mode 4034 // 8, bi-directional support mode
4094 { 9, PrivMode_MouseX10 }, 4035 { 9, PrivMode_MouseX10 },
4095#ifdef menuBar_esc
4096 { menuBar_esc, PrivMode_menuBar },
4097#endif
4098 // 18, 19 printing-related 4036 // 18, 19 printing-related
4099 { 25, PrivMode_VisibleCursor }, 4037 { 25, PrivMode_VisibleCursor },
4100#ifdef scrollBar_esc 4038#ifdef scrollBar_esc
4101 { scrollBar_esc, PrivMode_scrollBar }, 4039 { scrollBar_esc, PrivMode_scrollBar },
4102#endif 4040#endif
… …
4197 /* 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 */
4198 case 9: /* X10 mouse reporting */ 4136 case 9: /* X10 mouse reporting */
4199 if (state) /* orthogonal */ 4137 if (state) /* orthogonal */
4200 priv_modes &= ~PrivMode_MouseX11; 4138 priv_modes &= ~PrivMode_MouseX11;
4201 break; 4139 break;
4202#ifdef menuBar_esc
4203 case menuBar_esc:
4204#ifdef MENUBAR
4205 map_menuBar (state);
4206#endif
4207 break;
4208#endif
4209#ifdef scrollBar_esc 4140#ifdef scrollBar_esc
4210 case scrollBar_esc: 4141 case scrollBar_esc:
4211 if (scrollbar_mapping (state)) 4142 if (scrollbar_mapping (state))
4212 { 4143 {
4213 resize_all_windows (0, 0, 0); 4144 resize_all_windows (0, 0, 0);
… …
4458rxvt_term::tt_write (const char *data, unsigned int len) 4389rxvt_term::tt_write (const char *data, unsigned int len)
4459{ 4390{
4460 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)))
4461 return; 4392 return;
4462 4393
4463 if (pty.pty < 0) 4394 if (pty->pty < 0)
4464 return; 4395 return;
4465 4396
4466 if (v_buflen == 0) 4397 if (v_buflen == 0)
4467 { 4398 {
4468 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));
4469 4400
4470 if ((unsigned int)written == len) 4401 if ((unsigned int)written == len)
4471 return; 4402 return;
4472 4403
4473 data += written; 4404 data += written;
… …
4482 pty_ev.set (EVENT_READ | EVENT_WRITE); 4413 pty_ev.set (EVENT_READ | EVENT_WRITE);
4483} 4414}
4484 4415
4485void rxvt_term::pty_write () 4416void rxvt_term::pty_write ()
4486{ 4417{
4487 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));
4488 4419
4489 if (written > 0) 4420 if (written > 0)
4490 { 4421 {
4491 v_buflen -= written; 4422 v_buflen -= written;
4492 4423

Diff Legend

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