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.492 by sf-exg, Sun Aug 21 20:13:58 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}
… …
1476 } 1473 }
1477 else 1474 else
1478 { 1475 {
1479#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1480 if (moved) 1477 if (moved)
1481 {
1482 if (mapped)
1483 update_background (); 1478 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1487#endif 1479#endif
1488 } 1480 }
1489 1481
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 } 1483 }
… …
1739 want_refresh = 1; 1731 want_refresh = 1;
1740 1732
1741#if USE_XIM 1733#if USE_XIM
1742 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1743 { 1735 {
1744 IMSetPosition (); 1736 im_set_position ();
1745 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1746 } 1738 }
1747#endif 1739#endif
1748#if CURSOR_BLINK 1740#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
2222 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2224 2216
2225 for (;;) 2217 for (;;)
2226 { 2218 {
2227 if (expect_false (ch == NOCHAR)) 2219 if (ecb_unlikely (ch == NOCHAR))
2228 { 2220 {
2229 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2222 ch = next_char ();
2231 2223
2232 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2233 break; 2225 break;
2234 } 2226 }
2235 2227
2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237 { 2229 {
2238 if (expect_false (!seen_input)) 2230 if (ecb_unlikely (!seen_input))
2239 { 2231 {
2240 seen_input = 1; 2232 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2256 wchar_t *str = buf; 2248 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2250
2259 for (;;) 2251 for (;;)
2260 { 2252 {
2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break; 2254 break;
2263 2255
2264 *str++ = ch; 2256 *str++ = ch;
2265 2257
2266 if (expect_false (ch == C0_LF || str >= eol)) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2259 {
2268 if (ch == C0_LF) 2260 if (ch == C0_LF)
2269 nlines++; 2261 nlines++;
2270 2262
2271 refresh_count++; 2263 refresh_count++;
… …
2349rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2350{ 2342{
2351 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2352 { 2344 {
2353 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2355 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2356 2348
2357 wchar_t wc; 2349 wchar_t wc;
2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2359 2351
… …
2627 return; 2619 return;
2628 } 2620 }
2629 2621
2630 switch (ch) 2622 switch (ch)
2631 { 2623 {
2632 /* case 1: do_tek_mode (); break; */
2633 case '#': 2624 case '#':
2634 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2635 scr_E (); 2626 scr_E ();
2636 break; 2627 break;
2637 case '(': 2628 case '(':
… …
2660#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2661 case '9': 2652 case '9':
2662 scr_forwardindex (); 2653 scr_forwardindex ();
2663 break; 2654 break;
2664#endif 2655#endif
2656 // DECPAM/DECPNM
2665 case '=': 2657 case '=':
2666 case '>': 2658 case '>':
2667 set_privmode (PrivMode_aplKP, ch == '='); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2668 break; 2660 break;
2669 2661
… …
2676 2668
2677 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2678 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2679 { 2671 {
2680 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2682 } 2674 }
2683 break; 2675 break;
2684 2676
2685 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2686 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
… …
2698 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2699 scr_index (DN); 2691 scr_index (DN);
2700 break; 2692 break;
2701 2693
2702 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2703 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2704 2696
2705 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2706 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2707 2699
2708 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2709 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2710 process_dcs_seq (); 2702 process_dcs_seq ();
2711 break; 2703 break;
… …
2862 scr_soft_reset (); 2854 scr_soft_reset ();
2863 2855
2864 static const int pm_h[] = { 7, 25 }; 2856 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 }; 2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866 2858
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869 } 2861 }
2870 break; 2862 break;
2871 } 2863 }
2872 2864
2873 return; 2865 return;
… …
3463 if (*str != ';') 3455 if (*str != ';')
3464 { 3456 {
3465 if (bg_set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3466 { 3458 {
3467 changed++; 3459 changed++;
3468 str = strchr (str, ';');
3469 if (str == NULL)
3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 } 3460 }
3474 } 3461 }
3475 else 3462 else
3476 { 3463 {
3477 str++; 3464 str++;
… …
3608 return state; 3595 return state;
3609} 3596}
3610 3597
3611/* we're not using priv _yet_ */ 3598/* we're not using priv _yet_ */
3612void 3599void
3613rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3600rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3614{ 3601{
3615 unsigned int i, j; 3602 unsigned int i, j;
3616 int state; 3603 int state;
3617 3604
3618 static const struct 3605 static const struct
3619 { 3606 {
3620 const int argval; 3607 const int argval;
3621 const unsigned long bit; 3608 const unsigned long bit;
3622 } argtopriv[] = { 3609 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, // DECCKM 3610 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3611 { 2, PrivMode_vt52 }, // DECANM
3625 { 3, PrivMode_132 }, // DECCOLM 3612 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, // DECSCLM 3613 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, // DECSCNM 3614 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, // DECOM 3615 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, // DECAWM 3616 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, auto-repeat keys // DECARM 3617 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3618 { 9, PrivMode_MouseX10 },
3632 // 18 end FF to printer after print screen 3619 // 18 end FF to printer after print screen
3633 // 19 Print screen prints full screen/scroll region 3620 // 19 Print screen prints full screen/scroll region
3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3621 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3635#ifdef scrollBar_esc 3622#ifdef scrollBar_esc
3636 { scrollBar_esc, PrivMode_scrollBar }, 3623 { scrollBar_esc, PrivMode_scrollBar },
3637#endif 3624#endif
3638 { 35, PrivMode_ShiftKeys }, // rxvt extension 3625 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK 3626 // 38, tektronix mode // DECTEK
3640 { 40, PrivMode_132OK }, 3627 { 40, PrivMode_132OK },
3641 // 41 xterm more fixes NYI 3628 // 41 xterm more fixes NYI
3642 // 45 margin bell NYI 3629 // 45 margin bell NYI
3643 // 46 start logging 3630 // 46 start logging
3644 { 47, PrivMode_Screen }, 3631 { 47, PrivMode_Screen },
3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3632 { 66, PrivMode_aplKP }, // DECNKM
3646#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
3647 { 67, PrivMode_BackSpace }, // DECBKM 3634 { 67, PrivMode_BackSpace }, // DECBKM
3648#endif 3635#endif
3649 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
3650 { 1002, PrivMode_MouseBtnEvent }, 3637 { 1002, PrivMode_MouseBtnEvent },
… …
3679 for (i = 0; i < nargs; i++) 3666 for (i = 0; i < nargs; i++)
3680 { 3667 {
3681 state = -1; 3668 state = -1;
3682 3669
3683 /* basic handling */ 3670 /* basic handling */
3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3671 for (j = 0; j < ecb_array_length (argtopriv); j++)
3685 if (argtopriv[j].argval == arg[i]) 3672 if (argtopriv[j].argval == arg[i])
3686 { 3673 {
3687 state = privcases (mode, argtopriv[j].bit); 3674 state = privcases (mode, argtopriv[j].bit);
3688 break; 3675 break;
3689 } 3676 }

Diff Legend

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