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.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.491 by sf-exg, Fri Aug 19 17:42:09 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
… …
2656#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2657 case '9': 2657 case '9':
2658 scr_forwardindex (); 2658 scr_forwardindex ();
2659 break; 2659 break;
2660#endif 2660#endif
2661 // DECPAM/DECPNM
2661 case '=': 2662 case '=':
2662 case '>': 2663 case '>':
2663 set_privmode (PrivMode_aplKP, ch == '='); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2664 break; 2665 break;
2665 2666
… …
2672 2673
2673 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2674 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2675 { 2676 {
2676 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2677 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2678 } 2679 }
2679 break; 2680 break;
2680 2681
2681 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2682 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
… …
2858 scr_soft_reset (); 2859 scr_soft_reset ();
2859 2860
2860 static const int pm_h[] = { 7, 25 }; 2861 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 }; 2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862 2863
2863 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2865 } 2866 }
2866 break; 2867 break;
2867 } 2868 }
2868 2869
2869 return; 2870 return;
… …
3459 if (*str != ';') 3460 if (*str != ';')
3460 { 3461 {
3461 if (bg_set_file (str)) /* change pixmap */ 3462 if (bg_set_file (str)) /* change pixmap */
3462 { 3463 {
3463 changed++; 3464 changed++;
3464 str = strchr (str, ';');
3465 if (str == NULL)
3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3469 } 3465 }
3470 } 3466 }
3471 else 3467 else
3472 { 3468 {
3473 str++; 3469 str++;
… …
3604 return state; 3600 return state;
3605} 3601}
3606 3602
3607/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3608void 3604void
3609rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3610{ 3606{
3611 unsigned int i, j; 3607 unsigned int i, j;
3612 int state; 3608 int state;
3613 3609
3614 static const struct 3610 static const struct
3615 { 3611 {
3616 const int argval; 3612 const int argval;
3617 const unsigned long bit; 3613 const unsigned long bit;
3618 } argtopriv[] = { 3614 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3628 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region 3625 // 19 Print screen prints full screen/scroll region
3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3632 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3633#endif 3629#endif
3634 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3634 // 45 margin bell NYI
3639 // 46 start logging 3635 // 46 start logging
3640 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3642#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3640#endif
3645 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3646 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
… …
3675 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3676 { 3672 {
3677 state = -1; 3673 state = -1;
3678 3674
3679 /* basic handling */ 3675 /* basic handling */
3680 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3681 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3682 { 3678 {
3683 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3684 break; 3680 break;
3685 } 3681 }

Diff Legend

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