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.487 by sf-exg, Sat Apr 30 13:11:34 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);
… …
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 '(':
… …
2700 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2701 scr_index (DN); 2695 scr_index (DN);
2702 break; 2696 break;
2703 2697
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2706 2700
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2709 2703
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2706 process_dcs_seq ();
2713 break; 2707 break;
… …
2746 } 2740 }
2747} 2741}
2748/*}}} */ 2742/*}}} */
2749 2743
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2745enum {
2753 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2754 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,
2755 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 ,
2756 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,
… …
2776 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, */
2777 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, */
2778 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, */
2779 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, {, |, }, ~, */
2780 }; 2773 };
2781/* *INDENT-ON* */
2782 2774
2783void 2775void
2784rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2785{ 2777{
2786 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
3096 } 3088 }
3097} 3089}
3098/*}}} */ 3090/*}}} */
3099 3091
3100#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3093void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3095{
3105 int x, y; 3096 int x, y;
3106 XWindowAttributes wattr; 3097 XWindowAttributes wattr;

Diff Legend

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