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.445 by sf-exg, Fri Apr 2 13:52:30 2010 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 }
… …
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 648 unsigned int newlen = 1;
651 649
652 if (ev.state & ModNumLockMask) 650 if (ev.state & ModNumLockMask)
653 kp = false; 651 kp = false;
652
654 switch (translate_keypad (keysym, kp)) 653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
655 { 656 {
656#ifndef NO_BACKSPACE_KEY 657#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace: 658 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace) 659 if (priv_modes & PrivMode_HaveBackSpace)
659 { 660 {
… …
886 commit_iso14755 (); 887 commit_iso14755 ();
887 888
888 return; 889 return;
889 } 890 }
890 891
891 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
892 if (i[0] == keysym) 893 if (i[0] == keysym)
893 { 894 {
894 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
895 commit_iso14755 (); 896 commit_iso14755 ();
896 897
… …
933 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
934 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
935#endif 936#endif
936} 937}
937 938
938#if defined (KEYSYM_RESOURCE)
939unsigned int
940rxvt_term::cmd_write (const char *str, unsigned int count)
941{
942 unsigned int n, s;
943
944 n = cmdbuf_ptr - cmdbuf_base;
945 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
946
947 if (n > 0 && s < count)
948 {
949 memmove (cmdbuf_base, cmdbuf_ptr,
950 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
951 cmdbuf_ptr = cmdbuf_base;
952 cmdbuf_endp -= n;
953 s += n;
954 }
955
956 if (count > s)
957 {
958 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
959 count = s;
960 }
961
962 for (; count--;)
963 *cmdbuf_endp++ = *str++;
964
965 cmd_parse ();
966
967 return 0;
968}
969#endif
970
971void 939void
972rxvt_term::flush () 940rxvt_term::flush ()
973{ 941{
974 flush_ev.stop (); 942 flush_ev.stop ();
975 943
976#ifdef HAVE_BG_PIXMAP 944#ifdef HAVE_BG_PIXMAP
977 if (bgPixmap.check_clearChanged ()) 945 if (bg_flags & BG_NEEDS_REFRESH)
978 { 946 {
979// scr_clear (true); This needs to be researched further! 947 bg_flags &= ~BG_NEEDS_REFRESH;
980 scr_touch (false); 948 scr_touch (false);
981 } 949 }
982#endif 950#endif
983 951
984 if (want_refresh) 952 if (want_refresh)
… …
1149 { 1117 {
1150 } 1118 }
1151} event_handler; 1119} event_handler;
1152#endif 1120#endif
1153 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
1154bool 1155bool
1155rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1156{ 1157{
1157 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1158 1159
1159 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1160 { 1161
1161 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1162 n = 0;
1163 } 1163 {
1164 1164 // normally this indicates a "too long" command sequence - just drop the data we have
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;
… …
1248{ 1249{
1249 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1250 int x, y; 1251 int x, y;
1251 int code = 32; 1252 int code = 32;
1252 1253
1253 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1254 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1255 if (ev.type == MotionNotify) 1257 if (ev.type == MotionNotify)
1256 { 1258 {
1257 if (x == mouse_row && y == mouse_col) 1259 if (x == mouse_row && y == mouse_col)
1258 return; 1260 return;
1261
1259 mouse_row = x; 1262 mouse_row = x;
1260 mouse_col = y; 1263 mouse_col = y;
1261 code += 32; 1264 code += 32;
1262 } 1265 }
1263 1266
… …
1266 else 1269 else
1267 { 1270 {
1268 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1270 if (button_number >= 3) 1273 if (button_number >= 3)
1271 button_number += (64 - 3); 1274 button_number += 64 - 3;
1272 } 1275 }
1273 1276
1274 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1275 { 1278 {
1276 /* 1279 /*
… …
1308 fputc ('A', stderr); 1311 fputc ('A', stderr);
1309 if (key_state & 32) 1312 if (key_state & 32)
1310 fputc ('2', stderr); 1313 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1315 button_number,
1313 x + 1, 1316 x,
1314 y + 1); 1317 y);
1315#endif 1318#endif
1316 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1317 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1334 code + button_number + key_state,
1319 (32 + x + 1), 1335 32 + x,
1320 (32 + y + 1)); 1336 32 + y);
1321} 1337}
1322 1338
1323/*{{{ process an X event */ 1339/*{{{ process an X event */
1324void 1340void
1325rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1427 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1444 focus_out ();
1429 break; 1445 break;
1430 1446
1431 case ConfigureNotify: 1447 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1436 { 1449 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1439 1471
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1473 {
1442 seen_resize = 1; 1474 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1476 }
1445 else 1477 else
1446 { 1478 {
1447#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1449 { 1481 {
1450 if (mapped) 1482 if (mapped)
1451 update_background (); 1483 update_background ();
1452 else 1484 else
1453 bgPixmap.invalidate (); 1485 bg_invalidate ();
1454 } 1486 }
1455#endif 1487#endif
1456 } 1488 }
1457 1489
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1491 }
1460 break; 1492 break;
1461 1493
1462 case PropertyNotify: 1494 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1496 break;
1469 1497
1470 case SelectionClear: 1498 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1500 break;
1473 1501
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break;
1478
1479 case SelectionRequest: 1502 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1481 break; 1504 break;
1482 1505
1483 case MapNotify: 1506 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1507#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a 1508 /* This is needed specifically to fix the case of no window manager or a
1486 * non-reparenting window manager. In those cases we never get first 1509 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does 1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1489 * reparenting. 1512 * reparenting.
1490 * We should not render background immidiately, as there could be several 1513 * We should not render background immediately, as there could be several
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1492 * by scheduling background redraw as soon as we can, but giving a short 1515 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive. 1516 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all 1517 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results. 1518 * of ConfigureNotifys for the best results.
1496 */ 1519 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1520 if (!(bg_flags & BG_IS_VALID))
1498 update_background_ev.start (0.025); 1521 update_background_ev.start (0.025);
1499#endif 1522#endif
1500 mapped = 1; 1523 mapped = 1;
1501#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1525 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1518 { 1541 {
1519 do 1542 do
1520 { 1543 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1546 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1548
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1550
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1552 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1555 }
1533 1556
1534 want_refresh = 1; 1557 want_refresh = 1;
1535 } 1558 }
1536 else 1559 else
… …
1696rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1697{ 1720{
1698 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1699 return; 1722 return;
1700 1723
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1725 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1728 urgency_hint = enable;
1706 } 1729 }
1707} 1730}
1708#endif 1731#endif
1709 1732
… …
1817 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1818 */ 1841 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1844 {
1822 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1823 update_background (); 1846 update_background ();
1824 } 1847 }
1825 1848
1826 break; 1849 break;
1827 } 1850 }
… …
1866 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1867 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1869 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1870 { 1893 {
1871 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1872 MEvent.clicks++; 1895 MEvent.clicks++;
1873 1896
1874 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1875 { 1898 {
1876 /* only report double clicks */ 1899 /* only report double clicks */
… …
2147 selection_make (ev.time); 2170 selection_make (ev.time);
2148 break; 2171 break;
2149 2172
2150 case Button2: 2173 case Button2:
2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2176 break;
2154 2177
2155#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2156 case Button4: 2179 case Button4:
2157 case Button5: 2180 case Button5:
… …
2364 : NOCHAR; 2387 : NOCHAR;
2365} 2388}
2366 2389
2367static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2368 2391
2369/* rxvt_cmd_getc () - Return next input character */
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t 2392wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2394{
2377 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2378 2396
… …
2660 2678
2661 /* 8.3.87: NEXT LINE */ 2679 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2680 case C1_NEL: /* ESC E */
2663 { 2681 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2682 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2666 } 2684 }
2667 break; 2685 break;
2668 2686
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
2671 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 */
2672 break; 2692 break;
2673 2693
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2696 scr_set_tab (1);
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2740 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2741 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2762};
2743 2763
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2769
2750const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2751 { 2771 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2753 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2754 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2755 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2844 { 2864 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2866 scr_soft_reset ();
2847 2867
2848 static const int pm_h[] = { 7, 25 }; 2868 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2870
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2853 } 2873 }
2854 break; 2874 break;
2855 } 2875 }
2856 2876
2857 return; 2877 return;
… …
3095 { 3115 {
3096 /* 3116 /*
3097 * commands 3117 * commands
3098 */ 3118 */
3099 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3120 XMapWindow (dpy, parent);
3101 break; 3121 break;
3102 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3124 break;
3105 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3127 break;
3108 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3130 break;
3111 case 5: /* raise window */ 3131 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3132 XRaiseWindow (dpy, parent);
3113 break; 3133 break;
3114 case 6: /* lower window */ 3134 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3135 XLowerWindow (dpy, parent);
3116 break; 3136 break;
3117 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3118 scr_touch (true); 3138 scr_touch (true);
3119 break; 3139 break;
3120 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3131 3151
3132 /* 3152 /*
3133 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3134 */ 3154 */
3135 case 11: /* report window state */ 3155 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3158 break;
3139 case 13: /* report window position */ 3159 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3165 break;
3146 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3169 break;
3150 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3172 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3175 break;
3156 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3157 { 3177 {
3158 char *s; 3178 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3160 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 */
3161 XFree (s); 3181 XFree (s);
3162 } 3182 }
3163 break; 3183 break;
3164 case 21: /* report window title */ 3184 case 21: /* report window title */
3165 { 3185 {
3166 char *s; 3186 char *s;
3167 XFetchName (dpy, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3168 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 */
3169 XFree (s); 3189 XFree (s);
3170 } 3190 }
3171 break; 3191 break;
3172 } 3192 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3249 */
3230void 3250void
3231rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3232{ 3252{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3253 /*
3237 * Not handled yet 3254 * Not handled yet
3238 */ 3255 */
3256
3257 unicode_t eh;
3239 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3240 if (s) 3259 if (s)
3241 free (s); 3260 free (s);
3242 3261
3243 return; 3262 return;
3244} 3263}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3268 */
3250void 3269void
3251rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3252{ 3271{
3253 unicode_t ch, eh;
3254 int arg; 3272 int arg;
3255 3273
3256 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3259 3277
3260 if (ch == ';') 3278 if (ch == ';')
3261 { 3279 {
3280 unicode_t eh;
3262 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3263 3282
3264 if (s) 3283 if (s)
3265 { 3284 {
3266 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3327 unsigned long bytes_after; 3346 unsigned long bytes_after;
3328 unsigned char *value = 0; 3347 unsigned char *value = 0;
3329 const char *str = ""; 3348 const char *str = "";
3330 3349
3331 if (prop 3350 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3355 && actual_type != None
3337 && actual_format == 8) 3356 && actual_format == 8)
… …
3349 { 3368 {
3350 *eq = 0; 3369 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3352 } 3371 }
3353 else 3372 else
3354 XDeleteProperty (dpy, parent[0], 3373 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3374 display->atom (str));
3356 } 3375 }
3357 break; 3376 break;
3358 3377
3359 case XTerm_Color: 3378 case XTerm_Color:
… …
3391 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3392 break; 3411 break;
3393 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3394 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3395 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3396#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3397 case XTerm_Color_RV:
3398 process_color_seq (op, Color_RV, str, resp);
3399 break;
3400 case Rxvt_Color_BD:
3401 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3402 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3403 break; 3426 break;
3404 case Rxvt_Color_UL:
3405 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3406 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3407 break; 3429 break;
3408 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3409 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
… …
3417 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3418 { 3440 {
3419 bool changed = false; 3441 bool changed = false;
3420 3442
3421 if (ISSET_PIXCOLOR (Color_tint)) 3443 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3444 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3425 3445
3426 if (changed) 3446 if (changed)
3427 update_background (); 3447 update_background ();
3428 } 3448 }
3429 3449
… …
3435 if (!strcmp (str, "?")) 3455 if (!strcmp (str, "?"))
3436 { 3456 {
3437 char str[256]; 3457 char str[256];
3438 3458
3439 sprintf (str, "[%dx%d+%d+%d]", 3459 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3460 min (h_scale, 32767), min (v_scale, 32767),
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3461 min (h_align, 32767), min (v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3462 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3463 }
3444 else 3464 else
3445 { 3465 {
3446 int changed = 0; 3466 int changed = 0;
3447 3467
3448 if (*str != ';') 3468 if (*str != ';')
3449 { 3469 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3470 if (bg_set_file (str)) /* change pixmap */
3471 {
3453 changed++; 3472 changed++;
3454 str = strchr (str, ';'); 3473 str = strchr (str, ';');
3455 if (str == NULL) 3474 if (str == NULL)
3456 bgPixmap.set_defaultGeometry (); 3475 bg_set_default_geometry ();
3476 else
3477 bg_set_geometry (str+1);
3478 }
3457 } 3479 }
3458 3480 else
3459 while (str)
3460 { 3481 {
3461 str++; 3482 str++;
3462 if (bgPixmap.set_geometry (str)) 3483 if (bg_set_geometry (str, true))
3463 changed++; 3484 changed++;
3464 str = strchr (str, ';');
3465 } 3485 }
3466 3486
3467 if (changed) 3487 if (changed)
3488 {
3489 if (bg_window_position_sensitive ())
3490 {
3491 int x, y;
3492 get_window_origin (x, y);
3493 bg_set_position (x, y);
3494 }
3468 update_background (); 3495 update_background ();
3496 }
3469 } 3497 }
3470 break; 3498 break;
3471#endif 3499#endif
3472 3500
3473 case XTerm_logfile: 3501 case XTerm_logfile:
… …
3576 { 3604 {
3577 if (mode == 'r') 3605 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3607 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609
3581 set_privmode (bit, state); 3610 set_privmode (bit, state);
3582 } 3611 }
3583 3612
3584 return state; 3613 return state;
3585} 3614}
… …
3604 { 6, PrivMode_relOrigin }, // DECOM 3633 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, // DECAWM 3634 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, auto-repeat keys // DECARM 3635 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3636 { 9, PrivMode_MouseX10 },
3608 // 18 end FF to printer after print screen 3637 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region 3638 // 19 Print screen prints full screen/scroll region
3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3642#endif
3614 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3623 { 67, PrivMode_BackSpace }, // DECBKM 3652 { 67, PrivMode_BackSpace }, // DECBKM
3624#endif 3653#endif
3625 { 1000, PrivMode_MouseX11 }, 3654 { 1000, PrivMode_MouseX11 },
3626 { 1002, PrivMode_MouseBtnEvent }, 3655 { 1002, PrivMode_MouseBtnEvent },
3627 { 1003, PrivMode_MouseAnyEvent }, 3656 { 1003, PrivMode_MouseAnyEvent },
3657#if ENABLE_FRILLS
3658 { 1005, PrivMode_ExtModeMouse },
3659#endif
3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3629 { 1011, PrivMode_Keypress }, // rxvt extension 3661 { 1011, PrivMode_Keypress }, // rxvt extension
3662#if ENABLE_FRILLS
3663 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3664#endif
3630 // 1035 enable modifiers for alt, numlock NYI 3665 // 1035 enable modifiers for alt, numlock NYI
3631 // 1036 send ESC for meta keys NYI 3666 // 1036 send ESC for meta keys NYI
3632 // 1037 send DEL for keypad delete NYI 3667 // 1037 send DEL for keypad delete NYI
3633 { 1047, PrivMode_Screen }, 3668 { 1047, PrivMode_Screen },
3634 // 1048 save and restore cursor 3669 // 1048 save and restore cursor, implemented in code
3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3670 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3671 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste }, 3672 { 2004, PrivMode_BracketPaste },
3638 }; 3673 };
3639 3674
… …
3649 for (i = 0; i < nargs; i++) 3684 for (i = 0; i < nargs; i++)
3650 { 3685 {
3651 state = -1; 3686 state = -1;
3652 3687
3653 /* basic handling */ 3688 /* basic handling */
3654 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3655 if (argtopriv[j].argval == arg[i]) 3690 if (argtopriv[j].argval == arg[i])
3656 { 3691 {
3657 state = privcases (mode, argtopriv[j].bit); 3692 state = privcases (mode, argtopriv[j].bit);
3658 break; 3693 break;
3659 } 3694 }
… …
3737 case 1003: 3772 case 1003:
3738 if (state) 3773 if (state)
3739 { 3774 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3775 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3776 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3777 mouse_row = mouse_col = 0;
3742 vt_emask_mouse = PointerMotionMask; 3778 vt_emask_mouse = PointerMotionMask;
3743 } 3779 }
3744 else 3780 else
3745 vt_emask_mouse = NoEventMask; 3781 vt_emask_mouse = NoEventMask;
3746 3782
… …
3931 } 3967 }
3932 } 3968 }
3933} 3969}
3934/*}}} */ 3970/*}}} */
3935 3971
3936/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3937void
3938rxvt_term::process_graphics ()
3939{
3940 unicode_t ch, cmd = cmd_getc ();
3941
3942 if (cmd == 'Q')
3943 {
3944 /* query graphics */
3945 tt_printf ("\033G0\012"); /* no graphics */
3946 return;
3947 }
3948 /* swallow other graphics sequences until terminating ':' */
3949 do
3950 ch = cmd_getc ();
3951 while (ch != ':');
3952}
3953/*}}} */
3954
3955/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
3956 3973
3957/* 3974/*
3958 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
3972 3989
3973/* ---------------------------------------------------------------------- */ 3990/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 3991/* Write data to the pty as typed by the user, pasted with the mouse,
3975 * or generated by us in response to a query ESC sequence. 3992 * or generated by us in response to a query ESC sequence.
3976 */ 3993 */
3977const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3978 3995
3979void 3996void
3980rxvt_term::tt_write (const char *data, unsigned int len) 3997rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 3998{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3999 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3987 4004
3988 if (v_buflen == 0) 4005 if (v_buflen == 0)
3989 { 4006 {
3990 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));
3991 4008
4009 max_it (written, 0);
4010
3992 if ((unsigned int)written == len) 4011 if (written == len)
3993 return; 4012 return;
3994 4013
3995 data += written; 4014 data += written;
3996 len -= written; 4015 len -= written;
3997 } 4016 }
3998 4017
3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4018 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4000 4019
4001 memcpy (v_buffer + v_buflen, data, len); 4020 memcpy (v_buffer + v_buflen, data, len);
4002 v_buflen += len; 4021 v_buflen += len;
4003 4022
4004 pty_ev.set (ev::READ | ev::WRITE); 4023 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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