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.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15: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 }
… …
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_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}
… …
1080 1042
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1044void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1046{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1049 {
1088 want_refresh = 1; 1050 want_refresh = 1;
1089 refresh_check (); 1051 refresh_check ();
1090 } 1052 }
1091 else 1053 else
… …
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;
… …
1445 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1441 focus_out ();
1447 break; 1442 break;
1448 1443
1449 case ConfigureNotify: 1444 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1451 { 1446 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1448 ;
1454 1449
1455#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
1456 bool moved = false; 1451 bool moved = false;
1457 if (bgPixmap.window_position_sensitive ()) 1452 if (bg_window_position_sensitive ())
1458 { 1453 {
1459 int x, y; 1454 int x, y;
1460 if (ev.xconfigure.send_event) 1455 if (ev.xconfigure.send_event)
1461 { 1456 {
1462 x = ev.xconfigure.x; 1457 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1458 y = ev.xconfigure.y;
1464 } 1459 }
1465 else 1460 else
1466 get_window_origin (x, y); 1461 get_window_origin (x, y);
1467 1462
1468 if (bgPixmap.set_position (x, y) 1463 if (bg_set_position (x, y)
1469 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1464 || !(bg_flags & BG_IS_VALID))
1470 moved = true; 1465 moved = true;
1471 } 1466 }
1472#endif 1467#endif
1473 1468
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1478 } 1473 }
1479 else 1474 else
1480 { 1475 {
1481#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1477 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1478 update_background ();
1486 else
1487 bgPixmap.invalidate ();
1488 }
1489#endif 1479#endif
1490 } 1480 }
1491 1481
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1483 }
1494 break; 1484 break;
1495 1485
1496 case PropertyNotify: 1486 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1488 break;
1503 1489
1504 case SelectionClear: 1490 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1492 break;
1512 1493
1513 case SelectionRequest: 1494 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1515 break; 1496 break;
… …
1526 * by scheduling background redraw as soon as we can, but giving a short 1507 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all 1509 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1530 */ 1511 */
1531 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1532 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1533#endif 1514#endif
1534 mapped = 1; 1515 mapped = 1;
1535#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1536 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1551 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1552 { 1533 {
1553 do 1534 do
1554 { 1535 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1538 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1540
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1542
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 { 1544 {
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1566 } 1547 }
1567 1548
1568 want_refresh = 1; 1549 want_refresh = 1;
1569 } 1550 }
1570 else 1551 else
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1577 ; 1558 ;
1578 1559
1579 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1580 { 1561 {
1581 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1582 scrollBar.show (0); 1563 scrollBar.show (0);
1583 } 1564 }
1584 } 1565 }
1585 break; 1566 break;
1586 1567
… …
1674#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1675 } 1656 }
1676#endif 1657#endif
1677 } 1658 }
1678 } 1659 }
1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1661 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1683 ; 1664 ;
1684 1665
1685 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1670 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollBar.size ()); 1672 scrollBar.size ());
1692 want_refresh = 1; 1673 want_refresh = 1;
1693 scrollBar.show (1); 1674 scrollBar.show (1);
1694 } 1675 }
1695 break; 1676 break;
… …
1730rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1731{ 1712{
1732 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1733 return; 1714 return;
1734 1715
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1717 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1720 urgency_hint = enable;
1721 XFree (h);
1740 } 1722 }
1741} 1723}
1742#endif 1724#endif
1743 1725
1744void 1726void
… …
1750 want_refresh = 1; 1732 want_refresh = 1;
1751 1733
1752#if USE_XIM 1734#if USE_XIM
1753 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1754 { 1736 {
1755 IMSetPosition (); 1737 im_set_position ();
1756 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1757 } 1739 }
1758#endif 1740#endif
1759#if CURSOR_BLINK 1741#if CURSOR_BLINK
1760 if (option (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
… …
1851 * use the property to determine the pixmap. We use it later on. 1833 * use the property to determine the pixmap. We use it later on.
1852 */ 1834 */
1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1855 { 1837 {
1856 bgPixmap.set_root_pixmap (); 1838 bg_set_root_pixmap ();
1857 update_background (); 1839 update_background ();
1858 } 1840 }
1859 1841
1860 break; 1842 break;
1861 } 1843 }
… …
1991 if (scrollBar.upButton (ev.y)) 1973 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */ 1974 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y)) 1975 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */ 1976 direction = DN; /* down */
1995 1977
1996 scrollBar.state = STATE_IDLE; 1978 scrollBar.state = SB_STATE_IDLE;
1997 /* 1979 /*
1998 * Rxvt-style scrollbar: 1980 * Rxvt-style scrollbar:
1999 * move up if mouse is above slider 1981 * move up if mouse is above slider
2000 * move dn if mouse is below slider 1982 * move dn if mouse is below slider
2001 * 1983 *
… …
2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2022 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2023#endif
2042 if (scr_page (direction, 1)) 2024 if (scr_page (direction, 1))
2043 { 2025 {
2044 if (direction == UP) 2026 if (direction == UP)
2045 scrollBar.state = STATE_UP; 2027 scrollBar.state = SB_STATE_UP;
2046 else 2028 else
2047 scrollBar.state = STATE_DOWN; 2029 scrollBar.state = SB_STATE_DOWN;
2048 } 2030 }
2049 } 2031 }
2050 else 2032 else
2051 switch (ev.button) 2033 switch (ev.button)
2052 { 2034 {
2053 case Button2: 2035 case Button2:
2054 switch (scrollBar.align) 2036 switch (scrollBar.align)
2055 { 2037 {
2056 case R_SB_ALIGN_TOP: 2038 case SB_ALIGN_TOP:
2057 csrO = 0; 2039 csrO = 0;
2058 break; 2040 break;
2059 case R_SB_ALIGN_CENTRE: 2041 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2042 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2043 break;
2062 case R_SB_ALIGN_BOTTOM: 2044 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2045 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2046 break;
2065 } 2047 }
2066 2048
2067 if (scrollBar.style == R_SB_XTERM 2049 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2050 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2051 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2052 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2053
2072 scrollBar.state = STATE_MOTION; 2054 scrollBar.state = SB_STATE_MOTION;
2073 break; 2055 break;
2074 2056
2075 case Button1: 2057 case Button1:
2076 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2058 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2059 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2060 /* FALLTHROUGH */
2079 2061
2080 case Button3: 2062 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2063 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2064 {
2083 if (scrollbar_above_slider (ev.y)) 2065 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2067 scr_page (UP, nrow - 1);
2086# else 2068# else
2087 scr_page (UP, nrow / 4); 2069 scr_page (UP, nrow / 4);
2088# endif 2070# endif
2089 else if (scrollbar_below_slider (ev.y)) 2071 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2073 scr_page (DN, nrow - 1);
2092# else 2074# else
2093 scr_page (DN, nrow / 4); 2075 scr_page (DN, nrow / 4);
2094# endif 2076# endif
2095 else 2077 else
2096 scrollBar.state = STATE_MOTION; 2078 scrollBar.state = SB_STATE_MOTION;
2097 } 2079 }
2098 else 2080 else
2099 { 2081 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2082 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2083 (nrow
2102 * scrollbar_position (ev.y) 2084 * scrollBar.position (ev.y)
2103 / scrollBar.size ())); 2085 / scrollBar.size ()));
2104 } 2086 }
2105 2087
2106 break; 2088 break;
2107 } 2089 }
… …
2118 2100
2119 csrO = 0; /* reset csr Offset */ 2101 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2102 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2103 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2104
2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2105 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2106 {
2125 scrollBar.state = STATE_IDLE; 2107 scrollBar.state = SB_STATE_IDLE;
2126 scrollBar.show (0); 2108 scrollBar.show (0);
2127 } 2109 }
2128 2110
2129#ifdef SELECTION_SCROLLING 2111#ifdef SELECTION_SCROLLING
2130 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
… …
2233 wchar_t ch = NOCHAR; 2215 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2216 char *seq_begin; // remember start of esc-sequence here
2235 2217
2236 for (;;) 2218 for (;;)
2237 { 2219 {
2238 if (expect_false (ch == NOCHAR)) 2220 if (ecb_unlikely (ch == NOCHAR))
2239 { 2221 {
2240 seq_begin = cmdbuf_ptr; 2222 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2223 ch = next_char ();
2242 2224
2243 if (ch == NOCHAR) 2225 if (ch == NOCHAR)
2244 break; 2226 break;
2245 } 2227 }
2246 2228
2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2229 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2248 { 2230 {
2249 if (expect_false (!seen_input)) 2231 if (ecb_unlikely (!seen_input))
2250 { 2232 {
2251 seen_input = 1; 2233 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2234 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2235 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2236 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2249 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2250 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2251
2270 for (;;) 2252 for (;;)
2271 { 2253 {
2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2254 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2273 break; 2255 break;
2274 2256
2275 *str++ = ch; 2257 *str++ = ch;
2276 2258
2277 if (expect_false (ch == C0_LF || str >= eol)) 2259 if (ecb_unlikely (ch == C0_LF || str >= eol))
2278 { 2260 {
2279 if (ch == C0_LF) 2261 if (ch == C0_LF)
2280 nlines++; 2262 nlines++;
2281 2263
2282 refresh_count++; 2264 refresh_count++;
… …
2360rxvt_term::next_char () NOTHROW 2342rxvt_term::next_char () NOTHROW
2361{ 2343{
2362 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2363 { 2345 {
2364 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2347 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366 return *cmdbuf_ptr++; 2348 return *cmdbuf_ptr++;
2367 2349
2368 wchar_t wc; 2350 wchar_t wc;
2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2370 2352
… …
2398 : NOCHAR; 2380 : NOCHAR;
2399} 2381}
2400 2382
2401static class out_of_input out_of_input; 2383static class out_of_input out_of_input;
2402 2384
2403/* rxvt_cmd_getc () - Return next input character */
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t 2385wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2386rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2387{
2411 wchar_t c = next_char (); 2388 wchar_t c = next_char ();
2412 2389
… …
2505 pclose_printer (fd); 2482 pclose_printer (fd);
2506} 2483}
2507#endif /* PRINTPIPE */ 2484#endif /* PRINTPIPE */
2508/*}}} */ 2485/*}}} */
2509 2486
2510/* *INDENT-OFF* */
2511enum { 2487enum {
2512 C1_40 = 0x40, 2488 C1_40 = 0x40,
2513 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2489 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2514 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2490 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2515 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2516 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2517}; 2493};
2518/* *INDENT-ON* */
2519 2494
2520/*{{{ process non-printing single characters */ 2495/*{{{ process non-printing single characters */
2521void 2496void
2522rxvt_term::process_nonprinting (unicode_t ch) 2497rxvt_term::process_nonprinting (unicode_t ch)
2523{ 2498{
… …
2616 break; 2591 break;
2617 case 'Z': /* identify the terminal type */ 2592 case 'Z': /* identify the terminal type */
2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2593 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2619 break; 2594 break;
2620 case '<': /* turn off VT52 mode */ 2595 case '<': /* turn off VT52 mode */
2621 set_privmode (PrivMode_vt52, 0); 2596 priv_modes &= ~PrivMode_vt52;
2622 break; 2597 break;
2623 case 'F': /* use special graphics character set */ 2598 case 'F': /* use special graphics character set */
2624 case 'G': /* use regular character set */ 2599 case 'G': /* use regular character set */
2625 /* unimplemented */ 2600 /* unimplemented */
2626 break; 2601 break;
… …
2645 return; 2620 return;
2646 } 2621 }
2647 2622
2648 switch (ch) 2623 switch (ch)
2649 { 2624 {
2650 /* case 1: do_tek_mode (); break; */
2651 case '#': 2625 case '#':
2652 if (cmd_getc () == '8') 2626 if (cmd_getc () == '8')
2653 scr_E (); 2627 scr_E ();
2654 break; 2628 break;
2655 case '(': 2629 case '(':
… …
2678#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2679 case '9': 2653 case '9':
2680 scr_forwardindex (); 2654 scr_forwardindex ();
2681 break; 2655 break;
2682#endif 2656#endif
2657 // DECPAM/DECPNM
2683 case '=': 2658 case '=':
2659 priv_modes |= PrivMode_aplKP;
2660 break;
2684 case '>': 2661 case '>':
2685 set_privmode (PrivMode_aplKP, ch == '='); 2662 priv_modes &= ~PrivMode_aplKP;
2686 break; 2663 break;
2687 2664
2688 case C1_40: 2665 case C1_40:
2689 cmd_getc (); 2666 cmd_getc ();
2690 break; 2667 break;
… …
2694 2671
2695 /* 8.3.87: NEXT LINE */ 2672 /* 8.3.87: NEXT LINE */
2696 case C1_NEL: /* ESC E */ 2673 case C1_NEL: /* ESC E */
2697 { 2674 {
2698 wchar_t nlcr[] = { C0_LF, C0_CR }; 2675 wchar_t nlcr[] = { C0_LF, C0_CR };
2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2676 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2700 } 2677 }
2701 break; 2678 break;
2702 2679
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2680 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2681 case C1_ESA: /* ESC G */
2705 process_graphics (); 2682 // used by original rxvt for rob nations own graphics mode
2683 if (cmd_getc () == 'Q')
2684 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2706 break; 2685 break;
2707 2686
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2687 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2688 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2689 scr_set_tab (1);
… …
2714 case C1_RI: /* ESC M */ 2693 case C1_RI: /* ESC M */
2715 scr_index (DN); 2694 scr_index (DN);
2716 break; 2695 break;
2717 2696
2718 /* 8.3.142: SINGLE-SHIFT TWO */ 2697 /* 8.3.142: SINGLE-SHIFT TWO */
2719 /*case C1_SS2: scr_single_shift (2); break; */ 2698 /* case C1_SS2: break; */
2720 2699
2721 /* 8.3.143: SINGLE-SHIFT THREE */ 2700 /* 8.3.143: SINGLE-SHIFT THREE */
2722 /*case C1_SS3: scr_single_shift (3); break; */ 2701 /* case C1_SS3: break; */
2723 2702
2724 /* 8.3.27: DEVICE CONTROL STRING */ 2703 /* 8.3.27: DEVICE CONTROL STRING */
2725 case C1_DCS: /* ESC P */ 2704 case C1_DCS: /* ESC P */
2726 process_dcs_seq (); 2705 process_dcs_seq ();
2727 break; 2706 break;
… …
2760 } 2739 }
2761} 2740}
2762/*}}} */ 2741/*}}} */
2763 2742
2764/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2743/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2765/* *INDENT-OFF* */
2766enum { 2744enum {
2767 CSI_ICH = 0x40, 2745 CSI_ICH = 0x40,
2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2746 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2747 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2748 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2768 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2794 }; 2772 };
2795/* *INDENT-ON* */
2796 2773
2797void 2774void
2798rxvt_term::process_csi_seq () 2775rxvt_term::process_csi_seq ()
2799{ 2776{
2800 unicode_t ch, priv, i; 2777 unicode_t ch, priv, i;
… …
2880 scr_soft_reset (); 2857 scr_soft_reset ();
2881 2858
2882 static const int pm_h[] = { 7, 25 }; 2859 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2860 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884 2861
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2862 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2863 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2887 } 2864 }
2888 break; 2865 break;
2889 } 2866 }
2890 2867
2891 return; 2868 return;
… …
2909 } 2886 }
2910 break; 2887 break;
2911#endif 2888#endif
2912 2889
2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2890 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2891 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2915 arg[0] = -arg[0]; 2892 arg[0] = -arg[0];
2916 /* FALLTHROUGH */ 2893 /* FALLTHROUGH */
2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2894 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2918 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2895 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2919 scr_gotorc (arg[0], 0, RELATIVE); 2896 scr_gotorc (arg[0], 0, RELATIVE);
2920 break; 2897 break;
2921 2898
2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2899 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2900 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3110 } 3087 }
3111} 3088}
3112/*}}} */ 3089/*}}} */
3113 3090
3114#if !ENABLE_MINIMAL 3091#if !ENABLE_MINIMAL
3115/* ARGSUSED */
3116void 3092void
3117rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3093rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3118{ 3094{
3119 int x, y; 3095 int x, y;
3120 XWindowAttributes wattr; 3096 XWindowAttributes wattr;
… …
3129 { 3105 {
3130 /* 3106 /*
3131 * commands 3107 * commands
3132 */ 3108 */
3133 case 1: /* deiconify window */ 3109 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3110 XMapWindow (dpy, parent);
3135 break; 3111 break;
3136 case 2: /* iconify window */ 3112 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3113 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3114 break;
3139 case 3: /* set position (pixels) */ 3115 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3116 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3117 break;
3142 case 4: /* set size (pixels) */ 3118 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3119 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3120 break;
3145 case 5: /* raise window */ 3121 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3122 XRaiseWindow (dpy, parent);
3147 break; 3123 break;
3148 case 6: /* lower window */ 3124 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3125 XLowerWindow (dpy, parent);
3150 break; 3126 break;
3151 case 7: /* refresh window */ 3127 case 7: /* refresh window */
3152 scr_touch (true); 3128 scr_touch (true);
3153 break; 3129 break;
3154 case 8: /* set size (chars) */ 3130 case 8: /* set size (chars) */
… …
3165 3141
3166 /* 3142 /*
3167 * reports - some output format copied from XTerm 3143 * reports - some output format copied from XTerm
3168 */ 3144 */
3169 case 11: /* report window state */ 3145 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3146 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3147 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3148 break;
3173 case 13: /* report window position */ 3149 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3151 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3152 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3153 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3154 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3155 break;
3180 case 14: /* report window size (pixels) */ 3156 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3157 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3158 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3159 break;
3184 case 18: /* report text area size (chars) */ 3160 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3162 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3165 break;
3190 case 20: /* report icon label */ 3166 case 20: /* report icon label */
3191 { 3167 {
3192 char *s; 3168 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3169 XGetIconName (dpy, parent, &s);
3194 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3171 XFree (s);
3196 } 3172 }
3197 break; 3173 break;
3198 case 21: /* report window title */ 3174 case 21: /* report window title */
3199 { 3175 {
3200 char *s; 3176 char *s;
3201 XFetchName (dpy, parent[0], &s); 3177 XFetchName (dpy, parent, &s);
3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3203 XFree (s); 3179 XFree (s);
3204 } 3180 }
3205 break; 3181 break;
3206 } 3182 }
… …
3360 unsigned long bytes_after; 3336 unsigned long bytes_after;
3361 unsigned char *value = 0; 3337 unsigned char *value = 0;
3362 const char *str = ""; 3338 const char *str = "";
3363 3339
3364 if (prop 3340 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3341 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3342 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3343 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3344 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3345 && actual_type != None
3370 && actual_format == 8) 3346 && actual_format == 8)
… …
3382 { 3358 {
3383 *eq = 0; 3359 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3360 set_utf8_property (display->atom (str), eq + 1);
3385 } 3361 }
3386 else 3362 else
3387 XDeleteProperty (dpy, parent[0], 3363 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3364 display->atom (str));
3389 } 3365 }
3390 break; 3366 break;
3391 3367
3392 case XTerm_Color: 3368 case XTerm_Color:
… …
3453 process_color_seq (op, Color_tint, str, resp); 3429 process_color_seq (op, Color_tint, str, resp);
3454 { 3430 {
3455 bool changed = false; 3431 bool changed = false;
3456 3432
3457 if (ISSET_PIXCOLOR (Color_tint)) 3433 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3434 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3459 3435
3460 if (changed) 3436 if (changed)
3461 update_background (); 3437 update_background ();
3462 } 3438 }
3463 3439
… …
3469 if (!strcmp (str, "?")) 3445 if (!strcmp (str, "?"))
3470 { 3446 {
3471 char str[256]; 3447 char str[256];
3472 3448
3473 sprintf (str, "[%dx%d+%d+%d]", 3449 sprintf (str, "[%dx%d+%d+%d]",
3474 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3450 min (h_scale, 32767), min (v_scale, 32767),
3475 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3451 min (h_align, 32767), min (v_align, 32767));
3476 process_xterm_seq (XTerm_title, str, CHAR_ST); 3452 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 } 3453 }
3478 else 3454 else
3479 { 3455 {
3480 int changed = 0; 3456 bool changed = false;
3481 3457
3482 if (*str != ';') 3458 if (*str != ';')
3483 { 3459 {
3484 if (bgPixmap.set_file (str)) /* change pixmap */ 3460 if (bg_set_file (str)) /* change pixmap */
3485 {
3486 changed++; 3461 changed = true;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bgPixmap.set_defaultGeometry ();
3490 else
3491 bgPixmap.set_geometry (str+1);
3492 }
3493 } 3462 }
3494 else 3463 else
3495 { 3464 {
3496 str++; 3465 str++;
3497 if (bgPixmap.set_geometry (str, true)) 3466 if (bg_set_geometry (str, true))
3498 changed++; 3467 changed = true;
3499 } 3468 }
3500 3469
3501 if (changed) 3470 if (changed)
3502 { 3471 {
3503 if (bgPixmap.window_position_sensitive ()) 3472 if (bg_window_position_sensitive ())
3504 { 3473 {
3505 int x, y; 3474 int x, y;
3506 get_window_origin (x, y); 3475 get_window_origin (x, y);
3507 bgPixmap.set_position (x, y); 3476 bg_set_position (x, y);
3508 } 3477 }
3509 update_background (); 3478 update_background ();
3510 } 3479 }
3511 } 3480 }
3512 break; 3481 break;
… …
3619 if (mode == 'r') 3588 if (mode == 'r')
3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3589 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3621 else 3590 else
3622 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3591 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3623 3592
3624 set_privmode (bit, state); 3593 if (state)
3594 priv_modes |= bit;
3595 else
3596 priv_modes &= ~bit;
3625 } 3597 }
3626 3598
3627 return state; 3599 return state;
3628} 3600}
3629 3601
3630/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3631void 3603void
3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3633{ 3605{
3634 unsigned int i, j; 3606 unsigned int i, j;
3635 int state; 3607 int state;
3636 3608
3637 static const struct 3609 static const struct
3638 { 3610 {
3639 const int argval; 3611 const int argval;
3640 const unsigned long bit; 3612 const unsigned long bit;
3641 } argtopriv[] = { 3613 } argtopriv[] = {
3642 { 1, PrivMode_aplCUR }, // DECCKM 3614 { 1, PrivMode_aplCUR }, // DECCKM
3643 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 }, // DECANM
3644 { 3, PrivMode_132 }, // DECCOLM 3616 { 3, PrivMode_132 }, // DECCOLM
3645 { 4, PrivMode_smoothScroll }, // DECSCLM 3617 { 4, PrivMode_smoothScroll }, // DECSCLM
3646 { 5, PrivMode_rVideo }, // DECSCNM 3618 { 5, PrivMode_rVideo }, // DECSCNM
3647 { 6, PrivMode_relOrigin }, // DECOM 3619 { 6, PrivMode_relOrigin }, // DECOM
3648 { 7, PrivMode_Autowrap }, // DECAWM 3620 { 7, PrivMode_Autowrap }, // DECAWM
3649 // 8, auto-repeat keys // DECARM 3621 // 8, auto-repeat keys // DECARM
3650 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
3651 // 18 end FF to printer after print screen 3623 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region 3624 // 19 Print screen prints full screen/scroll region
3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3625 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3654#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
3655 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
3656#endif 3628#endif
3657 { 35, PrivMode_ShiftKeys }, // rxvt extension 3629 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK 3630 // 38, tektronix mode // DECTEK
3659 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3660 // 41 xterm more fixes NYI 3632 // 41 xterm more fixes NYI
3661 // 45 margin bell NYI 3633 // 45 margin bell NYI
3662 // 46 start logging 3634 // 46 start logging
3663 { 47, PrivMode_Screen }, 3635 { 47, PrivMode_Screen },
3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3636 { 66, PrivMode_aplKP }, // DECNKM
3665#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3666 { 67, PrivMode_BackSpace }, // DECBKM 3638 { 67, PrivMode_BackSpace }, // DECBKM
3667#endif 3639#endif
3668 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3669 { 1002, PrivMode_MouseBtnEvent }, 3641 { 1002, PrivMode_MouseBtnEvent },
… …
3698 for (i = 0; i < nargs; i++) 3670 for (i = 0; i < nargs; i++)
3699 { 3671 {
3700 state = -1; 3672 state = -1;
3701 3673
3702 /* basic handling */ 3674 /* basic handling */
3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3675 for (j = 0; j < ecb_array_length (argtopriv); j++)
3704 if (argtopriv[j].argval == arg[i]) 3676 if (argtopriv[j].argval == arg[i])
3705 { 3677 {
3706 state = privcases (mode, argtopriv[j].bit); 3678 state = privcases (mode, argtopriv[j].bit);
3707 break; 3679 break;
3708 } 3680 }
… …
3734 case 2: /* VT52 mode */ 3706 case 2: /* VT52 mode */
3735 /* oddball mode. should be set regardless of set/reset 3707 /* oddball mode. should be set regardless of set/reset
3736 * parameter. Return from VT52 mode with an ESC < from 3708 * parameter. Return from VT52 mode with an ESC < from
3737 * within VT52 mode 3709 * within VT52 mode
3738 */ 3710 */
3739 set_privmode (PrivMode_vt52, 1); 3711 priv_modes |= PrivMode_vt52;
3740 break; 3712 break;
3741 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
3742 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3715 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3744 break; 3716 break;
… …
3759 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3732 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3761 break; 3733 break;
3762#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
3763 case scrollBar_esc: 3735 case scrollBar_esc:
3764 if (scrollBar.map (state)) 3736 scrollBar.map (state);
3765 {
3766 resize_all_windows (0, 0, 0); 3737 resize_all_windows (0, 0, 0);
3767 scr_touch (true); 3738 scr_touch (true);
3768 }
3769 break; 3739 break;
3770#endif 3740#endif
3771 case 25: /* visible/invisible cursor */ 3741 case 25: /* visible/invisible cursor */
3772 scr_cursor_visible (state); 3742 scr_cursor_visible (state);
3773 break; 3743 break;
… …
3981 } 3951 }
3982 } 3952 }
3983} 3953}
3984/*}}} */ 3954/*}}} */
3985 3955
3986/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3987void
3988rxvt_term::process_graphics ()
3989{
3990 unicode_t ch, cmd = cmd_getc ();
3991
3992 if (cmd == 'Q')
3993 {
3994 /* query graphics */
3995 tt_printf ("\033G0\012"); /* no graphics */
3996 return;
3997 }
3998 /* swallow other graphics sequences until terminating ':' */
3999 do
4000 ch = cmd_getc ();
4001 while (ch != ':');
4002}
4003/*}}} */
4004
4005/* ------------------------------------------------------------------------- */ 3956/* ------------------------------------------------------------------------- */
4006 3957
4007/* 3958/*
4008 * Send printf () formatted output to the command. 3959 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 3960 * Only use for small amounts of data.
… …
4037 3988
4038 if (v_buflen == 0) 3989 if (v_buflen == 0)
4039 { 3990 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041 3992
3993 max_it (written, 0);
3994
4042 if ((unsigned int)written == len) 3995 if (written == len)
4043 return; 3996 return;
4044 3997
4045 data += written; 3998 data += written;
4046 len -= written; 3999 len -= written;
4047 } 4000 }

Diff Legend

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