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.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.107 by root, Sat Jul 31 00:01:12 2004 UTC

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

Diff Legend

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