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.479 by root, Fri Feb 25 07:07:41 2011 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
938#endif 938#endif
939} 939}
940 940
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 941void
975rxvt_term::flush () 942rxvt_term::flush ()
976{ 943{
977 flush_ev.stop (); 944 flush_ev.stop ();
978 945
… …
1152 { 1119 {
1153 } 1120 }
1154} event_handler; 1121} event_handler;
1155#endif 1122#endif
1156 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1157bool 1157bool
1158rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1159{ 1159{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1161 1161
1162 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163
1164 if (!avail)
1165 {
1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have 1166 // 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; 1167 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1168 1171
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1173
1171 if (r > 0) 1174 if (r > 0)
1172 { 1175 {
1173 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1174 return true; 1177 return true;
… …
1442 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1446 focus_out ();
1444 break; 1447 break;
1445 1448
1446 case ConfigureNotify: 1449 case ConfigureNotify:
1447 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1448 { 1451 {
1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450 ; 1453 ;
1451 1454
1452#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_BG_PIXMAP
… …
1718rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1719{ 1722{
1720 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1721 return; 1724 return;
1722 1725
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1724 { 1727 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1727 urgency_hint = enable; 1730 urgency_hint = enable;
1728 } 1731 }
1729} 1732}
1730#endif 1733#endif
1731 1734
… …
2386 : NOCHAR; 2389 : NOCHAR;
2387} 2390}
2388 2391
2389static class out_of_input out_of_input; 2392static class out_of_input out_of_input;
2390 2393
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 2394wchar_t
2397rxvt_term::cmd_getc () THROW ((class out_of_input)) 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2398{ 2396{
2399 wchar_t c = next_char (); 2397 wchar_t c = next_char ();
2400 2398
… …
3119 { 3117 {
3120 /* 3118 /*
3121 * commands 3119 * commands
3122 */ 3120 */
3123 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3124 XMapWindow (dpy, parent[0]); 3122 XMapWindow (dpy, parent);
3125 break; 3123 break;
3126 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3127 XIconifyWindow (dpy, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent, display->screen);
3128 break; 3126 break;
3129 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3130 XMoveWindow (dpy, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent, args[1], args[2]);
3131 break; 3129 break;
3132 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3133 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134 break; 3132 break;
3135 case 5: /* raise window */ 3133 case 5: /* raise window */
3136 XRaiseWindow (dpy, parent[0]); 3134 XRaiseWindow (dpy, parent);
3137 break; 3135 break;
3138 case 6: /* lower window */ 3136 case 6: /* lower window */
3139 XLowerWindow (dpy, parent[0]); 3137 XLowerWindow (dpy, parent);
3140 break; 3138 break;
3141 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3142 scr_touch (true); 3140 scr_touch (true);
3143 break; 3141 break;
3144 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3155 3153
3156 /* 3154 /*
3157 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3158 */ 3156 */
3159 case 11: /* report window state */ 3157 case 11: /* report window state */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3161 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162 break; 3160 break;
3163 case 13: /* report window position */ 3161 case 13: /* report window position */
3164 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3165 XTranslateCoordinates (dpy, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent, wattr.root,
3166 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3167 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3168 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3169 break; 3167 break;
3170 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173 break; 3171 break;
3174 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3175 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176 break; 3174 break;
… …
3178 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179 break; 3177 break;
3180 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3181 { 3179 {
3182 char *s; 3180 char *s;
3183 XGetIconName (dpy, parent[0], &s); 3181 XGetIconName (dpy, parent, &s);
3184 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185 XFree (s); 3183 XFree (s);
3186 } 3184 }
3187 break; 3185 break;
3188 case 21: /* report window title */ 3186 case 21: /* report window title */
3189 { 3187 {
3190 char *s; 3188 char *s;
3191 XFetchName (dpy, parent[0], &s); 3189 XFetchName (dpy, parent, &s);
3192 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193 XFree (s); 3191 XFree (s);
3194 } 3192 }
3195 break; 3193 break;
3196 } 3194 }
… …
3350 unsigned long bytes_after; 3348 unsigned long bytes_after;
3351 unsigned char *value = 0; 3349 unsigned char *value = 0;
3352 const char *str = ""; 3350 const char *str = "";
3353 3351
3354 if (prop 3352 if (prop
3355 && XGetWindowProperty (dpy, parent[0], 3353 && XGetWindowProperty (dpy, parent,
3356 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3357 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3358 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3359 && actual_type != None 3357 && actual_type != None
3360 && actual_format == 8) 3358 && actual_format == 8)
… …
3372 { 3370 {
3373 *eq = 0; 3371 *eq = 0;
3374 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3375 } 3373 }
3376 else 3374 else
3377 XDeleteProperty (dpy, parent[0], 3375 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3376 display->atom (str));
3379 } 3377 }
3380 break; 3378 break;
3381 3379
3382 case XTerm_Color: 3380 case XTerm_Color:
… …
4008 4006
4009 if (v_buflen == 0) 4007 if (v_buflen == 0)
4010 { 4008 {
4011 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4009 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4012 4010
4011 max_it (written, 0);
4012
4013 if ((unsigned int)written == len) 4013 if (written == len)
4014 return; 4014 return;
4015 4015
4016 data += written; 4016 data += written;
4017 len -= written; 4017 len -= written;
4018 } 4018 }

Diff Legend

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