… | |
… | |
25 | * - extensive modifications |
25 | * - extensive modifications |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
27 | * Copyright (c) 2001 Marius Gedminas |
27 | * Copyright (c) 2001 Marius Gedminas |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
30 | * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> |
30 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
31 | * |
31 | * |
32 | * This program is free software; you can redistribute it and/or modify |
32 | * This program is free software; you can redistribute it and/or modify |
33 | * it under the terms of the GNU General Public License as published by |
33 | * it under the terms of the GNU General Public License as published by |
34 | * the Free Software Foundation; either version 2 of the License, or |
34 | * the Free Software Foundation; either version 2 of the License, or |
35 | * (at your option) any later version. |
35 | * (at your option) any later version. |
… | |
… | |
867 | #endif |
867 | #endif |
868 | /* nil */ ; |
868 | /* nil */ ; |
869 | } |
869 | } |
870 | } |
870 | } |
871 | |
871 | |
|
|
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
873 | return; |
|
|
874 | |
872 | if (len <= 0) |
875 | if (len <= 0) |
873 | return; /* not mapped */ |
876 | return; /* not mapped */ |
874 | |
877 | |
875 | if (OPTION (Opt_scrollTtyKeypress)) |
878 | if (OPTION (Opt_scrollTtyKeypress)) |
876 | if (view_start) |
879 | if (view_start) |
… | |
… | |
970 | if (want_refresh) |
973 | if (want_refresh) |
971 | { |
974 | { |
972 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
973 | { |
976 | { |
974 | int row = -view_start; |
977 | int row = -view_start; |
|
|
978 | int end_row = row + nrow; |
975 | |
979 | |
976 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
980 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
977 | --row; |
981 | --row; |
978 | |
982 | |
979 | while (row < -view_start + nrow) |
983 | do |
980 | { |
984 | { |
981 | int start_row = row; |
985 | int start_row = row; |
982 | line_t *l; |
986 | line_t *l; |
983 | |
987 | |
984 | do |
988 | do |
985 | { |
989 | { |
986 | l = &ROW (row); |
990 | l = &ROW (row++); |
987 | |
991 | |
988 | if (!(l->f & LINE_FILTERED)) |
992 | if (!(l->f & LINE_FILTERED)) |
989 | { |
993 | { |
990 | // line not filtered, mark it as filtered |
994 | // line not filtered, mark it as filtered |
991 | l->f |= LINE_FILTERED; |
995 | l->f |= LINE_FILTERED; |
992 | while (l->is_longer ()) |
996 | while (l->is_longer ()) |
993 | { |
997 | { |
994 | l = &ROW (++row); |
998 | l = &ROW (row++); |
995 | l->f |= LINE_FILTERED; |
999 | l->f |= LINE_FILTERED; |
996 | } |
1000 | } |
997 | |
1001 | |
998 | // and filter it |
1002 | // and filter it |
999 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1003 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1000 | |
1004 | |
1001 | break; |
1005 | break; |
1002 | } |
1006 | } |
1003 | } |
1007 | } |
1004 | while (l->is_longer ()); |
1008 | while (l->is_longer () && row < end_row); |
1005 | |
|
|
1006 | row++; |
|
|
1007 | } |
1009 | } |
1008 | |
1010 | while (row < end_row); |
1009 | } |
1011 | } |
1010 | |
1012 | |
1011 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
1012 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
1013 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
… | |
… | |
1202 | |
1204 | |
1203 | #ifdef POINTER_BLANK |
1205 | #ifdef POINTER_BLANK |
1204 | void |
1206 | void |
1205 | rxvt_term::pointer_blank () |
1207 | rxvt_term::pointer_blank () |
1206 | { |
1208 | { |
1207 | if (! OPTION (Opt_pointerBlank)) |
1209 | if (!OPTION (Opt_pointerBlank)) |
1208 | return; |
1210 | return; |
1209 | |
1211 | |
1210 | XDefineCursor (display->display, vt, display->blank_cursor); |
1212 | XDefineCursor (display->display, vt, display->blank_cursor); |
1211 | XFlush (display->display); |
1213 | XFlush (display->display); |
1212 | |
1214 | |
… | |
… | |
1309 | dDisp; |
1311 | dDisp; |
1310 | |
1312 | |
1311 | SET_R (this); |
1313 | SET_R (this); |
1312 | SET_LOCALE (locale); |
1314 | SET_LOCALE (locale); |
1313 | |
1315 | |
1314 | #if defined(CURSOR_BLINK) |
|
|
1315 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1316 | { |
|
|
1317 | if (hidden_cursor) |
|
|
1318 | { |
|
|
1319 | hidden_cursor = 0; |
|
|
1320 | want_refresh = 1; |
|
|
1321 | } |
|
|
1322 | |
|
|
1323 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1324 | } |
|
|
1325 | #endif |
|
|
1326 | |
|
|
1327 | #if defined(POINTER_BLANK) |
|
|
1328 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1329 | { |
|
|
1330 | if (ev.type == MotionNotify |
|
|
1331 | || ev.type == ButtonPress |
|
|
1332 | || ev.type == ButtonRelease) |
|
|
1333 | if (hidden_pointer) |
|
|
1334 | pointer_unblank (); |
|
|
1335 | |
|
|
1336 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1337 | pointer_blank (); |
|
|
1338 | } |
|
|
1339 | #endif |
|
|
1340 | |
|
|
1341 | Window unused_root, unused_child; |
1316 | Window unused_root, unused_child; |
1342 | int unused_root_x, unused_root_y; |
1317 | int unused_root_x, unused_root_y; |
1343 | unsigned int unused_mask; |
1318 | unsigned int unused_mask; |
1344 | |
1319 | |
1345 | switch (ev.type) |
1320 | switch (ev.type) |
… | |
… | |
1352 | |
1327 | |
1353 | break; |
1328 | break; |
1354 | |
1329 | |
1355 | case KeyRelease: |
1330 | case KeyRelease: |
1356 | { |
1331 | { |
1357 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1332 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1358 | KeySym ks; |
1333 | KeySym keysym; |
1359 | |
1334 | |
1360 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1335 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1361 | #endif |
1336 | #endif |
1362 | |
1337 | |
1363 | #if ENABLE_FRILLS || ISO_14755 |
1338 | #if ENABLE_FRILLS || ISO_14755 |
1364 | // ISO 14755 support |
1339 | // ISO 14755 support |
1365 | if (iso14755buf) |
1340 | if (iso14755buf) |
… | |
… | |
1370 | # endif |
1345 | # endif |
1371 | # if ISO_14755 |
1346 | # if ISO_14755 |
1372 | // iso14755 part 5.2 handling: release time |
1347 | // iso14755 part 5.2 handling: release time |
1373 | // first: controls |
1348 | // first: controls |
1374 | if ((ev.xkey.state & ControlMask) |
1349 | if ((ev.xkey.state & ControlMask) |
1375 | && ((ks >= 0x40 && ks <= 0x5f) |
1350 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1376 | || (ks >= 0x61 && ks <= 0x7f))) |
1351 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1377 | { |
1352 | { |
1378 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1353 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1379 | commit_iso14755 (); |
1354 | commit_iso14755 (); |
1380 | return; // case-break; |
1355 | goto skip_switch; |
1381 | } |
1356 | } |
1382 | |
1357 | |
1383 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1358 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1384 | if (i[0] == ks) |
1359 | if (i[0] == keysym) |
1385 | { |
1360 | { |
1386 | iso14755buf = ISO_14755_51 | i[1]; |
1361 | iso14755buf = ISO_14755_51 | i[1]; |
1387 | commit_iso14755 (); |
1362 | commit_iso14755 (); |
1388 | return; // case-break; |
1363 | goto skip_switch; |
1389 | } |
1364 | } |
1390 | |
1365 | |
1391 | scr_bell (); |
1366 | scr_bell (); |
1392 | # endif |
1367 | # endif |
1393 | iso14755buf = 0; |
1368 | iso14755buf = 0; |
… | |
… | |
1412 | else |
1387 | else |
1413 | iso14755buf = 0; |
1388 | iso14755buf = 0; |
1414 | } |
1389 | } |
1415 | #endif |
1390 | #endif |
1416 | |
1391 | |
|
|
1392 | if (ev.xany.window == vt |
|
|
1393 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1394 | break; |
|
|
1395 | |
1417 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1396 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1418 | if (!(ev.xkey.state & ControlMask)) |
1397 | if (!(ev.xkey.state & ControlMask)) |
1419 | slip_wheel_ev.stop (); |
1398 | slip_wheel_ev.stop (); |
1420 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1399 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1421 | mouse_slip_wheel_speed = 0; |
1400 | mouse_slip_wheel_speed = 0; |
1422 | #endif |
1401 | #endif |
1423 | break; |
1402 | break; |
1424 | } |
1403 | } |
1425 | |
1404 | |
… | |
… | |
1555 | |
1534 | |
1556 | case SelectionRequest: |
1535 | case SelectionRequest: |
1557 | selection_send (ev.xselectionrequest); |
1536 | selection_send (ev.xselectionrequest); |
1558 | break; |
1537 | break; |
1559 | |
1538 | |
|
|
1539 | case MapNotify: |
|
|
1540 | mapped = 1; |
|
|
1541 | #ifdef TEXT_BLINK |
|
|
1542 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1543 | #endif |
|
|
1544 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1545 | break; |
|
|
1546 | |
1560 | case UnmapNotify: |
1547 | case UnmapNotify: |
1561 | mapped = 0; |
1548 | mapped = 0; |
1562 | #ifdef TEXT_BLINK |
1549 | #ifdef TEXT_BLINK |
1563 | text_blink_ev.stop (); |
1550 | text_blink_ev.stop (); |
1564 | #endif |
1551 | #endif |
1565 | break; |
1552 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1566 | |
|
|
1567 | case MapNotify: |
|
|
1568 | mapped = 1; |
|
|
1569 | #ifdef TEXT_BLINK |
|
|
1570 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1571 | #endif |
|
|
1572 | break; |
1553 | break; |
1573 | |
1554 | |
1574 | #ifdef TRANSPARENT |
1555 | #ifdef TRANSPARENT |
1575 | case ReparentNotify: |
1556 | case ReparentNotify: |
1576 | rootwin_cb (ev); |
1557 | rootwin_cb (ev); |
… | |
… | |
1590 | |
1571 | |
1591 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1572 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1592 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1573 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1593 | ev.xexpose.width, ev.xexpose.height, False); |
1574 | ev.xexpose.width, ev.xexpose.height, False); |
1594 | |
1575 | |
1595 | scr_refresh (refresh_type); |
1576 | want_refresh = 1; |
1596 | } |
1577 | } |
1597 | else |
1578 | else |
1598 | { |
1579 | { |
1599 | XEvent unused_event; |
1580 | XEvent unused_event; |
1600 | |
1581 | |
… | |
… | |
1635 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1616 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1636 | break; |
1617 | break; |
1637 | |
1618 | |
1638 | if (ev.xany.window == vt) |
1619 | if (ev.xany.window == vt) |
1639 | { |
1620 | { |
|
|
1621 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1622 | ; // nop |
1640 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1623 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1641 | { |
1624 | { |
1642 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1625 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1643 | ; |
1626 | ; |
1644 | |
1627 | |
1645 | XQueryPointer (disp, vt, |
1628 | XQueryPointer (disp, vt, |
… | |
… | |
1725 | &unused_root_x, &unused_root_y, |
1708 | &unused_root_x, &unused_root_y, |
1726 | &ev.xbutton.x, &ev.xbutton.y, |
1709 | &ev.xbutton.x, &ev.xbutton.y, |
1727 | &unused_mask); |
1710 | &unused_mask); |
1728 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1711 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1729 | scrollbar_size ()); |
1712 | scrollbar_size ()); |
1730 | scr_refresh (refresh_type); |
1713 | want_refresh = 1; |
1731 | refresh_limit = 0; |
1714 | refresh_limit = 0; |
1732 | scrollbar_show (1); |
1715 | scrollbar_show (1); |
1733 | } |
1716 | } |
1734 | break; |
1717 | break; |
1735 | } |
1718 | } |
|
|
1719 | |
|
|
1720 | skip_switch: ; |
|
|
1721 | |
|
|
1722 | #if defined(CURSOR_BLINK) |
|
|
1723 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1724 | { |
|
|
1725 | if (hidden_cursor) |
|
|
1726 | { |
|
|
1727 | hidden_cursor = 0; |
|
|
1728 | want_refresh = 1; |
|
|
1729 | } |
|
|
1730 | |
|
|
1731 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1732 | } |
|
|
1733 | #endif |
|
|
1734 | |
|
|
1735 | #if defined(POINTER_BLANK) |
|
|
1736 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1737 | { |
|
|
1738 | if (ev.type == MotionNotify |
|
|
1739 | || ev.type == ButtonPress |
|
|
1740 | || ev.type == ButtonRelease) |
|
|
1741 | if (hidden_pointer) |
|
|
1742 | pointer_unblank (); |
|
|
1743 | |
|
|
1744 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1745 | pointer_blank (); |
|
|
1746 | } |
|
|
1747 | #endif |
1736 | } |
1748 | } |
1737 | |
1749 | |
1738 | void |
1750 | void |
1739 | rxvt_term::focus_in () |
1751 | rxvt_term::focus_in () |
1740 | { |
1752 | { |
… | |
… | |
1865 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1877 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1866 | if (ev.button == MEvent.button && clickintime) |
1878 | if (ev.button == MEvent.button && clickintime) |
1867 | { |
1879 | { |
1868 | /* same button, within alloted time */ |
1880 | /* same button, within alloted time */ |
1869 | MEvent.clicks++; |
1881 | MEvent.clicks++; |
|
|
1882 | |
1870 | if (MEvent.clicks > 1) |
1883 | if (MEvent.clicks > 1) |
1871 | { |
1884 | { |
1872 | /* only report double clicks */ |
1885 | /* only report double clicks */ |
1873 | MEvent.clicks = 2; |
1886 | MEvent.clicks = 2; |
1874 | mouse_report (ev); |
1887 | mouse_report (ev); |
… | |
… | |
1894 | else |
1907 | else |
1895 | { |
1908 | { |
1896 | if (ev.button != MEvent.button) |
1909 | if (ev.button != MEvent.button) |
1897 | MEvent.clicks = 0; |
1910 | MEvent.clicks = 0; |
1898 | |
1911 | |
1899 | if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) |
1912 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1900 | switch (ev.button) |
1913 | switch (ev.button) |
1901 | { |
1914 | { |
1902 | case Button1: |
1915 | case Button1: |
1903 | /* allow meta + click to select rectangular areas */ |
1916 | /* allow meta + click to select rectangular areas */ |
1904 | /* should be done in screen.C */ |
1917 | /* should be done in screen.C */ |
… | |
… | |
2082 | } |
2095 | } |
2083 | |
2096 | |
2084 | break; |
2097 | break; |
2085 | } |
2098 | } |
2086 | } |
2099 | } |
|
|
2100 | |
2087 | return; |
2101 | return; |
2088 | } |
2102 | } |
|
|
2103 | |
2089 | #if MENUBAR |
2104 | #if MENUBAR |
2090 | /* |
2105 | /* |
2091 | * Menubar window processing of button press |
2106 | * Menubar window processing of button press |
2092 | */ |
2107 | */ |
2093 | if (isMenuBarWindow (ev.window)) |
2108 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
2156 | if (priv_modes & PrivMode_mouse_report |
2171 | if (priv_modes & PrivMode_mouse_report |
2157 | && bypass_keystate |
2172 | && bypass_keystate |
2158 | && ev.button == Button1 && MEvent.clicks <= 1) |
2173 | && ev.button == Button1 && MEvent.clicks <= 1) |
2159 | selection_extend (ev.x, ev.y, 0); |
2174 | selection_extend (ev.x, ev.y, 0); |
2160 | |
2175 | |
|
|
2176 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2177 | return; |
|
|
2178 | |
2161 | switch (ev.button) |
2179 | switch (ev.button) |
2162 | { |
2180 | { |
2163 | case Button1: |
2181 | case Button1: |
2164 | case Button3: |
2182 | case Button3: |
2165 | selection_make (ev.time); |
2183 | selection_make (ev.time); |
… | |
… | |
2196 | slip_wheel_ev.start (); |
2214 | slip_wheel_ev.start (); |
2197 | } |
2215 | } |
2198 | else |
2216 | else |
2199 | { |
2217 | { |
2200 | # endif |
2218 | # endif |
2201 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2202 | scr_page (v, i); |
2219 | scr_page (v, i); |
2203 | scr_refresh (SMOOTH_REFRESH); |
|
|
2204 | scrollbar_show (1); |
2220 | scrollbar_show (1); |
2205 | # else |
|
|
2206 | while (i--) |
|
|
2207 | { |
|
|
2208 | scr_page (v, 1); |
|
|
2209 | scr_refresh (SMOOTH_REFRESH); |
|
|
2210 | scrollbar_show (1); |
|
|
2211 | } |
|
|
2212 | # endif |
|
|
2213 | # ifdef MOUSE_SLIP_WHEELING |
2221 | # ifdef MOUSE_SLIP_WHEELING |
2214 | } |
2222 | } |
2215 | #endif |
2223 | # endif |
2216 | } |
2224 | } |
2217 | break; |
2225 | break; |
2218 | #endif |
2226 | #endif |
2219 | } |
2227 | } |
2220 | } |
2228 | } |
… | |
… | |
2709 | |
2717 | |
2710 | bool |
2718 | bool |
2711 | rxvt_term::cmd_parse () |
2719 | rxvt_term::cmd_parse () |
2712 | { |
2720 | { |
2713 | bool flag = false; |
2721 | bool flag = false; |
2714 | unicode_t ch = NOCHAR; |
2722 | wchar_t ch = NOCHAR; |
2715 | char *seq_begin; // remember start of esc-sequence here |
2723 | char *seq_begin; // remember start of esc-sequence here |
2716 | |
2724 | |
2717 | for (;;) |
2725 | for (;;) |
2718 | { |
2726 | { |
2719 | if (ch == NOCHAR) |
2727 | if (ch == NOCHAR) |
2720 | { |
2728 | { |
2721 | seq_begin = cmdbuf_ptr; |
2729 | seq_begin = cmdbuf_ptr; |
2722 | ch = next_char (); |
2730 | ch = next_char (); |
2723 | } |
|
|
2724 | |
2731 | |
2725 | if (ch == NOCHAR) // TODO: improve |
2732 | if (ch == NOCHAR) |
2726 | break; |
2733 | break; |
|
|
2734 | } |
2727 | |
2735 | |
2728 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2736 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2729 | { |
2737 | { |
2730 | if (!seen_input) |
2738 | if (!seen_input) |
2731 | { |
2739 | { |
… | |
… | |
2740 | if (seen_resize && cmd_pid) |
2748 | if (seen_resize && cmd_pid) |
2741 | kill (-cmd_pid, SIGWINCH); |
2749 | kill (-cmd_pid, SIGWINCH); |
2742 | } |
2750 | } |
2743 | |
2751 | |
2744 | /* Read a text string from the input buffer */ |
2752 | /* Read a text string from the input buffer */ |
2745 | unicode_t buf[UBUFSIZ]; |
2753 | wchar_t buf[UBUFSIZ]; |
2746 | bool refreshnow = false; |
2754 | bool refreshnow = false; |
2747 | int nlines = 0; |
2755 | int nlines = 0; |
2748 | unicode_t *str = buf; |
2756 | wchar_t *str = buf; |
2749 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2757 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2750 | |
2758 | |
2751 | for (;;) |
2759 | for (;;) |
2752 | { |
2760 | { |
2753 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2761 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2754 | break; |
2762 | break; |
… | |
… | |
2772 | } |
2780 | } |
2773 | |
2781 | |
2774 | // scr_add_lines only works for nlines <= nrow - 1. |
2782 | // scr_add_lines only works for nlines <= nrow - 1. |
2775 | if (nlines >= nrow - 1) |
2783 | if (nlines >= nrow - 1) |
2776 | { |
2784 | { |
2777 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2785 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2778 | scr_add_lines (buf, nlines, str - buf); |
2786 | scr_add_lines (buf, str - buf, nlines); |
2779 | |
2787 | |
2780 | nlines = 0; |
2788 | nlines = 0; |
2781 | str = buf; |
2789 | str = buf; |
2782 | eol = str + min (ncol, UBUFSIZ); |
2790 | eol = str + min (ncol, UBUFSIZ); |
2783 | } |
2791 | } |
… | |
… | |
2797 | |
2805 | |
2798 | seq_begin = cmdbuf_ptr; |
2806 | seq_begin = cmdbuf_ptr; |
2799 | ch = next_char (); |
2807 | ch = next_char (); |
2800 | } |
2808 | } |
2801 | |
2809 | |
2802 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2810 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2803 | scr_add_lines (buf, nlines, str - buf); |
2811 | scr_add_lines (buf, str - buf, nlines); |
2804 | |
2812 | |
2805 | /* |
2813 | /* |
2806 | * If there have been a lot of new lines, then update the screen |
2814 | * If there have been a lot of new lines, then update the screen |
2807 | * What the heck I'll cheat and only refresh less than every page-full. |
2815 | * What the heck I'll cheat and only refresh less than every page-full. |
2808 | * the number of pages between refreshes is refresh_limit, which |
2816 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2814 | refresh_limit++; |
2822 | refresh_limit++; |
2815 | else |
2823 | else |
2816 | { |
2824 | { |
2817 | flag = true; |
2825 | flag = true; |
2818 | scr_refresh (refresh_type); |
2826 | scr_refresh (refresh_type); |
2819 | flush_ev.stop (); |
2827 | want_refresh = 1; |
2820 | } |
2828 | } |
2821 | } |
2829 | } |
2822 | |
2830 | |
2823 | } |
2831 | } |
2824 | else |
2832 | else |
… | |
… | |
2839 | } |
2847 | } |
2840 | |
2848 | |
2841 | return flag; |
2849 | return flag; |
2842 | } |
2850 | } |
2843 | |
2851 | |
2844 | // read the next octet |
|
|
2845 | unicode_t |
|
|
2846 | rxvt_term::next_octet () |
|
|
2847 | { |
|
|
2848 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2849 | ? *cmdbuf_ptr++ |
|
|
2850 | : NOCHAR; |
|
|
2851 | } |
|
|
2852 | |
|
|
2853 | // read the next character |
2852 | // read the next character |
2854 | unicode_t |
2853 | wchar_t |
2855 | rxvt_term::next_char () |
2854 | rxvt_term::next_char () |
2856 | { |
2855 | { |
2857 | while (cmdbuf_ptr < cmdbuf_endp) |
2856 | while (cmdbuf_ptr < cmdbuf_endp) |
2858 | { |
2857 | { |
2859 | // assume 7-bit to be ascii ALWAYS |
2858 | // assume 7-bit to be ascii ALWAYS |
… | |
… | |
2869 | cmdbuf_ptr = cmdbuf_endp; |
2868 | cmdbuf_ptr = cmdbuf_endp; |
2870 | break; |
2869 | break; |
2871 | } |
2870 | } |
2872 | |
2871 | |
2873 | if (len == (size_t)-1) |
2872 | if (len == (size_t)-1) |
2874 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2873 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2875 | |
2874 | |
2876 | // assume wchar == unicode |
2875 | // assume wchar == unicode |
2877 | cmdbuf_ptr += len; |
2876 | cmdbuf_ptr += len; |
2878 | return wc & UNICODE_MASK; |
2877 | return wc & UNICODE_MASK; |
2879 | } |
2878 | } |
2880 | |
2879 | |
2881 | return NOCHAR; |
2880 | return NOCHAR; |
|
|
2881 | } |
|
|
2882 | |
|
|
2883 | // read the next octet |
|
|
2884 | uint32_t |
|
|
2885 | rxvt_term::next_octet () |
|
|
2886 | { |
|
|
2887 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2888 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2889 | : NOCHAR; |
2882 | } |
2890 | } |
2883 | |
2891 | |
2884 | /* rxvt_cmd_getc () - Return next input character */ |
2892 | /* rxvt_cmd_getc () - Return next input character */ |
2885 | /* |
2893 | /* |
2886 | * Return the next input character after first passing any keyboard input |
2894 | * Return the next input character after first passing any keyboard input |
2887 | * to the command. |
2895 | * to the command. |
2888 | */ |
2896 | */ |
2889 | unicode_t |
2897 | wchar_t |
2890 | rxvt_term::cmd_getc () |
2898 | rxvt_term::cmd_getc () |
2891 | { |
2899 | { |
2892 | unicode_t c = next_char (); |
2900 | wchar_t c = next_char (); |
2893 | |
2901 | |
2894 | if (c == NOCHAR) |
2902 | if (c == NOCHAR) |
2895 | throw out_of_input; |
2903 | throw out_of_input; |
2896 | |
2904 | |
2897 | return c; |
2905 | return c; |
2898 | } |
2906 | } |
2899 | |
2907 | |
2900 | unicode_t |
2908 | uint32_t |
2901 | rxvt_term::cmd_get8 () |
2909 | rxvt_term::cmd_get8 () |
2902 | { |
2910 | { |
2903 | unicode_t c = next_octet (); |
2911 | uint32_t c = next_octet (); |
2904 | |
2912 | |
2905 | if (c == NOCHAR) |
2913 | if (c == NOCHAR) |
2906 | throw out_of_input; |
2914 | throw out_of_input; |
2907 | |
2915 | |
2908 | return c; |
2916 | return c; |
… | |
… | |
3175 | break; |
3183 | break; |
3176 | |
3184 | |
3177 | /* 8.3.87: NEXT LINE */ |
3185 | /* 8.3.87: NEXT LINE */ |
3178 | case C1_NEL: /* ESC E */ |
3186 | case C1_NEL: /* ESC E */ |
3179 | { |
3187 | { |
3180 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3188 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3181 | scr_add_lines (nlcr, 1, 2); |
3189 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3182 | } |
3190 | } |
3183 | break; |
3191 | break; |
3184 | |
3192 | |
3185 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3193 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3186 | case C1_ESA: /* ESC G */ |
3194 | case C1_ESA: /* ESC G */ |
… | |
… | |
4014 | break; |
4022 | break; |
4015 | #endif |
4023 | #endif |
4016 | |
4024 | |
4017 | #if ENABLE_PERL |
4025 | #if ENABLE_PERL |
4018 | case URxvt_perl: |
4026 | case URxvt_perl: |
4019 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
4027 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
4020 | ; // no responses yet |
4028 | ; // no responses yet |
4021 | break; |
4029 | break; |
4022 | #endif |
4030 | #endif |
4023 | } |
4031 | } |
4024 | } |
4032 | } |
… | |
… | |
4136 | /* extra handling for values with state unkept */ |
4144 | /* extra handling for values with state unkept */ |
4137 | switch (arg[i]) |
4145 | switch (arg[i]) |
4138 | { |
4146 | { |
4139 | #if ENABLE_STYLES |
4147 | #if ENABLE_STYLES |
4140 | case 1021: |
4148 | case 1021: |
4141 | if (mode) |
4149 | set_option (Opt_intensityStyles, mode); |
4142 | SET_OPTION (Opt_intensityStyles); |
|
|
4143 | else |
|
|
4144 | CLR_OPTION (Opt_intensityStyles); |
|
|
4145 | |
4150 | |
4146 | scr_touch (true); |
4151 | scr_touch (true); |
4147 | break; |
4152 | break; |
4148 | #endif |
4153 | #endif |
4149 | case 1048: /* alternative cursor save */ |
4154 | case 1048: /* alternative cursor save */ |
… | |
… | |
4171 | case 3: /* 80/132 */ |
4176 | case 3: /* 80/132 */ |
4172 | if (priv_modes & PrivMode_132OK) |
4177 | if (priv_modes & PrivMode_132OK) |
4173 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4178 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4174 | break; |
4179 | break; |
4175 | case 4: /* smooth scrolling */ |
4180 | case 4: /* smooth scrolling */ |
4176 | if (!state) |
4181 | set_option (Opt_jumpScroll, !state); |
4177 | SET_OPTION (Opt_jumpScroll); |
|
|
4178 | else |
|
|
4179 | CLR_OPTION (Opt_jumpScroll); |
|
|
4180 | break; |
4182 | break; |
4181 | case 5: /* reverse video */ |
4183 | case 5: /* reverse video */ |
4182 | scr_rvideo_mode (state); |
4184 | scr_rvideo_mode (state); |
4183 | break; |
4185 | break; |
4184 | case 6: /* relative/absolute origins */ |
4186 | case 6: /* relative/absolute origins */ |
… | |
… | |
4225 | #if 0 |
4227 | #if 0 |
4226 | case 1001: |
4228 | case 1001: |
4227 | break; /* X11 mouse highlighting */ |
4229 | break; /* X11 mouse highlighting */ |
4228 | #endif |
4230 | #endif |
4229 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4231 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4230 | if (!state) |
4232 | set_option (Opt_scrollTtyOutput, !state); |
4231 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4232 | else |
|
|
4233 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4234 | break; |
4233 | break; |
4235 | case 1011: /* scroll to bottom on key press */ |
4234 | case 1011: /* scroll to bottom on key press */ |
4236 | if (state) |
4235 | set_option (Opt_scrollTtyKeypress, state); |
4237 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4238 | else |
|
|
4239 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4240 | break; |
4236 | break; |
4241 | case 1047: /* secondary screen w/ clearing last */ |
4237 | case 1047: /* secondary screen w/ clearing last */ |
4242 | if (OPTION (Opt_secondaryScreen)) |
4238 | if (OPTION (Opt_secondaryScreen)) |
4243 | if (current_screen != PRIMARY) |
4239 | if (current_screen != PRIMARY) |
4244 | scr_erase_screen (2); |
4240 | scr_erase_screen (2); |
… | |
… | |
4454 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4450 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4455 | |
4451 | |
4456 | void |
4452 | void |
4457 | rxvt_term::tt_write (const char *data, unsigned int len) |
4453 | rxvt_term::tt_write (const char *data, unsigned int len) |
4458 | { |
4454 | { |
|
|
4455 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4456 | return; |
|
|
4457 | |
|
|
4458 | if (pty.pty < 0) |
|
|
4459 | return; |
|
|
4460 | |
4459 | if (v_buflen == 0) |
4461 | if (v_buflen == 0) |
4460 | { |
4462 | { |
4461 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4463 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4462 | |
4464 | |
4463 | if ((unsigned int)written == len) |
4465 | if ((unsigned int)written == len) |