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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC

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

Diff Legend

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