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.480 by sf-exg, Mon Mar 7 11:48:55 2011 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

… …
569 selection_request (ev.time); 569 selection_request (ev.time);
570 return; 570 return;
571#if TODO 571#if TODO
572 /* rxvt extras */ 572 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 574 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 576 return;
579#endif 577#endif
580 } 578 }
581 } 579 }
582 } 580 }
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
938#endif 936#endif
939} 937}
940 938
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 939void
975rxvt_term::flush () 940rxvt_term::flush ()
976{ 941{
977 flush_ev.stop (); 942 flush_ev.stop ();
978 943
… …
1152 { 1117 {
1153 } 1118 }
1154} event_handler; 1119} event_handler;
1155#endif 1120#endif
1156 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1157bool 1155bool
1158rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1159{ 1157{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1161 1159
1162 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (!avail)
1163 {
1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1168 1169
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1171
1171 if (r > 0) 1172 if (r > 0)
1172 { 1173 {
1173 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1174 return true; 1175 return true;
… …
1442 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1444 focus_out ();
1444 break; 1445 break;
1445 1446
1446 case ConfigureNotify: 1447 case ConfigureNotify:
1447 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1448 { 1449 {
1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450 ; 1451 ;
1451 1452
1452#ifdef HAVE_BG_PIXMAP 1453#ifdef HAVE_BG_PIXMAP
… …
1718rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1719{ 1720{
1720 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1721 return; 1722 return;
1722 1723
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1724 { 1725 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1727 urgency_hint = enable; 1728 urgency_hint = enable;
1728 } 1729 }
1729} 1730}
1730#endif 1731#endif
1731 1732
… …
2386 : NOCHAR; 2387 : NOCHAR;
2387} 2388}
2388 2389
2389static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2390 2391
2391/* rxvt_cmd_getc () - Return next input character */
2392/*
2393 * Return the next input character after first passing any keyboard input
2394 * to the command.
2395 */
2396wchar_t 2392wchar_t
2397rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2398{ 2394{
2399 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2400 2396
… …
2493 pclose_printer (fd); 2489 pclose_printer (fd);
2494} 2490}
2495#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2496/*}}} */ 2492/*}}} */
2497 2493
2498/* *INDENT-OFF* */
2499enum { 2494enum {
2500 C1_40 = 0x40, 2495 C1_40 = 0x40,
2501 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2502 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2503 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2504 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2505}; 2500};
2506/* *INDENT-ON* */
2507 2501
2508/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2509void 2503void
2510rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2511{ 2505{
… …
2750 } 2744 }
2751} 2745}
2752/*}}} */ 2746/*}}} */
2753 2747
2754/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755/* *INDENT-OFF* */
2756enum { 2749enum {
2757 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2758 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2759 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2760 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2780 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2781 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2782 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2783 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2784 }; 2777 };
2785/* *INDENT-ON* */
2786 2778
2787void 2779void
2788rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2789{ 2781{
2790 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
… …
3100 } 3092 }
3101} 3093}
3102/*}}} */ 3094/*}}} */
3103 3095
3104#if !ENABLE_MINIMAL 3096#if !ENABLE_MINIMAL
3105/* ARGSUSED */
3106void 3097void
3107rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3108{ 3099{
3109 int x, y; 3100 int x, y;
3110 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
… …
3119 { 3110 {
3120 /* 3111 /*
3121 * commands 3112 * commands
3122 */ 3113 */
3123 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3124 XMapWindow (dpy, parent[0]); 3115 XMapWindow (dpy, parent);
3125 break; 3116 break;
3126 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3127 XIconifyWindow (dpy, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3128 break; 3119 break;
3129 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3130 XMoveWindow (dpy, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3131 break; 3122 break;
3132 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3133 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134 break; 3125 break;
3135 case 5: /* raise window */ 3126 case 5: /* raise window */
3136 XRaiseWindow (dpy, parent[0]); 3127 XRaiseWindow (dpy, parent);
3137 break; 3128 break;
3138 case 6: /* lower window */ 3129 case 6: /* lower window */
3139 XLowerWindow (dpy, parent[0]); 3130 XLowerWindow (dpy, parent);
3140 break; 3131 break;
3141 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3142 scr_touch (true); 3133 scr_touch (true);
3143 break; 3134 break;
3144 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3155 3146
3156 /* 3147 /*
3157 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3158 */ 3149 */
3159 case 11: /* report window state */ 3150 case 11: /* report window state */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3161 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162 break; 3153 break;
3163 case 13: /* report window position */ 3154 case 13: /* report window position */
3164 XGetWindowAttributes (dpy, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3165 XTranslateCoordinates (dpy, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3166 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3167 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3168 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3169 break; 3160 break;
3170 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173 break; 3164 break;
3174 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3175 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176 break; 3167 break;
… …
3178 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179 break; 3170 break;
3180 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3181 { 3172 {
3182 char *s; 3173 char *s;
3183 XGetIconName (dpy, parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3184 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185 XFree (s); 3176 XFree (s);
3186 } 3177 }
3187 break; 3178 break;
3188 case 21: /* report window title */ 3179 case 21: /* report window title */
3189 { 3180 {
3190 char *s; 3181 char *s;
3191 XFetchName (dpy, parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3192 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193 XFree (s); 3184 XFree (s);
3194 } 3185 }
3195 break; 3186 break;
3196 } 3187 }
… …
3350 unsigned long bytes_after; 3341 unsigned long bytes_after;
3351 unsigned char *value = 0; 3342 unsigned char *value = 0;
3352 const char *str = ""; 3343 const char *str = "";
3353 3344
3354 if (prop 3345 if (prop
3355 && XGetWindowProperty (dpy, parent[0], 3346 && XGetWindowProperty (dpy, parent,
3356 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3357 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3358 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3359 && actual_type != None 3350 && actual_type != None
3360 && actual_format == 8) 3351 && actual_format == 8)
… …
3372 { 3363 {
3373 *eq = 0; 3364 *eq = 0;
3374 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3375 } 3366 }
3376 else 3367 else
3377 XDeleteProperty (dpy, parent[0], 3368 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3369 display->atom (str));
3379 } 3370 }
3380 break; 3371 break;
3381 3372
3382 case XTerm_Color: 3373 case XTerm_Color:

Diff Legend

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