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.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.491 by sf-exg, Fri Aug 19 17:42:09 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 }
… …
992 } 987 }
993 988
994 scr_refresh (); 989 scr_refresh ();
995 scrollBar.show (1); 990 scrollBar.show (1);
996#ifdef USE_XIM 991#ifdef USE_XIM
997 IMSendSpot (); 992 im_send_spot ();
998#endif 993#endif
999 } 994 }
1000 995
1001 display->flush (); 996 display->flush ();
1002} 997}
… …
1741 want_refresh = 1; 1736 want_refresh = 1;
1742 1737
1743#if USE_XIM 1738#if USE_XIM
1744 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1745 { 1740 {
1746 IMSetPosition (); 1741 im_set_position ();
1747 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1748 } 1743 }
1749#endif 1744#endif
1750#if CURSOR_BLINK 1745#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
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
… …
2491 pclose_printer (fd); 2486 pclose_printer (fd);
2492} 2487}
2493#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2494/*}}} */ 2489/*}}} */
2495 2490
2496/* *INDENT-OFF* */
2497enum { 2491enum {
2498 C1_40 = 0x40, 2492 C1_40 = 0x40,
2499 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,
2500 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,
2501 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,
2502 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,
2503}; 2497};
2504/* *INDENT-ON* */
2505 2498
2506/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2507void 2500void
2508rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2502{
… …
2631 return; 2624 return;
2632 } 2625 }
2633 2626
2634 switch (ch) 2627 switch (ch)
2635 { 2628 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2629 case '#':
2638 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2639 scr_E (); 2631 scr_E ();
2640 break; 2632 break;
2641 case '(': 2633 case '(':
… …
2664#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2665 case '9': 2657 case '9':
2666 scr_forwardindex (); 2658 scr_forwardindex ();
2667 break; 2659 break;
2668#endif 2660#endif
2661 // DECPAM/DECPNM
2669 case '=': 2662 case '=':
2670 case '>': 2663 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2672 break; 2665 break;
2673 2666
… …
2680 2673
2681 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2683 { 2676 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2679 }
2687 break; 2680 break;
2688 2681
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
… …
2702 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2703 scr_index (DN); 2696 scr_index (DN);
2704 break; 2697 break;
2705 2698
2706 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2707 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2708 2701
2709 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2710 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2711 2704
2712 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2713 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2714 process_dcs_seq (); 2707 process_dcs_seq ();
2715 break; 2708 break;
… …
2748 } 2741 }
2749} 2742}
2750/*}}} */ 2743/*}}} */
2751 2744
2752/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2753/* *INDENT-OFF* */
2754enum { 2746enum {
2755 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2756 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,
2757 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 ,
2758 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,
… …
2778 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, */
2779 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, */
2780 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, */
2781 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, {, |, }, ~, */
2782 }; 2774 };
2783/* *INDENT-ON* */
2784 2775
2785void 2776void
2786rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2787{ 2778{
2788 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
2868 scr_soft_reset (); 2859 scr_soft_reset ();
2869 2860
2870 static const int pm_h[] = { 7, 25 }; 2861 static const int pm_h[] = { 7, 25 };
2871 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 };
2872 2863
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2875 } 2866 }
2876 break; 2867 break;
2877 } 2868 }
2878 2869
2879 return; 2870 return;
… …
3098 } 3089 }
3099} 3090}
3100/*}}} */ 3091/*}}} */
3101 3092
3102#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3103/* ARGSUSED */
3104void 3094void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3096{
3107 int x, y; 3097 int x, y;
3108 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3470 if (*str != ';') 3460 if (*str != ';')
3471 { 3461 {
3472 if (bg_set_file (str)) /* change pixmap */ 3462 if (bg_set_file (str)) /* change pixmap */
3473 { 3463 {
3474 changed++; 3464 changed++;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 } 3465 }
3481 } 3466 }
3482 else 3467 else
3483 { 3468 {
3484 str++; 3469 str++;
… …
3615 return state; 3600 return state;
3616} 3601}
3617 3602
3618/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3619void 3604void
3620rxvt_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)
3621{ 3606{
3622 unsigned int i, j; 3607 unsigned int i, j;
3623 int state; 3608 int state;
3624 3609
3625 static const struct 3610 static const struct
3626 { 3611 {
3627 const int argval; 3612 const int argval;
3628 const unsigned long bit; 3613 const unsigned long bit;
3629 } argtopriv[] = { 3614 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3639 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3625 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3629#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3634 // 45 margin bell NYI
3650 // 46 start logging 3635 // 46 start logging
3651 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3640#endif
3656 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
… …
3686 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3687 { 3672 {
3688 state = -1; 3673 state = -1;
3689 3674
3690 /* basic handling */ 3675 /* basic handling */
3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3692 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3693 { 3678 {
3694 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3695 break; 3680 break;
3696 } 3681 }

Diff Legend

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