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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.90 by pcg, Fri Apr 2 19:09:52 2004 UTC

… …
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
… …
140 valid_keysym = keysym != NoSymbol; 147 valid_keysym = keysym != NoSymbol;
141 } 148 }
142 149
143 if (valid_keysym) 150 if (valid_keysym)
144 { 151 {
145 /* for some backwards compatibility */
146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
147# ifdef HOTKEY_CTRL
148 if (ctrl)
149# else
150 if (meta)
151# endif
152 {
153 if (keysym == ks_bigfont)
154 {
155 change_font (FONT_UP);
156 return;
157 }
158 else if (keysym == ks_smallfont)
159 {
160 change_font (FONT_DN);
161 return;
162 }
163 }
164#endif
165
166 if (TermWin.saveLines) 152 if (TermWin.saveLines)
167 { 153 {
168#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
169 if (!ctrl && !meta) 155 if (!ctrl && !meta)
170 { 156 {
… …
261#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
263 { 249 {
264 unsigned int l; 250 unsigned int l;
265 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
266 const unsigned char ch = C0_ESC;
267 252
268 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
269 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
270 255
271 /* escape prefix */ 256 /* escape prefix */
272 if (meta) 257 if (meta
273# ifdef META8_OPTION 258# ifdef META8_OPTION
274 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
275# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
276 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
277 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
278 return; 268 return;
279 } 269 }
280 else 270 else
281#endif 271#endif
… …
545 break; 535 break;
546 } 536 }
547 if (newlen) 537 if (newlen)
548 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
549 } 539 }
540
550 /* 541 /*
551 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
552 */ 543 */
553#ifdef META8_OPTION 544#ifdef META8_OPTION
554 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
569 { 560 {
570 unsigned char *ch; 561 unsigned char *ch;
571 562
572 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
573 *ch |= 0x80; 564 *ch |= 0x80;
565
574 meta = 0; 566 meta = 0;
575 } 567 }
576#endif 568#endif
577 /* nil */ ; 569 /* nil */ ;
578 } 570 }
… …
631/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
632/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
633unsigned int 625unsigned int
634rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
635{ 627{
636 unsigned int n, s; 628 unsigned int n, s;
637 629
638 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
639 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
640 632
641 if (n > 0 && s < count) 633 if (n > 0 && s < count)
642 { 634 {
643 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
644 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
… …
647 s += n; 639 s += n;
648 } 640 }
649 641
650 if (count > s) 642 if (count > s)
651 { 643 {
652 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
653 count = s; 645 count = s;
654 } 646 }
655 647
656 for (; count--;) 648 for (; count--;)
657 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
… …
728 720
729 memmove (cmdbuf_base, cmdbuf_ptr, n); 721 memmove (cmdbuf_base, cmdbuf_ptr, n);
730 cmdbuf_ptr = cmdbuf_base; 722 cmdbuf_ptr = cmdbuf_base;
731 cmdbuf_endp = cmdbuf_ptr + n; 723 cmdbuf_endp = cmdbuf_ptr + n;
732 724
733 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
734 726
735 if (n > 0) 727 if (n > 0)
736 { 728 {
737 cmdbuf_endp += n; 729 cmdbuf_endp += n;
738 return true; 730 return true;
… …
751 743
752 if (revents & EVENT_WRITE) 744 if (revents & EVENT_WRITE)
753 tt_write (0, 0); 745 tt_write (0, 0);
754 else if (revents & EVENT_READ) 746 else if (revents & EVENT_READ)
755 { 747 {
756 bool flag = true;
757
758 // loop, but don't allow a single term to monopolize us 748 // loop, but don't allow a single term to monopolize us
759 // the number of loops is fully arbitrary, and thus wrong 749 // the number of loops is fully arbitrary, and thus wrong
760 while (flag && pty_fill ()) 750 while (pty_fill ())
761 { 751 {
762 if (!seen_input) 752 if (!seen_input)
763 { 753 {
764 seen_input = 1; 754 seen_input = 1;
765 /* once we know the shell is running, send the screen size. Again! */ 755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
766 tt_winch (); 757 tt_winch ();
767 } 758 }
768 759
769 if (cmd_parse ()) 760 if (cmd_parse ())
770 break; 761 break;
771 } 762 }
772 }
773}
774
775bool
776rxvt_term::cmd_parse ()
777{
778 bool flag = false;
779 uint32_t ch = NOCHAR;
780
781 for (;;)
782 {
783 if (ch == NOCHAR)
784 ch = next_char ();
785
786 if (ch == NOCHAR) // TODO: improve
787 break;
788
789 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
790 {
791 /* Read a text string from the input buffer */
792 uint32_t buf[BUFSIZ];
793 bool refreshnow = false;
794 int nlines = 0;
795 uint32_t *str = buf;
796
797 *str++ = ch;
798
799 for (;;)
800 {
801 ch = next_char ();
802
803 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
804 break;
805 else
806 {
807 *str++ = ch;
808
809 if (ch == '\n')
810 {
811 nlines++;
812 refresh_count++;
813
814 if (! (Options & Opt_jumpScroll)
815 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
816 {
817 refreshnow = true;
818 flag = false;
819 ch = NOCHAR;
820 break;
821 }
822
823 // scr_add_lines only works for nlines < TermWin.nrow - 1.
824 if (nlines >= TermWin.nrow - 1)
825 {
826 scr_add_lines (buf, nlines, str - buf);
827 nlines = 0;
828 str = buf;
829 }
830 }
831
832 if (str >= buf + BUFSIZ)
833 {
834 ch = NOCHAR;
835 break;
836 }
837 }
838 }
839
840 scr_add_lines (buf, nlines, str - buf);
841
842 /*
843 * If there have been a lot of new lines, then update the screen
844 * What the heck I'll cheat and only refresh less than every page-full.
845 * the number of pages between refreshes is refresh_limit, which
846 * is incremented here because we must be doing flat-out scrolling.
847 *
848 * refreshing should be correct for small scrolls, because of the
849 * time-out
850 */
851 if (refreshnow)
852 {
853 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
854 refresh_limit++;
855
856 scr_refresh (refresh_type);
857 }
858
859 }
860 else
861 {
862 switch (ch)
863 {
864 default:
865 process_nonprinting (ch);
866 break;
867 case C0_ESC: /* escape char */
868 process_escape_seq ();
869 break;
870 /*case 0x9b: */ /* CSI */
871 /* process_csi_seq (); */
872 }
873
874 ch = NOCHAR;
875 }
876 }
877
878 return flag;
879}
880
881// read the next character, currently handles UTF-8
882// will probably handle all sorts of other stuff in the future
883uint32_t
884rxvt_term::next_char ()
885{
886 while (cmdbuf_ptr < cmdbuf_endp)
887 {
888 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
889 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
890 || !*cmdbuf_ptr)
891 return *cmdbuf_ptr++;
892
893 wchar_t wc;
894 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
895
896 if (len == (size_t)-2)
897 {
898 // the mbstate stores incomplete sequences. didn't know this :/
899 cmdbuf_ptr = cmdbuf_endp;
900 break;
901 }
902
903 if (len == (size_t)-1)
904 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
905
906 // assume wchar == unicode
907 cmdbuf_ptr += len;
908 return wc;
909 }
910
911 return NOCHAR;
912}
913
914/* rxvt_cmd_getc () - Return next input character */
915/*
916 * Return the next input character after first passing any keyboard input
917 * to the command.
918 */
919uint32_t
920rxvt_term::cmd_getc ()
921{
922 for (;;)
923 {
924 uint32_t c = next_char ();
925 if (c != NOCHAR)
926 return c;
927
928 // incomplete sequences should occur rarely, still, a better solution
929 // would be preferred. either setjmp/longjmp or better design.
930 fcntl (cmd_fd, F_SETFL, 0);
931 pty_fill ();
932 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
933 } 763 }
934} 764}
935 765
936#ifdef POINTER_BLANK 766#ifdef POINTER_BLANK
937void 767void
… …
1301 check_our_parents (); 1131 check_our_parents ();
1302 if (am_transparent) 1132 if (am_transparent)
1303 want_full_refresh = 1; 1133 want_full_refresh = 1;
1304 } 1134 }
1305#endif 1135#endif
1306
1307 } 1136 }
1308 break; 1137 break;
1309 1138
1310 case SelectionClear: 1139 case SelectionClear:
1311 display->set_selection_owner (0); 1140 selection_clear ();
1312 break; 1141 break;
1313 1142
1314 case SelectionNotify: 1143 case SelectionNotify:
1315 if (selection_wait == Sel_normal) 1144 if (selection_wait == Sel_normal)
1316 selection_paste (ev.xselection.requestor, 1145 selection_paste (ev.xselection.requestor,
… …
1515 return; 1344 return;
1516 } 1345 }
1517 1346
1518 /* FALLTHROUGH */ 1347 /* FALLTHROUGH */
1519 case ReparentNotify: 1348 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ()) 1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1521 if (am_transparent)
1522 want_full_refresh = 1; 1350 want_full_refresh = 1;
1523 break; 1351 break;
1524#endif 1352#endif
1525 } 1353 }
1526} 1354}
1527 1355
… …
1871 else if (isMenuBarWindow (ev.window)) 1699 else if (isMenuBarWindow (ev.window))
1872 menubar_control (ev); 1700 menubar_control (ev);
1873#endif 1701#endif
1874} 1702}
1875 1703
1876
1877#ifdef TRANSPARENT 1704#ifdef TRANSPARENT
1705#if TINTING
1706/* shading taken from eterm-0.9.2 */
1707/* RGB 15 */
1708
1709static void
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1717 /* No saturation */
1718 for (y = h; --y >= 0;) {
1719 for (x = -w; x < 0; x++) {
1720 int r, g, b;
1721
1722 b = ((uint16_t *) ptr)[x];
1723 r = (b & 0x7c00) * rm;
1724 g = (b & 0x3e0) * gm;
1725 b = (b & 0x1f) * bm;
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1727 | ((g >> 8) & 0x3e0)
1728 | ((b >> 8) & 0x1f);
1729 }
1730 ptr += bpl;
1731 }
1732 } else {
1733 for (y = h; --y >= 0;) {
1734 for (x = -w; x < 0; x++) {
1735 int r, g, b;
1736
1737 b = ((uint16_t *) ptr)[x];
1738 r = (b & 0x7c00) * rm;
1739 g = (b & 0x3e0) * gm;
1740 b = (b & 0x1f) * bm;
1741 r |= (!(r >> 15) - 1);
1742 g |= (!(g >> 10) - 1);
1743 b |= (!(b >> 5) - 1);
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1745 | ((g >> 8) & 0x3e0)
1746 | ((b >> 8) & 0x1f);
1747 }
1748 ptr += bpl;
1749 }
1750 }
1751}
1752
1753/* RGB 16 */
1754static void
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1756{
1757 unsigned char *ptr;
1758 int x, y;
1759
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1762 /* No saturation */
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 }
1777 } else {
1778 for (y = h; --y >= 0;) {
1779 for (x = -w; x < 0; x++) {
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 }
1793 ptr += bpl;
1794 }
1795 }
1796}
1797
1798/* RGB 24 */
1799static void
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1801{
1802 unsigned char *ptr;
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 }
1830 } else {
1831 for (y = h; --y >= 0;) {
1832 for (x = -(w * 3); x < 0; x += 3) {
1833 int r, g, b;
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 }
1861 ptr += bpl;
1862 }
1863 }
1864}
1865
1866/* RGB 32 */
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936}
1937
1938#endif
1939
1878/* 1940/*
1879 * Check our parents are still who we think they are. 1941 * Check our parents are still who we think they are.
1880 * Do transparency updates if required 1942 * Do transparency updates if required
1881 */ 1943 */
1882int 1944int
1883rxvt_term::check_our_parents () 1945rxvt_term::check_our_parents ()
1884{ 1946{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 1947 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 1948 unsigned long nitems, bytes_after;
1887 Atom atype; 1949 Atom atype;
1888 unsigned char *prop = NULL; 1950 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 1951 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 1952 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 1953 XWindowAttributes wattr, wrootattr;
1892 1954
1893 pchanged = 0; 1955 pchanged = 0;
1894 1956
1895 if (! (Options & Opt_transparent)) 1957 if (!(Options & Opt_transparent))
1896 return pchanged; /* Don't try any more */ 1958 return pchanged; /* Don't try any more */
1897 1959
1898 XGetWindowAttributes (display->display, display->root, &wrootattr); 1960 XGetWindowAttributes (display->display, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 1961 rootdepth = wrootattr.depth;
1900 1962
1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1964
1902 if (rootdepth != wattr.depth) 1965 if (rootdepth != wattr.depth)
1903 { 1966 {
1904 if (am_transparent) 1967 if (am_transparent)
1905 { 1968 {
1906 pchanged = 1; 1969 pchanged = 1;
1907 XSetWindowBackground (display->display, TermWin.vt, 1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1908 PixColors[Color_bg]);
1909 am_transparent = am_pixmap_trans = 0; 1971 am_transparent = am_pixmap_trans = 0;
1910 } 1972 }
1973
1911 return pchanged; /* Don't try any more */ 1974 return pchanged; /* Don't try any more */
1912 } 1975 }
1913 1976
1914 /* Get all X ops out of the queue so that our information is up-to-date. */ 1977 /* Get all X ops out of the queue so that our information is up-to-date. */
1915 XSync (display->display, False); 1978 XSync (display->display, False);
… …
1917 /* 1980 /*
1918 * Make the frame window set by the window manager have 1981 * Make the frame window set by the window manager have
1919 * the root background. Some window managers put multiple nested frame 1982 * the root background. Some window managers put multiple nested frame
1920 * windows for each client, so we have to take care about that. 1983 * windows for each client, so we have to take care about that.
1921 */ 1984 */
1922 i = (xa[XA_XROOTPMAPID] != 0 1985 i = (xa[XA_XROOTPMAPID]
1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1925 &nitems, &bytes_after, &prop) == Success)); 1988 &nitems, &bytes_after, &prop) == Success);
1989
1990 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success);
1995
1926 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1927 have_pixmap = 0; 1997 have_pixmap = 0;
1928 else 1998 else
1929 { 1999 {
1930 have_pixmap = 1; 2000 have_pixmap = 1;
1931 rootpixmap = * ((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1932 XFree (prop); 2002 XFree (prop);
1933 } 2003 }
2004
1934 if (have_pixmap) 2005 if (have_pixmap)
1935 { 2006 {
1936 /* 2007 /*
1937 * Copy display->root pixmap transparency 2008 * Copy display->root pixmap transparency
1938 */ 2009 */
1939 int sx, sy, nx, ny; 2010 int sx, sy, nx, ny;
1940 unsigned int nw, nh; 2011 unsigned int nw, nh;
1941 Window cr; 2012 Window cr;
1942 XImage *image; 2013 XImage *image;
1943 GC gc; 2014 GC gc;
1944 XGCValues gcvalue; 2015 XGCValues gcvalue;
1945 2016
1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1947 0, 0, &sx, &sy, &cr); 2018 0, 0, &sx, &sy, &cr);
1948 nw = (unsigned int)szHint.width; 2019 nw = (unsigned int)szHint.width;
1949 nh = (unsigned int)szHint.height; 2020 nh = (unsigned int)szHint.height;
1950 nx = ny = 0; 2021 nx = ny = 0;
2022
1951 if (sx < 0) 2023 if (sx < 0)
1952 { 2024 {
1953 nw += sx; 2025 nw += sx;
1954 nx = -sx; 2026 nx = -sx;
1955 sx = 0; 2027 sx = 0;
1956 } 2028 }
2029
1957 if (sy < 0) 2030 if (sy < 0)
1958 { 2031 {
1959 nh += sy; 2032 nh += sy;
1960 ny = -sy; 2033 ny = -sy;
1961 sy = 0; 2034 sy = 0;
1962 } 2035 }
2036
1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1965 allowedxerror = -1; 2039 allowedxerror = -1;
1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1967 ZPixmap); 2041
1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1969 /* XXX: may need a delay here? */ 2043 /* XXX: may need a delay here? */
1970 allowedxerror = 0; 2044 allowedxerror = 0;
2045
1971 if (image == NULL) 2046 if (image == NULL)
1972 { 2047 {
1973 if (am_transparent && am_pixmap_trans) 2048 if (am_transparent && am_pixmap_trans)
1974 { 2049 {
1975 pchanged = 1; 2050 pchanged = 1;
… …
1977 { 2052 {
1978 XFreePixmap (display->display, TermWin.pixmap); 2053 XFreePixmap (display->display, TermWin.pixmap);
1979 TermWin.pixmap = None; 2054 TermWin.pixmap = None;
1980 } 2055 }
1981 } 2056 }
2057
1982 am_pixmap_trans = 0; 2058 am_pixmap_trans = 0;
1983 } 2059 }
1984 else 2060 else
1985 { 2061 {
1986 if (TermWin.pixmap != None) 2062 if (TermWin.pixmap != None)
1987 XFreePixmap (display->display, TermWin.pixmap); 2063 XFreePixmap (display->display, TermWin.pixmap);
2064
2065#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint))
2067 {
2068 unsigned short shade, rm, gm, bm;
2069
2070 PixColors[Color_tint].get (display, rm, gm, bm);
2071
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 }
2083#endif
2084
1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1989 (unsigned int)szHint.width,
1990 (unsigned int)szHint.height, 2086 szHint.width, szHint.height, image->depth);
1991 (unsigned int)image->depth);
1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1994 nx, ny, (unsigned int)image->width,
1995 (unsigned int)image->height); 2089 nx, ny, image->width, image->height);
1996 XFreeGC (display->display, gc); 2090 XFreeGC (display->display, gc);
1997 XDestroyImage (image); 2091 XDestroyImage (image);
1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1999 TermWin.pixmap); 2093 TermWin.pixmap);
2094
2000 if (!am_transparent || !am_pixmap_trans) 2095 if (!am_transparent || !am_pixmap_trans)
2001 pchanged = 1; 2096 pchanged = 1;
2097
2002 am_transparent = am_pixmap_trans = 1; 2098 am_transparent = am_pixmap_trans = 1;
2003 } 2099 }
2004 } 2100 }
2101
2005 if (!am_pixmap_trans) 2102 if (!am_pixmap_trans)
2006 { 2103 {
2007 unsigned int n; 2104 unsigned int n;
2008 /* 2105 /*
2009 * InheritPixmap transparency 2106 * InheritPixmap transparency
2010 */ 2107 */
2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2013 i++)
2014 { 2110 {
2015 oldp = TermWin.parent[i]; 2111 oldp = TermWin.parent[i];
2016 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2112 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2017 &TermWin.parent[i], &list, &n); 2113 &TermWin.parent[i], &list, &n);
2018 XFree (list); 2114 XFree (list);
2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116
2020 if (TermWin.parent[i] == display->root) 2117 if (TermWin.parent[i] == display->root)
2021 { 2118 {
2022 if (oldp != None) 2119 if (oldp != None)
2023 pchanged = 1; 2120 pchanged = 1;
2121
2024 break; 2122 break;
2025 } 2123 }
2124
2026 if (oldp != TermWin.parent[i]) 2125 if (oldp != TermWin.parent[i])
2027 pchanged = 1; 2126 pchanged = 1;
2028 } 2127 }
2128
2029 n = 0; 2129 n = 0;
2130
2030 if (pchanged) 2131 if (pchanged)
2031 { 2132 {
2032 for (; n < (unsigned int)i; n++) 2133 for (; n < (unsigned int)i; n++)
2033 { 2134 {
2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2039 break; 2140 break;
2040 } 2141 }
2041 } 2142 }
2042 } 2143 }
2043 if (n > (int) (sizeof (TermWin.parent) 2144
2044 / sizeof (TermWin.parent[0]))) 2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2045 { 2146 {
2046 D_X ((stderr, "InheritPixmap Turning off")); 2147 D_X ((stderr, "InheritPixmap Turning off"));
2047 XSetWindowBackground (display->display, TermWin.parent[0], 2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2048 PixColors[Color_fg]);
2049 XSetWindowBackground (display->display, TermWin.vt, 2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2050 PixColors[Color_bg]);
2051 am_transparent = 0; 2150 am_transparent = 0;
2052 /* XXX: also turn off Opt_transparent? */ 2151 /* XXX: also turn off Opt_transparent? */
2053 } 2152 }
2054 else 2153 else
2055 { 2154 {
2155#if WAIT_FOR_WM
2056 /* wait (an arbitrary period) for the WM to do its thing 2156 /* wait (an arbitrary period) for the WM to do its thing
2057 * needed for fvwm2.2.2 (and before?) */ 2157 * needed for fvwm2.2.2 (and before?) */
2058# ifdef HAVE_NANOSLEEP
2059 struct timespec rqt;
2060
2061 rqt.tv_sec = 1;
2062 rqt.tv_nsec = 0;
2063 nanosleep (&rqt, NULL);
2064# else
2065 sleep (1); 2158 sleep (1);
2066# endif 2159#endif
2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2068 for (n = 0; n < (unsigned int)i; n++) 2161 for (n = 0; n < (unsigned int)i; n++)
2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2070 ParentRelative); 2163
2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2072 ParentRelative);
2073 am_transparent = 1; 2165 am_transparent = 1;
2074 } 2166 }
2167
2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2076 TermWin.parent[i] = None; 2169 TermWin.parent[i] = None;
2077 } 2170 }
2171
2078 return pchanged; 2172 return pchanged;
2079} 2173}
2080#endif 2174#endif
2081 2175
2082/*}}} */ 2176/*}}} */
2177
2178bool
2179rxvt_term::cmd_parse ()
2180{
2181 bool flag = false;
2182 unicode_t ch = NOCHAR;
2183 unsigned char *seq_begin; // remember start of esc-sequence here
2184
2185 for (;;)
2186 {
2187 if (ch == NOCHAR)
2188 {
2189 seq_begin = cmdbuf_ptr;
2190 ch = next_char ();
2191 }
2192
2193 if (ch == NOCHAR) // TODO: improve
2194 break;
2195
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
2197 {
2198 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false;
2201 int nlines = 0;
2202 unicode_t *str = buf;
2203
2204 *str++ = ch;
2205
2206 for (;;)
2207 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
2212 break;
2213
2214 *str++ = ch;
2215
2216 if (ch == '\n')
2217 {
2218 nlines++;
2219 refresh_count++;
2220
2221 if (! (Options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2223 {
2224 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR;
2227 break;
2228 }
2229
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1)
2232 {
2233 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0;
2235 str = buf;
2236 }
2237 }
2238
2239 if (str >= buf + UBUFSIZ)
2240 {
2241 ch = NOCHAR;
2242 break;
2243 }
2244 }
2245
2246 scr_add_lines (buf, nlines, str - buf);
2247
2248 /*
2249 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */
2257 if (refreshnow)
2258 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++;
2261
2262 scr_refresh (refresh_type);
2263 }
2264
2265 }
2266 else
2267 {
2268 try
2269 {
2270 process_nonprinting (ch);
2271 }
2272 catch (const class out_of_input &o)
2273 {
2274 // we ran out of input, retry later
2275 cmdbuf_ptr = seq_begin;
2276 break;
2277 }
2278
2279 ch = NOCHAR;
2280 }
2281 }
2282
2283 return flag;
2284}
2285
2286// read the next character
2287unicode_t
2288rxvt_term::next_char ()
2289{
2290 while (cmdbuf_ptr < cmdbuf_endp)
2291 {
2292 // assume 7-bit to be ascii ALWAYS
2293 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2294 return *cmdbuf_ptr++;
2295
2296 wchar_t wc;
2297 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2298
2299 if (len == (size_t)-2)
2300 {
2301 // the mbstate stores incomplete sequences. didn't know this :/
2302 cmdbuf_ptr = cmdbuf_endp;
2303 break;
2304 }
2305
2306 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308
2309 // assume wchar == unicode
2310 cmdbuf_ptr += len;
2311 return wc;
2312 }
2313
2314 return NOCHAR;
2315}
2316
2317/* rxvt_cmd_getc () - Return next input character */
2318/*
2319 * Return the next input character after first passing any keyboard input
2320 * to the command.
2321 */
2322unicode_t
2323rxvt_term::cmd_getc ()
2324{
2325 unicode_t c = next_char ();
2326
2327 if (c == NOCHAR)
2328 throw out_of_input;
2329
2330 return c;
2331}
2083 2332
2084/*{{{ print pipe */ 2333/*{{{ print pipe */
2085/*----------------------------------------------------------------------*/ 2334/*----------------------------------------------------------------------*/
2086#ifdef PRINTPIPE 2335#ifdef PRINTPIPE
2087FILE * 2336FILE *
2088rxvt_term::popen_printer () 2337rxvt_term::popen_printer ()
2089{ 2338{
2090 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2339 FILE *stream = popen (rs[Rs_print_pipe], "w");
2091 2340
2092 if (stream == NULL) 2341 if (stream == NULL)
2093 rxvt_print_error ("can't open printer pipe"); 2342 rxvt_warn ("can't open printer pipe, not printing.\n");
2343
2094 return stream; 2344 return stream;
2095} 2345}
2096 2346
2097int 2347int
2098rxvt_term::pclose_printer (FILE *stream) 2348rxvt_term::pclose_printer (FILE *stream)
2099{ 2349{
2100 fflush (stream); 2350 fflush (stream);
2101 /* pclose () reported not to work on SunOS 4.1.3 */
2102# if defined (__sun__) /* TODO: RESOLVE THIS */
2103 /* pclose works provided SIGCHLD handler uses waitpid */
2104 return pclose (stream); /* return fclose (stream); */
2105# else
2106 return pclose (stream); 2351 return pclose (stream);
2107# endif
2108} 2352}
2109 2353
2110/* 2354/*
2111 * simulate attached vt100 printer 2355 * simulate attached vt100 printer
2112 */ 2356 */
2113void 2357void
2114rxvt_term::process_print_pipe () 2358rxvt_term::process_print_pipe ()
2115{ 2359{
2116 int done; 2360 int done;
2117 FILE *fd; 2361 FILE *fd;
2118 2362
2119 if ((fd = popen_printer ()) == NULL) 2363 if ((fd = popen_printer ()) == NULL)
2120 return; 2364 return;
2121 2365
2122 /* 2366 /*
2123 * Send all input to the printer until either ESC[4i or ESC[?4i 2367 * Send all input to the printer until either ESC[4i or ESC[?4i
2124 * is received. 2368 * is received.
2125 */ 2369 */
2126 for (done = 0; !done;) 2370 for (done = 0; !done;)
2127 { 2371 {
2128 unsigned char buf[8]; 2372 unsigned char buf[8];
2129 unsigned char ch; 2373 unicode_t ch;
2130 unsigned int i, len; 2374 unsigned int i, len;
2131 2375
2132 if ((ch = cmd_getc ()) != C0_ESC) 2376 if ((ch = cmd_getc ()) != C0_ESC)
2133 { 2377 {
2134 if (putc (ch, fd) == EOF) 2378 if (putc (ch, fd) == EOF)
2135 break; /* done = 1 */ 2379 break; /* done = 1 */
… …
2150 { 2394 {
2151 if ((buf[len++] = cmd_getc ()) == 'i') 2395 if ((buf[len++] = cmd_getc ()) == 'i')
2152 break; /* done = 1 */ 2396 break; /* done = 1 */
2153 } 2397 }
2154 } 2398 }
2399
2155 for (i = 0; i < len; i++) 2400 for (i = 0; i < len; i++)
2156 if (putc (buf[i], fd) == EOF) 2401 if (putc (buf[i], fd) == EOF)
2157 { 2402 {
2158 done = 1; 2403 done = 1;
2159 break; 2404 break;
2160 } 2405 }
2161 } 2406 }
2162 } 2407 }
2408
2163 pclose_printer (fd); 2409 pclose_printer (fd);
2164} 2410}
2165#endif /* PRINTPIPE */ 2411#endif /* PRINTPIPE */
2166/*}}} */ 2412/*}}} */
2167 2413
2168/* *INDENT-OFF* */ 2414/* *INDENT-OFF* */
2169enum { 2415enum {
2170 C1_40 = 0x40, 2416 C1_40 = 0x40,
2171 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2417 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2172 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2418 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2173 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2419 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2174 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2420 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2175}; 2421};
2176/* *INDENT-ON* */ 2422/* *INDENT-ON* */
2177 2423
2178/*{{{ process non-printing single characters */ 2424/*{{{ process non-printing single characters */
2179void 2425void
2180rxvt_term::process_nonprinting (unsigned char ch) 2426rxvt_term::process_nonprinting (unicode_t ch)
2181{ 2427{
2182 switch (ch) 2428 switch (ch)
2183 { 2429 {
2430 case C0_ESC:
2431 process_escape_seq ();
2432 break;
2184 case C0_ENQ: /* terminal Status */ 2433 case C0_ENQ: /* terminal Status */
2185 if (rs[Rs_answerbackstring]) 2434 if (rs[Rs_answerbackstring])
2186 tt_write (
2187 (const unsigned char *)rs[Rs_answerbackstring], 2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2188 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2189 else 2437 else
2190 tt_write ((unsigned char *)VT100_ANS, 2438 tt_write ((unsigned char *)VT100_ANS,
2191 (unsigned int)STRLEN (VT100_ANS)); 2439 (unsigned int)STRLEN (VT100_ANS));
2192 break; 2440 break;
2193 case C0_BEL: /* bell */ 2441 case C0_BEL: /* bell */
2194 scr_bell (); 2442 scr_bell ();
2195 break; 2443 break;
2196 case C0_BS: /* backspace */ 2444 case C0_BS: /* backspace */
… …
2211 scr_charset_choose (1); 2459 scr_charset_choose (1);
2212 break; 2460 break;
2213 case C0_SI: /* shift in - acs */ 2461 case C0_SI: /* shift in - acs */
2214 scr_charset_choose (0); 2462 scr_charset_choose (0);
2215 break; 2463 break;
2464
2465 // 8-bit controls
2466 case 0x90: /* DCS */
2467 process_dcs_seq ();
2468 break;
2469 case 0x9b: /* CSI */
2470 process_csi_seq ();
2471 break;
2472 case 0x9d: /* CSI */
2473 process_osc_seq ();
2474 break;
2216 } 2475 }
2217} 2476}
2218/*}}} */ 2477/*}}} */
2219 2478
2220 2479
2221/*{{{ process VT52 escape sequences */ 2480/*{{{ process VT52 escape sequences */
2222void 2481void
2223rxvt_term::process_escape_vt52 (unsigned char ch) 2482rxvt_term::process_escape_vt52 (unicode_t ch)
2224{ 2483{
2225 int row, col; 2484 int row, col;
2226 2485
2227 switch (ch) 2486 switch (ch)
2228 { 2487 {
… …
2280 2539
2281/*{{{ process escape sequences */ 2540/*{{{ process escape sequences */
2282void 2541void
2283rxvt_term::process_escape_seq () 2542rxvt_term::process_escape_seq ()
2284{ 2543{
2285 unsigned char ch = cmd_getc (); 2544 unicode_t ch = cmd_getc ();
2286 2545
2287 if (PrivateModes & PrivMode_vt52) 2546 if (PrivateModes & PrivMode_vt52)
2288 { 2547 {
2289 process_escape_vt52 (ch); 2548 process_escape_vt52 (ch);
2290 return; 2549 return;
… …
2338 break; 2597 break;
2339 2598
2340 /* 8.3.87: NEXT LINE */ 2599 /* 8.3.87: NEXT LINE */
2341 case C1_NEL: /* ESC E */ 2600 case C1_NEL: /* ESC E */
2342 { 2601 {
2343 uint32_t nlcr[] = { '\n', '\r' }; 2602 unicode_t nlcr[] = { L'\n', L'\r' };
2344 scr_add_lines (nlcr, 1, 2); 2603 scr_add_lines (nlcr, 1, 2);
2345 } 2604 }
2346 break; 2605 break;
2347 2606
2348 /* kidnapped escape sequence: Should be 8.3.48 */ 2607 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2359 case C1_RI: /* ESC M */ 2618 case C1_RI: /* ESC M */
2360 scr_index (DN); 2619 scr_index (DN);
2361 break; 2620 break;
2362 2621
2363 /* 8.3.142: SINGLE-SHIFT TWO */ 2622 /* 8.3.142: SINGLE-SHIFT TWO */
2364 /*case C1_SS2: scr_single_shift (2); break; */ 2623 /*case C1_SS2: scr_single_shift (2); break; */
2365 2624
2366 /* 8.3.143: SINGLE-SHIFT THREE */ 2625 /* 8.3.143: SINGLE-SHIFT THREE */
2367 /*case C1_SS3: scr_single_shift (3); break; */ 2626 /*case C1_SS3: scr_single_shift (3); break; */
2368 2627
2369 /* 8.3.27: DEVICE CONTROL STRING */ 2628 /* 8.3.27: DEVICE CONTROL STRING */
2370 case C1_DCS: /* ESC P */ 2629 case C1_DCS: /* ESC P */
2371 process_dcs_seq (); 2630 process_dcs_seq ();
2372 break; 2631 break;
… …
2387 process_osc_seq (); 2646 process_osc_seq ();
2388 break; 2647 break;
2389 2648
2390 /* 8.3.106: RESET TO INITIAL STATE */ 2649 /* 8.3.106: RESET TO INITIAL STATE */
2391 case 'c': 2650 case 'c':
2651 mbstate.reset ();
2392 scr_poweron (); 2652 scr_poweron ();
2393 scrollbar_show (1); 2653 scrollbar_show (1);
2394 break; 2654 break;
2395 2655
2396 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2656 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2433 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2693 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2434 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2694 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2435 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2695 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2436 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2696 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2437 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2697 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2438 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2698 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2439 }; 2699 };
2440/* *INDENT-ON* */ 2700/* *INDENT-ON* */
2441 2701
2442void 2702void
2443rxvt_term::process_csi_seq () 2703rxvt_term::process_csi_seq ()
2444{ 2704{
2445 unsigned char ch, priv, i; 2705 unicode_t ch, priv, i;
2446 unsigned int nargs, p; 2706 unsigned int nargs, p;
2447 int n, ndef; 2707 int n, ndef;
2448 int arg[ESC_ARGS]; 2708 int arg[ESC_ARGS];
2449 2709
2450 for (nargs = ESC_ARGS; nargs > 0;) 2710 for (nargs = ESC_ARGS; nargs > 0;)
2451 arg[--nargs] = 0; 2711 arg[--nargs] = 0;
2452 2712
2453 priv = 0; 2713 priv = 0;
… …
2455 if (ch >= '<' && ch <= '?') 2715 if (ch >= '<' && ch <= '?')
2456 { /* '<' '=' '>' '?' */ 2716 { /* '<' '=' '>' '?' */
2457 priv = ch; 2717 priv = ch;
2458 ch = cmd_getc (); 2718 ch = cmd_getc ();
2459 } 2719 }
2720
2460 /* read any numerical arguments */ 2721 /* read any numerical arguments */
2461 for (n = -1; ch < CSI_ICH; ) 2722 for (n = -1; ch < CSI_ICH; )
2462 { 2723 {
2463 if (isdigit (ch)) 2724 if (isdigit (ch))
2464 { 2725 {
… …
2471 { 2732 {
2472 if (nargs < ESC_ARGS) 2733 if (nargs < ESC_ARGS)
2473 arg[nargs++] = n; 2734 arg[nargs++] = n;
2474 n = -1; 2735 n = -1;
2475 } 2736 }
2476 else if (ch == '\b') 2737 else if (IS_CONTROL (ch))
2477 {
2478 scr_backspace ();
2479 }
2480 else if (ch == C0_ESC)
2481 {
2482 process_escape_seq ();
2483 return;
2484 }
2485 else if (ch < ' ')
2486 {
2487 process_nonprinting (ch); 2738 process_nonprinting (ch);
2488 } 2739
2489 ch = cmd_getc (); 2740 ch = cmd_getc ();
2490 } 2741 }
2491 2742
2492 if (ch > CSI_7F) 2743 if (ch > CSI_7F)
2493 return; 2744 return;
… …
2651 tt_printf ("\033[0n"); 2902 tt_printf ("\033[0n");
2652 break; 2903 break;
2653 case 6: /* CPR requested */ 2904 case 6: /* CPR requested */
2654 scr_report_position (); 2905 scr_report_position ();
2655 break; 2906 break;
2656#if defined (ENABLE_DISPLAY_ANSWER)
2657 case 7: /* unofficial extension */ 2907 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure)
2658 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2909 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2659 break; 2910 break;
2660#endif
2661 case 8: /* unofficial extension */ 2911 case 8: /* unofficial extension */
2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2663 break; 2913 break;
2664 } 2914 }
2665 break; 2915 break;
2666 2916
2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2917 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735#endif 2985#endif
2736 2986
2737 case CSI_78: /* DECREQTPARM */ 2987 case CSI_78: /* DECREQTPARM */
2738 if (arg[0] == 0 || arg[0] == 1) 2988 if (arg[0] == 0 || arg[0] == 1)
2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2989 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2740 /* FALLTHROUGH */ 2990 break;
2741 2991
2742 default: 2992 default:
2743 break; 2993 break;
2744 } 2994 }
2745} 2995}
… …
2748#ifndef NO_FRILLS 2998#ifndef NO_FRILLS
2749/* ARGSUSED */ 2999/* ARGSUSED */
2750void 3000void
2751rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3001rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2752{ 3002{
2753 int x, y; 3003 int x, y;
2754#if 0
2755 char *s;
2756#endif
2757 XWindowAttributes wattr; 3004 XWindowAttributes wattr;
2758 Window wdummy; 3005 Window wdummy;
2759 3006
2760 if (nargs == 0) 3007 if (nargs == 0)
2761 return; 3008 return;
3009
2762 switch (args[0]) 3010 switch (args[0])
2763 { 3011 {
2764 /* 3012 /*
2765 * commands 3013 * commands
2766 */ 3014 */
2767 case 1: /* deiconify window */ 3015 case 1: /* deiconify window */
2768 XMapWindow (display->display, TermWin.parent[0]); 3016 XMapWindow (display->display, TermWin.parent[0]);
2769 break; 3017 break;
2770 case 2: /* iconify window */ 3018 case 2: /* iconify window */
2771 XIconifyWindow (display->display, TermWin.parent[0], 3019 XIconifyWindow (display->display, TermWin.parent[0],
… …
2788 break; 3036 break;
2789 case 8: /* set size (chars) */ 3037 case 8: /* set size (chars) */
2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2791 (unsigned int) (args[1] * TermWin.fheight)); 3039 (unsigned int) (args[1] * TermWin.fheight));
2792 break; 3040 break;
3041
3042 //case 9: NYI, TODO, restore maximized window or maximize window
2793 default: 3043 default:
2794 if (args[0] >= 24) /* set height (chars) */ 3044 if (args[0] >= 24) /* set height (chars) */
2795 set_widthheight ((unsigned int)TermWin.width, 3045 set_widthheight ((unsigned int)TermWin.width,
2796 (unsigned int) (args[1] * TermWin.fheight)); 3046 (unsigned int) (args[1] * TermWin.fheight));
2797 break; 3047 break;
3048
3049
2798 /* 3050 /*
2799 * reports - some output format copied from XTerm 3051 * reports - some output format copied from XTerm
2800 */ 3052 */
2801 case 11: /* report window state */ 3053 case 11: /* report window state */
2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2804 break; 3056 break;
2805 case 13: /* report window position */ 3057 case 13: /* report window position */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2808 -wattr.border_width, -wattr.border_width, 3060 -wattr.border_width, -wattr.border_width,
2809 &x, &y, &wdummy); 3061 &x, &y, &wdummy);
2810 tt_printf ("\033[3;%d;%dt", x, y); 3062 tt_printf ("\033[3;%d;%dt", x, y);
2811 break; 3063 break;
2812 case 14: /* report window size (pixels) */ 3064 case 14: /* report window size (pixels) */
2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2815 break; 3067 break;
2816 case 18: /* report window size (chars) */ 3068 case 18: /* report text area size (chars) */
2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3070 break;
2819#if 0 /* XXX: currently disabled due to security concerns */ 3071 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break;
2820 case 20: /* report icon label */ 3074 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3078 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2823 break; 3081 break;
2824 case 21: /* report window title */ 3082 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 {
3085 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3086 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3088 }
2827 break; 3089 break;
2828#endif
2829
2830 } 3090 }
2831} 3091}
2832#endif 3092#endif
2833 3093
2834/*----------------------------------------------------------------------*/ 3094/*----------------------------------------------------------------------*/
2835/* 3095/*
2836 * get input up until STRING TERMINATOR (or BEL) 3096 * get input up until STRING TERMINATOR (or BEL)
2837 * ends_how is terminator used. returned input must be free ()d 3097 * ends_how is terminator used. returned input must be free ()d
2838 */ 3098 */
2839unsigned char * 3099unsigned char *
2840rxvt_term::get_to_st (unsigned char *ends_how) 3100rxvt_term::get_to_st (unicode_t &ends_how)
2841{ 3101{
2842 int seen_esc = 0; /* seen escape? */ 3102 int seen_esc = 0; /* seen escape? */
2843 unsigned int n = 0; 3103 unsigned int n = 0;
2844 unsigned char *s; 3104 unsigned char *s;
3105 unicode_t ch;
2845 unsigned char ch, string[STRING_MAX]; 3106 unsigned char string[STRING_MAX];
2846 3107
2847 for (; (ch = cmd_getc ());) 3108 while ((ch = cmd_getc ()))
2848 { 3109 {
2849 if (ch == C0_BEL 3110 if (ch == C0_BEL || ch == CHAR_ST)
2850 || ch == CHAR_ST 3111 break;
3112
3113 if (seen_esc)
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3114 if (ch == 0x5c) /* 7bit ST */
2852 break; 3115 break;
3116 else
3117 return NULL;
3118
2853 if (ch == C0_ESC) 3119 if (ch == C0_ESC)
2854 { 3120 {
2855 seen_esc = 1; 3121 seen_esc = 1;
2856 continue; 3122 continue;
2857 } 3123 }
2858 else if (ch == '\t') 3124 else if (ch == '\t')
2859 ch = ' '; /* translate '\t' to space */ 3125 ch = ' '; /* translate '\t' to space */
2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d))
2861 return NULL; /* other control character - exit */ 3127 return NULL; /* other control character - exit */
3128
2862 if (n < sizeof (string) - 1) 3129 if (n >= sizeof (string) - 1)
3130 // stop at some sane length
3131 return NULL;
3132
2863 string[n++] = ch; 3133 string[n++] = ch;
2864 seen_esc = 0; 3134 seen_esc = 0;
2865 } 3135 }
3136
2866 string[n++] = '\0'; 3137 string[n++] = '\0';
3138
2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2868 return NULL; 3140 return NULL;
3141
2869 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3142 ends_how = (ch == 0x5c ? C0_ESC : ch);
2870 STRNCPY (s, string, n); 3143 STRNCPY (s, string, n);
2871 return s; 3144 return s;
2872} 3145}
2873 3146
2874/*----------------------------------------------------------------------*/ 3147/*----------------------------------------------------------------------*/
… …
2876 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2877 */ 3150 */
2878void 3151void
2879rxvt_term::process_dcs_seq () 3152rxvt_term::process_dcs_seq ()
2880{ 3153{
2881 unsigned char eh, *s; 3154 unsigned char *s;
3155 unicode_t eh;
3156
2882 /* 3157 /*
2883 * Not handled yet 3158 * Not handled yet
2884 */ 3159 */
2885 s = get_to_st (&eh); 3160 s = get_to_st (eh);
2886 if (s) 3161 if (s)
2887 free (s); 3162 free (s);
3163
2888 return; 3164 return;
2889} 3165}
2890 3166
2891/*----------------------------------------------------------------------*/ 3167/*----------------------------------------------------------------------*/
2892/* 3168/*
2893 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3169 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2894 */ 3170 */
2895void 3171void
2896rxvt_term::process_osc_seq () 3172rxvt_term::process_osc_seq ()
2897{ 3173{
2898 unsigned char ch, eh, *s; 3174 unicode_t ch, eh;
2899 int arg; 3175 int arg;
2900 3176
2901 ch = cmd_getc (); 3177 ch = cmd_getc ();
2902 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3178 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2903 arg = arg * 10 + (ch - '0'); 3179 arg = arg * 10 + (ch - '0');
2904 3180
2905 if (ch == ';') 3181 if (ch == ';')
2906 { 3182 {
2907 s = get_to_st (&eh); 3183 unsigned char *s = get_to_st (eh);
3184
2908 if (s) 3185 if (s)
2909 { 3186 {
2910 /*
2911 * rxvt_menubar_dispatch () violates the constness of the string,
2912 * so do it here
2913 */
2914 if (arg == XTerm_Menu)
2915#if 0 /* XXX: currently disabled due to security concerns */
2916 menubar_dispatch ((char *)s);
2917#else
2918 (void)0;
2919#endif
2920 else
2921 xterm_seq (arg, (char *)s, eh); 3187 process_xterm_seq (arg, (char *)s, eh);
2922 free (s); 3188 free (s);
2923 } 3189 }
2924 } 3190 }
2925} 3191}
3192
3193void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{
3196 if (str[0] == '?' && !str[1])
3197 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 }
3205 else
3206 set_window_color (color, str);
3207}
3208
2926/* 3209/*
2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2928 * 0 = change iconName/title 3211 * 0 = change iconName/title
2929 * 1 = change iconName 3212 * 1 = change iconName
2930 * 2 = change title 3213 * 2 = change title
2931 * 4 = change color 3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
2932 * 12 = change text color 3217 * 12 = change text color
2933 * 13 = change mouse foreground color 3218 * 13 = change mouse foreground color
2934 * 17 = change highlight character colour 3219 * 17 = change highlight character colour
2935 * 18 = change bold character color 3220 * 18 = change bold character color
2936 * 19 = change underlined character color 3221 * 19 = change underlined character color
2937 * 46 = change logfile (not implemented) 3222 * 46 = change logfile (not implemented)
2938 * 50 = change font 3223 * 50 = change font
2939 * 3224 *
2940 * rxvt extensions: 3225 * rxvt extensions:
2941 * 9 = change locale (NYI)
2942 * 10 = menu (may change in future)
2943 * 20 = bg pixmap 3226 * 20 = bg pixmap
2944 * 39 = change default fg color 3227 * 39 = change default fg color
2945 * 49 = change default bg color 3228 * 49 = change default bg color
2946 * 55 = dump scrollback buffer and all of screen 3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
2947 */ 3233 */
2948void 3234void
2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2950{ 3236{
2951 int changed = 0; 3237 int changed = 0;
2952 int color; 3238 int color;
2953 char *buf, *name; 3239 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1];
2954 3241
2955 assert (str != NULL); 3242 assert (str != NULL);
2956 switch (op) 3243 switch (op)
2957 { 3244 {
2958 case XTerm_name: 3245 case XTerm_name:
2959 set_title (str); 3246 set_title (str);
2960 /* FALLTHROUGH */ 3247 /* FALLTHROUGH */
2961 case XTerm_iconName: 3248 case XTerm_iconName:
2962 set_iconName (str); 3249 set_icon_name (str);
2963 break; 3250 break;
2964 case XTerm_title: 3251 case XTerm_title:
2965 set_title (str); 3252 set_title (str);
2966 break; 3253 break;
3254 case XTerm_property:
3255 if (str[0] == '?')
3256 {
3257 Atom prop = XInternAtom (display->display, str + 1, True);
3258 Atom actual_type;
3259 int actual_format;
3260 unsigned long nitems;
3261 unsigned long bytes_after;
3262 unsigned char *value = 0;
3263 const char *str = "";
3264
3265 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None
3271 && actual_format == 8)
3272 str = (const char *)(value);
3273
3274 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3275
3276 XFree (value);
3277 }
3278 else
3279 {
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281
3282 if (eq)
3283 {
3284 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0],
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 }
3290 else
3291 XDeleteProperty (display->display, TermWin.parent[0],
3292 display->atom (str));
3293 }
3294 break;
3295
2967 case XTerm_Color: 3296 case XTerm_Color:
2968 for (buf = (char *)str; buf && *buf;) 3297 for (buf = (char *)str; buf && *buf;)
2969 { 3298 {
2970 if ((name = STRCHR (buf, ';')) == NULL) 3299 if ((name = STRCHR (buf, ';')) == NULL)
2971 break; 3300 break;
3301
2972 *name++ = '\0'; 3302 *name++ = '\0';
2973 color = atoi (buf); 3303 color = atoi (buf);
3304
2974 if (color < 0 || color >= TOTAL_COLORS) 3305 if (color < 0 || color >= TOTAL_COLORS)
2975 break; 3306 break;
3307
2976 if ((buf = STRCHR (name, ';')) != NULL) 3308 if ((buf = STRCHR (name, ';')) != NULL)
2977 *buf++ = '\0'; 3309 *buf++ = '\0';
3310
3311 if (name[0] == '?' && !name[1])
3312 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 }
3320 else
2978 set_window_color (color + minCOLOR, name); 3321 set_window_color (color + minCOLOR, name);
2979 } 3322 }
3323 break;
3324 case XTerm_Color00:
3325 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3326 break;
3327 case XTerm_Color01:
3328 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2980 break; 3329 break;
2981#ifndef NO_CURSORCOLOR 3330#ifndef NO_CURSORCOLOR
2982 case XTerm_Color_cursor: 3331 case XTerm_Color_cursor:
2983 set_window_color (Color_cursor, str); 3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2984 break; 3333 break;
2985#endif 3334#endif
2986 case XTerm_Color_pointer: 3335 case XTerm_Color_pointer_fg:
2987 set_window_color (Color_pointer, str); 3336 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3337 break;
3338 case XTerm_Color_pointer_bg:
3339 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2988 break; 3340 break;
2989#ifndef NO_BOLD_UNDERLINE_REVERSE 3341#ifndef NO_BOLD_UNDERLINE_REVERSE
2990 case XTerm_Color_BD: 3342 case XTerm_Color_BD:
2991 set_window_color (Color_BD, str); 3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2992 break; 3344 break;
2993 case XTerm_Color_UL: 3345 case XTerm_Color_UL:
2994 set_window_color (Color_UL, str); 3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2995 break; 3347 break;
2996 case XTerm_Color_RV: 3348 case XTerm_Color_RV:
2997 set_window_color (Color_RV, str); 3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2998 break; 3350 break;
2999#endif 3351#endif
3000 3352
3001 case XTerm_Menu:
3002 /*
3003 * rxvt_menubar_dispatch () violates the constness of the string,
3004 * so DON'T do it here
3005 */
3006 break;
3007 case XTerm_Pixmap: 3353 case XTerm_Pixmap:
3008 if (*str != ';') 3354 if (*str != ';')
3009 { 3355 {
3010#if XPM_BACKGROUND 3356#if XPM_BACKGROUND
3011 scale_pixmap (""); /* reset to default scaling */ 3357 scale_pixmap (""); /* reset to default scaling */
… …
3034 set_window_color (Color_fg, str); 3380 set_window_color (Color_fg, str);
3035 break; 3381 break;
3036 case XTerm_restoreBG: 3382 case XTerm_restoreBG:
3037 set_window_color (Color_bg, str); 3383 set_window_color (Color_bg, str);
3038 break; 3384 break;
3385
3039 case XTerm_logfile: 3386 case XTerm_logfile:
3387 // TODO, when secure mode?
3040 break; 3388 break;
3389
3041 case XTerm_font: 3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3042 change_font (str); 3401 change_font (str);
3043 break; 3402 break;
3403
3044#ifndef NO_FRILLS 3404#ifndef NO_FRILLS
3045 case XTerm_locale: 3405 case XTerm_locale:
3046 if (str[0] == '?' && !str[1]) 3406 if (query)
3047 tt_printf ("%-.250s\n", locale); 3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3048 else 3411 else
3049 { 3412 {
3050 set_locale (str); 3413 set_locale (str);
3051# ifdef USE_XIM 3414# ifdef USE_XIM
3052 im_cb (); 3415 im_cb ();
3053# endif 3416# endif
3054 // TODO: call selection_make with the right values set
3055 // to re-fresh the selection.
3056 if (display->selection_owner == this)
3057 display->set_selection_owner (0);
3058 } 3417 }
3059 break; 3418 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif
3429
3430#ifdef MENUBAR
3431 case XTerm_Menu:
3432 if (Options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break;
3060#endif 3435#endif
3061#if 0 3436#if 0
3062 case XTerm_dumpscreen: /* no error notices */ 3437 case XTerm_dumpscreen: /* no error notices */
3063 { 3438 {
3064 int fd; 3439 int fd;
3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3440 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3066 { 3441 {
3067 scr_dump (fd); 3442 scr_dump (fd);
3068 close (fd); 3443 close (fd);
3069 } 3444 }
3070 } 3445 }
3071 break; 3446 break;
3072#endif 3447#endif
3073
3074 } 3448 }
3075} 3449}
3076/*----------------------------------------------------------------------*/ 3450/*----------------------------------------------------------------------*/
3077 3451
3078/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3452/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3086 * so no need for fancy checking 3460 * so no need for fancy checking
3087 */ 3461 */
3088int 3462int
3089rxvt_term::privcases (int mode, unsigned long bit) 3463rxvt_term::privcases (int mode, unsigned long bit)
3090{ 3464{
3091 int state; 3465 int state;
3092 3466
3093 if (mode == 's') 3467 if (mode == 's')
3094 { 3468 {
3095 SavedModes |= (PrivateModes & bit); 3469 SavedModes |= (PrivateModes & bit);
3096 return -1; 3470 return -1;
… …
3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3102 else 3476 else
3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3104 PrivMode (state, bit); 3478 PrivMode (state, bit);
3105 } 3479 }
3480
3106 return state; 3481 return state;
3107} 3482}
3108 3483
3109/* we're not using priv _yet_ */ 3484/* we're not using priv _yet_ */
3110void 3485void
3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3486rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3112{ 3487{
3113 unsigned int i, j; 3488 unsigned int i, j;
3114 int state; 3489 int state;
3490
3115 static const struct 3491 static const struct
3116 { 3492 {
3117 const int argval; 3493 const int argval;
3118 const unsigned long bit; 3494 const unsigned long bit;
3119 } 3495 }
3496
3120 argtopriv[] = { 3497 argtopriv[] = {
3121 { 1, PrivMode_aplCUR }, 3498 { 1, PrivMode_aplCUR },
3122 { 2, PrivMode_vt52 }, 3499 { 2, PrivMode_vt52 },
3123 { 3, PrivMode_132 }, 3500 { 3, PrivMode_132 },
3124 { 4, PrivMode_smoothScroll }, 3501 { 4, PrivMode_smoothScroll },
… …
3130 { menuBar_esc, PrivMode_menuBar }, 3507 { menuBar_esc, PrivMode_menuBar },
3131#endif 3508#endif
3132#ifdef scrollBar_esc 3509#ifdef scrollBar_esc
3133 { scrollBar_esc, PrivMode_scrollBar }, 3510 { scrollBar_esc, PrivMode_scrollBar },
3134#endif 3511#endif
3512 // 18, 19 printing-related
3135 { 25, PrivMode_VisibleCursor }, 3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3136 { 35, PrivMode_ShiftKeys }, 3515 { 35, PrivMode_ShiftKeys }, // rxvt extension
3137 { 40, PrivMode_132OK }, 3516 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI
3519 // 46 start logging
3138 { 47, PrivMode_Screen }, 3520 { 47, PrivMode_Screen },
3139 { 66, PrivMode_aplKP }, 3521 { 66, PrivMode_aplKP },
3140#ifndef NO_BACKSPACE_KEY 3522#ifndef NO_BACKSPACE_KEY
3141 { 67, PrivMode_BackSpace }, 3523 { 67, PrivMode_BackSpace },
3142#endif 3524#endif
3143 { 1000, PrivMode_MouseX11 }, 3525 { 1000, PrivMode_MouseX11 },
3526 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3527 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3528 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3144 { 1010, PrivMode_TtyOutputInh }, 3529 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3145 { 1011, PrivMode_Keypress }, 3530 { 1011, PrivMode_Keypress }, // rxvt extension
3531 // 1035 enable modifiers for alt, numlock NYI
3532 // 1036 send ESC for meta keys NYI
3533 // 1037 send DEL for keypad delete NYI
3146 { 1047, PrivMode_Screen }, 3534 { 1047, PrivMode_Screen },
3535 // 1048 save and restore cursor
3147 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3536 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3537 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3148 }; 3538 };
3149 3539
3150 if (nargs == 0) 3540 if (nargs == 0)
3151 return; 3541 return;
3152 3542
… …
3167 state = privcases (mode, argtopriv[j].bit); 3557 state = privcases (mode, argtopriv[j].bit);
3168 break; 3558 break;
3169 } 3559 }
3170 3560
3171 /* extra handling for values with state unkept */ 3561 /* extra handling for values with state unkept */
3172 if (state == -1)
3173 switch (arg[i]) 3562 switch (arg[i])
3174 { 3563 {
3175 case 1048: /* alternative cursor save */ 3564 case 1048: /* alternative cursor save */
3565 if (Options & Opt_secondaryScreen)
3176 if (mode == 0) 3566 if (mode == 0)
3177 scr_cursor (RESTORE); 3567 scr_cursor (RESTORE);
3178 else if (mode == 1) 3568 else if (mode == 1)
3179 scr_cursor (SAVE); 3569 scr_cursor (SAVE);
3180 /* FALLTHROUGH */
3181 default:
3182 continue; /* for (;i;) */
3183 }
3184
3185 /* extra handling for values with valid 0 or 1 state */
3186 switch (arg[i])
3187 {
3188 /* case 1: - application cursor keys */
3189 case 2: /* VT52 mode */
3190 /* oddball mode. should be set regardless of set/reset
3191 * parameter. Return from VT52 mode with an ESC < from
3192 * within VT52 mode
3193 */
3194 PrivMode (1, PrivMode_vt52);
3195 break; 3570 break;
3571 }
3572
3573 if (state >= 0)
3574 /* extra handling for values with valid 0 or 1 state */
3575 switch (arg[i])
3576 {
3577 /* case 1: - application cursor keys */
3578 case 2: /* VT52 mode */
3579 /* oddball mode. should be set regardless of set/reset
3580 * parameter. Return from VT52 mode with an ESC < from
3581 * within VT52 mode
3582 */
3583 PrivMode (1, PrivMode_vt52);
3584 break;
3196 case 3: /* 80/132 */ 3585 case 3: /* 80/132 */
3197 if (PrivateModes & PrivMode_132OK) 3586 if (PrivateModes & PrivMode_132OK)
3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3199 (unsigned int)TermWin.height);
3200 break; 3588 break;
3201 case 4: /* smooth scrolling */ 3589 case 4: /* smooth scrolling */
3202 if (state) 3590 if (state)
3203 Options &= ~Opt_jumpScroll; 3591 Options &= ~Opt_jumpScroll;
3204 else 3592 else
3205 Options |= Opt_jumpScroll; 3593 Options |= Opt_jumpScroll;
3206 break; 3594 break;
3207 case 5: /* reverse video */ 3595 case 5: /* reverse video */
3208 scr_rvideo_mode (state); 3596 scr_rvideo_mode (state);
3209 break; 3597 break;
3210 case 6: /* relative/absolute origins */ 3598 case 6: /* relative/absolute origins */
3211 scr_relative_origin (state); 3599 scr_relative_origin (state);
3212 break; 3600 break;
3213 case 7: /* autowrap */ 3601 case 7: /* autowrap */
3214 scr_autowrap (state); 3602 scr_autowrap (state);
3215 break; 3603 break;
3216 /* case 8: - auto repeat, can't do on a per window basis */ 3604 /* case 8: - auto repeat, can't do on a per window basis */
3217 case 9: /* X10 mouse reporting */ 3605 case 9: /* X10 mouse reporting */
3218 if (state) /* orthogonal */ 3606 if (state) /* orthogonal */
3219 PrivateModes &= ~ (PrivMode_MouseX11); 3607 PrivateModes &= ~PrivMode_MouseX11;
3220 break; 3608 break;
3221#ifdef menuBar_esc 3609#ifdef menuBar_esc
3222 case menuBar_esc: 3610 case menuBar_esc:
3223#ifdef MENUBAR 3611#ifdef MENUBAR
3224 map_menuBar (state); 3612 map_menuBar (state);
3225#endif 3613#endif
3226 break; 3614 break;
3227#endif 3615#endif
3228#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
3229 case scrollBar_esc: 3617 case scrollBar_esc:
3230 if (scrollbar_mapping (state)) 3618 if (scrollbar_mapping (state))
3231 { 3619 {
3232 resize_all_windows (0, 0, 0); 3620 resize_all_windows (0, 0, 0);
3233 scr_touch (true); 3621 scr_touch (true);
3234 } 3622 }
3235 break; 3623 break;
3236#endif 3624#endif
3237 case 25: /* visible/invisible cursor */ 3625 case 25: /* visible/invisible cursor */
3238 scr_cursor_visible (state); 3626 scr_cursor_visible (state);
3239 break; 3627 break;
3240 /* case 35: - shift keys */ 3628 /* case 35: - shift keys */
3241 /* case 40: - 80 <--> 132 mode */ 3629 /* case 40: - 80 <--> 132 mode */
3242 case 47: /* secondary screen */ 3630 case 47: /* secondary screen */
3243 scr_change_screen (state); 3631 scr_change_screen (state);
3244 break; 3632 break;
3245 /* case 66: - application key pad */ 3633 /* case 66: - application key pad */
3246 /* case 67: - backspace key */ 3634 /* case 67: - backspace key */
3247 case 1000: /* X11 mouse reporting */ 3635 case 1000: /* X11 mouse reporting */
3248 if (state) /* orthogonal */ 3636 if (state) /* orthogonal */
3249 PrivateModes &= ~ (PrivMode_MouseX10); 3637 PrivateModes &= ~PrivMode_MouseX10;
3250 break; 3638 break;
3251#if 0 3639#if 0
3252 case 1001: 3640 case 1001:
3253 break; /* X11 mouse highlighting */ 3641 break; /* X11 mouse highlighting */
3254#endif 3642#endif
3255 case 1010: /* scroll to bottom on TTY output inhibit */ 3643 case 1010: /* scroll to bottom on TTY output inhibit */
3256 if (state) 3644 if (state)
3257 Options &= ~Opt_scrollTtyOutput; 3645 Options &= ~Opt_scrollTtyOutput;
3258 else 3646 else
3259 Options |= Opt_scrollTtyOutput; 3647 Options |= Opt_scrollTtyOutput;
3260 break; 3648 break;
3261 case 1011: /* scroll to bottom on key press */ 3649 case 1011: /* scroll to bottom on key press */
3262 if (state) 3650 if (state)
3263 Options |= Opt_scrollTtyKeypress; 3651 Options |= Opt_scrollTtyKeypress;
3264 else 3652 else
3265 Options &= ~Opt_scrollTtyKeypress; 3653 Options &= ~Opt_scrollTtyKeypress;
3266 break; 3654 break;
3267 case 1047: /* secondary screen w/ clearing */ 3655 case 1047: /* secondary screen w/ clearing last */
3268 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3656 if (Options & Opt_secondaryScreen)
3269 if (current_screen != PRIMARY) 3657 if (current_screen != PRIMARY)
3270 scr_erase_screen (2); 3658 scr_erase_screen (2);
3271 scr_change_screen (state); 3659 scr_change_screen (state);
3272 /* FALLTHROUGH */
3273 default:
3274 break; 3660 break;
3661 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY)
3665 scr_erase_screen (2);
3666 break;
3667 default:
3668 break;
3275 } 3669 }
3276 } 3670 }
3277} 3671}
3278/*}}} */ 3672/*}}} */
3279 3673
3280/*{{{ process sgr sequences */ 3674/*{{{ process sgr sequences */
3281void 3675void
3282rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3676rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3283{ 3677{
3284 unsigned int i; 3678 unsigned int i;
3285 short rendset; 3679 short rendset;
3286 int rendstyle; 3680 int rendstyle;
3287 3681
3288 if (nargs == 0) 3682 if (nargs == 0)
3289 { 3683 {
3290 scr_rendition (0, ~RS_None); 3684 scr_rendition (0, ~RS_None);
3291 return; 3685 return;
3292 } 3686 }
3687
3293 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3294 { 3689 {
3295 rendset = -1; 3690 rendset = -1;
3296 switch (arg[i]) 3691 switch (arg[i])
3297 { 3692 {
… …
3308 rendset = 1, rendstyle = RS_Blink; 3703 rendset = 1, rendstyle = RS_Blink;
3309 break; 3704 break;
3310 case 7: 3705 case 7:
3311 rendset = 1, rendstyle = RS_RVid; 3706 rendset = 1, rendstyle = RS_RVid;
3312 break; 3707 break;
3708 case 8:
3709 // invisible. NYI
3710 break;
3313 case 22: 3711 case 22:
3314 rendset = 0, rendstyle = RS_Bold; 3712 rendset = 0, rendstyle = RS_Bold;
3315 break; 3713 break;
3316 case 24: 3714 case 24:
3317 rendset = 0, rendstyle = RS_Uline; 3715 rendset = 0, rendstyle = RS_Uline;
… …
3320 rendset = 0, rendstyle = RS_Blink; 3718 rendset = 0, rendstyle = RS_Blink;
3321 break; 3719 break;
3322 case 27: 3720 case 27:
3323 rendset = 0, rendstyle = RS_RVid; 3721 rendset = 0, rendstyle = RS_RVid;
3324 break; 3722 break;
3723 case 28:
3724 // visible. NYI
3725 break;
3325 } 3726 }
3727
3326 if (rendset != -1) 3728 if (rendset != -1)
3327 { 3729 {
3328 scr_rendition (rendset, rendstyle); 3730 scr_rendition (rendset, rendstyle);
3329 continue; /* for (;i;) */ 3731 continue; /* for (;i;) */
3330 } 3732 }
… …
3337 case 33: 3739 case 33:
3338 case 34: 3740 case 34:
3339 case 35: 3741 case 35:
3340 case 36: 3742 case 36:
3341 case 37: 3743 case 37:
3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3343 Color_fg);
3344 break; 3745 break;
3345#ifdef TTY_256COLOR 3746#ifdef TTY_256COLOR
3346 case 38: 3747 case 38:
3347 if (nargs > i + 2 && arg[i + 1] == 5) 3748 if (nargs > i + 2 && arg[i + 1] == 5)
3348 { 3749 {
3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3350 Color_fg);
3351 i += 2; 3751 i += 2;
3352 } 3752 }
3353 break; 3753 break;
3354#endif 3754#endif
3355 case 39: /* default fg */ 3755 case 39: /* default fg */
… …
3362 case 43: 3762 case 43:
3363 case 44: 3763 case 44:
3364 case 45: 3764 case 45:
3365 case 46: 3765 case 46:
3366 case 47: 3766 case 47:
3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3368 Color_bg);
3369 break; 3768 break;
3370#ifdef TTY_256COLOR 3769#ifdef TTY_256COLOR
3371 case 48: 3770 case 48:
3372 if (nargs > i + 2 && arg[i + 1] == 5) 3771 if (nargs > i + 2 && arg[i + 1] == 5)
3373 { 3772 {
3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3375 Color_bg);
3376 i += 2; 3774 i += 2;
3377 } 3775 }
3378 break; 3776 break;
3379#endif 3777#endif
3380 case 49: /* default bg */ 3778 case 49: /* default bg */
… …
3413 3811
3414/*{{{ process Rob Nation's own graphics mode sequences */ 3812/*{{{ process Rob Nation's own graphics mode sequences */
3415void 3813void
3416rxvt_term::process_graphics () 3814rxvt_term::process_graphics ()
3417{ 3815{
3418 unsigned char ch, cmd = cmd_getc (); 3816 unicode_t ch, cmd = cmd_getc ();
3419 3817
3420 if (cmd == 'Q') 3818 if (cmd == 'Q')
3421 { /* query graphics */ 3819 { /* query graphics */
3422 tt_printf ("\033G0\n"); /* no graphics */ 3820 tt_printf ("\033G0\n"); /* no graphics */
3423 return; 3821 return;

Diff Legend

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