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.116 by root, Wed Aug 4 03:29:28 2004 UTC

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

Diff Legend

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