… | |
… | |
64 | |
64 | |
65 | /*----------------------------------------------------------------------*/ |
65 | /*----------------------------------------------------------------------*/ |
66 | |
66 | |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
68 | |
68 | |
69 | // exception thrown when the command parser runs out of input data |
|
|
70 | class out_of_input { } out_of_input; |
|
|
71 | |
|
|
72 | #if ENABLE_FRILLS || ISO_14755 |
69 | #if ENABLE_FRILLS || ISO_14755 |
73 | |
70 | |
74 | #define ISO_14755_STARTED 0x80000000UL |
71 | #define ISO_14755_STARTED 0x80000000UL |
75 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
72 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
76 | #define ISO_14755_52 0x20000000UL // keycap (section 5.2) |
73 | #define ISO_14755_52 0x20000000UL // keycap (section 5.2) |
… | |
… | |
302 | rxvt_term::lookup_key (XKeyEvent &ev) |
299 | rxvt_term::lookup_key (XKeyEvent &ev) |
303 | { |
300 | { |
304 | int ctrl, meta, shft, len; |
301 | int ctrl, meta, shft, len; |
305 | unsigned int newlen; |
302 | unsigned int newlen; |
306 | KeySym keysym; |
303 | KeySym keysym; |
307 | #ifdef DEBUG_CMD |
|
|
308 | static int debug_key = 1; /* accessible by a debugger only */ |
|
|
309 | #endif |
|
|
310 | int valid_keysym; |
304 | int valid_keysym; |
311 | char kbuf[KBUFSZ]; |
305 | char kbuf[KBUFSZ]; |
312 | |
306 | |
313 | /* |
307 | /* |
314 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
308 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
… | |
… | |
464 | { |
458 | { |
465 | switch (keysym) |
459 | switch (keysym) |
466 | { |
460 | { |
467 | /* normal XTerm key bindings */ |
461 | /* normal XTerm key bindings */ |
468 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
462 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
469 | selection_request (ev.time, 0, 0); |
463 | selection_request (ev.time); |
470 | return; |
464 | return; |
471 | #if TODO |
465 | #if TODO |
472 | /* rxvt extras */ |
466 | /* rxvt extras */ |
473 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
467 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
474 | change_font (FONT_UP); |
468 | change_font (FONT_UP); |
… | |
… | |
905 | { |
899 | { |
906 | const char ch = C0_ESC; |
900 | const char ch = C0_ESC; |
907 | tt_write (&ch, 1); |
901 | tt_write (&ch, 1); |
908 | } |
902 | } |
909 | |
903 | |
910 | #if defined(DEBUG_CMD) |
|
|
911 | /* Display keyboard buffer contents */ |
|
|
912 | unsigned char *p; |
|
|
913 | int i; |
|
|
914 | |
|
|
915 | fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); |
|
|
916 | for (i = 0, p = kbuf; i < len; i++, p++) |
|
|
917 | fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
|
|
918 | fprintf (stderr, "'\n"); |
|
|
919 | #endif /* DEBUG_CMD */ |
|
|
920 | tt_write (kbuf, (unsigned int)len); |
904 | tt_write (kbuf, (unsigned int)len); |
921 | } |
905 | } |
922 | /*}}} */ |
906 | /*}}} */ |
923 | |
907 | |
924 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
908 | #if defined (KEYSYM_RESOURCE) |
925 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
926 | /* attempt to `write' count to the input buffer */ |
|
|
927 | unsigned int |
909 | unsigned int |
928 | rxvt_term::cmd_write (const char *str, unsigned int count) |
910 | rxvt_term::cmd_write (const char *str, unsigned int count) |
929 | { |
911 | { |
930 | unsigned int n, s; |
912 | unsigned int n, s; |
931 | |
913 | |
… | |
… | |
1008 | while (l->is_longer () && row < end_row); |
990 | while (l->is_longer () && row < end_row); |
1009 | } |
991 | } |
1010 | while (row < end_row); |
992 | while (row < end_row); |
1011 | } |
993 | } |
1012 | |
994 | |
1013 | scr_refresh (refresh_type); |
995 | scr_refresh (); |
1014 | scrollbar_show (1); |
996 | scrollbar_show (1); |
1015 | #ifdef USE_XIM |
997 | #ifdef USE_XIM |
1016 | IMSendSpot (); |
998 | IMSendSpot (); |
1017 | #endif |
999 | #endif |
1018 | } |
1000 | } |
… | |
… | |
1046 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1028 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1047 | { |
1029 | { |
1048 | hidden_cursor = !hidden_cursor; |
1030 | hidden_cursor = !hidden_cursor; |
1049 | want_refresh = 1; |
1031 | want_refresh = 1; |
1050 | |
1032 | |
1051 | w.start (w.at + BLINK_INTERVAL); |
1033 | w.start (w.at + CURSOR_BLINK_INTERVAL); |
1052 | } |
1034 | } |
1053 | #endif |
1035 | #endif |
1054 | |
1036 | |
1055 | #ifdef TEXT_BLINK |
1037 | #ifdef TEXT_BLINK |
1056 | void |
1038 | void |
… | |
… | |
1070 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1052 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1071 | { |
1053 | { |
1072 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1054 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1073 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1055 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1074 | { |
1056 | { |
1075 | refresh_type |= SMOOTH_REFRESH; |
|
|
1076 | want_refresh = 1; |
1057 | want_refresh = 1; |
1077 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1058 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1078 | } |
1059 | } |
1079 | } |
1060 | } |
1080 | #endif |
1061 | #endif |
… | |
… | |
1084 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1065 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1085 | { |
1066 | { |
1086 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1067 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1087 | { |
1068 | { |
1088 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1069 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1089 | refresh_type |= SMOOTH_REFRESH; |
|
|
1090 | want_refresh = 1; |
1070 | want_refresh = 1; |
1091 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1071 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1092 | } |
1072 | } |
1093 | } |
1073 | } |
1094 | #endif |
1074 | #endif |
… | |
… | |
1102 | : scr_page (UP, mouse_slip_wheel_speed)) |
1082 | : scr_page (UP, mouse_slip_wheel_speed)) |
1103 | { |
1083 | { |
1104 | if (view_start == top_row || view_start == 0) |
1084 | if (view_start == top_row || view_start == 0) |
1105 | mouse_slip_wheel_speed = 0; |
1085 | mouse_slip_wheel_speed = 0; |
1106 | |
1086 | |
1107 | refresh_type |= SMOOTH_REFRESH; |
|
|
1108 | want_refresh = 1; |
1087 | want_refresh = 1; |
1109 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1088 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1110 | } |
1089 | } |
1111 | } |
1090 | } |
1112 | #endif |
1091 | #endif |
… | |
… | |
1142 | |
1121 | |
1143 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1122 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1144 | cmdbuf_ptr = cmdbuf_base; |
1123 | cmdbuf_ptr = cmdbuf_base; |
1145 | cmdbuf_endp = cmdbuf_ptr + n; |
1124 | cmdbuf_endp = cmdbuf_ptr + n; |
1146 | |
1125 | |
1147 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1126 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1148 | |
1127 | |
1149 | if (r > 0) |
1128 | if (r > 0) |
1150 | { |
1129 | { |
1151 | cmdbuf_endp += r; |
1130 | cmdbuf_endp += r; |
1152 | return true; |
1131 | return true; |
… | |
… | |
1287 | (32 + button_number + key_state), |
1266 | (32 + button_number + key_state), |
1288 | (32 + x + 1), |
1267 | (32 + x + 1), |
1289 | (32 + y + 1)); |
1268 | (32 + y + 1)); |
1290 | } |
1269 | } |
1291 | |
1270 | |
1292 | #ifdef USING_W11LIB |
|
|
1293 | void |
|
|
1294 | rxvt_W11_process_x_event (XEvent *ev) |
|
|
1295 | { |
|
|
1296 | rxvt_t *r = rxvt_get_r (); |
|
|
1297 | |
|
|
1298 | x_cb (*ev); |
|
|
1299 | } |
|
|
1300 | #endif |
|
|
1301 | |
|
|
1302 | /*{{{ process an X event */ |
1271 | /*{{{ process an X event */ |
1303 | void |
1272 | void |
1304 | rxvt_term::x_cb (XEvent &ev) |
1273 | rxvt_term::x_cb (XEvent &ev) |
1305 | { |
1274 | { |
1306 | make_current (); |
1275 | make_current (); |
1307 | |
1276 | |
1308 | dDisp; |
1277 | dDisp; |
1309 | |
1278 | |
1310 | if (ev.xany.window == vt |
1279 | if (ev.xany.window == vt |
|
|
1280 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1311 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1281 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1312 | return; |
1282 | return; |
1313 | |
1283 | |
1314 | // for XQueryPointer |
1284 | // for XQueryPointer |
1315 | Window unused_root, unused_child; |
1285 | Window unused_root, unused_child; |
… | |
… | |
1409 | button_release (ev.xbutton); |
1379 | button_release (ev.xbutton); |
1410 | break; |
1380 | break; |
1411 | |
1381 | |
1412 | case ClientMessage: |
1382 | case ClientMessage: |
1413 | if (ev.xclient.format == 32 |
1383 | if (ev.xclient.format == 32 |
1414 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
1384 | && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END))) |
1415 | { |
1385 | { |
|
|
1386 | if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1387 | { |
|
|
1388 | if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END))) |
|
|
1389 | { |
1416 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1390 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
|
|
1391 | { |
|
|
1392 | if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) |
1417 | destroy (); |
1393 | destroy (); |
|
|
1394 | } |
1418 | #if ENABLE_EWMH |
1395 | #if ENABLE_EWMH |
1419 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1396 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1420 | XSendEvent (disp, ev.xclient.window = display->root, |
1397 | XSendEvent (disp, ev.xclient.window = display->root, |
1421 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1398 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1422 | &ev); |
1399 | &ev); |
|
|
1400 | #endif |
|
|
1401 | } |
|
|
1402 | } |
|
|
1403 | #if ENABLE_XEMBED |
|
|
1404 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1405 | { |
|
|
1406 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1407 | focus_in (); |
|
|
1408 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1409 | focus_out (); |
|
|
1410 | } |
1423 | #endif |
1411 | #endif |
1424 | } |
1412 | } |
1425 | #if ENABLE_XEMBED |
|
|
1426 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1427 | { |
|
|
1428 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1429 | focus_in (); |
|
|
1430 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1431 | focus_out (); |
|
|
1432 | } |
|
|
1433 | #endif |
|
|
1434 | #ifdef OFFIX_DND |
|
|
1435 | /* OffiX Dnd (drag 'n' drop) protocol */ |
|
|
1436 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
|
|
1437 | && (ev.xclient.data.l[0] == DndFile |
|
|
1438 | || ev.xclient.data.l[0] == DndDir |
|
|
1439 | || ev.xclient.data.l[0] == DndLink)) |
|
|
1440 | { |
|
|
1441 | /* Get Dnd data */ |
|
|
1442 | Atom ActualType; |
|
|
1443 | int ActualFormat; |
|
|
1444 | unsigned char *data; |
|
|
1445 | unsigned long Size, RemainingBytes; |
|
|
1446 | |
|
|
1447 | XGetWindowProperty (disp, display->root, |
|
|
1448 | xa[XA_DNDSELECTION], |
|
|
1449 | 0L, 1000000L, |
|
|
1450 | False, AnyPropertyType, |
|
|
1451 | &ActualType, &ActualFormat, |
|
|
1452 | &Size, &RemainingBytes, |
|
|
1453 | &data); |
|
|
1454 | set_string_property (XA_CUT_BUFFER0, data); |
|
|
1455 | XFree (data); |
|
|
1456 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
|
|
1457 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
|
|
1458 | } |
|
|
1459 | #endif /* OFFIX_DND */ |
|
|
1460 | break; |
1413 | break; |
1461 | |
1414 | |
1462 | case MappingNotify: |
1415 | case MappingNotify: |
1463 | XRefreshKeyboardMapping (&ev.xmapping); |
1416 | XRefreshKeyboardMapping (&ev.xmapping); |
1464 | break; |
1417 | break; |
… | |
… | |
1506 | { |
1459 | { |
1507 | seen_resize = 1; |
1460 | seen_resize = 1; |
1508 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1461 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1509 | } |
1462 | } |
1510 | |
1463 | |
|
|
1464 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1465 | |
1511 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1466 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1512 | if (OPTION (Opt_transparent)) |
1467 | if (OPTION (Opt_transparent)) |
1513 | check_our_parents (); |
1468 | check_our_parents (); |
1514 | #endif |
1469 | #endif |
1515 | } |
1470 | } |
1516 | break; |
1471 | break; |
1517 | |
1472 | |
1518 | case PropertyNotify: |
1473 | case PropertyNotify: |
|
|
1474 | if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1519 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1475 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1520 | && ev.xproperty.state == PropertyNewValue) |
1476 | && ev.xproperty.state == PropertyNewValue) |
1521 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1477 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1522 | |
1478 | |
1523 | break; |
1479 | break; |
1524 | |
1480 | |
1525 | case SelectionClear: |
1481 | case SelectionClear: |
1526 | selection_clear (); |
1482 | selection_clear (); |
… | |
… | |
1586 | if (isScrollbarWindow (ev.xany.window)) |
1542 | if (isScrollbarWindow (ev.xany.window)) |
1587 | { |
1543 | { |
1588 | scrollBar.setIdle (); |
1544 | scrollBar.setIdle (); |
1589 | scrollbar_show (0); |
1545 | scrollbar_show (0); |
1590 | } |
1546 | } |
1591 | #ifdef MENUBAR |
|
|
1592 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1593 | menubar_expose (); |
|
|
1594 | #endif |
|
|
1595 | |
1547 | |
1596 | #ifdef TRANSPARENT |
1548 | #ifdef TRANSPARENT |
1597 | if (am_transparent && ev.xany.window == parent[0]) |
1549 | if (am_transparent && ev.xany.window == parent[0]) |
1598 | XClearWindow (disp, ev.xany.window); |
1550 | XClearWindow (disp, ev.xany.window); |
1599 | #endif |
1551 | #endif |
… | |
… | |
1603 | case MotionNotify: |
1555 | case MotionNotify: |
1604 | #ifdef POINTER_BLANK |
1556 | #ifdef POINTER_BLANK |
1605 | if (hidden_pointer) |
1557 | if (hidden_pointer) |
1606 | pointer_unblank (); |
1558 | pointer_unblank (); |
1607 | #endif |
1559 | #endif |
1608 | #if MENUBAR |
|
|
1609 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1610 | { |
|
|
1611 | menubar_control (ev.xbutton); |
|
|
1612 | break; |
|
|
1613 | } |
|
|
1614 | #endif |
|
|
1615 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1560 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1616 | break; |
1561 | break; |
1617 | |
1562 | |
1618 | if (ev.xany.window == vt) |
1563 | if (ev.xany.window == vt) |
1619 | { |
1564 | { |
|
|
1565 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1620 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1566 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1621 | ; // nop |
1567 | ; // nop |
1622 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1568 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1623 | { |
1569 | { |
1624 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1570 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1625 | ; |
1571 | ; |
… | |
… | |
1725 | { |
1671 | { |
1726 | hidden_cursor = 0; |
1672 | hidden_cursor = 0; |
1727 | want_refresh = 1; |
1673 | want_refresh = 1; |
1728 | } |
1674 | } |
1729 | |
1675 | |
1730 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1676 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
1731 | } |
1677 | } |
1732 | #endif |
1678 | #endif |
1733 | |
1679 | |
1734 | #if defined(POINTER_BLANK) |
1680 | #if defined(POINTER_BLANK) |
1735 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
1681 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
… | |
… | |
1763 | XSetICFocus (Input_Context); |
1709 | XSetICFocus (Input_Context); |
1764 | } |
1710 | } |
1765 | #endif |
1711 | #endif |
1766 | #if CURSOR_BLINK |
1712 | #if CURSOR_BLINK |
1767 | if (OPTION (Opt_cursorBlink)) |
1713 | if (OPTION (Opt_cursorBlink)) |
1768 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1714 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
1769 | #endif |
1715 | #endif |
1770 | #if OFF_FOCUS_FADING |
1716 | #if OFF_FOCUS_FADING |
1771 | if (rs[Rs_fade]) |
1717 | if (rs[Rs_fade]) |
1772 | { |
1718 | { |
1773 | pix_colors = pix_colors_focused; |
1719 | pix_colors = pix_colors_focused; |
… | |
… | |
1854 | /* |
1800 | /* |
1855 | * VT window processing of button press |
1801 | * VT window processing of button press |
1856 | */ |
1802 | */ |
1857 | if (ev.window == vt) |
1803 | if (ev.window == vt) |
1858 | { |
1804 | { |
|
|
1805 | if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
|
|
1806 | return; |
|
|
1807 | |
1859 | #if ISO_14755 |
1808 | #if ISO_14755 |
1860 | // 5.4 |
1809 | // 5.4 |
1861 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1810 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1862 | { |
1811 | { |
1863 | iso14755_54 (ev.x, ev.y); |
1812 | iso14755_54 (ev.x, ev.y); |
… | |
… | |
1905 | else |
1854 | else |
1906 | { |
1855 | { |
1907 | if (ev.button != MEvent.button) |
1856 | if (ev.button != MEvent.button) |
1908 | MEvent.clicks = 0; |
1857 | MEvent.clicks = 0; |
1909 | |
1858 | |
1910 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
|
|
1911 | switch (ev.button) |
1859 | switch (ev.button) |
1912 | { |
1860 | { |
1913 | case Button1: |
1861 | case Button1: |
1914 | /* allow meta + click to select rectangular areas */ |
1862 | /* allow meta + click to select rectangular areas */ |
1915 | /* should be done in screen.C */ |
1863 | /* should be done in screen.C */ |
1916 | #if ENABLE_FRILLS |
1864 | #if ENABLE_FRILLS |
1917 | selection.rect = !!(ev.state & ModMetaMask); |
1865 | selection.rect = !!(ev.state & ModMetaMask); |
1918 | #else |
1866 | #else |
1919 | selection.rect = false; |
1867 | selection.rect = false; |
1920 | #endif |
1868 | #endif |
1921 | |
1869 | |
1922 | /* allow shift+left click to extend selection */ |
1870 | /* allow shift+left click to extend selection */ |
1923 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1871 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1924 | { |
1872 | { |
1925 | if (MEvent.button == Button1 && clickintime) |
1873 | if (MEvent.button == Button1 && clickintime) |
1926 | selection_rotate (ev.x, ev.y); |
1874 | selection_rotate (ev.x, ev.y); |
1927 | else |
1875 | else |
1928 | selection_extend (ev.x, ev.y, 1); |
1876 | selection_extend (ev.x, ev.y, 1); |
1929 | } |
1877 | } |
1930 | else |
1878 | else |
1931 | { |
1879 | { |
1932 | if (MEvent.button == Button1 && clickintime) |
1880 | if (MEvent.button == Button1 && clickintime) |
1933 | MEvent.clicks++; |
1881 | MEvent.clicks++; |
1934 | else |
1882 | else |
1935 | MEvent.clicks = 1; |
1883 | MEvent.clicks = 1; |
1936 | |
1884 | |
1937 | selection_click (MEvent.clicks, ev.x, ev.y); |
1885 | selection_click (MEvent.clicks, ev.x, ev.y); |
1938 | } |
1886 | } |
1939 | |
1887 | |
1940 | MEvent.button = Button1; |
1888 | MEvent.button = Button1; |
1941 | break; |
1889 | break; |
1942 | |
1890 | |
1943 | case Button3: |
1891 | case Button3: |
1944 | if (MEvent.button == Button3 && clickintime) |
1892 | if (MEvent.button == Button3 && clickintime) |
1945 | selection_rotate (ev.x, ev.y); |
1893 | selection_rotate (ev.x, ev.y); |
1946 | else |
1894 | else |
1947 | selection_extend (ev.x, ev.y, 1); |
1895 | selection_extend (ev.x, ev.y, 1); |
1948 | |
1896 | |
1949 | MEvent.button = Button3; |
1897 | MEvent.button = Button3; |
1950 | break; |
1898 | break; |
1951 | } |
1899 | } |
1952 | } |
1900 | } |
1953 | |
1901 | |
1954 | MEvent.time = ev.time; |
1902 | MEvent.time = ev.time; |
1955 | return; |
1903 | return; |
1956 | } |
1904 | } |
1957 | |
1905 | |
… | |
… | |
2096 | } |
2044 | } |
2097 | } |
2045 | } |
2098 | |
2046 | |
2099 | return; |
2047 | return; |
2100 | } |
2048 | } |
2101 | |
|
|
2102 | #if MENUBAR |
|
|
2103 | /* |
|
|
2104 | * Menubar window processing of button press |
|
|
2105 | */ |
|
|
2106 | if (isMenuBarWindow (ev.window)) |
|
|
2107 | menubar_control (ev); |
|
|
2108 | #endif |
|
|
2109 | } |
2049 | } |
2110 | |
2050 | |
2111 | void |
2051 | void |
2112 | rxvt_term::button_release (XButtonEvent &ev) |
2052 | rxvt_term::button_release (XButtonEvent &ev) |
2113 | { |
2053 | { |
… | |
… | |
2119 | |
2059 | |
2120 | if (scrollbar_isUpDn ()) |
2060 | if (scrollbar_isUpDn ()) |
2121 | { |
2061 | { |
2122 | scrollBar.setIdle (); |
2062 | scrollBar.setIdle (); |
2123 | scrollbar_show (0); |
2063 | scrollbar_show (0); |
2124 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2125 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2126 | #endif |
|
|
2127 | } |
2064 | } |
2128 | |
2065 | |
2129 | #ifdef SELECTION_SCROLLING |
2066 | #ifdef SELECTION_SCROLLING |
2130 | if (sel_scroll_ev.active) |
2067 | if (sel_scroll_ev.active) |
2131 | sel_scroll_ev.stop(); |
2068 | sel_scroll_ev.stop(); |
2132 | #endif |
2069 | #endif |
2133 | |
2070 | |
2134 | if (ev.window == vt) |
2071 | if (ev.window == vt) |
2135 | { |
2072 | { |
|
|
2073 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2074 | return; |
|
|
2075 | |
2136 | #if ISO_14755 |
2076 | #if ISO_14755 |
2137 | // 5.4 |
2077 | // 5.4 |
2138 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2078 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2139 | return; |
2079 | return; |
2140 | #endif |
2080 | #endif |
|
|
2081 | |
2141 | if (reportmode) |
2082 | if (reportmode) |
2142 | { |
2083 | { |
2143 | /* mouse report from vt window */ |
2084 | /* mouse report from vt window */ |
2144 | /* don't report release of wheel "buttons" */ |
2085 | /* don't report release of wheel "buttons" */ |
2145 | if (ev.button >= 4) |
2086 | if (ev.button >= 4) |
… | |
… | |
2169 | if (priv_modes & PrivMode_mouse_report |
2110 | if (priv_modes & PrivMode_mouse_report |
2170 | && bypass_keystate |
2111 | && bypass_keystate |
2171 | && ev.button == Button1 && MEvent.clicks <= 1) |
2112 | && ev.button == Button1 && MEvent.clicks <= 1) |
2172 | selection_extend (ev.x, ev.y, 0); |
2113 | selection_extend (ev.x, ev.y, 0); |
2173 | |
2114 | |
2174 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2175 | return; |
|
|
2176 | |
|
|
2177 | switch (ev.button) |
2115 | switch (ev.button) |
2178 | { |
2116 | { |
2179 | case Button1: |
2117 | case Button1: |
2180 | case Button3: |
2118 | case Button3: |
2181 | selection_make (ev.time); |
2119 | selection_make (ev.time); |
2182 | break; |
2120 | break; |
|
|
2121 | |
2183 | case Button2: |
2122 | case Button2: |
2184 | selection_request (ev.time, ev.x, ev.y); |
2123 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
|
|
2124 | selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); |
2185 | break; |
2125 | break; |
|
|
2126 | |
2186 | #ifdef MOUSE_WHEEL |
2127 | #ifdef MOUSE_WHEEL |
2187 | case Button4: |
2128 | case Button4: |
2188 | case Button5: |
2129 | case Button5: |
2189 | { |
2130 | { |
2190 | int i; |
2131 | int i; |
… | |
… | |
2222 | } |
2163 | } |
2223 | break; |
2164 | break; |
2224 | #endif |
2165 | #endif |
2225 | } |
2166 | } |
2226 | } |
2167 | } |
2227 | #ifdef MENUBAR |
|
|
2228 | else if (isMenuBarWindow (ev.window)) |
|
|
2229 | menubar_control (ev); |
|
|
2230 | #endif |
|
|
2231 | } |
2168 | } |
2232 | |
2169 | |
2233 | #ifdef TRANSPARENT |
2170 | #ifdef TRANSPARENT |
2234 | #if TINTING |
2171 | #if TINTING |
2235 | /* taken from aterm-0.4.2 */ |
2172 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2672 | am_transparent = 0; |
2609 | am_transparent = 0; |
2673 | /* XXX: also turn off Opt_transparent? */ |
2610 | /* XXX: also turn off Opt_transparent? */ |
2674 | } |
2611 | } |
2675 | else |
2612 | else |
2676 | { |
2613 | { |
2677 | #if WAIT_FOR_WM |
|
|
2678 | /* wait (an arbitrary period) for the WM to do its thing |
|
|
2679 | * needed for fvwm2.2.2 (and before?) */ |
|
|
2680 | sleep (1); |
|
|
2681 | #endif |
|
|
2682 | for (n = 0; n < (unsigned int)i; n++) |
2614 | for (n = 0; n < (unsigned int)i; n++) |
2683 | { |
2615 | { |
2684 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2616 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2685 | XClearWindow (disp, parent[n]); |
2617 | XClearWindow (disp, parent[n]); |
2686 | } |
2618 | } |
… | |
… | |
2778 | } |
2710 | } |
2779 | |
2711 | |
2780 | // scr_add_lines only works for nlines <= nrow - 1. |
2712 | // scr_add_lines only works for nlines <= nrow - 1. |
2781 | if (nlines >= nrow - 1) |
2713 | if (nlines >= nrow - 1) |
2782 | { |
2714 | { |
|
|
2715 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2783 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2716 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2784 | scr_add_lines (buf, str - buf, nlines); |
2717 | scr_add_lines (buf, str - buf, nlines); |
2785 | |
2718 | |
2786 | nlines = 0; |
2719 | nlines = 0; |
2787 | str = buf; |
2720 | str = buf; |
2788 | eol = str + min (ncol, UBUFSIZ); |
2721 | eol = str + min (ncol, UBUFSIZ); |
… | |
… | |
2803 | |
2736 | |
2804 | seq_begin = cmdbuf_ptr; |
2737 | seq_begin = cmdbuf_ptr; |
2805 | ch = next_char (); |
2738 | ch = next_char (); |
2806 | } |
2739 | } |
2807 | |
2740 | |
|
|
2741 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2808 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2742 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2809 | scr_add_lines (buf, str - buf, nlines); |
2743 | scr_add_lines (buf, str - buf, nlines); |
2810 | |
2744 | |
2811 | /* |
2745 | /* |
2812 | * If there have been a lot of new lines, then update the screen |
2746 | * If there have been a lot of new lines, then update the screen |
2813 | * What the heck I'll cheat and only refresh less than every page-full. |
2747 | * What the heck I'll cheat and only refresh less than every page-full. |
… | |
… | |
2819 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2753 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2820 | refresh_limit++; |
2754 | refresh_limit++; |
2821 | else |
2755 | else |
2822 | { |
2756 | { |
2823 | flag = true; |
2757 | flag = true; |
2824 | scr_refresh (refresh_type); |
2758 | scr_refresh (); |
2825 | want_refresh = 1; |
2759 | want_refresh = 1; |
2826 | } |
2760 | } |
2827 | } |
2761 | } |
2828 | |
2762 | |
2829 | } |
2763 | } |
… | |
… | |
2847 | return flag; |
2781 | return flag; |
2848 | } |
2782 | } |
2849 | |
2783 | |
2850 | // read the next character |
2784 | // read the next character |
2851 | wchar_t |
2785 | wchar_t |
2852 | rxvt_term::next_char () |
2786 | rxvt_term::next_char () NOTHROW |
2853 | { |
2787 | { |
2854 | while (cmdbuf_ptr < cmdbuf_endp) |
2788 | while (cmdbuf_ptr < cmdbuf_endp) |
2855 | { |
2789 | { |
2856 | // assume 7-bit to be ascii ALWAYS |
2790 | // assume 7-bit to be ascii ALWAYS |
2857 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2791 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
… | |
… | |
2878 | return NOCHAR; |
2812 | return NOCHAR; |
2879 | } |
2813 | } |
2880 | |
2814 | |
2881 | // read the next octet |
2815 | // read the next octet |
2882 | uint32_t |
2816 | uint32_t |
2883 | rxvt_term::next_octet () |
2817 | rxvt_term::next_octet () NOTHROW |
2884 | { |
2818 | { |
2885 | return cmdbuf_ptr < cmdbuf_endp |
2819 | return cmdbuf_ptr < cmdbuf_endp |
2886 | ? (unsigned char)*cmdbuf_ptr++ |
2820 | ? (unsigned char)*cmdbuf_ptr++ |
2887 | : NOCHAR; |
2821 | : NOCHAR; |
2888 | } |
2822 | } |
|
|
2823 | |
|
|
2824 | static class out_of_input out_of_input; |
2889 | |
2825 | |
2890 | /* rxvt_cmd_getc () - Return next input character */ |
2826 | /* rxvt_cmd_getc () - Return next input character */ |
2891 | /* |
2827 | /* |
2892 | * Return the next input character after first passing any keyboard input |
2828 | * Return the next input character after first passing any keyboard input |
2893 | * to the command. |
2829 | * to the command. |
2894 | */ |
2830 | */ |
2895 | wchar_t |
2831 | wchar_t |
2896 | rxvt_term::cmd_getc () |
2832 | rxvt_term::cmd_getc () THROW ((class out_of_input)) |
2897 | { |
2833 | { |
2898 | wchar_t c = next_char (); |
2834 | wchar_t c = next_char (); |
2899 | |
2835 | |
2900 | if (c == NOCHAR) |
2836 | if (c == NOCHAR) |
2901 | throw out_of_input; |
2837 | throw out_of_input; |
2902 | |
2838 | |
2903 | return c; |
2839 | return c; |
2904 | } |
2840 | } |
2905 | |
2841 | |
2906 | uint32_t |
2842 | uint32_t |
2907 | rxvt_term::cmd_get8 () |
2843 | rxvt_term::cmd_get8 () THROW ((class out_of_input)) |
2908 | { |
2844 | { |
2909 | uint32_t c = next_octet (); |
2845 | uint32_t c = next_octet (); |
2910 | |
2846 | |
2911 | if (c == NOCHAR) |
2847 | if (c == NOCHAR) |
2912 | throw out_of_input; |
2848 | throw out_of_input; |
… | |
… | |
3333 | ndef = get_byte_array_bit (csi_defaults, i); |
3269 | ndef = get_byte_array_bit (csi_defaults, i); |
3334 | for (p = 0; p < nargs; p++) |
3270 | for (p = 0; p < nargs; p++) |
3335 | if (arg[p] == -1) |
3271 | if (arg[p] == -1) |
3336 | arg[p] = ndef; |
3272 | arg[p] = ndef; |
3337 | |
3273 | |
3338 | #ifdef DEBUG_CMD |
|
|
3339 | fprintf (stderr, "CSI "); |
|
|
3340 | for (p = 0; p < nargs; p++) |
|
|
3341 | fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); |
|
|
3342 | fprintf (stderr, "%c\n", ch); |
|
|
3343 | #endif |
|
|
3344 | |
|
|
3345 | /* |
3274 | /* |
3346 | * private mode handling |
3275 | * private mode handling |
3347 | */ |
3276 | */ |
3348 | if (priv) |
3277 | if (priv) |
3349 | { |
3278 | { |
3350 | switch (priv) |
3279 | switch (priv) |
3351 | { |
3280 | { |
3352 | case '>': |
3281 | case '>': |
3353 | if (ch == CSI_DA) /* secondary device attributes */ |
3282 | if (ch == CSI_DA) /* secondary device attributes */ |
|
|
3283 | { |
|
|
3284 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
|
|
3285 | // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. |
|
|
3286 | // |
|
|
3287 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
|
|
3288 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
|
|
3289 | // that we do not support xterm mouse reporting (should be 95 when we do). |
|
|
3290 | // |
3354 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3291 | tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); |
|
|
3292 | } |
3355 | break; |
3293 | break; |
3356 | case '?': |
3294 | case '?': |
3357 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3295 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3358 | process_terminal_mode (ch, priv, nargs, arg); |
3296 | process_terminal_mode (ch, priv, nargs, arg); |
3359 | break; |
3297 | break; |
… | |
… | |
3791 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3729 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3792 | */ |
3730 | */ |
3793 | void |
3731 | void |
3794 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3732 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3795 | { |
3733 | { |
3796 | int changed = 0; |
|
|
3797 | int color; |
3734 | int color; |
3798 | char *buf, *name; |
3735 | char *buf, *name; |
3799 | bool query = str[0] == '?' && !str[1]; |
3736 | bool query = str[0] == '?' && !str[1]; |
3800 | int saveop = op; |
3737 | int saveop = op; |
3801 | dDisp; |
3738 | dDisp; |
… | |
… | |
3917 | want_full_refresh = want_refresh = 1; |
3854 | want_full_refresh = want_refresh = 1; |
3918 | break; |
3855 | break; |
3919 | #endif |
3856 | #endif |
3920 | |
3857 | |
3921 | case Rxvt_Pixmap: |
3858 | case Rxvt_Pixmap: |
|
|
3859 | { |
3922 | if (*str != ';') |
3860 | if (*str != ';') |
3923 | { |
3861 | { |
3924 | #if XPM_BACKGROUND |
3862 | #if XPM_BACKGROUND |
3925 | scale_pixmap (""); /* reset to default scaling */ |
3863 | scale_pixmap (""); /* reset to default scaling */ |
3926 | set_bgPixmap (str); /* change pixmap */ |
3864 | set_bgPixmap (str); /* change pixmap */ |
3927 | scr_touch (true); |
3865 | scr_touch (true); |
3928 | #endif |
3866 | #endif |
3929 | } |
3867 | } |
3930 | |
3868 | |
|
|
3869 | int changed = 0; |
|
|
3870 | |
3931 | while ((str = strchr (str, ';')) != NULL) |
3871 | while ((str = strchr (str, ';')) != NULL) |
3932 | { |
3872 | { |
3933 | str++; |
3873 | str++; |
3934 | #if XPM_BACKGROUND |
3874 | #if XPM_BACKGROUND |
3935 | changed += scale_pixmap (str); |
3875 | changed += scale_pixmap (str); |
3936 | #endif |
3876 | #endif |
3937 | } |
3877 | } |
3938 | |
3878 | |
3939 | if (changed) |
3879 | if (changed) |
3940 | { |
3880 | { |
3941 | #ifdef XPM_BACKGROUND |
3881 | #ifdef XPM_BACKGROUND |
3942 | resize_pixmap (); |
3882 | resize_pixmap (); |
3943 | scr_touch (true); |
3883 | scr_touch (true); |
3944 | #endif |
3884 | #endif |
3945 | } |
3885 | } |
|
|
3886 | } |
3946 | break; |
3887 | break; |
3947 | |
3888 | |
3948 | case Rxvt_restoreFG: |
3889 | case Rxvt_restoreFG: |
3949 | set_window_color (Color_fg, str); |
3890 | set_window_color (Color_fg, str); |
3950 | break; |
3891 | break; |
… | |
… | |
3954 | |
3895 | |
3955 | case XTerm_logfile: |
3896 | case XTerm_logfile: |
3956 | // TODO, when secure mode? |
3897 | // TODO, when secure mode? |
3957 | break; |
3898 | break; |
3958 | |
3899 | |
3959 | #ifdef MENUBAR |
|
|
3960 | case URxvt_Menu: |
|
|
3961 | if (OPTION (Opt_insecure)) |
|
|
3962 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3963 | break; |
|
|
3964 | #endif |
|
|
3965 | #if 0 |
3900 | #if 0 |
3966 | case Rxvt_dumpscreen: /* no error notices */ |
3901 | case Rxvt_dumpscreen: /* no error notices */ |
3967 | { |
3902 | { |
3968 | int fd; |
3903 | int fd; |
3969 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3904 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
… | |
… | |
4002 | if (query) |
3937 | if (query) |
4003 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3938 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
4004 | else |
3939 | else |
4005 | { |
3940 | { |
4006 | set_locale (str); |
3941 | set_locale (str); |
4007 | pty.set_utf8_mode (enc_utf8); |
3942 | pty->set_utf8_mode (enc_utf8); |
4008 | init_xlocale (); |
3943 | init_xlocale (); |
4009 | } |
3944 | } |
4010 | break; |
3945 | break; |
4011 | |
3946 | |
4012 | case URxvt_view_up: |
3947 | case URxvt_view_up: |
… | |
… | |
4065 | return state; |
4000 | return state; |
4066 | } |
4001 | } |
4067 | |
4002 | |
4068 | /* we're not using priv _yet_ */ |
4003 | /* we're not using priv _yet_ */ |
4069 | void |
4004 | void |
4070 | rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) |
4005 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
4071 | { |
4006 | { |
4072 | unsigned int i, j; |
4007 | unsigned int i, j; |
4073 | int state; |
4008 | int state; |
4074 | |
4009 | |
4075 | static const struct |
4010 | static const struct |
… | |
… | |
4086 | { 5, PrivMode_rVideo }, |
4021 | { 5, PrivMode_rVideo }, |
4087 | { 6, PrivMode_relOrigin }, |
4022 | { 6, PrivMode_relOrigin }, |
4088 | { 7, PrivMode_Autowrap }, |
4023 | { 7, PrivMode_Autowrap }, |
4089 | // 8, bi-directional support mode |
4024 | // 8, bi-directional support mode |
4090 | { 9, PrivMode_MouseX10 }, |
4025 | { 9, PrivMode_MouseX10 }, |
4091 | #ifdef menuBar_esc |
|
|
4092 | { menuBar_esc, PrivMode_menuBar }, |
|
|
4093 | #endif |
|
|
4094 | // 18, 19 printing-related |
4026 | // 18, 19 printing-related |
4095 | { 25, PrivMode_VisibleCursor }, |
4027 | { 25, PrivMode_VisibleCursor }, |
4096 | #ifdef scrollBar_esc |
4028 | #ifdef scrollBar_esc |
4097 | { scrollBar_esc, PrivMode_scrollBar }, |
4029 | { scrollBar_esc, PrivMode_scrollBar }, |
4098 | #endif |
4030 | #endif |
… | |
… | |
4193 | /* case 8: - auto repeat, can't do on a per window basis */ |
4125 | /* case 8: - auto repeat, can't do on a per window basis */ |
4194 | case 9: /* X10 mouse reporting */ |
4126 | case 9: /* X10 mouse reporting */ |
4195 | if (state) /* orthogonal */ |
4127 | if (state) /* orthogonal */ |
4196 | priv_modes &= ~PrivMode_MouseX11; |
4128 | priv_modes &= ~PrivMode_MouseX11; |
4197 | break; |
4129 | break; |
4198 | #ifdef menuBar_esc |
|
|
4199 | case menuBar_esc: |
|
|
4200 | #ifdef MENUBAR |
|
|
4201 | map_menuBar (state); |
|
|
4202 | #endif |
|
|
4203 | break; |
|
|
4204 | #endif |
|
|
4205 | #ifdef scrollBar_esc |
4130 | #ifdef scrollBar_esc |
4206 | case scrollBar_esc: |
4131 | case scrollBar_esc: |
4207 | if (scrollbar_mapping (state)) |
4132 | if (scrollbar_mapping (state)) |
4208 | { |
4133 | { |
4209 | resize_all_windows (0, 0, 0); |
4134 | resize_all_windows (0, 0, 0); |
… | |
… | |
4454 | rxvt_term::tt_write (const char *data, unsigned int len) |
4379 | rxvt_term::tt_write (const char *data, unsigned int len) |
4455 | { |
4380 | { |
4456 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4381 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4457 | return; |
4382 | return; |
4458 | |
4383 | |
4459 | if (pty.pty < 0) |
4384 | if (pty->pty < 0) |
4460 | return; |
4385 | return; |
4461 | |
4386 | |
4462 | if (v_buflen == 0) |
4387 | if (v_buflen == 0) |
4463 | { |
4388 | { |
4464 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4389 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4465 | |
4390 | |
4466 | if ((unsigned int)written == len) |
4391 | if ((unsigned int)written == len) |
4467 | return; |
4392 | return; |
4468 | |
4393 | |
4469 | data += written; |
4394 | data += written; |
… | |
… | |
4478 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4403 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4479 | } |
4404 | } |
4480 | |
4405 | |
4481 | void rxvt_term::pty_write () |
4406 | void rxvt_term::pty_write () |
4482 | { |
4407 | { |
4483 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4408 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4484 | |
4409 | |
4485 | if (written > 0) |
4410 | if (written > 0) |
4486 | { |
4411 | { |
4487 | v_buflen -= written; |
4412 | v_buflen -= written; |
4488 | |
4413 | |