… | |
… | |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
148 | return; |
148 | return; |
149 | |
149 | |
150 | for (;;) |
150 | for (;;) |
151 | { |
151 | { |
152 | const line_t &l = ROW(y - view_start); |
152 | const line_t &l = ROW(y + view_start); |
153 | |
153 | |
154 | text_t t = l.t[x]; |
154 | text_t t = l.t[x]; |
155 | |
155 | |
156 | if (t != NOCHAR || !x) |
156 | if (t != NOCHAR || !x) |
157 | { |
157 | { |
… | |
… | |
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 | |
… | |
… | |
972 | |
972 | |
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 > top_row && 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 |
… | |
… | |
1102 | { |
1101 | { |
1103 | if (mouse_slip_wheel_speed == 0 |
1102 | if (mouse_slip_wheel_speed == 0 |
1104 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1103 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1105 | : scr_page (UP, mouse_slip_wheel_speed)) |
1104 | : scr_page (UP, mouse_slip_wheel_speed)) |
1106 | { |
1105 | { |
1107 | if (view_start == nsaved || |
1106 | if (view_start == top_row || view_start == 0) |
1108 | view_start == 0) |
|
|
1109 | mouse_slip_wheel_speed = 0; |
1107 | mouse_slip_wheel_speed = 0; |
1110 | |
1108 | |
1111 | refresh_type |= SMOOTH_REFRESH; |
1109 | refresh_type |= SMOOTH_REFRESH; |
1112 | want_refresh = 1; |
1110 | want_refresh = 1; |
1113 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1111 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
… | |
… | |
1312 | dDisp; |
1310 | dDisp; |
1313 | |
1311 | |
1314 | SET_R (this); |
1312 | SET_R (this); |
1315 | SET_LOCALE (locale); |
1313 | SET_LOCALE (locale); |
1316 | |
1314 | |
1317 | #if defined(CURSOR_BLINK) |
1315 | if (ev.xany.window == vt |
1318 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1316 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1319 | { |
1317 | return; |
1320 | if (hidden_cursor) |
|
|
1321 | { |
|
|
1322 | hidden_cursor = 0; |
|
|
1323 | want_refresh = 1; |
|
|
1324 | } |
|
|
1325 | |
1318 | |
1326 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1319 | // for XQueryPointer |
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 | |
|
|
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 | |
1348 | switch (ev.type) |
1324 | switch (ev.type) |
… | |
… | |
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; |
… | |
… | |
1416 | iso14755buf = 0; |
1392 | iso14755buf = 0; |
1417 | } |
1393 | } |
1418 | #endif |
1394 | #endif |
1419 | |
1395 | |
1420 | if (ev.xany.window == vt |
1396 | if (ev.xany.window == vt |
1421 | && 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))) |
1422 | break; |
1398 | break; |
1423 | |
1399 | |
1424 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1400 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1425 | if (!(ev.xkey.state & ControlMask)) |
1401 | if (!(ev.xkey.state & ControlMask)) |
1426 | slip_wheel_ev.stop (); |
1402 | slip_wheel_ev.stop (); |
1427 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1403 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1428 | mouse_slip_wheel_speed = 0; |
1404 | mouse_slip_wheel_speed = 0; |
1429 | #endif |
1405 | #endif |
1430 | break; |
1406 | break; |
1431 | } |
1407 | } |
1432 | |
1408 | |
… | |
… | |
1562 | |
1538 | |
1563 | case SelectionRequest: |
1539 | case SelectionRequest: |
1564 | selection_send (ev.xselectionrequest); |
1540 | selection_send (ev.xselectionrequest); |
1565 | break; |
1541 | break; |
1566 | |
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 | |
1567 | case UnmapNotify: |
1551 | case UnmapNotify: |
1568 | mapped = 0; |
1552 | mapped = 0; |
1569 | #ifdef TEXT_BLINK |
1553 | #ifdef TEXT_BLINK |
1570 | text_blink_ev.stop (); |
1554 | text_blink_ev.stop (); |
1571 | #endif |
1555 | #endif |
1572 | break; |
1556 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1573 | |
|
|
1574 | case MapNotify: |
|
|
1575 | mapped = 1; |
|
|
1576 | #ifdef TEXT_BLINK |
|
|
1577 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1578 | #endif |
|
|
1579 | break; |
1557 | break; |
1580 | |
1558 | |
1581 | #ifdef TRANSPARENT |
1559 | #ifdef TRANSPARENT |
1582 | case ReparentNotify: |
1560 | case ReparentNotify: |
1583 | rootwin_cb (ev); |
1561 | rootwin_cb (ev); |
… | |
… | |
1597 | |
1575 | |
1598 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1576 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1599 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1577 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1600 | ev.xexpose.width, ev.xexpose.height, False); |
1578 | ev.xexpose.width, ev.xexpose.height, False); |
1601 | |
1579 | |
1602 | scr_refresh (refresh_type); |
1580 | want_refresh = 1; |
1603 | } |
1581 | } |
1604 | else |
1582 | else |
1605 | { |
1583 | { |
1606 | XEvent unused_event; |
1584 | XEvent unused_event; |
1607 | |
1585 | |
… | |
… | |
1734 | &unused_root_x, &unused_root_y, |
1712 | &unused_root_x, &unused_root_y, |
1735 | &ev.xbutton.x, &ev.xbutton.y, |
1713 | &ev.xbutton.x, &ev.xbutton.y, |
1736 | &unused_mask); |
1714 | &unused_mask); |
1737 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1715 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1738 | scrollbar_size ()); |
1716 | scrollbar_size ()); |
1739 | scr_refresh (refresh_type); |
1717 | want_refresh = 1; |
1740 | refresh_limit = 0; |
1718 | refresh_limit = 0; |
1741 | scrollbar_show (1); |
1719 | scrollbar_show (1); |
1742 | } |
1720 | } |
1743 | break; |
1721 | break; |
1744 | } |
1722 | } |
|
|
1723 | |
|
|
1724 | skip_switch: ; |
|
|
1725 | |
|
|
1726 | #if defined(CURSOR_BLINK) |
|
|
1727 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1728 | { |
|
|
1729 | if (hidden_cursor) |
|
|
1730 | { |
|
|
1731 | hidden_cursor = 0; |
|
|
1732 | want_refresh = 1; |
|
|
1733 | } |
|
|
1734 | |
|
|
1735 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1736 | } |
|
|
1737 | #endif |
|
|
1738 | |
|
|
1739 | #if defined(POINTER_BLANK) |
|
|
1740 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1741 | { |
|
|
1742 | if (ev.type == MotionNotify |
|
|
1743 | || ev.type == ButtonPress |
|
|
1744 | || ev.type == ButtonRelease) |
|
|
1745 | if (hidden_pointer) |
|
|
1746 | pointer_unblank (); |
|
|
1747 | |
|
|
1748 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1749 | pointer_blank (); |
|
|
1750 | } |
|
|
1751 | #endif |
1745 | } |
1752 | } |
1746 | |
1753 | |
1747 | void |
1754 | void |
1748 | rxvt_term::focus_in () |
1755 | rxvt_term::focus_in () |
1749 | { |
1756 | { |
… | |
… | |
1917 | #else |
1924 | #else |
1918 | selection.rect = false; |
1925 | selection.rect = false; |
1919 | #endif |
1926 | #endif |
1920 | |
1927 | |
1921 | /* allow shift+left click to extend selection */ |
1928 | /* allow shift+left click to extend selection */ |
1922 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1929 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1923 | { |
1930 | { |
1924 | if (MEvent.button == Button1 && clickintime) |
1931 | if (MEvent.button == Button1 && clickintime) |
1925 | selection_rotate (ev.x, ev.y); |
1932 | selection_rotate (ev.x, ev.y); |
1926 | else |
1933 | else |
1927 | selection_extend (ev.x, ev.y, 1); |
1934 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
2211 | slip_wheel_ev.start (); |
2218 | slip_wheel_ev.start (); |
2212 | } |
2219 | } |
2213 | else |
2220 | else |
2214 | { |
2221 | { |
2215 | # endif |
2222 | # endif |
2216 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2217 | scr_page (v, i); |
2223 | scr_page (v, i); |
2218 | scr_refresh (SMOOTH_REFRESH); |
|
|
2219 | scrollbar_show (1); |
2224 | scrollbar_show (1); |
2220 | # else |
|
|
2221 | while (i--) |
|
|
2222 | { |
|
|
2223 | scr_page (v, 1); |
|
|
2224 | scr_refresh (SMOOTH_REFRESH); |
|
|
2225 | scrollbar_show (1); |
|
|
2226 | } |
|
|
2227 | # endif |
|
|
2228 | # ifdef MOUSE_SLIP_WHEELING |
2225 | # ifdef MOUSE_SLIP_WHEELING |
2229 | } |
2226 | } |
2230 | #endif |
2227 | # endif |
2231 | } |
2228 | } |
2232 | break; |
2229 | break; |
2233 | #endif |
2230 | #endif |
2234 | } |
2231 | } |
2235 | } |
2232 | } |
… | |
… | |
2724 | |
2721 | |
2725 | bool |
2722 | bool |
2726 | rxvt_term::cmd_parse () |
2723 | rxvt_term::cmd_parse () |
2727 | { |
2724 | { |
2728 | bool flag = false; |
2725 | bool flag = false; |
2729 | unicode_t ch = NOCHAR; |
2726 | wchar_t ch = NOCHAR; |
2730 | char *seq_begin; // remember start of esc-sequence here |
2727 | char *seq_begin; // remember start of esc-sequence here |
2731 | |
2728 | |
2732 | for (;;) |
2729 | for (;;) |
2733 | { |
2730 | { |
2734 | if (ch == NOCHAR) |
2731 | if (ch == NOCHAR) |
… | |
… | |
2755 | if (seen_resize && cmd_pid) |
2752 | if (seen_resize && cmd_pid) |
2756 | kill (-cmd_pid, SIGWINCH); |
2753 | kill (-cmd_pid, SIGWINCH); |
2757 | } |
2754 | } |
2758 | |
2755 | |
2759 | /* Read a text string from the input buffer */ |
2756 | /* Read a text string from the input buffer */ |
2760 | unicode_t buf[UBUFSIZ]; |
2757 | wchar_t buf[UBUFSIZ]; |
2761 | bool refreshnow = false; |
2758 | bool refreshnow = false; |
2762 | int nlines = 0; |
2759 | int nlines = 0; |
2763 | unicode_t *str = buf; |
2760 | wchar_t *str = buf; |
2764 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2761 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2765 | |
2762 | |
2766 | for (;;) |
2763 | for (;;) |
2767 | { |
2764 | { |
2768 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2765 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2769 | break; |
2766 | break; |
… | |
… | |
2787 | } |
2784 | } |
2788 | |
2785 | |
2789 | // scr_add_lines only works for nlines <= nrow - 1. |
2786 | // scr_add_lines only works for nlines <= nrow - 1. |
2790 | if (nlines >= nrow - 1) |
2787 | if (nlines >= nrow - 1) |
2791 | { |
2788 | { |
2792 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2789 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2793 | scr_add_lines (buf, nlines, str - buf); |
2790 | scr_add_lines (buf, str - buf, nlines); |
2794 | |
2791 | |
2795 | nlines = 0; |
2792 | nlines = 0; |
2796 | str = buf; |
2793 | str = buf; |
2797 | eol = str + min (ncol, UBUFSIZ); |
2794 | eol = str + min (ncol, UBUFSIZ); |
2798 | } |
2795 | } |
… | |
… | |
2812 | |
2809 | |
2813 | seq_begin = cmdbuf_ptr; |
2810 | seq_begin = cmdbuf_ptr; |
2814 | ch = next_char (); |
2811 | ch = next_char (); |
2815 | } |
2812 | } |
2816 | |
2813 | |
2817 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2814 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2818 | scr_add_lines (buf, nlines, str - buf); |
2815 | scr_add_lines (buf, str - buf, nlines); |
2819 | |
2816 | |
2820 | /* |
2817 | /* |
2821 | * If there have been a lot of new lines, then update the screen |
2818 | * If there have been a lot of new lines, then update the screen |
2822 | * What the heck I'll cheat and only refresh less than every page-full. |
2819 | * What the heck I'll cheat and only refresh less than every page-full. |
2823 | * the number of pages between refreshes is refresh_limit, which |
2820 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2829 | refresh_limit++; |
2826 | refresh_limit++; |
2830 | else |
2827 | else |
2831 | { |
2828 | { |
2832 | flag = true; |
2829 | flag = true; |
2833 | scr_refresh (refresh_type); |
2830 | scr_refresh (refresh_type); |
2834 | flush_ev.stop (); |
2831 | want_refresh = 1; |
2835 | } |
2832 | } |
2836 | } |
2833 | } |
2837 | |
2834 | |
2838 | } |
2835 | } |
2839 | else |
2836 | else |
… | |
… | |
2854 | } |
2851 | } |
2855 | |
2852 | |
2856 | return flag; |
2853 | return flag; |
2857 | } |
2854 | } |
2858 | |
2855 | |
2859 | // read the next octet |
|
|
2860 | unicode_t |
|
|
2861 | rxvt_term::next_octet () |
|
|
2862 | { |
|
|
2863 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2864 | ? *cmdbuf_ptr++ |
|
|
2865 | : NOCHAR; |
|
|
2866 | } |
|
|
2867 | |
|
|
2868 | // read the next character |
2856 | // read the next character |
2869 | unicode_t |
2857 | wchar_t |
2870 | rxvt_term::next_char () |
2858 | rxvt_term::next_char () |
2871 | { |
2859 | { |
2872 | while (cmdbuf_ptr < cmdbuf_endp) |
2860 | while (cmdbuf_ptr < cmdbuf_endp) |
2873 | { |
2861 | { |
2874 | // assume 7-bit to be ascii ALWAYS |
2862 | // assume 7-bit to be ascii ALWAYS |
… | |
… | |
2884 | cmdbuf_ptr = cmdbuf_endp; |
2872 | cmdbuf_ptr = cmdbuf_endp; |
2885 | break; |
2873 | break; |
2886 | } |
2874 | } |
2887 | |
2875 | |
2888 | if (len == (size_t)-1) |
2876 | if (len == (size_t)-1) |
2889 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2877 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2890 | |
2878 | |
2891 | // assume wchar == unicode |
2879 | // assume wchar == unicode |
2892 | cmdbuf_ptr += len; |
2880 | cmdbuf_ptr += len; |
2893 | return wc & UNICODE_MASK; |
2881 | return wc & UNICODE_MASK; |
2894 | } |
2882 | } |
2895 | |
2883 | |
2896 | return NOCHAR; |
2884 | return NOCHAR; |
|
|
2885 | } |
|
|
2886 | |
|
|
2887 | // read the next octet |
|
|
2888 | uint32_t |
|
|
2889 | rxvt_term::next_octet () |
|
|
2890 | { |
|
|
2891 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2892 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2893 | : NOCHAR; |
2897 | } |
2894 | } |
2898 | |
2895 | |
2899 | /* rxvt_cmd_getc () - Return next input character */ |
2896 | /* rxvt_cmd_getc () - Return next input character */ |
2900 | /* |
2897 | /* |
2901 | * Return the next input character after first passing any keyboard input |
2898 | * Return the next input character after first passing any keyboard input |
2902 | * to the command. |
2899 | * to the command. |
2903 | */ |
2900 | */ |
2904 | unicode_t |
2901 | wchar_t |
2905 | rxvt_term::cmd_getc () |
2902 | rxvt_term::cmd_getc () |
2906 | { |
2903 | { |
2907 | unicode_t c = next_char (); |
2904 | wchar_t c = next_char (); |
2908 | |
2905 | |
2909 | if (c == NOCHAR) |
2906 | if (c == NOCHAR) |
2910 | throw out_of_input; |
2907 | throw out_of_input; |
2911 | |
2908 | |
2912 | return c; |
2909 | return c; |
2913 | } |
2910 | } |
2914 | |
2911 | |
2915 | unicode_t |
2912 | uint32_t |
2916 | rxvt_term::cmd_get8 () |
2913 | rxvt_term::cmd_get8 () |
2917 | { |
2914 | { |
2918 | unicode_t c = next_octet (); |
2915 | uint32_t c = next_octet (); |
2919 | |
2916 | |
2920 | if (c == NOCHAR) |
2917 | if (c == NOCHAR) |
2921 | throw out_of_input; |
2918 | throw out_of_input; |
2922 | |
2919 | |
2923 | return c; |
2920 | return c; |
… | |
… | |
3190 | break; |
3187 | break; |
3191 | |
3188 | |
3192 | /* 8.3.87: NEXT LINE */ |
3189 | /* 8.3.87: NEXT LINE */ |
3193 | case C1_NEL: /* ESC E */ |
3190 | case C1_NEL: /* ESC E */ |
3194 | { |
3191 | { |
3195 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3192 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3196 | scr_add_lines (nlcr, 1, 2); |
3193 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3197 | } |
3194 | } |
3198 | break; |
3195 | break; |
3199 | |
3196 | |
3200 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3197 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3201 | case C1_ESA: /* ESC G */ |
3198 | case C1_ESA: /* ESC G */ |
… | |
… | |
3865 | { |
3862 | { |
3866 | if ((name = strchr (buf, ';')) == NULL) |
3863 | if ((name = strchr (buf, ';')) == NULL) |
3867 | break; |
3864 | break; |
3868 | |
3865 | |
3869 | *name++ = '\0'; |
3866 | *name++ = '\0'; |
3870 | color = atoi (buf); |
3867 | color = atoi (buf) + minCOLOR; |
3871 | |
3868 | |
3872 | if (color < 0 || color >= TOTAL_COLORS) |
3869 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3873 | break; |
3870 | break; |
3874 | |
3871 | |
3875 | if ((buf = strchr (name, ';')) != NULL) |
3872 | if ((buf = strchr (name, ';')) != NULL) |
3876 | *buf++ = '\0'; |
3873 | *buf++ = '\0'; |
3877 | |
3874 | |
3878 | if (name[0] == '?' && !name[1]) |
3875 | if (name[0] == '?' && !name[1]) |
3879 | { |
3876 | { |
3880 | unsigned short r, g, b; |
3877 | unsigned short r, g, b; |
3881 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3878 | pix_colors_focused[color].get (display, r, g, b); |
3882 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3879 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3883 | } |
3880 | } |
3884 | else |
3881 | else |
3885 | set_window_color (color + minCOLOR, name); |
3882 | set_window_color (color, name); |
3886 | } |
3883 | } |
3887 | break; |
3884 | break; |
3888 | case XTerm_Color00: |
3885 | case XTerm_Color00: |
3889 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3886 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3890 | break; |
3887 | break; |
3891 | case XTerm_Color01: |
3888 | case XTerm_Color01: |
3892 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3889 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3893 | break; |
3890 | break; |
3894 | #ifndef NO_CURSORCOLOR |
3891 | #ifndef NO_CURSORCOLOR |
3895 | case XTerm_Color_cursor: |
3892 | case XTerm_Color_cursor: |
3896 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3893 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3897 | break; |
3894 | break; |
… | |
… | |
3901 | break; |
3898 | break; |
3902 | case XTerm_Color_pointer_bg: |
3899 | case XTerm_Color_pointer_bg: |
3903 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3900 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3904 | break; |
3901 | break; |
3905 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3902 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3906 | case XTerm_Color_BD: |
|
|
3907 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3908 | break; |
|
|
3909 | case XTerm_Color_UL: |
|
|
3910 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3911 | break; |
|
|
3912 | case XTerm_Color_RV: |
3903 | case XTerm_Color_RV: |
3913 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3904 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3905 | break; |
|
|
3906 | case Rxvt_Color_BD: |
|
|
3907 | case URxvt_Color_BD: |
|
|
3908 | process_color_seq (op, Color_BD, str, resp); |
|
|
3909 | break; |
|
|
3910 | case Rxvt_Color_UL: |
|
|
3911 | case URxvt_Color_UL: |
|
|
3912 | process_color_seq (op, Color_UL, str, resp); |
3914 | break; |
3913 | break; |
3915 | case URxvt_Color_IT: |
3914 | case URxvt_Color_IT: |
3916 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3915 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3917 | break; |
3916 | break; |
3918 | #endif |
3917 | #endif |
… | |
… | |
3923 | if (am_transparent) |
3922 | if (am_transparent) |
3924 | want_full_refresh = want_refresh = 1; |
3923 | want_full_refresh = want_refresh = 1; |
3925 | break; |
3924 | break; |
3926 | #endif |
3925 | #endif |
3927 | |
3926 | |
3928 | case XTerm_Pixmap: |
3927 | case Rxvt_Pixmap: |
3929 | if (*str != ';') |
3928 | if (*str != ';') |
3930 | { |
3929 | { |
3931 | #if XPM_BACKGROUND |
3930 | #if XPM_BACKGROUND |
3932 | scale_pixmap (""); /* reset to default scaling */ |
3931 | scale_pixmap (""); /* reset to default scaling */ |
3933 | set_bgPixmap (str); /* change pixmap */ |
3932 | set_bgPixmap (str); /* change pixmap */ |
3934 | #endif |
|
|
3935 | scr_touch (true); |
3933 | scr_touch (true); |
|
|
3934 | #endif |
3936 | } |
3935 | } |
|
|
3936 | |
3937 | while ((str = strchr (str, ';')) != NULL) |
3937 | while ((str = strchr (str, ';')) != NULL) |
3938 | { |
3938 | { |
3939 | str++; |
3939 | str++; |
3940 | #if XPM_BACKGROUND |
3940 | #if XPM_BACKGROUND |
3941 | changed += scale_pixmap (str); |
3941 | changed += scale_pixmap (str); |
… | |
… | |
3944 | |
3944 | |
3945 | if (changed) |
3945 | if (changed) |
3946 | { |
3946 | { |
3947 | #ifdef XPM_BACKGROUND |
3947 | #ifdef XPM_BACKGROUND |
3948 | resize_pixmap (); |
3948 | resize_pixmap (); |
3949 | #endif |
|
|
3950 | scr_touch (true); |
3949 | scr_touch (true); |
|
|
3950 | #endif |
3951 | } |
3951 | } |
3952 | break; |
3952 | break; |
3953 | |
3953 | |
3954 | case XTerm_restoreFG: |
3954 | case Rxvt_restoreFG: |
3955 | set_window_color (Color_fg, str); |
3955 | set_window_color (Color_fg, str); |
3956 | break; |
3956 | break; |
3957 | case XTerm_restoreBG: |
3957 | case Rxvt_restoreBG: |
3958 | set_window_color (Color_bg, str); |
3958 | set_window_color (Color_bg, str); |
3959 | break; |
3959 | break; |
3960 | |
3960 | |
3961 | case XTerm_logfile: |
3961 | case XTerm_logfile: |
3962 | // TODO, when secure mode? |
3962 | // TODO, when secure mode? |
… | |
… | |
3967 | if (OPTION (Opt_insecure)) |
3967 | if (OPTION (Opt_insecure)) |
3968 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3968 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3969 | break; |
3969 | break; |
3970 | #endif |
3970 | #endif |
3971 | #if 0 |
3971 | #if 0 |
3972 | case XTerm_dumpscreen: /* no error notices */ |
3972 | case Rxvt_dumpscreen: /* no error notices */ |
3973 | { |
3973 | { |
3974 | int fd; |
3974 | int fd; |
3975 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3975 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3976 | { |
3976 | { |
3977 | scr_dump (fd); |
3977 | scr_dump (fd); |
… | |
… | |
4029 | break; |
4029 | break; |
4030 | #endif |
4030 | #endif |
4031 | |
4031 | |
4032 | #if ENABLE_PERL |
4032 | #if ENABLE_PERL |
4033 | case URxvt_perl: |
4033 | case URxvt_perl: |
4034 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
4034 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
4035 | ; // no responses yet |
4035 | ; // no responses yet |
4036 | break; |
4036 | break; |
4037 | #endif |
4037 | #endif |
4038 | } |
4038 | } |
4039 | } |
4039 | } |
… | |
… | |
4151 | /* extra handling for values with state unkept */ |
4151 | /* extra handling for values with state unkept */ |
4152 | switch (arg[i]) |
4152 | switch (arg[i]) |
4153 | { |
4153 | { |
4154 | #if ENABLE_STYLES |
4154 | #if ENABLE_STYLES |
4155 | case 1021: |
4155 | case 1021: |
4156 | if (mode) |
4156 | set_option (Opt_intensityStyles, mode); |
4157 | SET_OPTION (Opt_intensityStyles); |
|
|
4158 | else |
|
|
4159 | CLR_OPTION (Opt_intensityStyles); |
|
|
4160 | |
4157 | |
4161 | scr_touch (true); |
4158 | scr_touch (true); |
4162 | break; |
4159 | break; |
4163 | #endif |
4160 | #endif |
4164 | case 1048: /* alternative cursor save */ |
4161 | case 1048: /* alternative cursor save */ |
… | |
… | |
4186 | case 3: /* 80/132 */ |
4183 | case 3: /* 80/132 */ |
4187 | if (priv_modes & PrivMode_132OK) |
4184 | if (priv_modes & PrivMode_132OK) |
4188 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4185 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4189 | break; |
4186 | break; |
4190 | case 4: /* smooth scrolling */ |
4187 | case 4: /* smooth scrolling */ |
4191 | if (!state) |
4188 | set_option (Opt_jumpScroll, !state); |
4192 | SET_OPTION (Opt_jumpScroll); |
|
|
4193 | else |
|
|
4194 | CLR_OPTION (Opt_jumpScroll); |
|
|
4195 | break; |
4189 | break; |
4196 | case 5: /* reverse video */ |
4190 | case 5: /* reverse video */ |
4197 | scr_rvideo_mode (state); |
4191 | scr_rvideo_mode (state); |
4198 | break; |
4192 | break; |
4199 | case 6: /* relative/absolute origins */ |
4193 | case 6: /* relative/absolute origins */ |
… | |
… | |
4240 | #if 0 |
4234 | #if 0 |
4241 | case 1001: |
4235 | case 1001: |
4242 | break; /* X11 mouse highlighting */ |
4236 | break; /* X11 mouse highlighting */ |
4243 | #endif |
4237 | #endif |
4244 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4238 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4245 | if (!state) |
4239 | set_option (Opt_scrollTtyOutput, !state); |
4246 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4247 | else |
|
|
4248 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4249 | break; |
4240 | break; |
4250 | case 1011: /* scroll to bottom on key press */ |
4241 | case 1011: /* scroll to bottom on key press */ |
4251 | if (state) |
4242 | set_option (Opt_scrollTtyKeypress, state); |
4252 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4253 | else |
|
|
4254 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4255 | break; |
4243 | break; |
4256 | case 1047: /* secondary screen w/ clearing last */ |
4244 | case 1047: /* secondary screen w/ clearing last */ |
4257 | if (OPTION (Opt_secondaryScreen)) |
4245 | if (OPTION (Opt_secondaryScreen)) |
4258 | if (current_screen != PRIMARY) |
4246 | if (current_screen != PRIMARY) |
4259 | scr_erase_screen (2); |
4247 | scr_erase_screen (2); |
… | |
… | |
4469 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4457 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4470 | |
4458 | |
4471 | void |
4459 | void |
4472 | rxvt_term::tt_write (const char *data, unsigned int len) |
4460 | rxvt_term::tt_write (const char *data, unsigned int len) |
4473 | { |
4461 | { |
|
|
4462 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4463 | return; |
|
|
4464 | |
4474 | if (pty.pty < 0) |
4465 | if (pty.pty < 0) |
4475 | return; |
4466 | return; |
4476 | |
4467 | |
4477 | if (v_buflen == 0) |
4468 | if (v_buflen == 0) |
4478 | { |
4469 | { |