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.478 by root, Thu Feb 24 12:42:41 2011 UTC vs.
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 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
… …
2688 } 2691 }
2689 break; 2692 break;
2690 2693
2691 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2692 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2693 process_graphics (); 2696 // used by original rxvt for rob nations own graphics mode
2697 if (cmd_getc () == 'Q')
2698 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2694 break; 2699 break;
2695 2700
2696 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2697 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2698 scr_set_tab (1); 2703 scr_set_tab (1);
… …
3117 { 3122 {
3118 /* 3123 /*
3119 * commands 3124 * commands
3120 */ 3125 */
3121 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3122 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3123 break; 3128 break;
3124 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3125 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3126 break; 3131 break;
3127 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3128 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3129 break; 3134 break;
3130 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3137 break;
3133 case 5: /* raise window */ 3138 case 5: /* raise window */
3134 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3135 break; 3140 break;
3136 case 6: /* lower window */ 3141 case 6: /* lower window */
3137 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3138 break; 3143 break;
3139 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3140 scr_touch (true); 3145 scr_touch (true);
3141 break; 3146 break;
3142 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3153 3158
3154 /* 3159 /*
3155 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3156 */ 3161 */
3157 case 11: /* report window state */ 3162 case 11: /* report window state */
3158 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3165 break;
3161 case 13: /* report window position */ 3166 case 13: /* report window position */
3162 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3163 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3172 break;
3168 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3176 break;
3172 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3179 break;
… …
3176 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3182 break;
3178 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3179 { 3184 {
3180 char *s; 3185 char *s;
3181 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3183 XFree (s); 3188 XFree (s);
3184 } 3189 }
3185 break; 3190 break;
3186 case 21: /* report window title */ 3191 case 21: /* report window title */
3187 { 3192 {
3188 char *s; 3193 char *s;
3189 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3191 XFree (s); 3196 XFree (s);
3192 } 3197 }
3193 break; 3198 break;
3194 } 3199 }
… …
3348 unsigned long bytes_after; 3353 unsigned long bytes_after;
3349 unsigned char *value = 0; 3354 unsigned char *value = 0;
3350 const char *str = ""; 3355 const char *str = "";
3351 3356
3352 if (prop 3357 if (prop
3353 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3354 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3355 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3356 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3357 && actual_type != None 3362 && actual_type != None
3358 && actual_format == 8) 3363 && actual_format == 8)
… …
3370 { 3375 {
3371 *eq = 0; 3376 *eq = 0;
3372 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3373 } 3378 }
3374 else 3379 else
3375 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3376 display->atom (str)); 3381 display->atom (str));
3377 } 3382 }
3378 break; 3383 break;
3379 3384
3380 case XTerm_Color: 3385 case XTerm_Color:
… …
3969 } 3974 }
3970 } 3975 }
3971} 3976}
3972/*}}} */ 3977/*}}} */
3973 3978
3974/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3975void
3976rxvt_term::process_graphics ()
3977{
3978 unicode_t ch, cmd = cmd_getc ();
3979
3980 if (cmd == 'Q')
3981 {
3982 /* query graphics */
3983 tt_printf ("\033G0\012"); /* no graphics */
3984 return;
3985 }
3986 /* swallow other graphics sequences until terminating ':' */
3987 do
3988 ch = cmd_getc ();
3989 while (ch != ':');
3990}
3991/*}}} */
3992
3993/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3994 3980
3995/* 3981/*
3996 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3997 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
4025 4011
4026 if (v_buflen == 0) 4012 if (v_buflen == 0)
4027 { 4013 {
4028 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4014 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4029 4015
4016 max_it (written, 0);
4017
4030 if ((unsigned int)written == len) 4018 if (written == len)
4031 return; 4019 return;
4032 4020
4033 data += written; 4021 data += written;
4034 len -= written; 4022 len -= written;
4035 } 4023 }

Diff Legend

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