… | |
… | |
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 | { |
… | |
… | |
443 | scr_move_to (0, 1); |
443 | scr_move_to (0, 1); |
444 | return; |
444 | return; |
445 | } |
445 | } |
446 | else if (keysym == XK_End) |
446 | else if (keysym == XK_End) |
447 | { |
447 | { |
448 | scr_move_to (1, 0); |
448 | scr_move_to (1, 1); |
449 | return; |
449 | return; |
450 | } |
450 | } |
451 | } |
451 | } |
452 | #endif |
452 | #endif |
453 | } |
453 | } |
… | |
… | |
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_STR_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 |
… | |
… | |
1022 | } |
1021 | } |
1023 | |
1022 | |
1024 | void |
1023 | void |
1025 | rxvt_term::check_cb (check_watcher &w) |
1024 | rxvt_term::check_cb (check_watcher &w) |
1026 | { |
1025 | { |
1027 | SET_R (this); |
1026 | make_current (); |
1028 | SET_LOCALE (locale); |
|
|
1029 | |
1027 | |
1030 | display->flush (); |
1028 | display->flush (); |
1031 | |
1029 | |
1032 | if (want_refresh && !flush_ev.active) |
1030 | if (want_refresh && !flush_ev.active) |
1033 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
1031 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
1034 | } |
1032 | } |
1035 | |
1033 | |
1036 | void |
1034 | void |
1037 | rxvt_term::flush_cb (time_watcher &w) |
1035 | rxvt_term::flush_cb (time_watcher &w) |
1038 | { |
1036 | { |
1039 | SET_R (this); |
1037 | make_current (); |
1040 | SET_LOCALE (locale); |
|
|
1041 | |
1038 | |
1042 | refresh_limit = 1; |
1039 | refresh_limit = 1; |
1043 | refresh_count = 0; |
1040 | refresh_count = 0; |
1044 | flush (); |
1041 | flush (); |
1045 | } |
1042 | } |
… | |
… | |
1102 | { |
1099 | { |
1103 | if (mouse_slip_wheel_speed == 0 |
1100 | if (mouse_slip_wheel_speed == 0 |
1104 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1101 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1105 | : scr_page (UP, mouse_slip_wheel_speed)) |
1102 | : scr_page (UP, mouse_slip_wheel_speed)) |
1106 | { |
1103 | { |
1107 | if (view_start == nsaved || |
1104 | if (view_start == top_row || view_start == 0) |
1108 | view_start == 0) |
|
|
1109 | mouse_slip_wheel_speed = 0; |
1105 | mouse_slip_wheel_speed = 0; |
1110 | |
1106 | |
1111 | refresh_type |= SMOOTH_REFRESH; |
1107 | refresh_type |= SMOOTH_REFRESH; |
1112 | want_refresh = 1; |
1108 | want_refresh = 1; |
1113 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1109 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
… | |
… | |
1174 | } |
1170 | } |
1175 | |
1171 | |
1176 | void |
1172 | void |
1177 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1173 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1178 | { |
1174 | { |
1179 | SET_R (this); |
1175 | make_current (); |
1180 | SET_LOCALE (locale); |
|
|
1181 | |
1176 | |
1182 | if (revents & EVENT_READ) |
1177 | if (revents & EVENT_READ) |
1183 | // loop, but don't allow a single term to monopolize us |
1178 | // loop, but don't allow a single term to monopolize us |
1184 | while (pty_fill ()) |
1179 | while (pty_fill ()) |
1185 | if (cmd_parse ()) |
1180 | if (cmd_parse ()) |
… | |
… | |
1217 | } |
1212 | } |
1218 | |
1213 | |
1219 | void |
1214 | void |
1220 | rxvt_term::pointer_cb (time_watcher &w) |
1215 | rxvt_term::pointer_cb (time_watcher &w) |
1221 | { |
1216 | { |
1222 | SET_R (this); |
1217 | make_current (); |
1223 | SET_LOCALE (locale); |
|
|
1224 | |
1218 | |
1225 | pointer_blank (); |
1219 | pointer_blank (); |
1226 | } |
1220 | } |
1227 | #endif |
1221 | #endif |
1228 | |
1222 | |
… | |
… | |
1307 | |
1301 | |
1308 | /*{{{ process an X event */ |
1302 | /*{{{ process an X event */ |
1309 | void |
1303 | void |
1310 | rxvt_term::x_cb (XEvent &ev) |
1304 | rxvt_term::x_cb (XEvent &ev) |
1311 | { |
1305 | { |
|
|
1306 | make_current (); |
|
|
1307 | |
1312 | dDisp; |
1308 | dDisp; |
1313 | |
1309 | |
1314 | SET_R (this); |
1310 | if (ev.xany.window == vt |
1315 | SET_LOCALE (locale); |
1311 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1312 | return; |
1316 | |
1313 | |
1317 | #if defined(CURSOR_BLINK) |
1314 | // for XQueryPointer |
1318 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1319 | { |
|
|
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 | |
|
|
1344 | Window unused_root, unused_child; |
1315 | Window unused_root, unused_child; |
1345 | int unused_root_x, unused_root_y; |
1316 | int unused_root_x, unused_root_y; |
1346 | unsigned int unused_mask; |
1317 | unsigned int unused_mask; |
1347 | |
1318 | |
1348 | switch (ev.type) |
1319 | switch (ev.type) |
… | |
… | |
1355 | |
1326 | |
1356 | break; |
1327 | break; |
1357 | |
1328 | |
1358 | case KeyRelease: |
1329 | case KeyRelease: |
1359 | { |
1330 | { |
1360 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1331 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1361 | KeySym ks; |
1332 | KeySym keysym; |
1362 | |
1333 | |
1363 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1334 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1364 | #endif |
1335 | #endif |
1365 | |
1336 | |
1366 | #if ENABLE_FRILLS || ISO_14755 |
1337 | #if ENABLE_FRILLS || ISO_14755 |
1367 | // ISO 14755 support |
1338 | // ISO 14755 support |
1368 | if (iso14755buf) |
1339 | if (iso14755buf) |
… | |
… | |
1373 | # endif |
1344 | # endif |
1374 | # if ISO_14755 |
1345 | # if ISO_14755 |
1375 | // iso14755 part 5.2 handling: release time |
1346 | // iso14755 part 5.2 handling: release time |
1376 | // first: controls |
1347 | // first: controls |
1377 | if ((ev.xkey.state & ControlMask) |
1348 | if ((ev.xkey.state & ControlMask) |
1378 | && ((ks >= 0x40 && ks <= 0x5f) |
1349 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1379 | || (ks >= 0x61 && ks <= 0x7f))) |
1350 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1380 | { |
1351 | { |
1381 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1352 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1382 | commit_iso14755 (); |
1353 | commit_iso14755 (); |
1383 | return; // case-break; |
1354 | goto skip_switch; |
1384 | } |
1355 | } |
1385 | |
1356 | |
1386 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1357 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1387 | if (i[0] == ks) |
1358 | if (i[0] == keysym) |
1388 | { |
1359 | { |
1389 | iso14755buf = ISO_14755_51 | i[1]; |
1360 | iso14755buf = ISO_14755_51 | i[1]; |
1390 | commit_iso14755 (); |
1361 | commit_iso14755 (); |
1391 | return; // case-break; |
1362 | goto skip_switch; |
1392 | } |
1363 | } |
1393 | |
1364 | |
1394 | scr_bell (); |
1365 | scr_bell (); |
1395 | # endif |
1366 | # endif |
1396 | iso14755buf = 0; |
1367 | iso14755buf = 0; |
… | |
… | |
1416 | iso14755buf = 0; |
1387 | iso14755buf = 0; |
1417 | } |
1388 | } |
1418 | #endif |
1389 | #endif |
1419 | |
1390 | |
1420 | if (ev.xany.window == vt |
1391 | if (ev.xany.window == vt |
1421 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) |
1392 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
1422 | break; |
1393 | break; |
1423 | |
1394 | |
1424 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1395 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1425 | if (!(ev.xkey.state & ControlMask)) |
1396 | if (!(ev.xkey.state & ControlMask)) |
1426 | slip_wheel_ev.stop (); |
1397 | slip_wheel_ev.stop (); |
1427 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1398 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1428 | mouse_slip_wheel_speed = 0; |
1399 | mouse_slip_wheel_speed = 0; |
1429 | #endif |
1400 | #endif |
1430 | break; |
1401 | break; |
1431 | } |
1402 | } |
1432 | |
1403 | |
… | |
… | |
1562 | |
1533 | |
1563 | case SelectionRequest: |
1534 | case SelectionRequest: |
1564 | selection_send (ev.xselectionrequest); |
1535 | selection_send (ev.xselectionrequest); |
1565 | break; |
1536 | break; |
1566 | |
1537 | |
|
|
1538 | case MapNotify: |
|
|
1539 | mapped = 1; |
|
|
1540 | #ifdef TEXT_BLINK |
|
|
1541 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1542 | #endif |
|
|
1543 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1544 | break; |
|
|
1545 | |
1567 | case UnmapNotify: |
1546 | case UnmapNotify: |
1568 | mapped = 0; |
1547 | mapped = 0; |
1569 | #ifdef TEXT_BLINK |
1548 | #ifdef TEXT_BLINK |
1570 | text_blink_ev.stop (); |
1549 | text_blink_ev.stop (); |
1571 | #endif |
1550 | #endif |
1572 | break; |
1551 | 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; |
1552 | break; |
1580 | |
1553 | |
1581 | #ifdef TRANSPARENT |
1554 | #ifdef TRANSPARENT |
1582 | case ReparentNotify: |
1555 | case ReparentNotify: |
1583 | rootwin_cb (ev); |
1556 | rootwin_cb (ev); |
… | |
… | |
1597 | |
1570 | |
1598 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1571 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1599 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1572 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1600 | ev.xexpose.width, ev.xexpose.height, False); |
1573 | ev.xexpose.width, ev.xexpose.height, False); |
1601 | |
1574 | |
1602 | scr_refresh (refresh_type); |
1575 | want_refresh = 1; |
1603 | } |
1576 | } |
1604 | else |
1577 | else |
1605 | { |
1578 | { |
1606 | XEvent unused_event; |
1579 | XEvent unused_event; |
1607 | |
1580 | |
… | |
… | |
1734 | &unused_root_x, &unused_root_y, |
1707 | &unused_root_x, &unused_root_y, |
1735 | &ev.xbutton.x, &ev.xbutton.y, |
1708 | &ev.xbutton.x, &ev.xbutton.y, |
1736 | &unused_mask); |
1709 | &unused_mask); |
1737 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1710 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1738 | scrollbar_size ()); |
1711 | scrollbar_size ()); |
1739 | scr_refresh (refresh_type); |
1712 | want_refresh = 1; |
1740 | refresh_limit = 0; |
1713 | refresh_limit = 0; |
1741 | scrollbar_show (1); |
1714 | scrollbar_show (1); |
1742 | } |
1715 | } |
1743 | break; |
1716 | break; |
1744 | } |
1717 | } |
|
|
1718 | |
|
|
1719 | skip_switch: ; |
|
|
1720 | |
|
|
1721 | #if defined(CURSOR_BLINK) |
|
|
1722 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1723 | { |
|
|
1724 | if (hidden_cursor) |
|
|
1725 | { |
|
|
1726 | hidden_cursor = 0; |
|
|
1727 | want_refresh = 1; |
|
|
1728 | } |
|
|
1729 | |
|
|
1730 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1731 | } |
|
|
1732 | #endif |
|
|
1733 | |
|
|
1734 | #if defined(POINTER_BLANK) |
|
|
1735 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1736 | { |
|
|
1737 | if (ev.type == MotionNotify |
|
|
1738 | || ev.type == ButtonPress |
|
|
1739 | || ev.type == ButtonRelease) |
|
|
1740 | if (hidden_pointer) |
|
|
1741 | pointer_unblank (); |
|
|
1742 | |
|
|
1743 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1744 | pointer_blank (); |
|
|
1745 | } |
|
|
1746 | #endif |
1745 | } |
1747 | } |
1746 | |
1748 | |
1747 | void |
1749 | void |
1748 | rxvt_term::focus_in () |
1750 | rxvt_term::focus_in () |
1749 | { |
1751 | { |
… | |
… | |
1815 | |
1817 | |
1816 | #if TRANSPARENT |
1818 | #if TRANSPARENT |
1817 | void |
1819 | void |
1818 | rxvt_term::rootwin_cb (XEvent &ev) |
1820 | rxvt_term::rootwin_cb (XEvent &ev) |
1819 | { |
1821 | { |
1820 | SET_R (this); |
1822 | make_current (); |
1821 | SET_LOCALE (locale); |
|
|
1822 | |
1823 | |
1823 | switch (ev.type) |
1824 | switch (ev.type) |
1824 | { |
1825 | { |
1825 | case PropertyNotify: |
1826 | case PropertyNotify: |
1826 | /* |
1827 | /* |
… | |
… | |
1917 | #else |
1918 | #else |
1918 | selection.rect = false; |
1919 | selection.rect = false; |
1919 | #endif |
1920 | #endif |
1920 | |
1921 | |
1921 | /* allow shift+left click to extend selection */ |
1922 | /* allow shift+left click to extend selection */ |
1922 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1923 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1923 | { |
1924 | { |
1924 | if (MEvent.button == Button1 && clickintime) |
1925 | if (MEvent.button == Button1 && clickintime) |
1925 | selection_rotate (ev.x, ev.y); |
1926 | selection_rotate (ev.x, ev.y); |
1926 | else |
1927 | else |
1927 | selection_extend (ev.x, ev.y, 1); |
1928 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
2211 | slip_wheel_ev.start (); |
2212 | slip_wheel_ev.start (); |
2212 | } |
2213 | } |
2213 | else |
2214 | else |
2214 | { |
2215 | { |
2215 | # endif |
2216 | # endif |
2216 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2217 | scr_page (v, i); |
2217 | scr_page (v, i); |
2218 | scr_refresh (SMOOTH_REFRESH); |
|
|
2219 | scrollbar_show (1); |
2218 | 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 |
2219 | # ifdef MOUSE_SLIP_WHEELING |
2229 | } |
2220 | } |
2230 | #endif |
2221 | # endif |
2231 | } |
2222 | } |
2232 | break; |
2223 | break; |
2233 | #endif |
2224 | #endif |
2234 | } |
2225 | } |
2235 | } |
2226 | } |
… | |
… | |
2829 | refresh_limit++; |
2820 | refresh_limit++; |
2830 | else |
2821 | else |
2831 | { |
2822 | { |
2832 | flag = true; |
2823 | flag = true; |
2833 | scr_refresh (refresh_type); |
2824 | scr_refresh (refresh_type); |
2834 | flush_ev.stop (); |
2825 | want_refresh = 1; |
2835 | } |
2826 | } |
2836 | } |
2827 | } |
2837 | |
2828 | |
2838 | } |
2829 | } |
2839 | else |
2830 | else |
… | |
… | |
3865 | { |
3856 | { |
3866 | if ((name = strchr (buf, ';')) == NULL) |
3857 | if ((name = strchr (buf, ';')) == NULL) |
3867 | break; |
3858 | break; |
3868 | |
3859 | |
3869 | *name++ = '\0'; |
3860 | *name++ = '\0'; |
3870 | color = atoi (buf); |
3861 | color = atoi (buf) + minCOLOR; |
3871 | |
3862 | |
3872 | if (color < 0 || color >= TOTAL_COLORS) |
3863 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3873 | break; |
3864 | break; |
3874 | |
3865 | |
3875 | if ((buf = strchr (name, ';')) != NULL) |
3866 | if ((buf = strchr (name, ';')) != NULL) |
3876 | *buf++ = '\0'; |
3867 | *buf++ = '\0'; |
3877 | |
3868 | |
3878 | if (name[0] == '?' && !name[1]) |
3869 | if (name[0] == '?' && !name[1]) |
3879 | { |
3870 | { |
3880 | unsigned short r, g, b; |
3871 | unsigned short r, g, b; |
3881 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3872 | 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); |
3873 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3883 | } |
3874 | } |
3884 | else |
3875 | else |
3885 | set_window_color (color + minCOLOR, name); |
3876 | set_window_color (color, name); |
3886 | } |
3877 | } |
3887 | break; |
3878 | break; |
3888 | case XTerm_Color00: |
3879 | case XTerm_Color00: |
3889 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3880 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3890 | break; |
3881 | break; |
3891 | case XTerm_Color01: |
3882 | case XTerm_Color01: |
3892 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3883 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3893 | break; |
3884 | break; |
3894 | #ifndef NO_CURSORCOLOR |
3885 | #ifndef NO_CURSORCOLOR |
3895 | case XTerm_Color_cursor: |
3886 | case XTerm_Color_cursor: |
3896 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3887 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3897 | break; |
3888 | break; |
… | |
… | |
3901 | break; |
3892 | break; |
3902 | case XTerm_Color_pointer_bg: |
3893 | case XTerm_Color_pointer_bg: |
3903 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3894 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3904 | break; |
3895 | break; |
3905 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3896 | #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: |
3897 | case XTerm_Color_RV: |
3913 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3898 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3899 | break; |
|
|
3900 | case Rxvt_Color_BD: |
|
|
3901 | case URxvt_Color_BD: |
|
|
3902 | process_color_seq (op, Color_BD, str, resp); |
|
|
3903 | break; |
|
|
3904 | case Rxvt_Color_UL: |
|
|
3905 | case URxvt_Color_UL: |
|
|
3906 | process_color_seq (op, Color_UL, str, resp); |
3914 | break; |
3907 | break; |
3915 | case URxvt_Color_IT: |
3908 | case URxvt_Color_IT: |
3916 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3909 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3917 | break; |
3910 | break; |
3918 | #endif |
3911 | #endif |
… | |
… | |
3923 | if (am_transparent) |
3916 | if (am_transparent) |
3924 | want_full_refresh = want_refresh = 1; |
3917 | want_full_refresh = want_refresh = 1; |
3925 | break; |
3918 | break; |
3926 | #endif |
3919 | #endif |
3927 | |
3920 | |
3928 | case XTerm_Pixmap: |
3921 | case Rxvt_Pixmap: |
3929 | if (*str != ';') |
3922 | if (*str != ';') |
3930 | { |
3923 | { |
3931 | #if XPM_BACKGROUND |
3924 | #if XPM_BACKGROUND |
3932 | scale_pixmap (""); /* reset to default scaling */ |
3925 | scale_pixmap (""); /* reset to default scaling */ |
3933 | set_bgPixmap (str); /* change pixmap */ |
3926 | set_bgPixmap (str); /* change pixmap */ |
3934 | #endif |
|
|
3935 | scr_touch (true); |
3927 | scr_touch (true); |
|
|
3928 | #endif |
3936 | } |
3929 | } |
|
|
3930 | |
3937 | while ((str = strchr (str, ';')) != NULL) |
3931 | while ((str = strchr (str, ';')) != NULL) |
3938 | { |
3932 | { |
3939 | str++; |
3933 | str++; |
3940 | #if XPM_BACKGROUND |
3934 | #if XPM_BACKGROUND |
3941 | changed += scale_pixmap (str); |
3935 | changed += scale_pixmap (str); |
… | |
… | |
3944 | |
3938 | |
3945 | if (changed) |
3939 | if (changed) |
3946 | { |
3940 | { |
3947 | #ifdef XPM_BACKGROUND |
3941 | #ifdef XPM_BACKGROUND |
3948 | resize_pixmap (); |
3942 | resize_pixmap (); |
3949 | #endif |
|
|
3950 | scr_touch (true); |
3943 | scr_touch (true); |
|
|
3944 | #endif |
3951 | } |
3945 | } |
3952 | break; |
3946 | break; |
3953 | |
3947 | |
3954 | case XTerm_restoreFG: |
3948 | case Rxvt_restoreFG: |
3955 | set_window_color (Color_fg, str); |
3949 | set_window_color (Color_fg, str); |
3956 | break; |
3950 | break; |
3957 | case XTerm_restoreBG: |
3951 | case Rxvt_restoreBG: |
3958 | set_window_color (Color_bg, str); |
3952 | set_window_color (Color_bg, str); |
3959 | break; |
3953 | break; |
3960 | |
3954 | |
3961 | case XTerm_logfile: |
3955 | case XTerm_logfile: |
3962 | // TODO, when secure mode? |
3956 | // TODO, when secure mode? |
… | |
… | |
3967 | if (OPTION (Opt_insecure)) |
3961 | if (OPTION (Opt_insecure)) |
3968 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3962 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3969 | break; |
3963 | break; |
3970 | #endif |
3964 | #endif |
3971 | #if 0 |
3965 | #if 0 |
3972 | case XTerm_dumpscreen: /* no error notices */ |
3966 | case Rxvt_dumpscreen: /* no error notices */ |
3973 | { |
3967 | { |
3974 | int fd; |
3968 | int fd; |
3975 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3969 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3976 | { |
3970 | { |
3977 | scr_dump (fd); |
3971 | scr_dump (fd); |
… | |
… | |
4151 | /* extra handling for values with state unkept */ |
4145 | /* extra handling for values with state unkept */ |
4152 | switch (arg[i]) |
4146 | switch (arg[i]) |
4153 | { |
4147 | { |
4154 | #if ENABLE_STYLES |
4148 | #if ENABLE_STYLES |
4155 | case 1021: |
4149 | case 1021: |
4156 | if (mode) |
4150 | set_option (Opt_intensityStyles, mode); |
4157 | SET_OPTION (Opt_intensityStyles); |
|
|
4158 | else |
|
|
4159 | CLR_OPTION (Opt_intensityStyles); |
|
|
4160 | |
4151 | |
4161 | scr_touch (true); |
4152 | scr_touch (true); |
4162 | break; |
4153 | break; |
4163 | #endif |
4154 | #endif |
4164 | case 1048: /* alternative cursor save */ |
4155 | case 1048: /* alternative cursor save */ |
… | |
… | |
4186 | case 3: /* 80/132 */ |
4177 | case 3: /* 80/132 */ |
4187 | if (priv_modes & PrivMode_132OK) |
4178 | if (priv_modes & PrivMode_132OK) |
4188 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4179 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4189 | break; |
4180 | break; |
4190 | case 4: /* smooth scrolling */ |
4181 | case 4: /* smooth scrolling */ |
4191 | if (!state) |
4182 | set_option (Opt_jumpScroll, !state); |
4192 | SET_OPTION (Opt_jumpScroll); |
|
|
4193 | else |
|
|
4194 | CLR_OPTION (Opt_jumpScroll); |
|
|
4195 | break; |
4183 | break; |
4196 | case 5: /* reverse video */ |
4184 | case 5: /* reverse video */ |
4197 | scr_rvideo_mode (state); |
4185 | scr_rvideo_mode (state); |
4198 | break; |
4186 | break; |
4199 | case 6: /* relative/absolute origins */ |
4187 | case 6: /* relative/absolute origins */ |
… | |
… | |
4240 | #if 0 |
4228 | #if 0 |
4241 | case 1001: |
4229 | case 1001: |
4242 | break; /* X11 mouse highlighting */ |
4230 | break; /* X11 mouse highlighting */ |
4243 | #endif |
4231 | #endif |
4244 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4232 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4245 | if (!state) |
4233 | set_option (Opt_scrollTtyOutput, !state); |
4246 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4247 | else |
|
|
4248 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4249 | break; |
4234 | break; |
4250 | case 1011: /* scroll to bottom on key press */ |
4235 | case 1011: /* scroll to bottom on key press */ |
4251 | if (state) |
4236 | set_option (Opt_scrollTtyKeypress, state); |
4252 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4253 | else |
|
|
4254 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4255 | break; |
4237 | break; |
4256 | case 1047: /* secondary screen w/ clearing last */ |
4238 | case 1047: /* secondary screen w/ clearing last */ |
4257 | if (OPTION (Opt_secondaryScreen)) |
4239 | if (OPTION (Opt_secondaryScreen)) |
4258 | if (current_screen != PRIMARY) |
4240 | if (current_screen != PRIMARY) |
4259 | scr_erase_screen (2); |
4241 | scr_erase_screen (2); |
… | |
… | |
4469 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4451 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4470 | |
4452 | |
4471 | void |
4453 | void |
4472 | rxvt_term::tt_write (const char *data, unsigned int len) |
4454 | rxvt_term::tt_write (const char *data, unsigned int len) |
4473 | { |
4455 | { |
|
|
4456 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4457 | return; |
|
|
4458 | |
4474 | if (pty.pty < 0) |
4459 | if (pty.pty < 0) |
4475 | return; |
4460 | return; |
4476 | |
4461 | |
4477 | if (v_buflen == 0) |
4462 | if (v_buflen == 0) |
4478 | { |
4463 | { |