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.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.490 by sf-exg, Sat Jul 9 18:23:48 2011 UTC

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

Diff Legend

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