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.475 by sf-exg, Tue Feb 1 00:41:01 2011 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
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;
1163 { 1161
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1165 n = 0;
1166 } 1163 {
1167 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1171 1169
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1171
1174 if (r > 0) 1172 if (r > 0)
1175 { 1173 {
1176 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1177 return true; 1175 return true;
… …
1445 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1444 focus_out ();
1447 break; 1445 break;
1448 1446
1449 case ConfigureNotify: 1447 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1451 { 1449 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1451 ;
1454 1452
1455#ifdef HAVE_BG_PIXMAP 1453#ifdef HAVE_BG_PIXMAP
… …
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1491 }
1494 break; 1492 break;
1495 1493
1496 case PropertyNotify: 1494 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1496 break;
1503 1497
1504 case SelectionClear: 1498 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1500 break;
1512 1501
1513 case SelectionRequest: 1502 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1515 break; 1504 break;
… …
1730rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1731{ 1720{
1732 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1733 return; 1722 return;
1734 1723
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1725 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1728 urgency_hint = enable;
1740 } 1729 }
1741} 1730}
1742#endif 1731#endif
1743 1732
… …
2398 : NOCHAR; 2387 : NOCHAR;
2399} 2388}
2400 2389
2401static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2402 2391
2403/* rxvt_cmd_getc () - Return next input character */
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t 2392wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2394{
2411 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2412 2396
… …
2700 } 2684 }
2701 break; 2685 break;
2702 2686
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
2705 process_graphics (); 2689 // used by original rxvt for rob nations own graphics mode
2690 if (cmd_getc () == 'Q')
2691 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2706 break; 2692 break;
2707 2693
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2696 scr_set_tab (1);
… …
3129 { 3115 {
3130 /* 3116 /*
3131 * commands 3117 * commands
3132 */ 3118 */
3133 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3120 XMapWindow (dpy, parent);
3135 break; 3121 break;
3136 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3124 break;
3139 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3127 break;
3142 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3130 break;
3145 case 5: /* raise window */ 3131 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3132 XRaiseWindow (dpy, parent);
3147 break; 3133 break;
3148 case 6: /* lower window */ 3134 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3135 XLowerWindow (dpy, parent);
3150 break; 3136 break;
3151 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3152 scr_touch (true); 3138 scr_touch (true);
3153 break; 3139 break;
3154 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3165 3151
3166 /* 3152 /*
3167 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3168 */ 3154 */
3169 case 11: /* report window state */ 3155 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3158 break;
3173 case 13: /* report window position */ 3159 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3165 break;
3180 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3169 break;
3184 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3172 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3175 break;
3190 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3191 { 3177 {
3192 char *s; 3178 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3194 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 */
3195 XFree (s); 3181 XFree (s);
3196 } 3182 }
3197 break; 3183 break;
3198 case 21: /* report window title */ 3184 case 21: /* report window title */
3199 { 3185 {
3200 char *s; 3186 char *s;
3201 XFetchName (dpy, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3203 XFree (s); 3189 XFree (s);
3204 } 3190 }
3205 break; 3191 break;
3206 } 3192 }
… …
3360 unsigned long bytes_after; 3346 unsigned long bytes_after;
3361 unsigned char *value = 0; 3347 unsigned char *value = 0;
3362 const char *str = ""; 3348 const char *str = "";
3363 3349
3364 if (prop 3350 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3355 && actual_type != None
3370 && actual_format == 8) 3356 && actual_format == 8)
… …
3382 { 3368 {
3383 *eq = 0; 3369 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3385 } 3371 }
3386 else 3372 else
3387 XDeleteProperty (dpy, parent[0], 3373 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3374 display->atom (str));
3389 } 3375 }
3390 break; 3376 break;
3391 3377
3392 case XTerm_Color: 3378 case XTerm_Color:
… …
3981 } 3967 }
3982 } 3968 }
3983} 3969}
3984/*}}} */ 3970/*}}} */
3985 3971
3986/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3987void
3988rxvt_term::process_graphics ()
3989{
3990 unicode_t ch, cmd = cmd_getc ();
3991
3992 if (cmd == 'Q')
3993 {
3994 /* query graphics */
3995 tt_printf ("\033G0\012"); /* no graphics */
3996 return;
3997 }
3998 /* swallow other graphics sequences until terminating ':' */
3999 do
4000 ch = cmd_getc ();
4001 while (ch != ':');
4002}
4003/*}}} */
4004
4005/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
4006 3973
4007/* 3974/*
4008 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
4037 4004
4038 if (v_buflen == 0) 4005 if (v_buflen == 0)
4039 { 4006 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4007 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041 4008
4009 max_it (written, 0);
4010
4042 if ((unsigned int)written == len) 4011 if (written == len)
4043 return; 4012 return;
4044 4013
4045 data += written; 4014 data += written;
4046 len -= written; 4015 len -= written;
4047 } 4016 }

Diff Legend

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