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.482 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.488 by sf-exg, Mon May 30 18:39:03 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);
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
2224 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2226 2221
2227 for (;;) 2222 for (;;)
2228 { 2223 {
2229 if (expect_false (ch == NOCHAR)) 2224 if (ecb_unlikely (ch == NOCHAR))
2230 { 2225 {
2231 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2227 ch = next_char ();
2233 2228
2234 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2235 break; 2230 break;
2236 } 2231 }
2237 2232
2238 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))
2239 { 2234 {
2240 if (expect_false (!seen_input)) 2235 if (ecb_unlikely (!seen_input))
2241 { 2236 {
2242 seen_input = 1; 2237 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2253 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2255
2261 for (;;) 2256 for (;;)
2262 { 2257 {
2263 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)))
2264 break; 2259 break;
2265 2260
2266 *str++ = ch; 2261 *str++ = ch;
2267 2262
2268 if (expect_false (ch == C0_LF || str >= eol)) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2264 {
2270 if (ch == C0_LF) 2265 if (ch == C0_LF)
2271 nlines++; 2266 nlines++;
2272 2267
2273 refresh_count++; 2268 refresh_count++;
… …
2351rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2352{ 2347{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2349 {
2355 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2358 2353
2359 wchar_t wc; 2354 wchar_t wc;
2360 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);
2361 2356
… …
2389 : NOCHAR; 2384 : NOCHAR;
2390} 2385}
2391 2386
2392static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2393 2388
2394/* rxvt_cmd_getc () - Return next input character */
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t 2389wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2391{
2402 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2403 2393
… …
2496 pclose_printer (fd); 2486 pclose_printer (fd);
2497} 2487}
2498#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2499/*}}} */ 2489/*}}} */
2500 2490
2501/* *INDENT-OFF* */
2502enum { 2491enum {
2503 C1_40 = 0x40, 2492 C1_40 = 0x40,
2504 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,
2505 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,
2506 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,
2507 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,
2508}; 2497};
2509/* *INDENT-ON* */
2510 2498
2511/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2512void 2500void
2513rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2502{
… …
2636 return; 2624 return;
2637 } 2625 }
2638 2626
2639 switch (ch) 2627 switch (ch)
2640 { 2628 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2629 case '#':
2643 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2644 scr_E (); 2631 scr_E ();
2645 break; 2632 break;
2646 case '(': 2633 case '(':
… …
2685 2672
2686 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2688 { 2675 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2678 }
2692 break; 2679 break;
2693 2680
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
… …
2707 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2708 scr_index (DN); 2695 scr_index (DN);
2709 break; 2696 break;
2710 2697
2711 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2712 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2713 2700
2714 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2715 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2716 2703
2717 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2718 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2719 process_dcs_seq (); 2706 process_dcs_seq ();
2720 break; 2707 break;
… …
2753 } 2740 }
2754} 2741}
2755/*}}} */ 2742/*}}} */
2756 2743
2757/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2758/* *INDENT-OFF* */
2759enum { 2745enum {
2760 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2761 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2762 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2763 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2783 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2784 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2785 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2786 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2787 }; 2773 };
2788/* *INDENT-ON* */
2789 2774
2790void 2775void
2791rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2792{ 2777{
2793 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2873 scr_soft_reset (); 2858 scr_soft_reset ();
2874 2859
2875 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877 2862
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2880 } 2865 }
2881 break; 2866 break;
2882 } 2867 }
2883 2868
2884 return; 2869 return;
… …
3103 } 3088 }
3104} 3089}
3105/*}}} */ 3090/*}}} */
3106 3091
3107#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3108/* ARGSUSED */
3109void 3093void
3110rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111{ 3095{
3112 int x, y; 3096 int x, y;
3113 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3620 return state; 3604 return state;
3621} 3605}
3622 3606
3623/* we're not using priv _yet_ */ 3607/* we're not using priv _yet_ */
3624void 3608void
3625rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3609rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3626{ 3610{
3627 unsigned int i, j; 3611 unsigned int i, j;
3628 int state; 3612 int state;
3629 3613
3630 static const struct 3614 static const struct
… …
3691 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
3692 { 3676 {
3693 state = -1; 3677 state = -1;
3694 3678
3695 /* basic handling */ 3679 /* basic handling */
3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3680 for (j = 0; j < ecb_array_length (argtopriv); j++)
3697 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
3698 { 3682 {
3699 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
3700 break; 3684 break;
3701 } 3685 }

Diff Legend

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