… | |
… | |
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) |
… | |
… | |
1465 | } |
1464 | } |
1466 | else |
1465 | else |
1467 | get_window_origin (x, y); |
1466 | get_window_origin (x, y); |
1468 | |
1467 | |
1469 | if (bgPixmap.set_position (x, y) |
1468 | if (bgPixmap.set_position (x, y) |
1470 | || (bgPixmap.flags & bgPixmap_t::isInvalid)) |
1469 | || !(bgPixmap.flags & bgPixmap_t::isValid)) |
1471 | moved = true; |
1470 | moved = true; |
1472 | } |
1471 | } |
1473 | #endif |
1472 | #endif |
1474 | |
1473 | |
1475 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1474 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
… | |
… | |
1527 | * by scheduling background redraw as soon as we can, but giving a short |
1526 | * by scheduling background redraw as soon as we can, but giving a short |
1528 | * bit of time for ConfigureNotifies to arrive. |
1527 | * bit of time for ConfigureNotifies to arrive. |
1529 | * We should render background PRIOR to drawing any text, but AFTER all |
1528 | * We should render background PRIOR to drawing any text, but AFTER all |
1530 | * of ConfigureNotifys for the best results. |
1529 | * of ConfigureNotifys for the best results. |
1531 | */ |
1530 | */ |
1532 | if (bgPixmap.flags & bgPixmap_t::isInvalid) |
1531 | if (!(bgPixmap.flags & bgPixmap_t::isValid)) |
1533 | update_background_ev.start (0.025); |
1532 | update_background_ev.start (0.025); |
1534 | #endif |
1533 | #endif |
1535 | mapped = 1; |
1534 | mapped = 1; |
1536 | #ifdef TEXT_BLINK |
1535 | #ifdef TEXT_BLINK |
1537 | text_blink_ev.start (); |
1536 | text_blink_ev.start (); |
… | |
… | |
2695 | |
2694 | |
2696 | /* 8.3.87: NEXT LINE */ |
2695 | /* 8.3.87: NEXT LINE */ |
2697 | case C1_NEL: /* ESC E */ |
2696 | case C1_NEL: /* ESC E */ |
2698 | { |
2697 | { |
2699 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2698 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2700 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
2699 | scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); |
2701 | } |
2700 | } |
2702 | break; |
2701 | break; |
2703 | |
2702 | |
2704 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2703 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2705 | case C1_ESA: /* ESC G */ |
2704 | case C1_ESA: /* ESC G */ |
… | |
… | |
2774 | 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, |
2775 | 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 , |
2776 | 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 |
2777 | }; |
2776 | }; |
2778 | |
2777 | |
2779 | #define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ |
2778 | #define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \ |
2780 | (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ |
2779 | (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ |
2781 | | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) |
2780 | | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) |
2782 | #define get_byte_array_bit(array, bit) \ |
2781 | #define get_byte_array_bit(array, bit) \ |
2783 | (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) |
2782 | (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7)))) |
2784 | |
2783 | |
2785 | const unsigned char csi_defaults[] = |
2784 | static const unsigned char csi_defaults[] = |
2786 | { |
2785 | { |
2787 | 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, */ |
2788 | 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, */ |
2789 | 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, */ |
2790 | 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, [, \, ], ^, _, */ |
… | |
… | |
2881 | scr_soft_reset (); |
2880 | scr_soft_reset (); |
2882 | |
2881 | |
2883 | static const int pm_h[] = { 7, 25 }; |
2882 | static const int pm_h[] = { 7, 25 }; |
2884 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2883 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2885 | |
2884 | |
2886 | 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); |
2887 | 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); |
2888 | } |
2887 | } |
2889 | break; |
2888 | break; |
2890 | } |
2889 | } |
2891 | |
2890 | |
2892 | return; |
2891 | return; |
… | |
… | |
3455 | { |
3454 | { |
3456 | bool changed = false; |
3455 | bool changed = false; |
3457 | |
3456 | |
3458 | if (ISSET_PIXCOLOR (Color_tint)) |
3457 | if (ISSET_PIXCOLOR (Color_tint)) |
3459 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3458 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3460 | else |
|
|
3461 | changed = bgPixmap.unset_tint (); |
|
|
3462 | |
3459 | |
3463 | if (changed) |
3460 | if (changed) |
3464 | update_background (); |
3461 | update_background (); |
3465 | } |
3462 | } |
3466 | |
3463 | |
… | |
… | |
3701 | for (i = 0; i < nargs; i++) |
3698 | for (i = 0; i < nargs; i++) |
3702 | { |
3699 | { |
3703 | state = -1; |
3700 | state = -1; |
3704 | |
3701 | |
3705 | /* basic handling */ |
3702 | /* basic handling */ |
3706 | for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) |
3703 | for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) |
3707 | if (argtopriv[j].argval == arg[i]) |
3704 | if (argtopriv[j].argval == arg[i]) |
3708 | { |
3705 | { |
3709 | state = privcases (mode, argtopriv[j].bit); |
3706 | state = privcases (mode, argtopriv[j].bit); |
3710 | break; |
3707 | break; |
3711 | } |
3708 | } |
… | |
… | |
4025 | |
4022 | |
4026 | /* ---------------------------------------------------------------------- */ |
4023 | /* ---------------------------------------------------------------------- */ |
4027 | /* 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, |
4028 | * or generated by us in response to a query ESC sequence. |
4025 | * or generated by us in response to a query ESC sequence. |
4029 | */ |
4026 | */ |
4030 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4027 | static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4031 | |
4028 | |
4032 | void |
4029 | void |
4033 | rxvt_term::tt_write (const char *data, unsigned int len) |
4030 | rxvt_term::tt_write (const char *data, unsigned int len) |
4034 | { |
4031 | { |
4035 | 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))) |
… | |
… | |
4047 | |
4044 | |
4048 | data += written; |
4045 | data += written; |
4049 | len -= written; |
4046 | len -= written; |
4050 | } |
4047 | } |
4051 | |
4048 | |
4052 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4049 | v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len); |
4053 | |
4050 | |
4054 | memcpy (v_buffer + v_buflen, data, len); |
4051 | memcpy (v_buffer + v_buflen, data, len); |
4055 | v_buflen += len; |
4052 | v_buflen += len; |
4056 | |
4053 | |
4057 | pty_ev.set (ev::READ | ev::WRITE); |
4054 | pty_ev.set (ev::READ | ev::WRITE); |