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.484 by sf-exg, Fri Apr 29 10:10:20 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
… …
2489 pclose_printer (fd); 2486 pclose_printer (fd);
2490} 2487}
2491#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2492/*}}} */ 2489/*}}} */
2493 2490
2494/* *INDENT-OFF* */
2495enum { 2491enum {
2496 C1_40 = 0x40, 2492 C1_40 = 0x40,
2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2501}; 2497};
2502/* *INDENT-ON* */
2503 2498
2504/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2505void 2500void
2506rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2507{ 2502{
… …
2629 return; 2624 return;
2630 } 2625 }
2631 2626
2632 switch (ch) 2627 switch (ch)
2633 { 2628 {
2634 /* case 1: do_tek_mode (); break; */
2635 case '#': 2629 case '#':
2636 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2637 scr_E (); 2631 scr_E ();
2638 break; 2632 break;
2639 case '(': 2633 case '(':
… …
2662#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2663 case '9': 2657 case '9':
2664 scr_forwardindex (); 2658 scr_forwardindex ();
2665 break; 2659 break;
2666#endif 2660#endif
2661 // DECPAM/DECPNM
2667 case '=': 2662 case '=':
2668 case '>': 2663 case '>':
2669 set_privmode (PrivMode_aplKP, ch == '='); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2670 break; 2665 break;
2671 2666
… …
2678 2673
2679 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2680 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2681 { 2676 {
2682 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2684 } 2679 }
2685 break; 2680 break;
2686 2681
2687 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2688 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
… …
2700 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2701 scr_index (DN); 2696 scr_index (DN);
2702 break; 2697 break;
2703 2698
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2706 2701
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2709 2704
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2707 process_dcs_seq ();
2713 break; 2708 break;
… …
2746 } 2741 }
2747} 2742}
2748/*}}} */ 2743/*}}} */
2749 2744
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2746enum {
2753 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2774 };
2781/* *INDENT-ON* */
2782 2775
2783void 2776void
2784rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2785{ 2778{
2786 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
2866 scr_soft_reset (); 2859 scr_soft_reset ();
2867 2860
2868 static const int pm_h[] = { 7, 25 }; 2861 static const int pm_h[] = { 7, 25 };
2869 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 };
2870 2863
2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2866 }
2874 break; 2867 break;
2875 } 2868 }
2876 2869
2877 return; 2870 return;
… …
3096 } 3089 }
3097} 3090}
3098/*}}} */ 3091/*}}} */
3099 3092
3100#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3094void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3096{
3105 int x, y; 3097 int x, y;
3106 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3613 return state; 3605 return state;
3614} 3606}
3615 3607
3616/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
3617void 3609void
3618rxvt_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)
3619{ 3611{
3620 unsigned int i, j; 3612 unsigned int i, j;
3621 int state; 3613 int state;
3622 3614
3623 static const struct 3615 static const struct
3624 { 3616 {
3625 const int argval; 3617 const int argval;
3626 const unsigned long bit; 3618 const unsigned long bit;
3627 } argtopriv[] = { 3619 } argtopriv[] = {
3628 { 1, PrivMode_aplCUR }, // DECCKM 3620 { 1, PrivMode_aplCUR }, // DECCKM
3629 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 }, // DECANM
3630 { 3, PrivMode_132 }, // DECCOLM 3622 { 3, PrivMode_132 }, // DECCOLM
3631 { 4, PrivMode_smoothScroll }, // DECSCLM 3623 { 4, PrivMode_smoothScroll }, // DECSCLM
3632 { 5, PrivMode_rVideo }, // DECSCNM 3624 { 5, PrivMode_rVideo }, // DECSCNM
3633 { 6, PrivMode_relOrigin }, // DECOM 3625 { 6, PrivMode_relOrigin }, // DECOM
3634 { 7, PrivMode_Autowrap }, // DECAWM 3626 { 7, PrivMode_Autowrap }, // DECAWM
3635 // 8, auto-repeat keys // DECARM 3627 // 8, auto-repeat keys // DECARM
3636 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3637 // 18 end FF to printer after print screen 3629 // 18 end FF to printer after print screen
3638 // 19 Print screen prints full screen/scroll region 3630 // 19 Print screen prints full screen/scroll region
3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3631 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3634#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK 3636 // 38, tektronix mode // DECTEK
3645 { 40, PrivMode_132OK }, 3637 { 40, PrivMode_132OK },
3646 // 41 xterm more fixes NYI 3638 // 41 xterm more fixes NYI
3647 // 45 margin bell NYI 3639 // 45 margin bell NYI
3648 // 46 start logging 3640 // 46 start logging
3649 { 47, PrivMode_Screen }, 3641 { 47, PrivMode_Screen },
3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3642 { 66, PrivMode_aplKP }, // DECNKM
3651#ifndef NO_BACKSPACE_KEY 3643#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, // DECBKM 3644 { 67, PrivMode_BackSpace }, // DECBKM
3653#endif 3645#endif
3654 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
3655 { 1002, PrivMode_MouseBtnEvent }, 3647 { 1002, PrivMode_MouseBtnEvent },
… …
3684 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
3685 { 3677 {
3686 state = -1; 3678 state = -1;
3687 3679
3688 /* basic handling */ 3680 /* basic handling */
3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3681 for (j = 0; j < ecb_array_length (argtopriv); j++)
3690 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
3691 { 3683 {
3692 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
3693 break; 3685 break;
3694 } 3686 }

Diff Legend

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