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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.93 by pcg, Thu Apr 8 20:31:45 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 uint32_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 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_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
868uint32_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 */
904uint32_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 uint32_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,
… …
1500 return; 1337 return;
1501 } 1338 }
1502 1339
1503 /* FALLTHROUGH */ 1340 /* FALLTHROUGH */
1504 case ReparentNotify: 1341 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1343 want_full_refresh = 1;
1508 break; 1344 break;
1509#endif 1345#endif
1510 } 1346 }
1511} 1347}
1512 1348
… …
1856 else if (isMenuBarWindow (ev.window)) 1692 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 1693 menubar_control (ev);
1858#endif 1694#endif
1859} 1695}
1860 1696
1861
1862#ifdef TRANSPARENT 1697#ifdef TRANSPARENT
1698#if TINTING
1699/* shading taken from eterm-0.9.2 */
1700/* RGB 15 */
1701
1702static void
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1710 /* No saturation */
1711 for (y = h; --y >= 0;) {
1712 for (x = -w; x < 0; x++) {
1713 int r, g, b;
1714
1715 b = ((uint16_t *) ptr)[x];
1716 r = (b & 0x7c00) * rm;
1717 g = (b & 0x3e0) * gm;
1718 b = (b & 0x1f) * bm;
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1720 | ((g >> 8) & 0x3e0)
1721 | ((b >> 8) & 0x1f);
1722 }
1723 ptr += bpl;
1724 }
1725 } else {
1726 for (y = h; --y >= 0;) {
1727 for (x = -w; x < 0; x++) {
1728 int r, g, b;
1729
1730 b = ((uint16_t *) ptr)[x];
1731 r = (b & 0x7c00) * rm;
1732 g = (b & 0x3e0) * gm;
1733 b = (b & 0x1f) * bm;
1734 r |= (!(r >> 15) - 1);
1735 g |= (!(g >> 10) - 1);
1736 b |= (!(b >> 5) - 1);
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1738 | ((g >> 8) & 0x3e0)
1739 | ((b >> 8) & 0x1f);
1740 }
1741 ptr += bpl;
1742 }
1743 }
1744}
1745
1746/* RGB 16 */
1747static void
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1749{
1750 unsigned char *ptr;
1751 int x, y;
1752
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1755 /* No saturation */
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 }
1770 } else {
1771 for (y = h; --y >= 0;) {
1772 for (x = -w; x < 0; x++) {
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 }
1786 ptr += bpl;
1787 }
1788 }
1789}
1790
1791/* RGB 24 */
1792static void
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1794{
1795 unsigned char *ptr;
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 }
1823 } else {
1824 for (y = h; --y >= 0;) {
1825 for (x = -(w * 3); x < 0; x += 3) {
1826 int r, g, b;
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 }
1854 ptr += bpl;
1855 }
1856 }
1857}
1858
1859/* RGB 32 */
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929}
1930
1931#endif
1932
1863/* 1933/*
1864 * Check our parents are still who we think they are. 1934 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 1935 * Do transparency updates if required
1866 */ 1936 */
1867int 1937int
1868rxvt_term::check_our_parents () 1938rxvt_term::check_our_parents ()
1869{ 1939{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 1940 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 1941 unsigned long nitems, bytes_after;
1872 Atom atype; 1942 Atom atype;
1873 unsigned char *prop = NULL; 1943 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 1944 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 1945 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 1946 XWindowAttributes wattr, wrootattr;
1877 1947
1878 pchanged = 0; 1948 pchanged = 0;
1879 1949
1880 if (! (Options & Opt_transparent)) 1950 if (!(Options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 1951 return pchanged; /* Don't try any more */
1882 1952
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 1953 XGetWindowAttributes (display->display, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 1954 rootdepth = wrootattr.depth;
1885 1955
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1957
1887 if (rootdepth != wattr.depth) 1958 if (rootdepth != wattr.depth)
1888 { 1959 {
1889 if (am_transparent) 1960 if (am_transparent)
1890 { 1961 {
1891 pchanged = 1; 1962 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 1964 am_transparent = am_pixmap_trans = 0;
1895 } 1965 }
1966
1896 return pchanged; /* Don't try any more */ 1967 return pchanged; /* Don't try any more */
1897 } 1968 }
1898 1969
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 1970 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 1971 XSync (display->display, False);
… …
1902 /* 1973 /*
1903 * Make the frame window set by the window manager have 1974 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 1975 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 1976 * windows for each client, so we have to take care about that.
1906 */ 1977 */
1907 i = (xa[XA_XROOTPMAPID] != 0 1978 i = (xa[XA_XROOTPMAPID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 1981 &nitems, &bytes_after, &prop) == Success);
1982
1983 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success);
1988
1911 if (!i || prop == NULL) 1989 if (!i || prop == NULL)
1912 have_pixmap = 0; 1990 have_pixmap = 0;
1913 else 1991 else
1914 { 1992 {
1915 have_pixmap = 1; 1993 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 1994 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 1995 XFree (prop);
1918 } 1996 }
1997
1919 if (have_pixmap) 1998 if (have_pixmap)
1920 { 1999 {
1921 /* 2000 /*
1922 * Copy display->root pixmap transparency 2001 * Copy display->root pixmap transparency
1923 */ 2002 */
… …
1927 XImage *image; 2006 XImage *image;
1928 GC gc; 2007 GC gc;
1929 XGCValues gcvalue; 2008 XGCValues gcvalue;
1930 2009
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2011 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2012 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2013 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2014 nx = ny = 0;
1936 2015
1937 if (sx < 0) 2016 if (sx < 0)
… …
1949 } 2028 }
1950 2029
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1953 allowedxerror = -1; 2032 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2034
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2036 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2037 allowedxerror = 0;
2038
1959 if (image == NULL) 2039 if (image == NULL)
1960 { 2040 {
1961 if (am_transparent && am_pixmap_trans) 2041 if (am_transparent && am_pixmap_trans)
1962 { 2042 {
1963 pchanged = 1; 2043 pchanged = 1;
… …
1965 { 2045 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2046 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2047 TermWin.pixmap = None;
1968 } 2048 }
1969 } 2049 }
2050
1970 am_pixmap_trans = 0; 2051 am_pixmap_trans = 0;
1971 } 2052 }
1972 else 2053 else
1973 { 2054 {
1974 if (TermWin.pixmap != None) 2055 if (TermWin.pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2056 XFreePixmap (display->display, TermWin.pixmap);
2057
2058#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint))
2060 {
2061 unsigned short shade, rm, gm, bm;
2062
2063 PixColors[Color_tint].get (display, rm, gm, bm);
2064
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 }
2076#endif
2077
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2079 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2082 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2083 XFreeGC (display->display, gc);
1985 XDestroyImage (image); 2084 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1987 TermWin.pixmap); 2086 TermWin.pixmap);
2087
1988 if (!am_transparent || !am_pixmap_trans) 2088 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2089 pchanged = 1;
2090
1990 am_transparent = am_pixmap_trans = 1; 2091 am_transparent = am_pixmap_trans = 1;
1991 } 2092 }
1992 } 2093 }
1993 2094
1994 if (!am_pixmap_trans) 2095 if (!am_pixmap_trans)
1995 { 2096 {
1996 unsigned int n; 2097 unsigned int n;
1997 /* 2098 /*
1998 * InheritPixmap transparency 2099 * InheritPixmap transparency
1999 */ 2100 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2103 {
2004 oldp = TermWin.parent[i]; 2104 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2105 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2106 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2107 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109
2009 if (TermWin.parent[i] == display->root) 2110 if (TermWin.parent[i] == display->root)
2010 { 2111 {
2011 if (oldp != None) 2112 if (oldp != None)
2012 pchanged = 1; 2113 pchanged = 1;
2114
2013 break; 2115 break;
2014 } 2116 }
2117
2015 if (oldp != TermWin.parent[i]) 2118 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2119 pchanged = 1;
2017 } 2120 }
2018 2121
2019 n = 0; 2122 n = 0;
… …
2030 break; 2133 break;
2031 } 2134 }
2032 } 2135 }
2033 } 2136 }
2034 2137
2035 if (n > (int) (sizeof (TermWin.parent) 2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2139 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2140 D_X ((stderr, "InheritPixmap Turning off"));
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt, 2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2143 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2144 /* XXX: also turn off Opt_transparent? */
2045 } 2145 }
2046 else 2146 else
2047 { 2147 {
2148#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2149 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2150 * 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); 2151 sleep (1);
2058# endif 2152#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2154 for (n = 0; n < (unsigned int)i; n++)
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2156
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2158 am_transparent = 1;
2066 } 2159 }
2067 2160
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2162 TermWin.parent[i] = None;
2070 } 2163 }
2164
2071 return pchanged; 2165 return pchanged;
2072} 2166}
2073#endif 2167#endif
2074 2168
2075/*}}} */ 2169/*}}} */
2170
2171bool
2172rxvt_term::cmd_parse ()
2173{
2174 bool flag = false;
2175 unicode_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here
2177
2178 for (;;)
2179 {
2180 if (ch == NOCHAR)
2181 {
2182 seq_begin = cmdbuf_ptr;
2183 ch = next_char ();
2184 }
2185
2186 if (ch == NOCHAR) // TODO: improve
2187 break;
2188
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 {
2191 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false;
2194 int nlines = 0;
2195 unicode_t *str = buf;
2196
2197 *str++ = ch;
2198
2199 for (;;)
2200 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break;
2206
2207 *str++ = ch;
2208
2209 if (ch == C0_LF)
2210 {
2211 nlines++;
2212 refresh_count++;
2213
2214 if (! (Options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2216 {
2217 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR;
2220 break;
2221 }
2222
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1)
2225 {
2226 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0;
2228 str = buf;
2229 }
2230 }
2231
2232 if (str >= buf + UBUFSIZ)
2233 {
2234 ch = NOCHAR;
2235 break;
2236 }
2237 }
2238
2239 scr_add_lines (buf, nlines, str - buf);
2240
2241 /*
2242 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */
2250 if (refreshnow)
2251 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++;
2254 else
2255 scr_refresh (refresh_type);
2256 }
2257
2258 }
2259 else
2260 {
2261 try
2262 {
2263 process_nonprinting (ch);
2264 }
2265 catch (const class out_of_input &o)
2266 {
2267 // we ran out of input, retry later
2268 cmdbuf_ptr = seq_begin;
2269 break;
2270 }
2271
2272 ch = NOCHAR;
2273 }
2274 }
2275
2276 return flag;
2277}
2278
2279// read the next character
2280unicode_t
2281rxvt_term::next_char ()
2282{
2283 while (cmdbuf_ptr < cmdbuf_endp)
2284 {
2285 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2287 return *cmdbuf_ptr++;
2288
2289 wchar_t wc;
2290 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2291
2292 if (len == (size_t)-2)
2293 {
2294 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp;
2296 break;
2297 }
2298
2299 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301
2302 // assume wchar == unicode
2303 cmdbuf_ptr += len;
2304 return wc;
2305 }
2306
2307 return NOCHAR;
2308}
2309
2310/* rxvt_cmd_getc () - Return next input character */
2311/*
2312 * Return the next input character after first passing any keyboard input
2313 * to the command.
2314 */
2315unicode_t
2316rxvt_term::cmd_getc ()
2317{
2318 unicode_t c = next_char ();
2319
2320 if (c == NOCHAR)
2321 throw out_of_input;
2322
2323 return c;
2324}
2076 2325
2077/*{{{ print pipe */ 2326/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2327/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2328#ifdef PRINTPIPE
2080FILE * 2329FILE *
2081rxvt_term::popen_printer () 2330rxvt_term::popen_printer ()
2082{ 2331{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2332 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2333
2085 if (stream == NULL) 2334 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2335 rxvt_warn ("can't open printer pipe, not printing.\n");
2336
2087 return stream; 2337 return stream;
2088} 2338}
2089 2339
2090int 2340int
2091rxvt_term::pclose_printer (FILE *stream) 2341rxvt_term::pclose_printer (FILE *stream)
2092{ 2342{
2093 fflush (stream); 2343 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); 2344 return pclose (stream);
2100# endif
2101} 2345}
2102 2346
2103/* 2347/*
2104 * simulate attached vt100 printer 2348 * simulate attached vt100 printer
2105 */ 2349 */
2106void 2350void
2107rxvt_term::process_print_pipe () 2351rxvt_term::process_print_pipe ()
2108{ 2352{
2109 int done; 2353 int done;
2110 FILE *fd; 2354 FILE *fd;
2111 2355
2112 if ((fd = popen_printer ()) == NULL) 2356 if ((fd = popen_printer ()) == NULL)
2113 return; 2357 return;
2114 2358
2115 /* 2359 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2360 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2361 * is received.
2118 */ 2362 */
2119 for (done = 0; !done;) 2363 for (done = 0; !done;)
2120 { 2364 {
2121 unsigned char buf[8]; 2365 unsigned char buf[8];
2122 unsigned char ch; 2366 unicode_t ch;
2123 unsigned int i, len; 2367 unsigned int i, len;
2124 2368
2125 if ((ch = cmd_getc ()) != C0_ESC) 2369 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2370 {
2127 if (putc (ch, fd) == EOF) 2371 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2372 break; /* done = 1 */
… …
2143 { 2387 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2388 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2389 break; /* done = 1 */
2146 } 2390 }
2147 } 2391 }
2392
2148 for (i = 0; i < len; i++) 2393 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2394 if (putc (buf[i], fd) == EOF)
2150 { 2395 {
2151 done = 1; 2396 done = 1;
2152 break; 2397 break;
2153 } 2398 }
2154 } 2399 }
2155 } 2400 }
2401
2156 pclose_printer (fd); 2402 pclose_printer (fd);
2157} 2403}
2158#endif /* PRINTPIPE */ 2404#endif /* PRINTPIPE */
2159/*}}} */ 2405/*}}} */
2160 2406
2161/* *INDENT-OFF* */ 2407/* *INDENT-OFF* */
2162enum { 2408enum {
2163 C1_40 = 0x40, 2409 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2410 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, 2411 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, 2412 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 2413 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2414};
2169/* *INDENT-ON* */ 2415/* *INDENT-ON* */
2170 2416
2171/*{{{ process non-printing single characters */ 2417/*{{{ process non-printing single characters */
2172void 2418void
2173rxvt_term::process_nonprinting (unsigned char ch) 2419rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2420{
2175 switch (ch) 2421 switch (ch)
2176 { 2422 {
2423 case C0_ESC:
2424 process_escape_seq ();
2425 break;
2177 case C0_ENQ: /* terminal Status */ 2426 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2427 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2430 else
2183 tt_write ((unsigned char *)VT100_ANS, 2431 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2432 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2433 break;
2186 case C0_BEL: /* bell */ 2434 case C0_BEL: /* bell */
2187 scr_bell (); 2435 scr_bell ();
2188 break; 2436 break;
2189 case C0_BS: /* backspace */ 2437 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2452 scr_charset_choose (1);
2205 break; 2453 break;
2206 case C0_SI: /* shift in - acs */ 2454 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2455 scr_charset_choose (0);
2208 break; 2456 break;
2457
2458 // 8-bit controls
2459 case 0x90: /* DCS */
2460 process_dcs_seq ();
2461 break;
2462 case 0x9b: /* CSI */
2463 process_csi_seq ();
2464 break;
2465 case 0x9d: /* CSI */
2466 process_osc_seq ();
2467 break;
2209 } 2468 }
2210} 2469}
2211/*}}} */ 2470/*}}} */
2212 2471
2213 2472
2214/*{{{ process VT52 escape sequences */ 2473/*{{{ process VT52 escape sequences */
2215void 2474void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2475rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2476{
2218 int row, col; 2477 int row, col;
2219 2478
2220 switch (ch) 2479 switch (ch)
2221 { 2480 {
… …
2273 2532
2274/*{{{ process escape sequences */ 2533/*{{{ process escape sequences */
2275void 2534void
2276rxvt_term::process_escape_seq () 2535rxvt_term::process_escape_seq ()
2277{ 2536{
2278 unsigned char ch = cmd_getc (); 2537 unicode_t ch = cmd_getc ();
2279 2538
2280 if (PrivateModes & PrivMode_vt52) 2539 if (PrivateModes & PrivMode_vt52)
2281 { 2540 {
2282 process_escape_vt52 (ch); 2541 process_escape_vt52 (ch);
2283 return; 2542 return;
… …
2331 break; 2590 break;
2332 2591
2333 /* 8.3.87: NEXT LINE */ 2592 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 2593 case C1_NEL: /* ESC E */
2335 { 2594 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 2595 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 2596 scr_add_lines (nlcr, 1, 2);
2338 } 2597 }
2339 break; 2598 break;
2340 2599
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 2600 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 2611 case C1_RI: /* ESC M */
2353 scr_index (DN); 2612 scr_index (DN);
2354 break; 2613 break;
2355 2614
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 2615 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 2616 /*case C1_SS2: scr_single_shift (2); break; */
2358 2617
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 2618 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 2619 /*case C1_SS3: scr_single_shift (3); break; */
2361 2620
2362 /* 8.3.27: DEVICE CONTROL STRING */ 2621 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 2622 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 2623 process_dcs_seq ();
2365 break; 2624 break;
… …
2380 process_osc_seq (); 2639 process_osc_seq ();
2381 break; 2640 break;
2382 2641
2383 /* 8.3.106: RESET TO INITIAL STATE */ 2642 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 2643 case 'c':
2644 mbstate.reset ();
2385 scr_poweron (); 2645 scr_poweron ();
2386 scrollbar_show (1); 2646 scrollbar_show (1);
2387 break; 2647 break;
2388 2648
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2649 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2686 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, [, \, ], ^, _, */ 2687 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, */ 2688 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, */ 2689 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, */ 2690 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, {, |, }, ~, */ 2691 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 2692 };
2433/* *INDENT-ON* */ 2693/* *INDENT-ON* */
2434 2694
2435void 2695void
2436rxvt_term::process_csi_seq () 2696rxvt_term::process_csi_seq ()
2437{ 2697{
2438 unsigned char ch, priv, i; 2698 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 2699 unsigned int nargs, p;
2440 int n, ndef; 2700 int n, ndef;
2441 int arg[ESC_ARGS]; 2701 int arg[ESC_ARGS];
2442 2702
2443 for (nargs = ESC_ARGS; nargs > 0;) 2703 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 2704 arg[--nargs] = 0;
2445 2705
2446 priv = 0; 2706 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 2708 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 2709 { /* '<' '=' '>' '?' */
2450 priv = ch; 2710 priv = ch;
2451 ch = cmd_getc (); 2711 ch = cmd_getc ();
2452 } 2712 }
2713
2453 /* read any numerical arguments */ 2714 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 2715 for (n = -1; ch < CSI_ICH; )
2455 { 2716 {
2456 if (isdigit (ch)) 2717 if (isdigit (ch))
2457 { 2718 {
… …
2464 { 2725 {
2465 if (nargs < ESC_ARGS) 2726 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 2727 arg[nargs++] = n;
2467 n = -1; 2728 n = -1;
2468 } 2729 }
2469 else if (ch == '\b') 2730 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); 2731 process_nonprinting (ch);
2481 } 2732
2482 ch = cmd_getc (); 2733 ch = cmd_getc ();
2483 } 2734 }
2484 2735
2485 if (ch > CSI_7F) 2736 if (ch > CSI_7F)
2486 return; 2737 return;
… …
2644 tt_printf ("\033[0n"); 2895 tt_printf ("\033[0n");
2645 break; 2896 break;
2646 case 6: /* CPR requested */ 2897 case 6: /* CPR requested */
2647 scr_report_position (); 2898 scr_report_position ();
2648 break; 2899 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 2900 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2902 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2652 break; 2903 break;
2653#endif
2654 case 8: /* unofficial extension */ 2904 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 2906 break;
2657 } 2907 }
2658 break; 2908 break;
2659 2909
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2910 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2728#endif 2978#endif
2729 2979
2730 case CSI_78: /* DECREQTPARM */ 2980 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 2981 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2982 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 2983 break;
2734 2984
2735 default: 2985 default:
2736 break; 2986 break;
2737 } 2987 }
2738} 2988}
… …
2741#ifndef NO_FRILLS 2991#ifndef NO_FRILLS
2742/* ARGSUSED */ 2992/* ARGSUSED */
2743void 2993void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2994rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 2995{
2746 int x, y; 2996 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 2997 XWindowAttributes wattr;
2751 Window wdummy; 2998 Window wdummy;
2752 2999
2753 if (nargs == 0) 3000 if (nargs == 0)
2754 return; 3001 return;
3002
2755 switch (args[0]) 3003 switch (args[0])
2756 { 3004 {
2757 /* 3005 /*
2758 * commands 3006 * commands
2759 */ 3007 */
2760 case 1: /* deiconify window */ 3008 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3009 XMapWindow (display->display, TermWin.parent[0]);
2762 break; 3010 break;
2763 case 2: /* iconify window */ 3011 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3012 XIconifyWindow (display->display, TermWin.parent[0],
… …
2781 break; 3029 break;
2782 case 8: /* set size (chars) */ 3030 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3032 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3033 break;
3034
3035 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3036 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3037 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3038 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3039 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3040 break;
3041
3042
2791 /* 3043 /*
2792 * reports - some output format copied from XTerm 3044 * reports - some output format copied from XTerm
2793 */ 3045 */
2794 case 11: /* report window state */ 3046 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3049 break;
2798 case 13: /* report window position */ 3050 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3053 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3054 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3055 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3056 break;
2805 case 14: /* report window size (pixels) */ 3057 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3060 break;
2809 case 18: /* report window size (chars) */ 3061 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3063 break;
2812#if 0 /* XXX: currently disabled due to security concerns */ 3064 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066 break;
2813 case 20: /* report icon label */ 3067 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 {
3070 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3071 XGetIconName (display->display, TermWin.parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3073 }
2816 break; 3074 break;
2817 case 21: /* report window title */ 3075 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 {
3078 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3079 XFetchName (display->display, TermWin.parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3081 }
2820 break; 3082 break;
2821#endif
2822
2823 } 3083 }
2824} 3084}
2825#endif 3085#endif
2826 3086
2827/*----------------------------------------------------------------------*/ 3087/*----------------------------------------------------------------------*/
2828/* 3088/*
2829 * get input up until STRING TERMINATOR (or BEL) 3089 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3090 * ends_how is terminator used. returned input must be free()'d
2831 */ 3091 */
2832unsigned char * 3092unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3093rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3094{
2835 int seen_esc = 0; /* seen escape? */ 3095 int seen_esc = 0; /* seen escape? */
2836 unsigned int n = 0; 3096 unsigned int n = 0;
2837 unsigned char *s; 3097 unsigned char *s;
3098 unicode_t ch;
2838 unsigned char ch, string[STRING_MAX]; 3099 unsigned char string[STRING_MAX];
2839 3100
2840 for (; (ch = cmd_getc ());) 3101 while ((ch = cmd_getc ()))
2841 { 3102 {
2842 if (ch == C0_BEL 3103 if (ch == C0_BEL || ch == CHAR_ST)
2843 || ch == CHAR_ST 3104 break;
3105
3106 if (seen_esc)
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3107 if (ch == 0x5c) /* 7bit ST */
2845 break; 3108 break;
3109 else
3110 return NULL;
3111
2846 if (ch == C0_ESC) 3112 if (ch == C0_ESC)
2847 { 3113 {
2848 seen_esc = 1; 3114 seen_esc = 1;
2849 continue; 3115 continue;
2850 } 3116 }
2851 else if (ch == '\t') 3117 else if (ch == C0_HT)
2852 ch = ' '; /* translate '\t' to space */ 3118 ch = ' '; /* translate '\t' to space */
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
2854 return NULL; /* other control character - exit */ 3120 return NULL; /* other control character - exit */
3121
2855 if (n < sizeof (string) - 1) 3122 if (n >= sizeof (string) - 1)
3123 // stop at some sane length
3124 return NULL;
3125
2856 string[n++] = ch; 3126 string[n++] = ch;
2857 seen_esc = 0; 3127 seen_esc = 0;
2858 } 3128 }
3129
2859 string[n++] = '\0'; 3130 string[n++] = '\0';
3131
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2861 return NULL; 3133 return NULL;
3134
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3135 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3136 STRNCPY (s, string, n);
2864 return s; 3137 return s;
2865} 3138}
2866 3139
2867/*----------------------------------------------------------------------*/ 3140/*----------------------------------------------------------------------*/
… …
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3143 */
2871void 3144void
2872rxvt_term::process_dcs_seq () 3145rxvt_term::process_dcs_seq ()
2873{ 3146{
2874 unsigned char eh, *s; 3147 unsigned char *s;
3148 unicode_t eh;
3149
2875 /* 3150 /*
2876 * Not handled yet 3151 * Not handled yet
2877 */ 3152 */
2878 s = get_to_st (&eh); 3153 s = get_to_st (eh);
2879 if (s) 3154 if (s)
2880 free (s); 3155 free (s);
3156
2881 return; 3157 return;
2882} 3158}
2883 3159
2884/*----------------------------------------------------------------------*/ 3160/*----------------------------------------------------------------------*/
2885/* 3161/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3162 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3163 */
2888void 3164void
2889rxvt_term::process_osc_seq () 3165rxvt_term::process_osc_seq ()
2890{ 3166{
2891 unsigned char ch, eh, *s; 3167 unicode_t ch, eh;
2892 int arg; 3168 int arg;
2893 3169
2894 ch = cmd_getc (); 3170 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3171 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3172 arg = arg * 10 + (ch - '0');
2897 3173
2898 if (ch == ';') 3174 if (ch == ';')
2899 { 3175 {
2900 s = get_to_st (&eh); 3176 unsigned char *s = get_to_st (eh);
3177
2901 if (s) 3178 if (s)
2902 { 3179 {
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); 3180 process_xterm_seq (arg, (char *)s, eh);
2915 free (s); 3181 free (s);
2916 } 3182 }
2917 } 3183 }
2918} 3184}
3185
3186void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3188{
3189 if (str[0] == '?' && !str[1])
3190 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 }
3198 else
3199 set_window_color (color, str);
3200}
3201
2919/* 3202/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title 3204 * 0 = change iconName/title
2922 * 1 = change iconName 3205 * 1 = change iconName
2923 * 2 = change title 3206 * 2 = change title
2924 * 4 = change color 3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
2925 * 12 = change text color 3210 * 12 = change text color
2926 * 13 = change mouse foreground color 3211 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour 3212 * 17 = change highlight character colour
2928 * 18 = change bold character color 3213 * 18 = change bold character color
2929 * 19 = change underlined character color 3214 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented) 3215 * 46 = change logfile (not implemented)
2931 * 50 = change font 3216 * 50 = change font
2932 * 3217 *
2933 * rxvt extensions: 3218 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap 3219 * 20 = bg pixmap
2936 * 39 = change default fg color 3220 * 39 = change default fg color
2937 * 49 = change default bg color 3221 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen 3222 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale 3223 * 701 = change locale
2940 * 702 = find font 3224 * 702 = find font
3225 * 703 = menu
2941 */ 3226 */
2942void 3227void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2944{ 3229{
2945 int changed = 0; 3230 int changed = 0;
2946 int color; 3231 int color;
2947 char *buf, *name; 3232 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1];
2948 3234
2949 assert (str != NULL); 3235 assert (str != NULL);
2950 switch (op) 3236 switch (op)
2951 { 3237 {
2952 case XTerm_name: 3238 case XTerm_name:
2953 set_title (str); 3239 set_title (str);
2954 /* FALLTHROUGH */ 3240 /* FALLTHROUGH */
2955 case XTerm_iconName: 3241 case XTerm_iconName:
2956 set_iconName (str); 3242 set_icon_name (str);
2957 break; 3243 break;
2958 case XTerm_title: 3244 case XTerm_title:
2959 set_title (str); 3245 set_title (str);
2960 break; 3246 break;
3247 case XTerm_property:
3248 if (str[0] == '?')
3249 {
3250 Atom prop = XInternAtom (display->display, str + 1, True);
3251 Atom actual_type;
3252 int actual_format;
3253 unsigned long nitems;
3254 unsigned long bytes_after;
3255 unsigned char *value = 0;
3256 const char *str = "";
3257
3258 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None
3264 && actual_format == 8)
3265 str = (const char *)(value);
3266
3267 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3268
3269 XFree (value);
3270 }
3271 else
3272 {
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274
3275 if (eq)
3276 {
3277 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0],
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 }
3283 else
3284 XDeleteProperty (display->display, TermWin.parent[0],
3285 display->atom (str));
3286 }
3287 break;
3288
2961 case XTerm_Color: 3289 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3290 for (buf = (char *)str; buf && *buf;)
2963 { 3291 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3292 if ((name = STRCHR (buf, ';')) == NULL)
2965 break; 3293 break;
3294
2966 *name++ = '\0'; 3295 *name++ = '\0';
2967 color = atoi (buf); 3296 color = atoi (buf);
3297
2968 if (color < 0 || color >= TOTAL_COLORS) 3298 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3299 break;
3300
2970 if ((buf = STRCHR (name, ';')) != NULL) 3301 if ((buf = STRCHR (name, ';')) != NULL)
2971 *buf++ = '\0'; 3302 *buf++ = '\0';
3303
3304 if (name[0] == '?' && !name[1])
3305 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 }
3313 else
2972 set_window_color (color + minCOLOR, name); 3314 set_window_color (color + minCOLOR, name);
2973 } 3315 }
3316 break;
3317 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3319 break;
3320 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2974 break; 3322 break;
2975#ifndef NO_CURSORCOLOR 3323#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3324 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3326 break;
2979#endif 3327#endif
2980 case XTerm_Color_pointer: 3328 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3329 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3330 break;
3331 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2982 break; 3333 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3334#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3335 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2986 break; 3337 break;
2987 case XTerm_Color_UL: 3338 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3340 break;
2990 case XTerm_Color_RV: 3341 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3343 break;
2993#endif 3344#endif
2994 3345
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: 3346 case XTerm_Pixmap:
3002 if (*str != ';') 3347 if (*str != ';')
3003 { 3348 {
3004#if XPM_BACKGROUND 3349#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3350 scale_pixmap (""); /* reset to default scaling */
… …
3028 set_window_color (Color_fg, str); 3373 set_window_color (Color_fg, str);
3029 break; 3374 break;
3030 case XTerm_restoreBG: 3375 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3376 set_window_color (Color_bg, str);
3032 break; 3377 break;
3378
3033 case XTerm_logfile: 3379 case XTerm_logfile:
3380 // TODO, when secure mode?
3034 break; 3381 break;
3382
3035 case XTerm_font: 3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3036 change_font (str); 3394 change_font (str);
3037 break; 3395 break;
3396
3038#ifndef NO_FRILLS 3397#ifndef NO_FRILLS
3039 case XTerm_locale: 3398 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3399 if (query)
3041 tt_printf ("%-.250s\n", locale); 3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3042 else 3404 else
3043 { 3405 {
3044 set_locale (str); 3406 set_locale (str);
3045# ifdef USE_XIM 3407# ifdef USE_XIM
3046 im_cb (); 3408 im_cb ();
3047# endif 3409# endif
3048 } 3410 }
3049 break; 3411 break;
3412
3050 case XTerm_findfont: 3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3051 { 3415 {
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3416 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3054 } 3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR
3424 case XTerm_Menu:
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3055 break; 3427 break;
3056#endif 3428#endif
3057#if 0 3429#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3430 case XTerm_dumpscreen: /* no error notices */
3059 { 3431 {
3060 int fd; 3432 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3433 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3434 {
3063 scr_dump (fd); 3435 scr_dump (fd);
3064 close (fd); 3436 close (fd);
3065 } 3437 }
3066 } 3438 }
3067 break; 3439 break;
3068#endif 3440#endif
3069
3070 } 3441 }
3071} 3442}
3072/*----------------------------------------------------------------------*/ 3443/*----------------------------------------------------------------------*/
3073 3444
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3445/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3453 * so no need for fancy checking
3083 */ 3454 */
3084int 3455int
3085rxvt_term::privcases (int mode, unsigned long bit) 3456rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3457{
3087 int state; 3458 int state;
3088 3459
3089 if (mode == 's') 3460 if (mode == 's')
3090 { 3461 {
3091 SavedModes |= (PrivateModes & bit); 3462 SavedModes |= (PrivateModes & bit);
3092 return -1; 3463 return -1;
… …
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3469 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3100 PrivMode (state, bit); 3471 PrivMode (state, bit);
3101 } 3472 }
3473
3102 return state; 3474 return state;
3103} 3475}
3104 3476
3105/* we're not using priv _yet_ */ 3477/* we're not using priv _yet_ */
3106void 3478void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3479rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3108{ 3480{
3109 unsigned int i, j; 3481 unsigned int i, j;
3110 int state; 3482 int state;
3483
3111 static const struct 3484 static const struct
3112 { 3485 {
3113 const int argval; 3486 const int argval;
3114 const unsigned long bit; 3487 const unsigned long bit;
3115 } 3488 }
3489
3116 argtopriv[] = { 3490 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3491 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3492 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3493 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3494 { 4, PrivMode_smoothScroll },
… …
3126 { menuBar_esc, PrivMode_menuBar }, 3500 { menuBar_esc, PrivMode_menuBar },
3127#endif 3501#endif
3128#ifdef scrollBar_esc 3502#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 3503 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 3504#endif
3505 // 18, 19 printing-related
3131 { 25, PrivMode_VisibleCursor }, 3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3132 { 35, PrivMode_ShiftKeys }, 3508 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 3509 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI
3512 // 46 start logging
3134 { 47, PrivMode_Screen }, 3513 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 3514 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 3515#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 3516 { 67, PrivMode_BackSpace },
3138#endif 3517#endif
3139 { 1000, PrivMode_MouseX11 }, 3518 { 1000, PrivMode_MouseX11 },
3519 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3520 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3521 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 3522 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 3523 { 1011, PrivMode_Keypress }, // rxvt extension
3524 // 1035 enable modifiers for alt, numlock NYI
3525 // 1036 send ESC for meta keys NYI
3526 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 3527 { 1047, PrivMode_Screen },
3528 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3529 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3530 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 3531 };
3145 3532
3146 if (nargs == 0) 3533 if (nargs == 0)
3147 return; 3534 return;
3148 3535
… …
3163 state = privcases (mode, argtopriv[j].bit); 3550 state = privcases (mode, argtopriv[j].bit);
3164 break; 3551 break;
3165 } 3552 }
3166 3553
3167 /* extra handling for values with state unkept */ 3554 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 3555 switch (arg[i])
3170 { 3556 {
3171 case 1048: /* alternative cursor save */ 3557 case 1048: /* alternative cursor save */
3558 if (Options & Opt_secondaryScreen)
3172 if (mode == 0) 3559 if (mode == 0)
3173 scr_cursor (RESTORE); 3560 scr_cursor (RESTORE);
3174 else if (mode == 1) 3561 else if (mode == 1)
3175 scr_cursor (SAVE); 3562 scr_cursor (SAVE);
3176 /* FALLTHROUGH */
3177 default:
3178 continue; /* for (;i;) */
3179 }
3180
3181 /* extra handling for values with valid 0 or 1 state */
3182 switch (arg[i])
3183 {
3184 /* case 1: - application cursor keys */
3185 case 2: /* VT52 mode */
3186 /* oddball mode. should be set regardless of set/reset
3187 * parameter. Return from VT52 mode with an ESC < from
3188 * within VT52 mode
3189 */
3190 PrivMode (1, PrivMode_vt52);
3191 break; 3563 break;
3564 }
3565
3566 if (state >= 0)
3567 /* extra handling for values with valid 0 or 1 state */
3568 switch (arg[i])
3569 {
3570 /* case 1: - application cursor keys */
3571 case 2: /* VT52 mode */
3572 /* oddball mode. should be set regardless of set/reset
3573 * parameter. Return from VT52 mode with an ESC < from
3574 * within VT52 mode
3575 */
3576 PrivMode (1, PrivMode_vt52);
3577 break;
3192 case 3: /* 80/132 */ 3578 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 3579 if (PrivateModes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3195 break; 3581 break;
3196 case 4: /* smooth scrolling */ 3582 case 4: /* smooth scrolling */
3197 if (state) 3583 if (state)
3198 Options &= ~Opt_jumpScroll; 3584 Options &= ~Opt_jumpScroll;
3199 else 3585 else
3200 Options |= Opt_jumpScroll; 3586 Options |= Opt_jumpScroll;
3201 break; 3587 break;
3202 case 5: /* reverse video */ 3588 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 3589 scr_rvideo_mode (state);
3204 break; 3590 break;
3205 case 6: /* relative/absolute origins */ 3591 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 3592 scr_relative_origin (state);
3207 break; 3593 break;
3208 case 7: /* autowrap */ 3594 case 7: /* autowrap */
3209 scr_autowrap (state); 3595 scr_autowrap (state);
3210 break; 3596 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 3597 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 3598 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 3599 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 3600 PrivateModes &= ~PrivMode_MouseX11;
3215 break; 3601 break;
3216#ifdef menuBar_esc 3602#ifdef menuBar_esc
3217 case menuBar_esc: 3603 case menuBar_esc:
3218#ifdef MENUBAR 3604#ifdef MENUBAR
3219 map_menuBar (state); 3605 map_menuBar (state);
3220#endif 3606#endif
3221 break; 3607 break;
3222#endif 3608#endif
3223#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3224 case scrollBar_esc: 3610 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 3611 if (scrollbar_mapping (state))
3226 { 3612 {
3227 resize_all_windows (0, 0, 0); 3613 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 3614 scr_touch (true);
3229 } 3615 }
3230 break; 3616 break;
3231#endif 3617#endif
3232 case 25: /* visible/invisible cursor */ 3618 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 3619 scr_cursor_visible (state);
3234 break; 3620 break;
3235 /* case 35: - shift keys */ 3621 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 3622 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 3623 case 47: /* secondary screen */
3238 scr_change_screen (state); 3624 scr_change_screen (state);
3239 break; 3625 break;
3240 /* case 66: - application key pad */ 3626 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 3627 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 3628 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 3629 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 3630 PrivateModes &= ~PrivMode_MouseX10;
3245 break; 3631 break;
3246#if 0 3632#if 0
3247 case 1001: 3633 case 1001:
3248 break; /* X11 mouse highlighting */ 3634 break; /* X11 mouse highlighting */
3249#endif 3635#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 3636 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state) 3637 if (state)
3252 Options &= ~Opt_scrollTtyOutput; 3638 Options &= ~Opt_scrollTtyOutput;
3253 else 3639 else
3254 Options |= Opt_scrollTtyOutput; 3640 Options |= Opt_scrollTtyOutput;
3255 break; 3641 break;
3256 case 1011: /* scroll to bottom on key press */ 3642 case 1011: /* scroll to bottom on key press */
3257 if (state) 3643 if (state)
3258 Options |= Opt_scrollTtyKeypress; 3644 Options |= Opt_scrollTtyKeypress;
3259 else 3645 else
3260 Options &= ~Opt_scrollTtyKeypress; 3646 Options &= ~Opt_scrollTtyKeypress;
3261 break; 3647 break;
3262 case 1047: /* secondary screen w/ clearing */ 3648 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3649 if (Options & Opt_secondaryScreen)
3264 if (current_screen != PRIMARY) 3650 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 3651 scr_erase_screen (2);
3266 scr_change_screen (state); 3652 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 3653 break;
3654 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY)
3658 scr_erase_screen (2);
3659 break;
3660 default:
3661 break;
3270 } 3662 }
3271 } 3663 }
3272} 3664}
3273/*}}} */ 3665/*}}} */
3274 3666
3275/*{{{ process sgr sequences */ 3667/*{{{ process sgr sequences */
3276void 3668void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3669rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 3670{
3279 unsigned int i; 3671 unsigned int i;
3280 short rendset; 3672 short rendset;
3281 int rendstyle; 3673 int rendstyle;
3282 3674
3283 if (nargs == 0) 3675 if (nargs == 0)
3284 { 3676 {
3285 scr_rendition (0, ~RS_None); 3677 scr_rendition (0, ~RS_None);
3286 return; 3678 return;
3287 } 3679 }
3680
3288 for (i = 0; i < nargs; i++) 3681 for (i = 0; i < nargs; i++)
3289 { 3682 {
3290 rendset = -1; 3683 rendset = -1;
3291 switch (arg[i]) 3684 switch (arg[i])
3292 { 3685 {
… …
3300 rendset = 1, rendstyle = RS_Uline; 3693 rendset = 1, rendstyle = RS_Uline;
3301 break; 3694 break;
3302 case 5: 3695 case 5:
3303 rendset = 1, rendstyle = RS_Blink; 3696 rendset = 1, rendstyle = RS_Blink;
3304 break; 3697 break;
3698 //case 6: // scoansi light background
3305 case 7: 3699 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 3700 rendset = 1, rendstyle = RS_RVid;
3701 break;
3702 case 8:
3703 // invisible. NYI
3704 break;
3705 //case 10: // scoansi acs off
3706 //case 11: // scoansi acs on
3707 //case 12: // scoansi acs on, |0x80
3708 case 21: // disable bold, blink and invis (some terminals use this)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink;
3307 break; 3710 break;
3308 case 22: 3711 case 22:
3309 rendset = 0, rendstyle = RS_Bold; 3712 rendset = 0, rendstyle = RS_Bold;
3310 break; 3713 break;
3311 case 24: 3714 case 24:
… …
3315 rendset = 0, rendstyle = RS_Blink; 3718 rendset = 0, rendstyle = RS_Blink;
3316 break; 3719 break;
3317 case 27: 3720 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 3721 rendset = 0, rendstyle = RS_RVid;
3319 break; 3722 break;
3723 case 28:
3724 // visible. NYI
3725 break;
3320 } 3726 }
3727
3321 if (rendset != -1) 3728 if (rendset != -1)
3322 { 3729 {
3323 scr_rendition (rendset, rendstyle); 3730 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 3731 continue; /* for (;i;) */
3325 } 3732 }
… …
3332 case 33: 3739 case 33:
3333 case 34: 3740 case 34:
3334 case 35: 3741 case 35:
3335 case 36: 3742 case 36:
3336 case 37: 3743 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 3745 break;
3340#ifdef TTY_256COLOR 3746#ifdef TTY_256COLOR
3341 case 38: 3747 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 3748 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 3749 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 3751 i += 2;
3347 } 3752 }
3348 break; 3753 break;
3349#endif 3754#endif
3350 case 39: /* default fg */ 3755 case 39: /* default fg */
… …
3357 case 43: 3762 case 43:
3358 case 44: 3763 case 44:
3359 case 45: 3764 case 45:
3360 case 46: 3765 case 46:
3361 case 47: 3766 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 3768 break;
3365#ifdef TTY_256COLOR 3769#ifdef TTY_256COLOR
3366 case 48: 3770 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 3771 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 3772 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 3774 i += 2;
3372 } 3775 }
3373 break; 3776 break;
3374#endif 3777#endif
3375 case 49: /* default bg */ 3778 case 49: /* default bg */
… …
3404 } 3807 }
3405 } 3808 }
3406} 3809}
3407/*}}} */ 3810/*}}} */
3408 3811
3409/*{{{ process Rob Nation's own graphics mode sequences */ 3812/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 3813void
3411rxvt_term::process_graphics () 3814rxvt_term::process_graphics ()
3412{ 3815{
3413 unsigned char ch, cmd = cmd_getc (); 3816 unicode_t ch, cmd = cmd_getc ();
3414 3817
3415 if (cmd == 'Q') 3818 if (cmd == 'Q')
3416 { /* query graphics */ 3819 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 3820 tt_printf ("\033G0\n"); /* no graphics */
3418 return; 3821 return;

Diff Legend

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