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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.95 by pcg, Sun May 9 18:19:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
52 52
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
57/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
58void 63void
59rxvt_term::lookup_key (XKeyEvent &ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
60{ 65{
61 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
… …
88#ifdef USE_XIM 93#ifdef USE_XIM
89 if (Input_Context) 94 if (Input_Context)
90 { 95 {
91 Status status_return; 96 Status status_return;
92 97
98#if 0
93#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
97 else 103 else
104#endif
98#endif 105#endif
99 { 106 {
100 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
101 108
102 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
… …
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
618unsigned int 625unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
620{ 627{
621 unsigned int n, s; 628 unsigned int n, s;
622 629
623 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 632
626 if (n > 0 && s < count) 633 if (n > 0 && s < count)
627 { 634 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
… …
632 s += n; 639 s += n;
633 } 640 }
634 641
635 if (count > s) 642 if (count > s)
636 { 643 {
637 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 645 count = s;
639 } 646 }
640 647
641 for (; count--;) 648 for (; count--;)
642 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
… …
665 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
666 scrollbar_show (1); 673 scrollbar_show (1);
667#ifdef USE_XIM 674#ifdef USE_XIM
668 IMSendSpot (); 675 IMSendSpot ();
669#endif 676#endif
670
671 } 677 }
672 678
673 display->flush (); 679 display->flush ();
674} 680}
675 681
… …
709bool 715bool
710rxvt_term::pty_fill () 716rxvt_term::pty_fill ()
711{ 717{
712 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 718 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
713 719
720 if (CBUFSIZ == n)
721 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
723 n = 0;
724 }
725
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 726 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 727 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 728 cmdbuf_endp = cmdbuf_ptr + n;
717 729
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
719 731
720 if (n > 0) 732 if (n > 0)
721 { 733 {
722 cmdbuf_endp += n; 734 cmdbuf_endp += n;
723 return true; 735 return true;
… …
735 SET_LOCALE (locale); 747 SET_LOCALE (locale);
736 748
737 if (revents & EVENT_WRITE) 749 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 750 tt_write (0, 0);
739 else if (revents & EVENT_READ) 751 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us 752 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ()) 753 while (pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ()) 754 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
764 unicode_t ch = NOCHAR;
765
766 for (;;)
767 {
768 if (ch == NOCHAR)
769 ch = next_char ();
770
771 if (ch == NOCHAR) // TODO: improve
772 break;
773
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868unicode_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break; 755 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904unicode_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 unicode_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 756}
920 757
921#ifdef POINTER_BLANK 758#ifdef POINTER_BLANK
922void 759void
923rxvt_term::pointer_unblank () 760rxvt_term::pointer_unblank ()
… …
1168 && (ev.xclient.data.l[0] == DndFile 1005 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1006 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1007 || ev.xclient.data.l[0] == DndLink))
1171 { 1008 {
1172 /* Get Dnd data */ 1009 /* Get Dnd data */
1173 Atom ActualType; 1010 Atom ActualType;
1174 int ActualFormat; 1011 int ActualFormat;
1175 unsigned char *data; 1012 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1013 unsigned long Size, RemainingBytes;
1177 1014
1178 XGetWindowProperty (display->display, display->root, 1015 XGetWindowProperty (display->display, display->root,
1179 xa[XA_DNDSELECTION], 1016 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1017 0L, 1000000L,
1181 False, AnyPropertyType, 1018 False, AnyPropertyType,
… …
1184 &data); 1021 &data);
1185 XChangeProperty (display->display, display->root, 1022 XChangeProperty (display->display, display->root,
1186 XA_CUT_BUFFER0, XA_STRING, 1023 XA_CUT_BUFFER0, XA_STRING,
1187 8, PropModeReplace, 1024 8, PropModeReplace,
1188 data, STRLEN (data)); 1025 data, STRLEN (data));
1026 XFree (data);
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1027 selection_paste (display->root, XA_CUT_BUFFER0, True);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1191 } 1029 }
1192#endif /* OFFIX_DND */ 1030#endif /* OFFIX_DND */
1193 break; 1031 break;
… …
1286 check_our_parents (); 1124 check_our_parents ();
1287 if (am_transparent) 1125 if (am_transparent)
1288 want_full_refresh = 1; 1126 want_full_refresh = 1;
1289 } 1127 }
1290#endif 1128#endif
1291
1292 } 1129 }
1293 break; 1130 break;
1294 1131
1295 case SelectionClear: 1132 case SelectionClear:
1296 display->set_selection_owner (0); 1133 selection_clear ();
1297 break; 1134 break;
1298 1135
1299 case SelectionNotify: 1136 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1137 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1138 selection_paste (ev.xselection.requestor,
… …
1332 { 1169 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1170#ifdef NO_SLOW_LINK_SUPPORT
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1171 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1172 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1173#else
1337 // don't understand this, so commented it out 1174 // I don't understand this, so I changed it :)
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1175 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1176 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1177 //scr_expose (ev.xexpose.x, 0,
1341 // ev.xexpose.width, TermWin.height, False); 1178 // ev.xexpose.width, TermWin.height, False);
1342#endif 1179#endif
… …
1344 } 1181 }
1345 else 1182 else
1346 { 1183 {
1347 XEvent unused_event; 1184 XEvent unused_event;
1348 1185
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1350 Expose, 1187 ;
1351 &unused_event)) ;
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1353 GraphicsExpose, 1189 ;
1354 &unused_event)) ; 1190
1355 if (isScrollbarWindow (ev.xany.window)) 1191 if (isScrollbarWindow (ev.xany.window))
1356 { 1192 {
1357 scrollBar.setIdle (); 1193 scrollBar.setIdle ();
1358 scrollbar_show (0); 1194 scrollbar_show (0);
1359 } 1195 }
… …
1500 return; 1336 return;
1501 } 1337 }
1502 1338
1503 /* FALLTHROUGH */ 1339 /* FALLTHROUGH */
1504 case ReparentNotify: 1340 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1342 want_full_refresh = 1;
1508 break; 1343 break;
1509#endif 1344#endif
1510 } 1345 }
1511} 1346}
1512 1347
… …
1856 else if (isMenuBarWindow (ev.window)) 1691 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 1692 menubar_control (ev);
1858#endif 1693#endif
1859} 1694}
1860 1695
1861
1862#ifdef TRANSPARENT 1696#ifdef TRANSPARENT
1697#if TINTING
1698/* shading taken from eterm-0.9.2 */
1699/* RGB 15 */
1700
1701static void
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1709 /* No saturation */
1710 for (y = h; --y >= 0;) {
1711 for (x = -w; x < 0; x++) {
1712 int r, g, b;
1713
1714 b = ((uint16_t *) ptr)[x];
1715 r = (b & 0x7c00) * rm;
1716 g = (b & 0x3e0) * gm;
1717 b = (b & 0x1f) * bm;
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1719 | ((g >> 8) & 0x3e0)
1720 | ((b >> 8) & 0x1f);
1721 }
1722 ptr += bpl;
1723 }
1724 } else {
1725 for (y = h; --y >= 0;) {
1726 for (x = -w; x < 0; x++) {
1727 int r, g, b;
1728
1729 b = ((uint16_t *) ptr)[x];
1730 r = (b & 0x7c00) * rm;
1731 g = (b & 0x3e0) * gm;
1732 b = (b & 0x1f) * bm;
1733 r |= (!(r >> 15) - 1);
1734 g |= (!(g >> 10) - 1);
1735 b |= (!(b >> 5) - 1);
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1737 | ((g >> 8) & 0x3e0)
1738 | ((b >> 8) & 0x1f);
1739 }
1740 ptr += bpl;
1741 }
1742 }
1743}
1744
1745/* RGB 16 */
1746static void
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1754 /* No saturation */
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 }
1769 } else {
1770 for (y = h; --y >= 0;) {
1771 for (x = -w; x < 0; x++) {
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 }
1785 ptr += bpl;
1786 }
1787 }
1788}
1789
1790/* RGB 24 */
1791static void
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1793{
1794 unsigned char *ptr;
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 }
1822 } else {
1823 for (y = h; --y >= 0;) {
1824 for (x = -(w * 3); x < 0; x += 3) {
1825 int r, g, b;
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 }
1853 ptr += bpl;
1854 }
1855 }
1856}
1857
1858/* RGB 32 */
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928}
1929
1930#endif
1931
1863/* 1932/*
1864 * Check our parents are still who we think they are. 1933 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 1934 * Do transparency updates if required
1866 */ 1935 */
1867int 1936int
1868rxvt_term::check_our_parents () 1937rxvt_term::check_our_parents ()
1869{ 1938{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 1939 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 1940 unsigned long nitems, bytes_after;
1872 Atom atype; 1941 Atom atype;
1873 unsigned char *prop = NULL; 1942 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 1943 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 1944 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 1945 XWindowAttributes wattr, wrootattr;
1877 1946
1878 pchanged = 0; 1947 pchanged = 0;
1879 1948
1880 if (! (Options & Opt_transparent)) 1949 if (!(Options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 1950 return pchanged; /* Don't try any more */
1882 1951
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 1952 XGetWindowAttributes (display->display, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 1953 rootdepth = wrootattr.depth;
1885 1954
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1956
1887 if (rootdepth != wattr.depth) 1957 if (rootdepth != wattr.depth)
1888 { 1958 {
1889 if (am_transparent) 1959 if (am_transparent)
1890 { 1960 {
1891 pchanged = 1; 1961 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 1963 am_transparent = am_pixmap_trans = 0;
1895 } 1964 }
1965
1896 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1897 } 1967 }
1898 1968
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 1969 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 1970 XSync (display->display, False);
… …
1902 /* 1972 /*
1903 * Make the frame window set by the window manager have 1973 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 1974 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 1975 * windows for each client, so we have to take care about that.
1906 */ 1976 */
1907 i = (xa[XA_XROOTPMAPID] != 0 1977 i = (xa[XA_XROOTPMAPID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 1980 &nitems, &bytes_after, &prop) == Success);
1981
1982 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success);
1987
1911 if (!i || prop == NULL) 1988 if (!i || prop == NULL)
1912 have_pixmap = 0; 1989 have_pixmap = 0;
1913 else 1990 else
1914 { 1991 {
1915 have_pixmap = 1; 1992 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 1993 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 1994 XFree (prop);
1918 } 1995 }
1996
1919 if (have_pixmap) 1997 if (have_pixmap)
1920 { 1998 {
1921 /* 1999 /*
1922 * Copy display->root pixmap transparency 2000 * Copy display->root pixmap transparency
1923 */ 2001 */
… …
1927 XImage *image; 2005 XImage *image;
1928 GC gc; 2006 GC gc;
1929 XGCValues gcvalue; 2007 XGCValues gcvalue;
1930 2008
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2010 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2011 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2012 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2013 nx = ny = 0;
1936 2014
1937 if (sx < 0) 2015 if (sx < 0)
… …
1949 } 2027 }
1950 2028
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1953 allowedxerror = -1; 2031 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2033
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2035 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2036 allowedxerror = 0;
2037
1959 if (image == NULL) 2038 if (image == NULL)
1960 { 2039 {
1961 if (am_transparent && am_pixmap_trans) 2040 if (am_transparent && am_pixmap_trans)
1962 { 2041 {
1963 pchanged = 1; 2042 pchanged = 1;
… …
1965 { 2044 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2045 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2046 TermWin.pixmap = None;
1968 } 2047 }
1969 } 2048 }
2049
1970 am_pixmap_trans = 0; 2050 am_pixmap_trans = 0;
1971 } 2051 }
1972 else 2052 else
1973 { 2053 {
1974 if (TermWin.pixmap != None) 2054 if (TermWin.pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2055 XFreePixmap (display->display, TermWin.pixmap);
2056
2057#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint))
2059 {
2060 unsigned short shade, rm, gm, bm;
2061
2062 PixColors[Color_tint].get (display, rm, gm, bm);
2063
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 }
2075#endif
2076
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2078 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2081 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2082 XFreeGC (display->display, gc);
1985 XDestroyImage (image); 2083 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1987 TermWin.pixmap); 2085 TermWin.pixmap);
2086
1988 if (!am_transparent || !am_pixmap_trans) 2087 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2088 pchanged = 1;
2089
1990 am_transparent = am_pixmap_trans = 1; 2090 am_transparent = am_pixmap_trans = 1;
1991 } 2091 }
1992 } 2092 }
1993 2093
1994 if (!am_pixmap_trans) 2094 if (!am_pixmap_trans)
1995 { 2095 {
1996 unsigned int n; 2096 unsigned int n;
1997 /* 2097 /*
1998 * InheritPixmap transparency 2098 * InheritPixmap transparency
1999 */ 2099 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2102 {
2004 oldp = TermWin.parent[i]; 2103 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2104 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2105 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2106 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108
2009 if (TermWin.parent[i] == display->root) 2109 if (TermWin.parent[i] == display->root)
2010 { 2110 {
2011 if (oldp != None) 2111 if (oldp != None)
2012 pchanged = 1; 2112 pchanged = 1;
2113
2013 break; 2114 break;
2014 } 2115 }
2116
2015 if (oldp != TermWin.parent[i]) 2117 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2118 pchanged = 1;
2017 } 2119 }
2018 2120
2019 n = 0; 2121 n = 0;
… …
2030 break; 2132 break;
2031 } 2133 }
2032 } 2134 }
2033 } 2135 }
2034 2136
2035 if (n > (int) (sizeof (TermWin.parent) 2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2138 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2139 D_X ((stderr, "InheritPixmap Turning off"));
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt, 2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2142 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2143 /* XXX: also turn off Opt_transparent? */
2045 } 2144 }
2046 else 2145 else
2047 { 2146 {
2147#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2148 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2149 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2150 sleep (1);
2058# endif 2151#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2153 for (n = 0; n < (unsigned int)i; n++)
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2155
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2157 am_transparent = 1;
2066 } 2158 }
2067 2159
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2161 TermWin.parent[i] = None;
2070 } 2162 }
2163
2071 return pchanged; 2164 return pchanged;
2072} 2165}
2073#endif 2166#endif
2074 2167
2075/*}}} */ 2168/*}}} */
2169
2170bool
2171rxvt_term::cmd_parse ()
2172{
2173 bool flag = false;
2174 unicode_t ch = NOCHAR;
2175 unsigned char *seq_begin; // remember start of esc-sequence here
2176
2177 for (;;)
2178 {
2179 if (ch == NOCHAR)
2180 {
2181 seq_begin = cmdbuf_ptr;
2182 ch = next_char ();
2183 }
2184
2185 if (ch == NOCHAR) // TODO: improve
2186 break;
2187
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 {
2190 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false;
2193 int nlines = 0;
2194 unicode_t *str = buf;
2195
2196 *str++ = ch;
2197
2198 for (;;)
2199 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break;
2205
2206 *str++ = ch;
2207
2208 if (ch == C0_LF)
2209 {
2210 nlines++;
2211 refresh_count++;
2212
2213 if (! (Options & Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2215 {
2216 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR;
2219 break;
2220 }
2221
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2223 if (nlines >= TermWin.nrow - 1)
2224 {
2225 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0;
2227 str = buf;
2228 }
2229 }
2230
2231 if (str >= buf + UBUFSIZ)
2232 {
2233 ch = NOCHAR;
2234 break;
2235 }
2236 }
2237
2238 scr_add_lines (buf, nlines, str - buf);
2239
2240 /*
2241 * If there have been a lot of new lines, then update the screen
2242 * What the heck I'll cheat and only refresh less than every page-full.
2243 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */
2249 if (refreshnow)
2250 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++;
2253 else
2254 scr_refresh (refresh_type);
2255 }
2256
2257 }
2258 else
2259 {
2260 try
2261 {
2262 process_nonprinting (ch);
2263 }
2264 catch (const class out_of_input &o)
2265 {
2266 // we ran out of input, retry later
2267 cmdbuf_ptr = seq_begin;
2268 break;
2269 }
2270
2271 ch = NOCHAR;
2272 }
2273 }
2274
2275 return flag;
2276}
2277
2278// read the next character
2279unicode_t
2280rxvt_term::next_char ()
2281{
2282 while (cmdbuf_ptr < cmdbuf_endp)
2283 {
2284 // assume 7-bit to be ascii ALWAYS
2285 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2286 return *cmdbuf_ptr++;
2287
2288 wchar_t wc;
2289 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2290
2291 if (len == (size_t)-2)
2292 {
2293 // the mbstate stores incomplete sequences. didn't know this :/
2294 cmdbuf_ptr = cmdbuf_endp;
2295 break;
2296 }
2297
2298 if (len == (size_t)-1)
2299 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2300
2301 // assume wchar == unicode
2302 cmdbuf_ptr += len;
2303 return wc;
2304 }
2305
2306 return NOCHAR;
2307}
2308
2309/* rxvt_cmd_getc () - Return next input character */
2310/*
2311 * Return the next input character after first passing any keyboard input
2312 * to the command.
2313 */
2314unicode_t
2315rxvt_term::cmd_getc ()
2316{
2317 unicode_t c = next_char ();
2318
2319 if (c == NOCHAR)
2320 throw out_of_input;
2321
2322 return c;
2323}
2076 2324
2077/*{{{ print pipe */ 2325/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2326/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2327#ifdef PRINTPIPE
2080FILE * 2328FILE *
2081rxvt_term::popen_printer () 2329rxvt_term::popen_printer ()
2082{ 2330{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2331 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2332
2085 if (stream == NULL) 2333 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2334 rxvt_warn ("can't open printer pipe, not printing.\n");
2335
2087 return stream; 2336 return stream;
2088} 2337}
2089 2338
2090int 2339int
2091rxvt_term::pclose_printer (FILE *stream) 2340rxvt_term::pclose_printer (FILE *stream)
2092{ 2341{
2093 fflush (stream); 2342 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2343 return pclose (stream);
2100# endif
2101} 2344}
2102 2345
2103/* 2346/*
2104 * simulate attached vt100 printer 2347 * simulate attached vt100 printer
2105 */ 2348 */
2106void 2349void
2107rxvt_term::process_print_pipe () 2350rxvt_term::process_print_pipe ()
2108{ 2351{
2109 int done; 2352 int done;
2110 FILE *fd; 2353 FILE *fd;
2111 2354
2112 if ((fd = popen_printer ()) == NULL) 2355 if ((fd = popen_printer ()) == NULL)
2113 return; 2356 return;
2114 2357
2115 /* 2358 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2359 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2360 * is received.
2118 */ 2361 */
2119 for (done = 0; !done;) 2362 for (done = 0; !done;)
2120 { 2363 {
2121 unsigned char buf[8]; 2364 unsigned char buf[8];
2122 unsigned char ch; 2365 unicode_t ch;
2123 unsigned int i, len; 2366 unsigned int i, len;
2124 2367
2125 if ((ch = cmd_getc ()) != C0_ESC) 2368 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2369 {
2127 if (putc (ch, fd) == EOF) 2370 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2371 break; /* done = 1 */
… …
2143 { 2386 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2387 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2388 break; /* done = 1 */
2146 } 2389 }
2147 } 2390 }
2391
2148 for (i = 0; i < len; i++) 2392 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2393 if (putc (buf[i], fd) == EOF)
2150 { 2394 {
2151 done = 1; 2395 done = 1;
2152 break; 2396 break;
2153 } 2397 }
2154 } 2398 }
2155 } 2399 }
2400
2156 pclose_printer (fd); 2401 pclose_printer (fd);
2157} 2402}
2158#endif /* PRINTPIPE */ 2403#endif /* PRINTPIPE */
2159/*}}} */ 2404/*}}} */
2160 2405
2161/* *INDENT-OFF* */ 2406/* *INDENT-OFF* */
2162enum { 2407enum {
2163 C1_40 = 0x40, 2408 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2409 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2165 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2410 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2166 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2411 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2167 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2412 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2413};
2169/* *INDENT-ON* */ 2414/* *INDENT-ON* */
2170 2415
2171/*{{{ process non-printing single characters */ 2416/*{{{ process non-printing single characters */
2172void 2417void
2173rxvt_term::process_nonprinting (unsigned char ch) 2418rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2419{
2175 switch (ch) 2420 switch (ch)
2176 { 2421 {
2422 case C0_ESC:
2423 process_escape_seq ();
2424 break;
2177 case C0_ENQ: /* terminal Status */ 2425 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2426 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2428 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2429 else
2183 tt_write ((unsigned char *)VT100_ANS, 2430 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2431 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2432 break;
2186 case C0_BEL: /* bell */ 2433 case C0_BEL: /* bell */
2187 scr_bell (); 2434 scr_bell ();
2188 break; 2435 break;
2189 case C0_BS: /* backspace */ 2436 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2451 scr_charset_choose (1);
2205 break; 2452 break;
2206 case C0_SI: /* shift in - acs */ 2453 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2454 scr_charset_choose (0);
2208 break; 2455 break;
2456
2457 // 8-bit controls
2458 case 0x90: /* DCS */
2459 process_dcs_seq ();
2460 break;
2461 case 0x9b: /* CSI */
2462 process_csi_seq ();
2463 break;
2464 case 0x9d: /* CSI */
2465 process_osc_seq ();
2466 break;
2209 } 2467 }
2210} 2468}
2211/*}}} */ 2469/*}}} */
2212 2470
2213 2471
2214/*{{{ process VT52 escape sequences */ 2472/*{{{ process VT52 escape sequences */
2215void 2473void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2474rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2475{
2218 int row, col; 2476 int row, col;
2219 2477
2220 switch (ch) 2478 switch (ch)
2221 { 2479 {
… …
2273 2531
2274/*{{{ process escape sequences */ 2532/*{{{ process escape sequences */
2275void 2533void
2276rxvt_term::process_escape_seq () 2534rxvt_term::process_escape_seq ()
2277{ 2535{
2278 unsigned char ch = cmd_getc (); 2536 unicode_t ch = cmd_getc ();
2279 2537
2280 if (PrivateModes & PrivMode_vt52) 2538 if (PrivateModes & PrivMode_vt52)
2281 { 2539 {
2282 process_escape_vt52 (ch); 2540 process_escape_vt52 (ch);
2283 return; 2541 return;
… …
2331 break; 2589 break;
2332 2590
2333 /* 8.3.87: NEXT LINE */ 2591 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 2592 case C1_NEL: /* ESC E */
2335 { 2593 {
2336 unicode_t nlcr[] = { L'\n', L'\r' }; 2594 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 2595 scr_add_lines (nlcr, 1, 2);
2338 } 2596 }
2339 break; 2597 break;
2340 2598
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 2599 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 2610 case C1_RI: /* ESC M */
2353 scr_index (DN); 2611 scr_index (DN);
2354 break; 2612 break;
2355 2613
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 2614 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 2615 /*case C1_SS2: scr_single_shift (2); break; */
2358 2616
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 2617 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 2618 /*case C1_SS3: scr_single_shift (3); break; */
2361 2619
2362 /* 8.3.27: DEVICE CONTROL STRING */ 2620 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 2621 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 2622 process_dcs_seq ();
2365 break; 2623 break;
… …
2380 process_osc_seq (); 2638 process_osc_seq ();
2381 break; 2639 break;
2382 2640
2383 /* 8.3.106: RESET TO INITIAL STATE */ 2641 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 2642 case 'c':
2643 mbstate.reset ();
2385 scr_poweron (); 2644 scr_poweron ();
2386 scrollbar_show (1); 2645 scrollbar_show (1);
2387 break; 2646 break;
2388 2647
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2648 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 2660
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2661/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 2662/* *INDENT-OFF* */
2404enum { 2663enum {
2405 CSI_ICH = 0x40, 2664 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2665 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2407 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2666 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2408 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2667 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2409 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2668 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2410 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2669 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2411 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2670 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2685 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2686 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2687 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2688 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2689 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2690 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 2691 };
2433/* *INDENT-ON* */ 2692/* *INDENT-ON* */
2434 2693
2435void 2694void
2436rxvt_term::process_csi_seq () 2695rxvt_term::process_csi_seq ()
2437{ 2696{
2438 unsigned char ch, priv, i; 2697 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 2698 unsigned int nargs, p;
2440 int n, ndef; 2699 int n, ndef;
2441 int arg[ESC_ARGS]; 2700 int arg[ESC_ARGS];
2442 2701
2443 for (nargs = ESC_ARGS; nargs > 0;) 2702 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 2703 arg[--nargs] = 0;
2445 2704
2446 priv = 0; 2705 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 2707 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 2708 { /* '<' '=' '>' '?' */
2450 priv = ch; 2709 priv = ch;
2451 ch = cmd_getc (); 2710 ch = cmd_getc ();
2452 } 2711 }
2712
2453 /* read any numerical arguments */ 2713 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 2714 for (n = -1; ch < CSI_ICH; )
2455 { 2715 {
2456 if (isdigit (ch)) 2716 if (isdigit (ch))
2457 { 2717 {
… …
2464 { 2724 {
2465 if (nargs < ESC_ARGS) 2725 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 2726 arg[nargs++] = n;
2467 n = -1; 2727 n = -1;
2468 } 2728 }
2469 else if (ch == '\b') 2729 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 2730 process_nonprinting (ch);
2481 } 2731
2482 ch = cmd_getc (); 2732 ch = cmd_getc ();
2483 } 2733 }
2484 2734
2485 if (ch > CSI_7F) 2735 if (ch > CSI_7F)
2486 return; 2736 return;
… …
2644 tt_printf ("\033[0n"); 2894 tt_printf ("\033[0n");
2645 break; 2895 break;
2646 case 6: /* CPR requested */ 2896 case 6: /* CPR requested */
2647 scr_report_position (); 2897 scr_report_position ();
2648 break; 2898 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 2899 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2901 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2652 break; 2902 break;
2653#endif
2654 case 8: /* unofficial extension */ 2903 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 2905 break;
2657 } 2906 }
2658 break; 2907 break;
2659 2908
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2909 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2728#endif 2977#endif
2729 2978
2730 case CSI_78: /* DECREQTPARM */ 2979 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 2980 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2981 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 2982 break;
2734 2983
2735 default: 2984 default:
2736 break; 2985 break;
2737 } 2986 }
2738} 2987}
… …
2741#ifndef NO_FRILLS 2990#ifndef NO_FRILLS
2742/* ARGSUSED */ 2991/* ARGSUSED */
2743void 2992void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2993rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 2994{
2746 int x, y; 2995 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 2996 XWindowAttributes wattr;
2751 Window wdummy; 2997 Window wdummy;
2752 2998
2753 if (nargs == 0) 2999 if (nargs == 0)
2754 return; 3000 return;
3001
2755 switch (args[0]) 3002 switch (args[0])
2756 { 3003 {
2757 /* 3004 /*
2758 * commands 3005 * commands
2759 */ 3006 */
2760 case 1: /* deiconify window */ 3007 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3008 XMapWindow (display->display, TermWin.parent[0]);
2762 break; 3009 break;
2763 case 2: /* iconify window */ 3010 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3011 XIconifyWindow (display->display, TermWin.parent[0],
… …
2781 break; 3028 break;
2782 case 8: /* set size (chars) */ 3029 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3031 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3032 break;
3033
3034 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3035 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3036 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3037 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3038 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3039 break;
3040
3041
2791 /* 3042 /*
2792 * reports - some output format copied from XTerm 3043 * reports - some output format copied from XTerm
2793 */ 3044 */
2794 case 11: /* report window state */ 3045 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3048 break;
2798 case 13: /* report window position */ 3049 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3052 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3053 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3054 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3055 break;
2805 case 14: /* report window size (pixels) */ 3056 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3059 break;
2809 case 18: /* report window size (chars) */ 3060 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3062 break;
2812#if 0 /* XXX: currently disabled due to security concerns */ 3063 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3065 break;
2813 case 20: /* report icon label */ 3066 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 {
3069 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3070 XGetIconName (display->display, TermWin.parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3072 }
2816 break; 3073 break;
2817 case 21: /* report window title */ 3074 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3078 XFetchName (display->display, TermWin.parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2820 break; 3081 break;
2821#endif
2822
2823 } 3082 }
2824} 3083}
2825#endif 3084#endif
2826 3085
2827/*----------------------------------------------------------------------*/ 3086/*----------------------------------------------------------------------*/
2828/* 3087/*
2829 * get input up until STRING TERMINATOR (or BEL) 3088 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3089 * ends_how is terminator used. returned input must be free()'d
2831 */ 3090 */
2832unsigned char * 3091unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3092rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3093{
2835 int seen_esc = 0; /* seen escape? */ 3094 int seen_esc = 0; /* seen escape? */
2836 unsigned int n = 0; 3095 unsigned int n = 0;
2837 unsigned char *s; 3096 unsigned char *s;
3097 unicode_t ch;
2838 unsigned char ch, string[STRING_MAX]; 3098 unsigned char string[STRING_MAX];
2839 3099
2840 for (; (ch = cmd_getc ());) 3100 while ((ch = cmd_getc ()))
2841 { 3101 {
2842 if (ch == C0_BEL 3102 if (ch == C0_BEL || ch == CHAR_ST)
2843 || ch == CHAR_ST 3103 break;
3104
3105 if (seen_esc)
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3106 if (ch == 0x5c) /* 7bit ST */
2845 break; 3107 break;
3108 else
3109 return NULL;
3110
2846 if (ch == C0_ESC) 3111 if (ch == C0_ESC)
2847 { 3112 {
2848 seen_esc = 1; 3113 seen_esc = 1;
2849 continue; 3114 continue;
2850 } 3115 }
2851 else if (ch == '\t') 3116 else if (ch == C0_HT)
2852 ch = ' '; /* translate '\t' to space */ 3117 ch = ' '; /* translate '\t' to space */
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
2854 return NULL; /* other control character - exit */ 3119 return NULL; /* other control character - exit */
3120
2855 if (n < sizeof (string) - 1) 3121 if (n >= sizeof (string) - 1)
3122 // stop at some sane length
3123 return NULL;
3124
2856 string[n++] = ch; 3125 string[n++] = ch;
2857 seen_esc = 0; 3126 seen_esc = 0;
2858 } 3127 }
3128
2859 string[n++] = '\0'; 3129 string[n++] = '\0';
3130
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2861 return NULL; 3132 return NULL;
3133
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3134 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3135 STRNCPY (s, string, n);
2864 return s; 3136 return s;
2865} 3137}
2866 3138
2867/*----------------------------------------------------------------------*/ 3139/*----------------------------------------------------------------------*/
… …
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3142 */
2871void 3143void
2872rxvt_term::process_dcs_seq () 3144rxvt_term::process_dcs_seq ()
2873{ 3145{
2874 unsigned char eh, *s; 3146 unsigned char *s;
3147 unicode_t eh;
3148
2875 /* 3149 /*
2876 * Not handled yet 3150 * Not handled yet
2877 */ 3151 */
2878 s = get_to_st (&eh); 3152 s = get_to_st (eh);
2879 if (s) 3153 if (s)
2880 free (s); 3154 free (s);
3155
2881 return; 3156 return;
2882} 3157}
2883 3158
2884/*----------------------------------------------------------------------*/ 3159/*----------------------------------------------------------------------*/
2885/* 3160/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3161 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3162 */
2888void 3163void
2889rxvt_term::process_osc_seq () 3164rxvt_term::process_osc_seq ()
2890{ 3165{
2891 unsigned char ch, eh, *s; 3166 unicode_t ch, eh;
2892 int arg; 3167 int arg;
2893 3168
2894 ch = cmd_getc (); 3169 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3170 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3171 arg = arg * 10 + (ch - '0');
2897 3172
2898 if (ch == ';') 3173 if (ch == ';')
2899 { 3174 {
2900 s = get_to_st (&eh); 3175 unsigned char *s = get_to_st (eh);
3176
2901 if (s) 3177 if (s)
2902 { 3178 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3179 process_xterm_seq (arg, (char *)s, eh);
2915 free (s); 3180 free (s);
2916 } 3181 }
2917 } 3182 }
2918} 3183}
3184
3185void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3187{
3188 if (str[0] == '?' && !str[1])
3189 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b);
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3195 }
3196 }
3197 else
3198 set_window_color (color, str);
3199}
3200
2919/* 3201/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title 3203 * 0 = change iconName/title
2922 * 1 = change iconName 3204 * 1 = change iconName
2923 * 2 = change title 3205 * 2 = change title
2924 * 4 = change color 3206 * 4 = change color
3207 * 10 = change fg color
3208 * 11 = change bg color
2925 * 12 = change text color 3209 * 12 = change text color
2926 * 13 = change mouse foreground color 3210 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour 3211 * 17 = change highlight character colour
2928 * 18 = change bold character color 3212 * 18 = change bold character color
2929 * 19 = change underlined character color 3213 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented) 3214 * 46 = change logfile (not implemented)
2931 * 50 = change font 3215 * 50 = change font
2932 * 3216 *
2933 * rxvt extensions: 3217 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap 3218 * 20 = bg pixmap
2936 * 39 = change default fg color 3219 * 39 = change default fg color
2937 * 49 = change default bg color 3220 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen 3221 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale 3222 * 701 = change locale
2940 * 702 = find font 3223 * 702 = find font
3224 * 703 = menu
2941 */ 3225 */
2942void 3226void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3227rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2944{ 3228{
2945 int changed = 0; 3229 int changed = 0;
2946 int color; 3230 int color;
2947 char *buf, *name; 3231 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1];
2948 3233
2949 assert (str != NULL); 3234 assert (str != NULL);
2950 switch (op) 3235 switch (op)
2951 { 3236 {
2952 case XTerm_name: 3237 case XTerm_name:
2953 set_title (str); 3238 set_title (str);
2954 /* FALLTHROUGH */ 3239 /* FALLTHROUGH */
2955 case XTerm_iconName: 3240 case XTerm_iconName:
2956 set_iconName (str); 3241 set_icon_name (str);
2957 break; 3242 break;
2958 case XTerm_title: 3243 case XTerm_title:
2959 set_title (str); 3244 set_title (str);
2960 break; 3245 break;
3246 case XTerm_property:
3247 if (str[0] == '?')
3248 {
3249 Atom prop = XInternAtom (display->display, str + 1, True);
3250 Atom actual_type;
3251 int actual_format;
3252 unsigned long nitems;
3253 unsigned long bytes_after;
3254 unsigned char *value = 0;
3255 const char *str = "";
3256
3257 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None
3263 && actual_format == 8)
3264 str = (const char *)(value);
3265
3266 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3267
3268 XFree (value);
3269 }
3270 else
3271 {
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273
3274 if (eq)
3275 {
3276 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0],
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 }
3282 else
3283 XDeleteProperty (display->display, TermWin.parent[0],
3284 display->atom (str));
3285 }
3286 break;
3287
2961 case XTerm_Color: 3288 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3289 for (buf = (char *)str; buf && *buf;)
2963 { 3290 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3291 if ((name = STRCHR (buf, ';')) == NULL)
2965 break; 3292 break;
3293
2966 *name++ = '\0'; 3294 *name++ = '\0';
2967 color = atoi (buf); 3295 color = atoi (buf);
3296
2968 if (color < 0 || color >= TOTAL_COLORS) 3297 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3298 break;
3299
2970 if ((buf = STRCHR (name, ';')) != NULL) 3300 if ((buf = STRCHR (name, ';')) != NULL)
2971 *buf++ = '\0'; 3301 *buf++ = '\0';
3302
3303 if (name[0] == '?' && !name[1])
3304 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 }
3312 else
2972 set_window_color (color + minCOLOR, name); 3313 set_window_color (color + minCOLOR, name);
2973 } 3314 }
3315 break;
3316 case XTerm_Color00:
3317 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3318 break;
3319 case XTerm_Color01:
3320 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2974 break; 3321 break;
2975#ifndef NO_CURSORCOLOR 3322#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3323 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3324 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3325 break;
2979#endif 3326#endif
2980 case XTerm_Color_pointer: 3327 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3328 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3329 break;
3330 case XTerm_Color_pointer_bg:
3331 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2982 break; 3332 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3333#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3334 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2986 break; 3336 break;
2987 case XTerm_Color_UL: 3337 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3339 break;
2990 case XTerm_Color_RV: 3340 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3342 break;
2993#endif 3343#endif
2994 3344
2995 case XTerm_Menu:
2996 /*
2997 * rxvt_menubar_dispatch () violates the constness of the string,
2998 * so DON'T do it here
2999 */
3000 break;
3001 case XTerm_Pixmap: 3345 case XTerm_Pixmap:
3002 if (*str != ';') 3346 if (*str != ';')
3003 { 3347 {
3004#if XPM_BACKGROUND 3348#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3349 scale_pixmap (""); /* reset to default scaling */
… …
3028 set_window_color (Color_fg, str); 3372 set_window_color (Color_fg, str);
3029 break; 3373 break;
3030 case XTerm_restoreBG: 3374 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3375 set_window_color (Color_bg, str);
3032 break; 3376 break;
3377
3033 case XTerm_logfile: 3378 case XTerm_logfile:
3379 // TODO, when secure mode?
3034 break; 3380 break;
3381
3035 case XTerm_font: 3382 case XTerm_font:
3383 if (query)
3384 {
3385 if (Options & Opt_insecure)
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3387 TermWin.fontset->fontdesc
3388 ? TermWin.fontset->fontdesc
3389 : "",
3390 resp);
3391 }
3392 else
3036 change_font (str); 3393 change_font (str);
3037 break; 3394 break;
3395
3038#ifndef NO_FRILLS 3396#ifndef NO_FRILLS
3039 case XTerm_locale: 3397 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3398 if (query)
3041 tt_printf ("%-.250s\n", locale); 3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3402 }
3042 else 3403 else
3043 { 3404 {
3044 set_locale (str); 3405 set_locale (str);
3045# ifdef USE_XIM 3406# ifdef USE_XIM
3046 im_cb (); 3407 im_cb ();
3047# endif 3408# endif
3048 } 3409 }
3049 break; 3410 break;
3411
3050 case XTerm_findfont: 3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3051 { 3414 {
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3415 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3054 } 3418 }
3419 break;
3420#endif
3421
3422#ifdef MENUBAR
3423 case XTerm_Menu:
3424 if (Options & Opt_insecure)
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3055 break; 3426 break;
3056#endif 3427#endif
3057#if 0 3428#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3429 case XTerm_dumpscreen: /* no error notices */
3059 { 3430 {
3060 int fd; 3431 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3432 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3433 {
3063 scr_dump (fd); 3434 scr_dump (fd);
3064 close (fd); 3435 close (fd);
3065 } 3436 }
3066 } 3437 }
3067 break; 3438 break;
3068#endif 3439#endif
3069
3070 } 3440 }
3071} 3441}
3072/*----------------------------------------------------------------------*/ 3442/*----------------------------------------------------------------------*/
3073 3443
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3444/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3452 * so no need for fancy checking
3083 */ 3453 */
3084int 3454int
3085rxvt_term::privcases (int mode, unsigned long bit) 3455rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3456{
3087 int state; 3457 int state;
3088 3458
3089 if (mode == 's') 3459 if (mode == 's')
3090 { 3460 {
3091 SavedModes |= (PrivateModes & bit); 3461 SavedModes |= (PrivateModes & bit);
3092 return -1; 3462 return -1;
… …
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3468 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3100 PrivMode (state, bit); 3470 PrivMode (state, bit);
3101 } 3471 }
3472
3102 return state; 3473 return state;
3103} 3474}
3104 3475
3105/* we're not using priv _yet_ */ 3476/* we're not using priv _yet_ */
3106void 3477void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3478rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3108{ 3479{
3109 unsigned int i, j; 3480 unsigned int i, j;
3110 int state; 3481 int state;
3482
3111 static const struct 3483 static const struct
3112 { 3484 {
3113 const int argval; 3485 const int argval;
3114 const unsigned long bit; 3486 const unsigned long bit;
3115 } 3487 }
3488
3116 argtopriv[] = { 3489 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3490 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3491 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3492 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3493 { 4, PrivMode_smoothScroll },
… …
3150 // 1035 enable modifiers for alt, numlock NYI 3523 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI 3524 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI 3525 // 1037 send DEL for keypad delete NYI
3153 { 1047, PrivMode_Screen }, 3526 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor 3527 // 1048 save and restore cursor
3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3528 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3529 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3157 }; 3530 };
3158 3531
3159 if (nargs == 0) 3532 if (nargs == 0)
3160 return; 3533 return;
… …
3179 3552
3180 /* extra handling for values with state unkept */ 3553 /* extra handling for values with state unkept */
3181 switch (arg[i]) 3554 switch (arg[i])
3182 { 3555 {
3183 case 1048: /* alternative cursor save */ 3556 case 1048: /* alternative cursor save */
3184 case 1049: 3557 if (Options & Opt_secondaryScreen)
3185 if (mode == 0) 3558 if (mode == 0)
3186 scr_cursor (RESTORE); 3559 scr_cursor (RESTORE);
3187 else if (mode == 1) 3560 else if (mode == 1)
3188 scr_cursor (SAVE); 3561 scr_cursor (SAVE);
3189 /* FALLTHROUGH */ 3562 break;
3190 } 3563 }
3191 3564
3192 if (state >= 0) 3565 if (state >= 0)
3193 /* extra handling for values with valid 0 or 1 state */ 3566 /* extra handling for values with valid 0 or 1 state */
3194 switch (arg[i]) 3567 switch (arg[i])
… …
3218 scr_relative_origin (state); 3591 scr_relative_origin (state);
3219 break; 3592 break;
3220 case 7: /* autowrap */ 3593 case 7: /* autowrap */
3221 scr_autowrap (state); 3594 scr_autowrap (state);
3222 break; 3595 break;
3223 /* case 8: - auto repeat, can't do on a per window basis */ 3596 /* case 8: - auto repeat, can't do on a per window basis */
3224 case 9: /* X10 mouse reporting */ 3597 case 9: /* X10 mouse reporting */
3225 if (state) /* orthogonal */ 3598 if (state) /* orthogonal */
3226 PrivateModes &= ~ (PrivMode_MouseX11); 3599 PrivateModes &= ~PrivMode_MouseX11;
3227 break; 3600 break;
3228#ifdef menuBar_esc 3601#ifdef menuBar_esc
3229 case menuBar_esc: 3602 case menuBar_esc:
3230#ifdef MENUBAR 3603#ifdef MENUBAR
3231 map_menuBar (state); 3604 map_menuBar (state);
… …
3242 break; 3615 break;
3243#endif 3616#endif
3244 case 25: /* visible/invisible cursor */ 3617 case 25: /* visible/invisible cursor */
3245 scr_cursor_visible (state); 3618 scr_cursor_visible (state);
3246 break; 3619 break;
3247 /* case 35: - shift keys */ 3620 /* case 35: - shift keys */
3248 /* case 40: - 80 <--> 132 mode */ 3621 /* case 40: - 80 <--> 132 mode */
3249 case 47: /* secondary screen */ 3622 case 47: /* secondary screen */
3250 scr_change_screen (state); 3623 scr_change_screen (state);
3251 break; 3624 break;
3252 /* case 66: - application key pad */ 3625 /* case 66: - application key pad */
3253 /* case 67: - backspace key */ 3626 /* case 67: - backspace key */
3254 case 1000: /* X11 mouse reporting */ 3627 case 1000: /* X11 mouse reporting */
3255 if (state) /* orthogonal */ 3628 if (state) /* orthogonal */
3256 PrivateModes &= ~ (PrivMode_MouseX10); 3629 PrivateModes &= ~PrivMode_MouseX10;
3257 break; 3630 break;
3258#if 0 3631#if 0
3259 case 1001: 3632 case 1001:
3260 break; /* X11 mouse highlighting */ 3633 break; /* X11 mouse highlighting */
3261#endif 3634#endif
… …
3269 if (state) 3642 if (state)
3270 Options |= Opt_scrollTtyKeypress; 3643 Options |= Opt_scrollTtyKeypress;
3271 else 3644 else
3272 Options &= ~Opt_scrollTtyKeypress; 3645 Options &= ~Opt_scrollTtyKeypress;
3273 break; 3646 break;
3274 case 1047: /* secondary screen w/ clearing */ 3647 case 1047: /* secondary screen w/ clearing last */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3648 if (Options & Opt_secondaryScreen)
3276 if (current_screen != PRIMARY) 3649 if (current_screen != PRIMARY)
3277 scr_erase_screen (2); 3650 scr_erase_screen (2);
3278 scr_change_screen (state); 3651 scr_change_screen (state);
3279 /* FALLTHROUGH */ 3652 break;
3653 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen)
3656 if (current_screen != PRIMARY)
3657 scr_erase_screen (2);
3658 break;
3280 default: 3659 default:
3281 break; 3660 break;
3282 } 3661 }
3283 } 3662 }
3284} 3663}
… …
3286 3665
3287/*{{{ process sgr sequences */ 3666/*{{{ process sgr sequences */
3288void 3667void
3289rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3668rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3290{ 3669{
3291 unsigned int i; 3670 unsigned int i;
3292 short rendset; 3671 short rendset;
3293 int rendstyle; 3672 int rendstyle;
3294 3673
3295 if (nargs == 0) 3674 if (nargs == 0)
3296 { 3675 {
3297 scr_rendition (0, ~RS_None); 3676 scr_rendition (0, ~RS_None);
3298 return; 3677 return;
3299 } 3678 }
3679
3300 for (i = 0; i < nargs; i++) 3680 for (i = 0; i < nargs; i++)
3301 { 3681 {
3302 rendset = -1; 3682 rendset = -1;
3303 switch (arg[i]) 3683 switch (arg[i])
3304 { 3684 {
… …
3312 rendset = 1, rendstyle = RS_Uline; 3692 rendset = 1, rendstyle = RS_Uline;
3313 break; 3693 break;
3314 case 5: 3694 case 5:
3315 rendset = 1, rendstyle = RS_Blink; 3695 rendset = 1, rendstyle = RS_Blink;
3316 break; 3696 break;
3697 //case 6: // scoansi light background
3317 case 7: 3698 case 7:
3318 rendset = 1, rendstyle = RS_RVid; 3699 rendset = 1, rendstyle = RS_RVid;
3319 break; 3700 break;
3320 case 8: 3701 case 8:
3321 // invisible. NYI 3702 // invisible. NYI
3703 break;
3704 //case 10: // scoansi acs off
3705 //case 11: // scoansi acs on
3706 //case 12: // scoansi acs on, |0x80
3707 case 21: // disable bold, blink and invis (some terminals use this)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink;
3322 break; 3709 break;
3323 case 22: 3710 case 22:
3324 rendset = 0, rendstyle = RS_Bold; 3711 rendset = 0, rendstyle = RS_Bold;
3325 break; 3712 break;
3326 case 24: 3713 case 24:
… …
3419 } 3806 }
3420 } 3807 }
3421} 3808}
3422/*}}} */ 3809/*}}} */
3423 3810
3424/*{{{ process Rob Nation's own graphics mode sequences */ 3811/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 3812void
3426rxvt_term::process_graphics () 3813rxvt_term::process_graphics ()
3427{ 3814{
3428 unsigned char ch, cmd = cmd_getc (); 3815 unicode_t ch, cmd = cmd_getc ();
3429 3816
3430 if (cmd == 'Q') 3817 if (cmd == 'Q')
3431 { /* query graphics */ 3818 { /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 3819 tt_printf ("\033G0\n"); /* no graphics */
3433 return; 3820 return;

Diff Legend

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