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.54 by pcg, Sun Feb 22 12:58:02 2004 UTC vs.
Revision 1.107 by root, Sat Jul 31 00:01:12 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
… …
110 SET_LOCALE (locale); 117 SET_LOCALE (locale);
111 118
112 if (status_return == XLookupChars 119 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 120 || status_return == XLookupBoth)
114 { 121 {
122 /* make sure the user can type ctrl-@, i.e. NUL */
123 if (len == 1 && *wkbuf == 0)
124 {
125 kbuf[0] = 0;
126 len = 1;
127 }
128 else
129 {
115 wkbuf[len] = 0; 130 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 131 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 132 if (len < 0)
118 len = 0; 133 len = 0;
134 }
119 } 135 }
120 else 136 else
121 len = 0; 137 len = 0;
122 } 138 }
123 139
… …
131 valid_keysym = keysym != NoSymbol; 147 valid_keysym = keysym != NoSymbol;
132 } 148 }
133 149
134 if (valid_keysym) 150 if (valid_keysym)
135 { 151 {
136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (FONT_DN);
152 return;
153 }
154 }
155#endif
156
157 if (TermWin.saveLines) 152 if (TermWin.saveLines)
158 { 153 {
159#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 155 if (!ctrl && !meta)
161 { 156 {
… …
252#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
254 { 249 {
255 unsigned int l; 250 unsigned int l;
256 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
257 const unsigned char ch = C0_ESC;
258 252
259 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
260 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
261 255
262 /* escape prefix */ 256 /* escape prefix */
263 if (meta) 257 if (meta
264# ifdef META8_OPTION 258# ifdef META8_OPTION
265 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
266# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
267 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
268 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
269 return; 268 return;
270 } 269 }
271 else 270 else
272#endif 271#endif
… …
282 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
283 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
284 } 283 }
285 else 284 else
286 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
287# ifdef MULTICHAR_SET
288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
289 {
290 int col, row;
291
292 newlen = STRLEN (kbuf);
293 col = screen.cur.col - 1;
294 row = screen.cur.row + TermWin.saveLines;
295 if (IS_MULTI2 (screen.rend[row][col]))
296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
297 }
298# endif
299 break; 286 break;
300#endif 287#endif
301#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
302 case XK_Delete: 289 case XK_Delete:
303 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
304# ifdef MULTICHAR_SET
305 if (Options & Opt_mc_hack)
306 {
307 int col, row;
308
309 newlen = STRLEN (kbuf);
310 col = screen.cur.col;
311 row = screen.cur.row + TermWin.saveLines;
312 if (IS_MULTI1 (screen.rend[row][col]))
313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
314 }
315# endif
316 break; 291 break;
317#endif 292#endif
318 case XK_Tab: 293 case XK_Tab:
319 if (shft) 294 if (shft)
320 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
362 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
363 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
364 } 339 }
365 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
366 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
367#ifdef MULTICHAR_SET
368 //TODO: ??
369 if (Options & Opt_mc_hack)
370 {
371 int col, row, m;
372
373 col = screen.cur.col;
374 row = screen.cur.row + TermWin.saveLines;
375 m = 0;
376 if (keysym == XK_Right
377 && IS_MULTI1 (screen.rend[row][col]))
378 m = 1;
379 else if (keysym == XK_Left)
380 {
381 if (col > 0)
382 {
383 if (IS_MULTI2 (screen.rend[row][col - 1]))
384 m = 1;
385 }
386 else if (screen.cur.row > 0)
387 {
388 col = screen.tlen[--row];
389 if (col == -1)
390 col = TermWin.ncol - 1;
391 else
392 col--;
393 if (col > 0
394 && IS_MULTI2 (screen.rend[row][col]))
395 m = 1;
396 }
397 }
398 if (m)
399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
400 }
401#endif
402 break; 342 break;
403 343
404#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
405# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
406 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
595 break; 535 break;
596 } 536 }
597 if (newlen) 537 if (newlen)
598 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
599 } 539 }
540
600 /* 541 /*
601 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
602 */ 543 */
603#ifdef META8_OPTION 544#ifdef META8_OPTION
604 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
619 { 560 {
620 unsigned char *ch; 561 unsigned char *ch;
621 562
622 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
623 *ch |= 0x80; 564 *ch |= 0x80;
565
624 meta = 0; 566 meta = 0;
625 } 567 }
626#endif 568#endif
627 /* nil */ ; 569 /* nil */ ;
628 } 570 }
… …
653 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
654 596
655 /* escape prefix */ 597 /* escape prefix */
656 if (meta 598 if (meta
657#ifdef META8_OPTION 599#ifdef META8_OPTION
658 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
659#endif 601#endif
660 ) 602 )
661 { 603 {
662 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
663
664 tt_write (&ch, 1); 605 tt_write (&ch, 1);
665 } 606 }
607
666#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
667 if (debug_key)
668 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
669 char *p; 610 unsigned char *p;
670 int i; 611 int i;
671 612
672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
673 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
675 fprintf (stderr, "'\n"); 616 fprintf (stderr, "'\n");
676 }
677#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
678 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
679} 619}
680/*}}} */ 620/*}}} */
681 621
… …
683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
684/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
685unsigned int 625unsigned int
686rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
687{ 627{
688 unsigned int n, s; 628 unsigned int n, s;
689 629
690 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
692 if (n > 0 && s < count) 633 if (n > 0 && s < count)
693 { 634 {
694 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
696 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
697 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
698 s += n; 639 s += n;
699 } 640 }
641
700 if (count > s) 642 if (count > s)
701 { 643 {
702 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
703 count = s; 645 count = s;
704 } 646 }
647
705 for (; count--;) 648 for (; count--;)
706 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
707 return 0; 653 return 0;
708} 654}
709#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
710 656
711void 657void
… …
726 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
727 scrollbar_show (1); 673 scrollbar_show (1);
728#ifdef USE_XIM 674#ifdef USE_XIM
729 IMSendSpot (); 675 IMSendSpot ();
730#endif 676#endif
731
732 } 677 }
733 678
734 display->flush (); 679 display->flush ();
735} 680}
736 681
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 710 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 711 }
767} 712}
768#endif 713#endif
769 714
715#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
716void
717rxvt_term::cont_scroll_cb (time_watcher &w)
718{
719 if ((scrollbar_isUp() || scrollbar_isDn()) &&
720 scr_page (scrollbar_isUp() ? UP : DN, 1))
721 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
725 }
726}
727#endif
728
729#ifdef SELECTION_SCROLLING
730void
731rxvt_term::sel_scroll_cb (time_watcher &w)
732{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
739 }
740}
741#endif
742
743#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
744void
745rxvt_term::slip_wheel_cb (time_watcher &w)
746{
747 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed))
750 {
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 }
755}
756#endif
757
770bool 758bool
771rxvt_term::pty_fill () 759rxvt_term::pty_fill ()
772{ 760{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 761 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762
763 if (CBUFSIZ == n)
764 {
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
766 n = 0;
767 }
774 768
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 769 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 770 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 771 cmdbuf_endp = cmdbuf_ptr + n;
778 772
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
780 774
781 if (n > 0) 775 if (n > 0)
782 { 776 {
783 cmdbuf_endp += n; 777 cmdbuf_endp += n;
784 return true; 778 return true;
785 } 779 }
786 else if (n < 0 && errno != EAGAIN) 780 else if (n < 0 && errno != EAGAIN)
787 destroy (); 781 destroy ();
788 782
789 return false; 783 return false;
790} 784}
791 785
792void 786void
793rxvt_term::pty_cb (io_watcher &w, short revents) 787rxvt_term::pty_cb (io_watcher &w, short revents)
… …
796 SET_LOCALE (locale); 790 SET_LOCALE (locale);
797 791
798 if (revents & EVENT_WRITE) 792 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 793 tt_write (0, 0);
800 else if (revents & EVENT_READ) 794 else if (revents & EVENT_READ)
801 {
802 bool flag = true;
803
804 // loop, but don't allow a single term to monopolize us 795 // loop, but don't allow a single term to monopolize us
805 // the number of loops is fully arbitrary, and thus wrong
806 while (flag && pty_fill ()) 796 while (pty_fill ())
807 { 797 if (cmd_parse ())
808 if (!seen_input)
809 {
810 seen_input = 1;
811 /* once we know the shell is running, send the screen size. Again! */
812 tt_winch ();
813 }
814
815 uint32_t ch = NOCHAR;
816
817 for (;;)
818 {
819 if (ch == NOCHAR)
820 ch = next_char ();
821
822 if (ch == NOCHAR) // TODO: improve
823 break; 798 break;
824
825 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
826 {
827 /* Read a text string from the input buffer */
828 uint32_t buf[BUFSIZ];
829 bool refreshnow = false;
830 int nlines = 0;
831 uint32_t *str = buf;
832
833 *str++ = ch;
834
835 for (;;)
836 {
837 ch = next_char ();
838
839 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
840 break;
841 else
842 {
843 *str++ = ch;
844
845 if (ch == '\n')
846 {
847 nlines++;
848 refresh_count++;
849
850 if (! (Options & Opt_jumpScroll)
851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
852 {
853 refreshnow = true;
854 flag = false;
855 ch = NOCHAR;
856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
865 }
866 }
867
868 if (str >= buf + BUFSIZ)
869 {
870 ch = NOCHAR;
871 break;
872 }
873 }
874 }
875
876 scr_add_lines (buf, nlines, str - buf);
877
878 /*
879 * If there have been a lot of new lines, then update the screen
880 * What the heck I'll cheat and only refresh less than every page-full.
881 * the number of pages between refreshes is refresh_limit, which
882 * is incremented here because we must be doing flat-out scrolling.
883 *
884 * refreshing should be correct for small scrolls, because of the
885 * time-out
886 */
887 if (refreshnow)
888 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++;
891
892 scr_refresh (refresh_type);
893 }
894
895 }
896 else
897 {
898 switch (ch)
899 {
900 default:
901 process_nonprinting (ch);
902 break;
903 case C0_ESC: /* escape char */
904 process_escape_seq ();
905 break;
906 /*case 0x9b: */ /* CSI */
907 /* process_csi_seq (); */
908 }
909
910 ch = NOCHAR;
911 }
912 }
913 }
914 }
915} 799}
916 800
917// read the next character, currently handles UTF-8 801void
918// will probably handle all sorts of other stuff in the future 802rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 803{
922 while (cmdbuf_ptr < cmdbuf_endp) 804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
923 { 805 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 806
927 wchar_t wc; 807#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 808 hidden_pointer = 0;
929 809
930 if (len == (size_t)-2) 810 if (Options & Opt_pointerBlank)
931 return NOCHAR; 811 pointer_ev.start (NOW + pointerBlankDelay);
932 812#endif
933 if (len == (size_t)-1)
934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
935
936 // assume wchar == unicode
937 cmdbuf_ptr += len;
938 return wc;
939 }
940
941 return NOCHAR;
942}
943
944/* rxvt_cmd_getc () - Return next input character */
945/*
946 * Return the next input character after first passing any keyboard input
947 * to the command.
948 */
949uint32_t
950rxvt_term::cmd_getc ()
951{
952 for (;;)
953 {
954 uint32_t c = next_char ();
955 if (c != NOCHAR)
956 return c;
957
958 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (cmd_fd, F_SETFL, 0);
961 pty_fill ();
962 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964} 813}
965 814
966#ifdef POINTER_BLANK 815#ifdef POINTER_BLANK
967void 816void
968rxvt_term::pointer_unblank ()
969{
970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
971 recolour_cursor ();
972
973 hidden_pointer = 0;
974
975 if (Options & Opt_pointerBlank)
976 pointer_ev.start (NOW + pointerBlankDelay);
977}
978
979void
980rxvt_term::pointer_blank () 817rxvt_term::pointer_blank ()
981{ 818{
982 if (! (Options & Opt_pointerBlank)) 819 if (! (Options & Opt_pointerBlank))
983 return; 820 return;
984 821
… …
997 pointer_blank (); 834 pointer_blank ();
998} 835}
999#endif 836#endif
1000 837
1001void 838void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 839rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 840{
1004 int button_number, key_state = 0; 841 int button_number, key_state = 0;
1005 int x, y; 842 int x, y;
1006 843
1007 x = ev.x; 844 x = ev.x;
1008 y = ev.y; 845 y = ev.y;
1009 pixel_position (&x, &y); 846 pixel_position (&x, &y);
1010 847
… …
1179 break; 1016 break;
1180 1017
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease: 1019 case KeyRelease:
1183 { 1020 {
1184 if (! (ev.xkey.state & ControlMask)) 1021 if (!(ev.xkey.state & ControlMask))
1185 mouse_slip_wheel_speed = 0; 1022 slip_wheel_ev.stop ();
1186 else 1023 else
1187 { 1024 {
1188 KeySym ks; 1025 KeySym ks;
1189 1026
1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1191 if (ks == XK_Control_L || ks == XK_Control_R) 1028 if (ks == XK_Control_L || ks == XK_Control_R)
1192 mouse_slip_wheel_speed = 0; 1029 mouse_slip_wheel_speed = 0;
1193 } 1030 }
… …
1213 && (ev.xclient.data.l[0] == DndFile 1050 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1051 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1052 || ev.xclient.data.l[0] == DndLink))
1216 { 1053 {
1217 /* Get Dnd data */ 1054 /* Get Dnd data */
1218 Atom ActualType; 1055 Atom ActualType;
1219 int ActualFormat; 1056 int ActualFormat;
1220 unsigned char *data; 1057 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1058 unsigned long Size, RemainingBytes;
1222 1059
1223 XGetWindowProperty (display->display, display->root, 1060 XGetWindowProperty (display->display, display->root,
1224 xa[XA_DNDSELECTION], 1061 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1062 0L, 1000000L,
1226 False, AnyPropertyType, 1063 False, AnyPropertyType,
… …
1229 &data); 1066 &data);
1230 XChangeProperty (display->display, display->root, 1067 XChangeProperty (display->display, display->root,
1231 XA_CUT_BUFFER0, XA_STRING, 1068 XA_CUT_BUFFER0, XA_STRING,
1232 8, PropModeReplace, 1069 8, PropModeReplace,
1233 data, STRLEN (data)); 1070 data, STRLEN (data));
1071 XFree (data);
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1072 selection_paste (display->root, XA_CUT_BUFFER0, True);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1236 } 1074 }
1237#endif /* OFFIX_DND */ 1075#endif /* OFFIX_DND */
1238 break; 1076 break;
… …
1277#endif 1115#endif
1278#ifdef CURSOR_BLINK 1116#ifdef CURSOR_BLINK
1279 if (Options & Opt_cursorBlink) 1117 if (Options & Opt_cursorBlink)
1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1281#endif 1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 {
1123 PixColors = PixColorsFocused;
1124 set_colorfgbg ();
1125 scr_clear ();
1126 scr_touch (true);
1127 }
1128#endif
1282 1129
1283 } 1130 }
1284 break; 1131 break;
1285 1132
1286 case FocusOut: 1133 case FocusOut:
… …
1294#endif 1141#endif
1295#ifdef CURSOR_BLINK 1142#ifdef CURSOR_BLINK
1296 if (Options & Opt_cursorBlink) 1143 if (Options & Opt_cursorBlink)
1297 cursor_blink_ev.stop (); 1144 cursor_blink_ev.stop ();
1298 hidden_cursor = 0; 1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1299#endif 1155#endif
1300 1156
1301 } 1157 }
1302 break; 1158 break;
1303 1159
… …
1331 check_our_parents (); 1187 check_our_parents ();
1332 if (am_transparent) 1188 if (am_transparent)
1333 want_full_refresh = 1; 1189 want_full_refresh = 1;
1334 } 1190 }
1335#endif 1191#endif
1336
1337 } 1192 }
1338 break; 1193 break;
1339 1194
1340 case SelectionClear: 1195 case SelectionClear:
1341 display->set_selection_owner (0); 1196 selection_clear ();
1342 break; 1197 break;
1343 1198
1344 case SelectionNotify: 1199 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1200 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1201 selection_paste (ev.xselection.requestor,
… …
1377 { 1232 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1233#ifdef NO_SLOW_LINK_SUPPORT
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1234 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1235 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1236#else
1382 // don't understand this, so commented it out 1237 // I don't understand this, so I changed it :)
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1238 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1239 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1240 //scr_expose (ev.xexpose.x, 0,
1386 // ev.xexpose.width, TermWin.height, False); 1241 // ev.xexpose.width, TermWin.height, False);
1387#endif 1242#endif
… …
1389 } 1244 }
1390 else 1245 else
1391 { 1246 {
1392 XEvent unused_event; 1247 XEvent unused_event;
1393 1248
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1395 Expose, 1250 ;
1396 &unused_event)) ;
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1398 GraphicsExpose, 1252 ;
1399 &unused_event)) ; 1253
1400 if (isScrollbarWindow (ev.xany.window)) 1254 if (isScrollbarWindow (ev.xany.window))
1401 { 1255 {
1402 scrollBar.setIdle (); 1256 scrollBar.setIdle ();
1403 scrollbar_show (0); 1257 scrollbar_show (0);
1404 } 1258 }
… …
1415 pointer_unblank (); 1269 pointer_unblank ();
1416#endif 1270#endif
1417#if MENUBAR 1271#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1272 if (isMenuBarWindow (ev.xany.window))
1419 { 1273 {
1420 menubar_control (& (ev.xbutton)); 1274 menubar_control (ev.xbutton);
1421 break; 1275 break;
1422 } 1276 }
1423#endif 1277#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1425 break; 1279 break;
… …
1447 if (ev.xbutton.y < TermWin.int_bwidth 1301 if (ev.xbutton.y < TermWin.int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1449 { 1303 {
1450 int dist; 1304 int dist;
1451 1305
1452 pending_scroll_selection=1;
1453
1454 /* don't clobber the current delay if we are 1306 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1307 * already in the middle of scrolling.
1456 */ 1308 */
1457 if (scroll_selection_delay<=0) 1309 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1311
1460 /* save the event params so we can highlight 1312 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1313 * the selection in the pending-scroll loop
1462 */ 1314 */
1463 selection_save_x=ev.xbutton.x; 1315 selection_save_x=ev.xbutton.x;
… …
1485 else 1337 else
1486 { 1338 {
1487 /* we are within the text window, so we 1339 /* we are within the text window, so we
1488 * shouldn't be scrolling 1340 * shouldn't be scrolling
1489 */ 1341 */
1490 pending_scroll_selection = 0; 1342 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop();
1491 } 1344 }
1492#endif 1345#endif
1493#ifdef MOUSE_THRESHOLD 1346#ifdef MOUSE_THRESHOLD
1494 1347
1495 } 1348 }
… …
1545 return; 1398 return;
1546 } 1399 }
1547 1400
1548 /* FALLTHROUGH */ 1401 /* FALLTHROUGH */
1549 case ReparentNotify: 1402 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1404 want_full_refresh = 1;
1553 break; 1405 break;
1554#endif 1406#endif
1555 } 1407 }
1556} 1408}
1557 1409
1558void 1410void
1559rxvt_term::button_press (const XButtonEvent &ev) 1411rxvt_term::button_press (XButtonEvent &ev)
1560{ 1412{
1561 int reportmode = 0, clickintime; 1413 int reportmode = 0, clickintime;
1562 1414
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate) 1416 if (!bypass_keystate)
… …
1713 upordown = 1; /* down */ 1565 upordown = 1; /* down */
1714 } 1566 }
1715 if (upordown) 1567 if (upordown)
1716 { 1568 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1569#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1570 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 1571#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 1572 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 1573 {
1722 if (upordown < 0) 1574 if (upordown < 0)
1723 scrollBar.setUp (); 1575 scrollBar.setUp ();
… …
1792 menubar_control (ev); 1644 menubar_control (ev);
1793#endif 1645#endif
1794} 1646}
1795 1647
1796void 1648void
1797rxvt_term::button_release (const XButtonEvent &ev) 1649rxvt_term::button_release (XButtonEvent &ev)
1798{ 1650{
1799 int reportmode = 0; 1651 int reportmode = 0;
1800 1652
1801 csrO = 0; /* reset csr Offset */ 1653 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 1654 if (!bypass_keystate)
… …
1810 refresh_type &= ~SMOOTH_REFRESH; 1662 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 1663#endif
1812 1664
1813 } 1665 }
1814#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 1667 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop();
1816#endif 1669#endif
1817 if (ev.window == TermWin.vt) 1670 if (ev.window == TermWin.vt)
1818 { 1671 {
1819 if (reportmode) 1672 if (reportmode)
1820 { 1673 {
… …
1862 case Button5: 1715 case Button5:
1863 { 1716 {
1864 int i; 1717 int i;
1865 page_dirn v; 1718 page_dirn v;
1866 1719
1867 v = (ev.button == Button4) ? UP : DN; 1720 v = ev.button == Button4 ? UP : DN;
1721
1868 if (ev.state & ShiftMask) 1722 if (ev.state & ShiftMask)
1869 i = 1; 1723 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 1724 else if (Options & Opt_mouseWheelScrollPage)
1871 i = TermWin.nrow - 1; 1725 i = TermWin.nrow - 1;
1872 else 1726 else
1873 i = 5; 1727 i = 5;
1728
1874# ifdef MOUSE_SLIP_WHEELING 1729# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 1730 if (ev.state & ControlMask)
1876 { 1731 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 1732 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1735
1736 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1738
1739 slip_wheel_ev.start ();
1879 } 1740 }
1741 else
1742 {
1880# endif 1743# endif
1881# ifdef JUMP_MOUSE_WHEEL 1744# ifdef JUMP_MOUSE_WHEEL
1882 scr_page (v, i);
1883 scr_refresh (SMOOTH_REFRESH);
1884 scrollbar_show (1);
1885# else
1886 while (i--)
1887 {
1888 scr_page (v, 1); 1745 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 1746 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 1747 scrollbar_show (1);
1748# else
1749 while (i--)
1750 {
1751 scr_page (v, 1);
1752 scr_refresh (SMOOTH_REFRESH);
1753 scrollbar_show (1);
1754 }
1755# endif
1756# ifdef MOUSE_SLIP_WHEELING
1891 } 1757 }
1892# endif 1758#endif
1893
1894 } 1759 }
1895 break; 1760 break;
1896#endif 1761#endif
1897
1898 } 1762 }
1899 } 1763 }
1900#ifdef MENUBAR 1764#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 1765 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 1766 menubar_control (ev);
1903#endif 1767#endif
1904} 1768}
1905 1769
1906
1907#ifdef TRANSPARENT 1770#ifdef TRANSPARENT
1771#if TINTING
1772/* shading taken from eterm-0.9.2 */
1773/* RGB 15 */
1774
1775static void
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1783 /* No saturation */
1784 for (y = h; --y >= 0;) {
1785 for (x = -w; x < 0; x++) {
1786 int r, g, b;
1787
1788 b = ((uint16_t *) ptr)[x];
1789 r = (b & 0x7c00) * rm;
1790 g = (b & 0x3e0) * gm;
1791 b = (b & 0x1f) * bm;
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1793 | ((g >> 8) & 0x3e0)
1794 | ((b >> 8) & 0x1f);
1795 }
1796 ptr += bpl;
1797 }
1798 } else {
1799 for (y = h; --y >= 0;) {
1800 for (x = -w; x < 0; x++) {
1801 int r, g, b;
1802
1803 b = ((uint16_t *) ptr)[x];
1804 r = (b & 0x7c00) * rm;
1805 g = (b & 0x3e0) * gm;
1806 b = (b & 0x1f) * bm;
1807 r |= (!(r >> 15) - 1);
1808 g |= (!(g >> 10) - 1);
1809 b |= (!(b >> 5) - 1);
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1811 | ((g >> 8) & 0x3e0)
1812 | ((b >> 8) & 0x1f);
1813 }
1814 ptr += bpl;
1815 }
1816 }
1817}
1818
1819/* RGB 16 */
1820static void
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1822{
1823 unsigned char *ptr;
1824 int x, y;
1825
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1828 /* No saturation */
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 }
1843 } else {
1844 for (y = h; --y >= 0;) {
1845 for (x = -w; x < 0; x++) {
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 }
1859 ptr += bpl;
1860 }
1861 }
1862}
1863
1864/* RGB 24 */
1865static void
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1867{
1868 unsigned char *ptr;
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 }
1896 } else {
1897 for (y = h; --y >= 0;) {
1898 for (x = -(w * 3); x < 0; x += 3) {
1899 int r, g, b;
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 }
1927 ptr += bpl;
1928 }
1929 }
1930}
1931
1932/* RGB 32 */
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002}
2003
2004#endif
2005
1908/* 2006/*
1909 * Check our parents are still who we think they are. 2007 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2008 * Do transparency updates if required
1911 */ 2009 */
1912int 2010int
1913rxvt_term::check_our_parents () 2011rxvt_term::check_our_parents ()
1914{ 2012{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2013 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2014 unsigned long nitems, bytes_after;
1917 Atom atype; 2015 Atom atype;
1918 unsigned char *prop = NULL; 2016 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2017 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2018 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2019 XWindowAttributes wattr, wrootattr;
1922 2020
1923 pchanged = 0; 2021 pchanged = 0;
1924 2022
1925 if (! (Options & Opt_transparent)) 2023 if (!(Options & Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2024 return pchanged; /* Don't try any more */
1927 2025
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2026 XGetWindowAttributes (display->display, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2027 rootdepth = wrootattr.depth;
1930 2028
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2030
1932 if (rootdepth != wattr.depth) 2031 if (rootdepth != wattr.depth)
1933 { 2032 {
1934 if (am_transparent) 2033 if (am_transparent)
1935 { 2034 {
1936 pchanged = 1; 2035 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2037 am_transparent = am_pixmap_trans = 0;
1940 } 2038 }
2039
1941 return pchanged; /* Don't try any more */ 2040 return pchanged; /* Don't try any more */
1942 } 2041 }
1943 2042
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2043 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2044 XSync (display->display, False);
… …
1947 /* 2046 /*
1948 * Make the frame window set by the window manager have 2047 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2048 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2049 * windows for each client, so we have to take care about that.
1951 */ 2050 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2051 i = (xa[XA_XROOTPMAPID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2054 &nitems, &bytes_after, &prop) == Success);
2055
1956 if (!i || prop == NULL) 2056 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success);
2061
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint])
1957 have_pixmap = 0; 2063 have_pixmap = 0;
1958 else 2064 else
1959 { 2065 {
1960 have_pixmap = 1; 2066 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2067 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2068 XFree (prop);
1963 } 2069 }
2070
1964 if (have_pixmap) 2071 if (have_pixmap)
1965 { 2072 {
1966 /* 2073 /*
1967 * Copy display->root pixmap transparency 2074 * Copy display->root pixmap transparency
1968 */ 2075 */
1969 int sx, sy, nx, ny; 2076 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2077 unsigned int nw, nh;
1971 Window cr; 2078 Window cr;
1972 XImage *image; 2079 XImage *image;
1973 GC gc; 2080 GC gc;
1974 XGCValues gcvalue; 2081 XGCValues gcvalue;
1975 2082
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2083 XTranslateCoordinates (display->display, TermWin.vt, display->root,
1977 0, 0, &sx, &sy, &cr); 2084 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2085 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2086 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2087 nx = ny = 0;
2088
1981 if (sx < 0) 2089 if (sx < 0)
1982 { 2090 {
1983 nw += sx; 2091 nw += sx;
1984 nx = -sx; 2092 nx = -sx;
1985 sx = 0; 2093 sx = 0;
1986 } 2094 }
2095
1987 if (sy < 0) 2096 if (sy < 0)
1988 { 2097 {
1989 nh += sy; 2098 nh += sy;
1990 ny = -sy; 2099 ny = -sy;
1991 sy = 0; 2100 sy = 0;
1992 } 2101 }
2102
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1995 allowedxerror = -1; 2105 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2107
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2109 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2110 allowedxerror = 0;
2111
2001 if (image == NULL) 2112 if (image == NULL)
2002 { 2113 {
2003 if (am_transparent && am_pixmap_trans) 2114 if (am_transparent && am_pixmap_trans)
2004 { 2115 {
2005 pchanged = 1; 2116 pchanged = 1;
… …
2007 { 2118 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2119 XFreePixmap (display->display, TermWin.pixmap);
2009 TermWin.pixmap = None; 2120 TermWin.pixmap = None;
2010 } 2121 }
2011 } 2122 }
2123
2012 am_pixmap_trans = 0; 2124 am_pixmap_trans = 0;
2013 } 2125 }
2014 else 2126 else
2015 { 2127 {
2016 if (TermWin.pixmap != None) 2128 if (TermWin.pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2129 XFreePixmap (display->display, TermWin.pixmap);
2130
2131#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint))
2133 {
2134 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade])
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm);
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2139
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 }
2151#endif
2152
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2154 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2157 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2158 XFreeGC (display->display, gc);
2027 XDestroyImage (image); 2159 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap);
2029 TermWin.pixmap); 2161
2030 if (!am_transparent || !am_pixmap_trans) 2162 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2163 pchanged = 1;
2164
2032 am_transparent = am_pixmap_trans = 1; 2165 am_transparent = am_pixmap_trans = 1;
2033 } 2166 }
2034 } 2167 }
2168
2035 if (!am_pixmap_trans) 2169 if (!am_pixmap_trans)
2036 { 2170 {
2037 unsigned int n; 2171 unsigned int n;
2038 /* 2172 /*
2039 * InheritPixmap transparency 2173 * InheritPixmap transparency
2040 */ 2174 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2177 {
2045 oldp = TermWin.parent[i]; 2178 oldp = TermWin.parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2179 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2180 &TermWin.parent[i], &list, &n);
2048 XFree (list); 2181 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183
2050 if (TermWin.parent[i] == display->root) 2184 if (TermWin.parent[i] == display->root)
2051 { 2185 {
2052 if (oldp != None) 2186 if (oldp != None)
2053 pchanged = 1; 2187 pchanged = 1;
2188
2054 break; 2189 break;
2055 } 2190 }
2191
2056 if (oldp != TermWin.parent[i]) 2192 if (oldp != TermWin.parent[i])
2057 pchanged = 1; 2193 pchanged = 1;
2058 } 2194 }
2195
2059 n = 0; 2196 n = 0;
2197
2060 if (pchanged) 2198 if (pchanged)
2061 { 2199 {
2062 for (; n < (unsigned int)i; n++) 2200 for (; n < (unsigned int)i; n++)
2063 { 2201 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2069 break; 2207 break;
2070 } 2208 }
2071 } 2209 }
2072 } 2210 }
2073 if (n > (int) (sizeof (TermWin.parent) 2211
2074 / sizeof (TermWin.parent[0]))) 2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2075 { 2213 {
2076 D_X ((stderr, "InheritPixmap Turning off")); 2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2078 PixColors[Color_fg]);
2079 XSetWindowBackground (display->display, TermWin.vt, 2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2080 PixColors[Color_bg]);
2081 am_transparent = 0; 2217 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2218 /* XXX: also turn off Opt_transparent? */
2083 } 2219 }
2084 else 2220 else
2085 { 2221 {
2222#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2223 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2224 * needed for fvwm2.2.2 (and before?) */
2088# ifdef HAVE_NANOSLEEP
2089 struct timespec rqt;
2090
2091 rqt.tv_sec = 1;
2092 rqt.tv_nsec = 0;
2093 nanosleep (&rqt, NULL);
2094# else
2095 sleep (1); 2225 sleep (1);
2096# endif 2226#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2228 for (n = 0; n < (unsigned int)i; n++)
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2100 ParentRelative); 2230
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2102 ParentRelative);
2103 am_transparent = 1; 2232 am_transparent = 1;
2104 } 2233 }
2234
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2236 TermWin.parent[i] = None;
2107 } 2237 }
2238
2108 return pchanged; 2239 return pchanged;
2109} 2240}
2110#endif 2241#endif
2111 2242
2112/*}}} */ 2243/*}}} */
2244
2245bool
2246rxvt_term::cmd_parse ()
2247{
2248 bool flag = false;
2249 unicode_t ch = NOCHAR;
2250 unsigned char *seq_begin; // remember start of esc-sequence here
2251
2252 for (;;)
2253 {
2254 if (ch == NOCHAR)
2255 {
2256 seq_begin = cmdbuf_ptr;
2257 ch = next_char ();
2258 }
2259
2260 if (ch == NOCHAR) // TODO: improve
2261 break;
2262
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 {
2265 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false;
2268 int nlines = 0;
2269 unicode_t *str = buf;
2270
2271 *str++ = ch;
2272
2273 for (;;)
2274 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break;
2280
2281 *str++ = ch;
2282
2283 if (ch == C0_LF)
2284 {
2285 nlines++;
2286 refresh_count++;
2287
2288 if (! (Options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2290 {
2291 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR;
2294 break;
2295 }
2296
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1)
2299 {
2300 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0;
2302 str = buf;
2303 }
2304 }
2305
2306 if (str >= buf + UBUFSIZ)
2307 {
2308 ch = NOCHAR;
2309 break;
2310 }
2311 }
2312
2313 scr_add_lines (buf, nlines, str - buf);
2314
2315 /*
2316 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */
2324 if (refreshnow)
2325 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++;
2328 else
2329 scr_refresh (refresh_type);
2330 }
2331
2332 }
2333 else
2334 {
2335 try
2336 {
2337 process_nonprinting (ch);
2338 }
2339 catch (const class out_of_input &o)
2340 {
2341 // we ran out of input, retry later
2342 cmdbuf_ptr = seq_begin;
2343 break;
2344 }
2345
2346 ch = NOCHAR;
2347 }
2348 }
2349
2350 return flag;
2351}
2352
2353// read the next octet
2354unicode_t
2355rxvt_term::next_octet ()
2356{
2357 return cmdbuf_ptr < cmdbuf_endp
2358 ? *cmdbuf_ptr++
2359 : NOCHAR;
2360}
2361
2362// read the next character
2363unicode_t
2364rxvt_term::next_char ()
2365{
2366 while (cmdbuf_ptr < cmdbuf_endp)
2367 {
2368 // assume 7-bit to be ascii ALWAYS
2369 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2370 return *cmdbuf_ptr++;
2371
2372 wchar_t wc;
2373 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2374
2375 if (len == (size_t)-2)
2376 {
2377 // the mbstate stores incomplete sequences. didn't know this :/
2378 cmdbuf_ptr = cmdbuf_endp;
2379 break;
2380 }
2381
2382 if (len == (size_t)-1)
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2384
2385 // assume wchar == unicode
2386 cmdbuf_ptr += len;
2387 return wc;
2388 }
2389
2390 return NOCHAR;
2391}
2392
2393/* rxvt_cmd_getc () - Return next input character */
2394/*
2395 * Return the next input character after first passing any keyboard input
2396 * to the command.
2397 */
2398unicode_t
2399rxvt_term::cmd_getc ()
2400{
2401 unicode_t c = next_char ();
2402
2403 if (c == NOCHAR)
2404 throw out_of_input;
2405
2406 return c;
2407}
2408
2409unicode_t
2410rxvt_term::cmd_get8 ()
2411{
2412 unicode_t c = next_octet ();
2413
2414 if (c == NOCHAR)
2415 throw out_of_input;
2416
2417 return c;
2418}
2113 2419
2114/*{{{ print pipe */ 2420/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2421/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2422#ifdef PRINTPIPE
2117FILE * 2423FILE *
2118rxvt_term::popen_printer () 2424rxvt_term::popen_printer ()
2119{ 2425{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2426 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2427
2122 if (stream == NULL) 2428 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2429 rxvt_warn ("can't open printer pipe, not printing.\n");
2430
2124 return stream; 2431 return stream;
2125} 2432}
2126 2433
2127int 2434int
2128rxvt_term::pclose_printer (FILE *stream) 2435rxvt_term::pclose_printer (FILE *stream)
2129{ 2436{
2130 fflush (stream); 2437 fflush (stream);
2131 /* pclose () reported not to work on SunOS 4.1.3 */
2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2133 /* pclose works provided SIGCHLD handler uses waitpid */
2134 return pclose (stream); /* return fclose (stream); */
2135# else
2136 return pclose (stream); 2438 return pclose (stream);
2137# endif
2138} 2439}
2139 2440
2140/* 2441/*
2141 * simulate attached vt100 printer 2442 * simulate attached vt100 printer
2142 */ 2443 */
2143void 2444void
2144rxvt_term::process_print_pipe () 2445rxvt_term::process_print_pipe ()
2145{ 2446{
2146 int done; 2447 int done;
2147 FILE *fd; 2448 FILE *fd;
2148 2449
2149 if ((fd = popen_printer ()) == NULL) 2450 if ((fd = popen_printer ()) == NULL)
2150 return; 2451 return;
2151 2452
2152 /* 2453 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2455 * is received.
2155 */ 2456 */
2156 for (done = 0; !done;) 2457 for (done = 0; !done;)
2157 { 2458 {
2158 unsigned char buf[8]; 2459 unsigned char buf[8];
2159 unsigned char ch; 2460 unicode_t ch;
2160 unsigned int i, len; 2461 unsigned int i, len;
2161 2462
2162 if ((ch = cmd_getc ()) != C0_ESC) 2463 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2464 {
2164 if (putc (ch, fd) == EOF) 2465 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2466 break; /* done = 1 */
… …
2180 { 2481 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2483 break; /* done = 1 */
2183 } 2484 }
2184 } 2485 }
2486
2185 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
2187 { 2489 {
2188 done = 1; 2490 done = 1;
2189 break; 2491 break;
2190 } 2492 }
2191 } 2493 }
2192 } 2494 }
2495
2193 pclose_printer (fd); 2496 pclose_printer (fd);
2194} 2497}
2195#endif /* PRINTPIPE */ 2498#endif /* PRINTPIPE */
2196/*}}} */ 2499/*}}} */
2197 2500
2198/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
2199enum { 2502enum {
2200 C1_40 = 0x40, 2503 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2202 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2203 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2204 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2508};
2206/* *INDENT-ON* */ 2509/* *INDENT-ON* */
2207 2510
2208/*{{{ process non-printing single characters */ 2511/*{{{ process non-printing single characters */
2209void 2512void
2210rxvt_term::process_nonprinting (unsigned char ch) 2513rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2514{
2212 switch (ch) 2515 switch (ch)
2213 { 2516 {
2517 case C0_ESC:
2518 process_escape_seq ();
2519 break;
2214 case C0_ENQ: /* terminal Status */ 2520 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2521 if (rs[Rs_answerbackstring])
2216 tt_write (
2217 (const unsigned char *)rs[Rs_answerbackstring], 2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2218 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2523 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2219 else 2524 else
2220 tt_write ((unsigned char *)VT100_ANS, 2525 tt_write ((unsigned char *)VT100_ANS,
2221 (unsigned int)STRLEN (VT100_ANS)); 2526 (unsigned int)STRLEN (VT100_ANS));
2222 break; 2527 break;
2223 case C0_BEL: /* bell */ 2528 case C0_BEL: /* bell */
2224 scr_bell (); 2529 scr_bell ();
2225 break; 2530 break;
2226 case C0_BS: /* backspace */ 2531 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2546 scr_charset_choose (1);
2242 break; 2547 break;
2243 case C0_SI: /* shift in - acs */ 2548 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2549 scr_charset_choose (0);
2245 break; 2550 break;
2551
2552#ifdef EIGHT_BIT_CONTROLS
2553 // 8-bit controls
2554 case 0x90: /* DCS */
2555 process_dcs_seq ();
2556 break;
2557 case 0x9b: /* CSI */
2558 process_csi_seq ();
2559 break;
2560 case 0x9d: /* CSI */
2561 process_osc_seq ();
2562 break;
2563#endif
2246 } 2564 }
2247} 2565}
2248/*}}} */ 2566/*}}} */
2249 2567
2250 2568
2251/*{{{ process VT52 escape sequences */ 2569/*{{{ process VT52 escape sequences */
2252void 2570void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 2571rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 2572{
2255 int row, col; 2573 int row, col;
2256 2574
2257 switch (ch) 2575 switch (ch)
2258 { 2576 {
… …
2310 2628
2311/*{{{ process escape sequences */ 2629/*{{{ process escape sequences */
2312void 2630void
2313rxvt_term::process_escape_seq () 2631rxvt_term::process_escape_seq ()
2314{ 2632{
2315 unsigned char ch = cmd_getc (); 2633 unicode_t ch = cmd_getc ();
2316 2634
2317 if (PrivateModes & PrivMode_vt52) 2635 if (PrivateModes & PrivMode_vt52)
2318 { 2636 {
2319 process_escape_vt52 (ch); 2637 process_escape_vt52 (ch);
2320 return; 2638 return;
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 2655 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 2656 break;
2339 case '+': 2657 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 2658 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 2659 break;
2342#ifdef MULTICHAR_SET
2343 case '$':
2344 scr_charset_set (-2, (unsigned int)cmd_getc ());
2345 break;
2346#endif
2347#ifndef NO_FRILLS 2660#ifndef NO_FRILLS
2348 case '6': 2661 case '6':
2349 scr_backindex (); 2662 scr_backindex ();
2350 break; 2663 break;
2351#endif 2664#endif
… …
2373 break; 2686 break;
2374 2687
2375 /* 8.3.87: NEXT LINE */ 2688 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 2689 case C1_NEL: /* ESC E */
2377 { 2690 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 2691 unicode_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 2692 scr_add_lines (nlcr, 1, 2);
2380 } 2693 }
2381 break; 2694 break;
2382 2695
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 2696 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2394 case C1_RI: /* ESC M */ 2707 case C1_RI: /* ESC M */
2395 scr_index (DN); 2708 scr_index (DN);
2396 break; 2709 break;
2397 2710
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 2711 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 2712 /*case C1_SS2: scr_single_shift (2); break; */
2400 2713
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 2714 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 2715 /*case C1_SS3: scr_single_shift (3); break; */
2403 2716
2404 /* 8.3.27: DEVICE CONTROL STRING */ 2717 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 2718 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 2719 process_dcs_seq ();
2407 break; 2720 break;
… …
2422 process_osc_seq (); 2735 process_osc_seq ();
2423 break; 2736 break;
2424 2737
2425 /* 8.3.106: RESET TO INITIAL STATE */ 2738 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 2739 case 'c':
2740 mbstate.reset ();
2427 scr_poweron (); 2741 scr_poweron ();
2428 scrollbar_show (1); 2742 scrollbar_show (1);
2429 break; 2743 break;
2430 2744
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2745 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 2757
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2758/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 2759/* *INDENT-OFF* */
2446enum { 2760enum {
2447 CSI_ICH = 0x40, 2761 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2762 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2449 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2763 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2450 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2764 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2451 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2765 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2452 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2766 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2453 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2767 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2782 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2783 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2784 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2785 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2786 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2787 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 2788 };
2475/* *INDENT-ON* */ 2789/* *INDENT-ON* */
2476 2790
2477void 2791void
2478rxvt_term::process_csi_seq () 2792rxvt_term::process_csi_seq ()
2479{ 2793{
2480 unsigned char ch, priv, i; 2794 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 2795 unsigned int nargs, p;
2482 int n, ndef; 2796 int n, ndef;
2483 int arg[ESC_ARGS]; 2797 int arg[ESC_ARGS];
2484 2798
2485 for (nargs = ESC_ARGS; nargs > 0;) 2799 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 2800 arg[--nargs] = 0;
2487 2801
2488 priv = 0; 2802 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 2804 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 2805 { /* '<' '=' '>' '?' */
2492 priv = ch; 2806 priv = ch;
2493 ch = cmd_getc (); 2807 ch = cmd_getc ();
2494 } 2808 }
2809
2495 /* read any numerical arguments */ 2810 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 2811 for (n = -1; ch < CSI_ICH; )
2497 { 2812 {
2498 if (isdigit (ch)) 2813 if (isdigit (ch))
2499 { 2814 {
… …
2506 { 2821 {
2507 if (nargs < ESC_ARGS) 2822 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 2823 arg[nargs++] = n;
2509 n = -1; 2824 n = -1;
2510 } 2825 }
2511 else if (ch == '\b') 2826 else if (IS_CONTROL (ch))
2512 {
2513 scr_backspace ();
2514 }
2515 else if (ch == C0_ESC)
2516 {
2517 process_escape_seq ();
2518 return;
2519 }
2520 else if (ch < ' ')
2521 {
2522 process_nonprinting (ch); 2827 process_nonprinting (ch);
2523 } 2828
2524 ch = cmd_getc (); 2829 ch = cmd_getc ();
2525 } 2830 }
2526 2831
2527 if (ch > CSI_7F) 2832 if (ch > CSI_7F)
2528 return; 2833 return;
… …
2686 tt_printf ("\033[0n"); 2991 tt_printf ("\033[0n");
2687 break; 2992 break;
2688 case 6: /* CPR requested */ 2993 case 6: /* CPR requested */
2689 scr_report_position (); 2994 scr_report_position ();
2690 break; 2995 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 2996 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure)
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2998 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2694 break; 2999 break;
2695#endif
2696 case 8: /* unofficial extension */ 3000 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3002 break;
2699 } 3003 }
2700 break; 3004 break;
2701 3005
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3006 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2770#endif 3074#endif
2771 3075
2772 case CSI_78: /* DECREQTPARM */ 3076 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3077 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3078 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3079 break;
2776 3080
2777 default: 3081 default:
2778 break; 3082 break;
2779 } 3083 }
2780} 3084}
… …
2783#ifndef NO_FRILLS 3087#ifndef NO_FRILLS
2784/* ARGSUSED */ 3088/* ARGSUSED */
2785void 3089void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3091{
2788 int x, y; 3092 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
2793 Window wdummy; 3094 Window wdummy;
2794 3095
2795 if (nargs == 0) 3096 if (nargs == 0)
2796 return; 3097 return;
3098
2797 switch (args[0]) 3099 switch (args[0])
2798 { 3100 {
2799 /* 3101 /*
2800 * commands 3102 * commands
2801 */ 3103 */
2802 case 1: /* deiconify window */ 3104 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3105 XMapWindow (display->display, TermWin.parent[0]);
2804 break; 3106 break;
2805 case 2: /* iconify window */ 3107 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3108 XIconifyWindow (display->display, TermWin.parent[0],
… …
2823 break; 3125 break;
2824 case 8: /* set size (chars) */ 3126 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3128 (unsigned int) (args[1] * TermWin.fheight));
2827 break; 3129 break;
3130
3131 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3132 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3133 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3134 set_widthheight ((unsigned int)TermWin.width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3135 (unsigned int) (args[1] * TermWin.fheight));
2832 break; 3136 break;
3137
3138
2833 /* 3139 /*
2834 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
2835 */ 3141 */
2836 case 11: /* report window state */ 3142 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3145 break;
2840 case 13: /* report window position */ 3146 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3152 break;
2847 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3156 break;
2851 case 18: /* report window size (chars) */ 3157 case 18: /* report text area size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2853 break; 3159 break;
2854#if 0 /* XXX: currently disabled due to security concerns */ 3160 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break;
2855 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 {
3166 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3167 XGetIconName (display->display, TermWin.parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3169 }
2858 break; 3170 break;
2859 case 21: /* report window title */ 3171 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 {
3174 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3175 XFetchName (display->display, TermWin.parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3177 }
2862 break; 3178 break;
2863#endif
2864
2865 } 3179 }
2866} 3180}
2867#endif 3181#endif
2868 3182
2869/*----------------------------------------------------------------------*/ 3183/*----------------------------------------------------------------------*/
2870/* 3184/*
2871 * get input up until STRING TERMINATOR (or BEL) 3185 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3186 * ends_how is terminator used. returned input must be free()'d
2873 */ 3187 */
2874unsigned char * 3188unsigned char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3189rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3190{
2877 int seen_esc = 0; /* seen escape? */ 3191 unicode_t prev = 0, ch;
2878 unsigned int n = 0; 3192 unsigned int n = 0;
2879 unsigned char *s; 3193 unsigned char *s;
2880 unsigned char ch, string[STRING_MAX]; 3194 unsigned char string[STRING_MAX];
2881 3195
2882 for (; (ch = cmd_getc ());) 3196 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3197 {
2884 if (ch == C0_BEL
2885 || ch == CHAR_ST
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2887 break;
2888 if (ch == C0_ESC) 3198 if (prev == C0_ESC)
2889 {
2890 seen_esc = 1;
2891 continue;
2892 } 3199 {
2893 else if (ch == '\t') 3200 if (ch == 0x5c) /* 7bit ST */
2894 ch = ' '; /* translate '\t' to space */ 3201 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3202 else
3203 return NULL;
3204 }
3205 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break;
3207 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3209
2897 if (n < sizeof (string) - 1) 3210 if (n >= sizeof (string) - 1)
3211 // stop at some sane length
3212 return NULL;
3213
3214 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else
2898 string[n++] = ch; 3220 string[n++] = prev = ch;
2899 seen_esc = 0;
2900 } 3221 }
3222
2901 string[n++] = '\0'; 3223 string[n++] = '\0';
3224
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2903 return NULL; 3226 return NULL;
3227
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3228 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3229 STRNCPY (s, string, n);
2906 return s; 3230 return s;
2907} 3231}
2908 3232
2909/*----------------------------------------------------------------------*/ 3233/*----------------------------------------------------------------------*/
… …
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3236 */
2913void 3237void
2914rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
2915{ 3239{
2916 unsigned char eh, *s; 3240 unsigned char *s;
3241 unicode_t eh;
3242
2917 /* 3243 /*
2918 * Not handled yet 3244 * Not handled yet
2919 */ 3245 */
2920 s = get_to_st (&eh); 3246 s = get_to_st (eh);
2921 if (s) 3247 if (s)
2922 free (s); 3248 free (s);
3249
2923 return; 3250 return;
2924} 3251}
2925 3252
2926/*----------------------------------------------------------------------*/ 3253/*----------------------------------------------------------------------*/
2927/* 3254/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3255 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3256 */
2930void 3257void
2931rxvt_term::process_osc_seq () 3258rxvt_term::process_osc_seq ()
2932{ 3259{
2933 unsigned char ch, eh, *s; 3260 unicode_t ch, eh;
2934 int arg; 3261 int arg;
2935 3262
2936 ch = cmd_getc (); 3263 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
2939 3266
2940 if (ch == ';') 3267 if (ch == ';')
2941 { 3268 {
2942 s = get_to_st (&eh); 3269 unsigned char *s = get_to_st (eh);
3270
2943 if (s) 3271 if (s)
2944 { 3272 {
2945 /*
2946 * rxvt_menubar_dispatch () violates the constness of the string,
2947 * so do it here
2948 */
2949 if (arg == XTerm_Menu)
2950#if 0 /* XXX: currently disabled due to security concerns */
2951 menubar_dispatch ((char *)s);
2952#else
2953 (void)0;
2954#endif
2955 else
2956 xterm_seq (arg, (char *)s, eh); 3273 process_xterm_seq (arg, (char *)s, eh);
2957 free (s); 3274 free (s);
2958 } 3275 }
2959 } 3276 }
2960} 3277}
3278
3279void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{
3282 if (str[0] == '?' && !str[1])
3283 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 }
3291 else
3292 set_window_color (color, str);
3293}
3294
2961/* 3295/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2963 * 0 = change iconName/title 3297 * 0 = change iconName/title
2964 * 1 = change iconName 3298 * 1 = change iconName
2965 * 2 = change title 3299 * 2 = change title
2966 * 4 = change color 3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
2967 * 12 = change text color 3303 * 12 = change text color
2968 * 13 = change mouse foreground color 3304 * 13 = change mouse foreground color
2969 * 17 = change highlight character colour 3305 * 17 = change highlight character colour
2970 * 18 = change bold character color 3306 * 18 = change bold character color
2971 * 19 = change underlined character color 3307 * 19 = change underlined character color
2972 * 46 = change logfile (not implemented) 3308 * 46 = change logfile (not implemented)
2973 * 50 = change font 3309 * 50 = change font
2974 * 3310 *
2975 * rxvt extensions: 3311 * rxvt extensions:
2976 * 9 = change locale (NYI)
2977 * 10 = menu (may change in future)
2978 * 20 = bg pixmap 3312 * 20 = bg pixmap
2979 * 39 = change default fg color 3313 * 39 = change default fg color
2980 * 49 = change default bg color 3314 * 49 = change default bg color
2981 * 55 = dump scrollback buffer and all of screen 3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
2982 */ 3319 */
2983void 3320void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2985{ 3322{
2986 int changed = 0; 3323 int changed = 0;
2987 int color; 3324 int color;
2988 char *buf, *name; 3325 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1];
2989 3327
2990 assert (str != NULL); 3328 assert (str != NULL);
2991 switch (op) 3329 switch (op)
2992 { 3330 {
2993 case XTerm_name: 3331 case XTerm_name:
2994 set_title (str); 3332 set_title (str);
2995 /* FALLTHROUGH */ 3333 /* FALLTHROUGH */
2996 case XTerm_iconName: 3334 case XTerm_iconName:
2997 set_iconName (str); 3335 set_icon_name (str);
2998 break; 3336 break;
2999 case XTerm_title: 3337 case XTerm_title:
3000 set_title (str); 3338 set_title (str);
3001 break; 3339 break;
3340 case XTerm_property:
3341 if (str[0] == '?')
3342 {
3343 Atom prop = XInternAtom (display->display, str + 1, True);
3344 Atom actual_type;
3345 int actual_format;
3346 unsigned long nitems;
3347 unsigned long bytes_after;
3348 unsigned char *value = 0;
3349 const char *str = "";
3350
3351 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None
3357 && actual_format == 8)
3358 str = (const char *)(value);
3359
3360 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3361
3362 XFree (value);
3363 }
3364 else
3365 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367
3368 if (eq)
3369 {
3370 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0],
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 }
3376 else
3377 XDeleteProperty (display->display, TermWin.parent[0],
3378 display->atom (str));
3379 }
3380 break;
3381
3002 case XTerm_Color: 3382 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3383 for (buf = (char *)str; buf && *buf;)
3004 { 3384 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3385 if ((name = STRCHR (buf, ';')) == NULL)
3006 break; 3386 break;
3387
3007 *name++ = '\0'; 3388 *name++ = '\0';
3008 color = atoi (buf); 3389 color = atoi (buf);
3390
3009 if (color < 0 || color >= TOTAL_COLORS) 3391 if (color < 0 || color >= TOTAL_COLORS)
3010 break; 3392 break;
3393
3011 if ((buf = STRCHR (name, ';')) != NULL) 3394 if ((buf = STRCHR (name, ';')) != NULL)
3012 *buf++ = '\0'; 3395 *buf++ = '\0';
3396
3397 if (name[0] == '?' && !name[1])
3398 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 }
3406 else
3013 set_window_color (color + minCOLOR, name); 3407 set_window_color (color + minCOLOR, name);
3014 } 3408 }
3409 break;
3410 case XTerm_Color00:
3411 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3412 break;
3413 case XTerm_Color01:
3414 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3015 break; 3415 break;
3016#ifndef NO_CURSORCOLOR 3416#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3417 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3418 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3019 break; 3419 break;
3020#endif 3420#endif
3021 case XTerm_Color_pointer: 3421 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3422 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3423 break;
3424 case XTerm_Color_pointer_bg:
3425 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3023 break; 3426 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3025 case XTerm_Color_BD: 3428 case XTerm_Color_BD:
3026 set_window_color (Color_BD, str); 3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3027 break; 3430 break;
3028 case XTerm_Color_UL: 3431 case XTerm_Color_UL:
3029 set_window_color (Color_UL, str); 3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3030 break; 3433 break;
3031 case XTerm_Color_RV: 3434 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3033 break; 3436 break;
3034#endif 3437#endif
3035 3438
3036 case XTerm_Menu:
3037 /*
3038 * rxvt_menubar_dispatch () violates the constness of the string,
3039 * so DON'T do it here
3040 */
3041 break;
3042 case XTerm_Pixmap: 3439 case XTerm_Pixmap:
3043 if (*str != ';') 3440 if (*str != ';')
3044 { 3441 {
3045#if XPM_BACKGROUND 3442#if XPM_BACKGROUND
3046 scale_pixmap (""); /* reset to default scaling */ 3443 scale_pixmap (""); /* reset to default scaling */
… …
3069 set_window_color (Color_fg, str); 3466 set_window_color (Color_fg, str);
3070 break; 3467 break;
3071 case XTerm_restoreBG: 3468 case XTerm_restoreBG:
3072 set_window_color (Color_bg, str); 3469 set_window_color (Color_bg, str);
3073 break; 3470 break;
3471
3074 case XTerm_logfile: 3472 case XTerm_logfile:
3473 // TODO, when secure mode?
3075 break; 3474 break;
3475
3076 case XTerm_font: 3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3077 change_font (str); 3487 change_font (str);
3078 break; 3488 break;
3489
3490#ifndef NO_FRILLS
3079 case XTerm_locale: 3491 case XTerm_locale:
3080 if (str[0] == '?' && !str[1]) 3492 if (query)
3081 tt_printf ("%-.250s\n", locale); 3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3082 else 3497 else
3083 { 3498 {
3084 set_locale (str); 3499 set_locale (str);
3500# ifdef USE_XIM
3085 im_cb (); 3501 im_cb ();
3502# endif
3086 } 3503 }
3087 break; 3504 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR
3517 case XTerm_Menu:
3518 if (Options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break;
3521#endif
3088#if 0 3522#if 0
3089 case XTerm_dumpscreen: /* no error notices */ 3523 case XTerm_dumpscreen: /* no error notices */
3090 { 3524 {
3091 int fd; 3525 int fd;
3092 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3526 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3093 { 3527 {
3094 scr_dump (fd); 3528 scr_dump (fd);
3095 close (fd); 3529 close (fd);
3096 } 3530 }
3097 } 3531 }
3098 break; 3532 break;
3099#endif 3533#endif
3100
3101 } 3534 }
3102} 3535}
3103/*----------------------------------------------------------------------*/ 3536/*----------------------------------------------------------------------*/
3104 3537
3105/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3538/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3113 * so no need for fancy checking 3546 * so no need for fancy checking
3114 */ 3547 */
3115int 3548int
3116rxvt_term::privcases (int mode, unsigned long bit) 3549rxvt_term::privcases (int mode, unsigned long bit)
3117{ 3550{
3118 int state; 3551 int state;
3119 3552
3120 if (mode == 's') 3553 if (mode == 's')
3121 { 3554 {
3122 SavedModes |= (PrivateModes & bit); 3555 SavedModes |= (PrivateModes & bit);
3123 return -1; 3556 return -1;
… …
3128 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3129 else 3562 else
3130 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3131 PrivMode (state, bit); 3564 PrivMode (state, bit);
3132 } 3565 }
3566
3133 return state; 3567 return state;
3134} 3568}
3135 3569
3136/* we're not using priv _yet_ */ 3570/* we're not using priv _yet_ */
3137void 3571void
3138rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3572rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3139{ 3573{
3140 unsigned int i, j; 3574 unsigned int i, j;
3141 int state; 3575 int state;
3576
3142 static const struct 3577 static const struct
3143 { 3578 {
3144 const int argval; 3579 const int argval;
3145 const unsigned long bit; 3580 const unsigned long bit;
3146 } 3581 }
3582
3147 argtopriv[] = { 3583 argtopriv[] = {
3148 { 1, PrivMode_aplCUR }, 3584 { 1, PrivMode_aplCUR },
3149 { 2, PrivMode_vt52 }, 3585 { 2, PrivMode_vt52 },
3150 { 3, PrivMode_132 }, 3586 { 3, PrivMode_132 },
3151 { 4, PrivMode_smoothScroll }, 3587 { 4, PrivMode_smoothScroll },
… …
3157 { menuBar_esc, PrivMode_menuBar }, 3593 { menuBar_esc, PrivMode_menuBar },
3158#endif 3594#endif
3159#ifdef scrollBar_esc 3595#ifdef scrollBar_esc
3160 { scrollBar_esc, PrivMode_scrollBar }, 3596 { scrollBar_esc, PrivMode_scrollBar },
3161#endif 3597#endif
3598 // 18, 19 printing-related
3162 { 25, PrivMode_VisibleCursor }, 3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3163 { 35, PrivMode_ShiftKeys }, 3601 { 35, PrivMode_ShiftKeys }, // rxvt extension
3164 { 40, PrivMode_132OK }, 3602 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI
3605 // 46 start logging
3165 { 47, PrivMode_Screen }, 3606 { 47, PrivMode_Screen },
3166 { 66, PrivMode_aplKP }, 3607 { 66, PrivMode_aplKP },
3167#ifndef NO_BACKSPACE_KEY 3608#ifndef NO_BACKSPACE_KEY
3168 { 67, PrivMode_BackSpace }, 3609 { 67, PrivMode_BackSpace },
3169#endif 3610#endif
3170 { 1000, PrivMode_MouseX11 }, 3611 { 1000, PrivMode_MouseX11 },
3612 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3613 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3614 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3171 { 1010, PrivMode_TtyOutputInh }, 3615 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3172 { 1011, PrivMode_Keypress }, 3616 { 1011, PrivMode_Keypress }, // rxvt extension
3617 // 1035 enable modifiers for alt, numlock NYI
3618 // 1036 send ESC for meta keys NYI
3619 // 1037 send DEL for keypad delete NYI
3173 { 1047, PrivMode_Screen }, 3620 { 1047, PrivMode_Screen },
3621 // 1048 save and restore cursor
3174 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3622 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3623 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3175 }; 3624 };
3176 3625
3177 if (nargs == 0) 3626 if (nargs == 0)
3178 return; 3627 return;
3179 3628
… …
3194 state = privcases (mode, argtopriv[j].bit); 3643 state = privcases (mode, argtopriv[j].bit);
3195 break; 3644 break;
3196 } 3645 }
3197 3646
3198 /* extra handling for values with state unkept */ 3647 /* extra handling for values with state unkept */
3199 if (state == -1)
3200 switch (arg[i]) 3648 switch (arg[i])
3201 { 3649 {
3202 case 1048: /* alternative cursor save */ 3650 case 1048: /* alternative cursor save */
3651 if (Options & Opt_secondaryScreen)
3203 if (mode == 0) 3652 if (mode == 0)
3204 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
3205 else if (mode == 1) 3654 else if (mode == 1)
3206 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
3207 /* FALLTHROUGH */
3208 default:
3209 continue; /* for (;i;) */
3210 }
3211
3212 /* extra handling for values with valid 0 or 1 state */
3213 switch (arg[i])
3214 {
3215 /* case 1: - application cursor keys */
3216 case 2: /* VT52 mode */
3217 /* oddball mode. should be set regardless of set/reset
3218 * parameter. Return from VT52 mode with an ESC < from
3219 * within VT52 mode
3220 */
3221 PrivMode (1, PrivMode_vt52);
3222 break; 3656 break;
3657 }
3658
3659 if (state >= 0)
3660 /* extra handling for values with valid 0 or 1 state */
3661 switch (arg[i])
3662 {
3663 /* case 1: - application cursor keys */
3664 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode
3668 */
3669 PrivMode (1, PrivMode_vt52);
3670 break;
3223 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
3224 if (PrivateModes & PrivMode_132OK) 3672 if (PrivateModes & PrivMode_132OK)
3225 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3226 (unsigned int)TermWin.height);
3227 break; 3674 break;
3228 case 4: /* smooth scrolling */ 3675 case 4: /* smooth scrolling */
3229 if (state) 3676 if (state)
3230 Options &= ~Opt_jumpScroll; 3677 Options &= ~Opt_jumpScroll;
3231 else 3678 else
3232 Options |= Opt_jumpScroll; 3679 Options |= Opt_jumpScroll;
3233 break; 3680 break;
3234 case 5: /* reverse video */ 3681 case 5: /* reverse video */
3235 scr_rvideo_mode (state); 3682 scr_rvideo_mode (state);
3236 break; 3683 break;
3237 case 6: /* relative/absolute origins */ 3684 case 6: /* relative/absolute origins */
3238 scr_relative_origin (state); 3685 scr_relative_origin (state);
3239 break; 3686 break;
3240 case 7: /* autowrap */ 3687 case 7: /* autowrap */
3241 scr_autowrap (state); 3688 scr_autowrap (state);
3242 break; 3689 break;
3243 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
3244 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
3245 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3246 PrivateModes &= ~ (PrivMode_MouseX11); 3693 PrivateModes &= ~PrivMode_MouseX11;
3247 break; 3694 break;
3248#ifdef menuBar_esc 3695#ifdef menuBar_esc
3249 case menuBar_esc: 3696 case menuBar_esc:
3250#ifdef MENUBAR 3697#ifdef MENUBAR
3251 map_menuBar (state); 3698 map_menuBar (state);
3252#endif 3699#endif
3253 break; 3700 break;
3254#endif 3701#endif
3255#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
3256 case scrollBar_esc: 3703 case scrollBar_esc:
3257 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
3258 { 3705 {
3259 resize_all_windows (0, 0, 0); 3706 resize_all_windows (0, 0, 0);
3260 scr_touch (true); 3707 scr_touch (true);
3261 } 3708 }
3262 break; 3709 break;
3263#endif 3710#endif
3264 case 25: /* visible/invisible cursor */ 3711 case 25: /* visible/invisible cursor */
3265 scr_cursor_visible (state); 3712 scr_cursor_visible (state);
3266 break; 3713 break;
3267 /* case 35: - shift keys */ 3714 /* case 35: - shift keys */
3268 /* case 40: - 80 <--> 132 mode */ 3715 /* case 40: - 80 <--> 132 mode */
3269 case 47: /* secondary screen */ 3716 case 47: /* secondary screen */
3270 scr_change_screen (state); 3717 scr_change_screen (state);
3271 break; 3718 break;
3272 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
3273 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
3274 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
3275 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX10); 3723 PrivateModes &= ~PrivMode_MouseX10;
3277 break; 3724 break;
3278#if 0 3725#if 0
3279 case 1001: 3726 case 1001:
3280 break; /* X11 mouse highlighting */ 3727 break; /* X11 mouse highlighting */
3281#endif 3728#endif
3282 case 1010: /* scroll to bottom on TTY output inhibit */ 3729 case 1010: /* scroll to bottom on TTY output inhibit */
3283 if (state) 3730 if (state)
3284 Options &= ~Opt_scrollTtyOutput; 3731 Options &= ~Opt_scrollTtyOutput;
3285 else 3732 else
3286 Options |= Opt_scrollTtyOutput; 3733 Options |= Opt_scrollTtyOutput;
3287 break; 3734 break;
3288 case 1011: /* scroll to bottom on key press */ 3735 case 1011: /* scroll to bottom on key press */
3289 if (state) 3736 if (state)
3290 Options |= Opt_scrollTtyKeypress; 3737 Options |= Opt_scrollTtyKeypress;
3291 else 3738 else
3292 Options &= ~Opt_scrollTtyKeypress; 3739 Options &= ~Opt_scrollTtyKeypress;
3293 break; 3740 break;
3294 case 1047: /* secondary screen w/ clearing */ 3741 case 1047: /* secondary screen w/ clearing last */
3295 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3742 if (Options & Opt_secondaryScreen)
3296 if (current_screen != PRIMARY) 3743 if (current_screen != PRIMARY)
3297 scr_erase_screen (2); 3744 scr_erase_screen (2);
3298 scr_change_screen (state); 3745 scr_change_screen (state);
3299 /* FALLTHROUGH */
3300 default:
3301 break; 3746 break;
3747 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY)
3751 scr_erase_screen (2);
3752 break;
3753 default:
3754 break;
3302 } 3755 }
3303 } 3756 }
3304} 3757}
3305/*}}} */ 3758/*}}} */
3306 3759
3307/*{{{ process sgr sequences */ 3760/*{{{ process sgr sequences */
3308void 3761void
3309rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3762rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3310{ 3763{
3311 unsigned int i; 3764 unsigned int i;
3312 short rendset; 3765 short rendset;
3313 int rendstyle; 3766 int rendstyle;
3314 3767
3315 if (nargs == 0) 3768 if (nargs == 0)
3316 { 3769 {
3317 scr_rendition (0, ~RS_None); 3770 scr_rendition (0, ~RS_None);
3318 return; 3771 return;
3319 } 3772 }
3773
3320 for (i = 0; i < nargs; i++) 3774 for (i = 0; i < nargs; i++)
3321 { 3775 {
3322 rendset = -1; 3776 rendset = -1;
3323 switch (arg[i]) 3777 switch (arg[i])
3324 { 3778 {
… …
3326 rendset = 0, rendstyle = ~RS_None; 3780 rendset = 0, rendstyle = ~RS_None;
3327 break; 3781 break;
3328 case 1: 3782 case 1:
3329 rendset = 1, rendstyle = RS_Bold; 3783 rendset = 1, rendstyle = RS_Bold;
3330 break; 3784 break;
3785 //case 2: // faint or second colour
3331 case 4: 3786 case 4:
3332 rendset = 1, rendstyle = RS_Uline; 3787 rendset = 1, rendstyle = RS_Uline;
3333 break; 3788 break;
3334 case 5: 3789 case 5: // slowly blinking
3790 case 6: // rapidly blinking
3335 rendset = 1, rendstyle = RS_Blink; 3791 rendset = 1, rendstyle = RS_Blink;
3336 break; 3792 break;
3793 //case 6: // scoansi light background
3337 case 7: 3794 case 7:
3338 rendset = 1, rendstyle = RS_RVid; 3795 rendset = 1, rendstyle = RS_RVid;
3796 break;
3797 case 8:
3798 // invisible. NYI
3799 break;
3800 //case 9: // crossed out
3801 //case 10: // scoansi acs off, primary font
3802 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font
3804 //...
3805 //case 19: // ninth alt font
3806 //case 20: // gothic
3807 case 21: // disable bold, faint
3808 rendset = 0, rendstyle = RS_Bold;
3339 break; 3809 break;
3340 case 22: 3810 case 22:
3341 rendset = 0, rendstyle = RS_Bold; 3811 rendset = 0, rendstyle = RS_Bold;
3342 break; 3812 break;
3813 //case 23: disable italic
3343 case 24: 3814 case 24:
3344 rendset = 0, rendstyle = RS_Uline; 3815 rendset = 0, rendstyle = RS_Uline;
3345 break; 3816 break;
3346 case 25: 3817 case 25:
3347 rendset = 0, rendstyle = RS_Blink; 3818 rendset = 0, rendstyle = RS_Blink;
3348 break; 3819 break;
3349 case 27: 3820 case 27:
3350 rendset = 0, rendstyle = RS_RVid; 3821 rendset = 0, rendstyle = RS_RVid;
3351 break; 3822 break;
3823 //case 28: // visible. NYI
3824 //case 29: // not crossed-out
3352 } 3825 }
3826
3353 if (rendset != -1) 3827 if (rendset != -1)
3354 { 3828 {
3355 scr_rendition (rendset, rendstyle); 3829 scr_rendition (rendset, rendstyle);
3356 continue; /* for (;i;) */ 3830 continue; /* for (;i;) */
3357 } 3831 }
… …
3364 case 33: 3838 case 33:
3365 case 34: 3839 case 34:
3366 case 35: 3840 case 35:
3367 case 36: 3841 case 36:
3368 case 37: 3842 case 37:
3369 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3370 Color_fg);
3371 break; 3844 break;
3372#ifdef TTY_256COLOR 3845#ifdef TTY_256COLOR
3373 case 38: 3846 case 38:
3374 if (nargs > i + 2 && arg[i + 1] == 5) 3847 if (nargs > i + 2 && arg[i + 1] == 5)
3375 { 3848 {
3376 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3377 Color_fg);
3378 i += 2; 3850 i += 2;
3379 } 3851 }
3380 break; 3852 break;
3381#endif 3853#endif
3382 case 39: /* default fg */ 3854 case 39: /* default fg */
… …
3389 case 43: 3861 case 43:
3390 case 44: 3862 case 44:
3391 case 45: 3863 case 45:
3392 case 46: 3864 case 46:
3393 case 47: 3865 case 47:
3394 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3395 Color_bg);
3396 break; 3867 break;
3397#ifdef TTY_256COLOR 3868#ifdef TTY_256COLOR
3398 case 48: 3869 case 48:
3399 if (nargs > i + 2 && arg[i + 1] == 5) 3870 if (nargs > i + 2 && arg[i + 1] == 5)
3400 { 3871 {
3401 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3402 Color_bg);
3403 i += 2; 3873 i += 2;
3404 } 3874 }
3405 break; 3875 break;
3406#endif 3876#endif
3407 case 49: /* default bg */ 3877 case 49: /* default bg */
… …
3436 } 3906 }
3437 } 3907 }
3438} 3908}
3439/*}}} */ 3909/*}}} */
3440 3910
3441/*{{{ process Rob Nation's own graphics mode sequences */ 3911/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3442void 3912void
3443rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
3444{ 3914{
3445 unsigned char ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
3446 3916
3447 if (cmd == 'Q') 3917 if (cmd == 'Q')
3448 { /* query graphics */ 3918 { /* query graphics */
3449 tt_printf ("\033G0\n"); /* no graphics */ 3919 tt_printf ("\033G0\n"); /* no graphics */
3450 return; 3920 return;

Diff Legend

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