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

Diff Legend

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