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.120 by root, Tue Aug 10 22:36:30 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
… …
316 newlen = 0; 306 newlen = 0;
317 } 307 }
318 break; 308 break;
319 309
320#ifdef XK_KP_Left 310#ifdef XK_KP_Left
321 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
322 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
323 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
324 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
326 { 316 {
… …
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++;
… …
669 if (want_full_refresh) 661 if (want_full_refresh)
670 { 662 {
671 want_full_refresh = 0; 663 want_full_refresh = 0;
672 scr_clear (); 664 scr_clear ();
673 scr_touch (false); 665 scr_touch (false);
674 want_refresh = 1;
675 } 666 }
676#endif 667#endif
677 668
678 if (want_refresh) 669 if (want_refresh)
679 { 670 {
680 scr_refresh (refresh_type); 671 scr_refresh (refresh_type);
681 scrollbar_show (1); 672 scrollbar_show (1);
682#ifdef USE_XIM 673#ifdef USE_XIM
683 IMSendSpot (); 674 IMSendSpot ();
684#endif 675#endif
685
686 } 676 }
687 677
688 display->flush (); 678 display->flush ();
679
680 flush_ev.stop ();
689} 681}
690 682
691void 683void
692rxvt_term::check_cb (check_watcher &w) 684rxvt_term::check_cb (check_watcher &w)
693{ 685{
694 SET_R (this); 686 SET_R (this);
695 SET_LOCALE (locale); 687 SET_LOCALE (locale);
696 688
689 display->flush ();
690
691 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01);
693}
694
695void
696rxvt_term::flush_cb (time_watcher &w)
697{
698 SET_R (this);
699 SET_LOCALE (locale);
700
701 refresh_limit = 1;
702 refresh_count = 0;
697 flush (); 703 flush ();
698} 704}
699 705
700#ifdef CURSOR_BLINK 706#ifdef CURSOR_BLINK
701void 707void
… …
719 w.start (w.at + TEXT_BLINK_INTERVAL); 725 w.start (w.at + TEXT_BLINK_INTERVAL);
720 } 726 }
721} 727}
722#endif 728#endif
723 729
730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
731void
732rxvt_term::cont_scroll_cb (time_watcher &w)
733{
734 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 }
741}
742#endif
743
744#ifdef SELECTION_SCROLLING
745void
746rxvt_term::sel_scroll_cb (time_watcher &w)
747{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 }
755}
756#endif
757
758#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
759void
760rxvt_term::slip_wheel_cb (time_watcher &w)
761{
762 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed))
765 {
766 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 }
770}
771#endif
772
724bool 773bool
725rxvt_term::pty_fill () 774rxvt_term::pty_fill ()
726{ 775{
727 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 776 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777
778 if (CBUFSIZ == n)
779 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
781 n = 0;
782 }
728 783
729 memmove (cmdbuf_base, cmdbuf_ptr, n); 784 memmove (cmdbuf_base, cmdbuf_ptr, n);
730 cmdbuf_ptr = cmdbuf_base; 785 cmdbuf_ptr = cmdbuf_base;
731 cmdbuf_endp = cmdbuf_ptr + n; 786 cmdbuf_endp = cmdbuf_ptr + n;
732 787
733 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
734 789
735 if (n > 0) 790 if (n > 0)
736 { 791 {
737 cmdbuf_endp += n; 792 cmdbuf_endp += n;
738 return true; 793 return true;
… …
750 SET_LOCALE (locale); 805 SET_LOCALE (locale);
751 806
752 if (revents & EVENT_WRITE) 807 if (revents & EVENT_WRITE)
753 tt_write (0, 0); 808 tt_write (0, 0);
754 else if (revents & EVENT_READ) 809 else if (revents & EVENT_READ)
755 {
756 bool flag = true;
757
758 // loop, but don't allow a single term to monopolize us 810 // 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 ()) 811 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 ()) 812 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; 813 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} 814}
913 815
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}
935
936#ifdef POINTER_BLANK
937void 816void
938rxvt_term::pointer_unblank () 817rxvt_term::pointer_unblank ()
939{ 818{
940 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
941 recolour_cursor (); 820 recolour_cursor ();
942 821
822#ifdef POINTER_BLANK
943 hidden_pointer = 0; 823 hidden_pointer = 0;
944 824
945 if (Options & Opt_pointerBlank) 825 if (Options & Opt_pointerBlank)
946 pointer_ev.start (NOW + pointerBlankDelay); 826 pointer_ev.start (NOW + pointerBlankDelay);
827#endif
947} 828}
948 829
830#ifdef POINTER_BLANK
949void 831void
950rxvt_term::pointer_blank () 832rxvt_term::pointer_blank ()
951{ 833{
952 if (! (Options & Opt_pointerBlank)) 834 if (! (Options & Opt_pointerBlank))
953 return; 835 return;
… …
1149 break; 1031 break;
1150 1032
1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1152 case KeyRelease: 1034 case KeyRelease:
1153 { 1035 {
1154 if (! (ev.xkey.state & ControlMask)) 1036 if (!(ev.xkey.state & ControlMask))
1155 mouse_slip_wheel_speed = 0; 1037 slip_wheel_ev.stop ();
1156 else 1038 else
1157 { 1039 {
1158 KeySym ks; 1040 KeySym ks;
1159 1041
1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1161 if (ks == XK_Control_L || ks == XK_Control_R) 1043 if (ks == XK_Control_L || ks == XK_Control_R)
1162 mouse_slip_wheel_speed = 0; 1044 mouse_slip_wheel_speed = 0;
1163 } 1045 }
… …
1183 && (ev.xclient.data.l[0] == DndFile 1065 && (ev.xclient.data.l[0] == DndFile
1184 || ev.xclient.data.l[0] == DndDir 1066 || ev.xclient.data.l[0] == DndDir
1185 || ev.xclient.data.l[0] == DndLink)) 1067 || ev.xclient.data.l[0] == DndLink))
1186 { 1068 {
1187 /* Get Dnd data */ 1069 /* Get Dnd data */
1188 Atom ActualType; 1070 Atom ActualType;
1189 int ActualFormat; 1071 int ActualFormat;
1190 unsigned char *data; 1072 unsigned char *data;
1191 unsigned long Size, RemainingBytes; 1073 unsigned long Size, RemainingBytes;
1192 1074
1193 XGetWindowProperty (display->display, display->root, 1075 XGetWindowProperty (display->display, display->root,
1194 xa[XA_DNDSELECTION], 1076 xa[XA_DNDSELECTION],
1195 0L, 1000000L, 1077 0L, 1000000L,
1196 False, AnyPropertyType, 1078 False, AnyPropertyType,
… …
1199 &data); 1081 &data);
1200 XChangeProperty (display->display, display->root, 1082 XChangeProperty (display->display, display->root,
1201 XA_CUT_BUFFER0, XA_STRING, 1083 XA_CUT_BUFFER0, XA_STRING,
1202 8, PropModeReplace, 1084 8, PropModeReplace,
1203 data, STRLEN (data)); 1085 data, STRLEN (data));
1086 XFree (data);
1204 selection_paste (display->root, XA_CUT_BUFFER0, True); 1087 selection_paste (display->root, XA_CUT_BUFFER0, True);
1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1206 } 1089 }
1207#endif /* OFFIX_DND */ 1090#endif /* OFFIX_DND */
1208 break; 1091 break;
1209 1092
1210 case MappingNotify: 1093 case MappingNotify:
1211 XRefreshKeyboardMapping (& (ev.xmapping)); 1094 XRefreshKeyboardMapping (&ev.xmapping);
1212 break; 1095 break;
1213 1096
1214 /* 1097 /*
1215 * XXX: this is not the _current_ arrangement 1098 * XXX: this is not the _current_ arrangement
1216 * Here's my conclusion: 1099 * Here's my conclusion:
… …
1247#endif 1130#endif
1248#ifdef CURSOR_BLINK 1131#ifdef CURSOR_BLINK
1249 if (Options & Opt_cursorBlink) 1132 if (Options & Opt_cursorBlink)
1250 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1251#endif 1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 {
1138 PixColors = PixColorsFocused;
1139 set_colorfgbg ();
1140 scr_clear ();
1141 scr_touch (true);
1142 }
1143#endif
1252 1144
1253 } 1145 }
1254 break; 1146 break;
1255 1147
1256 case FocusOut: 1148 case FocusOut:
… …
1265#ifdef CURSOR_BLINK 1157#ifdef CURSOR_BLINK
1266 if (Options & Opt_cursorBlink) 1158 if (Options & Opt_cursorBlink)
1267 cursor_blink_ev.stop (); 1159 cursor_blink_ev.stop ();
1268 hidden_cursor = 0; 1160 hidden_cursor = 0;
1269#endif 1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1270 1171
1271 } 1172 }
1272 break; 1173 break;
1273 1174
1274 case ConfigureNotify: 1175 case ConfigureNotify:
… …
1283 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1284 } 1185 }
1285 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1286 1187
1287 if (szHint.width != width || szHint.height != height) 1188 if (szHint.width != width || szHint.height != height)
1288 {
1289 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1290 resize_all_windows (width, height, 1); 1189 resize_all_windows (width, height, 1);
1291 } 1190
1292#ifdef DEBUG_SIZE
1293 else
1294 {
1295 D_SIZE ((stderr, "Size: Not resizing"));
1296 }
1297#endif
1298#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1299 if (Options & Opt_transparent) 1192 if (Options & Opt_transparent)
1300 { 1193 {
1301 check_our_parents (); 1194 check_our_parents ();
1302 if (am_transparent) 1195 if (am_transparent)
1303 want_full_refresh = 1; 1196 want_refresh = want_full_refresh = 1;
1304 } 1197 }
1305#endif 1198#endif
1306
1307 } 1199 }
1308 break; 1200 break;
1309 1201
1310 case SelectionClear: 1202 case SelectionClear:
1311 display->set_selection_owner (0); 1203 selection_clear ();
1312 break; 1204 break;
1313 1205
1314 case SelectionNotify: 1206 case SelectionNotify:
1315 if (selection_wait == Sel_normal) 1207 if (selection_wait == Sel_normal)
1316 selection_paste (ev.xselection.requestor, 1208 selection_paste (ev.xselection.requestor,
… …
1343 1235
1344 case GraphicsExpose: 1236 case GraphicsExpose:
1345 case Expose: 1237 case Expose:
1346 if (ev.xany.window == TermWin.vt) 1238 if (ev.xany.window == TermWin.vt)
1347 { 1239 {
1348#ifdef NO_SLOW_LINK_SUPPORT 1240 do
1349 scr_expose (ev.xexpose.x, ev.xexpose.y, 1241 scr_expose (ev.xexpose.x, ev.xexpose.y,
1350 ev.xexpose.width, ev.xexpose.height, False); 1242 ev.xexpose.width, ev.xexpose.height, False);
1351#else 1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1352 // don't understand this, so commented it out 1244
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1353 scr_expose (ev.xexpose.x, ev.xexpose.y, 1248 scr_expose (ev.xexpose.x, ev.xexpose.y,
1354 ev.xexpose.width, ev.xexpose.height, False); 1249 ev.xexpose.width, ev.xexpose.height, False);
1355 //scr_expose (ev.xexpose.x, 0, 1250
1356 // ev.xexpose.width, TermWin.height, False); 1251 scr_refresh (refresh_type);
1357#endif
1358 want_refresh = 1;
1359 } 1252 }
1360 else 1253 else
1361 { 1254 {
1362 XEvent unused_event; 1255 XEvent unused_event;
1363 1256
1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1365 Expose, 1258 ;
1366 &unused_event)) ;
1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1368 GraphicsExpose, 1260 ;
1369 &unused_event)) ; 1261
1370 if (isScrollbarWindow (ev.xany.window)) 1262 if (isScrollbarWindow (ev.xany.window))
1371 { 1263 {
1372 scrollBar.setIdle (); 1264 scrollBar.setIdle ();
1373 scrollbar_show (0); 1265 scrollbar_show (0);
1374 } 1266 }
1375#ifdef MENUBAR 1267#ifdef MENUBAR
1376 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1377 menubar_expose (); 1269 menubar_expose ();
1270#endif
1271
1272#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window);
1378#endif 1275#endif
1379 } 1276 }
1380 break; 1277 break;
1381 1278
1382 case MotionNotify: 1279 case MotionNotify:
… …
1417 if (ev.xbutton.y < TermWin.int_bwidth 1314 if (ev.xbutton.y < TermWin.int_bwidth
1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1419 { 1316 {
1420 int dist; 1317 int dist;
1421 1318
1422 pending_scroll_selection=1;
1423
1424 /* don't clobber the current delay if we are 1319 /* don't clobber the current delay if we are
1425 * already in the middle of scrolling. 1320 * already in the middle of scrolling.
1426 */ 1321 */
1427 if (scroll_selection_delay<=0) 1322 if (!sel_scroll_ev.active)
1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1429 1324
1430 /* save the event params so we can highlight 1325 /* save the event params so we can highlight
1431 * the selection in the pending-scroll loop 1326 * the selection in the pending-scroll loop
1432 */ 1327 */
1433 selection_save_x=ev.xbutton.x; 1328 selection_save_x=ev.xbutton.x;
… …
1455 else 1350 else
1456 { 1351 {
1457 /* we are within the text window, so we 1352 /* we are within the text window, so we
1458 * shouldn't be scrolling 1353 * shouldn't be scrolling
1459 */ 1354 */
1460 pending_scroll_selection = 0; 1355 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop();
1461 } 1357 }
1462#endif 1358#endif
1463#ifdef MOUSE_THRESHOLD 1359#ifdef MOUSE_THRESHOLD
1464 1360
1465 } 1361 }
… …
1515 return; 1411 return;
1516 } 1412 }
1517 1413
1518 /* FALLTHROUGH */ 1414 /* FALLTHROUGH */
1519 case ReparentNotify: 1415 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ()) 1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1521 if (am_transparent)
1522 want_full_refresh = 1; 1417 want_refresh = want_full_refresh = 1;
1523 break; 1418 break;
1524#endif 1419#endif
1525 } 1420 }
1526} 1421}
1527 1422
… …
1683 upordown = 1; /* down */ 1578 upordown = 1; /* down */
1684 } 1579 }
1685 if (upordown) 1580 if (upordown)
1686 { 1581 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1582#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1583 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1689#endif 1584#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1)) 1585 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 { 1586 {
1692 if (upordown < 0) 1587 if (upordown < 0)
1693 scrollBar.setUp (); 1588 scrollBar.setUp ();
… …
1709 break; 1604 break;
1710 case R_SB_ALIGN_BOTTOM: 1605 case R_SB_ALIGN_BOTTOM:
1711 csrO = scrollBar.bot - scrollBar.top; 1606 csrO = scrollBar.bot - scrollBar.top;
1712 break; 1607 break;
1713 } 1608 }
1609
1714 if (scrollBar.style == R_SB_XTERM 1610 if (scrollBar.style == R_SB_XTERM
1715 || scrollbar_above_slider (ev.y) 1611 || scrollbar_above_slider (ev.y)
1716 || scrollbar_below_slider (ev.y)) 1612 || scrollbar_below_slider (ev.y))
1717 scr_move_to ( scrollbar_position (ev.y) - csrO, 1613 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1718 scrollbar_size ()); 1614
1719 scrollBar.setMotion (); 1615 scrollBar.setMotion ();
1720 break; 1616 break;
1721 1617
1722 case Button1: 1618 case Button1:
1723 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1747 scr_page ((ev.button == Button1 ? DN : UP), 1643 scr_page ((ev.button == Button1 ? DN : UP),
1748 (TermWin.nrow 1644 (TermWin.nrow
1749 * scrollbar_position (ev.y) 1645 * scrollbar_position (ev.y)
1750 / scrollbar_size ())); 1646 / scrollbar_size ()));
1751 } 1647 }
1648
1752 break; 1649 break;
1753 } 1650 }
1754 } 1651 }
1755 return; 1652 return;
1756 } 1653 }
… …
1780 refresh_type &= ~SMOOTH_REFRESH; 1677 refresh_type &= ~SMOOTH_REFRESH;
1781#endif 1678#endif
1782 1679
1783 } 1680 }
1784#ifdef SELECTION_SCROLLING 1681#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0; 1682 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop();
1786#endif 1684#endif
1787 if (ev.window == TermWin.vt) 1685 if (ev.window == TermWin.vt)
1788 { 1686 {
1789 if (reportmode) 1687 if (reportmode)
1790 { 1688 {
… …
1832 case Button5: 1730 case Button5:
1833 { 1731 {
1834 int i; 1732 int i;
1835 page_dirn v; 1733 page_dirn v;
1836 1734
1837 v = (ev.button == Button4) ? UP : DN; 1735 v = ev.button == Button4 ? UP : DN;
1736
1838 if (ev.state & ShiftMask) 1737 if (ev.state & ShiftMask)
1839 i = 1; 1738 i = 1;
1840 else if ((Options & Opt_mouseWheelScrollPage)) 1739 else if (Options & Opt_mouseWheelScrollPage)
1841 i = TermWin.nrow - 1; 1740 i = TermWin.nrow - 1;
1842 else 1741 else
1843 i = 5; 1742 i = 5;
1743
1844# ifdef MOUSE_SLIP_WHEELING 1744# ifdef MOUSE_SLIP_WHEELING
1845 if (ev.state & ControlMask) 1745 if (ev.state & ControlMask)
1846 { 1746 {
1847 mouse_slip_wheel_speed += (v ? -1 : 1); 1747 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1750
1751 if (slip_wheel_ev.at < NOW)
1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753
1754 slip_wheel_ev.start ();
1849 } 1755 }
1756 else
1757 {
1850# endif 1758# endif
1851# ifdef JUMP_MOUSE_WHEEL 1759# ifdef JUMP_MOUSE_WHEEL
1852 scr_page (v, i);
1853 scr_refresh (SMOOTH_REFRESH);
1854 scrollbar_show (1);
1855# else
1856 while (i--)
1857 {
1858 scr_page (v, 1); 1760 scr_page (v, i);
1859 scr_refresh (SMOOTH_REFRESH); 1761 scr_refresh (SMOOTH_REFRESH);
1860 scrollbar_show (1); 1762 scrollbar_show (1);
1763# else
1764 while (i--)
1765 {
1766 scr_page (v, 1);
1767 scr_refresh (SMOOTH_REFRESH);
1768 scrollbar_show (1);
1769 }
1770# endif
1771# ifdef MOUSE_SLIP_WHEELING
1861 } 1772 }
1862# endif 1773#endif
1863
1864 } 1774 }
1865 break; 1775 break;
1866#endif 1776#endif
1867
1868 } 1777 }
1869 } 1778 }
1870#ifdef MENUBAR 1779#ifdef MENUBAR
1871 else if (isMenuBarWindow (ev.window)) 1780 else if (isMenuBarWindow (ev.window))
1872 menubar_control (ev); 1781 menubar_control (ev);
1873#endif 1782#endif
1874} 1783}
1875 1784
1876
1877#ifdef TRANSPARENT 1785#ifdef TRANSPARENT
1786#if TINTING
1787/* taken from aterm-0.4.2 */
1788
1789typedef uint32_t RUINT32T;
1790
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{
1793 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i;
1799
1800 Visual* visual = display->visual;
1801
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803
1804 /* for convenience */
1805 mask_r = visual->red_mask;
1806 mask_g = visual->green_mask;
1807 mask_b = visual->blue_mask;
1808
1809 /* boring lookup table pre-initialization */
1810 switch (srcImage->bits_per_pixel) {
1811 case 15:
1812 if ((mask_r != 0x7c00) ||
1813 (mask_g != 0x03e0) ||
1814 (mask_b != 0x001f))
1815 return;
1816 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1817 lookup_r = lookup;
1818 lookup_g = lookup+32;
1819 lookup_b = lookup+32+32;
1820 sh_r = 10;
1821 sh_g = 5;
1822 sh_b = 0;
1823 break;
1824 case 16:
1825 if ((mask_r != 0xf800) ||
1826 (mask_g != 0x07e0) ||
1827 (mask_b != 0x001f))
1828 return;
1829 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1830 lookup_r = lookup;
1831 lookup_g = lookup+32;
1832 lookup_b = lookup+32+64;
1833 sh_r = 11;
1834 sh_g = 5;
1835 sh_b = 0;
1836 break;
1837 case 24:
1838 if ((mask_r != 0xff0000) ||
1839 (mask_g != 0x00ff00) ||
1840 (mask_b != 0x0000ff))
1841 return;
1842 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1843 lookup_r = lookup;
1844 lookup_g = lookup+256;
1845 lookup_b = lookup+256+256;
1846 sh_r = 16;
1847 sh_g = 8;
1848 sh_b = 0;
1849 break;
1850 case 32:
1851 if ((mask_r != 0xff0000) ||
1852 (mask_g != 0x00ff00) ||
1853 (mask_b != 0x0000ff))
1854 return;
1855 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1856 lookup_r = lookup;
1857 lookup_g = lookup+256;
1858 lookup_b = lookup+256+256;
1859 sh_r = 16;
1860 sh_g = 8;
1861 sh_b = 0;
1862 break;
1863 default:
1864 return; /* we do not support this color depth */
1865 }
1866
1867 /* prepare limits for color transformation (each channel is handled separately) */
1868 if (shade < 0) {
1869 shade = -shade;
1870 if (shade < 0) shade = 0;
1871 if (shade > 100) shade = 100;
1872
1873 lower_lim_r = 65535-rm;
1874 lower_lim_g = 65535-gm;
1875 lower_lim_b = 65535-bm;
1876
1877 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1878 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1879 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1880
1881 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1882 } else {
1883 if (shade < 0) shade = 0;
1884 if (shade > 100) shade = 100;
1885
1886 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1887
1888 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1889 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1890 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1891 }
1892
1893 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1894 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1895 {
1896 unsigned int tmp;
1897
1898 tmp = lower_lim_r;
1899 lower_lim_r = lower_lim_b;
1900 lower_lim_b = tmp;
1901
1902 tmp = upper_lim_r;
1903 upper_lim_r = upper_lim_b;
1904 upper_lim_b = tmp;
1905 }
1906
1907 /* fill our lookup tables */
1908 for (i = 0; i <= mask_r>>sh_r; i++)
1909 {
1910 RUINT32T tmp;
1911 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1912 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1913 lookup_r[i] = (tmp/65535)<<sh_r;
1914 }
1915 for (i = 0; i <= mask_g>>sh_g; i++)
1916 {
1917 RUINT32T tmp;
1918 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1919 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1920 lookup_g[i] = (tmp/65535)<<sh_g;
1921 }
1922 for (i = 0; i <= mask_b>>sh_b; i++)
1923 {
1924 RUINT32T tmp;
1925 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1926 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1927 lookup_b[i] = (tmp/65535)<<sh_b;
1928 }
1929
1930 /* apply table to input image (replacing colors by newly calculated ones) */
1931 switch (srcImage->bits_per_pixel)
1932 {
1933 case 15:
1934 {
1935 unsigned short *p1, *pf, *p, *pl;
1936 p1 = (unsigned short *) srcImage->data;
1937 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1938 while (p1 < pf)
1939 {
1940 p = p1;
1941 pl = p1 + srcImage->width;
1942 for (; p < pl; p++)
1943 {
1944 *p = lookup_r[(*p & 0x7c00)>>10] |
1945 lookup_g[(*p & 0x03e0)>> 5] |
1946 lookup_b[(*p & 0x001f)];
1947 }
1948 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1949 }
1950 break;
1951 }
1952 case 16:
1953 {
1954 unsigned short *p1, *pf, *p, *pl;
1955 p1 = (unsigned short *) srcImage->data;
1956 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1957 while (p1 < pf)
1958 {
1959 p = p1;
1960 pl = p1 + srcImage->width;
1961 for (; p < pl; p++)
1962 {
1963 *p = lookup_r[(*p & 0xf800)>>11] |
1964 lookup_g[(*p & 0x07e0)>> 5] |
1965 lookup_b[(*p & 0x001f)];
1966 }
1967 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1968 }
1969 break;
1970 }
1971 case 24:
1972 {
1973 unsigned char *p1, *pf, *p, *pl;
1974 p1 = (unsigned char *) srcImage->data;
1975 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1976 while (p1 < pf)
1977 {
1978 p = p1;
1979 pl = p1 + srcImage->width * 3;
1980 for (; p < pl; p += 3)
1981 {
1982 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1983 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1984 p[2] = lookup_r[(p[2] & 0x0000ff)];
1985 }
1986 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1987 }
1988 break;
1989 }
1990 case 32:
1991 {
1992 RUINT32T *p1, *pf, *p, *pl;
1993 p1 = (RUINT32T *) srcImage->data;
1994 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1995
1996 while (p1 < pf)
1997 {
1998 p = p1;
1999 pl = p1 + srcImage->width;
2000 for (; p < pl; p++)
2001 {
2002 *p = lookup_r[(*p & 0xff0000)>>16] |
2003 lookup_g[(*p & 0x00ff00)>> 8] |
2004 lookup_b[(*p & 0x0000ff)] |
2005 (*p & ~0xffffff);
2006 }
2007 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2008 }
2009 break;
2010 }
2011 }
2012
2013 free (lookup);
2014}
2015#endif
2016
1878/* 2017/*
1879 * Check our parents are still who we think they are. 2018 * Check our parents are still who we think they are.
1880 * Do transparency updates if required 2019 * Do transparency updates if required
1881 */ 2020 */
1882int 2021int
1883rxvt_term::check_our_parents () 2022rxvt_term::check_our_parents ()
1884{ 2023{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 2024 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 2025 unsigned long nitems, bytes_after;
1887 Atom atype; 2026 Atom atype;
1888 unsigned char *prop = NULL; 2027 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 2028 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 2029 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 2030 XWindowAttributes wattr, wrootattr;
1892 2031
1893 pchanged = 0; 2032 pchanged = 0;
1894 2033
1895 if (! (Options & Opt_transparent)) 2034 if (!(Options & Opt_transparent))
1896 return pchanged; /* Don't try any more */ 2035 return pchanged; /* Don't try any more */
1897 2036
1898 XGetWindowAttributes (display->display, display->root, &wrootattr); 2037 XGetWindowAttributes (display->display, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 2038 rootdepth = wrootattr.depth;
1900 2039
1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2041
1902 if (rootdepth != wattr.depth) 2042 if (rootdepth != wattr.depth)
1903 { 2043 {
1904 if (am_transparent) 2044 if (am_transparent)
1905 { 2045 {
1906 pchanged = 1; 2046 pchanged = 1;
1907 XSetWindowBackground (display->display, TermWin.vt, 2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1908 PixColors[Color_bg]);
1909 am_transparent = am_pixmap_trans = 0; 2048 am_transparent = am_pixmap_trans = 0;
1910 } 2049 }
2050
1911 return pchanged; /* Don't try any more */ 2051 return pchanged; /* Don't try any more */
1912 } 2052 }
1913 2053
1914 /* Get all X ops out of the queue so that our information is up-to-date. */ 2054 /* Get all X ops out of the queue so that our information is up-to-date. */
1915 XSync (display->display, False); 2055 XSync (display->display, False);
… …
1917 /* 2057 /*
1918 * Make the frame window set by the window manager have 2058 * Make the frame window set by the window manager have
1919 * the root background. Some window managers put multiple nested frame 2059 * the root background. Some window managers put multiple nested frame
1920 * windows for each client, so we have to take care about that. 2060 * windows for each client, so we have to take care about that.
1921 */ 2061 */
1922 i = (xa[XA_XROOTPMAPID] != 0 2062 i = (xa[XA_XROOTPMAPID]
1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1925 &nitems, &bytes_after, &prop) == Success)); 2065 &nitems, &bytes_after, &prop) == Success);
2066
1926 if (!i || prop == NULL) 2067 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success);
2072
2073 if (!i || prop == NULL
2074#if TINTING
2075 || !rs[Rs_color + Color_tint]
2076#endif
2077 )
1927 have_pixmap = 0; 2078 have_pixmap = 0;
1928 else 2079 else
1929 { 2080 {
1930 have_pixmap = 1; 2081 have_pixmap = 1;
1931 rootpixmap = * ((Pixmap *)prop); 2082 rootpixmap = *(Pixmap *)prop;
1932 XFree (prop); 2083 XFree (prop);
1933 } 2084 }
2085
1934 if (have_pixmap) 2086 if (have_pixmap)
1935 { 2087 {
1936 /* 2088 /*
1937 * Copy display->root pixmap transparency 2089 * Copy display->root pixmap transparency
1938 */ 2090 */
1939 int sx, sy, nx, ny; 2091 int sx, sy, nx, ny;
1940 unsigned int nw, nh; 2092 unsigned int nw, nh;
1941 Window cr; 2093 Window cr;
1942 XImage *image; 2094 XImage *image;
1943 GC gc; 2095 GC gc;
1944 XGCValues gcvalue; 2096 XGCValues gcvalue;
1945 2097
1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1947 0, 0, &sx, &sy, &cr); 2099 0, 0, &sx, &sy, &cr);
1948 nw = (unsigned int)szHint.width; 2100 nw = (unsigned int)szHint.width;
1949 nh = (unsigned int)szHint.height; 2101 nh = (unsigned int)szHint.height;
1950 nx = ny = 0; 2102 nx = ny = 0;
2103
1951 if (sx < 0) 2104 if (sx < 0)
1952 { 2105 {
1953 nw += sx; 2106 nw += sx;
1954 nx = -sx; 2107 nx = -sx;
1955 sx = 0; 2108 sx = 0;
1956 } 2109 }
2110
1957 if (sy < 0) 2111 if (sy < 0)
1958 { 2112 {
1959 nh += sy; 2113 nh += sy;
1960 ny = -sy; 2114 ny = -sy;
1961 sy = 0; 2115 sy = 0;
1962 } 2116 }
2117
1963 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1964 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1965 allowedxerror = -1; 2120 allowedxerror = -1;
1966 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1967 ZPixmap); 2122
1968 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1969 /* XXX: may need a delay here? */ 2124 /* XXX: may need a delay here? */
1970 allowedxerror = 0; 2125 allowedxerror = 0;
2126
1971 if (image == NULL) 2127 if (image == NULL)
1972 { 2128 {
1973 if (am_transparent && am_pixmap_trans) 2129 if (am_transparent && am_pixmap_trans)
1974 { 2130 {
1975 pchanged = 1; 2131 pchanged = 1;
… …
1977 { 2133 {
1978 XFreePixmap (display->display, TermWin.pixmap); 2134 XFreePixmap (display->display, TermWin.pixmap);
1979 TermWin.pixmap = None; 2135 TermWin.pixmap = None;
1980 } 2136 }
1981 } 2137 }
2138
1982 am_pixmap_trans = 0; 2139 am_pixmap_trans = 0;
1983 } 2140 }
1984 else 2141 else
1985 { 2142 {
1986 if (TermWin.pixmap != None) 2143 if (TermWin.pixmap != None)
1987 XFreePixmap (display->display, TermWin.pixmap); 2144 XFreePixmap (display->display, TermWin.pixmap);
2145
2146#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint))
2148 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2153
2154 ShadeXImage (display, image, shade, rm, gm, bm);
2155 }
2156#endif
2157
1988 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1989 (unsigned int)szHint.width,
1990 (unsigned int)szHint.height, 2159 szHint.width, szHint.height, image->depth);
1991 (unsigned int)image->depth);
1992 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1993 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1994 nx, ny, (unsigned int)image->width,
1995 (unsigned int)image->height); 2162 nx, ny, image->width, image->height);
1996 XFreeGC (display->display, gc); 2163 XFreeGC (display->display, gc);
1997 XDestroyImage (image); 2164 XDestroyImage (image);
1998 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1999 TermWin.pixmap); 2166 XClearWindow (display->display, TermWin.parent[0]);
2167
2000 if (!am_transparent || !am_pixmap_trans) 2168 if (!am_transparent || !am_pixmap_trans)
2001 pchanged = 1; 2169 pchanged = 1;
2170
2002 am_transparent = am_pixmap_trans = 1; 2171 am_transparent = am_pixmap_trans = 1;
2003 } 2172 }
2004 } 2173 }
2174
2005 if (!am_pixmap_trans) 2175 if (!am_pixmap_trans)
2006 { 2176 {
2007 unsigned int n; 2177 unsigned int n;
2008 /* 2178 /*
2009 * InheritPixmap transparency 2179 * InheritPixmap transparency
2010 */ 2180 */
2011 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2012 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2013 i++)
2014 { 2183 {
2015 oldp = TermWin.parent[i]; 2184 oldp = TermWin.parent[i];
2016 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2185 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2017 &TermWin.parent[i], &list, &n); 2186 &TermWin.parent[i], &list, &n);
2018 XFree (list); 2187 XFree (list);
2019 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189
2020 if (TermWin.parent[i] == display->root) 2190 if (TermWin.parent[i] == display->root)
2021 { 2191 {
2022 if (oldp != None) 2192 if (oldp != None)
2023 pchanged = 1; 2193 pchanged = 1;
2194
2024 break; 2195 break;
2025 } 2196 }
2197
2026 if (oldp != TermWin.parent[i]) 2198 if (oldp != TermWin.parent[i])
2027 pchanged = 1; 2199 pchanged = 1;
2028 } 2200 }
2201
2029 n = 0; 2202 n = 0;
2203
2030 if (pchanged) 2204 if (pchanged)
2031 { 2205 {
2032 for (; n < (unsigned int)i; n++) 2206 for (; n < (unsigned int)i; n++)
2033 { 2207 {
2034 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2038 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2039 break; 2213 break;
2040 } 2214 }
2041 } 2215 }
2042 } 2216 }
2043 if (n > (int) (sizeof (TermWin.parent) 2217
2044 / sizeof (TermWin.parent[0]))) 2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2045 { 2219 {
2046 D_X ((stderr, "InheritPixmap Turning off")); 2220 D_X ((stderr, "InheritPixmap Turning off"));
2047 XSetWindowBackground (display->display, TermWin.parent[0], 2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2048 PixColors[Color_fg]);
2049 XSetWindowBackground (display->display, TermWin.vt, 2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2050 PixColors[Color_bg]);
2051 am_transparent = 0; 2223 am_transparent = 0;
2052 /* XXX: also turn off Opt_transparent? */ 2224 /* XXX: also turn off Opt_transparent? */
2053 } 2225 }
2054 else 2226 else
2055 { 2227 {
2228#if WAIT_FOR_WM
2056 /* wait (an arbitrary period) for the WM to do its thing 2229 /* wait (an arbitrary period) for the WM to do its thing
2057 * needed for fvwm2.2.2 (and before?) */ 2230 * 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); 2231 sleep (1);
2066# endif 2232#endif
2067 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2068 for (n = 0; n < (unsigned int)i; n++) 2234 for (n = 0; n < (unsigned int)i; n++)
2235 {
2069 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2070 ParentRelative); 2237 XClearWindow (display->display, TermWin.parent[n]);
2238 }
2239
2071 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2072 ParentRelative);
2073 am_transparent = 1; 2241 am_transparent = 1;
2074 } 2242 }
2243
2075 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2076 TermWin.parent[i] = None; 2245 TermWin.parent[i] = None;
2077 } 2246 }
2247
2248 // this is experimental
2249 if (scrollBar.win)
2250 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle ();
2254 scrollbar_show (0);
2255 }
2256
2078 return pchanged; 2257 return pchanged;
2079} 2258}
2080#endif 2259#endif
2081 2260
2082/*}}} */ 2261/*}}} */
2262
2263bool
2264rxvt_term::cmd_parse ()
2265{
2266 bool flag = false;
2267 unicode_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here
2269
2270 for (;;)
2271 {
2272 if (ch == NOCHAR)
2273 {
2274 seq_begin = cmdbuf_ptr;
2275 ch = next_char ();
2276 }
2277
2278 if (ch == NOCHAR) // TODO: improve
2279 break;
2280
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 {
2283 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false;
2286 int nlines = 0;
2287 unicode_t *str = buf;
2288
2289 for (;;)
2290 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break;
2293
2294 *str++ = ch;
2295
2296 if (ch == C0_LF)
2297 {
2298 nlines++;
2299 refresh_count++;
2300
2301 if (!(Options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 {
2304 refreshnow = true;
2305 ch = NOCHAR;
2306 break;
2307 }
2308
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2310 if (nlines >= TermWin.nrow - 1)
2311 {
2312 scr_add_lines (buf, nlines, str - buf);
2313 nlines = 0;
2314 str = buf;
2315 }
2316 }
2317
2318 if (str >= buf + UBUFSIZ)
2319 {
2320 ch = NOCHAR;
2321 break;
2322 }
2323
2324 seq_begin = cmdbuf_ptr;
2325 ch = next_char ();
2326 }
2327
2328 scr_add_lines (buf, nlines, str - buf);
2329
2330 /*
2331 * If there have been a lot of new lines, then update the screen
2332 * What the heck I'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */
2336 if (refreshnow)
2337 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true;
2343 scr_refresh (refresh_type);
2344 }
2345 }
2346
2347 }
2348 else
2349 {
2350 try
2351 {
2352 process_nonprinting (ch);
2353 }
2354 catch (const class out_of_input &o)
2355 {
2356 // we ran out of input, retry later
2357 cmdbuf_ptr = seq_begin;
2358 break;
2359 }
2360
2361 ch = NOCHAR;
2362 }
2363 }
2364
2365 return flag;
2366}
2367
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character
2378unicode_t
2379rxvt_term::next_char ()
2380{
2381 while (cmdbuf_ptr < cmdbuf_endp)
2382 {
2383 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++;
2386
2387 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389
2390 if (len == (size_t)-2)
2391 {
2392 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp;
2394 break;
2395 }
2396
2397 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399
2400 // assume wchar == unicode
2401 cmdbuf_ptr += len;
2402 return wc;
2403 }
2404
2405 return NOCHAR;
2406}
2407
2408/* rxvt_cmd_getc () - Return next input character */
2409/*
2410 * Return the next input character after first passing any keyboard input
2411 * to the command.
2412 */
2413unicode_t
2414rxvt_term::cmd_getc ()
2415{
2416 unicode_t c = next_char ();
2417
2418 if (c == NOCHAR)
2419 throw out_of_input;
2420
2421 return c;
2422}
2423
2424unicode_t
2425rxvt_term::cmd_get8 ()
2426{
2427 unicode_t c = next_octet ();
2428
2429 if (c == NOCHAR)
2430 throw out_of_input;
2431
2432 return c;
2433}
2083 2434
2084/*{{{ print pipe */ 2435/*{{{ print pipe */
2085/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2086#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2087FILE * 2438FILE *
2088rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2089{ 2440{
2090 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe], "w");
2091 2442
2092 if (stream == NULL) 2443 if (stream == NULL)
2093 rxvt_print_error ("can't open printer pipe"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2445
2094 return stream; 2446 return stream;
2095} 2447}
2096 2448
2097int 2449int
2098rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2099{ 2451{
2100 fflush (stream); 2452 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); 2453 return pclose (stream);
2107# endif
2108} 2454}
2109 2455
2110/* 2456/*
2111 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2112 */ 2458 */
2113void 2459void
2114rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2115{ 2461{
2116 int done; 2462 int done;
2117 FILE *fd; 2463 FILE *fd;
2118 2464
2119 if ((fd = popen_printer ()) == NULL) 2465 if ((fd = popen_printer ()) == NULL)
2120 return; 2466 return;
2121 2467
2122 /* 2468 /*
2123 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2124 * is received. 2470 * is received.
2125 */ 2471 */
2126 for (done = 0; !done;) 2472 for (done = 0; !done;)
2127 { 2473 {
2128 unsigned char buf[8]; 2474 unsigned char buf[8];
2129 unsigned char ch; 2475 unicode_t ch;
2130 unsigned int i, len; 2476 unsigned int i, len;
2131 2477
2132 if ((ch = cmd_getc ()) != C0_ESC) 2478 if ((ch = cmd_getc ()) != C0_ESC)
2133 { 2479 {
2134 if (putc (ch, fd) == EOF) 2480 if (putc (ch, fd) == EOF)
2135 break; /* done = 1 */ 2481 break; /* done = 1 */
… …
2150 { 2496 {
2151 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2152 break; /* done = 1 */ 2498 break; /* done = 1 */
2153 } 2499 }
2154 } 2500 }
2501
2155 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2156 if (putc (buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2157 { 2504 {
2158 done = 1; 2505 done = 1;
2159 break; 2506 break;
2160 } 2507 }
2161 } 2508 }
2162 } 2509 }
2510
2163 pclose_printer (fd); 2511 pclose_printer (fd);
2164} 2512}
2165#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2166/*}}} */ 2514/*}}} */
2167 2515
2168/* *INDENT-OFF* */ 2516/* *INDENT-OFF* */
2169enum { 2517enum {
2170 C1_40 = 0x40, 2518 C1_40 = 0x40,
2171 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2519 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, 2520 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, 2521 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 2522 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2175}; 2523};
2176/* *INDENT-ON* */ 2524/* *INDENT-ON* */
2177 2525
2178/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2179void 2527void
2180rxvt_term::process_nonprinting (unsigned char ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2181{ 2529{
2182 switch (ch) 2530 switch (ch)
2183 { 2531 {
2532 case C0_ESC:
2533 process_escape_seq ();
2534 break;
2184 case C0_ENQ: /* terminal Status */ 2535 case C0_ENQ: /* terminal Status */
2185 if (rs[Rs_answerbackstring]) 2536 if (rs[Rs_answerbackstring])
2186 tt_write (
2187 (const unsigned char *)rs[Rs_answerbackstring], 2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2188 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2189 else 2539 else
2190 tt_write ((unsigned char *)VT100_ANS, 2540 tt_write ((unsigned char *)VT100_ANS,
2191 (unsigned int)STRLEN (VT100_ANS)); 2541 (unsigned int)STRLEN (VT100_ANS));
2192 break; 2542 break;
2193 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2194 scr_bell (); 2544 scr_bell ();
2195 break; 2545 break;
2196 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
2211 scr_charset_choose (1); 2561 scr_charset_choose (1);
2212 break; 2562 break;
2213 case C0_SI: /* shift in - acs */ 2563 case C0_SI: /* shift in - acs */
2214 scr_charset_choose (0); 2564 scr_charset_choose (0);
2215 break; 2565 break;
2566
2567#ifdef EIGHT_BIT_CONTROLS
2568 // 8-bit controls
2569 case 0x90: /* DCS */
2570 process_dcs_seq ();
2571 break;
2572 case 0x9b: /* CSI */
2573 process_csi_seq ();
2574 break;
2575 case 0x9d: /* CSI */
2576 process_osc_seq ();
2577 break;
2578#endif
2216 } 2579 }
2217} 2580}
2218/*}}} */ 2581/*}}} */
2219 2582
2220 2583
2221/*{{{ process VT52 escape sequences */ 2584/*{{{ process VT52 escape sequences */
2222void 2585void
2223rxvt_term::process_escape_vt52 (unsigned char ch) 2586rxvt_term::process_escape_vt52 (unicode_t ch)
2224{ 2587{
2225 int row, col; 2588 int row, col;
2226 2589
2227 switch (ch) 2590 switch (ch)
2228 { 2591 {
… …
2280 2643
2281/*{{{ process escape sequences */ 2644/*{{{ process escape sequences */
2282void 2645void
2283rxvt_term::process_escape_seq () 2646rxvt_term::process_escape_seq ()
2284{ 2647{
2285 unsigned char ch = cmd_getc (); 2648 unicode_t ch = cmd_getc ();
2286 2649
2287 if (PrivateModes & PrivMode_vt52) 2650 if (PrivateModes & PrivMode_vt52)
2288 { 2651 {
2289 process_escape_vt52 (ch); 2652 process_escape_vt52 (ch);
2290 return; 2653 return;
… …
2338 break; 2701 break;
2339 2702
2340 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2341 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2342 { 2705 {
2343 uint32_t nlcr[] = { '\n', '\r' }; 2706 unicode_t nlcr[] = { C0_LF, C0_CR };
2344 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, 1, 2);
2345 } 2708 }
2346 break; 2709 break;
2347 2710
2348 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2359 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2360 scr_index (DN); 2723 scr_index (DN);
2361 break; 2724 break;
2362 2725
2363 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2364 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /*case C1_SS2: scr_single_shift (2); break; */
2365 2728
2366 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2367 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /*case C1_SS3: scr_single_shift (3); break; */
2368 2731
2369 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2370 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2371 process_dcs_seq (); 2734 process_dcs_seq ();
2372 break; 2735 break;
… …
2387 process_osc_seq (); 2750 process_osc_seq ();
2388 break; 2751 break;
2389 2752
2390 /* 8.3.106: RESET TO INITIAL STATE */ 2753 /* 8.3.106: RESET TO INITIAL STATE */
2391 case 'c': 2754 case 'c':
2755 mbstate.reset ();
2392 scr_poweron (); 2756 scr_poweron ();
2393 scrollbar_show (1); 2757 scrollbar_show (1);
2394 break; 2758 break;
2395 2759
2396 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2760 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2408 2772
2409/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2773/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2410/* *INDENT-OFF* */ 2774/* *INDENT-OFF* */
2411enum { 2775enum {
2412 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2413 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 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 , 2778 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, 2779 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, 2780 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, 2781 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, 2782 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, */ 2797 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, [, \, ], ^, _, */ 2798 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, */ 2799 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, */ 2800 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, */ 2801 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, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2439 }; 2803 };
2440/* *INDENT-ON* */ 2804/* *INDENT-ON* */
2441 2805
2442void 2806void
2443rxvt_term::process_csi_seq () 2807rxvt_term::process_csi_seq ()
2444{ 2808{
2445 unsigned char ch, priv, i; 2809 unicode_t ch, priv, i;
2446 unsigned int nargs, p; 2810 unsigned int nargs, p;
2447 int n, ndef; 2811 int n, ndef;
2448 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2449 2813
2450 for (nargs = ESC_ARGS; nargs > 0;) 2814 for (nargs = ESC_ARGS; nargs > 0;)
2451 arg[--nargs] = 0; 2815 arg[--nargs] = 0;
2452 2816
2453 priv = 0; 2817 priv = 0;
… …
2455 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2456 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
2457 priv = ch; 2821 priv = ch;
2458 ch = cmd_getc (); 2822 ch = cmd_getc ();
2459 } 2823 }
2824
2460 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2461 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2462 { 2827 {
2463 if (isdigit (ch)) 2828 if (isdigit (ch))
2464 { 2829 {
… …
2471 { 2836 {
2472 if (nargs < ESC_ARGS) 2837 if (nargs < ESC_ARGS)
2473 arg[nargs++] = n; 2838 arg[nargs++] = n;
2474 n = -1; 2839 n = -1;
2475 } 2840 }
2476 else if (ch == '\b') 2841 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); 2842 process_nonprinting (ch);
2488 } 2843
2489 ch = cmd_getc (); 2844 ch = cmd_getc ();
2490 } 2845 }
2491 2846
2492 if (ch > CSI_7F) 2847 if (ch > CSI_7F)
2493 return; 2848 return;
… …
2651 tt_printf ("\033[0n"); 3006 tt_printf ("\033[0n");
2652 break; 3007 break;
2653 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
2654 scr_report_position (); 3009 scr_report_position ();
2655 break; 3010 break;
2656#if defined (ENABLE_DISPLAY_ANSWER)
2657 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure)
2658 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2659 break; 3014 break;
2660#endif
2661 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
2662 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2663 break; 3017 break;
2664 } 3018 }
2665 break; 3019 break;
2666 3020
2667 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3021 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735#endif 3089#endif
2736 3090
2737 case CSI_78: /* DECREQTPARM */ 3091 case CSI_78: /* DECREQTPARM */
2738 if (arg[0] == 0 || arg[0] == 1) 3092 if (arg[0] == 0 || arg[0] == 1)
2739 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3093 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2740 /* FALLTHROUGH */ 3094 break;
2741 3095
2742 default: 3096 default:
2743 break; 3097 break;
2744 } 3098 }
2745} 3099}
… …
2748#ifndef NO_FRILLS 3102#ifndef NO_FRILLS
2749/* ARGSUSED */ 3103/* ARGSUSED */
2750void 3104void
2751rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3105rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2752{ 3106{
2753 int x, y; 3107 int x, y;
2754#if 0
2755 char *s;
2756#endif
2757 XWindowAttributes wattr; 3108 XWindowAttributes wattr;
2758 Window wdummy; 3109 Window wdummy;
2759 3110
2760 if (nargs == 0) 3111 if (nargs == 0)
2761 return; 3112 return;
3113
2762 switch (args[0]) 3114 switch (args[0])
2763 { 3115 {
2764 /* 3116 /*
2765 * commands 3117 * commands
2766 */ 3118 */
2767 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
2768 XMapWindow (display->display, TermWin.parent[0]); 3120 XMapWindow (display->display, TermWin.parent[0]);
2769 break; 3121 break;
2770 case 2: /* iconify window */ 3122 case 2: /* iconify window */
2771 XIconifyWindow (display->display, TermWin.parent[0], 3123 XIconifyWindow (display->display, TermWin.parent[0],
… …
2788 break; 3140 break;
2789 case 8: /* set size (chars) */ 3141 case 8: /* set size (chars) */
2790 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2791 (unsigned int) (args[1] * TermWin.fheight)); 3143 (unsigned int) (args[1] * TermWin.fheight));
2792 break; 3144 break;
3145
3146 //case 9: NYI, TODO, restore maximized window or maximize window
2793 default: 3147 default:
2794 if (args[0] >= 24) /* set height (chars) */ 3148 if (args[0] >= 24) /* set height (chars) */
2795 set_widthheight ((unsigned int)TermWin.width, 3149 set_widthheight ((unsigned int)TermWin.width,
2796 (unsigned int) (args[1] * TermWin.fheight)); 3150 (unsigned int) (args[1] * TermWin.fheight));
2797 break; 3151 break;
3152
3153
2798 /* 3154 /*
2799 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
2800 */ 3156 */
2801 case 11: /* report window state */ 3157 case 11: /* report window state */
2802 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2803 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2804 break; 3160 break;
2805 case 13: /* report window position */ 3161 case 13: /* report window position */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2808 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
2809 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
2810 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
2811 break; 3167 break;
2812 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
2813 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2814 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2815 break; 3171 break;
2816 case 18: /* report window size (chars) */ 3172 case 18: /* report text area size (chars) */
2817 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3174 break;
2819#if 0 /* XXX: currently disabled due to security concerns */ 3175 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break;
2820 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 {
3181 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3182 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3184 }
2823 break; 3185 break;
2824 case 21: /* report window title */ 3186 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 {
3189 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3190 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3192 }
2827 break; 3193 break;
2828#endif
2829
2830 } 3194 }
2831} 3195}
2832#endif 3196#endif
2833 3197
2834/*----------------------------------------------------------------------*/ 3198/*----------------------------------------------------------------------*/
2835/* 3199/*
2836 * get input up until STRING TERMINATOR (or BEL) 3200 * get input up until STRING TERMINATOR (or BEL)
2837 * ends_how is terminator used. returned input must be free ()d 3201 * ends_how is terminator used. returned input must be free()'d
2838 */ 3202 */
2839unsigned char * 3203unsigned char *
2840rxvt_term::get_to_st (unsigned char *ends_how) 3204rxvt_term::get_to_st (unicode_t &ends_how)
2841{ 3205{
2842 int seen_esc = 0; /* seen escape? */ 3206 unicode_t prev = 0, ch;
2843 unsigned int n = 0; 3207 unsigned int n = 0;
2844 unsigned char *s; 3208 unsigned char *s;
2845 unsigned char ch, string[STRING_MAX]; 3209 unsigned char string[STRING_MAX];
2846 3210
2847 for (; (ch = cmd_getc ());) 3211 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3212 {
2849 if (ch == C0_BEL
2850 || ch == CHAR_ST
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2852 break;
2853 if (ch == C0_ESC) 3213 if (prev == C0_ESC)
2854 {
2855 seen_esc = 1;
2856 continue;
2857 } 3214 {
2858 else if (ch == '\t') 3215 if (ch == 0x5c) /* 7bit ST */
2859 ch = ' '; /* translate '\t' to space */ 3216 break;
2860 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3217 else
3218 return NULL;
3219 }
3220 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break;
3222 else if (ch < 0x20)
2861 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3224
2862 if (n < sizeof (string) - 1) 3225 if (n >= sizeof (string) - 1)
3226 // stop at some sane length
3227 return NULL;
3228
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
2863 string[n++] = ch; 3235 string[n++] = prev = ch;
2864 seen_esc = 0;
2865 } 3236 }
3237
2866 string[n++] = '\0'; 3238 string[n++] = '\0';
3239
2867 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2868 return NULL; 3241 return NULL;
3242
2869 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3243 ends_how = (ch == 0x5c ? C0_ESC : ch);
2870 STRNCPY (s, string, n); 3244 STRNCPY (s, string, n);
2871 return s; 3245 return s;
2872} 3246}
2873 3247
2874/*----------------------------------------------------------------------*/ 3248/*----------------------------------------------------------------------*/
… …
2876 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2877 */ 3251 */
2878void 3252void
2879rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
2880{ 3254{
2881 unsigned char eh, *s; 3255 unsigned char *s;
3256 unicode_t eh;
3257
2882 /* 3258 /*
2883 * Not handled yet 3259 * Not handled yet
2884 */ 3260 */
2885 s = get_to_st (&eh); 3261 s = get_to_st (eh);
2886 if (s) 3262 if (s)
2887 free (s); 3263 free (s);
3264
2888 return; 3265 return;
2889} 3266}
2890 3267
2891/*----------------------------------------------------------------------*/ 3268/*----------------------------------------------------------------------*/
2892/* 3269/*
2893 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3270 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2894 */ 3271 */
2895void 3272void
2896rxvt_term::process_osc_seq () 3273rxvt_term::process_osc_seq ()
2897{ 3274{
2898 unsigned char ch, eh, *s; 3275 unicode_t ch, eh;
2899 int arg; 3276 int arg;
2900 3277
2901 ch = cmd_getc (); 3278 ch = cmd_getc ();
2902 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2903 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
2904 3281
2905 if (ch == ';') 3282 if (ch == ';')
2906 { 3283 {
2907 s = get_to_st (&eh); 3284 unsigned char *s = get_to_st (eh);
3285
2908 if (s) 3286 if (s)
2909 { 3287 {
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); 3288 process_xterm_seq (arg, (char *)s, eh);
2922 free (s); 3289 free (s);
2923 } 3290 }
2924 } 3291 }
2925} 3292}
3293
3294void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{
3297 if (str[0] == '?' && !str[1])
3298 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 }
3306 else
3307 set_window_color (color, str);
3308}
3309
2926/* 3310/*
2927 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2928 * 0 = change iconName/title 3312 * 0 = change iconName/title
2929 * 1 = change iconName 3313 * 1 = change iconName
2930 * 2 = change title 3314 * 2 = change title
2931 * 4 = change color 3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
2932 * 12 = change text color 3318 * 12 = change text color
2933 * 13 = change mouse foreground color 3319 * 13 = change mouse foreground color
2934 * 17 = change highlight character colour 3320 * 17 = change highlight character colour
2935 * 18 = change bold character color 3321 * 18 = change bold character color
2936 * 19 = change underlined character color 3322 * 19 = change underlined character color
2937 * 46 = change logfile (not implemented) 3323 * 46 = change logfile (not implemented)
2938 * 50 = change font 3324 * 50 = change font
2939 * 3325 *
2940 * rxvt extensions: 3326 * rxvt extensions:
2941 * 9 = change locale (NYI)
2942 * 10 = menu (may change in future)
2943 * 20 = bg pixmap 3327 * 20 = bg pixmap
2944 * 39 = change default fg color 3328 * 39 = change default fg color
2945 * 49 = change default bg color 3329 * 49 = change default bg color
2946 * 55 = dump scrollback buffer and all of screen 3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
2947 */ 3334 */
2948void 3335void
2949rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2950{ 3337{
2951 int changed = 0; 3338 int changed = 0;
2952 int color; 3339 int color;
2953 char *buf, *name; 3340 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1];
2954 3342
2955 assert (str != NULL); 3343 assert (str != NULL);
2956 switch (op) 3344 switch (op)
2957 { 3345 {
2958 case XTerm_name: 3346 case XTerm_name:
2959 set_title (str); 3347 set_title (str);
2960 /* FALLTHROUGH */ 3348 /* FALLTHROUGH */
2961 case XTerm_iconName: 3349 case XTerm_iconName:
2962 set_iconName (str); 3350 set_icon_name (str);
2963 break; 3351 break;
2964 case XTerm_title: 3352 case XTerm_title:
2965 set_title (str); 3353 set_title (str);
2966 break; 3354 break;
3355 case XTerm_property:
3356 if (str[0] == '?')
3357 {
3358 Atom prop = XInternAtom (display->display, str + 1, True);
3359 Atom actual_type;
3360 int actual_format;
3361 unsigned long nitems;
3362 unsigned long bytes_after;
3363 unsigned char *value = 0;
3364 const char *str = "";
3365
3366 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None
3372 && actual_format == 8)
3373 str = (const char *)(value);
3374
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3376
3377 XFree (value);
3378 }
3379 else
3380 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382
3383 if (eq)
3384 {
3385 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0],
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 }
3391 else
3392 XDeleteProperty (display->display, TermWin.parent[0],
3393 display->atom (str));
3394 }
3395 break;
3396
2967 case XTerm_Color: 3397 case XTerm_Color:
2968 for (buf = (char *)str; buf && *buf;) 3398 for (buf = (char *)str; buf && *buf;)
2969 { 3399 {
2970 if ((name = STRCHR (buf, ';')) == NULL) 3400 if ((name = STRCHR (buf, ';')) == NULL)
2971 break; 3401 break;
3402
2972 *name++ = '\0'; 3403 *name++ = '\0';
2973 color = atoi (buf); 3404 color = atoi (buf);
3405
2974 if (color < 0 || color >= TOTAL_COLORS) 3406 if (color < 0 || color >= TOTAL_COLORS)
2975 break; 3407 break;
3408
2976 if ((buf = STRCHR (name, ';')) != NULL) 3409 if ((buf = STRCHR (name, ';')) != NULL)
2977 *buf++ = '\0'; 3410 *buf++ = '\0';
3411
3412 if (name[0] == '?' && !name[1])
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
2978 set_window_color (color + minCOLOR, name); 3422 set_window_color (color + minCOLOR, name);
2979 } 3423 }
3424 break;
3425 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3427 break;
3428 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2980 break; 3430 break;
2981#ifndef NO_CURSORCOLOR 3431#ifndef NO_CURSORCOLOR
2982 case XTerm_Color_cursor: 3432 case XTerm_Color_cursor:
2983 set_window_color (Color_cursor, str); 3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2984 break; 3434 break;
2985#endif 3435#endif
2986 case XTerm_Color_pointer: 3436 case XTerm_Color_pointer_fg:
2987 set_window_color (Color_pointer, str); 3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3438 break;
3439 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2988 break; 3441 break;
2989#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
2990 case XTerm_Color_BD: 3443 case XTerm_Color_BD:
2991 set_window_color (Color_BD, str); 3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2992 break; 3445 break;
2993 case XTerm_Color_UL: 3446 case XTerm_Color_UL:
2994 set_window_color (Color_UL, str); 3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2995 break; 3448 break;
2996 case XTerm_Color_RV: 3449 case XTerm_Color_RV:
2997 set_window_color (Color_RV, str); 3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2998 break; 3451 break;
2999#endif 3452#endif
3000 3453
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: 3454 case XTerm_Pixmap:
3008 if (*str != ';') 3455 if (*str != ';')
3009 { 3456 {
3010#if XPM_BACKGROUND 3457#if XPM_BACKGROUND
3011 scale_pixmap (""); /* reset to default scaling */ 3458 scale_pixmap (""); /* reset to default scaling */
… …
3034 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3035 break; 3482 break;
3036 case XTerm_restoreBG: 3483 case XTerm_restoreBG:
3037 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3038 break; 3485 break;
3486
3039 case XTerm_logfile: 3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3040 break; 3489 break;
3490
3041 case XTerm_font: 3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3042 change_font (str); 3502 change_font (str);
3043 break; 3503 break;
3504
3044#ifndef NO_FRILLS 3505#ifndef NO_FRILLS
3045 case XTerm_locale: 3506 case XTerm_locale:
3046 if (str[0] == '?' && !str[1]) 3507 if (query)
3047 tt_printf ("%-.250s\n", locale); 3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3048 else 3512 else
3049 { 3513 {
3050 set_locale (str); 3514 set_locale (str);
3051# ifdef USE_XIM 3515# ifdef USE_XIM
3052 im_cb (); 3516 im_cb ();
3053# endif 3517# 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 } 3518 }
3059 break; 3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break;
3060#endif 3536#endif
3061#if 0 3537#if 0
3062 case XTerm_dumpscreen: /* no error notices */ 3538 case XTerm_dumpscreen: /* no error notices */
3063 { 3539 {
3064 int fd; 3540 int fd;
3065 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3066 { 3542 {
3067 scr_dump (fd); 3543 scr_dump (fd);
3068 close (fd); 3544 close (fd);
3069 } 3545 }
3070 } 3546 }
3071 break; 3547 break;
3072#endif 3548#endif
3073
3074 } 3549 }
3075} 3550}
3076/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3077 3552
3078/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3553/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3086 * so no need for fancy checking 3561 * so no need for fancy checking
3087 */ 3562 */
3088int 3563int
3089rxvt_term::privcases (int mode, unsigned long bit) 3564rxvt_term::privcases (int mode, unsigned long bit)
3090{ 3565{
3091 int state; 3566 int state;
3092 3567
3093 if (mode == 's') 3568 if (mode == 's')
3094 { 3569 {
3095 SavedModes |= (PrivateModes & bit); 3570 SavedModes |= (PrivateModes & bit);
3096 return -1; 3571 return -1;
… …
3101 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3102 else 3577 else
3103 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3104 PrivMode (state, bit); 3579 PrivMode (state, bit);
3105 } 3580 }
3581
3106 return state; 3582 return state;
3107} 3583}
3108 3584
3109/* we're not using priv _yet_ */ 3585/* we're not using priv _yet_ */
3110void 3586void
3111rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3112{ 3588{
3113 unsigned int i, j; 3589 unsigned int i, j;
3114 int state; 3590 int state;
3591
3115 static const struct 3592 static const struct
3116 { 3593 {
3117 const int argval; 3594 const int argval;
3118 const unsigned long bit; 3595 const unsigned long bit;
3119 } 3596 }
3597
3120 argtopriv[] = { 3598 argtopriv[] = {
3121 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
3122 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3123 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
3124 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
… …
3130 { menuBar_esc, PrivMode_menuBar }, 3608 { menuBar_esc, PrivMode_menuBar },
3131#endif 3609#endif
3132#ifdef scrollBar_esc 3610#ifdef scrollBar_esc
3133 { scrollBar_esc, PrivMode_scrollBar }, 3611 { scrollBar_esc, PrivMode_scrollBar },
3134#endif 3612#endif
3613 // 18, 19 printing-related
3135 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3136 { 35, PrivMode_ShiftKeys }, 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension
3137 { 40, PrivMode_132OK }, 3617 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI
3620 // 46 start logging
3138 { 47, PrivMode_Screen }, 3621 { 47, PrivMode_Screen },
3139 { 66, PrivMode_aplKP }, 3622 { 66, PrivMode_aplKP },
3140#ifndef NO_BACKSPACE_KEY 3623#ifndef NO_BACKSPACE_KEY
3141 { 67, PrivMode_BackSpace }, 3624 { 67, PrivMode_BackSpace },
3142#endif 3625#endif
3143 { 1000, PrivMode_MouseX11 }, 3626 { 1000, PrivMode_MouseX11 },
3627 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3628 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3629 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3144 { 1010, PrivMode_TtyOutputInh }, 3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3145 { 1011, PrivMode_Keypress }, 3631 { 1011, PrivMode_Keypress }, // rxvt extension
3632 // 1035 enable modifiers for alt, numlock NYI
3633 // 1036 send ESC for meta keys NYI
3634 // 1037 send DEL for keypad delete NYI
3146 { 1047, PrivMode_Screen }, 3635 { 1047, PrivMode_Screen },
3636 // 1048 save and restore cursor
3147 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3637 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3638 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3148 }; 3639 };
3149 3640
3150 if (nargs == 0) 3641 if (nargs == 0)
3151 return; 3642 return;
3152 3643
… …
3167 state = privcases (mode, argtopriv[j].bit); 3658 state = privcases (mode, argtopriv[j].bit);
3168 break; 3659 break;
3169 } 3660 }
3170 3661
3171 /* extra handling for values with state unkept */ 3662 /* extra handling for values with state unkept */
3172 if (state == -1)
3173 switch (arg[i]) 3663 switch (arg[i])
3174 { 3664 {
3175 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
3666 if (Options & Opt_secondaryScreen)
3176 if (mode == 0) 3667 if (mode == 0)
3177 scr_cursor (RESTORE); 3668 scr_cursor (RESTORE);
3178 else if (mode == 1) 3669 else if (mode == 1)
3179 scr_cursor (SAVE); 3670 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; 3671 break;
3672 }
3673
3674 if (state >= 0)
3675 /* extra handling for values with valid 0 or 1 state */
3676 switch (arg[i])
3677 {
3678 /* case 1: - application cursor keys */
3679 case 2: /* VT52 mode */
3680 /* oddball mode. should be set regardless of set/reset
3681 * parameter. Return from VT52 mode with an ESC < from
3682 * within VT52 mode
3683 */
3684 PrivMode (1, PrivMode_vt52);
3685 break;
3196 case 3: /* 80/132 */ 3686 case 3: /* 80/132 */
3197 if (PrivateModes & PrivMode_132OK) 3687 if (PrivateModes & PrivMode_132OK)
3198 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3199 (unsigned int)TermWin.height);
3200 break; 3689 break;
3201 case 4: /* smooth scrolling */ 3690 case 4: /* smooth scrolling */
3202 if (state) 3691 if (state)
3203 Options &= ~Opt_jumpScroll; 3692 Options &= ~Opt_jumpScroll;
3204 else 3693 else
3205 Options |= Opt_jumpScroll; 3694 Options |= Opt_jumpScroll;
3206 break; 3695 break;
3207 case 5: /* reverse video */ 3696 case 5: /* reverse video */
3208 scr_rvideo_mode (state); 3697 scr_rvideo_mode (state);
3209 break; 3698 break;
3210 case 6: /* relative/absolute origins */ 3699 case 6: /* relative/absolute origins */
3211 scr_relative_origin (state); 3700 scr_relative_origin (state);
3212 break; 3701 break;
3213 case 7: /* autowrap */ 3702 case 7: /* autowrap */
3214 scr_autowrap (state); 3703 scr_autowrap (state);
3215 break; 3704 break;
3216 /* case 8: - auto repeat, can't do on a per window basis */ 3705 /* case 8: - auto repeat, can't do on a per window basis */
3217 case 9: /* X10 mouse reporting */ 3706 case 9: /* X10 mouse reporting */
3218 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
3219 PrivateModes &= ~ (PrivMode_MouseX11); 3708 PrivateModes &= ~PrivMode_MouseX11;
3220 break; 3709 break;
3221#ifdef menuBar_esc 3710#ifdef menuBar_esc
3222 case menuBar_esc: 3711 case menuBar_esc:
3223#ifdef MENUBAR 3712#ifdef MENUBAR
3224 map_menuBar (state); 3713 map_menuBar (state);
3225#endif 3714#endif
3226 break; 3715 break;
3227#endif 3716#endif
3228#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3229 case scrollBar_esc: 3718 case scrollBar_esc:
3230 if (scrollbar_mapping (state)) 3719 if (scrollbar_mapping (state))
3231 { 3720 {
3232 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3233 scr_touch (true); 3722 scr_touch (true);
3234 } 3723 }
3235 break; 3724 break;
3236#endif 3725#endif
3237 case 25: /* visible/invisible cursor */ 3726 case 25: /* visible/invisible cursor */
3238 scr_cursor_visible (state); 3727 scr_cursor_visible (state);
3239 break; 3728 break;
3240 /* case 35: - shift keys */ 3729 /* case 35: - shift keys */
3241 /* case 40: - 80 <--> 132 mode */ 3730 /* case 40: - 80 <--> 132 mode */
3242 case 47: /* secondary screen */ 3731 case 47: /* secondary screen */
3243 scr_change_screen (state); 3732 scr_change_screen (state);
3244 break; 3733 break;
3245 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3246 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3247 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3248 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3249 PrivateModes &= ~ (PrivMode_MouseX10); 3738 PrivateModes &= ~PrivMode_MouseX10;
3250 break; 3739 break;
3251#if 0 3740#if 0
3252 case 1001: 3741 case 1001:
3253 break; /* X11 mouse highlighting */ 3742 break; /* X11 mouse highlighting */
3254#endif 3743#endif
3255 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3256 if (state) 3745 if (state)
3257 Options &= ~Opt_scrollTtyOutput; 3746 Options &= ~Opt_scrollTtyOutput;
3258 else 3747 else
3259 Options |= Opt_scrollTtyOutput; 3748 Options |= Opt_scrollTtyOutput;
3260 break; 3749 break;
3261 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3262 if (state) 3751 if (state)
3263 Options |= Opt_scrollTtyKeypress; 3752 Options |= Opt_scrollTtyKeypress;
3264 else 3753 else
3265 Options &= ~Opt_scrollTtyKeypress; 3754 Options &= ~Opt_scrollTtyKeypress;
3266 break; 3755 break;
3267 case 1047: /* secondary screen w/ clearing */ 3756 case 1047: /* secondary screen w/ clearing last */
3268 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3757 if (Options & Opt_secondaryScreen)
3269 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
3270 scr_erase_screen (2); 3759 scr_erase_screen (2);
3271 scr_change_screen (state); 3760 scr_change_screen (state);
3272 /* FALLTHROUGH */
3273 default:
3274 break; 3761 break;
3762 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY)
3766 scr_erase_screen (2);
3767 break;
3768 default:
3769 break;
3275 } 3770 }
3276 } 3771 }
3277} 3772}
3278/*}}} */ 3773/*}}} */
3279 3774
3280/*{{{ process sgr sequences */ 3775/*{{{ process sgr sequences */
3281void 3776void
3282rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3777rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3283{ 3778{
3284 unsigned int i; 3779 unsigned int i;
3285 short rendset; 3780 short rendset;
3286 int rendstyle; 3781 int rendstyle;
3287 3782
3288 if (nargs == 0) 3783 if (nargs == 0)
3289 { 3784 {
3290 scr_rendition (0, ~RS_None); 3785 scr_rendition (0, ~RS_None);
3291 return; 3786 return;
3292 } 3787 }
3788
3293 for (i = 0; i < nargs; i++) 3789 for (i = 0; i < nargs; i++)
3294 { 3790 {
3295 rendset = -1; 3791 rendset = -1;
3296 switch (arg[i]) 3792 switch (arg[i])
3297 { 3793 {
… …
3299 rendset = 0, rendstyle = ~RS_None; 3795 rendset = 0, rendstyle = ~RS_None;
3300 break; 3796 break;
3301 case 1: 3797 case 1:
3302 rendset = 1, rendstyle = RS_Bold; 3798 rendset = 1, rendstyle = RS_Bold;
3303 break; 3799 break;
3800 //case 2: // faint or second colour
3304 case 4: 3801 case 4:
3305 rendset = 1, rendstyle = RS_Uline; 3802 rendset = 1, rendstyle = RS_Uline;
3306 break; 3803 break;
3307 case 5: 3804 case 5: // slowly blinking
3805 case 6: // rapidly blinking
3308 rendset = 1, rendstyle = RS_Blink; 3806 rendset = 1, rendstyle = RS_Blink;
3309 break; 3807 break;
3808 //case 6: // scoansi light background
3310 case 7: 3809 case 7:
3311 rendset = 1, rendstyle = RS_RVid; 3810 rendset = 1, rendstyle = RS_RVid;
3811 break;
3812 case 8:
3813 // invisible. NYI
3814 break;
3815 //case 9: // crossed out
3816 //case 10: // scoansi acs off, primary font
3817 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font
3819 //...
3820 //case 19: // ninth alt font
3821 //case 20: // gothic
3822 case 21: // disable bold, faint
3823 rendset = 0, rendstyle = RS_Bold;
3312 break; 3824 break;
3313 case 22: 3825 case 22:
3314 rendset = 0, rendstyle = RS_Bold; 3826 rendset = 0, rendstyle = RS_Bold;
3315 break; 3827 break;
3828 //case 23: disable italic
3316 case 24: 3829 case 24:
3317 rendset = 0, rendstyle = RS_Uline; 3830 rendset = 0, rendstyle = RS_Uline;
3318 break; 3831 break;
3319 case 25: 3832 case 25:
3320 rendset = 0, rendstyle = RS_Blink; 3833 rendset = 0, rendstyle = RS_Blink;
3321 break; 3834 break;
3322 case 27: 3835 case 27:
3323 rendset = 0, rendstyle = RS_RVid; 3836 rendset = 0, rendstyle = RS_RVid;
3324 break; 3837 break;
3838 //case 28: // visible. NYI
3839 //case 29: // not crossed-out
3325 } 3840 }
3841
3326 if (rendset != -1) 3842 if (rendset != -1)
3327 { 3843 {
3328 scr_rendition (rendset, rendstyle); 3844 scr_rendition (rendset, rendstyle);
3329 continue; /* for (;i;) */ 3845 continue; /* for (;i;) */
3330 } 3846 }
… …
3337 case 33: 3853 case 33:
3338 case 34: 3854 case 34:
3339 case 35: 3855 case 35:
3340 case 36: 3856 case 36:
3341 case 37: 3857 case 37:
3342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3343 Color_fg);
3344 break; 3859 break;
3345#ifdef TTY_256COLOR 3860#ifdef TTY_256COLOR
3346 case 38: 3861 case 38:
3347 if (nargs > i + 2 && arg[i + 1] == 5) 3862 if (nargs > i + 2 && arg[i + 1] == 5)
3348 { 3863 {
3349 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3350 Color_fg);
3351 i += 2; 3865 i += 2;
3352 } 3866 }
3353 break; 3867 break;
3354#endif 3868#endif
3355 case 39: /* default fg */ 3869 case 39: /* default fg */
… …
3362 case 43: 3876 case 43:
3363 case 44: 3877 case 44:
3364 case 45: 3878 case 45:
3365 case 46: 3879 case 46:
3366 case 47: 3880 case 47:
3367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3368 Color_bg);
3369 break; 3882 break;
3370#ifdef TTY_256COLOR 3883#ifdef TTY_256COLOR
3371 case 48: 3884 case 48:
3372 if (nargs > i + 2 && arg[i + 1] == 5) 3885 if (nargs > i + 2 && arg[i + 1] == 5)
3373 { 3886 {
3374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3375 Color_bg);
3376 i += 2; 3888 i += 2;
3377 } 3889 }
3378 break; 3890 break;
3379#endif 3891#endif
3380 case 49: /* default bg */ 3892 case 49: /* default bg */
… …
3409 } 3921 }
3410 } 3922 }
3411} 3923}
3412/*}}} */ 3924/*}}} */
3413 3925
3414/*{{{ process Rob Nation's own graphics mode sequences */ 3926/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3415void 3927void
3416rxvt_term::process_graphics () 3928rxvt_term::process_graphics ()
3417{ 3929{
3418 unsigned char ch, cmd = cmd_getc (); 3930 unicode_t ch, cmd = cmd_getc ();
3419 3931
3420 if (cmd == 'Q') 3932 if (cmd == 'Q')
3421 { /* query graphics */ 3933 { /* query graphics */
3422 tt_printf ("\033G0\n"); /* no graphics */ 3934 tt_printf ("\033G0\n"); /* no graphics */
3423 return; 3935 return;

Diff Legend

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