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.473 by sf-exg, Thu Jan 27 17:37:19 2011 UTC vs.
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 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
… …
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
979#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
980 if (bg_flags & hasChanged) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982 bg_flags &= ~hasChanged; 949 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 950 scr_touch (false);
984 } 951 }
985#endif 952#endif
986 953
987 if (want_refresh) 954 if (want_refresh)
… …
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 { 1163
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1165 n = 0;
1166 } 1165 {
1167 1166 // 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; 1167 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1171 1171
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1173
1174 if (r > 0) 1174 if (r > 0)
1175 { 1175 {
1176 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1177 return true; 1177 return true;
… …
1445 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1446 focus_out ();
1447 break; 1447 break;
1448 1448
1449 case ConfigureNotify: 1449 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1451 { 1451 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1453 ;
1454 1454
1455#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_BG_PIXMAP
… …
1464 } 1464 }
1465 else 1465 else
1466 get_window_origin (x, y); 1466 get_window_origin (x, y);
1467 1467
1468 if (bg_set_position (x, y) 1468 if (bg_set_position (x, y)
1469 || !(bg_flags & isValid)) 1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true; 1470 moved = true;
1471 } 1471 }
1472#endif 1472#endif
1473 1473
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1493 }
1494 break; 1494 break;
1495 1495
1496 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 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; 1498 break;
1503 1499
1504 case SelectionClear: 1500 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 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; 1502 break;
1512 1503
1513 case SelectionRequest: 1504 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1515 break; 1506 break;
… …
1526 * by scheduling background redraw as soon as we can, but giving a short 1517 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1530 */ 1521 */
1531 if (!(bg_flags & isValid)) 1522 if (!(bg_flags & BG_IS_VALID))
1532 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1533#endif 1524#endif
1534 mapped = 1; 1525 mapped = 1;
1535#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1536 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1551 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1552 { 1543 {
1553 do 1544 do
1554 { 1545 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1548 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1550
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1552
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 { 1554 {
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1566 } 1557 }
1567 1558
1568 want_refresh = 1; 1559 want_refresh = 1;
1569 } 1560 }
1570 else 1561 else
… …
1730rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1731{ 1722{
1732 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1733 return; 1724 return;
1734 1725
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1727 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1730 urgency_hint = enable;
1740 } 1731 }
1741} 1732}
1742#endif 1733#endif
1743 1734
… …
2700 } 2691 }
2701 break; 2692 break;
2702 2693
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2705 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 */
2706 break; 2699 break;
2707 2700
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2703 scr_set_tab (1);
… …
3129 { 3122 {
3130 /* 3123 /*
3131 * commands 3124 * commands
3132 */ 3125 */
3133 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3135 break; 3128 break;
3136 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3131 break;
3139 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3134 break;
3142 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3137 break;
3145 case 5: /* raise window */ 3138 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3147 break; 3140 break;
3148 case 6: /* lower window */ 3141 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3150 break; 3143 break;
3151 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3152 scr_touch (true); 3145 scr_touch (true);
3153 break; 3146 break;
3154 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3165 3158
3166 /* 3159 /*
3167 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3168 */ 3161 */
3169 case 11: /* report window state */ 3162 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3165 break;
3173 case 13: /* report window position */ 3166 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3172 break;
3180 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3176 break;
3184 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3179 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3182 break;
3190 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3191 { 3184 {
3192 char *s; 3185 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3194 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 */
3195 XFree (s); 3188 XFree (s);
3196 } 3189 }
3197 break; 3190 break;
3198 case 21: /* report window title */ 3191 case 21: /* report window title */
3199 { 3192 {
3200 char *s; 3193 char *s;
3201 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3202 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 */
3203 XFree (s); 3196 XFree (s);
3204 } 3197 }
3205 break; 3198 break;
3206 } 3199 }
… …
3360 unsigned long bytes_after; 3353 unsigned long bytes_after;
3361 unsigned char *value = 0; 3354 unsigned char *value = 0;
3362 const char *str = ""; 3355 const char *str = "";
3363 3356
3364 if (prop 3357 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3362 && actual_type != None
3370 && actual_format == 8) 3363 && actual_format == 8)
… …
3382 { 3375 {
3383 *eq = 0; 3376 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3385 } 3378 }
3386 else 3379 else
3387 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3381 display->atom (str));
3389 } 3382 }
3390 break; 3383 break;
3391 3384
3392 case XTerm_Color: 3385 case XTerm_Color:
… …
3981 } 3974 }
3982 } 3975 }
3983} 3976}
3984/*}}} */ 3977/*}}} */
3985 3978
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/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
4006 3980
4007/* 3981/*
4008 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
4037 4011
4038 if (v_buflen == 0) 4012 if (v_buflen == 0)
4039 { 4013 {
4040 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));
4041 4015
4016 max_it (written, 0);
4017
4042 if ((unsigned int)written == len) 4018 if (written == len)
4043 return; 4019 return;
4044 4020
4045 data += written; 4021 data += written;
4046 len -= written; 4022 len -= written;
4047 } 4023 }

Diff Legend

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