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.451 by root, Sun May 23 00:37:19 2010 UTC vs.
Revision 1.489 by sf-exg, Sat Jul 9 13:40:13 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 }
… …
889 commit_iso14755 (); 884 commit_iso14755 ();
890 885
891 return; 886 return;
892 } 887 }
893 888
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 890 if (i[0] == keysym)
896 { 891 {
897 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 893 commit_iso14755 ();
899 894
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
938#endif 933#endif
939} 934}
940 935
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 936void
975rxvt_term::flush () 937rxvt_term::flush ()
976{ 938{
977 flush_ev.stop (); 939 flush_ev.stop ();
978 940
979#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
981 { 943 {
982// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 945 scr_touch (false);
984 } 946 }
985#endif 947#endif
986 948
987 if (want_refresh) 949 if (want_refresh)
… …
1025 } 987 }
1026 988
1027 scr_refresh (); 989 scr_refresh ();
1028 scrollBar.show (1); 990 scrollBar.show (1);
1029#ifdef USE_XIM 991#ifdef USE_XIM
1030 IMSendSpot (); 992 im_send_spot ();
1031#endif 993#endif
1032 } 994 }
1033 995
1034 display->flush (); 996 display->flush ();
1035} 997}
… …
1152 { 1114 {
1153 } 1115 }
1154} event_handler; 1116} event_handler;
1155#endif 1117#endif
1156 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
1157bool 1152bool
1158rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1159{ 1154{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1161 1156
1162 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1158
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1165 n = 0;
1166 } 1160 {
1167 1161 // 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; 1162 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1171 1166
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1168
1174 if (r > 0) 1169 if (r > 0)
1175 { 1170 {
1176 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1177 return true; 1172 return true;
… …
1251{ 1246{
1252 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1253 int x, y; 1248 int x, y;
1254 int code = 32; 1249 int code = 32;
1255 1250
1256 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1258 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1259 { 1255 {
1260 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1261 return; 1257 return;
1258
1262 mouse_row = x; 1259 mouse_row = x;
1263 mouse_col = y; 1260 mouse_col = y;
1264 code += 32; 1261 code += 32;
1265 } 1262 }
1266 1263
… …
1269 else 1266 else
1270 { 1267 {
1271 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1270 if (button_number >= 3)
1274 button_number += (64 - 3); 1271 button_number += 64 - 3;
1275 } 1272 }
1276 1273
1277 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1278 { 1275 {
1279 /* 1276 /*
… …
1311 fputc ('A', stderr); 1308 fputc ('A', stderr);
1312 if (key_state & 32) 1309 if (key_state & 32)
1313 fputc ('2', stderr); 1310 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1312 button_number,
1316 x + 1, 1313 x,
1317 y + 1); 1314 y);
1318#endif 1315#endif
1319 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
1320 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1331 code + button_number + key_state,
1322 (32 + x + 1), 1332 32 + x,
1323 (32 + y + 1)); 1333 32 + y);
1324} 1334}
1325 1335
1326/*{{{ process an X event */ 1336/*{{{ process an X event */
1327void 1337void
1328rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1441 focus_out ();
1432 break; 1442 break;
1433 1443
1434 case ConfigureNotify: 1444 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1439 { 1446 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 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
1442 1468
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1470 {
1445 seen_resize = 1; 1471 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1473 }
1448 else 1474 else
1449 { 1475 {
1450#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1452 { 1478 {
1453 if (mapped) 1479 if (mapped)
1454 update_background (); 1480 update_background ();
1455 else 1481 else
1456 bgPixmap.invalidate (); 1482 bg_invalidate ();
1457 } 1483 }
1458#endif 1484#endif
1459 } 1485 }
1460 1486
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1488 }
1463 break; 1489 break;
1464 1490
1465 case PropertyNotify: 1491 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break; 1493 break;
1472 1494
1473 case SelectionClear: 1495 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1497 break;
1476 1498
1477 case SelectionNotify:
1478 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break;
1481
1482 case SelectionRequest: 1499 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1484 break; 1501 break;
1485 1502
1486 case MapNotify: 1503 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1488 /* 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
1489 * non-reparenting window manager. In those cases we never get first 1506 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1509 * reparenting.
1493 * We should not render background immidiately, as there could be several 1510 * We should not render background immediately, as there could be several
1494 * 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
1495 * 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
1496 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1497 * 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
1498 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
1499 */ 1516 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1517 if (!(bg_flags & BG_IS_VALID))
1501 update_background_ev.start (0.025); 1518 update_background_ev.start (0.025);
1502#endif 1519#endif
1503 mapped = 1; 1520 mapped = 1;
1504#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1522 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1521 { 1538 {
1522 do 1539 do
1523 { 1540 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1543 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1545
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1547
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1549 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1552 }
1536 1553
1537 want_refresh = 1; 1554 want_refresh = 1;
1538 } 1555 }
1539 else 1556 else
… …
1699rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1700{ 1717{
1701 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1702 return; 1719 return;
1703 1720
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1705 { 1722 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent, h);
1708 urgency_hint = enable; 1725 urgency_hint = enable;
1709 } 1726 }
1710} 1727}
1711#endif 1728#endif
1712 1729
… …
1719 want_refresh = 1; 1736 want_refresh = 1;
1720 1737
1721#if USE_XIM 1738#if USE_XIM
1722 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1723 { 1740 {
1724 IMSetPosition (); 1741 im_set_position ();
1725 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1726 } 1743 }
1727#endif 1744#endif
1728#if CURSOR_BLINK 1745#if CURSOR_BLINK
1729 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
1820 * 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.
1821 */ 1838 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1841 {
1825 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1826 update_background (); 1843 update_background ();
1827 } 1844 }
1828 1845
1829 break; 1846 break;
1830 } 1847 }
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1873 { 1890 {
1874 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1875 MEvent.clicks++; 1892 MEvent.clicks++;
1876 1893
1877 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1878 { 1895 {
1879 /* only report double clicks */ 1896 /* only report double clicks */
… …
2202 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2203 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2204 2221
2205 for (;;) 2222 for (;;)
2206 { 2223 {
2207 if (expect_false (ch == NOCHAR)) 2224 if (ecb_unlikely (ch == NOCHAR))
2208 { 2225 {
2209 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2210 ch = next_char (); 2227 ch = next_char ();
2211 2228
2212 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2213 break; 2230 break;
2214 } 2231 }
2215 2232
2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2217 { 2234 {
2218 if (expect_false (!seen_input)) 2235 if (ecb_unlikely (!seen_input))
2219 { 2236 {
2220 seen_input = 1; 2237 seen_input = 1;
2221 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2222 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2223 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2236 wchar_t *str = buf; 2253 wchar_t *str = buf;
2237 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2238 2255
2239 for (;;) 2256 for (;;)
2240 { 2257 {
2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2242 break; 2259 break;
2243 2260
2244 *str++ = ch; 2261 *str++ = ch;
2245 2262
2246 if (expect_false (ch == C0_LF || str >= eol)) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2247 { 2264 {
2248 if (ch == C0_LF) 2265 if (ch == C0_LF)
2249 nlines++; 2266 nlines++;
2250 2267
2251 refresh_count++; 2268 refresh_count++;
… …
2329rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2330{ 2347{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2349 {
2333 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2336 2353
2337 wchar_t wc; 2354 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339 2356
… …
2367 : NOCHAR; 2384 : NOCHAR;
2368} 2385}
2369 2386
2370static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2371 2388
2372/* rxvt_cmd_getc () - Return next input character */
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t 2389wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2391{
2380 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2381 2393
… …
2474 pclose_printer (fd); 2486 pclose_printer (fd);
2475} 2487}
2476#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2477/*}}} */ 2489/*}}} */
2478 2490
2479/* *INDENT-OFF* */
2480enum { 2491enum {
2481 C1_40 = 0x40, 2492 C1_40 = 0x40,
2482 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,
2483 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,
2484 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,
2485 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,
2486}; 2497};
2487/* *INDENT-ON* */
2488 2498
2489/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2490void 2500void
2491rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2492{ 2502{
… …
2614 return; 2624 return;
2615 } 2625 }
2616 2626
2617 switch (ch) 2627 switch (ch)
2618 { 2628 {
2619 /* case 1: do_tek_mode (); break; */
2620 case '#': 2629 case '#':
2621 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2622 scr_E (); 2631 scr_E ();
2623 break; 2632 break;
2624 case '(': 2633 case '(':
… …
2663 2672
2664 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2666 { 2675 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2669 } 2678 }
2670 break; 2679 break;
2671 2680
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2674 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2675 break; 2686 break;
2676 2687
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2683 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2684 scr_index (DN); 2695 scr_index (DN);
2685 break; 2696 break;
2686 2697
2687 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2688 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2689 2700
2690 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2691 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2692 2703
2693 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2694 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2695 process_dcs_seq (); 2706 process_dcs_seq ();
2696 break; 2707 break;
… …
2729 } 2740 }
2730} 2741}
2731/*}}} */ 2742/*}}} */
2732 2743
2733/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2734/* *INDENT-OFF* */
2735enum { 2745enum {
2736 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2737 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2738 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2739 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2743 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2744 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2755};
2746 2756
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2762
2753const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2754 { 2764 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2759 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2760 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2761 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2762 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2763 }; 2773 };
2764/* *INDENT-ON* */
2765 2774
2766void 2775void
2767rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2768{ 2777{
2769 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2847 { 2856 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2858 scr_soft_reset ();
2850 2859
2851 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2862
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2856 } 2865 }
2857 break; 2866 break;
2858 } 2867 }
2859 2868
2860 return; 2869 return;
… …
3079 } 3088 }
3080} 3089}
3081/*}}} */ 3090/*}}} */
3082 3091
3083#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3084/* ARGSUSED */
3085void 3093void
3086rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3087{ 3095{
3088 int x, y; 3096 int x, y;
3089 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3098 { 3106 {
3099 /* 3107 /*
3100 * commands 3108 * commands
3101 */ 3109 */
3102 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3103 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3104 break; 3112 break;
3105 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3106 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3107 break; 3115 break;
3108 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3109 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3110 break; 3118 break;
3111 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3113 break; 3121 break;
3114 case 5: /* raise window */ 3122 case 5: /* raise window */
3115 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3116 break; 3124 break;
3117 case 6: /* lower window */ 3125 case 6: /* lower window */
3118 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3119 break; 3127 break;
3120 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3121 scr_touch (true); 3129 scr_touch (true);
3122 break; 3130 break;
3123 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3134 3142
3135 /* 3143 /*
3136 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3137 */ 3145 */
3138 case 11: /* report window state */ 3146 case 11: /* report window state */
3139 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3141 break; 3149 break;
3142 case 13: /* report window position */ 3150 case 13: /* report window position */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3144 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3145 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3146 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3147 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3148 break; 3156 break;
3149 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3152 break; 3160 break;
3153 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break; 3163 break;
… …
3157 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3158 break; 3166 break;
3159 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3160 { 3168 {
3161 char *s; 3169 char *s;
3162 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3172 XFree (s);
3165 } 3173 }
3166 break; 3174 break;
3167 case 21: /* report window title */ 3175 case 21: /* report window title */
3168 { 3176 {
3169 char *s; 3177 char *s;
3170 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s); 3180 XFree (s);
3173 } 3181 }
3174 break; 3182 break;
3175 } 3183 }
… …
3329 unsigned long bytes_after; 3337 unsigned long bytes_after;
3330 unsigned char *value = 0; 3338 unsigned char *value = 0;
3331 const char *str = ""; 3339 const char *str = "";
3332 3340
3333 if (prop 3341 if (prop
3334 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3335 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3336 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3337 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3338 && actual_type != None 3346 && actual_type != None
3339 && actual_format == 8) 3347 && actual_format == 8)
… …
3351 { 3359 {
3352 *eq = 0; 3360 *eq = 0;
3353 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3354 } 3362 }
3355 else 3363 else
3356 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3357 display->atom (str)); 3365 display->atom (str));
3358 } 3366 }
3359 break; 3367 break;
3360 3368
3361 case XTerm_Color: 3369 case XTerm_Color:
… …
3422 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3423 { 3431 {
3424 bool changed = false; 3432 bool changed = false;
3425 3433
3426 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3430 3436
3431 if (changed) 3437 if (changed)
3432 update_background (); 3438 update_background ();
3433 } 3439 }
3434 3440
… …
3440 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3441 { 3447 {
3442 char str[256]; 3448 char str[256];
3443 3449
3444 sprintf (str, "[%dx%d+%d+%d]", 3450 sprintf (str, "[%dx%d+%d+%d]",
3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3447 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3448 } 3454 }
3449 else 3455 else
3450 { 3456 {
3451 int changed = 0; 3457 int changed = 0;
3452 3458
3453 if (*str != ';') 3459 if (*str != ';')
3454 { 3460 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3462 {
3458 changed++; 3463 changed++;
3459 str = strchr (str, ';'); 3464 str = strchr (str, ';');
3460 if (str == NULL) 3465 if (str == NULL)
3461 bgPixmap.set_defaultGeometry (); 3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3469 }
3462 } 3470 }
3463 3471 else
3464 while (str)
3465 { 3472 {
3466 str++; 3473 str++;
3467 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3468 changed++; 3475 changed++;
3469 str = strchr (str, ';');
3470 } 3476 }
3471 3477
3472 if (changed) 3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3473 update_background (); 3486 update_background ();
3487 }
3474 } 3488 }
3475 break; 3489 break;
3476#endif 3490#endif
3477 3491
3478 case XTerm_logfile: 3492 case XTerm_logfile:
… …
3590 return state; 3604 return state;
3591} 3605}
3592 3606
3593/* we're not using priv _yet_ */ 3607/* we're not using priv _yet_ */
3594void 3608void
3595rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3609rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3596{ 3610{
3597 unsigned int i, j; 3611 unsigned int i, j;
3598 int state; 3612 int state;
3599 3613
3600 static const struct 3614 static const struct
… …
3610 { 6, PrivMode_relOrigin }, // DECOM 3624 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, // DECAWM 3625 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, auto-repeat keys // DECARM 3626 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
3614 // 18 end FF to printer after print screen 3628 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region 3629 // 19 Print screen prints full screen/scroll region
3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3631#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3632 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3633#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3634 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3629 { 67, PrivMode_BackSpace }, // DECBKM 3643 { 67, PrivMode_BackSpace }, // DECBKM
3630#endif 3644#endif
3631 { 1000, PrivMode_MouseX11 }, 3645 { 1000, PrivMode_MouseX11 },
3632 { 1002, PrivMode_MouseBtnEvent }, 3646 { 1002, PrivMode_MouseBtnEvent },
3633 { 1003, PrivMode_MouseAnyEvent }, 3647 { 1003, PrivMode_MouseAnyEvent },
3648#if ENABLE_FRILLS
3649 { 1005, PrivMode_ExtModeMouse },
3650#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3652 { 1011, PrivMode_Keypress }, // rxvt extension
3653#if ENABLE_FRILLS
3654 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3655#endif
3636 // 1035 enable modifiers for alt, numlock NYI 3656 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3657 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3658 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3659 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3660 // 1048 save and restore cursor, implemented in code
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3661 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste }, 3663 { 2004, PrivMode_BracketPaste },
3644 }; 3664 };
3645 3665
… …
3655 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
3656 { 3676 {
3657 state = -1; 3677 state = -1;
3658 3678
3659 /* basic handling */ 3679 /* basic handling */
3660 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3680 for (j = 0; j < ecb_array_length (argtopriv); j++)
3661 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
3662 { 3682 {
3663 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
3664 break; 3684 break;
3665 } 3685 }
… …
3743 case 1003: 3763 case 1003:
3744 if (state) 3764 if (state)
3745 { 3765 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3766 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3767 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3768 mouse_row = mouse_col = 0;
3748 vt_emask_mouse = PointerMotionMask; 3769 vt_emask_mouse = PointerMotionMask;
3749 } 3770 }
3750 else 3771 else
3751 vt_emask_mouse = NoEventMask; 3772 vt_emask_mouse = NoEventMask;
3752 3773
… …
3937 } 3958 }
3938 } 3959 }
3939} 3960}
3940/*}}} */ 3961/*}}} */
3941 3962
3942/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3943void
3944rxvt_term::process_graphics ()
3945{
3946 unicode_t ch, cmd = cmd_getc ();
3947
3948 if (cmd == 'Q')
3949 {
3950 /* query graphics */
3951 tt_printf ("\033G0\012"); /* no graphics */
3952 return;
3953 }
3954 /* swallow other graphics sequences until terminating ':' */
3955 do
3956 ch = cmd_getc ();
3957 while (ch != ':');
3958}
3959/*}}} */
3960
3961/* ------------------------------------------------------------------------- */ 3963/* ------------------------------------------------------------------------- */
3962 3964
3963/* 3965/*
3964 * Send printf () formatted output to the command. 3966 * Send printf () formatted output to the command.
3965 * Only use for small amounts of data. 3967 * Only use for small amounts of data.
… …
3978 3980
3979/* ---------------------------------------------------------------------- */ 3981/* ---------------------------------------------------------------------- */
3980/* Write data to the pty as typed by the user, pasted with the mouse, 3982/* Write data to the pty as typed by the user, pasted with the mouse,
3981 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
3982 */ 3984 */
3983const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3984 3986
3985void 3987void
3986rxvt_term::tt_write (const char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
3987{ 3989{
3988 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3993 3995
3994 if (v_buflen == 0) 3996 if (v_buflen == 0)
3995 { 3997 {
3996 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3997 3999
4000 max_it (written, 0);
4001
3998 if ((unsigned int)written == len) 4002 if (written == len)
3999 return; 4003 return;
4000 4004
4001 data += written; 4005 data += written;
4002 len -= written; 4006 len -= written;
4003 } 4007 }
4004 4008
4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4009 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4006 4010
4007 memcpy (v_buffer + v_buflen, data, len); 4011 memcpy (v_buffer + v_buflen, data, len);
4008 v_buflen += len; 4012 v_buflen += len;
4009 4013
4010 pty_ev.set (ev::READ | ev::WRITE); 4014 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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