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.470 by sf-exg, Sun Jan 9 23:48:37 2011 UTC vs.
Revision 1.490 by sf-exg, Sat Jul 9 18:23:48 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 }
… …
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.flags & bgPixmap_t::hasChanged) 942 if (bg_flags & BG_NEEDS_REFRESH)
981 { 943 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 944 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 945 scr_touch (false);
985 } 946 }
986#endif 947#endif
987 948
988 if (want_refresh) 949 if (want_refresh)
… …
1026 } 987 }
1027 988
1028 scr_refresh (); 989 scr_refresh ();
1029 scrollBar.show (1); 990 scrollBar.show (1);
1030#ifdef USE_XIM 991#ifdef USE_XIM
1031 IMSendSpot (); 992 im_send_spot ();
1032#endif 993#endif
1033 } 994 }
1034 995
1035 display->flush (); 996 display->flush ();
1036} 997}
… …
1153 { 1114 {
1154 } 1115 }
1155} event_handler; 1116} event_handler;
1156#endif 1117#endif
1157 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
1158bool 1152bool
1159rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1160{ 1154{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1162 1156
1163 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1158
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1166 n = 0;
1167 } 1160 {
1168 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1172 1166
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1168
1175 if (r > 0) 1169 if (r > 0)
1176 { 1170 {
1177 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1178 return true; 1172 return true;
… …
1446 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1447 focus_out (); 1441 focus_out ();
1448 break; 1442 break;
1449 1443
1450 case ConfigureNotify: 1444 case ConfigureNotify:
1451 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1452 { 1446 {
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1448 ;
1455 1449
1456#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
1457 bool moved = false; 1451 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1452 if (bg_window_position_sensitive ())
1459 { 1453 {
1460 int x, y; 1454 int x, y;
1461 if (ev.xconfigure.send_event) 1455 if (ev.xconfigure.send_event)
1462 { 1456 {
1463 x = ev.xconfigure.x; 1457 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1458 y = ev.xconfigure.y;
1465 } 1459 }
1466 else 1460 else
1467 get_window_origin (x, y); 1461 get_window_origin (x, y);
1468 1462
1469 if (bgPixmap.set_position (x, y) 1463 if (bg_set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1464 || !(bg_flags & BG_IS_VALID))
1471 moved = true; 1465 moved = true;
1472 } 1466 }
1473#endif 1467#endif
1474 1468
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1483 if (moved) 1477 if (moved)
1484 { 1478 {
1485 if (mapped) 1479 if (mapped)
1486 update_background (); 1480 update_background ();
1487 else 1481 else
1488 bgPixmap.invalidate (); 1482 bg_invalidate ();
1489 } 1483 }
1490#endif 1484#endif
1491 } 1485 }
1492 1486
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1488 }
1495 break; 1489 break;
1496 1490
1497 case PropertyNotify: 1491 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503 break; 1493 break;
1504 1494
1505 case SelectionClear: 1495 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break;
1508
1509 case SelectionNotify:
1510 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 break; 1497 break;
1513 1498
1514 case SelectionRequest: 1499 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1516 break; 1501 break;
… …
1527 * 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
1528 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1529 * 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
1530 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
1531 */ 1516 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1517 if (!(bg_flags & BG_IS_VALID))
1533 update_background_ev.start (0.025); 1518 update_background_ev.start (0.025);
1534#endif 1519#endif
1535 mapped = 1; 1520 mapped = 1;
1536#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1522 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1553 { 1538 {
1554 do 1539 do
1555 { 1540 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1543 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1545
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1547
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1549 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1552 }
1568 1553
1569 want_refresh = 1; 1554 want_refresh = 1;
1570 } 1555 }
1571 else 1556 else
… …
1731rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1732{ 1717{
1733 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1734 return; 1719 return;
1735 1720
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 { 1722 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable; 1725 urgency_hint = enable;
1741 } 1726 }
1742} 1727}
1743#endif 1728#endif
1744 1729
… …
1751 want_refresh = 1; 1736 want_refresh = 1;
1752 1737
1753#if USE_XIM 1738#if USE_XIM
1754 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1755 { 1740 {
1756 IMSetPosition (); 1741 im_set_position ();
1757 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1758 } 1743 }
1759#endif 1744#endif
1760#if CURSOR_BLINK 1745#if CURSOR_BLINK
1761 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
1852 * 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.
1853 */ 1838 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1841 {
1857 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1858 update_background (); 1843 update_background ();
1859 } 1844 }
1860 1845
1861 break; 1846 break;
1862 } 1847 }
… …
2234 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2235 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2236 2221
2237 for (;;) 2222 for (;;)
2238 { 2223 {
2239 if (expect_false (ch == NOCHAR)) 2224 if (ecb_unlikely (ch == NOCHAR))
2240 { 2225 {
2241 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2242 ch = next_char (); 2227 ch = next_char ();
2243 2228
2244 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2245 break; 2230 break;
2246 } 2231 }
2247 2232
2248 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))
2249 { 2234 {
2250 if (expect_false (!seen_input)) 2235 if (ecb_unlikely (!seen_input))
2251 { 2236 {
2252 seen_input = 1; 2237 seen_input = 1;
2253 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2254 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2255 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2268 wchar_t *str = buf; 2253 wchar_t *str = buf;
2269 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2270 2255
2271 for (;;) 2256 for (;;)
2272 { 2257 {
2273 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)))
2274 break; 2259 break;
2275 2260
2276 *str++ = ch; 2261 *str++ = ch;
2277 2262
2278 if (expect_false (ch == C0_LF || str >= eol)) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2279 { 2264 {
2280 if (ch == C0_LF) 2265 if (ch == C0_LF)
2281 nlines++; 2266 nlines++;
2282 2267
2283 refresh_count++; 2268 refresh_count++;
… …
2361rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2362{ 2347{
2363 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2364 { 2349 {
2365 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2367 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2368 2353
2369 wchar_t wc; 2354 wchar_t wc;
2370 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);
2371 2356
… …
2399 : NOCHAR; 2384 : NOCHAR;
2400} 2385}
2401 2386
2402static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2403 2388
2404/* rxvt_cmd_getc () - Return next input character */
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t 2389wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2391{
2412 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2413 2393
… …
2506 pclose_printer (fd); 2486 pclose_printer (fd);
2507} 2487}
2508#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2509/*}}} */ 2489/*}}} */
2510 2490
2511/* *INDENT-OFF* */
2512enum { 2491enum {
2513 C1_40 = 0x40, 2492 C1_40 = 0x40,
2514 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,
2515 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,
2516 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,
2517 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,
2518}; 2497};
2519/* *INDENT-ON* */
2520 2498
2521/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2522void 2500void
2523rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2502{
… …
2646 return; 2624 return;
2647 } 2625 }
2648 2626
2649 switch (ch) 2627 switch (ch)
2650 { 2628 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2629 case '#':
2653 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2654 scr_E (); 2631 scr_E ();
2655 break; 2632 break;
2656 case '(': 2633 case '(':
… …
2679#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2680 case '9': 2657 case '9':
2681 scr_forwardindex (); 2658 scr_forwardindex ();
2682 break; 2659 break;
2683#endif 2660#endif
2661 // DECPAM/DECPNM
2684 case '=': 2662 case '=':
2685 case '>': 2663 case '>':
2686 set_privmode (PrivMode_aplKP, ch == '='); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2687 break; 2665 break;
2688 2666
… …
2695 2673
2696 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2698 { 2676 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2679 }
2702 break; 2680 break;
2703 2681
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
2706 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 */
2707 break; 2687 break;
2708 2688
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2691 scr_set_tab (1);
… …
2715 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2716 scr_index (DN); 2696 scr_index (DN);
2717 break; 2697 break;
2718 2698
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2721 2701
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2724 2704
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2707 process_dcs_seq ();
2728 break; 2708 break;
… …
2761 } 2741 }
2762} 2742}
2763/*}}} */ 2743/*}}} */
2764 2744
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2746enum {
2768 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2769 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,
2770 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 ,
2771 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,
… …
2791 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, */
2792 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, */
2793 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, */
2794 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, {, |, }, ~, */
2795 }; 2774 };
2796/* *INDENT-ON* */
2797 2775
2798void 2776void
2799rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2800{ 2778{
2801 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
2881 scr_soft_reset (); 2859 scr_soft_reset ();
2882 2860
2883 static const int pm_h[] = { 7, 25 }; 2861 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885 2863
2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2888 } 2866 }
2889 break; 2867 break;
2890 } 2868 }
2891 2869
2892 return; 2870 return;
… …
3111 } 3089 }
3112} 3090}
3113/*}}} */ 3091/*}}} */
3114 3092
3115#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3116/* ARGSUSED */
3117void 3094void
3118rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119{ 3096{
3120 int x, y; 3097 int x, y;
3121 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3130 { 3107 {
3131 /* 3108 /*
3132 * commands 3109 * commands
3133 */ 3110 */
3134 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3135 XMapWindow (dpy, parent[0]); 3112 XMapWindow (dpy, parent);
3136 break; 3113 break;
3137 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3138 XIconifyWindow (dpy, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3139 break; 3116 break;
3140 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3141 XMoveWindow (dpy, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3142 break; 3119 break;
3143 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145 break; 3122 break;
3146 case 5: /* raise window */ 3123 case 5: /* raise window */
3147 XRaiseWindow (dpy, parent[0]); 3124 XRaiseWindow (dpy, parent);
3148 break; 3125 break;
3149 case 6: /* lower window */ 3126 case 6: /* lower window */
3150 XLowerWindow (dpy, parent[0]); 3127 XLowerWindow (dpy, parent);
3151 break; 3128 break;
3152 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3153 scr_touch (true); 3130 scr_touch (true);
3154 break; 3131 break;
3155 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3166 3143
3167 /* 3144 /*
3168 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3169 */ 3146 */
3170 case 11: /* report window state */ 3147 case 11: /* report window state */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173 break; 3150 break;
3174 case 13: /* report window position */ 3151 case 13: /* report window position */
3175 XGetWindowAttributes (dpy, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3176 XTranslateCoordinates (dpy, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3177 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3178 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3179 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3180 break; 3157 break;
3181 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3182 XGetWindowAttributes (dpy, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184 break; 3161 break;
3185 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3186 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187 break; 3164 break;
… …
3189 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190 break; 3167 break;
3191 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3192 { 3169 {
3193 char *s; 3170 char *s;
3194 XGetIconName (dpy, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3195 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 */
3196 XFree (s); 3173 XFree (s);
3197 } 3174 }
3198 break; 3175 break;
3199 case 21: /* report window title */ 3176 case 21: /* report window title */
3200 { 3177 {
3201 char *s; 3178 char *s;
3202 XFetchName (dpy, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3203 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 */
3204 XFree (s); 3181 XFree (s);
3205 } 3182 }
3206 break; 3183 break;
3207 } 3184 }
… …
3361 unsigned long bytes_after; 3338 unsigned long bytes_after;
3362 unsigned char *value = 0; 3339 unsigned char *value = 0;
3363 const char *str = ""; 3340 const char *str = "";
3364 3341
3365 if (prop 3342 if (prop
3366 && XGetWindowProperty (dpy, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3367 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3368 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3369 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3370 && actual_type != None 3347 && actual_type != None
3371 && actual_format == 8) 3348 && actual_format == 8)
… …
3383 { 3360 {
3384 *eq = 0; 3361 *eq = 0;
3385 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3386 } 3363 }
3387 else 3364 else
3388 XDeleteProperty (dpy, parent[0], 3365 XDeleteProperty (dpy, parent,
3389 display->atom (str)); 3366 display->atom (str));
3390 } 3367 }
3391 break; 3368 break;
3392 3369
3393 case XTerm_Color: 3370 case XTerm_Color:
… …
3454 process_color_seq (op, Color_tint, str, resp); 3431 process_color_seq (op, Color_tint, str, resp);
3455 { 3432 {
3456 bool changed = false; 3433 bool changed = false;
3457 3434
3458 if (ISSET_PIXCOLOR (Color_tint)) 3435 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3436 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3460 3437
3461 if (changed) 3438 if (changed)
3462 update_background (); 3439 update_background ();
3463 } 3440 }
3464 3441
… …
3470 if (!strcmp (str, "?")) 3447 if (!strcmp (str, "?"))
3471 { 3448 {
3472 char str[256]; 3449 char str[256];
3473 3450
3474 sprintf (str, "[%dx%d+%d+%d]", 3451 sprintf (str, "[%dx%d+%d+%d]",
3475 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3452 min (h_scale, 32767), min (v_scale, 32767),
3476 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3453 min (h_align, 32767), min (v_align, 32767));
3477 process_xterm_seq (XTerm_title, str, CHAR_ST); 3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3478 } 3455 }
3479 else 3456 else
3480 { 3457 {
3481 int changed = 0; 3458 int changed = 0;
3482 3459
3483 if (*str != ';') 3460 if (*str != ';')
3484 { 3461 {
3485 if (bgPixmap.set_file (str)) /* change pixmap */ 3462 if (bg_set_file (str)) /* change pixmap */
3486 { 3463 {
3487 changed++; 3464 changed++;
3488 str = strchr (str, ';'); 3465 str = strchr (str, ';');
3489 if (str == NULL) 3466 if (str == NULL)
3490 bgPixmap.set_defaultGeometry (); 3467 bg_set_default_geometry ();
3491 else 3468 else
3492 bgPixmap.set_geometry (str+1); 3469 bg_set_geometry (str+1);
3493 } 3470 }
3494 } 3471 }
3495 else 3472 else
3496 { 3473 {
3497 str++; 3474 str++;
3498 if (bgPixmap.set_geometry (str, true)) 3475 if (bg_set_geometry (str, true))
3499 changed++; 3476 changed++;
3500 } 3477 }
3501 3478
3502 if (changed) 3479 if (changed)
3503 { 3480 {
3504 if (bgPixmap.window_position_sensitive ()) 3481 if (bg_window_position_sensitive ())
3505 { 3482 {
3506 int x, y; 3483 int x, y;
3507 get_window_origin (x, y); 3484 get_window_origin (x, y);
3508 bgPixmap.set_position (x, y); 3485 bg_set_position (x, y);
3509 } 3486 }
3510 update_background (); 3487 update_background ();
3511 } 3488 }
3512 } 3489 }
3513 break; 3490 break;
… …
3628 return state; 3605 return state;
3629} 3606}
3630 3607
3631/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
3632void 3609void
3633rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3610rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3634{ 3611{
3635 unsigned int i, j; 3612 unsigned int i, j;
3636 int state; 3613 int state;
3637 3614
3638 static const struct 3615 static const struct
3639 { 3616 {
3640 const int argval; 3617 const int argval;
3641 const unsigned long bit; 3618 const unsigned long bit;
3642 } argtopriv[] = { 3619 } argtopriv[] = {
3643 { 1, PrivMode_aplCUR }, // DECCKM 3620 { 1, PrivMode_aplCUR }, // DECCKM
3644 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 }, // DECANM
3645 { 3, PrivMode_132 }, // DECCOLM 3622 { 3, PrivMode_132 }, // DECCOLM
3646 { 4, PrivMode_smoothScroll }, // DECSCLM 3623 { 4, PrivMode_smoothScroll }, // DECSCLM
3647 { 5, PrivMode_rVideo }, // DECSCNM 3624 { 5, PrivMode_rVideo }, // DECSCNM
3648 { 6, PrivMode_relOrigin }, // DECOM 3625 { 6, PrivMode_relOrigin }, // DECOM
3649 { 7, PrivMode_Autowrap }, // DECAWM 3626 { 7, PrivMode_Autowrap }, // DECAWM
3650 // 8, auto-repeat keys // DECARM 3627 // 8, auto-repeat keys // DECARM
3651 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3652 // 18 end FF to printer after print screen 3629 // 18 end FF to printer after print screen
3653 // 19 Print screen prints full screen/scroll region 3630 // 19 Print screen prints full screen/scroll region
3654 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3631 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3655#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3656 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3657#endif 3634#endif
3658 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
3659 // 38, tektronix mode // DECTEK 3636 // 38, tektronix mode // DECTEK
3660 { 40, PrivMode_132OK }, 3637 { 40, PrivMode_132OK },
3661 // 41 xterm more fixes NYI 3638 // 41 xterm more fixes NYI
3662 // 45 margin bell NYI 3639 // 45 margin bell NYI
3663 // 46 start logging 3640 // 46 start logging
3664 { 47, PrivMode_Screen }, 3641 { 47, PrivMode_Screen },
3665 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3642 { 66, PrivMode_aplKP }, // DECNKM
3666#ifndef NO_BACKSPACE_KEY 3643#ifndef NO_BACKSPACE_KEY
3667 { 67, PrivMode_BackSpace }, // DECBKM 3644 { 67, PrivMode_BackSpace }, // DECBKM
3668#endif 3645#endif
3669 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
3670 { 1002, PrivMode_MouseBtnEvent }, 3647 { 1002, PrivMode_MouseBtnEvent },
… …
3699 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
3700 { 3677 {
3701 state = -1; 3678 state = -1;
3702 3679
3703 /* basic handling */ 3680 /* basic handling */
3704 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3681 for (j = 0; j < ecb_array_length (argtopriv); j++)
3705 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
3706 { 3683 {
3707 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
3708 break; 3685 break;
3709 } 3686 }
… …
3982 } 3959 }
3983 } 3960 }
3984} 3961}
3985/*}}} */ 3962/*}}} */
3986 3963
3987/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3988void
3989rxvt_term::process_graphics ()
3990{
3991 unicode_t ch, cmd = cmd_getc ();
3992
3993 if (cmd == 'Q')
3994 {
3995 /* query graphics */
3996 tt_printf ("\033G0\012"); /* no graphics */
3997 return;
3998 }
3999 /* swallow other graphics sequences until terminating ':' */
4000 do
4001 ch = cmd_getc ();
4002 while (ch != ':');
4003}
4004/*}}} */
4005
4006/* ------------------------------------------------------------------------- */ 3964/* ------------------------------------------------------------------------- */
4007 3965
4008/* 3966/*
4009 * Send printf () formatted output to the command. 3967 * Send printf () formatted output to the command.
4010 * Only use for small amounts of data. 3968 * Only use for small amounts of data.
… …
4038 3996
4039 if (v_buflen == 0) 3997 if (v_buflen == 0)
4040 { 3998 {
4041 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));
4042 4000
4001 max_it (written, 0);
4002
4043 if ((unsigned int)written == len) 4003 if (written == len)
4044 return; 4004 return;
4045 4005
4046 data += written; 4006 data += written;
4047 len -= written; 4007 len -= written;
4048 } 4008 }

Diff Legend

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