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.59 by pcg, Wed Feb 25 15:39:48 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
… …
291 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
292 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
293 } 283 }
294 else 284 else
295 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
296# ifdef MULTICHAR_SET
297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
298 {
299 int col, row;
300
301 newlen = STRLEN (kbuf);
302 col = screen.cur.col - 1;
303 row = screen.cur.row + TermWin.saveLines;
304 if (IS_MULTI2 (screen.rend[row][col]))
305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
306 }
307# endif
308 break; 286 break;
309#endif 287#endif
310#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
311 case XK_Delete: 289 case XK_Delete:
312 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
313# ifdef MULTICHAR_SET
314 if (Options & Opt_mc_hack)
315 {
316 int col, row;
317
318 newlen = STRLEN (kbuf);
319 col = screen.cur.col;
320 row = screen.cur.row + TermWin.saveLines;
321 if (IS_MULTI1 (screen.rend[row][col]))
322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
323 }
324# endif
325 break; 291 break;
326#endif 292#endif
327 case XK_Tab: 293 case XK_Tab:
328 if (shft) 294 if (shft)
329 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
371 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
372 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
373 } 339 }
374 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
375 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
376#ifdef MULTICHAR_SET
377 //TODO: ??
378 if (Options & Opt_mc_hack)
379 {
380 int col, row, m;
381
382 col = screen.cur.col;
383 row = screen.cur.row + TermWin.saveLines;
384 m = 0;
385 if (keysym == XK_Right
386 && IS_MULTI1 (screen.rend[row][col]))
387 m = 1;
388 else if (keysym == XK_Left)
389 {
390 if (col > 0)
391 {
392 if (IS_MULTI2 (screen.rend[row][col - 1]))
393 m = 1;
394 }
395 else if (screen.cur.row > 0)
396 {
397 col = screen.tlen[--row];
398 if (col == -1)
399 col = TermWin.ncol - 1;
400 else
401 col--;
402 if (col > 0
403 && IS_MULTI2 (screen.rend[row][col]))
404 m = 1;
405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
410#endif
411 break; 342 break;
412 343
413#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
414# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
415 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
604 break; 535 break;
605 } 536 }
606 if (newlen) 537 if (newlen)
607 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
608 } 539 }
540
609 /* 541 /*
610 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
611 */ 543 */
612#ifdef META8_OPTION 544#ifdef META8_OPTION
613 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
628 { 560 {
629 unsigned char *ch; 561 unsigned char *ch;
630 562
631 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
632 *ch |= 0x80; 564 *ch |= 0x80;
565
633 meta = 0; 566 meta = 0;
634 } 567 }
635#endif 568#endif
636 /* nil */ ; 569 /* nil */ ;
637 } 570 }
… …
690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
691/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
692unsigned int 625unsigned int
693rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
694{ 627{
695 unsigned int n, s; 628 unsigned int n, s;
696 629
697 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
699 632
700 if (n > 0 && s < count) 633 if (n > 0 && s < count)
701 { 634 {
702 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
… …
706 s += n; 639 s += n;
707 } 640 }
708 641
709 if (count > s) 642 if (count > s)
710 { 643 {
711 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
712 count = s; 645 count = s;
713 } 646 }
714 647
715 for (; count--;) 648 for (; count--;)
716 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
… …
787 720
788 memmove (cmdbuf_base, cmdbuf_ptr, n); 721 memmove (cmdbuf_base, cmdbuf_ptr, n);
789 cmdbuf_ptr = cmdbuf_base; 722 cmdbuf_ptr = cmdbuf_base;
790 cmdbuf_endp = cmdbuf_ptr + n; 723 cmdbuf_endp = cmdbuf_ptr + n;
791 724
792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
793 726
794 if (n > 0) 727 if (n > 0)
795 { 728 {
796 cmdbuf_endp += n; 729 cmdbuf_endp += n;
797 return true; 730 return true;
… …
810 743
811 if (revents & EVENT_WRITE) 744 if (revents & EVENT_WRITE)
812 tt_write (0, 0); 745 tt_write (0, 0);
813 else if (revents & EVENT_READ) 746 else if (revents & EVENT_READ)
814 { 747 {
815 bool flag = true;
816
817 // loop, but don't allow a single term to monopolize us 748 // loop, but don't allow a single term to monopolize us
818 // the number of loops is fully arbitrary, and thus wrong 749 // the number of loops is fully arbitrary, and thus wrong
819 while (flag && pty_fill ()) 750 while (pty_fill ())
820 { 751 {
821 if (!seen_input) 752 if (!seen_input)
822 { 753 {
823 seen_input = 1; 754 seen_input = 1;
824 /* 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.
825 tt_winch (); 757 tt_winch ();
826 } 758 }
827 759
828 if (cmd_parse ()) 760 if (cmd_parse ())
829 break; 761 break;
830 } 762 }
831 }
832}
833
834bool
835rxvt_term::cmd_parse ()
836{
837 bool flag = false;
838 uint32_t ch = NOCHAR;
839
840 for (;;)
841 {
842 if (ch == NOCHAR)
843 ch = next_char ();
844
845 if (ch == NOCHAR) // TODO: improve
846 break;
847
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
857
858 for (;;)
859 {
860 ch = next_char ();
861
862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
863 break;
864 else
865 {
866 *str++ = ch;
867
868 if (ch == '\n')
869 {
870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
875 {
876 refreshnow = true;
877 flag = false;
878 ch = NOCHAR;
879 break;
880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
888 }
889 }
890
891 if (str >= buf + BUFSIZ)
892 {
893 ch = NOCHAR;
894 break;
895 }
896 }
897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
935 }
936
937 return flag;
938}
939
940// read the next character, currently handles UTF-8
941// will probably handle all sorts of other stuff in the future
942uint32_t
943rxvt_term::next_char ()
944{
945 while (cmdbuf_ptr < cmdbuf_endp)
946 {
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
948 return *cmdbuf_ptr++;
949
950 wchar_t wc;
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
952
953 if (len == (size_t)-2)
954 return NOCHAR;
955
956 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958
959 // assume wchar == unicode
960 cmdbuf_ptr += len;
961 return wc;
962 }
963
964 return NOCHAR;
965}
966
967/* rxvt_cmd_getc () - Return next input character */
968/*
969 * Return the next input character after first passing any keyboard input
970 * to the command.
971 */
972uint32_t
973rxvt_term::cmd_getc ()
974{
975 for (;;)
976 {
977 uint32_t c = next_char ();
978 if (c != NOCHAR)
979 return c;
980
981 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design.
983 fcntl (cmd_fd, F_SETFL, 0);
984 pty_fill ();
985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
986 } 763 }
987} 764}
988 765
989#ifdef POINTER_BLANK 766#ifdef POINTER_BLANK
990void 767void
… …
1354 check_our_parents (); 1131 check_our_parents ();
1355 if (am_transparent) 1132 if (am_transparent)
1356 want_full_refresh = 1; 1133 want_full_refresh = 1;
1357 } 1134 }
1358#endif 1135#endif
1359
1360 } 1136 }
1361 break; 1137 break;
1362 1138
1363 case SelectionClear: 1139 case SelectionClear:
1364 display->set_selection_owner (0); 1140 selection_clear ();
1365 break; 1141 break;
1366 1142
1367 case SelectionNotify: 1143 case SelectionNotify:
1368 if (selection_wait == Sel_normal) 1144 if (selection_wait == Sel_normal)
1369 selection_paste (ev.xselection.requestor, 1145 selection_paste (ev.xselection.requestor,
… …
1568 return; 1344 return;
1569 } 1345 }
1570 1346
1571 /* FALLTHROUGH */ 1347 /* FALLTHROUGH */
1572 case ReparentNotify: 1348 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1574 if (am_transparent)
1575 want_full_refresh = 1; 1350 want_full_refresh = 1;
1576 break; 1351 break;
1577#endif 1352#endif
1578 } 1353 }
1579} 1354}
1580 1355
… …
1924 else if (isMenuBarWindow (ev.window)) 1699 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev); 1700 menubar_control (ev);
1926#endif 1701#endif
1927} 1702}
1928 1703
1929
1930#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
1931/* 1940/*
1932 * Check our parents are still who we think they are. 1941 * Check our parents are still who we think they are.
1933 * Do transparency updates if required 1942 * Do transparency updates if required
1934 */ 1943 */
1935int 1944int
1936rxvt_term::check_our_parents () 1945rxvt_term::check_our_parents ()
1937{ 1946{
1938 int i, pchanged, aformat, have_pixmap, rootdepth; 1947 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after; 1948 unsigned long nitems, bytes_after;
1940 Atom atype; 1949 Atom atype;
1941 unsigned char *prop = NULL; 1950 unsigned char *prop = NULL;
1942 Window root, oldp, *list; 1951 Window root, oldp, *list;
1943 Pixmap rootpixmap = None; 1952 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr; 1953 XWindowAttributes wattr, wrootattr;
1945 1954
1946 pchanged = 0; 1955 pchanged = 0;
1947 1956
1948 if (! (Options & Opt_transparent)) 1957 if (!(Options & Opt_transparent))
1949 return pchanged; /* Don't try any more */ 1958 return pchanged; /* Don't try any more */
1950 1959
1951 XGetWindowAttributes (display->display, display->root, &wrootattr); 1960 XGetWindowAttributes (display->display, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth; 1961 rootdepth = wrootattr.depth;
1953 1962
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1964
1955 if (rootdepth != wattr.depth) 1965 if (rootdepth != wattr.depth)
1956 { 1966 {
1957 if (am_transparent) 1967 if (am_transparent)
1958 { 1968 {
1959 pchanged = 1; 1969 pchanged = 1;
1960 XSetWindowBackground (display->display, TermWin.vt, 1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1961 PixColors[Color_bg]);
1962 am_transparent = am_pixmap_trans = 0; 1971 am_transparent = am_pixmap_trans = 0;
1963 } 1972 }
1973
1964 return pchanged; /* Don't try any more */ 1974 return pchanged; /* Don't try any more */
1965 } 1975 }
1966 1976
1967 /* 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. */
1968 XSync (display->display, False); 1978 XSync (display->display, False);
… …
1970 /* 1980 /*
1971 * Make the frame window set by the window manager have 1981 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame 1982 * the root background. Some window managers put multiple nested frame
1973 * 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.
1974 */ 1984 */
1975 i = (xa[XA_XROOTPMAPID] != 0 1985 i = (xa[XA_XROOTPMAPID]
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &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
1979 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1980 have_pixmap = 0; 1997 have_pixmap = 0;
1981 else 1998 else
1982 { 1999 {
1983 have_pixmap = 1; 2000 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1985 XFree (prop); 2002 XFree (prop);
1986 } 2003 }
2004
1987 if (have_pixmap) 2005 if (have_pixmap)
1988 { 2006 {
1989 /* 2007 /*
1990 * Copy display->root pixmap transparency 2008 * Copy display->root pixmap transparency
1991 */ 2009 */
1992 int sx, sy, nx, ny; 2010 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 2011 unsigned int nw, nh;
1994 Window cr; 2012 Window cr;
1995 XImage *image; 2013 XImage *image;
1996 GC gc; 2014 GC gc;
1997 XGCValues gcvalue; 2015 XGCValues gcvalue;
1998 2016
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 2018 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 2019 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 2020 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 2021 nx = ny = 0;
2022
2004 if (sx < 0) 2023 if (sx < 0)
2005 { 2024 {
2006 nw += sx; 2025 nw += sx;
2007 nx = -sx; 2026 nx = -sx;
2008 sx = 0; 2027 sx = 0;
2009 } 2028 }
2029
2010 if (sy < 0) 2030 if (sy < 0)
2011 { 2031 {
2012 nh += sy; 2032 nh += sy;
2013 ny = -sy; 2033 ny = -sy;
2014 sy = 0; 2034 sy = 0;
2015 } 2035 }
2036
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2018 allowedxerror = -1; 2039 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2020 ZPixmap); 2041
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */ 2043 /* XXX: may need a delay here? */
2023 allowedxerror = 0; 2044 allowedxerror = 0;
2045
2024 if (image == NULL) 2046 if (image == NULL)
2025 { 2047 {
2026 if (am_transparent && am_pixmap_trans) 2048 if (am_transparent && am_pixmap_trans)
2027 { 2049 {
2028 pchanged = 1; 2050 pchanged = 1;
… …
2030 { 2052 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2053 XFreePixmap (display->display, TermWin.pixmap);
2032 TermWin.pixmap = None; 2054 TermWin.pixmap = None;
2033 } 2055 }
2034 } 2056 }
2057
2035 am_pixmap_trans = 0; 2058 am_pixmap_trans = 0;
2036 } 2059 }
2037 else 2060 else
2038 { 2061 {
2039 if (TermWin.pixmap != None) 2062 if (TermWin.pixmap != None)
2040 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
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2042 (unsigned int)szHint.width,
2043 (unsigned int)szHint.height, 2086 szHint.width, szHint.height, image->depth);
2044 (unsigned int)image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height); 2089 nx, ny, image->width, image->height);
2049 XFreeGC (display->display, gc); 2090 XFreeGC (display->display, gc);
2050 XDestroyImage (image); 2091 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2052 TermWin.pixmap); 2093 TermWin.pixmap);
2094
2053 if (!am_transparent || !am_pixmap_trans) 2095 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 2096 pchanged = 1;
2097
2055 am_transparent = am_pixmap_trans = 1; 2098 am_transparent = am_pixmap_trans = 1;
2056 } 2099 }
2057 } 2100 }
2101
2058 if (!am_pixmap_trans) 2102 if (!am_pixmap_trans)
2059 { 2103 {
2060 unsigned int n; 2104 unsigned int n;
2061 /* 2105 /*
2062 * InheritPixmap transparency 2106 * InheritPixmap transparency
2063 */ 2107 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2066 i++)
2067 { 2110 {
2068 oldp = TermWin.parent[i]; 2111 oldp = TermWin.parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2112 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2070 &TermWin.parent[i], &list, &n); 2113 &TermWin.parent[i], &list, &n);
2071 XFree (list); 2114 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116
2073 if (TermWin.parent[i] == display->root) 2117 if (TermWin.parent[i] == display->root)
2074 { 2118 {
2075 if (oldp != None) 2119 if (oldp != None)
2076 pchanged = 1; 2120 pchanged = 1;
2121
2077 break; 2122 break;
2078 } 2123 }
2124
2079 if (oldp != TermWin.parent[i]) 2125 if (oldp != TermWin.parent[i])
2080 pchanged = 1; 2126 pchanged = 1;
2081 } 2127 }
2128
2082 n = 0; 2129 n = 0;
2130
2083 if (pchanged) 2131 if (pchanged)
2084 { 2132 {
2085 for (; n < (unsigned int)i; n++) 2133 for (; n < (unsigned int)i; n++)
2086 { 2134 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2092 break; 2140 break;
2093 } 2141 }
2094 } 2142 }
2095 } 2143 }
2096 if (n > (int) (sizeof (TermWin.parent) 2144
2097 / sizeof (TermWin.parent[0]))) 2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2098 { 2146 {
2099 D_X ((stderr, "InheritPixmap Turning off")); 2147 D_X ((stderr, "InheritPixmap Turning off"));
2100 XSetWindowBackground (display->display, TermWin.parent[0], 2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2101 PixColors[Color_fg]);
2102 XSetWindowBackground (display->display, TermWin.vt, 2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2103 PixColors[Color_bg]);
2104 am_transparent = 0; 2150 am_transparent = 0;
2105 /* XXX: also turn off Opt_transparent? */ 2151 /* XXX: also turn off Opt_transparent? */
2106 } 2152 }
2107 else 2153 else
2108 { 2154 {
2155#if WAIT_FOR_WM
2109 /* wait (an arbitrary period) for the WM to do its thing 2156 /* wait (an arbitrary period) for the WM to do its thing
2110 * needed for fvwm2.2.2 (and before?) */ 2157 * needed for fvwm2.2.2 (and before?) */
2111# ifdef HAVE_NANOSLEEP
2112 struct timespec rqt;
2113
2114 rqt.tv_sec = 1;
2115 rqt.tv_nsec = 0;
2116 nanosleep (&rqt, NULL);
2117# else
2118 sleep (1); 2158 sleep (1);
2119# endif 2159#endif
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2121 for (n = 0; n < (unsigned int)i; n++) 2161 for (n = 0; n < (unsigned int)i; n++)
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2123 ParentRelative); 2163
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2125 ParentRelative);
2126 am_transparent = 1; 2165 am_transparent = 1;
2127 } 2166 }
2167
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None; 2169 TermWin.parent[i] = None;
2130 } 2170 }
2171
2131 return pchanged; 2172 return pchanged;
2132} 2173}
2133#endif 2174#endif
2134 2175
2135/*}}} */ 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}
2136 2332
2137/*{{{ print pipe */ 2333/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2334/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2335#ifdef PRINTPIPE
2140FILE * 2336FILE *
2141rxvt_term::popen_printer () 2337rxvt_term::popen_printer ()
2142{ 2338{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2339 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2340
2145 if (stream == NULL) 2341 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2342 rxvt_warn ("can't open printer pipe, not printing.\n");
2343
2147 return stream; 2344 return stream;
2148} 2345}
2149 2346
2150int 2347int
2151rxvt_term::pclose_printer (FILE *stream) 2348rxvt_term::pclose_printer (FILE *stream)
2152{ 2349{
2153 fflush (stream); 2350 fflush (stream);
2154 /* pclose () reported not to work on SunOS 4.1.3 */
2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2156 /* pclose works provided SIGCHLD handler uses waitpid */
2157 return pclose (stream); /* return fclose (stream); */
2158# else
2159 return pclose (stream); 2351 return pclose (stream);
2160# endif
2161} 2352}
2162 2353
2163/* 2354/*
2164 * simulate attached vt100 printer 2355 * simulate attached vt100 printer
2165 */ 2356 */
2166void 2357void
2167rxvt_term::process_print_pipe () 2358rxvt_term::process_print_pipe ()
2168{ 2359{
2169 int done; 2360 int done;
2170 FILE *fd; 2361 FILE *fd;
2171 2362
2172 if ((fd = popen_printer ()) == NULL) 2363 if ((fd = popen_printer ()) == NULL)
2173 return; 2364 return;
2174 2365
2175 /* 2366 /*
2176 * 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
2177 * is received. 2368 * is received.
2178 */ 2369 */
2179 for (done = 0; !done;) 2370 for (done = 0; !done;)
2180 { 2371 {
2181 unsigned char buf[8]; 2372 unsigned char buf[8];
2182 unsigned char ch; 2373 unicode_t ch;
2183 unsigned int i, len; 2374 unsigned int i, len;
2184 2375
2185 if ((ch = cmd_getc ()) != C0_ESC) 2376 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2377 {
2187 if (putc (ch, fd) == EOF) 2378 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2379 break; /* done = 1 */
… …
2203 { 2394 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2395 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2396 break; /* done = 1 */
2206 } 2397 }
2207 } 2398 }
2399
2208 for (i = 0; i < len; i++) 2400 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2401 if (putc (buf[i], fd) == EOF)
2210 { 2402 {
2211 done = 1; 2403 done = 1;
2212 break; 2404 break;
2213 } 2405 }
2214 } 2406 }
2215 } 2407 }
2408
2216 pclose_printer (fd); 2409 pclose_printer (fd);
2217} 2410}
2218#endif /* PRINTPIPE */ 2411#endif /* PRINTPIPE */
2219/*}}} */ 2412/*}}} */
2220 2413
2221/* *INDENT-OFF* */ 2414/* *INDENT-OFF* */
2222enum { 2415enum {
2223 C1_40 = 0x40, 2416 C1_40 = 0x40,
2224 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,
2225 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,
2226 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,
2227 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,
2228}; 2421};
2229/* *INDENT-ON* */ 2422/* *INDENT-ON* */
2230 2423
2231/*{{{ process non-printing single characters */ 2424/*{{{ process non-printing single characters */
2232void 2425void
2233rxvt_term::process_nonprinting (unsigned char ch) 2426rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2427{
2235 switch (ch) 2428 switch (ch)
2236 { 2429 {
2430 case C0_ESC:
2431 process_escape_seq ();
2432 break;
2237 case C0_ENQ: /* terminal Status */ 2433 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2434 if (rs[Rs_answerbackstring])
2239 tt_write (
2240 (const unsigned char *)rs[Rs_answerbackstring], 2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2241 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2242 else 2437 else
2243 tt_write ((unsigned char *)VT100_ANS, 2438 tt_write ((unsigned char *)VT100_ANS,
2244 (unsigned int)STRLEN (VT100_ANS)); 2439 (unsigned int)STRLEN (VT100_ANS));
2245 break; 2440 break;
2246 case C0_BEL: /* bell */ 2441 case C0_BEL: /* bell */
2247 scr_bell (); 2442 scr_bell ();
2248 break; 2443 break;
2249 case C0_BS: /* backspace */ 2444 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 2459 scr_charset_choose (1);
2265 break; 2460 break;
2266 case C0_SI: /* shift in - acs */ 2461 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 2462 scr_charset_choose (0);
2268 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;
2269 } 2475 }
2270} 2476}
2271/*}}} */ 2477/*}}} */
2272 2478
2273 2479
2274/*{{{ process VT52 escape sequences */ 2480/*{{{ process VT52 escape sequences */
2275void 2481void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 2482rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 2483{
2278 int row, col; 2484 int row, col;
2279 2485
2280 switch (ch) 2486 switch (ch)
2281 { 2487 {
… …
2333 2539
2334/*{{{ process escape sequences */ 2540/*{{{ process escape sequences */
2335void 2541void
2336rxvt_term::process_escape_seq () 2542rxvt_term::process_escape_seq ()
2337{ 2543{
2338 unsigned char ch = cmd_getc (); 2544 unicode_t ch = cmd_getc ();
2339 2545
2340 if (PrivateModes & PrivMode_vt52) 2546 if (PrivateModes & PrivMode_vt52)
2341 { 2547 {
2342 process_escape_vt52 (ch); 2548 process_escape_vt52 (ch);
2343 return; 2549 return;
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 2566 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 2567 break;
2362 case '+': 2568 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 2569 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 2570 break;
2365#ifdef MULTICHAR_SET
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS 2571#ifndef NO_FRILLS
2371 case '6': 2572 case '6':
2372 scr_backindex (); 2573 scr_backindex ();
2373 break; 2574 break;
2374#endif 2575#endif
… …
2396 break; 2597 break;
2397 2598
2398 /* 8.3.87: NEXT LINE */ 2599 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 2600 case C1_NEL: /* ESC E */
2400 { 2601 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 2602 unicode_t nlcr[] = { L'\n', L'\r' };
2402 scr_add_lines (nlcr, 1, 2); 2603 scr_add_lines (nlcr, 1, 2);
2403 } 2604 }
2404 break; 2605 break;
2405 2606
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 2607 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2417 case C1_RI: /* ESC M */ 2618 case C1_RI: /* ESC M */
2418 scr_index (DN); 2619 scr_index (DN);
2419 break; 2620 break;
2420 2621
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 2622 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 2623 /*case C1_SS2: scr_single_shift (2); break; */
2423 2624
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 2625 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 2626 /*case C1_SS3: scr_single_shift (3); break; */
2426 2627
2427 /* 8.3.27: DEVICE CONTROL STRING */ 2628 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 2629 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 2630 process_dcs_seq ();
2430 break; 2631 break;
… …
2445 process_osc_seq (); 2646 process_osc_seq ();
2446 break; 2647 break;
2447 2648
2448 /* 8.3.106: RESET TO INITIAL STATE */ 2649 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 2650 case 'c':
2651 mbstate.reset ();
2450 scr_poweron (); 2652 scr_poweron ();
2451 scrollbar_show (1); 2653 scrollbar_show (1);
2452 break; 2654 break;
2453 2655
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2656 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2491 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, */
2492 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, [, \, ], ^, _, */
2493 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, */
2494 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, */
2495 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, */
2496 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, {, |, }, ~, */
2497 }; 2699 };
2498/* *INDENT-ON* */ 2700/* *INDENT-ON* */
2499 2701
2500void 2702void
2501rxvt_term::process_csi_seq () 2703rxvt_term::process_csi_seq ()
2502{ 2704{
2503 unsigned char ch, priv, i; 2705 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 2706 unsigned int nargs, p;
2505 int n, ndef; 2707 int n, ndef;
2506 int arg[ESC_ARGS]; 2708 int arg[ESC_ARGS];
2507 2709
2508 for (nargs = ESC_ARGS; nargs > 0;) 2710 for (nargs = ESC_ARGS; nargs > 0;)
2509 arg[--nargs] = 0; 2711 arg[--nargs] = 0;
2510 2712
2511 priv = 0; 2713 priv = 0;
… …
2513 if (ch >= '<' && ch <= '?') 2715 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */ 2716 { /* '<' '=' '>' '?' */
2515 priv = ch; 2717 priv = ch;
2516 ch = cmd_getc (); 2718 ch = cmd_getc ();
2517 } 2719 }
2720
2518 /* read any numerical arguments */ 2721 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 2722 for (n = -1; ch < CSI_ICH; )
2520 { 2723 {
2521 if (isdigit (ch)) 2724 if (isdigit (ch))
2522 { 2725 {
… …
2529 { 2732 {
2530 if (nargs < ESC_ARGS) 2733 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 2734 arg[nargs++] = n;
2532 n = -1; 2735 n = -1;
2533 } 2736 }
2534 else if (ch == '\b') 2737 else if (IS_CONTROL (ch))
2535 {
2536 scr_backspace ();
2537 }
2538 else if (ch == C0_ESC)
2539 {
2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch); 2738 process_nonprinting (ch);
2546 } 2739
2547 ch = cmd_getc (); 2740 ch = cmd_getc ();
2548 } 2741 }
2549 2742
2550 if (ch > CSI_7F) 2743 if (ch > CSI_7F)
2551 return; 2744 return;
… …
2709 tt_printf ("\033[0n"); 2902 tt_printf ("\033[0n");
2710 break; 2903 break;
2711 case 6: /* CPR requested */ 2904 case 6: /* CPR requested */
2712 scr_report_position (); 2905 scr_report_position ();
2713 break; 2906 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 2907 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure)
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2909 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2717 break; 2910 break;
2718#endif
2719 case 8: /* unofficial extension */ 2911 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 2913 break;
2722 } 2914 }
2723 break; 2915 break;
2724 2916
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2917 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2793#endif 2985#endif
2794 2986
2795 case CSI_78: /* DECREQTPARM */ 2987 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 2988 if (arg[0] == 0 || arg[0] == 1)
2797 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);
2798 /* FALLTHROUGH */ 2990 break;
2799 2991
2800 default: 2992 default:
2801 break; 2993 break;
2802 } 2994 }
2803} 2995}
… …
2806#ifndef NO_FRILLS 2998#ifndef NO_FRILLS
2807/* ARGSUSED */ 2999/* ARGSUSED */
2808void 3000void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3001rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3002{
2811 int x, y; 3003 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3004 XWindowAttributes wattr;
2816 Window wdummy; 3005 Window wdummy;
2817 3006
2818 if (nargs == 0) 3007 if (nargs == 0)
2819 return; 3008 return;
3009
2820 switch (args[0]) 3010 switch (args[0])
2821 { 3011 {
2822 /* 3012 /*
2823 * commands 3013 * commands
2824 */ 3014 */
2825 case 1: /* deiconify window */ 3015 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3016 XMapWindow (display->display, TermWin.parent[0]);
2827 break; 3017 break;
2828 case 2: /* iconify window */ 3018 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3019 XIconifyWindow (display->display, TermWin.parent[0],
… …
2846 break; 3036 break;
2847 case 8: /* set size (chars) */ 3037 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3039 (unsigned int) (args[1] * TermWin.fheight));
2850 break; 3040 break;
3041
3042 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3043 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3044 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3045 set_widthheight ((unsigned int)TermWin.width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3046 (unsigned int) (args[1] * TermWin.fheight));
2855 break; 3047 break;
3048
3049
2856 /* 3050 /*
2857 * reports - some output format copied from XTerm 3051 * reports - some output format copied from XTerm
2858 */ 3052 */
2859 case 11: /* report window state */ 3053 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3056 break;
2863 case 13: /* report window position */ 3057 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3060 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3061 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3062 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3063 break;
2870 case 14: /* report window size (pixels) */ 3064 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3067 break;
2874 case 18: /* report window size (chars) */ 3068 case 18: /* report text area size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2876 break; 3070 break;
2877#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;
2878 case 20: /* report icon label */ 3074 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3078 XGetIconName (display->display, TermWin.parent[0], &s);
2880 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2881 break; 3081 break;
2882 case 21: /* report window title */ 3082 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 {
3085 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3086 XFetchName (display->display, TermWin.parent[0], &s);
2884 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3088 }
2885 break; 3089 break;
2886#endif
2887
2888 } 3090 }
2889} 3091}
2890#endif 3092#endif
2891 3093
2892/*----------------------------------------------------------------------*/ 3094/*----------------------------------------------------------------------*/
2893/* 3095/*
2894 * get input up until STRING TERMINATOR (or BEL) 3096 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3097 * ends_how is terminator used. returned input must be free ()d
2896 */ 3098 */
2897unsigned char * 3099unsigned char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3100rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3101{
2900 int seen_esc = 0; /* seen escape? */ 3102 int seen_esc = 0; /* seen escape? */
2901 unsigned int n = 0; 3103 unsigned int n = 0;
2902 unsigned char *s; 3104 unsigned char *s;
3105 unicode_t ch;
2903 unsigned char ch, string[STRING_MAX]; 3106 unsigned char string[STRING_MAX];
2904 3107
2905 for (; (ch = cmd_getc ());) 3108 while ((ch = cmd_getc ()))
2906 { 3109 {
2907 if (ch == C0_BEL 3110 if (ch == C0_BEL || ch == CHAR_ST)
2908 || ch == CHAR_ST 3111 break;
3112
3113 if (seen_esc)
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3114 if (ch == 0x5c) /* 7bit ST */
2910 break; 3115 break;
3116 else
3117 return NULL;
3118
2911 if (ch == C0_ESC) 3119 if (ch == C0_ESC)
2912 { 3120 {
2913 seen_esc = 1; 3121 seen_esc = 1;
2914 continue; 3122 continue;
2915 } 3123 }
2916 else if (ch == '\t') 3124 else if (ch == '\t')
2917 ch = ' '; /* translate '\t' to space */ 3125 ch = ' '; /* translate '\t' to space */
2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d))
2919 return NULL; /* other control character - exit */ 3127 return NULL; /* other control character - exit */
3128
2920 if (n < sizeof (string) - 1) 3129 if (n >= sizeof (string) - 1)
3130 // stop at some sane length
3131 return NULL;
3132
2921 string[n++] = ch; 3133 string[n++] = ch;
2922 seen_esc = 0; 3134 seen_esc = 0;
2923 } 3135 }
3136
2924 string[n++] = '\0'; 3137 string[n++] = '\0';
3138
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2926 return NULL; 3140 return NULL;
3141
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3142 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3143 STRNCPY (s, string, n);
2929 return s; 3144 return s;
2930} 3145}
2931 3146
2932/*----------------------------------------------------------------------*/ 3147/*----------------------------------------------------------------------*/
… …
2934 * 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)'
2935 */ 3150 */
2936void 3151void
2937rxvt_term::process_dcs_seq () 3152rxvt_term::process_dcs_seq ()
2938{ 3153{
2939 unsigned char eh, *s; 3154 unsigned char *s;
3155 unicode_t eh;
3156
2940 /* 3157 /*
2941 * Not handled yet 3158 * Not handled yet
2942 */ 3159 */
2943 s = get_to_st (&eh); 3160 s = get_to_st (eh);
2944 if (s) 3161 if (s)
2945 free (s); 3162 free (s);
3163
2946 return; 3164 return;
2947} 3165}
2948 3166
2949/*----------------------------------------------------------------------*/ 3167/*----------------------------------------------------------------------*/
2950/* 3168/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3169 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3170 */
2953void 3171void
2954rxvt_term::process_osc_seq () 3172rxvt_term::process_osc_seq ()
2955{ 3173{
2956 unsigned char ch, eh, *s; 3174 unicode_t ch, eh;
2957 int arg; 3175 int arg;
2958 3176
2959 ch = cmd_getc (); 3177 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3178 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3179 arg = arg * 10 + (ch - '0');
2962 3180
2963 if (ch == ';') 3181 if (ch == ';')
2964 { 3182 {
2965 s = get_to_st (&eh); 3183 unsigned char *s = get_to_st (eh);
3184
2966 if (s) 3185 if (s)
2967 { 3186 {
2968 /*
2969 * rxvt_menubar_dispatch () violates the constness of the string,
2970 * so do it here
2971 */
2972 if (arg == XTerm_Menu)
2973#if 0 /* XXX: currently disabled due to security concerns */
2974 menubar_dispatch ((char *)s);
2975#else
2976 (void)0;
2977#endif
2978 else
2979 xterm_seq (arg, (char *)s, eh); 3187 process_xterm_seq (arg, (char *)s, eh);
2980 free (s); 3188 free (s);
2981 } 3189 }
2982 } 3190 }
2983} 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
2984/* 3209/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2986 * 0 = change iconName/title 3211 * 0 = change iconName/title
2987 * 1 = change iconName 3212 * 1 = change iconName
2988 * 2 = change title 3213 * 2 = change title
2989 * 4 = change color 3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
2990 * 12 = change text color 3217 * 12 = change text color
2991 * 13 = change mouse foreground color 3218 * 13 = change mouse foreground color
2992 * 17 = change highlight character colour 3219 * 17 = change highlight character colour
2993 * 18 = change bold character color 3220 * 18 = change bold character color
2994 * 19 = change underlined character color 3221 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented) 3222 * 46 = change logfile (not implemented)
2996 * 50 = change font 3223 * 50 = change font
2997 * 3224 *
2998 * rxvt extensions: 3225 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future)
3001 * 20 = bg pixmap 3226 * 20 = bg pixmap
3002 * 39 = change default fg color 3227 * 39 = change default fg color
3003 * 49 = change default bg color 3228 * 49 = change default bg color
3004 * 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
3005 */ 3233 */
3006void 3234void
3007rxvt_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)
3008{ 3236{
3009 int changed = 0; 3237 int changed = 0;
3010 int color; 3238 int color;
3011 char *buf, *name; 3239 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1];
3012 3241
3013 assert (str != NULL); 3242 assert (str != NULL);
3014 switch (op) 3243 switch (op)
3015 { 3244 {
3016 case XTerm_name: 3245 case XTerm_name:
3017 set_title (str); 3246 set_title (str);
3018 /* FALLTHROUGH */ 3247 /* FALLTHROUGH */
3019 case XTerm_iconName: 3248 case XTerm_iconName:
3020 set_iconName (str); 3249 set_icon_name (str);
3021 break; 3250 break;
3022 case XTerm_title: 3251 case XTerm_title:
3023 set_title (str); 3252 set_title (str);
3024 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
3025 case XTerm_Color: 3296 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3297 for (buf = (char *)str; buf && *buf;)
3027 { 3298 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3299 if ((name = STRCHR (buf, ';')) == NULL)
3029 break; 3300 break;
3301
3030 *name++ = '\0'; 3302 *name++ = '\0';
3031 color = atoi (buf); 3303 color = atoi (buf);
3304
3032 if (color < 0 || color >= TOTAL_COLORS) 3305 if (color < 0 || color >= TOTAL_COLORS)
3033 break; 3306 break;
3307
3034 if ((buf = STRCHR (name, ';')) != NULL) 3308 if ((buf = STRCHR (name, ';')) != NULL)
3035 *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
3036 set_window_color (color + minCOLOR, name); 3321 set_window_color (color + minCOLOR, name);
3037 } 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);
3038 break; 3329 break;
3039#ifndef NO_CURSORCOLOR 3330#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3331 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3042 break; 3333 break;
3043#endif 3334#endif
3044 case XTerm_Color_pointer: 3335 case XTerm_Color_pointer_fg:
3045 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);
3046 break; 3340 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3341#ifndef NO_BOLD_UNDERLINE_REVERSE
3048 case XTerm_Color_BD: 3342 case XTerm_Color_BD:
3049 set_window_color (Color_BD, str); 3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3050 break; 3344 break;
3051 case XTerm_Color_UL: 3345 case XTerm_Color_UL:
3052 set_window_color (Color_UL, str); 3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3053 break; 3347 break;
3054 case XTerm_Color_RV: 3348 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3056 break; 3350 break;
3057#endif 3351#endif
3058 3352
3059 case XTerm_Menu:
3060 /*
3061 * rxvt_menubar_dispatch () violates the constness of the string,
3062 * so DON'T do it here
3063 */
3064 break;
3065 case XTerm_Pixmap: 3353 case XTerm_Pixmap:
3066 if (*str != ';') 3354 if (*str != ';')
3067 { 3355 {
3068#if XPM_BACKGROUND 3356#if XPM_BACKGROUND
3069 scale_pixmap (""); /* reset to default scaling */ 3357 scale_pixmap (""); /* reset to default scaling */
… …
3092 set_window_color (Color_fg, str); 3380 set_window_color (Color_fg, str);
3093 break; 3381 break;
3094 case XTerm_restoreBG: 3382 case XTerm_restoreBG:
3095 set_window_color (Color_bg, str); 3383 set_window_color (Color_bg, str);
3096 break; 3384 break;
3385
3097 case XTerm_logfile: 3386 case XTerm_logfile:
3387 // TODO, when secure mode?
3098 break; 3388 break;
3389
3099 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
3100 change_font (str); 3401 change_font (str);
3101 break; 3402 break;
3403
3404#ifndef NO_FRILLS
3102 case XTerm_locale: 3405 case XTerm_locale:
3103 if (str[0] == '?' && !str[1]) 3406 if (query)
3104 tt_printf ("%-.250s\n", locale); 3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3105 else 3411 else
3106 { 3412 {
3107 set_locale (str); 3413 set_locale (str);
3414# ifdef USE_XIM
3108 im_cb (); 3415 im_cb ();
3109 3416# endif
3110 // TODO: call selection_make with the right values set
3111 // to re-fresh the selection.
3112 if (display->selection_owner == this)
3113 display->set_selection_owner (0);
3114 } 3417 }
3115 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;
3435#endif
3116#if 0 3436#if 0
3117 case XTerm_dumpscreen: /* no error notices */ 3437 case XTerm_dumpscreen: /* no error notices */
3118 { 3438 {
3119 int fd; 3439 int fd;
3120 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)
3121 { 3441 {
3122 scr_dump (fd); 3442 scr_dump (fd);
3123 close (fd); 3443 close (fd);
3124 } 3444 }
3125 } 3445 }
3126 break; 3446 break;
3127#endif 3447#endif
3128
3129 } 3448 }
3130} 3449}
3131/*----------------------------------------------------------------------*/ 3450/*----------------------------------------------------------------------*/
3132 3451
3133/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3452/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3141 * so no need for fancy checking 3460 * so no need for fancy checking
3142 */ 3461 */
3143int 3462int
3144rxvt_term::privcases (int mode, unsigned long bit) 3463rxvt_term::privcases (int mode, unsigned long bit)
3145{ 3464{
3146 int state; 3465 int state;
3147 3466
3148 if (mode == 's') 3467 if (mode == 's')
3149 { 3468 {
3150 SavedModes |= (PrivateModes & bit); 3469 SavedModes |= (PrivateModes & bit);
3151 return -1; 3470 return -1;
… …
3156 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3157 else 3476 else
3158 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3159 PrivMode (state, bit); 3478 PrivMode (state, bit);
3160 } 3479 }
3480
3161 return state; 3481 return state;
3162} 3482}
3163 3483
3164/* we're not using priv _yet_ */ 3484/* we're not using priv _yet_ */
3165void 3485void
3166rxvt_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)
3167{ 3487{
3168 unsigned int i, j; 3488 unsigned int i, j;
3169 int state; 3489 int state;
3490
3170 static const struct 3491 static const struct
3171 { 3492 {
3172 const int argval; 3493 const int argval;
3173 const unsigned long bit; 3494 const unsigned long bit;
3174 } 3495 }
3496
3175 argtopriv[] = { 3497 argtopriv[] = {
3176 { 1, PrivMode_aplCUR }, 3498 { 1, PrivMode_aplCUR },
3177 { 2, PrivMode_vt52 }, 3499 { 2, PrivMode_vt52 },
3178 { 3, PrivMode_132 }, 3500 { 3, PrivMode_132 },
3179 { 4, PrivMode_smoothScroll }, 3501 { 4, PrivMode_smoothScroll },
… …
3185 { menuBar_esc, PrivMode_menuBar }, 3507 { menuBar_esc, PrivMode_menuBar },
3186#endif 3508#endif
3187#ifdef scrollBar_esc 3509#ifdef scrollBar_esc
3188 { scrollBar_esc, PrivMode_scrollBar }, 3510 { scrollBar_esc, PrivMode_scrollBar },
3189#endif 3511#endif
3512 // 18, 19 printing-related
3190 { 25, PrivMode_VisibleCursor }, 3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3191 { 35, PrivMode_ShiftKeys }, 3515 { 35, PrivMode_ShiftKeys }, // rxvt extension
3192 { 40, PrivMode_132OK }, 3516 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI
3519 // 46 start logging
3193 { 47, PrivMode_Screen }, 3520 { 47, PrivMode_Screen },
3194 { 66, PrivMode_aplKP }, 3521 { 66, PrivMode_aplKP },
3195#ifndef NO_BACKSPACE_KEY 3522#ifndef NO_BACKSPACE_KEY
3196 { 67, PrivMode_BackSpace }, 3523 { 67, PrivMode_BackSpace },
3197#endif 3524#endif
3198 { 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
3199 { 1010, PrivMode_TtyOutputInh }, 3529 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3200 { 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
3201 { 1047, PrivMode_Screen }, 3534 { 1047, PrivMode_Screen },
3535 // 1048 save and restore cursor
3202 { 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
3203 }; 3538 };
3204 3539
3205 if (nargs == 0) 3540 if (nargs == 0)
3206 return; 3541 return;
3207 3542
… …
3222 state = privcases (mode, argtopriv[j].bit); 3557 state = privcases (mode, argtopriv[j].bit);
3223 break; 3558 break;
3224 } 3559 }
3225 3560
3226 /* extra handling for values with state unkept */ 3561 /* extra handling for values with state unkept */
3227 if (state == -1)
3228 switch (arg[i]) 3562 switch (arg[i])
3229 { 3563 {
3230 case 1048: /* alternative cursor save */ 3564 case 1048: /* alternative cursor save */
3565 if (Options & Opt_secondaryScreen)
3231 if (mode == 0) 3566 if (mode == 0)
3232 scr_cursor (RESTORE); 3567 scr_cursor (RESTORE);
3233 else if (mode == 1) 3568 else if (mode == 1)
3234 scr_cursor (SAVE); 3569 scr_cursor (SAVE);
3235 /* FALLTHROUGH */
3236 default:
3237 continue; /* for (;i;) */
3238 }
3239
3240 /* extra handling for values with valid 0 or 1 state */
3241 switch (arg[i])
3242 {
3243 /* case 1: - application cursor keys */
3244 case 2: /* VT52 mode */
3245 /* oddball mode. should be set regardless of set/reset
3246 * parameter. Return from VT52 mode with an ESC < from
3247 * within VT52 mode
3248 */
3249 PrivMode (1, PrivMode_vt52);
3250 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;
3251 case 3: /* 80/132 */ 3585 case 3: /* 80/132 */
3252 if (PrivateModes & PrivMode_132OK) 3586 if (PrivateModes & PrivMode_132OK)
3253 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3254 (unsigned int)TermWin.height);
3255 break; 3588 break;
3256 case 4: /* smooth scrolling */ 3589 case 4: /* smooth scrolling */
3257 if (state) 3590 if (state)
3258 Options &= ~Opt_jumpScroll; 3591 Options &= ~Opt_jumpScroll;
3259 else 3592 else
3260 Options |= Opt_jumpScroll; 3593 Options |= Opt_jumpScroll;
3261 break; 3594 break;
3262 case 5: /* reverse video */ 3595 case 5: /* reverse video */
3263 scr_rvideo_mode (state); 3596 scr_rvideo_mode (state);
3264 break; 3597 break;
3265 case 6: /* relative/absolute origins */ 3598 case 6: /* relative/absolute origins */
3266 scr_relative_origin (state); 3599 scr_relative_origin (state);
3267 break; 3600 break;
3268 case 7: /* autowrap */ 3601 case 7: /* autowrap */
3269 scr_autowrap (state); 3602 scr_autowrap (state);
3270 break; 3603 break;
3271 /* 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 */
3272 case 9: /* X10 mouse reporting */ 3605 case 9: /* X10 mouse reporting */
3273 if (state) /* orthogonal */ 3606 if (state) /* orthogonal */
3274 PrivateModes &= ~ (PrivMode_MouseX11); 3607 PrivateModes &= ~PrivMode_MouseX11;
3275 break; 3608 break;
3276#ifdef menuBar_esc 3609#ifdef menuBar_esc
3277 case menuBar_esc: 3610 case menuBar_esc:
3278#ifdef MENUBAR 3611#ifdef MENUBAR
3279 map_menuBar (state); 3612 map_menuBar (state);
3280#endif 3613#endif
3281 break; 3614 break;
3282#endif 3615#endif
3283#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
3284 case scrollBar_esc: 3617 case scrollBar_esc:
3285 if (scrollbar_mapping (state)) 3618 if (scrollbar_mapping (state))
3286 { 3619 {
3287 resize_all_windows (0, 0, 0); 3620 resize_all_windows (0, 0, 0);
3288 scr_touch (true); 3621 scr_touch (true);
3289 } 3622 }
3290 break; 3623 break;
3291#endif 3624#endif
3292 case 25: /* visible/invisible cursor */ 3625 case 25: /* visible/invisible cursor */
3293 scr_cursor_visible (state); 3626 scr_cursor_visible (state);
3294 break; 3627 break;
3295 /* case 35: - shift keys */ 3628 /* case 35: - shift keys */
3296 /* case 40: - 80 <--> 132 mode */ 3629 /* case 40: - 80 <--> 132 mode */
3297 case 47: /* secondary screen */ 3630 case 47: /* secondary screen */
3298 scr_change_screen (state); 3631 scr_change_screen (state);
3299 break; 3632 break;
3300 /* case 66: - application key pad */ 3633 /* case 66: - application key pad */
3301 /* case 67: - backspace key */ 3634 /* case 67: - backspace key */
3302 case 1000: /* X11 mouse reporting */ 3635 case 1000: /* X11 mouse reporting */
3303 if (state) /* orthogonal */ 3636 if (state) /* orthogonal */
3304 PrivateModes &= ~ (PrivMode_MouseX10); 3637 PrivateModes &= ~PrivMode_MouseX10;
3305 break; 3638 break;
3306#if 0 3639#if 0
3307 case 1001: 3640 case 1001:
3308 break; /* X11 mouse highlighting */ 3641 break; /* X11 mouse highlighting */
3309#endif 3642#endif
3310 case 1010: /* scroll to bottom on TTY output inhibit */ 3643 case 1010: /* scroll to bottom on TTY output inhibit */
3311 if (state) 3644 if (state)
3312 Options &= ~Opt_scrollTtyOutput; 3645 Options &= ~Opt_scrollTtyOutput;
3313 else 3646 else
3314 Options |= Opt_scrollTtyOutput; 3647 Options |= Opt_scrollTtyOutput;
3315 break; 3648 break;
3316 case 1011: /* scroll to bottom on key press */ 3649 case 1011: /* scroll to bottom on key press */
3317 if (state) 3650 if (state)
3318 Options |= Opt_scrollTtyKeypress; 3651 Options |= Opt_scrollTtyKeypress;
3319 else 3652 else
3320 Options &= ~Opt_scrollTtyKeypress; 3653 Options &= ~Opt_scrollTtyKeypress;
3321 break; 3654 break;
3322 case 1047: /* secondary screen w/ clearing */ 3655 case 1047: /* secondary screen w/ clearing last */
3323 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3656 if (Options & Opt_secondaryScreen)
3324 if (current_screen != PRIMARY) 3657 if (current_screen != PRIMARY)
3325 scr_erase_screen (2); 3658 scr_erase_screen (2);
3326 scr_change_screen (state); 3659 scr_change_screen (state);
3327 /* FALLTHROUGH */
3328 default:
3329 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;
3330 } 3669 }
3331 } 3670 }
3332} 3671}
3333/*}}} */ 3672/*}}} */
3334 3673
3335/*{{{ process sgr sequences */ 3674/*{{{ process sgr sequences */
3336void 3675void
3337rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3676rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3338{ 3677{
3339 unsigned int i; 3678 unsigned int i;
3340 short rendset; 3679 short rendset;
3341 int rendstyle; 3680 int rendstyle;
3342 3681
3343 if (nargs == 0) 3682 if (nargs == 0)
3344 { 3683 {
3345 scr_rendition (0, ~RS_None); 3684 scr_rendition (0, ~RS_None);
3346 return; 3685 return;
3347 } 3686 }
3687
3348 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3349 { 3689 {
3350 rendset = -1; 3690 rendset = -1;
3351 switch (arg[i]) 3691 switch (arg[i])
3352 { 3692 {
… …
3363 rendset = 1, rendstyle = RS_Blink; 3703 rendset = 1, rendstyle = RS_Blink;
3364 break; 3704 break;
3365 case 7: 3705 case 7:
3366 rendset = 1, rendstyle = RS_RVid; 3706 rendset = 1, rendstyle = RS_RVid;
3367 break; 3707 break;
3708 case 8:
3709 // invisible. NYI
3710 break;
3368 case 22: 3711 case 22:
3369 rendset = 0, rendstyle = RS_Bold; 3712 rendset = 0, rendstyle = RS_Bold;
3370 break; 3713 break;
3371 case 24: 3714 case 24:
3372 rendset = 0, rendstyle = RS_Uline; 3715 rendset = 0, rendstyle = RS_Uline;
… …
3375 rendset = 0, rendstyle = RS_Blink; 3718 rendset = 0, rendstyle = RS_Blink;
3376 break; 3719 break;
3377 case 27: 3720 case 27:
3378 rendset = 0, rendstyle = RS_RVid; 3721 rendset = 0, rendstyle = RS_RVid;
3379 break; 3722 break;
3723 case 28:
3724 // visible. NYI
3725 break;
3380 } 3726 }
3727
3381 if (rendset != -1) 3728 if (rendset != -1)
3382 { 3729 {
3383 scr_rendition (rendset, rendstyle); 3730 scr_rendition (rendset, rendstyle);
3384 continue; /* for (;i;) */ 3731 continue; /* for (;i;) */
3385 } 3732 }
… …
3392 case 33: 3739 case 33:
3393 case 34: 3740 case 34:
3394 case 35: 3741 case 35:
3395 case 36: 3742 case 36:
3396 case 37: 3743 case 37:
3397 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3398 Color_fg);
3399 break; 3745 break;
3400#ifdef TTY_256COLOR 3746#ifdef TTY_256COLOR
3401 case 38: 3747 case 38:
3402 if (nargs > i + 2 && arg[i + 1] == 5) 3748 if (nargs > i + 2 && arg[i + 1] == 5)
3403 { 3749 {
3404 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3405 Color_fg);
3406 i += 2; 3751 i += 2;
3407 } 3752 }
3408 break; 3753 break;
3409#endif 3754#endif
3410 case 39: /* default fg */ 3755 case 39: /* default fg */
… …
3417 case 43: 3762 case 43:
3418 case 44: 3763 case 44:
3419 case 45: 3764 case 45:
3420 case 46: 3765 case 46:
3421 case 47: 3766 case 47:
3422 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3423 Color_bg);
3424 break; 3768 break;
3425#ifdef TTY_256COLOR 3769#ifdef TTY_256COLOR
3426 case 48: 3770 case 48:
3427 if (nargs > i + 2 && arg[i + 1] == 5) 3771 if (nargs > i + 2 && arg[i + 1] == 5)
3428 { 3772 {
3429 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3430 Color_bg);
3431 i += 2; 3774 i += 2;
3432 } 3775 }
3433 break; 3776 break;
3434#endif 3777#endif
3435 case 49: /* default bg */ 3778 case 49: /* default bg */
… …
3468 3811
3469/*{{{ process Rob Nation's own graphics mode sequences */ 3812/*{{{ process Rob Nation's own graphics mode sequences */
3470void 3813void
3471rxvt_term::process_graphics () 3814rxvt_term::process_graphics ()
3472{ 3815{
3473 unsigned char ch, cmd = cmd_getc (); 3816 unicode_t ch, cmd = cmd_getc ();
3474 3817
3475 if (cmd == 'Q') 3818 if (cmd == 'Q')
3476 { /* query graphics */ 3819 { /* query graphics */
3477 tt_printf ("\033G0\n"); /* no graphics */ 3820 tt_printf ("\033G0\n"); /* no graphics */
3478 return; 3821 return;

Diff Legend

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