… | |
… | |
889 | commit_iso14755 (); |
889 | commit_iso14755 (); |
890 | |
890 | |
891 | return; |
891 | return; |
892 | } |
892 | } |
893 | |
893 | |
894 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
894 | for (unsigned short *i = iso14755_symtab; i[0]; i += 2) |
895 | if (i[0] == keysym) |
895 | if (i[0] == keysym) |
896 | { |
896 | { |
897 | iso14755buf = ISO_14755_51 | i[1]; |
897 | iso14755buf = ISO_14755_51 | i[1]; |
898 | commit_iso14755 (); |
898 | commit_iso14755 (); |
899 | |
899 | |
… | |
… | |
978 | |
978 | |
979 | #ifdef HAVE_BG_PIXMAP |
979 | #ifdef HAVE_BG_PIXMAP |
980 | if (bgPixmap.flags & bgPixmap_t::hasChanged) |
980 | if (bgPixmap.flags & bgPixmap_t::hasChanged) |
981 | { |
981 | { |
982 | bgPixmap.flags &= ~bgPixmap_t::hasChanged; |
982 | bgPixmap.flags &= ~bgPixmap_t::hasChanged; |
983 | // scr_clear (true); This needs to be researched further! |
|
|
984 | scr_touch (false); |
983 | scr_touch (false); |
985 | } |
984 | } |
986 | #endif |
985 | #endif |
987 | |
986 | |
988 | if (want_refresh) |
987 | if (want_refresh) |
… | |
… | |
1252 | { |
1251 | { |
1253 | int button_number, key_state = 0; |
1252 | int button_number, key_state = 0; |
1254 | int x, y; |
1253 | int x, y; |
1255 | int code = 32; |
1254 | int code = 32; |
1256 | |
1255 | |
1257 | x = Pixel2Col (ev.x); |
1256 | x = Pixel2Col (ev.x) + 1; |
1258 | y = Pixel2Row (ev.y); |
1257 | y = Pixel2Row (ev.y) + 1; |
|
|
1258 | |
1259 | if (ev.type == MotionNotify) |
1259 | if (ev.type == MotionNotify) |
1260 | { |
1260 | { |
1261 | if (x == mouse_row && y == mouse_col) |
1261 | if (x == mouse_row && y == mouse_col) |
1262 | return; |
1262 | return; |
|
|
1263 | |
1263 | mouse_row = x; |
1264 | mouse_row = x; |
1264 | mouse_col = y; |
1265 | mouse_col = y; |
1265 | code += 32; |
1266 | code += 32; |
1266 | } |
1267 | } |
1267 | |
1268 | |
… | |
… | |
1270 | else |
1271 | else |
1271 | { |
1272 | { |
1272 | button_number = MEvent.button - Button1; |
1273 | button_number = MEvent.button - Button1; |
1273 | /* add 0x3D for wheel events, like xterm does */ |
1274 | /* add 0x3D for wheel events, like xterm does */ |
1274 | if (button_number >= 3) |
1275 | if (button_number >= 3) |
1275 | button_number += (64 - 3); |
1276 | button_number += 64 - 3; |
1276 | } |
1277 | } |
1277 | |
1278 | |
1278 | if (priv_modes & PrivMode_MouseX10) |
1279 | if (priv_modes & PrivMode_MouseX10) |
1279 | { |
1280 | { |
1280 | /* |
1281 | /* |
… | |
… | |
1312 | fputc ('A', stderr); |
1313 | fputc ('A', stderr); |
1313 | if (key_state & 32) |
1314 | if (key_state & 32) |
1314 | fputc ('2', stderr); |
1315 | fputc ('2', stderr); |
1315 | fprintf (stderr, "]: <%d>, %d/%d\n", |
1316 | fprintf (stderr, "]: <%d>, %d/%d\n", |
1316 | button_number, |
1317 | button_number, |
1317 | x + 1, |
1318 | x, |
1318 | y + 1); |
1319 | y); |
1319 | #endif |
1320 | #endif |
1320 | |
1321 | |
|
|
1322 | #if ENABLE_FRILLS |
|
|
1323 | if (priv_modes & PrivMode_ExtMouseRight) |
|
|
1324 | tt_printf ("\033[%d;%d;%dM", |
|
|
1325 | code + button_number + key_state, |
|
|
1326 | x, |
|
|
1327 | y); |
|
|
1328 | else if (priv_modes & PrivMode_ExtModeMouse) |
|
|
1329 | tt_printf ("\033[M%c%lc%lc", |
|
|
1330 | code + button_number + key_state, |
|
|
1331 | wint_t (32 + x), |
|
|
1332 | wint_t (32 + y)); |
|
|
1333 | else |
|
|
1334 | #endif |
1321 | tt_printf ("\033[M%c%c%c", |
1335 | tt_printf ("\033[M%c%c%c", |
1322 | (code + button_number + key_state), |
1336 | code + button_number + key_state, |
1323 | (32 + x + 1), |
1337 | 32 + x, |
1324 | (32 + y + 1)); |
1338 | 32 + y); |
1325 | } |
1339 | } |
1326 | |
1340 | |
1327 | /*{{{ process an X event */ |
1341 | /*{{{ process an X event */ |
1328 | void |
1342 | void |
1329 | rxvt_term::x_cb (XEvent &ev) |
1343 | rxvt_term::x_cb (XEvent &ev) |
… | |
… | |
2680 | |
2694 | |
2681 | /* 8.3.87: NEXT LINE */ |
2695 | /* 8.3.87: NEXT LINE */ |
2682 | case C1_NEL: /* ESC E */ |
2696 | case C1_NEL: /* ESC E */ |
2683 | { |
2697 | { |
2684 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2698 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2685 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
2699 | scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); |
2686 | } |
2700 | } |
2687 | break; |
2701 | break; |
2688 | |
2702 | |
2689 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2703 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2690 | case C1_ESA: /* ESC G */ |
2704 | case C1_ESA: /* ESC G */ |
… | |
… | |
2759 | CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, |
2773 | CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, |
2760 | CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , |
2774 | CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , |
2761 | CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F |
2775 | CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F |
2762 | }; |
2776 | }; |
2763 | |
2777 | |
2764 | #define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ |
2778 | #define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \ |
2765 | (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ |
2779 | (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ |
2766 | | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) |
2780 | | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) |
2767 | #define get_byte_array_bit(array, bit) \ |
2781 | #define get_byte_array_bit(array, bit) \ |
2768 | (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) |
2782 | (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7)))) |
2769 | |
2783 | |
2770 | const unsigned char csi_defaults[] = |
2784 | static const unsigned char csi_defaults[] = |
2771 | { |
2785 | { |
2772 | make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ |
2786 | make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ |
2773 | make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ |
2787 | make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ |
2774 | make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ |
2788 | make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ |
2775 | make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ |
2789 | make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ |
… | |
… | |
2864 | { |
2878 | { |
2865 | /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ |
2879 | /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ |
2866 | scr_soft_reset (); |
2880 | scr_soft_reset (); |
2867 | |
2881 | |
2868 | static const int pm_h[] = { 7, 25 }; |
2882 | static const int pm_h[] = { 7, 25 }; |
2869 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; |
2883 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2870 | |
2884 | |
2871 | process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); |
2885 | process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); |
2872 | process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); |
2886 | process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); |
2873 | } |
2887 | } |
2874 | break; |
2888 | break; |
2875 | } |
2889 | } |
2876 | |
2890 | |
2877 | return; |
2891 | return; |
… | |
… | |
3440 | { |
3454 | { |
3441 | bool changed = false; |
3455 | bool changed = false; |
3442 | |
3456 | |
3443 | if (ISSET_PIXCOLOR (Color_tint)) |
3457 | if (ISSET_PIXCOLOR (Color_tint)) |
3444 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3458 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3445 | else |
|
|
3446 | changed = bgPixmap.unset_tint (); |
|
|
3447 | |
3459 | |
3448 | if (changed) |
3460 | if (changed) |
3449 | update_background (); |
3461 | update_background (); |
3450 | } |
3462 | } |
3451 | |
3463 | |
… | |
… | |
3654 | { 67, PrivMode_BackSpace }, // DECBKM |
3666 | { 67, PrivMode_BackSpace }, // DECBKM |
3655 | #endif |
3667 | #endif |
3656 | { 1000, PrivMode_MouseX11 }, |
3668 | { 1000, PrivMode_MouseX11 }, |
3657 | { 1002, PrivMode_MouseBtnEvent }, |
3669 | { 1002, PrivMode_MouseBtnEvent }, |
3658 | { 1003, PrivMode_MouseAnyEvent }, |
3670 | { 1003, PrivMode_MouseAnyEvent }, |
|
|
3671 | #if ENABLE_FRILLS |
|
|
3672 | { 1005, PrivMode_ExtModeMouse }, |
|
|
3673 | #endif |
3659 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3674 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3660 | { 1011, PrivMode_Keypress }, // rxvt extension |
3675 | { 1011, PrivMode_Keypress }, // rxvt extension |
|
|
3676 | #if ENABLE_FRILLS |
|
|
3677 | { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 |
|
|
3678 | #endif |
3661 | // 1035 enable modifiers for alt, numlock NYI |
3679 | // 1035 enable modifiers for alt, numlock NYI |
3662 | // 1036 send ESC for meta keys NYI |
3680 | // 1036 send ESC for meta keys NYI |
3663 | // 1037 send DEL for keypad delete NYI |
3681 | // 1037 send DEL for keypad delete NYI |
3664 | { 1047, PrivMode_Screen }, |
3682 | { 1047, PrivMode_Screen }, |
3665 | // 1048 save and restore cursor |
3683 | // 1048 save and restore cursor, implemented in code |
3666 | { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ |
3684 | { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ |
3667 | // 1051, 1052, 1060, 1061 keyboard emulation NYI |
3685 | // 1051, 1052, 1060, 1061 keyboard emulation NYI |
3668 | { 2004, PrivMode_BracketPaste }, |
3686 | { 2004, PrivMode_BracketPaste }, |
3669 | }; |
3687 | }; |
3670 | |
3688 | |
… | |
… | |
3680 | for (i = 0; i < nargs; i++) |
3698 | for (i = 0; i < nargs; i++) |
3681 | { |
3699 | { |
3682 | state = -1; |
3700 | state = -1; |
3683 | |
3701 | |
3684 | /* basic handling */ |
3702 | /* basic handling */ |
3685 | for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) |
3703 | for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) |
3686 | if (argtopriv[j].argval == arg[i]) |
3704 | if (argtopriv[j].argval == arg[i]) |
3687 | { |
3705 | { |
3688 | state = privcases (mode, argtopriv[j].bit); |
3706 | state = privcases (mode, argtopriv[j].bit); |
3689 | break; |
3707 | break; |
3690 | } |
3708 | } |
… | |
… | |
3768 | case 1003: |
3786 | case 1003: |
3769 | if (state) |
3787 | if (state) |
3770 | { |
3788 | { |
3771 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); |
3789 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); |
3772 | priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; |
3790 | priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; |
|
|
3791 | mouse_row = mouse_col = 0; |
3773 | vt_emask_mouse = PointerMotionMask; |
3792 | vt_emask_mouse = PointerMotionMask; |
3774 | } |
3793 | } |
3775 | else |
3794 | else |
3776 | vt_emask_mouse = NoEventMask; |
3795 | vt_emask_mouse = NoEventMask; |
3777 | |
3796 | |
… | |
… | |
4003 | |
4022 | |
4004 | /* ---------------------------------------------------------------------- */ |
4023 | /* ---------------------------------------------------------------------- */ |
4005 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4024 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4006 | * or generated by us in response to a query ESC sequence. |
4025 | * or generated by us in response to a query ESC sequence. |
4007 | */ |
4026 | */ |
4008 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4027 | static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4009 | |
4028 | |
4010 | void |
4029 | void |
4011 | rxvt_term::tt_write (const char *data, unsigned int len) |
4030 | rxvt_term::tt_write (const char *data, unsigned int len) |
4012 | { |
4031 | { |
4013 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4032 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
… | |
… | |
4025 | |
4044 | |
4026 | data += written; |
4045 | data += written; |
4027 | len -= written; |
4046 | len -= written; |
4028 | } |
4047 | } |
4029 | |
4048 | |
4030 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4049 | v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len); |
4031 | |
4050 | |
4032 | memcpy (v_buffer + v_buflen, data, len); |
4051 | memcpy (v_buffer + v_buflen, data, len); |
4033 | v_buflen += len; |
4052 | v_buflen += len; |
4034 | |
4053 | |
4035 | pty_ev.set (ev::READ | ev::WRITE); |
4054 | pty_ev.set (ev::READ | ev::WRITE); |