… | |
… | |
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_STRING_LEN, kbuf, len, DT_END))) |
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
873 | return; |
873 | return; |
874 | |
874 | |
875 | if (len <= 0) |
875 | if (len <= 0) |
876 | return; /* not mapped */ |
876 | return; /* not mapped */ |
877 | |
877 | |
… | |
… | |
973 | if (want_refresh) |
973 | if (want_refresh) |
974 | { |
974 | { |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
976 | { |
976 | { |
977 | int row = -view_start; |
977 | int row = -view_start; |
|
|
978 | int end_row = row + nrow; |
978 | |
979 | |
979 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
980 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
980 | --row; |
981 | --row; |
981 | |
982 | |
982 | while (row < -view_start + nrow) |
983 | do |
983 | { |
984 | { |
984 | int start_row = row; |
985 | int start_row = row; |
985 | line_t *l; |
986 | line_t *l; |
986 | |
987 | |
987 | do |
988 | do |
988 | { |
989 | { |
989 | l = &ROW (row); |
990 | l = &ROW (row++); |
990 | |
991 | |
991 | if (!(l->f & LINE_FILTERED)) |
992 | if (!(l->f & LINE_FILTERED)) |
992 | { |
993 | { |
993 | // line not filtered, mark it as filtered |
994 | // line not filtered, mark it as filtered |
994 | l->f |= LINE_FILTERED; |
995 | l->f |= LINE_FILTERED; |
995 | while (l->is_longer ()) |
996 | while (l->is_longer ()) |
996 | { |
997 | { |
997 | l = &ROW (++row); |
998 | l = &ROW (row++); |
998 | l->f |= LINE_FILTERED; |
999 | l->f |= LINE_FILTERED; |
999 | } |
1000 | } |
1000 | |
1001 | |
1001 | // and filter it |
1002 | // and filter it |
1002 | 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)); |
1003 | |
1004 | |
1004 | break; |
1005 | break; |
1005 | } |
1006 | } |
1006 | } |
1007 | } |
1007 | while (l->is_longer ()); |
1008 | while (l->is_longer () && row < end_row); |
1008 | |
|
|
1009 | row++; |
|
|
1010 | } |
1009 | } |
1011 | |
1010 | while (row < end_row); |
1012 | } |
1011 | } |
1013 | |
1012 | |
1014 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
1015 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
1016 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
… | |
… | |
1312 | dDisp; |
1311 | dDisp; |
1313 | |
1312 | |
1314 | SET_R (this); |
1313 | SET_R (this); |
1315 | SET_LOCALE (locale); |
1314 | SET_LOCALE (locale); |
1316 | |
1315 | |
1317 | #if defined(CURSOR_BLINK) |
1316 | if (ev.xany.window == vt |
1318 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1317 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1319 | { |
1318 | return; |
1320 | if (hidden_cursor) |
|
|
1321 | { |
|
|
1322 | hidden_cursor = 0; |
|
|
1323 | want_refresh = 1; |
|
|
1324 | } |
|
|
1325 | |
|
|
1326 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1327 | } |
|
|
1328 | #endif |
|
|
1329 | |
|
|
1330 | #if defined(POINTER_BLANK) |
|
|
1331 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1332 | { |
|
|
1333 | if (ev.type == MotionNotify |
|
|
1334 | || ev.type == ButtonPress |
|
|
1335 | || ev.type == ButtonRelease) |
|
|
1336 | if (hidden_pointer) |
|
|
1337 | pointer_unblank (); |
|
|
1338 | |
|
|
1339 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1340 | pointer_blank (); |
|
|
1341 | } |
|
|
1342 | #endif |
|
|
1343 | |
1319 | |
1344 | Window unused_root, unused_child; |
1320 | Window unused_root, unused_child; |
1345 | int unused_root_x, unused_root_y; |
1321 | int unused_root_x, unused_root_y; |
1346 | unsigned int unused_mask; |
1322 | unsigned int unused_mask; |
1347 | |
1323 | |
… | |
… | |
1355 | |
1331 | |
1356 | break; |
1332 | break; |
1357 | |
1333 | |
1358 | case KeyRelease: |
1334 | case KeyRelease: |
1359 | { |
1335 | { |
1360 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1336 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1361 | KeySym ks; |
1337 | KeySym keysym; |
1362 | |
1338 | |
1363 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1339 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1364 | #endif |
1340 | #endif |
1365 | |
1341 | |
1366 | #if ENABLE_FRILLS || ISO_14755 |
1342 | #if ENABLE_FRILLS || ISO_14755 |
1367 | // ISO 14755 support |
1343 | // ISO 14755 support |
1368 | if (iso14755buf) |
1344 | if (iso14755buf) |
… | |
… | |
1373 | # endif |
1349 | # endif |
1374 | # if ISO_14755 |
1350 | # if ISO_14755 |
1375 | // iso14755 part 5.2 handling: release time |
1351 | // iso14755 part 5.2 handling: release time |
1376 | // first: controls |
1352 | // first: controls |
1377 | if ((ev.xkey.state & ControlMask) |
1353 | if ((ev.xkey.state & ControlMask) |
1378 | && ((ks >= 0x40 && ks <= 0x5f) |
1354 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1379 | || (ks >= 0x61 && ks <= 0x7f))) |
1355 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1380 | { |
1356 | { |
1381 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1357 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1382 | commit_iso14755 (); |
1358 | commit_iso14755 (); |
1383 | return; // case-break; |
1359 | goto skip_switch; |
1384 | } |
1360 | } |
1385 | |
1361 | |
1386 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1362 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1387 | if (i[0] == ks) |
1363 | if (i[0] == keysym) |
1388 | { |
1364 | { |
1389 | iso14755buf = ISO_14755_51 | i[1]; |
1365 | iso14755buf = ISO_14755_51 | i[1]; |
1390 | commit_iso14755 (); |
1366 | commit_iso14755 (); |
1391 | return; // case-break; |
1367 | goto skip_switch; |
1392 | } |
1368 | } |
1393 | |
1369 | |
1394 | scr_bell (); |
1370 | scr_bell (); |
1395 | # endif |
1371 | # endif |
1396 | iso14755buf = 0; |
1372 | iso14755buf = 0; |
… | |
… | |
1415 | else |
1391 | else |
1416 | iso14755buf = 0; |
1392 | iso14755buf = 0; |
1417 | } |
1393 | } |
1418 | #endif |
1394 | #endif |
1419 | |
1395 | |
|
|
1396 | if (ev.xany.window == vt |
1420 | if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) |
1397 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
1421 | break; |
1398 | break; |
1422 | |
1399 | |
1423 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1400 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1424 | if (!(ev.xkey.state & ControlMask)) |
1401 | if (!(ev.xkey.state & ControlMask)) |
1425 | slip_wheel_ev.stop (); |
1402 | slip_wheel_ev.stop (); |
1426 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1403 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1427 | mouse_slip_wheel_speed = 0; |
1404 | mouse_slip_wheel_speed = 0; |
1428 | #endif |
1405 | #endif |
1429 | break; |
1406 | break; |
1430 | } |
1407 | } |
1431 | |
1408 | |
… | |
… | |
1561 | |
1538 | |
1562 | case SelectionRequest: |
1539 | case SelectionRequest: |
1563 | selection_send (ev.xselectionrequest); |
1540 | selection_send (ev.xselectionrequest); |
1564 | break; |
1541 | break; |
1565 | |
1542 | |
|
|
1543 | case MapNotify: |
|
|
1544 | mapped = 1; |
|
|
1545 | #ifdef TEXT_BLINK |
|
|
1546 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1547 | #endif |
|
|
1548 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1549 | break; |
|
|
1550 | |
1566 | case UnmapNotify: |
1551 | case UnmapNotify: |
1567 | mapped = 0; |
1552 | mapped = 0; |
1568 | #ifdef TEXT_BLINK |
1553 | #ifdef TEXT_BLINK |
1569 | text_blink_ev.stop (); |
1554 | text_blink_ev.stop (); |
1570 | #endif |
1555 | #endif |
1571 | break; |
1556 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1572 | |
|
|
1573 | case MapNotify: |
|
|
1574 | mapped = 1; |
|
|
1575 | #ifdef TEXT_BLINK |
|
|
1576 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1577 | #endif |
|
|
1578 | break; |
1557 | break; |
1579 | |
1558 | |
1580 | #ifdef TRANSPARENT |
1559 | #ifdef TRANSPARENT |
1581 | case ReparentNotify: |
1560 | case ReparentNotify: |
1582 | rootwin_cb (ev); |
1561 | rootwin_cb (ev); |
… | |
… | |
1596 | |
1575 | |
1597 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1576 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1598 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1577 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1599 | ev.xexpose.width, ev.xexpose.height, False); |
1578 | ev.xexpose.width, ev.xexpose.height, False); |
1600 | |
1579 | |
1601 | scr_refresh (refresh_type); |
1580 | want_refresh = 1; |
1602 | } |
1581 | } |
1603 | else |
1582 | else |
1604 | { |
1583 | { |
1605 | XEvent unused_event; |
1584 | XEvent unused_event; |
1606 | |
1585 | |
… | |
… | |
1625 | #endif |
1604 | #endif |
1626 | } |
1605 | } |
1627 | break; |
1606 | break; |
1628 | |
1607 | |
1629 | case MotionNotify: |
1608 | case MotionNotify: |
|
|
1609 | printf ("motion notify\n");//D |
1630 | #ifdef POINTER_BLANK |
1610 | #ifdef POINTER_BLANK |
1631 | if (hidden_pointer) |
1611 | if (hidden_pointer) |
1632 | pointer_unblank (); |
1612 | pointer_unblank (); |
1633 | #endif |
1613 | #endif |
1634 | #if MENUBAR |
1614 | #if MENUBAR |
… | |
… | |
1733 | &unused_root_x, &unused_root_y, |
1713 | &unused_root_x, &unused_root_y, |
1734 | &ev.xbutton.x, &ev.xbutton.y, |
1714 | &ev.xbutton.x, &ev.xbutton.y, |
1735 | &unused_mask); |
1715 | &unused_mask); |
1736 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1716 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1737 | scrollbar_size ()); |
1717 | scrollbar_size ()); |
1738 | scr_refresh (refresh_type); |
1718 | want_refresh = 1; |
1739 | refresh_limit = 0; |
1719 | refresh_limit = 0; |
1740 | scrollbar_show (1); |
1720 | scrollbar_show (1); |
1741 | } |
1721 | } |
1742 | break; |
1722 | break; |
1743 | } |
1723 | } |
|
|
1724 | |
|
|
1725 | skip_switch: ; |
|
|
1726 | |
|
|
1727 | #if defined(CURSOR_BLINK) |
|
|
1728 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1729 | { |
|
|
1730 | if (hidden_cursor) |
|
|
1731 | { |
|
|
1732 | hidden_cursor = 0; |
|
|
1733 | want_refresh = 1; |
|
|
1734 | } |
|
|
1735 | |
|
|
1736 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1737 | } |
|
|
1738 | #endif |
|
|
1739 | |
|
|
1740 | #if defined(POINTER_BLANK) |
|
|
1741 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1742 | { |
|
|
1743 | if (ev.type == MotionNotify |
|
|
1744 | || ev.type == ButtonPress |
|
|
1745 | || ev.type == ButtonRelease) |
|
|
1746 | if (hidden_pointer) |
|
|
1747 | pointer_unblank (); |
|
|
1748 | |
|
|
1749 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1750 | pointer_blank (); |
|
|
1751 | } |
|
|
1752 | #endif |
1744 | } |
1753 | } |
1745 | |
1754 | |
1746 | void |
1755 | void |
1747 | rxvt_term::focus_in () |
1756 | rxvt_term::focus_in () |
1748 | { |
1757 | { |
… | |
… | |
1916 | #else |
1925 | #else |
1917 | selection.rect = false; |
1926 | selection.rect = false; |
1918 | #endif |
1927 | #endif |
1919 | |
1928 | |
1920 | /* allow shift+left click to extend selection */ |
1929 | /* allow shift+left click to extend selection */ |
1921 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1930 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1922 | { |
1931 | { |
1923 | if (MEvent.button == Button1 && clickintime) |
1932 | if (MEvent.button == Button1 && clickintime) |
1924 | selection_rotate (ev.x, ev.y); |
1933 | selection_rotate (ev.x, ev.y); |
1925 | else |
1934 | else |
1926 | selection_extend (ev.x, ev.y, 1); |
1935 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
2167 | if (priv_modes & PrivMode_mouse_report |
2176 | if (priv_modes & PrivMode_mouse_report |
2168 | && bypass_keystate |
2177 | && bypass_keystate |
2169 | && ev.button == Button1 && MEvent.clicks <= 1) |
2178 | && ev.button == Button1 && MEvent.clicks <= 1) |
2170 | selection_extend (ev.x, ev.y, 0); |
2179 | selection_extend (ev.x, ev.y, 0); |
2171 | |
2180 | |
2172 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
2181 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
2173 | return; |
2182 | return; |
2174 | |
2183 | |
2175 | switch (ev.button) |
2184 | switch (ev.button) |
2176 | { |
2185 | { |
2177 | case Button1: |
2186 | case Button1: |
… | |
… | |
2210 | slip_wheel_ev.start (); |
2219 | slip_wheel_ev.start (); |
2211 | } |
2220 | } |
2212 | else |
2221 | else |
2213 | { |
2222 | { |
2214 | # endif |
2223 | # endif |
2215 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2216 | scr_page (v, i); |
2224 | scr_page (v, i); |
2217 | scr_refresh (SMOOTH_REFRESH); |
|
|
2218 | scrollbar_show (1); |
2225 | scrollbar_show (1); |
2219 | # else |
|
|
2220 | while (i--) |
|
|
2221 | { |
|
|
2222 | scr_page (v, 1); |
|
|
2223 | scr_refresh (SMOOTH_REFRESH); |
|
|
2224 | scrollbar_show (1); |
|
|
2225 | } |
|
|
2226 | # endif |
|
|
2227 | # ifdef MOUSE_SLIP_WHEELING |
2226 | # ifdef MOUSE_SLIP_WHEELING |
2228 | } |
2227 | } |
2229 | #endif |
2228 | # endif |
2230 | } |
2229 | } |
2231 | break; |
2230 | break; |
2232 | #endif |
2231 | #endif |
2233 | } |
2232 | } |
2234 | } |
2233 | } |
… | |
… | |
2723 | |
2722 | |
2724 | bool |
2723 | bool |
2725 | rxvt_term::cmd_parse () |
2724 | rxvt_term::cmd_parse () |
2726 | { |
2725 | { |
2727 | bool flag = false; |
2726 | bool flag = false; |
2728 | unicode_t ch = NOCHAR; |
2727 | wchar_t ch = NOCHAR; |
2729 | char *seq_begin; // remember start of esc-sequence here |
2728 | char *seq_begin; // remember start of esc-sequence here |
2730 | |
2729 | |
2731 | for (;;) |
2730 | for (;;) |
2732 | { |
2731 | { |
2733 | if (ch == NOCHAR) |
2732 | if (ch == NOCHAR) |
… | |
… | |
2754 | if (seen_resize && cmd_pid) |
2753 | if (seen_resize && cmd_pid) |
2755 | kill (-cmd_pid, SIGWINCH); |
2754 | kill (-cmd_pid, SIGWINCH); |
2756 | } |
2755 | } |
2757 | |
2756 | |
2758 | /* Read a text string from the input buffer */ |
2757 | /* Read a text string from the input buffer */ |
2759 | unicode_t buf[UBUFSIZ]; |
2758 | wchar_t buf[UBUFSIZ]; |
2760 | bool refreshnow = false; |
2759 | bool refreshnow = false; |
2761 | int nlines = 0; |
2760 | int nlines = 0; |
2762 | unicode_t *str = buf; |
2761 | wchar_t *str = buf; |
2763 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2762 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2764 | |
2763 | |
2765 | for (;;) |
2764 | for (;;) |
2766 | { |
2765 | { |
2767 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2766 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2768 | break; |
2767 | break; |
… | |
… | |
2786 | } |
2785 | } |
2787 | |
2786 | |
2788 | // scr_add_lines only works for nlines <= nrow - 1. |
2787 | // scr_add_lines only works for nlines <= nrow - 1. |
2789 | if (nlines >= nrow - 1) |
2788 | if (nlines >= nrow - 1) |
2790 | { |
2789 | { |
2791 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2790 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2792 | scr_add_lines (buf, nlines, str - buf); |
2791 | scr_add_lines (buf, str - buf, nlines); |
2793 | |
2792 | |
2794 | nlines = 0; |
2793 | nlines = 0; |
2795 | str = buf; |
2794 | str = buf; |
2796 | eol = str + min (ncol, UBUFSIZ); |
2795 | eol = str + min (ncol, UBUFSIZ); |
2797 | } |
2796 | } |
… | |
… | |
2811 | |
2810 | |
2812 | seq_begin = cmdbuf_ptr; |
2811 | seq_begin = cmdbuf_ptr; |
2813 | ch = next_char (); |
2812 | ch = next_char (); |
2814 | } |
2813 | } |
2815 | |
2814 | |
2816 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2815 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2817 | scr_add_lines (buf, nlines, str - buf); |
2816 | scr_add_lines (buf, str - buf, nlines); |
2818 | |
2817 | |
2819 | /* |
2818 | /* |
2820 | * If there have been a lot of new lines, then update the screen |
2819 | * If there have been a lot of new lines, then update the screen |
2821 | * What the heck I'll cheat and only refresh less than every page-full. |
2820 | * What the heck I'll cheat and only refresh less than every page-full. |
2822 | * the number of pages between refreshes is refresh_limit, which |
2821 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2828 | refresh_limit++; |
2827 | refresh_limit++; |
2829 | else |
2828 | else |
2830 | { |
2829 | { |
2831 | flag = true; |
2830 | flag = true; |
2832 | scr_refresh (refresh_type); |
2831 | scr_refresh (refresh_type); |
2833 | flush_ev.stop (); |
2832 | want_refresh = 1; |
2834 | } |
2833 | } |
2835 | } |
2834 | } |
2836 | |
2835 | |
2837 | } |
2836 | } |
2838 | else |
2837 | else |
… | |
… | |
2853 | } |
2852 | } |
2854 | |
2853 | |
2855 | return flag; |
2854 | return flag; |
2856 | } |
2855 | } |
2857 | |
2856 | |
2858 | // read the next octet |
|
|
2859 | unicode_t |
|
|
2860 | rxvt_term::next_octet () |
|
|
2861 | { |
|
|
2862 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2863 | ? *cmdbuf_ptr++ |
|
|
2864 | : NOCHAR; |
|
|
2865 | } |
|
|
2866 | |
|
|
2867 | // read the next character |
2857 | // read the next character |
2868 | unicode_t |
2858 | wchar_t |
2869 | rxvt_term::next_char () |
2859 | rxvt_term::next_char () |
2870 | { |
2860 | { |
2871 | while (cmdbuf_ptr < cmdbuf_endp) |
2861 | while (cmdbuf_ptr < cmdbuf_endp) |
2872 | { |
2862 | { |
2873 | // assume 7-bit to be ascii ALWAYS |
2863 | // assume 7-bit to be ascii ALWAYS |
… | |
… | |
2883 | cmdbuf_ptr = cmdbuf_endp; |
2873 | cmdbuf_ptr = cmdbuf_endp; |
2884 | break; |
2874 | break; |
2885 | } |
2875 | } |
2886 | |
2876 | |
2887 | if (len == (size_t)-1) |
2877 | if (len == (size_t)-1) |
2888 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2878 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2889 | |
2879 | |
2890 | // assume wchar == unicode |
2880 | // assume wchar == unicode |
2891 | cmdbuf_ptr += len; |
2881 | cmdbuf_ptr += len; |
2892 | return wc & UNICODE_MASK; |
2882 | return wc & UNICODE_MASK; |
2893 | } |
2883 | } |
2894 | |
2884 | |
2895 | return NOCHAR; |
2885 | return NOCHAR; |
|
|
2886 | } |
|
|
2887 | |
|
|
2888 | // read the next octet |
|
|
2889 | uint32_t |
|
|
2890 | rxvt_term::next_octet () |
|
|
2891 | { |
|
|
2892 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2893 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2894 | : NOCHAR; |
2896 | } |
2895 | } |
2897 | |
2896 | |
2898 | /* rxvt_cmd_getc () - Return next input character */ |
2897 | /* rxvt_cmd_getc () - Return next input character */ |
2899 | /* |
2898 | /* |
2900 | * Return the next input character after first passing any keyboard input |
2899 | * Return the next input character after first passing any keyboard input |
2901 | * to the command. |
2900 | * to the command. |
2902 | */ |
2901 | */ |
2903 | unicode_t |
2902 | wchar_t |
2904 | rxvt_term::cmd_getc () |
2903 | rxvt_term::cmd_getc () |
2905 | { |
2904 | { |
2906 | unicode_t c = next_char (); |
2905 | wchar_t c = next_char (); |
2907 | |
2906 | |
2908 | if (c == NOCHAR) |
2907 | if (c == NOCHAR) |
2909 | throw out_of_input; |
2908 | throw out_of_input; |
2910 | |
2909 | |
2911 | return c; |
2910 | return c; |
2912 | } |
2911 | } |
2913 | |
2912 | |
2914 | unicode_t |
2913 | uint32_t |
2915 | rxvt_term::cmd_get8 () |
2914 | rxvt_term::cmd_get8 () |
2916 | { |
2915 | { |
2917 | unicode_t c = next_octet (); |
2916 | uint32_t c = next_octet (); |
2918 | |
2917 | |
2919 | if (c == NOCHAR) |
2918 | if (c == NOCHAR) |
2920 | throw out_of_input; |
2919 | throw out_of_input; |
2921 | |
2920 | |
2922 | return c; |
2921 | return c; |
… | |
… | |
3189 | break; |
3188 | break; |
3190 | |
3189 | |
3191 | /* 8.3.87: NEXT LINE */ |
3190 | /* 8.3.87: NEXT LINE */ |
3192 | case C1_NEL: /* ESC E */ |
3191 | case C1_NEL: /* ESC E */ |
3193 | { |
3192 | { |
3194 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3193 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3195 | scr_add_lines (nlcr, 1, 2); |
3194 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3196 | } |
3195 | } |
3197 | break; |
3196 | break; |
3198 | |
3197 | |
3199 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3198 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3200 | case C1_ESA: /* ESC G */ |
3199 | case C1_ESA: /* ESC G */ |
… | |
… | |
3864 | { |
3863 | { |
3865 | if ((name = strchr (buf, ';')) == NULL) |
3864 | if ((name = strchr (buf, ';')) == NULL) |
3866 | break; |
3865 | break; |
3867 | |
3866 | |
3868 | *name++ = '\0'; |
3867 | *name++ = '\0'; |
3869 | color = atoi (buf); |
3868 | color = atoi (buf) + minCOLOR; |
3870 | |
3869 | |
3871 | if (color < 0 || color >= TOTAL_COLORS) |
3870 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3872 | break; |
3871 | break; |
3873 | |
3872 | |
3874 | if ((buf = strchr (name, ';')) != NULL) |
3873 | if ((buf = strchr (name, ';')) != NULL) |
3875 | *buf++ = '\0'; |
3874 | *buf++ = '\0'; |
3876 | |
3875 | |
3877 | if (name[0] == '?' && !name[1]) |
3876 | if (name[0] == '?' && !name[1]) |
3878 | { |
3877 | { |
3879 | unsigned short r, g, b; |
3878 | unsigned short r, g, b; |
3880 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3879 | pix_colors_focused[color].get (display, r, g, b); |
3881 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3880 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3882 | } |
3881 | } |
3883 | else |
3882 | else |
3884 | set_window_color (color + minCOLOR, name); |
3883 | set_window_color (color, name); |
3885 | } |
3884 | } |
3886 | break; |
3885 | break; |
3887 | case XTerm_Color00: |
3886 | case XTerm_Color00: |
3888 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3887 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3889 | break; |
3888 | break; |
3890 | case XTerm_Color01: |
3889 | case XTerm_Color01: |
3891 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3890 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3892 | break; |
3891 | break; |
3893 | #ifndef NO_CURSORCOLOR |
3892 | #ifndef NO_CURSORCOLOR |
3894 | case XTerm_Color_cursor: |
3893 | case XTerm_Color_cursor: |
3895 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3894 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3896 | break; |
3895 | break; |
… | |
… | |
3900 | break; |
3899 | break; |
3901 | case XTerm_Color_pointer_bg: |
3900 | case XTerm_Color_pointer_bg: |
3902 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3901 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3903 | break; |
3902 | break; |
3904 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3903 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3905 | case XTerm_Color_BD: |
|
|
3906 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3907 | break; |
|
|
3908 | case XTerm_Color_UL: |
|
|
3909 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3910 | break; |
|
|
3911 | case XTerm_Color_RV: |
3904 | case XTerm_Color_RV: |
3912 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3905 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3906 | break; |
|
|
3907 | case Rxvt_Color_BD: |
|
|
3908 | case URxvt_Color_BD: |
|
|
3909 | process_color_seq (op, Color_BD, str, resp); |
|
|
3910 | break; |
|
|
3911 | case Rxvt_Color_UL: |
|
|
3912 | case URxvt_Color_UL: |
|
|
3913 | process_color_seq (op, Color_UL, str, resp); |
3913 | break; |
3914 | break; |
3914 | case URxvt_Color_IT: |
3915 | case URxvt_Color_IT: |
3915 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3916 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3916 | break; |
3917 | break; |
3917 | #endif |
3918 | #endif |
… | |
… | |
3922 | if (am_transparent) |
3923 | if (am_transparent) |
3923 | want_full_refresh = want_refresh = 1; |
3924 | want_full_refresh = want_refresh = 1; |
3924 | break; |
3925 | break; |
3925 | #endif |
3926 | #endif |
3926 | |
3927 | |
3927 | case XTerm_Pixmap: |
3928 | case Rxvt_Pixmap: |
3928 | if (*str != ';') |
3929 | if (*str != ';') |
3929 | { |
3930 | { |
3930 | #if XPM_BACKGROUND |
3931 | #if XPM_BACKGROUND |
3931 | scale_pixmap (""); /* reset to default scaling */ |
3932 | scale_pixmap (""); /* reset to default scaling */ |
3932 | set_bgPixmap (str); /* change pixmap */ |
3933 | set_bgPixmap (str); /* change pixmap */ |
3933 | #endif |
|
|
3934 | scr_touch (true); |
3934 | scr_touch (true); |
|
|
3935 | #endif |
3935 | } |
3936 | } |
|
|
3937 | |
3936 | while ((str = strchr (str, ';')) != NULL) |
3938 | while ((str = strchr (str, ';')) != NULL) |
3937 | { |
3939 | { |
3938 | str++; |
3940 | str++; |
3939 | #if XPM_BACKGROUND |
3941 | #if XPM_BACKGROUND |
3940 | changed += scale_pixmap (str); |
3942 | changed += scale_pixmap (str); |
… | |
… | |
3943 | |
3945 | |
3944 | if (changed) |
3946 | if (changed) |
3945 | { |
3947 | { |
3946 | #ifdef XPM_BACKGROUND |
3948 | #ifdef XPM_BACKGROUND |
3947 | resize_pixmap (); |
3949 | resize_pixmap (); |
3948 | #endif |
|
|
3949 | scr_touch (true); |
3950 | scr_touch (true); |
|
|
3951 | #endif |
3950 | } |
3952 | } |
3951 | break; |
3953 | break; |
3952 | |
3954 | |
3953 | case XTerm_restoreFG: |
3955 | case Rxvt_restoreFG: |
3954 | set_window_color (Color_fg, str); |
3956 | set_window_color (Color_fg, str); |
3955 | break; |
3957 | break; |
3956 | case XTerm_restoreBG: |
3958 | case Rxvt_restoreBG: |
3957 | set_window_color (Color_bg, str); |
3959 | set_window_color (Color_bg, str); |
3958 | break; |
3960 | break; |
3959 | |
3961 | |
3960 | case XTerm_logfile: |
3962 | case XTerm_logfile: |
3961 | // TODO, when secure mode? |
3963 | // TODO, when secure mode? |
… | |
… | |
3966 | if (OPTION (Opt_insecure)) |
3968 | if (OPTION (Opt_insecure)) |
3967 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3969 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3968 | break; |
3970 | break; |
3969 | #endif |
3971 | #endif |
3970 | #if 0 |
3972 | #if 0 |
3971 | case XTerm_dumpscreen: /* no error notices */ |
3973 | case Rxvt_dumpscreen: /* no error notices */ |
3972 | { |
3974 | { |
3973 | int fd; |
3975 | int fd; |
3974 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3976 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3975 | { |
3977 | { |
3976 | scr_dump (fd); |
3978 | scr_dump (fd); |
… | |
… | |
4028 | break; |
4030 | break; |
4029 | #endif |
4031 | #endif |
4030 | |
4032 | |
4031 | #if ENABLE_PERL |
4033 | #if ENABLE_PERL |
4032 | case URxvt_perl: |
4034 | case URxvt_perl: |
4033 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
4035 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
4034 | ; // no responses yet |
4036 | ; // no responses yet |
4035 | break; |
4037 | break; |
4036 | #endif |
4038 | #endif |
4037 | } |
4039 | } |
4038 | } |
4040 | } |
… | |
… | |
4150 | /* extra handling for values with state unkept */ |
4152 | /* extra handling for values with state unkept */ |
4151 | switch (arg[i]) |
4153 | switch (arg[i]) |
4152 | { |
4154 | { |
4153 | #if ENABLE_STYLES |
4155 | #if ENABLE_STYLES |
4154 | case 1021: |
4156 | case 1021: |
4155 | if (mode) |
4157 | set_option (Opt_intensityStyles, mode); |
4156 | SET_OPTION (Opt_intensityStyles); |
|
|
4157 | else |
|
|
4158 | CLR_OPTION (Opt_intensityStyles); |
|
|
4159 | |
4158 | |
4160 | scr_touch (true); |
4159 | scr_touch (true); |
4161 | break; |
4160 | break; |
4162 | #endif |
4161 | #endif |
4163 | case 1048: /* alternative cursor save */ |
4162 | case 1048: /* alternative cursor save */ |
… | |
… | |
4185 | case 3: /* 80/132 */ |
4184 | case 3: /* 80/132 */ |
4186 | if (priv_modes & PrivMode_132OK) |
4185 | if (priv_modes & PrivMode_132OK) |
4187 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4186 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4188 | break; |
4187 | break; |
4189 | case 4: /* smooth scrolling */ |
4188 | case 4: /* smooth scrolling */ |
4190 | if (!state) |
4189 | set_option (Opt_jumpScroll, !state); |
4191 | SET_OPTION (Opt_jumpScroll); |
|
|
4192 | else |
|
|
4193 | CLR_OPTION (Opt_jumpScroll); |
|
|
4194 | break; |
4190 | break; |
4195 | case 5: /* reverse video */ |
4191 | case 5: /* reverse video */ |
4196 | scr_rvideo_mode (state); |
4192 | scr_rvideo_mode (state); |
4197 | break; |
4193 | break; |
4198 | case 6: /* relative/absolute origins */ |
4194 | case 6: /* relative/absolute origins */ |
… | |
… | |
4239 | #if 0 |
4235 | #if 0 |
4240 | case 1001: |
4236 | case 1001: |
4241 | break; /* X11 mouse highlighting */ |
4237 | break; /* X11 mouse highlighting */ |
4242 | #endif |
4238 | #endif |
4243 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4239 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4244 | if (!state) |
4240 | set_option (Opt_scrollTtyOutput, !state); |
4245 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4246 | else |
|
|
4247 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4248 | break; |
4241 | break; |
4249 | case 1011: /* scroll to bottom on key press */ |
4242 | case 1011: /* scroll to bottom on key press */ |
4250 | if (state) |
4243 | set_option (Opt_scrollTtyKeypress, state); |
4251 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4252 | else |
|
|
4253 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4254 | break; |
4244 | break; |
4255 | case 1047: /* secondary screen w/ clearing last */ |
4245 | case 1047: /* secondary screen w/ clearing last */ |
4256 | if (OPTION (Opt_secondaryScreen)) |
4246 | if (OPTION (Opt_secondaryScreen)) |
4257 | if (current_screen != PRIMARY) |
4247 | if (current_screen != PRIMARY) |
4258 | scr_erase_screen (2); |
4248 | scr_erase_screen (2); |
… | |
… | |
4468 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4458 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4469 | |
4459 | |
4470 | void |
4460 | void |
4471 | rxvt_term::tt_write (const char *data, unsigned int len) |
4461 | rxvt_term::tt_write (const char *data, unsigned int len) |
4472 | { |
4462 | { |
|
|
4463 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4464 | return; |
|
|
4465 | |
4473 | if (pty.pty < 0) |
4466 | if (pty.pty < 0) |
4474 | return; |
4467 | return; |
4475 | |
4468 | |
4476 | if (v_buflen == 0) |
4469 | if (v_buflen == 0) |
4477 | { |
4470 | { |