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.56 by pcg, Tue Feb 24 00:02:44 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
… …
291 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
292 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
293 } 283 }
294 else 284 else
295 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
296# ifdef MULTICHAR_SET
297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
298 {
299 int col, row;
300
301 newlen = STRLEN (kbuf);
302 col = screen.cur.col - 1;
303 row = screen.cur.row + TermWin.saveLines;
304 if (IS_MULTI2 (screen.rend[row][col]))
305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
306 }
307# endif
308 break; 286 break;
309#endif 287#endif
310#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
311 case XK_Delete: 289 case XK_Delete:
312 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
313# ifdef MULTICHAR_SET
314 if (Options & Opt_mc_hack)
315 {
316 int col, row;
317
318 newlen = STRLEN (kbuf);
319 col = screen.cur.col;
320 row = screen.cur.row + TermWin.saveLines;
321 if (IS_MULTI1 (screen.rend[row][col]))
322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
323 }
324# endif
325 break; 291 break;
326#endif 292#endif
327 case XK_Tab: 293 case XK_Tab:
328 if (shft) 294 if (shft)
329 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
371 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
372 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
373 } 339 }
374 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
375 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
376#ifdef MULTICHAR_SET
377 //TODO: ??
378 if (Options & Opt_mc_hack)
379 {
380 int col, row, m;
381
382 col = screen.cur.col;
383 row = screen.cur.row + TermWin.saveLines;
384 m = 0;
385 if (keysym == XK_Right
386 && IS_MULTI1 (screen.rend[row][col]))
387 m = 1;
388 else if (keysym == XK_Left)
389 {
390 if (col > 0)
391 {
392 if (IS_MULTI2 (screen.rend[row][col - 1]))
393 m = 1;
394 }
395 else if (screen.cur.row > 0)
396 {
397 col = screen.tlen[--row];
398 if (col == -1)
399 col = TermWin.ncol - 1;
400 else
401 col--;
402 if (col > 0
403 && IS_MULTI2 (screen.rend[row][col]))
404 m = 1;
405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
410#endif
411 break; 342 break;
412 343
413#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
414# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
415 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
604 break; 535 break;
605 } 536 }
606 if (newlen) 537 if (newlen)
607 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
608 } 539 }
540
609 /* 541 /*
610 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
611 */ 543 */
612#ifdef META8_OPTION 544#ifdef META8_OPTION
613 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
628 { 560 {
629 unsigned char *ch; 561 unsigned char *ch;
630 562
631 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
632 *ch |= 0x80; 564 *ch |= 0x80;
565
633 meta = 0; 566 meta = 0;
634 } 567 }
635#endif 568#endif
636 /* nil */ ; 569 /* nil */ ;
637 } 570 }
… …
690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
691/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
692unsigned int 625unsigned int
693rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
694{ 627{
695 unsigned int n, s; 628 unsigned int n, s;
696 629
697 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
699 if (n > 0 && s < count) 633 if (n > 0 && s < count)
700 { 634 {
701 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
702 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
703 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
704 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
705 s += n; 639 s += n;
706 } 640 }
641
707 if (count > s) 642 if (count > s)
708 { 643 {
709 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
710 count = s; 645 count = s;
711 } 646 }
647
712 for (; count--;) 648 for (; count--;)
713 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
714 return 0; 653 return 0;
715} 654}
716#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
717 656
718void 657void
… …
733 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
734 scrollbar_show (1); 673 scrollbar_show (1);
735#ifdef USE_XIM 674#ifdef USE_XIM
736 IMSendSpot (); 675 IMSendSpot ();
737#endif 676#endif
738
739 } 677 }
740 678
741 display->flush (); 679 display->flush ();
680
681 flush_ev.stop ();
742} 682}
743 683
744void 684void
745rxvt_term::check_cb (check_watcher &w) 685rxvt_term::check_cb (check_watcher &w)
746{ 686{
747 SET_R (this); 687 SET_R (this);
748 SET_LOCALE (locale); 688 SET_LOCALE (locale);
749 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;
750 flush (); 704 flush ();
751} 705}
752 706
753#ifdef CURSOR_BLINK 707#ifdef CURSOR_BLINK
754void 708void
… …
772 w.start (w.at + TEXT_BLINK_INTERVAL); 726 w.start (w.at + TEXT_BLINK_INTERVAL);
773 } 727 }
774} 728}
775#endif 729#endif
776 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
777bool 774bool
778rxvt_term::pty_fill () 775rxvt_term::pty_fill ()
779{ 776{
780 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 }
781 784
782 memmove (cmdbuf_base, cmdbuf_ptr, n); 785 memmove (cmdbuf_base, cmdbuf_ptr, n);
783 cmdbuf_ptr = cmdbuf_base; 786 cmdbuf_ptr = cmdbuf_base;
784 cmdbuf_endp = cmdbuf_ptr + n; 787 cmdbuf_endp = cmdbuf_ptr + n;
785 788
786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
787 790
788 if (n > 0) 791 if (n > 0)
789 { 792 {
790 cmdbuf_endp += n; 793 cmdbuf_endp += n;
791 return true; 794 return true;
792 } 795 }
793 else if (n < 0 && errno != EAGAIN) 796 else if (n < 0 && errno != EAGAIN)
794 destroy (); 797 destroy ();
795 798
796 return false; 799 return false;
797} 800}
798 801
799void 802void
800rxvt_term::pty_cb (io_watcher &w, short revents) 803rxvt_term::pty_cb (io_watcher &w, short revents)
… …
803 SET_LOCALE (locale); 806 SET_LOCALE (locale);
804 807
805 if (revents & EVENT_WRITE) 808 if (revents & EVENT_WRITE)
806 tt_write (0, 0); 809 tt_write (0, 0);
807 else if (revents & EVENT_READ) 810 else if (revents & EVENT_READ)
808 {
809 bool flag = true;
810
811 // loop, but don't allow a single term to monopolize us 811 // loop, but don't allow a single term to monopolize us
812 // the number of loops is fully arbitrary, and thus wrong
813 while (flag && pty_fill ()) 812 while (pty_fill ())
814 { 813 if (cmd_parse ())
815 if (!seen_input)
816 {
817 seen_input = 1;
818 /* once we know the shell is running, send the screen size. Again! */
819 tt_winch ();
820 }
821
822 uint32_t ch = NOCHAR;
823
824 for (;;)
825 {
826 if (ch == NOCHAR)
827 ch = next_char ();
828
829 if (ch == NOCHAR) // TODO: improve
830 break; 814 break;
831
832 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
833 {
834 /* Read a text string from the input buffer */
835 uint32_t buf[BUFSIZ];
836 bool refreshnow = false;
837 int nlines = 0;
838 uint32_t *str = buf;
839
840 *str++ = ch;
841
842 for (;;)
843 {
844 ch = next_char ();
845
846 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break;
848 else
849 {
850 *str++ = ch;
851
852 if (ch == '\n')
853 {
854 nlines++;
855 refresh_count++;
856
857 if (! (Options & Opt_jumpScroll)
858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
859 {
860 refreshnow = true;
861 flag = false;
862 ch = NOCHAR;
863 break;
864 }
865
866 // scr_add_lines only works for nlines < TermWin.nrow - 1.
867 if (nlines >= TermWin.nrow - 1)
868 {
869 scr_add_lines (buf, nlines, str - buf);
870 nlines = 0;
871 str = buf;
872 }
873 }
874
875 if (str >= buf + BUFSIZ)
876 {
877 ch = NOCHAR;
878 break;
879 }
880 }
881 }
882
883 scr_add_lines (buf, nlines, str - buf);
884
885 /*
886 * If there have been a lot of new lines, then update the screen
887 * What the heck I'll cheat and only refresh less than every page-full.
888 * the number of pages between refreshes is refresh_limit, which
889 * is incremented here because we must be doing flat-out scrolling.
890 *
891 * refreshing should be correct for small scrolls, because of the
892 * time-out
893 */
894 if (refreshnow)
895 {
896 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
897 refresh_limit++;
898
899 scr_refresh (refresh_type);
900 }
901
902 }
903 else
904 {
905 switch (ch)
906 {
907 default:
908 process_nonprinting (ch);
909 break;
910 case C0_ESC: /* escape char */
911 process_escape_seq ();
912 break;
913 /*case 0x9b: */ /* CSI */
914 /* process_csi_seq (); */
915 }
916
917 ch = NOCHAR;
918 }
919 }
920 }
921 }
922} 815}
923 816
924// read the next character, currently handles UTF-8
925// will probably handle all sorts of other stuff in the future
926uint32_t
927rxvt_term::next_char ()
928{
929 while (cmdbuf_ptr < cmdbuf_endp)
930 {
931 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
932 return *cmdbuf_ptr++;
933
934 wchar_t wc;
935 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
936
937 if (len == (size_t)-2)
938 return NOCHAR;
939
940 if (len == (size_t)-1)
941 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
942
943 // assume wchar == unicode
944 cmdbuf_ptr += len;
945 return wc;
946 }
947
948 return NOCHAR;
949}
950
951/* rxvt_cmd_getc () - Return next input character */
952/*
953 * Return the next input character after first passing any keyboard input
954 * to the command.
955 */
956uint32_t
957rxvt_term::cmd_getc ()
958{
959 for (;;)
960 {
961 uint32_t c = next_char ();
962 if (c != NOCHAR)
963 return c;
964
965 // incomplete sequences should occur rarely, still, a better solution
966 // would be preferred. either setjmp/longjmp or better design.
967 fcntl (cmd_fd, F_SETFL, 0);
968 pty_fill ();
969 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
970 }
971}
972
973#ifdef POINTER_BLANK
974void 817void
975rxvt_term::pointer_unblank () 818rxvt_term::pointer_unblank ()
976{ 819{
977 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
978 recolour_cursor (); 821 recolour_cursor ();
979 822
823#ifdef POINTER_BLANK
980 hidden_pointer = 0; 824 hidden_pointer = 0;
981 825
982 if (Options & Opt_pointerBlank) 826 if (Options & Opt_pointerBlank)
983 pointer_ev.start (NOW + pointerBlankDelay); 827 pointer_ev.start (NOW + pointerBlankDelay);
828#endif
984} 829}
985 830
831#ifdef POINTER_BLANK
986void 832void
987rxvt_term::pointer_blank () 833rxvt_term::pointer_blank ()
988{ 834{
989 if (! (Options & Opt_pointerBlank)) 835 if (! (Options & Opt_pointerBlank))
990 return; 836 return;
… …
1186 break; 1032 break;
1187 1033
1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1189 case KeyRelease: 1035 case KeyRelease:
1190 { 1036 {
1191 if (! (ev.xkey.state & ControlMask)) 1037 if (!(ev.xkey.state & ControlMask))
1192 mouse_slip_wheel_speed = 0; 1038 slip_wheel_ev.stop ();
1193 else 1039 else
1194 { 1040 {
1195 KeySym ks; 1041 KeySym ks;
1196 1042
1197 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1198 if (ks == XK_Control_L || ks == XK_Control_R) 1044 if (ks == XK_Control_L || ks == XK_Control_R)
1199 mouse_slip_wheel_speed = 0; 1045 mouse_slip_wheel_speed = 0;
1200 } 1046 }
… …
1220 && (ev.xclient.data.l[0] == DndFile 1066 && (ev.xclient.data.l[0] == DndFile
1221 || ev.xclient.data.l[0] == DndDir 1067 || ev.xclient.data.l[0] == DndDir
1222 || ev.xclient.data.l[0] == DndLink)) 1068 || ev.xclient.data.l[0] == DndLink))
1223 { 1069 {
1224 /* Get Dnd data */ 1070 /* Get Dnd data */
1225 Atom ActualType; 1071 Atom ActualType;
1226 int ActualFormat; 1072 int ActualFormat;
1227 unsigned char *data; 1073 unsigned char *data;
1228 unsigned long Size, RemainingBytes; 1074 unsigned long Size, RemainingBytes;
1229 1075
1230 XGetWindowProperty (display->display, display->root, 1076 XGetWindowProperty (display->display, display->root,
1231 xa[XA_DNDSELECTION], 1077 xa[XA_DNDSELECTION],
1232 0L, 1000000L, 1078 0L, 1000000L,
1233 False, AnyPropertyType, 1079 False, AnyPropertyType,
… …
1236 &data); 1082 &data);
1237 XChangeProperty (display->display, display->root, 1083 XChangeProperty (display->display, display->root,
1238 XA_CUT_BUFFER0, XA_STRING, 1084 XA_CUT_BUFFER0, XA_STRING,
1239 8, PropModeReplace, 1085 8, PropModeReplace,
1240 data, STRLEN (data)); 1086 data, STRLEN (data));
1087 XFree (data);
1241 selection_paste (display->root, XA_CUT_BUFFER0, True); 1088 selection_paste (display->root, XA_CUT_BUFFER0, True);
1242 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1243 } 1090 }
1244#endif /* OFFIX_DND */ 1091#endif /* OFFIX_DND */
1245 break; 1092 break;
1246 1093
1247 case MappingNotify: 1094 case MappingNotify:
1248 XRefreshKeyboardMapping (& (ev.xmapping)); 1095 XRefreshKeyboardMapping (&ev.xmapping);
1249 break; 1096 break;
1250 1097
1251 /* 1098 /*
1252 * XXX: this is not the _current_ arrangement 1099 * XXX: this is not the _current_ arrangement
1253 * Here's my conclusion: 1100 * Here's my conclusion:
… …
1284#endif 1131#endif
1285#ifdef CURSOR_BLINK 1132#ifdef CURSOR_BLINK
1286 if (Options & Opt_cursorBlink) 1133 if (Options & Opt_cursorBlink)
1287 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1288#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
1289 1145
1290 } 1146 }
1291 break; 1147 break;
1292 1148
1293 case FocusOut: 1149 case FocusOut:
… …
1302#ifdef CURSOR_BLINK 1158#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1159 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.stop (); 1160 cursor_blink_ev.stop ();
1305 hidden_cursor = 0; 1161 hidden_cursor = 0;
1306#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
1307 1172
1308 } 1173 }
1309 break; 1174 break;
1310 1175
1311 case ConfigureNotify: 1176 case ConfigureNotify:
… …
1320 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1321 } 1186 }
1322 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1323 1188
1324 if (szHint.width != width || szHint.height != height) 1189 if (szHint.width != width || szHint.height != height)
1325 {
1326 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1327 resize_all_windows (width, height, 1); 1190 resize_all_windows (width, height, 1);
1328 } 1191
1329#ifdef DEBUG_SIZE
1330 else
1331 {
1332 D_SIZE ((stderr, "Size: Not resizing"));
1333 }
1334#endif
1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1336 if (Options & Opt_transparent) 1193 if (Options & Opt_transparent)
1337 { 1194 {
1338 check_our_parents (); 1195 check_our_parents ();
1339 if (am_transparent) 1196 if (am_transparent)
1340 want_full_refresh = 1; 1197 want_full_refresh = 1;
1341 } 1198 }
1342#endif 1199#endif
1343
1344 } 1200 }
1345 break; 1201 break;
1346 1202
1347 case SelectionClear: 1203 case SelectionClear:
1348 display->set_selection_owner (0); 1204 selection_clear ();
1349 break; 1205 break;
1350 1206
1351 case SelectionNotify: 1207 case SelectionNotify:
1352 if (selection_wait == Sel_normal) 1208 if (selection_wait == Sel_normal)
1353 selection_paste (ev.xselection.requestor, 1209 selection_paste (ev.xselection.requestor,
… …
1380 1236
1381 case GraphicsExpose: 1237 case GraphicsExpose:
1382 case Expose: 1238 case Expose:
1383 if (ev.xany.window == TermWin.vt) 1239 if (ev.xany.window == TermWin.vt)
1384 { 1240 {
1385#ifdef NO_SLOW_LINK_SUPPORT 1241 do
1386 scr_expose (ev.xexpose.x, ev.xexpose.y, 1242 scr_expose (ev.xexpose.x, ev.xexpose.y,
1387 ev.xexpose.width, ev.xexpose.height, False); 1243 ev.xexpose.width, ev.xexpose.height, False);
1388#else 1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1389 // 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))
1390 scr_expose (ev.xexpose.x, ev.xexpose.y, 1249 scr_expose (ev.xexpose.x, ev.xexpose.y,
1391 ev.xexpose.width, ev.xexpose.height, False); 1250 ev.xexpose.width, ev.xexpose.height, False);
1392 //scr_expose (ev.xexpose.x, 0, 1251
1393 // ev.xexpose.width, TermWin.height, False); 1252 scr_refresh (refresh_type);
1394#endif
1395 want_refresh = 1;
1396 } 1253 }
1397 else 1254 else
1398 { 1255 {
1399 XEvent unused_event; 1256 XEvent unused_event;
1400 1257
1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1402 Expose, 1259 ;
1403 &unused_event)) ;
1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1405 GraphicsExpose, 1261 ;
1406 &unused_event)) ; 1262
1407 if (isScrollbarWindow (ev.xany.window)) 1263 if (isScrollbarWindow (ev.xany.window))
1408 { 1264 {
1409 scrollBar.setIdle (); 1265 scrollBar.setIdle ();
1410 scrollbar_show (0); 1266 scrollbar_show (0);
1411 } 1267 }
1412#ifdef MENUBAR 1268#ifdef MENUBAR
1413 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1414 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);
1415#endif 1276#endif
1416 } 1277 }
1417 break; 1278 break;
1418 1279
1419 case MotionNotify: 1280 case MotionNotify:
… …
1454 if (ev.xbutton.y < TermWin.int_bwidth 1315 if (ev.xbutton.y < TermWin.int_bwidth
1455 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1456 { 1317 {
1457 int dist; 1318 int dist;
1458 1319
1459 pending_scroll_selection=1;
1460
1461 /* don't clobber the current delay if we are 1320 /* don't clobber the current delay if we are
1462 * already in the middle of scrolling. 1321 * already in the middle of scrolling.
1463 */ 1322 */
1464 if (scroll_selection_delay<=0) 1323 if (!sel_scroll_ev.active)
1465 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1466 1325
1467 /* save the event params so we can highlight 1326 /* save the event params so we can highlight
1468 * the selection in the pending-scroll loop 1327 * the selection in the pending-scroll loop
1469 */ 1328 */
1470 selection_save_x=ev.xbutton.x; 1329 selection_save_x=ev.xbutton.x;
… …
1492 else 1351 else
1493 { 1352 {
1494 /* we are within the text window, so we 1353 /* we are within the text window, so we
1495 * shouldn't be scrolling 1354 * shouldn't be scrolling
1496 */ 1355 */
1497 pending_scroll_selection = 0; 1356 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop();
1498 } 1358 }
1499#endif 1359#endif
1500#ifdef MOUSE_THRESHOLD 1360#ifdef MOUSE_THRESHOLD
1501 1361
1502 } 1362 }
… …
1552 return; 1412 return;
1553 } 1413 }
1554 1414
1555 /* FALLTHROUGH */ 1415 /* FALLTHROUGH */
1556 case ReparentNotify: 1416 case ReparentNotify:
1557 if ((Options & Opt_transparent) && check_our_parents ()) 1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1558 if (am_transparent)
1559 want_full_refresh = 1; 1418 want_full_refresh = 1;
1560 break; 1419 break;
1561#endif 1420#endif
1562 } 1421 }
1563} 1422}
1564 1423
… …
1720 upordown = 1; /* down */ 1579 upordown = 1; /* down */
1721 } 1580 }
1722 if (upordown) 1581 if (upordown)
1723 { 1582 {
1724#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1583#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1725 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1584 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1726#endif 1585#endif
1727 if (scr_page (upordown < 0 ? UP : DN, 1)) 1586 if (scr_page (upordown < 0 ? UP : DN, 1))
1728 { 1587 {
1729 if (upordown < 0) 1588 if (upordown < 0)
1730 scrollBar.setUp (); 1589 scrollBar.setUp ();
… …
1817 refresh_type &= ~SMOOTH_REFRESH; 1676 refresh_type &= ~SMOOTH_REFRESH;
1818#endif 1677#endif
1819 1678
1820 } 1679 }
1821#ifdef SELECTION_SCROLLING 1680#ifdef SELECTION_SCROLLING
1822 pending_scroll_selection=0; 1681 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop();
1823#endif 1683#endif
1824 if (ev.window == TermWin.vt) 1684 if (ev.window == TermWin.vt)
1825 { 1685 {
1826 if (reportmode) 1686 if (reportmode)
1827 { 1687 {
… …
1869 case Button5: 1729 case Button5:
1870 { 1730 {
1871 int i; 1731 int i;
1872 page_dirn v; 1732 page_dirn v;
1873 1733
1874 v = (ev.button == Button4) ? UP : DN; 1734 v = ev.button == Button4 ? UP : DN;
1735
1875 if (ev.state & ShiftMask) 1736 if (ev.state & ShiftMask)
1876 i = 1; 1737 i = 1;
1877 else if ((Options & Opt_mouseWheelScrollPage)) 1738 else if (Options & Opt_mouseWheelScrollPage)
1878 i = TermWin.nrow - 1; 1739 i = TermWin.nrow - 1;
1879 else 1740 else
1880 i = 5; 1741 i = 5;
1742
1881# ifdef MOUSE_SLIP_WHEELING 1743# ifdef MOUSE_SLIP_WHEELING
1882 if (ev.state & ControlMask) 1744 if (ev.state & ControlMask)
1883 { 1745 {
1884 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)
1885 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752
1753 slip_wheel_ev.start ();
1886 } 1754 }
1755 else
1756 {
1887# endif 1757# endif
1888# ifdef JUMP_MOUSE_WHEEL 1758# ifdef JUMP_MOUSE_WHEEL
1889 scr_page (v, i);
1890 scr_refresh (SMOOTH_REFRESH);
1891 scrollbar_show (1);
1892# else
1893 while (i--)
1894 {
1895 scr_page (v, 1); 1759 scr_page (v, i);
1896 scr_refresh (SMOOTH_REFRESH); 1760 scr_refresh (SMOOTH_REFRESH);
1897 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
1898 } 1771 }
1899# endif 1772#endif
1900
1901 } 1773 }
1902 break; 1774 break;
1903#endif 1775#endif
1904
1905 } 1776 }
1906 } 1777 }
1907#ifdef MENUBAR 1778#ifdef MENUBAR
1908 else if (isMenuBarWindow (ev.window)) 1779 else if (isMenuBarWindow (ev.window))
1909 menubar_control (ev); 1780 menubar_control (ev);
1910#endif 1781#endif
1911} 1782}
1912 1783
1913
1914#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
1915/* 2016/*
1916 * Check our parents are still who we think they are. 2017 * Check our parents are still who we think they are.
1917 * Do transparency updates if required 2018 * Do transparency updates if required
1918 */ 2019 */
1919int 2020int
1920rxvt_term::check_our_parents () 2021rxvt_term::check_our_parents ()
1921{ 2022{
1922 int i, pchanged, aformat, have_pixmap, rootdepth; 2023 int i, pchanged, aformat, have_pixmap, rootdepth;
1923 unsigned long nitems, bytes_after; 2024 unsigned long nitems, bytes_after;
1924 Atom atype; 2025 Atom atype;
1925 unsigned char *prop = NULL; 2026 unsigned char *prop = NULL;
1926 Window root, oldp, *list; 2027 Window root, oldp, *list;
1927 Pixmap rootpixmap = None; 2028 Pixmap rootpixmap = None;
1928 XWindowAttributes wattr, wrootattr; 2029 XWindowAttributes wattr, wrootattr;
1929 2030
1930 pchanged = 0; 2031 pchanged = 0;
1931 2032
1932 if (! (Options & Opt_transparent)) 2033 if (!(Options & Opt_transparent))
1933 return pchanged; /* Don't try any more */ 2034 return pchanged; /* Don't try any more */
1934 2035
1935 XGetWindowAttributes (display->display, display->root, &wrootattr); 2036 XGetWindowAttributes (display->display, display->root, &wrootattr);
1936 rootdepth = wrootattr.depth; 2037 rootdepth = wrootattr.depth;
1937 2038
1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2040
1939 if (rootdepth != wattr.depth) 2041 if (rootdepth != wattr.depth)
1940 { 2042 {
1941 if (am_transparent) 2043 if (am_transparent)
1942 { 2044 {
1943 pchanged = 1; 2045 pchanged = 1;
1944 XSetWindowBackground (display->display, TermWin.vt, 2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1945 PixColors[Color_bg]);
1946 am_transparent = am_pixmap_trans = 0; 2047 am_transparent = am_pixmap_trans = 0;
1947 } 2048 }
2049
1948 return pchanged; /* Don't try any more */ 2050 return pchanged; /* Don't try any more */
1949 } 2051 }
1950 2052
1951 /* 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. */
1952 XSync (display->display, False); 2054 XSync (display->display, False);
… …
1954 /* 2056 /*
1955 * Make the frame window set by the window manager have 2057 * Make the frame window set by the window manager have
1956 * the root background. Some window managers put multiple nested frame 2058 * the root background. Some window managers put multiple nested frame
1957 * 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.
1958 */ 2060 */
1959 i = (xa[XA_XROOTPMAPID] != 0 2061 i = (xa[XA_XROOTPMAPID]
1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1962 &nitems, &bytes_after, &prop) == Success)); 2064 &nitems, &bytes_after, &prop) == Success);
2065
1963 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 )
1964 have_pixmap = 0; 2077 have_pixmap = 0;
1965 else 2078 else
1966 { 2079 {
1967 have_pixmap = 1; 2080 have_pixmap = 1;
1968 rootpixmap = * ((Pixmap *)prop); 2081 rootpixmap = *(Pixmap *)prop;
1969 XFree (prop); 2082 XFree (prop);
1970 } 2083 }
2084
1971 if (have_pixmap) 2085 if (have_pixmap)
1972 { 2086 {
1973 /* 2087 /*
1974 * Copy display->root pixmap transparency 2088 * Copy display->root pixmap transparency
1975 */ 2089 */
1976 int sx, sy, nx, ny; 2090 int sx, sy, nx, ny;
1977 unsigned int nw, nh; 2091 unsigned int nw, nh;
1978 Window cr; 2092 Window cr;
1979 XImage *image; 2093 XImage *image;
1980 GC gc; 2094 GC gc;
1981 XGCValues gcvalue; 2095 XGCValues gcvalue;
1982 2096
1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1984 0, 0, &sx, &sy, &cr); 2098 0, 0, &sx, &sy, &cr);
1985 nw = (unsigned int)szHint.width; 2099 nw = (unsigned int)szHint.width;
1986 nh = (unsigned int)szHint.height; 2100 nh = (unsigned int)szHint.height;
1987 nx = ny = 0; 2101 nx = ny = 0;
2102
1988 if (sx < 0) 2103 if (sx < 0)
1989 { 2104 {
1990 nw += sx; 2105 nw += sx;
1991 nx = -sx; 2106 nx = -sx;
1992 sx = 0; 2107 sx = 0;
1993 } 2108 }
2109
1994 if (sy < 0) 2110 if (sy < 0)
1995 { 2111 {
1996 nh += sy; 2112 nh += sy;
1997 ny = -sy; 2113 ny = -sy;
1998 sy = 0; 2114 sy = 0;
1999 } 2115 }
2116
2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2002 allowedxerror = -1; 2119 allowedxerror = -1;
2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2004 ZPixmap); 2121
2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2006 /* XXX: may need a delay here? */ 2123 /* XXX: may need a delay here? */
2007 allowedxerror = 0; 2124 allowedxerror = 0;
2125
2008 if (image == NULL) 2126 if (image == NULL)
2009 { 2127 {
2010 if (am_transparent && am_pixmap_trans) 2128 if (am_transparent && am_pixmap_trans)
2011 { 2129 {
2012 pchanged = 1; 2130 pchanged = 1;
… …
2014 { 2132 {
2015 XFreePixmap (display->display, TermWin.pixmap); 2133 XFreePixmap (display->display, TermWin.pixmap);
2016 TermWin.pixmap = None; 2134 TermWin.pixmap = None;
2017 } 2135 }
2018 } 2136 }
2137
2019 am_pixmap_trans = 0; 2138 am_pixmap_trans = 0;
2020 } 2139 }
2021 else 2140 else
2022 { 2141 {
2023 if (TermWin.pixmap != None) 2142 if (TermWin.pixmap != None)
2024 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
2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2026 (unsigned int)szHint.width,
2027 (unsigned int)szHint.height, 2158 szHint.width, szHint.height, image->depth);
2028 (unsigned int)image->depth);
2029 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2030 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2031 nx, ny, (unsigned int)image->width,
2032 (unsigned int)image->height); 2161 nx, ny, image->width, image->height);
2033 XFreeGC (display->display, gc); 2162 XFreeGC (display->display, gc);
2034 XDestroyImage (image); 2163 XDestroyImage (image);
2035 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2036 TermWin.pixmap); 2165 XClearWindow (display->display, TermWin.parent[0]);
2166
2037 if (!am_transparent || !am_pixmap_trans) 2167 if (!am_transparent || !am_pixmap_trans)
2038 pchanged = 1; 2168 pchanged = 1;
2169
2039 am_transparent = am_pixmap_trans = 1; 2170 am_transparent = am_pixmap_trans = 1;
2040 } 2171 }
2041 } 2172 }
2173
2042 if (!am_pixmap_trans) 2174 if (!am_pixmap_trans)
2043 { 2175 {
2044 unsigned int n; 2176 unsigned int n;
2045 /* 2177 /*
2046 * InheritPixmap transparency 2178 * InheritPixmap transparency
2047 */ 2179 */
2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2050 i++)
2051 { 2182 {
2052 oldp = TermWin.parent[i]; 2183 oldp = TermWin.parent[i];
2053 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2184 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2054 &TermWin.parent[i], &list, &n); 2185 &TermWin.parent[i], &list, &n);
2055 XFree (list); 2186 XFree (list);
2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188
2057 if (TermWin.parent[i] == display->root) 2189 if (TermWin.parent[i] == display->root)
2058 { 2190 {
2059 if (oldp != None) 2191 if (oldp != None)
2060 pchanged = 1; 2192 pchanged = 1;
2193
2061 break; 2194 break;
2062 } 2195 }
2196
2063 if (oldp != TermWin.parent[i]) 2197 if (oldp != TermWin.parent[i])
2064 pchanged = 1; 2198 pchanged = 1;
2065 } 2199 }
2200
2066 n = 0; 2201 n = 0;
2202
2067 if (pchanged) 2203 if (pchanged)
2068 { 2204 {
2069 for (; n < (unsigned int)i; n++) 2205 for (; n < (unsigned int)i; n++)
2070 { 2206 {
2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2076 break; 2212 break;
2077 } 2213 }
2078 } 2214 }
2079 } 2215 }
2080 if (n > (int) (sizeof (TermWin.parent) 2216
2081 / sizeof (TermWin.parent[0]))) 2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2082 { 2218 {
2083 D_X ((stderr, "InheritPixmap Turning off")); 2219 D_X ((stderr, "InheritPixmap Turning off"));
2084 XSetWindowBackground (display->display, TermWin.parent[0], 2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2085 PixColors[Color_fg]);
2086 XSetWindowBackground (display->display, TermWin.vt, 2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2087 PixColors[Color_bg]);
2088 am_transparent = 0; 2222 am_transparent = 0;
2089 /* XXX: also turn off Opt_transparent? */ 2223 /* XXX: also turn off Opt_transparent? */
2090 } 2224 }
2091 else 2225 else
2092 { 2226 {
2227#if WAIT_FOR_WM
2093 /* wait (an arbitrary period) for the WM to do its thing 2228 /* wait (an arbitrary period) for the WM to do its thing
2094 * needed for fvwm2.2.2 (and before?) */ 2229 * needed for fvwm2.2.2 (and before?) */
2095# ifdef HAVE_NANOSLEEP
2096 struct timespec rqt;
2097
2098 rqt.tv_sec = 1;
2099 rqt.tv_nsec = 0;
2100 nanosleep (&rqt, NULL);
2101# else
2102 sleep (1); 2230 sleep (1);
2103# endif 2231#endif
2104 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2105 for (n = 0; n < (unsigned int)i; n++) 2233 for (n = 0; n < (unsigned int)i; n++)
2234 {
2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2107 ParentRelative); 2236 XClearWindow (display->display, TermWin.parent[n]);
2237 }
2238
2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2109 ParentRelative);
2110 am_transparent = 1; 2240 am_transparent = 1;
2111 } 2241 }
2242
2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2113 TermWin.parent[i] = None; 2244 TermWin.parent[i] = None;
2114 } 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
2115 return pchanged; 2256 return pchanged;
2116} 2257}
2117#endif 2258#endif
2118 2259
2119/*}}} */ 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}
2120 2435
2121/*{{{ print pipe */ 2436/*{{{ print pipe */
2122/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2123#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2124FILE * 2439FILE *
2125rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2126{ 2441{
2127 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe], "w");
2128 2443
2129 if (stream == NULL) 2444 if (stream == NULL)
2130 rxvt_print_error ("can't open printer pipe"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2446
2131 return stream; 2447 return stream;
2132} 2448}
2133 2449
2134int 2450int
2135rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2136{ 2452{
2137 fflush (stream); 2453 fflush (stream);
2138 /* pclose () reported not to work on SunOS 4.1.3 */
2139# if defined (__sun__) /* TODO: RESOLVE THIS */
2140 /* pclose works provided SIGCHLD handler uses waitpid */
2141 return pclose (stream); /* return fclose (stream); */
2142# else
2143 return pclose (stream); 2454 return pclose (stream);
2144# endif
2145} 2455}
2146 2456
2147/* 2457/*
2148 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2149 */ 2459 */
2150void 2460void
2151rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2152{ 2462{
2153 int done; 2463 int done;
2154 FILE *fd; 2464 FILE *fd;
2155 2465
2156 if ((fd = popen_printer ()) == NULL) 2466 if ((fd = popen_printer ()) == NULL)
2157 return; 2467 return;
2158 2468
2159 /* 2469 /*
2160 * 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
2161 * is received. 2471 * is received.
2162 */ 2472 */
2163 for (done = 0; !done;) 2473 for (done = 0; !done;)
2164 { 2474 {
2165 unsigned char buf[8]; 2475 unsigned char buf[8];
2166 unsigned char ch; 2476 unicode_t ch;
2167 unsigned int i, len; 2477 unsigned int i, len;
2168 2478
2169 if ((ch = cmd_getc ()) != C0_ESC) 2479 if ((ch = cmd_getc ()) != C0_ESC)
2170 { 2480 {
2171 if (putc (ch, fd) == EOF) 2481 if (putc (ch, fd) == EOF)
2172 break; /* done = 1 */ 2482 break; /* done = 1 */
… …
2187 { 2497 {
2188 if ((buf[len++] = cmd_getc ()) == 'i') 2498 if ((buf[len++] = cmd_getc ()) == 'i')
2189 break; /* done = 1 */ 2499 break; /* done = 1 */
2190 } 2500 }
2191 } 2501 }
2502
2192 for (i = 0; i < len; i++) 2503 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF) 2504 if (putc (buf[i], fd) == EOF)
2194 { 2505 {
2195 done = 1; 2506 done = 1;
2196 break; 2507 break;
2197 } 2508 }
2198 } 2509 }
2199 } 2510 }
2511
2200 pclose_printer (fd); 2512 pclose_printer (fd);
2201} 2513}
2202#endif /* PRINTPIPE */ 2514#endif /* PRINTPIPE */
2203/*}}} */ 2515/*}}} */
2204 2516
2205/* *INDENT-OFF* */ 2517/* *INDENT-OFF* */
2206enum { 2518enum {
2207 C1_40 = 0x40, 2519 C1_40 = 0x40,
2208 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,
2209 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,
2210 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,
2211 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,
2212}; 2524};
2213/* *INDENT-ON* */ 2525/* *INDENT-ON* */
2214 2526
2215/*{{{ process non-printing single characters */ 2527/*{{{ process non-printing single characters */
2216void 2528void
2217rxvt_term::process_nonprinting (unsigned char ch) 2529rxvt_term::process_nonprinting (unicode_t ch)
2218{ 2530{
2219 switch (ch) 2531 switch (ch)
2220 { 2532 {
2533 case C0_ESC:
2534 process_escape_seq ();
2535 break;
2221 case C0_ENQ: /* terminal Status */ 2536 case C0_ENQ: /* terminal Status */
2222 if (rs[Rs_answerbackstring]) 2537 if (rs[Rs_answerbackstring])
2223 tt_write (
2224 (const unsigned char *)rs[Rs_answerbackstring], 2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2225 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2226 else 2540 else
2227 tt_write ((unsigned char *)VT100_ANS, 2541 tt_write ((unsigned char *)VT100_ANS,
2228 (unsigned int)STRLEN (VT100_ANS)); 2542 (unsigned int)STRLEN (VT100_ANS));
2229 break; 2543 break;
2230 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2231 scr_bell (); 2545 scr_bell ();
2232 break; 2546 break;
2233 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
… …
2248 scr_charset_choose (1); 2562 scr_charset_choose (1);
2249 break; 2563 break;
2250 case C0_SI: /* shift in - acs */ 2564 case C0_SI: /* shift in - acs */
2251 scr_charset_choose (0); 2565 scr_charset_choose (0);
2252 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
2253 } 2580 }
2254} 2581}
2255/*}}} */ 2582/*}}} */
2256 2583
2257 2584
2258/*{{{ process VT52 escape sequences */ 2585/*{{{ process VT52 escape sequences */
2259void 2586void
2260rxvt_term::process_escape_vt52 (unsigned char ch) 2587rxvt_term::process_escape_vt52 (unicode_t ch)
2261{ 2588{
2262 int row, col; 2589 int row, col;
2263 2590
2264 switch (ch) 2591 switch (ch)
2265 { 2592 {
… …
2317 2644
2318/*{{{ process escape sequences */ 2645/*{{{ process escape sequences */
2319void 2646void
2320rxvt_term::process_escape_seq () 2647rxvt_term::process_escape_seq ()
2321{ 2648{
2322 unsigned char ch = cmd_getc (); 2649 unicode_t ch = cmd_getc ();
2323 2650
2324 if (PrivateModes & PrivMode_vt52) 2651 if (PrivateModes & PrivMode_vt52)
2325 { 2652 {
2326 process_escape_vt52 (ch); 2653 process_escape_vt52 (ch);
2327 return; 2654 return;
… …
2344 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
2345 break; 2672 break;
2346 case '+': 2673 case '+':
2347 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
2348 break; 2675 break;
2349#ifdef MULTICHAR_SET
2350 case '$':
2351 scr_charset_set (-2, (unsigned int)cmd_getc ());
2352 break;
2353#endif
2354#ifndef NO_FRILLS 2676#ifndef NO_FRILLS
2355 case '6': 2677 case '6':
2356 scr_backindex (); 2678 scr_backindex ();
2357 break; 2679 break;
2358#endif 2680#endif
… …
2380 break; 2702 break;
2381 2703
2382 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
2383 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
2384 { 2706 {
2385 uint32_t nlcr[] = { '\n', '\r' }; 2707 unicode_t nlcr[] = { C0_LF, C0_CR };
2386 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, 1, 2);
2387 } 2709 }
2388 break; 2710 break;
2389 2711
2390 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2401 case C1_RI: /* ESC M */ 2723 case C1_RI: /* ESC M */
2402 scr_index (DN); 2724 scr_index (DN);
2403 break; 2725 break;
2404 2726
2405 /* 8.3.142: SINGLE-SHIFT TWO */ 2727 /* 8.3.142: SINGLE-SHIFT TWO */
2406 /*case C1_SS2: scr_single_shift (2); break; */ 2728 /*case C1_SS2: scr_single_shift (2); break; */
2407 2729
2408 /* 8.3.143: SINGLE-SHIFT THREE */ 2730 /* 8.3.143: SINGLE-SHIFT THREE */
2409 /*case C1_SS3: scr_single_shift (3); break; */ 2731 /*case C1_SS3: scr_single_shift (3); break; */
2410 2732
2411 /* 8.3.27: DEVICE CONTROL STRING */ 2733 /* 8.3.27: DEVICE CONTROL STRING */
2412 case C1_DCS: /* ESC P */ 2734 case C1_DCS: /* ESC P */
2413 process_dcs_seq (); 2735 process_dcs_seq ();
2414 break; 2736 break;
… …
2429 process_osc_seq (); 2751 process_osc_seq ();
2430 break; 2752 break;
2431 2753
2432 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE */
2433 case 'c': 2755 case 'c':
2756 mbstate.reset ();
2434 scr_poweron (); 2757 scr_poweron ();
2435 scrollbar_show (1); 2758 scrollbar_show (1);
2436 break; 2759 break;
2437 2760
2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2450 2773
2451/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2452/* *INDENT-OFF* */ 2775/* *INDENT-OFF* */
2453enum { 2776enum {
2454 CSI_ICH = 0x40, 2777 CSI_ICH = 0x40,
2455 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,
2456 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 ,
2457 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,
2458 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,
2459 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,
2460 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,
… …
2475 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, */
2476 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, [, \, ], ^, _, */
2477 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, */
2478 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, */
2479 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, */
2480 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, {, |, }, ~, */
2481 }; 2804 };
2482/* *INDENT-ON* */ 2805/* *INDENT-ON* */
2483 2806
2484void 2807void
2485rxvt_term::process_csi_seq () 2808rxvt_term::process_csi_seq ()
2486{ 2809{
2487 unsigned char ch, priv, i; 2810 unicode_t ch, priv, i;
2488 unsigned int nargs, p; 2811 unsigned int nargs, p;
2489 int n, ndef; 2812 int n, ndef;
2490 int arg[ESC_ARGS]; 2813 int arg[ESC_ARGS];
2491 2814
2492 for (nargs = ESC_ARGS; nargs > 0;) 2815 for (nargs = ESC_ARGS; nargs > 0;)
2493 arg[--nargs] = 0; 2816 arg[--nargs] = 0;
2494 2817
2495 priv = 0; 2818 priv = 0;
… …
2497 if (ch >= '<' && ch <= '?') 2820 if (ch >= '<' && ch <= '?')
2498 { /* '<' '=' '>' '?' */ 2821 { /* '<' '=' '>' '?' */
2499 priv = ch; 2822 priv = ch;
2500 ch = cmd_getc (); 2823 ch = cmd_getc ();
2501 } 2824 }
2825
2502 /* read any numerical arguments */ 2826 /* read any numerical arguments */
2503 for (n = -1; ch < CSI_ICH; ) 2827 for (n = -1; ch < CSI_ICH; )
2504 { 2828 {
2505 if (isdigit (ch)) 2829 if (isdigit (ch))
2506 { 2830 {
… …
2513 { 2837 {
2514 if (nargs < ESC_ARGS) 2838 if (nargs < ESC_ARGS)
2515 arg[nargs++] = n; 2839 arg[nargs++] = n;
2516 n = -1; 2840 n = -1;
2517 } 2841 }
2518 else if (ch == '\b') 2842 else if (IS_CONTROL (ch))
2519 {
2520 scr_backspace ();
2521 }
2522 else if (ch == C0_ESC)
2523 {
2524 process_escape_seq ();
2525 return;
2526 }
2527 else if (ch < ' ')
2528 {
2529 process_nonprinting (ch); 2843 process_nonprinting (ch);
2530 } 2844
2531 ch = cmd_getc (); 2845 ch = cmd_getc ();
2532 } 2846 }
2533 2847
2534 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
2535 return; 2849 return;
… …
2693 tt_printf ("\033[0n"); 3007 tt_printf ("\033[0n");
2694 break; 3008 break;
2695 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
2696 scr_report_position (); 3010 scr_report_position ();
2697 break; 3011 break;
2698#if defined (ENABLE_DISPLAY_ANSWER)
2699 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure)
2700 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2701 break; 3015 break;
2702#endif
2703 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2705 break; 3018 break;
2706 } 3019 }
2707 break; 3020 break;
2708 3021
2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3022 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2777#endif 3090#endif
2778 3091
2779 case CSI_78: /* DECREQTPARM */ 3092 case CSI_78: /* DECREQTPARM */
2780 if (arg[0] == 0 || arg[0] == 1) 3093 if (arg[0] == 0 || arg[0] == 1)
2781 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);
2782 /* FALLTHROUGH */ 3095 break;
2783 3096
2784 default: 3097 default:
2785 break; 3098 break;
2786 } 3099 }
2787} 3100}
… …
2790#ifndef NO_FRILLS 3103#ifndef NO_FRILLS
2791/* ARGSUSED */ 3104/* ARGSUSED */
2792void 3105void
2793rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3106rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2794{ 3107{
2795 int x, y; 3108 int x, y;
2796#if 0
2797 char *s;
2798#endif
2799 XWindowAttributes wattr; 3109 XWindowAttributes wattr;
2800 Window wdummy; 3110 Window wdummy;
2801 3111
2802 if (nargs == 0) 3112 if (nargs == 0)
2803 return; 3113 return;
3114
2804 switch (args[0]) 3115 switch (args[0])
2805 { 3116 {
2806 /* 3117 /*
2807 * commands 3118 * commands
2808 */ 3119 */
2809 case 1: /* deiconify window */ 3120 case 1: /* deiconify window */
2810 XMapWindow (display->display, TermWin.parent[0]); 3121 XMapWindow (display->display, TermWin.parent[0]);
2811 break; 3122 break;
2812 case 2: /* iconify window */ 3123 case 2: /* iconify window */
2813 XIconifyWindow (display->display, TermWin.parent[0], 3124 XIconifyWindow (display->display, TermWin.parent[0],
… …
2830 break; 3141 break;
2831 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2833 (unsigned int) (args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * TermWin.fheight));
2834 break; 3145 break;
3146
3147 //case 9: NYI, TODO, restore maximized window or maximize window
2835 default: 3148 default:
2836 if (args[0] >= 24) /* set height (chars) */ 3149 if (args[0] >= 24) /* set height (chars) */
2837 set_widthheight ((unsigned int)TermWin.width, 3150 set_widthheight ((unsigned int)TermWin.width,
2838 (unsigned int) (args[1] * TermWin.fheight)); 3151 (unsigned int) (args[1] * TermWin.fheight));
2839 break; 3152 break;
3153
3154
2840 /* 3155 /*
2841 * reports - some output format copied from XTerm 3156 * reports - some output format copied from XTerm
2842 */ 3157 */
2843 case 11: /* report window state */ 3158 case 11: /* report window state */
2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2846 break; 3161 break;
2847 case 13: /* report window position */ 3162 case 13: /* report window position */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2850 -wattr.border_width, -wattr.border_width, 3165 -wattr.border_width, -wattr.border_width,
2851 &x, &y, &wdummy); 3166 &x, &y, &wdummy);
2852 tt_printf ("\033[3;%d;%dt", x, y); 3167 tt_printf ("\033[3;%d;%dt", x, y);
2853 break; 3168 break;
2854 case 14: /* report window size (pixels) */ 3169 case 14: /* report window size (pixels) */
2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2857 break; 3172 break;
2858 case 18: /* report window size (chars) */ 3173 case 18: /* report text area size (chars) */
2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2860 break; 3175 break;
2861#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;
2862 case 20: /* report icon label */ 3179 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 {
3182 char *s;
2863 XGetIconName (display->display, TermWin.parent[0], &s); 3183 XGetIconName (display->display, TermWin.parent[0], &s);
2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3185 }
2865 break; 3186 break;
2866 case 21: /* report window title */ 3187 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 {
3190 char *s;
2867 XFetchName (display->display, TermWin.parent[0], &s); 3191 XFetchName (display->display, TermWin.parent[0], &s);
2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3193 }
2869 break; 3194 break;
2870#endif
2871
2872 } 3195 }
2873} 3196}
2874#endif 3197#endif
2875 3198
2876/*----------------------------------------------------------------------*/ 3199/*----------------------------------------------------------------------*/
2877/* 3200/*
2878 * get input up until STRING TERMINATOR (or BEL) 3201 * get input up until STRING TERMINATOR (or BEL)
2879 * ends_how is terminator used. returned input must be free ()d 3202 * ends_how is terminator used. returned input must be free()'d
2880 */ 3203 */
2881unsigned char * 3204unsigned char *
2882rxvt_term::get_to_st (unsigned char *ends_how) 3205rxvt_term::get_to_st (unicode_t &ends_how)
2883{ 3206{
2884 int seen_esc = 0; /* seen escape? */ 3207 unicode_t prev = 0, ch;
2885 unsigned int n = 0; 3208 unsigned int n = 0;
2886 unsigned char *s; 3209 unsigned char *s;
2887 unsigned char ch, string[STRING_MAX]; 3210 unsigned char string[STRING_MAX];
2888 3211
2889 for (; (ch = cmd_getc ());) 3212 while ((ch = cmd_getc ()) != NOCHAR)
2890 { 3213 {
2891 if (ch == C0_BEL
2892 || ch == CHAR_ST
2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2894 break;
2895 if (ch == C0_ESC) 3214 if (prev == C0_ESC)
2896 {
2897 seen_esc = 1;
2898 continue;
2899 } 3215 {
2900 else if (ch == '\t') 3216 if (ch == 0x5c) /* 7bit ST */
2901 ch = ' '; /* translate '\t' to space */ 3217 break;
2902 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)
2903 return NULL; /* other control character - exit */ 3224 return NULL; /* other control character - exit */
3225
2904 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
2905 string[n++] = ch; 3236 string[n++] = prev = ch;
2906 seen_esc = 0;
2907 } 3237 }
3238
2908 string[n++] = '\0'; 3239 string[n++] = '\0';
3240
2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2910 return NULL; 3242 return NULL;
3243
2911 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3244 ends_how = (ch == 0x5c ? C0_ESC : ch);
2912 STRNCPY (s, string, n); 3245 STRNCPY (s, string, n);
2913 return s; 3246 return s;
2914} 3247}
2915 3248
2916/*----------------------------------------------------------------------*/ 3249/*----------------------------------------------------------------------*/
… …
2918 * 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)'
2919 */ 3252 */
2920void 3253void
2921rxvt_term::process_dcs_seq () 3254rxvt_term::process_dcs_seq ()
2922{ 3255{
2923 unsigned char eh, *s; 3256 unsigned char *s;
3257 unicode_t eh;
3258
2924 /* 3259 /*
2925 * Not handled yet 3260 * Not handled yet
2926 */ 3261 */
2927 s = get_to_st (&eh); 3262 s = get_to_st (eh);
2928 if (s) 3263 if (s)
2929 free (s); 3264 free (s);
3265
2930 return; 3266 return;
2931} 3267}
2932 3268
2933/*----------------------------------------------------------------------*/ 3269/*----------------------------------------------------------------------*/
2934/* 3270/*
2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2936 */ 3272 */
2937void 3273void
2938rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
2939{ 3275{
2940 unsigned char ch, eh, *s; 3276 unicode_t ch, eh;
2941 int arg; 3277 int arg;
2942 3278
2943 ch = cmd_getc (); 3279 ch = cmd_getc ();
2944 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2945 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
2946 3282
2947 if (ch == ';') 3283 if (ch == ';')
2948 { 3284 {
2949 s = get_to_st (&eh); 3285 unsigned char *s = get_to_st (eh);
3286
2950 if (s) 3287 if (s)
2951 { 3288 {
2952 /*
2953 * rxvt_menubar_dispatch () violates the constness of the string,
2954 * so do it here
2955 */
2956 if (arg == XTerm_Menu)
2957#if 0 /* XXX: currently disabled due to security concerns */
2958 menubar_dispatch ((char *)s);
2959#else
2960 (void)0;
2961#endif
2962 else
2963 xterm_seq (arg, (char *)s, eh); 3289 process_xterm_seq (arg, (char *)s, eh);
2964 free (s); 3290 free (s);
2965 } 3291 }
2966 } 3292 }
2967} 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
2968/* 3311/*
2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2970 * 0 = change iconName/title 3313 * 0 = change iconName/title
2971 * 1 = change iconName 3314 * 1 = change iconName
2972 * 2 = change title 3315 * 2 = change title
2973 * 4 = change color 3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
2974 * 12 = change text color 3319 * 12 = change text color
2975 * 13 = change mouse foreground color 3320 * 13 = change mouse foreground color
2976 * 17 = change highlight character colour 3321 * 17 = change highlight character colour
2977 * 18 = change bold character color 3322 * 18 = change bold character color
2978 * 19 = change underlined character color 3323 * 19 = change underlined character color
2979 * 46 = change logfile (not implemented) 3324 * 46 = change logfile (not implemented)
2980 * 50 = change font 3325 * 50 = change font
2981 * 3326 *
2982 * rxvt extensions: 3327 * rxvt extensions:
2983 * 9 = change locale (NYI)
2984 * 10 = menu (may change in future)
2985 * 20 = bg pixmap 3328 * 20 = bg pixmap
2986 * 39 = change default fg color 3329 * 39 = change default fg color
2987 * 49 = change default bg color 3330 * 49 = change default bg color
2988 * 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
2989 */ 3335 */
2990void 3336void
2991rxvt_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)
2992{ 3338{
2993 int changed = 0; 3339 int changed = 0;
2994 int color; 3340 int color;
2995 char *buf, *name; 3341 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1];
2996 3343
2997 assert (str != NULL); 3344 assert (str != NULL);
2998 switch (op) 3345 switch (op)
2999 { 3346 {
3000 case XTerm_name: 3347 case XTerm_name:
3001 set_title (str); 3348 set_title (str);
3002 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
3003 case XTerm_iconName: 3350 case XTerm_iconName:
3004 set_iconName (str); 3351 set_icon_name (str);
3005 break; 3352 break;
3006 case XTerm_title: 3353 case XTerm_title:
3007 set_title (str); 3354 set_title (str);
3008 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
3009 case XTerm_Color: 3398 case XTerm_Color:
3010 for (buf = (char *)str; buf && *buf;) 3399 for (buf = (char *)str; buf && *buf;)
3011 { 3400 {
3012 if ((name = STRCHR (buf, ';')) == NULL) 3401 if ((name = STRCHR (buf, ';')) == NULL)
3013 break; 3402 break;
3403
3014 *name++ = '\0'; 3404 *name++ = '\0';
3015 color = atoi (buf); 3405 color = atoi (buf);
3406
3016 if (color < 0 || color >= TOTAL_COLORS) 3407 if (color < 0 || color >= TOTAL_COLORS)
3017 break; 3408 break;
3409
3018 if ((buf = STRCHR (name, ';')) != NULL) 3410 if ((buf = STRCHR (name, ';')) != NULL)
3019 *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
3020 set_window_color (color + minCOLOR, name); 3423 set_window_color (color + minCOLOR, name);
3021 } 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);
3022 break; 3431 break;
3023#ifndef NO_CURSORCOLOR 3432#ifndef NO_CURSORCOLOR
3024 case XTerm_Color_cursor: 3433 case XTerm_Color_cursor:
3025 set_window_color (Color_cursor, str); 3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3026 break; 3435 break;
3027#endif 3436#endif
3028 case XTerm_Color_pointer: 3437 case XTerm_Color_pointer_fg:
3029 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);
3030 break; 3442 break;
3031#ifndef NO_BOLD_UNDERLINE_REVERSE 3443#ifndef NO_BOLD_UNDERLINE_REVERSE
3032 case XTerm_Color_BD: 3444 case XTerm_Color_BD:
3033 set_window_color (Color_BD, str); 3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3034 break; 3446 break;
3035 case XTerm_Color_UL: 3447 case XTerm_Color_UL:
3036 set_window_color (Color_UL, str); 3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3037 break; 3449 break;
3038 case XTerm_Color_RV: 3450 case XTerm_Color_RV:
3039 set_window_color (Color_RV, str); 3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3040 break; 3452 break;
3041#endif 3453#endif
3042 3454
3043 case XTerm_Menu:
3044 /*
3045 * rxvt_menubar_dispatch () violates the constness of the string,
3046 * so DON'T do it here
3047 */
3048 break;
3049 case XTerm_Pixmap: 3455 case XTerm_Pixmap:
3050 if (*str != ';') 3456 if (*str != ';')
3051 { 3457 {
3052#if XPM_BACKGROUND 3458#if XPM_BACKGROUND
3053 scale_pixmap (""); /* reset to default scaling */ 3459 scale_pixmap (""); /* reset to default scaling */
… …
3076 set_window_color (Color_fg, str); 3482 set_window_color (Color_fg, str);
3077 break; 3483 break;
3078 case XTerm_restoreBG: 3484 case XTerm_restoreBG:
3079 set_window_color (Color_bg, str); 3485 set_window_color (Color_bg, str);
3080 break; 3486 break;
3487
3081 case XTerm_logfile: 3488 case XTerm_logfile:
3489 // TODO, when secure mode?
3082 break; 3490 break;
3491
3083 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
3084 change_font (str); 3503 change_font (str);
3085 break; 3504 break;
3505
3506#ifndef NO_FRILLS
3086 case XTerm_locale: 3507 case XTerm_locale:
3087 if (str[0] == '?' && !str[1]) 3508 if (query)
3088 tt_printf ("%-.250s\n", locale); 3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3089 else 3513 else
3090 { 3514 {
3091 set_locale (str); 3515 set_locale (str);
3516# ifdef USE_XIM
3092 im_cb (); 3517 im_cb ();
3518# endif
3093 } 3519 }
3094 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;
3537#endif
3095#if 0 3538#if 0
3096 case XTerm_dumpscreen: /* no error notices */ 3539 case XTerm_dumpscreen: /* no error notices */
3097 { 3540 {
3098 int fd; 3541 int fd;
3099 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)
3100 { 3543 {
3101 scr_dump (fd); 3544 scr_dump (fd);
3102 close (fd); 3545 close (fd);
3103 } 3546 }
3104 } 3547 }
3105 break; 3548 break;
3106#endif 3549#endif
3107
3108 } 3550 }
3109} 3551}
3110/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
3111 3553
3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3554/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3120 * so no need for fancy checking 3562 * so no need for fancy checking
3121 */ 3563 */
3122int 3564int
3123rxvt_term::privcases (int mode, unsigned long bit) 3565rxvt_term::privcases (int mode, unsigned long bit)
3124{ 3566{
3125 int state; 3567 int state;
3126 3568
3127 if (mode == 's') 3569 if (mode == 's')
3128 { 3570 {
3129 SavedModes |= (PrivateModes & bit); 3571 SavedModes |= (PrivateModes & bit);
3130 return -1; 3572 return -1;
… …
3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3136 else 3578 else
3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3138 PrivMode (state, bit); 3580 PrivMode (state, bit);
3139 } 3581 }
3582
3140 return state; 3583 return state;
3141} 3584}
3142 3585
3143/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3144void 3587void
3145rxvt_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)
3146{ 3589{
3147 unsigned int i, j; 3590 unsigned int i, j;
3148 int state; 3591 int state;
3592
3149 static const struct 3593 static const struct
3150 { 3594 {
3151 const int argval; 3595 const int argval;
3152 const unsigned long bit; 3596 const unsigned long bit;
3153 } 3597 }
3598
3154 argtopriv[] = { 3599 argtopriv[] = {
3155 { 1, PrivMode_aplCUR }, 3600 { 1, PrivMode_aplCUR },
3156 { 2, PrivMode_vt52 }, 3601 { 2, PrivMode_vt52 },
3157 { 3, PrivMode_132 }, 3602 { 3, PrivMode_132 },
3158 { 4, PrivMode_smoothScroll }, 3603 { 4, PrivMode_smoothScroll },
… …
3164 { menuBar_esc, PrivMode_menuBar }, 3609 { menuBar_esc, PrivMode_menuBar },
3165#endif 3610#endif
3166#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
3167 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
3168#endif 3613#endif
3614 // 18, 19 printing-related
3169 { 25, PrivMode_VisibleCursor }, 3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3170 { 35, PrivMode_ShiftKeys }, 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3171 { 40, PrivMode_132OK }, 3618 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI
3621 // 46 start logging
3172 { 47, PrivMode_Screen }, 3622 { 47, PrivMode_Screen },
3173 { 66, PrivMode_aplKP }, 3623 { 66, PrivMode_aplKP },
3174#ifndef NO_BACKSPACE_KEY 3624#ifndef NO_BACKSPACE_KEY
3175 { 67, PrivMode_BackSpace }, 3625 { 67, PrivMode_BackSpace },
3176#endif 3626#endif
3177 { 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
3178 { 1010, PrivMode_TtyOutputInh }, 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3179 { 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
3180 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor
3181 { 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
3182 }; 3640 };
3183 3641
3184 if (nargs == 0) 3642 if (nargs == 0)
3185 return; 3643 return;
3186 3644
… …
3201 state = privcases (mode, argtopriv[j].bit); 3659 state = privcases (mode, argtopriv[j].bit);
3202 break; 3660 break;
3203 } 3661 }
3204 3662
3205 /* extra handling for values with state unkept */ 3663 /* extra handling for values with state unkept */
3206 if (state == -1)
3207 switch (arg[i]) 3664 switch (arg[i])
3208 { 3665 {
3209 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3667 if (Options & Opt_secondaryScreen)
3210 if (mode == 0) 3668 if (mode == 0)
3211 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3212 else if (mode == 1) 3670 else if (mode == 1)
3213 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
3214 /* FALLTHROUGH */
3215 default:
3216 continue; /* for (;i;) */
3217 }
3218
3219 /* extra handling for values with valid 0 or 1 state */
3220 switch (arg[i])
3221 {
3222 /* case 1: - application cursor keys */
3223 case 2: /* VT52 mode */
3224 /* oddball mode. should be set regardless of set/reset
3225 * parameter. Return from VT52 mode with an ESC < from
3226 * within VT52 mode
3227 */
3228 PrivMode (1, PrivMode_vt52);
3229 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;
3230 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3231 if (PrivateModes & PrivMode_132OK) 3688 if (PrivateModes & PrivMode_132OK)
3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3233 (unsigned int)TermWin.height);
3234 break; 3690 break;
3235 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3236 if (state) 3692 if (state)
3237 Options &= ~Opt_jumpScroll; 3693 Options &= ~Opt_jumpScroll;
3238 else 3694 else
3239 Options |= Opt_jumpScroll; 3695 Options |= Opt_jumpScroll;
3240 break; 3696 break;
3241 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3242 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
3243 break; 3699 break;
3244 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
3245 scr_relative_origin (state); 3701 scr_relative_origin (state);
3246 break; 3702 break;
3247 case 7: /* autowrap */ 3703 case 7: /* autowrap */
3248 scr_autowrap (state); 3704 scr_autowrap (state);
3249 break; 3705 break;
3250 /* 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 */
3251 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3252 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3253 PrivateModes &= ~ (PrivMode_MouseX11); 3709 PrivateModes &= ~PrivMode_MouseX11;
3254 break; 3710 break;
3255#ifdef menuBar_esc 3711#ifdef menuBar_esc
3256 case menuBar_esc: 3712 case menuBar_esc:
3257#ifdef MENUBAR 3713#ifdef MENUBAR
3258 map_menuBar (state); 3714 map_menuBar (state);
3259#endif 3715#endif
3260 break; 3716 break;
3261#endif 3717#endif
3262#ifdef scrollBar_esc 3718#ifdef scrollBar_esc
3263 case scrollBar_esc: 3719 case scrollBar_esc:
3264 if (scrollbar_mapping (state)) 3720 if (scrollbar_mapping (state))
3265 { 3721 {
3266 resize_all_windows (0, 0, 0); 3722 resize_all_windows (0, 0, 0);
3267 scr_touch (true); 3723 scr_touch (true);
3268 } 3724 }
3269 break; 3725 break;
3270#endif 3726#endif
3271 case 25: /* visible/invisible cursor */ 3727 case 25: /* visible/invisible cursor */
3272 scr_cursor_visible (state); 3728 scr_cursor_visible (state);
3273 break; 3729 break;
3274 /* case 35: - shift keys */ 3730 /* case 35: - shift keys */
3275 /* case 40: - 80 <--> 132 mode */ 3731 /* case 40: - 80 <--> 132 mode */
3276 case 47: /* secondary screen */ 3732 case 47: /* secondary screen */
3277 scr_change_screen (state); 3733 scr_change_screen (state);
3278 break; 3734 break;
3279 /* case 66: - application key pad */ 3735 /* case 66: - application key pad */
3280 /* case 67: - backspace key */ 3736 /* case 67: - backspace key */
3281 case 1000: /* X11 mouse reporting */ 3737 case 1000: /* X11 mouse reporting */
3282 if (state) /* orthogonal */ 3738 if (state) /* orthogonal */
3283 PrivateModes &= ~ (PrivMode_MouseX10); 3739 PrivateModes &= ~PrivMode_MouseX10;
3284 break; 3740 break;
3285#if 0 3741#if 0
3286 case 1001: 3742 case 1001:
3287 break; /* X11 mouse highlighting */ 3743 break; /* X11 mouse highlighting */
3288#endif 3744#endif
3289 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3290 if (state) 3746 if (state)
3291 Options &= ~Opt_scrollTtyOutput; 3747 Options &= ~Opt_scrollTtyOutput;
3292 else 3748 else
3293 Options |= Opt_scrollTtyOutput; 3749 Options |= Opt_scrollTtyOutput;
3294 break; 3750 break;
3295 case 1011: /* scroll to bottom on key press */ 3751 case 1011: /* scroll to bottom on key press */
3296 if (state) 3752 if (state)
3297 Options |= Opt_scrollTtyKeypress; 3753 Options |= Opt_scrollTtyKeypress;
3298 else 3754 else
3299 Options &= ~Opt_scrollTtyKeypress; 3755 Options &= ~Opt_scrollTtyKeypress;
3300 break; 3756 break;
3301 case 1047: /* secondary screen w/ clearing */ 3757 case 1047: /* secondary screen w/ clearing last */
3302 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3758 if (Options & Opt_secondaryScreen)
3303 if (current_screen != PRIMARY) 3759 if (current_screen != PRIMARY)
3304 scr_erase_screen (2); 3760 scr_erase_screen (2);
3305 scr_change_screen (state); 3761 scr_change_screen (state);
3306 /* FALLTHROUGH */
3307 default:
3308 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;
3309 } 3771 }
3310 } 3772 }
3311} 3773}
3312/*}}} */ 3774/*}}} */
3313 3775
3314/*{{{ process sgr sequences */ 3776/*{{{ process sgr sequences */
3315void 3777void
3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3778rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3317{ 3779{
3318 unsigned int i; 3780 unsigned int i;
3319 short rendset; 3781 short rendset;
3320 int rendstyle; 3782 int rendstyle;
3321 3783
3322 if (nargs == 0) 3784 if (nargs == 0)
3323 { 3785 {
3324 scr_rendition (0, ~RS_None); 3786 scr_rendition (0, ~RS_None);
3325 return; 3787 return;
3326 } 3788 }
3789
3327 for (i = 0; i < nargs; i++) 3790 for (i = 0; i < nargs; i++)
3328 { 3791 {
3329 rendset = -1; 3792 rendset = -1;
3330 switch (arg[i]) 3793 switch (arg[i])
3331 { 3794 {
… …
3333 rendset = 0, rendstyle = ~RS_None; 3796 rendset = 0, rendstyle = ~RS_None;
3334 break; 3797 break;
3335 case 1: 3798 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3799 rendset = 1, rendstyle = RS_Bold;
3337 break; 3800 break;
3801 //case 2: // faint or second colour
3338 case 4: 3802 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3803 rendset = 1, rendstyle = RS_Uline;
3340 break; 3804 break;
3341 case 5: 3805 case 5: // slowly blinking
3806 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3807 rendset = 1, rendstyle = RS_Blink;
3343 break; 3808 break;
3809 //case 6: // scoansi light background
3344 case 7: 3810 case 7:
3345 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;
3346 break; 3825 break;
3347 case 22: 3826 case 22:
3348 rendset = 0, rendstyle = RS_Bold; 3827 rendset = 0, rendstyle = RS_Bold;
3349 break; 3828 break;
3829 //case 23: disable italic
3350 case 24: 3830 case 24:
3351 rendset = 0, rendstyle = RS_Uline; 3831 rendset = 0, rendstyle = RS_Uline;
3352 break; 3832 break;
3353 case 25: 3833 case 25:
3354 rendset = 0, rendstyle = RS_Blink; 3834 rendset = 0, rendstyle = RS_Blink;
3355 break; 3835 break;
3356 case 27: 3836 case 27:
3357 rendset = 0, rendstyle = RS_RVid; 3837 rendset = 0, rendstyle = RS_RVid;
3358 break; 3838 break;
3839 //case 28: // visible. NYI
3840 //case 29: // not crossed-out
3359 } 3841 }
3842
3360 if (rendset != -1) 3843 if (rendset != -1)
3361 { 3844 {
3362 scr_rendition (rendset, rendstyle); 3845 scr_rendition (rendset, rendstyle);
3363 continue; /* for (;i;) */ 3846 continue; /* for (;i;) */
3364 } 3847 }
… …
3371 case 33: 3854 case 33:
3372 case 34: 3855 case 34:
3373 case 35: 3856 case 35:
3374 case 36: 3857 case 36:
3375 case 37: 3858 case 37:
3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3377 Color_fg);
3378 break; 3860 break;
3379#ifdef TTY_256COLOR 3861#ifdef TTY_256COLOR
3380 case 38: 3862 case 38:
3381 if (nargs > i + 2 && arg[i + 1] == 5) 3863 if (nargs > i + 2 && arg[i + 1] == 5)
3382 { 3864 {
3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3384 Color_fg);
3385 i += 2; 3866 i += 2;
3386 } 3867 }
3387 break; 3868 break;
3388#endif 3869#endif
3389 case 39: /* default fg */ 3870 case 39: /* default fg */
… …
3396 case 43: 3877 case 43:
3397 case 44: 3878 case 44:
3398 case 45: 3879 case 45:
3399 case 46: 3880 case 46:
3400 case 47: 3881 case 47:
3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3402 Color_bg);
3403 break; 3883 break;
3404#ifdef TTY_256COLOR 3884#ifdef TTY_256COLOR
3405 case 48: 3885 case 48:
3406 if (nargs > i + 2 && arg[i + 1] == 5) 3886 if (nargs > i + 2 && arg[i + 1] == 5)
3407 { 3887 {
3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3409 Color_bg);
3410 i += 2; 3889 i += 2;
3411 } 3890 }
3412 break; 3891 break;
3413#endif 3892#endif
3414 case 49: /* default bg */ 3893 case 49: /* default bg */
… …
3443 } 3922 }
3444 } 3923 }
3445} 3924}
3446/*}}} */ 3925/*}}} */
3447 3926
3448/*{{{ process Rob Nation's own graphics mode sequences */ 3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3449void 3928void
3450rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
3451{ 3930{
3452 unsigned char ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
3453 3932
3454 if (cmd == 'Q') 3933 if (cmd == 'Q')
3455 { /* query graphics */ 3934 { /* query graphics */
3456 tt_printf ("\033G0\n"); /* no graphics */ 3935 tt_printf ("\033G0\n"); /* no graphics */
3457 return; 3936 return;

Diff Legend

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