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.58 by pcg, Wed Feb 25 15:06:03 2004 UTC vs.
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC

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

Diff Legend

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