ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.486 by sf-exg, Fri Apr 29 13:29:45 2011 UTC vs.
Revision 1.490 by sf-exg, Sat Jul 9 18:23:48 2011 UTC

… …
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}
… …
1736 want_refresh = 1; 1736 want_refresh = 1;
1737 1737
1738#if USE_XIM 1738#if USE_XIM
1739 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1740 { 1740 {
1741 IMSetPosition (); 1741 im_set_position ();
1742 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1743 } 1743 }
1744#endif 1744#endif
1745#if CURSOR_BLINK 1745#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
2219 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2221 2221
2222 for (;;) 2222 for (;;)
2223 { 2223 {
2224 if (expect_false (ch == NOCHAR)) 2224 if (ecb_unlikely (ch == NOCHAR))
2225 { 2225 {
2226 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2227 ch = next_char ();
2228 2228
2229 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2230 break; 2230 break;
2231 } 2231 }
2232 2232
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2234 {
2235 if (expect_false (!seen_input)) 2235 if (ecb_unlikely (!seen_input))
2236 { 2236 {
2237 seen_input = 1; 2237 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2253 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2255
2256 for (;;) 2256 for (;;)
2257 { 2257 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2259 break;
2260 2260
2261 *str++ = ch; 2261 *str++ = ch;
2262 2262
2263 if (expect_false (ch == C0_LF || str >= eol)) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2264 {
2265 if (ch == C0_LF) 2265 if (ch == C0_LF)
2266 nlines++; 2266 nlines++;
2267 2267
2268 refresh_count++; 2268 refresh_count++;
… …
2346rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2347{ 2347{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2349 {
2350 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2353 2353
2354 wchar_t wc; 2354 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2356
… …
2624 return; 2624 return;
2625 } 2625 }
2626 2626
2627 switch (ch) 2627 switch (ch)
2628 { 2628 {
2629 /* case 1: do_tek_mode (); break; */
2630 case '#': 2629 case '#':
2631 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2632 scr_E (); 2631 scr_E ();
2633 break; 2632 break;
2634 case '(': 2633 case '(':
… …
2657#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2658 case '9': 2657 case '9':
2659 scr_forwardindex (); 2658 scr_forwardindex ();
2660 break; 2659 break;
2661#endif 2660#endif
2661 // DECPAM/DECPNM
2662 case '=': 2662 case '=':
2663 case '>': 2663 case '>':
2664 set_privmode (PrivMode_aplKP, ch == '='); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2665 break; 2665 break;
2666 2666
… …
2673 2673
2674 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2675 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2676 { 2676 {
2677 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2678 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2679 } 2679 }
2680 break; 2680 break;
2681 2681
2682 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2683 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
… …
2695 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2696 scr_index (DN); 2696 scr_index (DN);
2697 break; 2697 break;
2698 2698
2699 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2700 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2701 2701
2702 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2703 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2704 2704
2705 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2706 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2707 process_dcs_seq (); 2707 process_dcs_seq ();
2708 break; 2708 break;
… …
2859 scr_soft_reset (); 2859 scr_soft_reset ();
2860 2860
2861 static const int pm_h[] = { 7, 25 }; 2861 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863 2863
2864 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2866 } 2866 }
2867 break; 2867 break;
2868 } 2868 }
2869 2869
2870 return; 2870 return;
… …
3605 return state; 3605 return state;
3606} 3606}
3607 3607
3608/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
3609void 3609void
3610rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3610rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3611{ 3611{
3612 unsigned int i, j; 3612 unsigned int i, j;
3613 int state; 3613 int state;
3614 3614
3615 static const struct 3615 static const struct
3616 { 3616 {
3617 const int argval; 3617 const int argval;
3618 const unsigned long bit; 3618 const unsigned long bit;
3619 } argtopriv[] = { 3619 } argtopriv[] = {
3620 { 1, PrivMode_aplCUR }, // DECCKM 3620 { 1, PrivMode_aplCUR }, // DECCKM
3621 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 }, // DECANM
3622 { 3, PrivMode_132 }, // DECCOLM 3622 { 3, PrivMode_132 }, // DECCOLM
3623 { 4, PrivMode_smoothScroll }, // DECSCLM 3623 { 4, PrivMode_smoothScroll }, // DECSCLM
3624 { 5, PrivMode_rVideo }, // DECSCNM 3624 { 5, PrivMode_rVideo }, // DECSCNM
3625 { 6, PrivMode_relOrigin }, // DECOM 3625 { 6, PrivMode_relOrigin }, // DECOM
3626 { 7, PrivMode_Autowrap }, // DECAWM 3626 { 7, PrivMode_Autowrap }, // DECAWM
3627 // 8, auto-repeat keys // DECARM 3627 // 8, auto-repeat keys // DECARM
3628 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3629 // 18 end FF to printer after print screen 3629 // 18 end FF to printer after print screen
3630 // 19 Print screen prints full screen/scroll region 3630 // 19 Print screen prints full screen/scroll region
3631 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3631 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3632#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3633 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3634#endif 3634#endif
3635 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
3636 // 38, tektronix mode // DECTEK 3636 // 38, tektronix mode // DECTEK
3637 { 40, PrivMode_132OK }, 3637 { 40, PrivMode_132OK },
3638 // 41 xterm more fixes NYI 3638 // 41 xterm more fixes NYI
3639 // 45 margin bell NYI 3639 // 45 margin bell NYI
3640 // 46 start logging 3640 // 46 start logging
3641 { 47, PrivMode_Screen }, 3641 { 47, PrivMode_Screen },
3642 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3642 { 66, PrivMode_aplKP }, // DECNKM
3643#ifndef NO_BACKSPACE_KEY 3643#ifndef NO_BACKSPACE_KEY
3644 { 67, PrivMode_BackSpace }, // DECBKM 3644 { 67, PrivMode_BackSpace }, // DECBKM
3645#endif 3645#endif
3646 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
3647 { 1002, PrivMode_MouseBtnEvent }, 3647 { 1002, PrivMode_MouseBtnEvent },
… …
3676 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
3677 { 3677 {
3678 state = -1; 3678 state = -1;
3679 3679
3680 /* basic handling */ 3680 /* basic handling */
3681 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3681 for (j = 0; j < ecb_array_length (argtopriv); j++)
3682 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
3683 { 3683 {
3684 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
3685 break; 3685 break;
3686 } 3686 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines