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.95 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

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