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.481 by root, Thu Mar 24 17:34:28 2011 UTC vs.
Revision 1.486 by sf-exg, Fri Apr 29 13:29:45 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 }
… …
1445 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1441 focus_out ();
1447 break; 1442 break;
1448 1443
1449 case ConfigureNotify: 1444 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1451 { 1446 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1448 ;
1454 1449
1455#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
… …
1721rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1722{ 1717{
1723 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1724 return; 1719 return;
1725 1720
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1722 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1725 urgency_hint = enable;
1731 } 1726 }
1732} 1727}
1733#endif 1728#endif
1734 1729
… …
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{
… …
2753 } 2741 }
2754} 2742}
2755/*}}} */ 2743/*}}} */
2756 2744
2757/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2758/* *INDENT-OFF* */
2759enum { 2746enum {
2760 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2761 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,
2762 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 ,
2763 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,
… …
2783 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, */
2784 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, */
2785 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, */
2786 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, {, |, }, ~, */
2787 }; 2774 };
2788/* *INDENT-ON* */
2789 2775
2790void 2776void
2791rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2792{ 2778{
2793 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
3103 } 3089 }
3104} 3090}
3105/*}}} */ 3091/*}}} */
3106 3092
3107#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3108/* ARGSUSED */
3109void 3094void
3110rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111{ 3096{
3112 int x, y; 3097 int x, y;
3113 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3122 { 3107 {
3123 /* 3108 /*
3124 * commands 3109 * commands
3125 */ 3110 */
3126 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3127 XMapWindow (dpy, parent[0]); 3112 XMapWindow (dpy, parent);
3128 break; 3113 break;
3129 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3130 XIconifyWindow (dpy, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3131 break; 3116 break;
3132 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3133 XMoveWindow (dpy, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3134 break; 3119 break;
3135 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3137 break; 3122 break;
3138 case 5: /* raise window */ 3123 case 5: /* raise window */
3139 XRaiseWindow (dpy, parent[0]); 3124 XRaiseWindow (dpy, parent);
3140 break; 3125 break;
3141 case 6: /* lower window */ 3126 case 6: /* lower window */
3142 XLowerWindow (dpy, parent[0]); 3127 XLowerWindow (dpy, parent);
3143 break; 3128 break;
3144 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3145 scr_touch (true); 3130 scr_touch (true);
3146 break; 3131 break;
3147 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3158 3143
3159 /* 3144 /*
3160 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3161 */ 3146 */
3162 case 11: /* report window state */ 3147 case 11: /* report window state */
3163 XGetWindowAttributes (dpy, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3165 break; 3150 break;
3166 case 13: /* report window position */ 3151 case 13: /* report window position */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3168 XTranslateCoordinates (dpy, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3169 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3170 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3171 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3172 break; 3157 break;
3173 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3176 break; 3161 break;
3177 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3178 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3179 break; 3164 break;
… …
3181 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3182 break; 3167 break;
3183 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3184 { 3169 {
3185 char *s; 3170 char *s;
3186 XGetIconName (dpy, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3188 XFree (s); 3173 XFree (s);
3189 } 3174 }
3190 break; 3175 break;
3191 case 21: /* report window title */ 3176 case 21: /* report window title */
3192 { 3177 {
3193 char *s; 3178 char *s;
3194 XFetchName (dpy, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s); 3181 XFree (s);
3197 } 3182 }
3198 break; 3183 break;
3199 } 3184 }
… …
3353 unsigned long bytes_after; 3338 unsigned long bytes_after;
3354 unsigned char *value = 0; 3339 unsigned char *value = 0;
3355 const char *str = ""; 3340 const char *str = "";
3356 3341
3357 if (prop 3342 if (prop
3358 && XGetWindowProperty (dpy, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3359 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3360 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3361 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3362 && actual_type != None 3347 && actual_type != None
3363 && actual_format == 8) 3348 && actual_format == 8)
… …
3375 { 3360 {
3376 *eq = 0; 3361 *eq = 0;
3377 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3378 } 3363 }
3379 else 3364 else
3380 XDeleteProperty (dpy, parent[0], 3365 XDeleteProperty (dpy, parent,
3381 display->atom (str)); 3366 display->atom (str));
3382 } 3367 }
3383 break; 3368 break;
3384 3369
3385 case XTerm_Color: 3370 case XTerm_Color:

Diff Legend

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