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.486 by sf-exg, Fri Apr 29 13:29:45 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
… …
257#endif 257#endif
258 258
259void 259void
260rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
261{ 261{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 263
267 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
268 { 265 {
269 char mb[16]; 266 char mb[MB_LEN_MAX];
270 int len; 267 int len;
271 268
272 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
275 else 272 else
276 { 273 {
277 mb[0] = ch[0]; 274 mb[0] = ch;
278 len = 1; 275 len = 1;
279 } 276 }
280 277
281 if (len > 0) 278 if (len > 0)
282 tt_write (mb, len); 279 tt_write (mb, len);
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 645 unsigned int newlen = 1;
651 646
652 if (ev.state & ModNumLockMask) 647 if (ev.state & ModNumLockMask)
653 kp = false; 648 kp = false;
649
654 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
655 { 653 {
656#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace: 655 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
659 { 657 {
… …
886 commit_iso14755 (); 884 commit_iso14755 ();
887 885
888 return; 886 return;
889 } 887 }
890 888
891 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
892 if (i[0] == keysym) 890 if (i[0] == keysym)
893 { 891 {
894 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
895 commit_iso14755 (); 893 commit_iso14755 ();
896 894
… …
933 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
934 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
935#endif 933#endif
936} 934}
937 935
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 936void
972rxvt_term::flush () 937rxvt_term::flush ()
973{ 938{
974 flush_ev.stop (); 939 flush_ev.stop ();
975 940
976#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
977 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
978 { 943 {
979// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
980 scr_touch (false); 945 scr_touch (false);
981 } 946 }
982#endif 947#endif
983 948
984 if (want_refresh) 949 if (want_refresh)
… …
1149 { 1114 {
1150 } 1115 }
1151} event_handler; 1116} event_handler;
1152#endif 1117#endif
1153 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1154bool 1152bool
1155rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1156{ 1154{
1157 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1158 1156
1159 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1160 { 1158
1161 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1162 n = 0;
1163 } 1160 {
1164 1161 // 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; 1162 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1168 1166
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1168
1171 if (r > 0) 1169 if (r > 0)
1172 { 1170 {
1173 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1174 return true; 1172 return true;
… …
1248{ 1246{
1249 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1250 int x, y; 1248 int x, y;
1251 int code = 32; 1249 int code = 32;
1252 1250
1253 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1254 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1255 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1256 { 1255 {
1257 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1258 return; 1257 return;
1258
1259 mouse_row = x; 1259 mouse_row = x;
1260 mouse_col = y; 1260 mouse_col = y;
1261 code += 32; 1261 code += 32;
1262 } 1262 }
1263 1263
… …
1266 else 1266 else
1267 { 1267 {
1268 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1270 if (button_number >= 3) 1270 if (button_number >= 3)
1271 button_number += (64 - 3); 1271 button_number += 64 - 3;
1272 } 1272 }
1273 1273
1274 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1275 { 1275 {
1276 /* 1276 /*
… …
1308 fputc ('A', stderr); 1308 fputc ('A', stderr);
1309 if (key_state & 32) 1309 if (key_state & 32)
1310 fputc ('2', stderr); 1310 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1312 button_number,
1313 x + 1, 1313 x,
1314 y + 1); 1314 y);
1315#endif 1315#endif
1316 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1317 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1331 code + button_number + key_state,
1319 (32 + x + 1), 1332 32 + x,
1320 (32 + y + 1)); 1333 32 + y);
1321} 1334}
1322 1335
1323/*{{{ process an X event */ 1336/*{{{ process an X event */
1324void 1337void
1325rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1427 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1441 focus_out ();
1429 break; 1442 break;
1430 1443
1431 case ConfigureNotify: 1444 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]) 1445 if (ev.xconfigure.window == parent)
1436 { 1446 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1439 1468
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1470 {
1442 seen_resize = 1; 1471 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1473 }
1445 else 1474 else
1446 { 1475 {
1447#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1449 { 1478 {
1450 if (mapped) 1479 if (mapped)
1451 update_background (); 1480 update_background ();
1452 else 1481 else
1453 bgPixmap.invalidate (); 1482 bg_invalidate ();
1454 } 1483 }
1455#endif 1484#endif
1456 } 1485 }
1457 1486
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1488 }
1460 break; 1489 break;
1461 1490
1462 case PropertyNotify: 1491 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 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; 1493 break;
1469 1494
1470 case SelectionClear: 1495 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1497 break;
1473 1498
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: 1499 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1481 break; 1501 break;
1482 1502
1483 case MapNotify: 1503 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a 1505 /* 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 1506 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1489 * reparenting. 1509 * reparenting.
1490 * We should not render background immidiately, as there could be several 1510 * 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 1511 * 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 1512 * by scheduling background redraw as soon as we can, but giving a short
1493 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
1496 */ 1516 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1517 if (!(bg_flags & BG_IS_VALID))
1498 update_background_ev.start (0.025); 1518 update_background_ev.start (0.025);
1499#endif 1519#endif
1500 mapped = 1; 1520 mapped = 1;
1501#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1522 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1518 { 1538 {
1519 do 1539 do
1520 { 1540 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1543 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1545
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1547
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1549 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1552 }
1533 1553
1534 want_refresh = 1; 1554 want_refresh = 1;
1535 } 1555 }
1536 else 1556 else
… …
1696rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1697{ 1717{
1698 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1699 return; 1719 return;
1700 1720
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1722 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1725 urgency_hint = enable;
1706 } 1726 }
1707} 1727}
1708#endif 1728#endif
1709 1729
… …
1817 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1818 */ 1838 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1841 {
1822 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1823 update_background (); 1843 update_background ();
1824 } 1844 }
1825 1845
1826 break; 1846 break;
1827 } 1847 }
… …
1866 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1867 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1869 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1870 { 1890 {
1871 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1872 MEvent.clicks++; 1892 MEvent.clicks++;
1873 1893
1874 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1875 { 1895 {
1876 /* only report double clicks */ 1896 /* only report double clicks */
… …
2147 selection_make (ev.time); 2167 selection_make (ev.time);
2148 break; 2168 break;
2149 2169
2150 case Button2: 2170 case Button2:
2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 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); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2173 break;
2154 2174
2155#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2156 case Button4: 2176 case Button4:
2157 case Button5: 2177 case Button5:
… …
2364 : NOCHAR; 2384 : NOCHAR;
2365} 2385}
2366 2386
2367static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2368 2388
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 2389wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2391{
2377 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2378 2393
… …
2471 pclose_printer (fd); 2486 pclose_printer (fd);
2472} 2487}
2473#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2474/*}}} */ 2489/*}}} */
2475 2490
2476/* *INDENT-OFF* */
2477enum { 2491enum {
2478 C1_40 = 0x40, 2492 C1_40 = 0x40,
2479 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2480 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2481 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2482 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2483}; 2497};
2484/* *INDENT-ON* */
2485 2498
2486/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2487void 2500void
2488rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2489{ 2502{
… …
2660 2673
2661 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2663 { 2676 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2678 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2666 } 2679 }
2667 break; 2680 break;
2668 2681
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
2671 process_graphics (); 2684 // used by original rxvt for rob nations own graphics mode
2685 if (cmd_getc () == 'Q')
2686 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2672 break; 2687 break;
2673 2688
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2691 scr_set_tab (1);
… …
2726 } 2741 }
2727} 2742}
2728/*}}} */ 2743/*}}} */
2729 2744
2730/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2731/* *INDENT-OFF* */
2732enum { 2746enum {
2733 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2734 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2735 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2736 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 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 , 2754 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 2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2756};
2743 2757
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2758#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2761#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2762 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2763
2750const unsigned char csi_defaults[] = 2764static const unsigned char csi_defaults[] =
2751 { 2765 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2766 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, */ 2767 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, */ 2768 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, [, \, ], ^, _, */ 2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2756 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2757 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2758 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2759 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2760 }; 2774 };
2761/* *INDENT-ON* */
2762 2775
2763void 2776void
2764rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2765{ 2778{
2766 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
2844 { 2857 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2858 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2859 scr_soft_reset ();
2847 2860
2848 static const int pm_h[] = { 7, 25 }; 2861 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2863
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2864 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); 2865 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2853 } 2866 }
2854 break; 2867 break;
2855 } 2868 }
2856 2869
2857 return; 2870 return;
… …
3076 } 3089 }
3077} 3090}
3078/*}}} */ 3091/*}}} */
3079 3092
3080#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3094void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3096{
3085 int x, y; 3097 int x, y;
3086 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3095 { 3107 {
3096 /* 3108 /*
3097 * commands 3109 * commands
3098 */ 3110 */
3099 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3112 XMapWindow (dpy, parent);
3101 break; 3113 break;
3102 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3116 break;
3105 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3119 break;
3108 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3122 break;
3111 case 5: /* raise window */ 3123 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3124 XRaiseWindow (dpy, parent);
3113 break; 3125 break;
3114 case 6: /* lower window */ 3126 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3127 XLowerWindow (dpy, parent);
3116 break; 3128 break;
3117 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3118 scr_touch (true); 3130 scr_touch (true);
3119 break; 3131 break;
3120 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3131 3143
3132 /* 3144 /*
3133 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3134 */ 3146 */
3135 case 11: /* report window state */ 3147 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3150 break;
3139 case 13: /* report window position */ 3151 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3157 break;
3146 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3161 break;
3150 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3164 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3167 break;
3156 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3157 { 3169 {
3158 char *s; 3170 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3173 XFree (s);
3162 } 3174 }
3163 break; 3175 break;
3164 case 21: /* report window title */ 3176 case 21: /* report window title */
3165 { 3177 {
3166 char *s; 3178 char *s;
3167 XFetchName (dpy, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3168 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 */
3169 XFree (s); 3181 XFree (s);
3170 } 3182 }
3171 break; 3183 break;
3172 } 3184 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3240 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3241 */
3230void 3242void
3231rxvt_term::process_dcs_seq () 3243rxvt_term::process_dcs_seq ()
3232{ 3244{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3245 /*
3237 * Not handled yet 3246 * Not handled yet
3238 */ 3247 */
3248
3249 unicode_t eh;
3239 s = get_to_st (eh); 3250 char *s = get_to_st (eh);
3240 if (s) 3251 if (s)
3241 free (s); 3252 free (s);
3242 3253
3243 return; 3254 return;
3244} 3255}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3259 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3260 */
3250void 3261void
3251rxvt_term::process_osc_seq () 3262rxvt_term::process_osc_seq ()
3252{ 3263{
3253 unicode_t ch, eh;
3254 int arg; 3264 int arg;
3255 3265
3256 ch = cmd_getc (); 3266 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3267 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3268 arg = arg * 10 + (ch - '0');
3259 3269
3260 if (ch == ';') 3270 if (ch == ';')
3261 { 3271 {
3272 unicode_t eh;
3262 char *s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3263 3274
3264 if (s) 3275 if (s)
3265 { 3276 {
3266 process_xterm_seq (arg, s, eh); 3277 process_xterm_seq (arg, s, eh);
… …
3327 unsigned long bytes_after; 3338 unsigned long bytes_after;
3328 unsigned char *value = 0; 3339 unsigned char *value = 0;
3329 const char *str = ""; 3340 const char *str = "";
3330 3341
3331 if (prop 3342 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3347 && actual_type != None
3337 && actual_format == 8) 3348 && actual_format == 8)
… …
3349 { 3360 {
3350 *eq = 0; 3361 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3352 } 3363 }
3353 else 3364 else
3354 XDeleteProperty (dpy, parent[0], 3365 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3366 display->atom (str));
3356 } 3367 }
3357 break; 3368 break;
3358 3369
3359 case XTerm_Color: 3370 case XTerm_Color:
… …
3391 process_color_seq (op, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3392 break; 3403 break;
3393 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3394 process_color_seq (op, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3395 break; 3406 break;
3407#ifdef OPTION_HC
3408 case XTerm_Color_HC:
3409 process_color_seq (op, Color_HC, str, resp);
3410 break;
3411 case XTerm_Color_HTC:
3412 process_color_seq (op, Color_HTC, str, resp);
3413 break;
3414#endif
3396#ifndef NO_BOLD_UNDERLINE_REVERSE 3415#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: 3416 case URxvt_Color_BD:
3402 process_color_seq (op, Color_BD, str, resp); 3417 process_color_seq (op, Color_BD, str, resp);
3403 break; 3418 break;
3404 case Rxvt_Color_UL:
3405 case URxvt_Color_UL: 3419 case URxvt_Color_UL:
3406 process_color_seq (op, Color_UL, str, resp); 3420 process_color_seq (op, Color_UL, str, resp);
3407 break; 3421 break;
3408 case URxvt_Color_IT: 3422 case URxvt_Color_IT:
3409 process_color_seq (op, Color_IT, str, resp); 3423 process_color_seq (op, Color_IT, str, resp);
… …
3417 process_color_seq (op, Color_tint, str, resp); 3431 process_color_seq (op, Color_tint, str, resp);
3418 { 3432 {
3419 bool changed = false; 3433 bool changed = false;
3420 3434
3421 if (ISSET_PIXCOLOR (Color_tint)) 3435 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3436 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3425 3437
3426 if (changed) 3438 if (changed)
3427 update_background (); 3439 update_background ();
3428 } 3440 }
3429 3441
… …
3435 if (!strcmp (str, "?")) 3447 if (!strcmp (str, "?"))
3436 { 3448 {
3437 char str[256]; 3449 char str[256];
3438 3450
3439 sprintf (str, "[%dx%d+%d+%d]", 3451 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3452 min (h_scale, 32767), min (v_scale, 32767),
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3453 min (h_align, 32767), min (v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3455 }
3444 else 3456 else
3445 { 3457 {
3446 int changed = 0; 3458 int changed = 0;
3447 3459
3448 if (*str != ';') 3460 if (*str != ';')
3449 { 3461 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3462 if (bg_set_file (str)) /* change pixmap */
3463 {
3453 changed++; 3464 changed++;
3454 str = strchr (str, ';'); 3465 str = strchr (str, ';');
3455 if (str == NULL) 3466 if (str == NULL)
3456 bgPixmap.set_defaultGeometry (); 3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3470 }
3457 } 3471 }
3458 3472 else
3459 while (str)
3460 { 3473 {
3461 str++; 3474 str++;
3462 if (bgPixmap.set_geometry (str)) 3475 if (bg_set_geometry (str, true))
3463 changed++; 3476 changed++;
3464 str = strchr (str, ';');
3465 } 3477 }
3466 3478
3467 if (changed) 3479 if (changed)
3480 {
3481 if (bg_window_position_sensitive ())
3482 {
3483 int x, y;
3484 get_window_origin (x, y);
3485 bg_set_position (x, y);
3486 }
3468 update_background (); 3487 update_background ();
3488 }
3469 } 3489 }
3470 break; 3490 break;
3471#endif 3491#endif
3472 3492
3473 case XTerm_logfile: 3493 case XTerm_logfile:
… …
3576 { 3596 {
3577 if (mode == 'r') 3597 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3599 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3600 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3601
3581 set_privmode (bit, state); 3602 set_privmode (bit, state);
3582 } 3603 }
3583 3604
3584 return state; 3605 return state;
3585} 3606}
… …
3604 { 6, PrivMode_relOrigin }, // DECOM 3625 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, // DECAWM 3626 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, auto-repeat keys // DECARM 3627 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3608 // 18 end FF to printer after print screen 3629 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region 3630 // 19 Print screen prints full screen/scroll region
3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3631 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3634#endif
3614 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3623 { 67, PrivMode_BackSpace }, // DECBKM 3644 { 67, PrivMode_BackSpace }, // DECBKM
3624#endif 3645#endif
3625 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
3626 { 1002, PrivMode_MouseBtnEvent }, 3647 { 1002, PrivMode_MouseBtnEvent },
3627 { 1003, PrivMode_MouseAnyEvent }, 3648 { 1003, PrivMode_MouseAnyEvent },
3649#if ENABLE_FRILLS
3650 { 1005, PrivMode_ExtModeMouse },
3651#endif
3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3652 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3629 { 1011, PrivMode_Keypress }, // rxvt extension 3653 { 1011, PrivMode_Keypress }, // rxvt extension
3654#if ENABLE_FRILLS
3655 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3656#endif
3630 // 1035 enable modifiers for alt, numlock NYI 3657 // 1035 enable modifiers for alt, numlock NYI
3631 // 1036 send ESC for meta keys NYI 3658 // 1036 send ESC for meta keys NYI
3632 // 1037 send DEL for keypad delete NYI 3659 // 1037 send DEL for keypad delete NYI
3633 { 1047, PrivMode_Screen }, 3660 { 1047, PrivMode_Screen },
3634 // 1048 save and restore cursor 3661 // 1048 save and restore cursor, implemented in code
3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3662 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3663 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste }, 3664 { 2004, PrivMode_BracketPaste },
3638 }; 3665 };
3639 3666
… …
3649 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
3650 { 3677 {
3651 state = -1; 3678 state = -1;
3652 3679
3653 /* basic handling */ 3680 /* basic handling */
3654 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3681 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3655 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
3656 { 3683 {
3657 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
3658 break; 3685 break;
3659 } 3686 }
… …
3737 case 1003: 3764 case 1003:
3738 if (state) 3765 if (state)
3739 { 3766 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3767 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3768 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3769 mouse_row = mouse_col = 0;
3742 vt_emask_mouse = PointerMotionMask; 3770 vt_emask_mouse = PointerMotionMask;
3743 } 3771 }
3744 else 3772 else
3745 vt_emask_mouse = NoEventMask; 3773 vt_emask_mouse = NoEventMask;
3746 3774
… …
3931 } 3959 }
3932 } 3960 }
3933} 3961}
3934/*}}} */ 3962/*}}} */
3935 3963
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/* ------------------------------------------------------------------------- */ 3964/* ------------------------------------------------------------------------- */
3956 3965
3957/* 3966/*
3958 * Send printf () formatted output to the command. 3967 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 3968 * Only use for small amounts of data.
… …
3972 3981
3973/* ---------------------------------------------------------------------- */ 3982/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 3983/* 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. 3984 * or generated by us in response to a query ESC sequence.
3976 */ 3985 */
3977const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3986static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3978 3987
3979void 3988void
3980rxvt_term::tt_write (const char *data, unsigned int len) 3989rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 3990{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3991 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3987 3996
3988 if (v_buflen == 0) 3997 if (v_buflen == 0)
3989 { 3998 {
3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3999 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3991 4000
4001 max_it (written, 0);
4002
3992 if ((unsigned int)written == len) 4003 if (written == len)
3993 return; 4004 return;
3994 4005
3995 data += written; 4006 data += written;
3996 len -= written; 4007 len -= written;
3997 } 4008 }
3998 4009
3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4010 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4000 4011
4001 memcpy (v_buffer + v_buflen, data, len); 4012 memcpy (v_buffer + v_buflen, data, len);
4002 v_buflen += len; 4013 v_buflen += len;
4003 4014
4004 pty_ev.set (ev::READ | ev::WRITE); 4015 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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