… | |
… | |
987 | } |
987 | } |
988 | |
988 | |
989 | scr_refresh (); |
989 | scr_refresh (); |
990 | scrollBar.show (1); |
990 | scrollBar.show (1); |
991 | #ifdef USE_XIM |
991 | #ifdef USE_XIM |
992 | IMSendSpot (); |
992 | im_send_spot (); |
993 | #endif |
993 | #endif |
994 | } |
994 | } |
995 | |
995 | |
996 | display->flush (); |
996 | display->flush (); |
997 | } |
997 | } |
… | |
… | |
1473 | } |
1473 | } |
1474 | else |
1474 | else |
1475 | { |
1475 | { |
1476 | #ifdef HAVE_BG_PIXMAP |
1476 | #ifdef HAVE_BG_PIXMAP |
1477 | if (moved) |
1477 | if (moved) |
1478 | { |
|
|
1479 | if (mapped) |
|
|
1480 | update_background (); |
1478 | update_background (); |
1481 | else |
|
|
1482 | bg_invalidate (); |
|
|
1483 | } |
|
|
1484 | #endif |
1479 | #endif |
1485 | } |
1480 | } |
1486 | |
1481 | |
1487 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1482 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1488 | } |
1483 | } |
… | |
… | |
1736 | want_refresh = 1; |
1731 | want_refresh = 1; |
1737 | |
1732 | |
1738 | #if USE_XIM |
1733 | #if USE_XIM |
1739 | if (Input_Context != NULL) |
1734 | if (Input_Context != NULL) |
1740 | { |
1735 | { |
1741 | IMSetPosition (); |
1736 | im_set_position (); |
1742 | XSetICFocus (Input_Context); |
1737 | XSetICFocus (Input_Context); |
1743 | } |
1738 | } |
1744 | #endif |
1739 | #endif |
1745 | #if CURSOR_BLINK |
1740 | #if CURSOR_BLINK |
1746 | if (option (Opt_cursorBlink)) |
1741 | if (option (Opt_cursorBlink)) |
… | |
… | |
2219 | wchar_t ch = NOCHAR; |
2214 | wchar_t ch = NOCHAR; |
2220 | char *seq_begin; // remember start of esc-sequence here |
2215 | char *seq_begin; // remember start of esc-sequence here |
2221 | |
2216 | |
2222 | for (;;) |
2217 | for (;;) |
2223 | { |
2218 | { |
2224 | if (expect_false (ch == NOCHAR)) |
2219 | if (ecb_unlikely (ch == NOCHAR)) |
2225 | { |
2220 | { |
2226 | seq_begin = cmdbuf_ptr; |
2221 | seq_begin = cmdbuf_ptr; |
2227 | ch = next_char (); |
2222 | ch = next_char (); |
2228 | |
2223 | |
2229 | if (ch == NOCHAR) |
2224 | if (ch == NOCHAR) |
2230 | break; |
2225 | break; |
2231 | } |
2226 | } |
2232 | |
2227 | |
2233 | if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) |
2228 | if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) |
2234 | { |
2229 | { |
2235 | if (expect_false (!seen_input)) |
2230 | if (ecb_unlikely (!seen_input)) |
2236 | { |
2231 | { |
2237 | seen_input = 1; |
2232 | seen_input = 1; |
2238 | // many badly-written programs (e.g. jed) contain a race condition: |
2233 | // many badly-written programs (e.g. jed) contain a race condition: |
2239 | // they first read the screensize and then install a SIGWINCH handler. |
2234 | // they first read the screensize and then install a SIGWINCH handler. |
2240 | // some window managers resize the window early, and these programs |
2235 | // some window managers resize the window early, and these programs |
… | |
… | |
2253 | wchar_t *str = buf; |
2248 | wchar_t *str = buf; |
2254 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2249 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2255 | |
2250 | |
2256 | for (;;) |
2251 | for (;;) |
2257 | { |
2252 | { |
2258 | if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) |
2253 | if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) |
2259 | break; |
2254 | break; |
2260 | |
2255 | |
2261 | *str++ = ch; |
2256 | *str++ = ch; |
2262 | |
2257 | |
2263 | if (expect_false (ch == C0_LF || str >= eol)) |
2258 | if (ecb_unlikely (ch == C0_LF || str >= eol)) |
2264 | { |
2259 | { |
2265 | if (ch == C0_LF) |
2260 | if (ch == C0_LF) |
2266 | nlines++; |
2261 | nlines++; |
2267 | |
2262 | |
2268 | refresh_count++; |
2263 | refresh_count++; |
… | |
… | |
2346 | rxvt_term::next_char () NOTHROW |
2341 | rxvt_term::next_char () NOTHROW |
2347 | { |
2342 | { |
2348 | while (cmdbuf_ptr < cmdbuf_endp) |
2343 | while (cmdbuf_ptr < cmdbuf_endp) |
2349 | { |
2344 | { |
2350 | // assume 7-bit to be ascii ALWAYS |
2345 | // assume 7-bit to be ascii ALWAYS |
2351 | if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2346 | if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2352 | return *cmdbuf_ptr++; |
2347 | return *cmdbuf_ptr++; |
2353 | |
2348 | |
2354 | wchar_t wc; |
2349 | wchar_t wc; |
2355 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2350 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2356 | |
2351 | |
… | |
… | |
2656 | #if !ENABLE_MINIMAL |
2651 | #if !ENABLE_MINIMAL |
2657 | case '9': |
2652 | case '9': |
2658 | scr_forwardindex (); |
2653 | scr_forwardindex (); |
2659 | break; |
2654 | break; |
2660 | #endif |
2655 | #endif |
|
|
2656 | // DECPAM/DECPNM |
2661 | case '=': |
2657 | case '=': |
2662 | case '>': |
2658 | case '>': |
2663 | set_privmode (PrivMode_aplKP, ch == '='); |
2659 | set_privmode (PrivMode_aplKP, ch == '='); |
2664 | break; |
2660 | break; |
2665 | |
2661 | |
… | |
… | |
2672 | |
2668 | |
2673 | /* 8.3.87: NEXT LINE */ |
2669 | /* 8.3.87: NEXT LINE */ |
2674 | case C1_NEL: /* ESC E */ |
2670 | case C1_NEL: /* ESC E */ |
2675 | { |
2671 | { |
2676 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2672 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2677 | scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); |
2673 | scr_add_lines (nlcr, ecb_array_length (nlcr), 1); |
2678 | } |
2674 | } |
2679 | break; |
2675 | break; |
2680 | |
2676 | |
2681 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2677 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2682 | case C1_ESA: /* ESC G */ |
2678 | case C1_ESA: /* ESC G */ |
… | |
… | |
2858 | scr_soft_reset (); |
2854 | scr_soft_reset (); |
2859 | |
2855 | |
2860 | static const int pm_h[] = { 7, 25 }; |
2856 | static const int pm_h[] = { 7, 25 }; |
2861 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2857 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2862 | |
2858 | |
2863 | process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); |
2859 | process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); |
2864 | process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); |
2860 | process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); |
2865 | } |
2861 | } |
2866 | break; |
2862 | break; |
2867 | } |
2863 | } |
2868 | |
2864 | |
2869 | return; |
2865 | return; |
… | |
… | |
3452 | min (h_align, 32767), min (v_align, 32767)); |
3448 | min (h_align, 32767), min (v_align, 32767)); |
3453 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3449 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3454 | } |
3450 | } |
3455 | else |
3451 | else |
3456 | { |
3452 | { |
3457 | int changed = 0; |
3453 | bool changed = false; |
3458 | |
3454 | |
3459 | if (*str != ';') |
3455 | if (*str != ';') |
3460 | { |
3456 | { |
3461 | if (bg_set_file (str)) /* change pixmap */ |
3457 | if (bg_set_file (str)) /* change pixmap */ |
3462 | { |
|
|
3463 | changed++; |
3458 | changed = true; |
3464 | str = strchr (str, ';'); |
|
|
3465 | if (str == NULL) |
|
|
3466 | bg_set_default_geometry (); |
|
|
3467 | else |
|
|
3468 | bg_set_geometry (str+1); |
|
|
3469 | } |
|
|
3470 | } |
3459 | } |
3471 | else |
3460 | else |
3472 | { |
3461 | { |
3473 | str++; |
3462 | str++; |
3474 | if (bg_set_geometry (str, true)) |
3463 | if (bg_set_geometry (str, true)) |
3475 | changed++; |
3464 | changed = true; |
3476 | } |
3465 | } |
3477 | |
3466 | |
3478 | if (changed) |
3467 | if (changed) |
3479 | { |
3468 | { |
3480 | if (bg_window_position_sensitive ()) |
3469 | if (bg_window_position_sensitive ()) |
… | |
… | |
3604 | return state; |
3593 | return state; |
3605 | } |
3594 | } |
3606 | |
3595 | |
3607 | /* we're not using priv _yet_ */ |
3596 | /* we're not using priv _yet_ */ |
3608 | void |
3597 | void |
3609 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
3598 | rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg) |
3610 | { |
3599 | { |
3611 | unsigned int i, j; |
3600 | unsigned int i, j; |
3612 | int state; |
3601 | int state; |
3613 | |
3602 | |
3614 | static const struct |
3603 | static const struct |
3615 | { |
3604 | { |
3616 | const int argval; |
3605 | const int argval; |
3617 | const unsigned long bit; |
3606 | const unsigned long bit; |
3618 | } argtopriv[] = { |
3607 | } argtopriv[] = { |
3619 | { 1, PrivMode_aplCUR }, // DECCKM |
3608 | { 1, PrivMode_aplCUR }, // DECCKM |
3620 | { 2, PrivMode_vt52 }, |
3609 | { 2, PrivMode_vt52 }, // DECANM |
3621 | { 3, PrivMode_132 }, // DECCOLM |
3610 | { 3, PrivMode_132 }, // DECCOLM |
3622 | { 4, PrivMode_smoothScroll }, // DECSCLM |
3611 | { 4, PrivMode_smoothScroll }, // DECSCLM |
3623 | { 5, PrivMode_rVideo }, // DECSCNM |
3612 | { 5, PrivMode_rVideo }, // DECSCNM |
3624 | { 6, PrivMode_relOrigin }, // DECOM |
3613 | { 6, PrivMode_relOrigin }, // DECOM |
3625 | { 7, PrivMode_Autowrap }, // DECAWM |
3614 | { 7, PrivMode_Autowrap }, // DECAWM |
3626 | // 8, auto-repeat keys // DECARM |
3615 | // 8, auto-repeat keys // DECARM |
3627 | { 9, PrivMode_MouseX10 }, |
3616 | { 9, PrivMode_MouseX10 }, |
3628 | // 18 end FF to printer after print screen |
3617 | // 18 end FF to printer after print screen |
3629 | // 19 Print screen prints full screen/scroll region |
3618 | // 19 Print screen prints full screen/scroll region |
3630 | { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis |
3619 | { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis |
3631 | #ifdef scrollBar_esc |
3620 | #ifdef scrollBar_esc |
3632 | { scrollBar_esc, PrivMode_scrollBar }, |
3621 | { scrollBar_esc, PrivMode_scrollBar }, |
3633 | #endif |
3622 | #endif |
3634 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3623 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3635 | // 38, tektronix mode // DECTEK |
3624 | // 38, tektronix mode // DECTEK |
3636 | { 40, PrivMode_132OK }, |
3625 | { 40, PrivMode_132OK }, |
3637 | // 41 xterm more fixes NYI |
3626 | // 41 xterm more fixes NYI |
3638 | // 45 margin bell NYI |
3627 | // 45 margin bell NYI |
3639 | // 46 start logging |
3628 | // 46 start logging |
3640 | { 47, PrivMode_Screen }, |
3629 | { 47, PrivMode_Screen }, |
3641 | { 66, PrivMode_aplKP }, // DECPAM/DECPNM |
3630 | { 66, PrivMode_aplKP }, // DECNKM |
3642 | #ifndef NO_BACKSPACE_KEY |
3631 | #ifndef NO_BACKSPACE_KEY |
3643 | { 67, PrivMode_BackSpace }, // DECBKM |
3632 | { 67, PrivMode_BackSpace }, // DECBKM |
3644 | #endif |
3633 | #endif |
3645 | { 1000, PrivMode_MouseX11 }, |
3634 | { 1000, PrivMode_MouseX11 }, |
3646 | { 1002, PrivMode_MouseBtnEvent }, |
3635 | { 1002, PrivMode_MouseBtnEvent }, |
… | |
… | |
3675 | for (i = 0; i < nargs; i++) |
3664 | for (i = 0; i < nargs; i++) |
3676 | { |
3665 | { |
3677 | state = -1; |
3666 | state = -1; |
3678 | |
3667 | |
3679 | /* basic handling */ |
3668 | /* basic handling */ |
3680 | for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) |
3669 | for (j = 0; j < ecb_array_length (argtopriv); j++) |
3681 | if (argtopriv[j].argval == arg[i]) |
3670 | if (argtopriv[j].argval == arg[i]) |
3682 | { |
3671 | { |
3683 | state = privcases (mode, argtopriv[j].bit); |
3672 | state = privcases (mode, argtopriv[j].bit); |
3684 | break; |
3673 | break; |
3685 | } |
3674 | } |