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.73 by pcg, Mon Mar 15 00:08:11 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
… …
299 newlen = 0; 306 newlen = 0;
300 } 307 }
301 break; 308 break;
302 309
303#ifdef XK_KP_Left 310#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
309 { 316 {
… …
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
618unsigned int 625unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
620{ 627{
621 unsigned int n, s; 628 unsigned int n, s;
622 629
623 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 632
626 if (n > 0 && s < count) 633 if (n > 0 && s < count)
627 { 634 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
… …
632 s += n; 639 s += n;
633 } 640 }
634 641
635 if (count > s) 642 if (count > s)
636 { 643 {
637 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 645 count = s;
639 } 646 }
640 647
641 for (; count--;) 648 for (; count--;)
642 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
… …
654 if (want_full_refresh) 661 if (want_full_refresh)
655 { 662 {
656 want_full_refresh = 0; 663 want_full_refresh = 0;
657 scr_clear (); 664 scr_clear ();
658 scr_touch (false); 665 scr_touch (false);
659 want_refresh = 1;
660 } 666 }
661#endif 667#endif
662 668
663 if (want_refresh) 669 if (want_refresh)
664 { 670 {
665 scr_refresh (refresh_type); 671 scr_refresh (refresh_type);
666 scrollbar_show (1); 672 scrollbar_show (1);
667#ifdef USE_XIM 673#ifdef USE_XIM
668 IMSendSpot (); 674 IMSendSpot ();
669#endif 675#endif
670
671 } 676 }
672 677
673 display->flush (); 678 display->flush ();
679
680 flush_ev.stop ();
674} 681}
675 682
676void 683void
677rxvt_term::check_cb (check_watcher &w) 684rxvt_term::check_cb (check_watcher &w)
678{ 685{
679 SET_R (this); 686 SET_R (this);
680 SET_LOCALE (locale); 687 SET_LOCALE (locale);
681 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;
682 flush (); 703 flush ();
683} 704}
684 705
685#ifdef CURSOR_BLINK 706#ifdef CURSOR_BLINK
686void 707void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 725 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 726 }
706} 727}
707#endif 728#endif
708 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
709bool 773bool
710rxvt_term::pty_fill () 774rxvt_term::pty_fill ()
711{ 775{
712 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 }
713 783
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 784 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 785 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 786 cmdbuf_endp = cmdbuf_ptr + n;
717 787
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
719 789
720 if (n > 0) 790 if (n > 0)
721 { 791 {
722 cmdbuf_endp += n; 792 cmdbuf_endp += n;
723 return true; 793 return true;
… …
735 SET_LOCALE (locale); 805 SET_LOCALE (locale);
736 806
737 if (revents & EVENT_WRITE) 807 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 808 tt_write (0, 0);
739 else if (revents & EVENT_READ) 809 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us 810 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ()) 811 while (pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ()) 812 if (cmd_parse ())
755 break;
756 }
757 }
758}
759
760bool
761rxvt_term::cmd_parse ()
762{
763 bool flag = false;
764 unicode_t ch = NOCHAR;
765
766 for (;;)
767 {
768 if (ch == NOCHAR)
769 ch = next_char ();
770
771 if (ch == NOCHAR) // TODO: improve
772 break;
773
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 unicode_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 unicode_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868unicode_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break; 813 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897} 814}
898 815
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904unicode_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 unicode_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919}
920
921#ifdef POINTER_BLANK
922void 816void
923rxvt_term::pointer_unblank () 817rxvt_term::pointer_unblank ()
924{ 818{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor (); 820 recolour_cursor ();
927 821
822#ifdef POINTER_BLANK
928 hidden_pointer = 0; 823 hidden_pointer = 0;
929 824
930 if (Options & Opt_pointerBlank) 825 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay); 826 pointer_ev.start (NOW + pointerBlankDelay);
827#endif
932} 828}
933 829
830#ifdef POINTER_BLANK
934void 831void
935rxvt_term::pointer_blank () 832rxvt_term::pointer_blank ()
936{ 833{
937 if (! (Options & Opt_pointerBlank)) 834 if (! (Options & Opt_pointerBlank))
938 return; 835 return;
… …
1134 break; 1031 break;
1135 1032
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease: 1034 case KeyRelease:
1138 { 1035 {
1139 if (! (ev.xkey.state & ControlMask)) 1036 if (!(ev.xkey.state & ControlMask))
1140 mouse_slip_wheel_speed = 0; 1037 slip_wheel_ev.stop ();
1141 else 1038 else
1142 { 1039 {
1143 KeySym ks; 1040 KeySym ks;
1144 1041
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R) 1043 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0; 1044 mouse_slip_wheel_speed = 0;
1148 } 1045 }
… …
1168 && (ev.xclient.data.l[0] == DndFile 1065 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1066 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1067 || ev.xclient.data.l[0] == DndLink))
1171 { 1068 {
1172 /* Get Dnd data */ 1069 /* Get Dnd data */
1173 Atom ActualType; 1070 Atom ActualType;
1174 int ActualFormat; 1071 int ActualFormat;
1175 unsigned char *data; 1072 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1073 unsigned long Size, RemainingBytes;
1177 1074
1178 XGetWindowProperty (display->display, display->root, 1075 XGetWindowProperty (display->display, display->root,
1179 xa[XA_DNDSELECTION], 1076 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1077 0L, 1000000L,
1181 False, AnyPropertyType, 1078 False, AnyPropertyType,
… …
1184 &data); 1081 &data);
1185 XChangeProperty (display->display, display->root, 1082 XChangeProperty (display->display, display->root,
1186 XA_CUT_BUFFER0, XA_STRING, 1083 XA_CUT_BUFFER0, XA_STRING,
1187 8, PropModeReplace, 1084 8, PropModeReplace,
1188 data, STRLEN (data)); 1085 data, STRLEN (data));
1086 XFree (data);
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1087 selection_paste (display->root, XA_CUT_BUFFER0, True);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1191 } 1089 }
1192#endif /* OFFIX_DND */ 1090#endif /* OFFIX_DND */
1193 break; 1091 break;
1194 1092
1195 case MappingNotify: 1093 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1094 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1095 break;
1198 1096
1199 /* 1097 /*
1200 * XXX: this is not the _current_ arrangement 1098 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1099 * Here's my conclusion:
… …
1232#endif 1130#endif
1233#ifdef CURSOR_BLINK 1131#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink) 1132 if (Options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1236#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
1237 1144
1238 } 1145 }
1239 break; 1146 break;
1240 1147
1241 case FocusOut: 1148 case FocusOut:
… …
1250#ifdef CURSOR_BLINK 1157#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink) 1158 if (Options & Opt_cursorBlink)
1252 cursor_blink_ev.stop (); 1159 cursor_blink_ev.stop ();
1253 hidden_cursor = 0; 1160 hidden_cursor = 0;
1254#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
1255 1171
1256 } 1172 }
1257 break; 1173 break;
1258 1174
1259 case ConfigureNotify: 1175 case ConfigureNotify:
… …
1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1269 } 1185 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271 1187
1272 if (szHint.width != width || szHint.height != height) 1188 if (szHint.width != width || szHint.height != height)
1273 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1275 resize_all_windows (width, height, 1); 1189 resize_all_windows (width, height, 1);
1276 } 1190
1277#ifdef DEBUG_SIZE
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent) 1192 if (Options & Opt_transparent)
1285 { 1193 {
1286 check_our_parents (); 1194 check_our_parents ();
1287 if (am_transparent) 1195 if (am_transparent)
1288 want_full_refresh = 1; 1196 want_refresh = want_full_refresh = 1;
1289 } 1197 }
1290#endif 1198#endif
1291
1292 } 1199 }
1293 break; 1200 break;
1294 1201
1295 case SelectionClear: 1202 case SelectionClear:
1296 display->set_selection_owner (0); 1203 selection_clear ();
1297 break; 1204 break;
1298 1205
1299 case SelectionNotify: 1206 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1207 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1208 selection_paste (ev.xselection.requestor,
… …
1328 1235
1329 case GraphicsExpose: 1236 case GraphicsExpose:
1330 case Expose: 1237 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1238 if (ev.xany.window == TermWin.vt)
1332 { 1239 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1240 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1241 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1242 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1337 // 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))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1248 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1249 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1250
1341 // ev.xexpose.width, TermWin.height, False); 1251 scr_refresh (refresh_type);
1342#endif
1343 want_refresh = 1;
1344 } 1252 }
1345 else 1253 else
1346 { 1254 {
1347 XEvent unused_event; 1255 XEvent unused_event;
1348 1256
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1350 Expose, 1258 ;
1351 &unused_event)) ;
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1353 GraphicsExpose, 1260 ;
1354 &unused_event)) ; 1261
1355 if (isScrollbarWindow (ev.xany.window)) 1262 if (isScrollbarWindow (ev.xany.window))
1356 { 1263 {
1357 scrollBar.setIdle (); 1264 scrollBar.setIdle ();
1358 scrollbar_show (0); 1265 scrollbar_show (0);
1359 } 1266 }
1360#ifdef MENUBAR 1267#ifdef MENUBAR
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1362 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);
1363#endif 1275#endif
1364 } 1276 }
1365 break; 1277 break;
1366 1278
1367 case MotionNotify: 1279 case MotionNotify:
… …
1402 if (ev.xbutton.y < TermWin.int_bwidth 1314 if (ev.xbutton.y < TermWin.int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1404 { 1316 {
1405 int dist; 1317 int dist;
1406 1318
1407 pending_scroll_selection=1;
1408
1409 /* don't clobber the current delay if we are 1319 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1320 * already in the middle of scrolling.
1411 */ 1321 */
1412 if (scroll_selection_delay<=0) 1322 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1324
1415 /* save the event params so we can highlight 1325 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1326 * the selection in the pending-scroll loop
1417 */ 1327 */
1418 selection_save_x=ev.xbutton.x; 1328 selection_save_x=ev.xbutton.x;
… …
1440 else 1350 else
1441 { 1351 {
1442 /* we are within the text window, so we 1352 /* we are within the text window, so we
1443 * shouldn't be scrolling 1353 * shouldn't be scrolling
1444 */ 1354 */
1445 pending_scroll_selection = 0; 1355 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop();
1446 } 1357 }
1447#endif 1358#endif
1448#ifdef MOUSE_THRESHOLD 1359#ifdef MOUSE_THRESHOLD
1449 1360
1450 } 1361 }
… …
1500 return; 1411 return;
1501 } 1412 }
1502 1413
1503 /* FALLTHROUGH */ 1414 /* FALLTHROUGH */
1504 case ReparentNotify: 1415 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1417 want_refresh = want_full_refresh = 1;
1508 break; 1418 break;
1509#endif 1419#endif
1510 } 1420 }
1511} 1421}
1512 1422
… …
1668 upordown = 1; /* down */ 1578 upordown = 1; /* down */
1669 } 1579 }
1670 if (upordown) 1580 if (upordown)
1671 { 1581 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1582#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1583 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 1584#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 1585 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 1586 {
1677 if (upordown < 0) 1587 if (upordown < 0)
1678 scrollBar.setUp (); 1588 scrollBar.setUp ();
… …
1694 break; 1604 break;
1695 case R_SB_ALIGN_BOTTOM: 1605 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 1606 csrO = scrollBar.bot - scrollBar.top;
1697 break; 1607 break;
1698 } 1608 }
1609
1699 if (scrollBar.style == R_SB_XTERM 1610 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 1611 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 1612 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 1613 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 1614
1704 scrollBar.setMotion (); 1615 scrollBar.setMotion ();
1705 break; 1616 break;
1706 1617
1707 case Button1: 1618 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1732 scr_page ((ev.button == Button1 ? DN : UP), 1643 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 1644 (TermWin.nrow
1734 * scrollbar_position (ev.y) 1645 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 1646 / scrollbar_size ()));
1736 } 1647 }
1648
1737 break; 1649 break;
1738 } 1650 }
1739 } 1651 }
1740 return; 1652 return;
1741 } 1653 }
… …
1765 refresh_type &= ~SMOOTH_REFRESH; 1677 refresh_type &= ~SMOOTH_REFRESH;
1766#endif 1678#endif
1767 1679
1768 } 1680 }
1769#ifdef SELECTION_SCROLLING 1681#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 1682 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop();
1771#endif 1684#endif
1772 if (ev.window == TermWin.vt) 1685 if (ev.window == TermWin.vt)
1773 { 1686 {
1774 if (reportmode) 1687 if (reportmode)
1775 { 1688 {
… …
1817 case Button5: 1730 case Button5:
1818 { 1731 {
1819 int i; 1732 int i;
1820 page_dirn v; 1733 page_dirn v;
1821 1734
1822 v = (ev.button == Button4) ? UP : DN; 1735 v = ev.button == Button4 ? UP : DN;
1736
1823 if (ev.state & ShiftMask) 1737 if (ev.state & ShiftMask)
1824 i = 1; 1738 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 1739 else if (Options & Opt_mouseWheelScrollPage)
1826 i = TermWin.nrow - 1; 1740 i = TermWin.nrow - 1;
1827 else 1741 else
1828 i = 5; 1742 i = 5;
1743
1829# ifdef MOUSE_SLIP_WHEELING 1744# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 1745 if (ev.state & ControlMask)
1831 { 1746 {
1832 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)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753
1754 slip_wheel_ev.start ();
1834 } 1755 }
1756 else
1757 {
1835# endif 1758# endif
1836# ifdef JUMP_MOUSE_WHEEL 1759# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1); 1760 scr_page (v, i);
1844 scr_refresh (SMOOTH_REFRESH); 1761 scr_refresh (SMOOTH_REFRESH);
1845 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
1846 } 1772 }
1847# endif 1773#endif
1848
1849 } 1774 }
1850 break; 1775 break;
1851#endif 1776#endif
1852
1853 } 1777 }
1854 } 1778 }
1855#ifdef MENUBAR 1779#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window)) 1780 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev); 1781 menubar_control (ev);
1858#endif 1782#endif
1859} 1783}
1860 1784
1861
1862#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
1863/* 2017/*
1864 * Check our parents are still who we think they are. 2018 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2019 * Do transparency updates if required
1866 */ 2020 */
1867int 2021int
1868rxvt_term::check_our_parents () 2022rxvt_term::check_our_parents ()
1869{ 2023{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2024 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2025 unsigned long nitems, bytes_after;
1872 Atom atype; 2026 Atom atype;
1873 unsigned char *prop = NULL; 2027 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2028 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2029 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2030 XWindowAttributes wattr, wrootattr;
1877 2031
1878 pchanged = 0; 2032 pchanged = 0;
1879 2033
1880 if (! (Options & Opt_transparent)) 2034 if (!(Options & Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2035 return pchanged; /* Don't try any more */
1882 2036
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2037 XGetWindowAttributes (display->display, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2038 rootdepth = wrootattr.depth;
1885 2039
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2041
1887 if (rootdepth != wattr.depth) 2042 if (rootdepth != wattr.depth)
1888 { 2043 {
1889 if (am_transparent) 2044 if (am_transparent)
1890 { 2045 {
1891 pchanged = 1; 2046 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2048 am_transparent = am_pixmap_trans = 0;
1895 } 2049 }
2050
1896 return pchanged; /* Don't try any more */ 2051 return pchanged; /* Don't try any more */
1897 } 2052 }
1898 2053
1899 /* 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. */
1900 XSync (display->display, False); 2055 XSync (display->display, False);
… …
1902 /* 2057 /*
1903 * Make the frame window set by the window manager have 2058 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2059 * the root background. Some window managers put multiple nested frame
1905 * 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.
1906 */ 2061 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2062 i = (xa[XA_XROOTPMAPID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2065 &nitems, &bytes_after, &prop) == Success);
2066
1911 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 )
1912 have_pixmap = 0; 2078 have_pixmap = 0;
1913 else 2079 else
1914 { 2080 {
1915 have_pixmap = 1; 2081 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2082 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2083 XFree (prop);
1918 } 2084 }
2085
1919 if (have_pixmap) 2086 if (have_pixmap)
1920 { 2087 {
1921 /* 2088 /*
1922 * Copy display->root pixmap transparency 2089 * Copy display->root pixmap transparency
1923 */ 2090 */
… …
1927 XImage *image; 2094 XImage *image;
1928 GC gc; 2095 GC gc;
1929 XGCValues gcvalue; 2096 XGCValues gcvalue;
1930 2097
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2099 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2100 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2101 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2102 nx = ny = 0;
1936 2103
1937 if (sx < 0) 2104 if (sx < 0)
… …
1949 } 2116 }
1950 2117
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1953 allowedxerror = -1; 2120 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2122
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2124 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2125 allowedxerror = 0;
2126
1959 if (image == NULL) 2127 if (image == NULL)
1960 { 2128 {
1961 if (am_transparent && am_pixmap_trans) 2129 if (am_transparent && am_pixmap_trans)
1962 { 2130 {
1963 pchanged = 1; 2131 pchanged = 1;
… …
1965 { 2133 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2134 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2135 TermWin.pixmap = None;
1968 } 2136 }
1969 } 2137 }
2138
1970 am_pixmap_trans = 0; 2139 am_pixmap_trans = 0;
1971 } 2140 }
1972 else 2141 else
1973 { 2142 {
1974 if (TermWin.pixmap != None) 2143 if (TermWin.pixmap != None)
1975 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
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2159 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2162 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2163 XFreeGC (display->display, gc);
1985 XDestroyImage (image); 2164 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1987 TermWin.pixmap); 2166 XClearWindow (display->display, TermWin.parent[0]);
2167
1988 if (!am_transparent || !am_pixmap_trans) 2168 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2169 pchanged = 1;
2170
1990 am_transparent = am_pixmap_trans = 1; 2171 am_transparent = am_pixmap_trans = 1;
1991 } 2172 }
1992 } 2173 }
1993 2174
1994 if (!am_pixmap_trans) 2175 if (!am_pixmap_trans)
1995 { 2176 {
1996 unsigned int n; 2177 unsigned int n;
1997 /* 2178 /*
1998 * InheritPixmap transparency 2179 * InheritPixmap transparency
1999 */ 2180 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2183 {
2004 oldp = TermWin.parent[i]; 2184 oldp = TermWin.parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2185 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2186 &TermWin.parent[i], &list, &n);
2007 XFree (list); 2187 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189
2009 if (TermWin.parent[i] == display->root) 2190 if (TermWin.parent[i] == display->root)
2010 { 2191 {
2011 if (oldp != None) 2192 if (oldp != None)
2012 pchanged = 1; 2193 pchanged = 1;
2194
2013 break; 2195 break;
2014 } 2196 }
2197
2015 if (oldp != TermWin.parent[i]) 2198 if (oldp != TermWin.parent[i])
2016 pchanged = 1; 2199 pchanged = 1;
2017 } 2200 }
2018 2201
2019 n = 0; 2202 n = 0;
… …
2030 break; 2213 break;
2031 } 2214 }
2032 } 2215 }
2033 } 2216 }
2034 2217
2035 if (n > (int) (sizeof (TermWin.parent) 2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2219 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2220 D_X ((stderr, "InheritPixmap Turning off"));
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt, 2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2223 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2224 /* XXX: also turn off Opt_transparent? */
2045 } 2225 }
2046 else 2226 else
2047 { 2227 {
2228#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2229 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2230 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2231 sleep (1);
2058# endif 2232#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2234 for (n = 0; n < (unsigned int)i; n++)
2235 {
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2062 ParentRelative); 2237 XClearWindow (display->display, TermWin.parent[n]);
2238 }
2239
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2064 ParentRelative);
2065 am_transparent = 1; 2241 am_transparent = 1;
2066 } 2242 }
2067 2243
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2245 TermWin.parent[i] = None;
2070 } 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
2071 return pchanged; 2257 return pchanged;
2072} 2258}
2073#endif 2259#endif
2074 2260
2075/*}}} */ 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}
2076 2434
2077/*{{{ print pipe */ 2435/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2080FILE * 2438FILE *
2081rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2082{ 2440{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2442
2085 if (stream == NULL) 2443 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2445
2087 return stream; 2446 return stream;
2088} 2447}
2089 2448
2090int 2449int
2091rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2092{ 2451{
2093 fflush (stream); 2452 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2453 return pclose (stream);
2100# endif
2101} 2454}
2102 2455
2103/* 2456/*
2104 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2105 */ 2458 */
2106void 2459void
2107rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2108{ 2461{
2109 int done; 2462 int done;
2110 FILE *fd; 2463 FILE *fd;
2111 2464
2112 if ((fd = popen_printer ()) == NULL) 2465 if ((fd = popen_printer ()) == NULL)
2113 return; 2466 return;
2114 2467
2115 /* 2468 /*
2116 * 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
2117 * is received. 2470 * is received.
2118 */ 2471 */
2119 for (done = 0; !done;) 2472 for (done = 0; !done;)
2120 { 2473 {
2121 unsigned char buf[8]; 2474 unsigned char buf[8];
2122 unsigned char ch; 2475 unicode_t ch;
2123 unsigned int i, len; 2476 unsigned int i, len;
2124 2477
2125 if ((ch = cmd_getc ()) != C0_ESC) 2478 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2479 {
2127 if (putc (ch, fd) == EOF) 2480 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2481 break; /* done = 1 */
… …
2143 { 2496 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2498 break; /* done = 1 */
2146 } 2499 }
2147 } 2500 }
2501
2148 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2150 { 2504 {
2151 done = 1; 2505 done = 1;
2152 break; 2506 break;
2153 } 2507 }
2154 } 2508 }
2155 } 2509 }
2510
2156 pclose_printer (fd); 2511 pclose_printer (fd);
2157} 2512}
2158#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2159/*}}} */ 2514/*}}} */
2160 2515
2161/* *INDENT-OFF* */ 2516/* *INDENT-OFF* */
2162enum { 2517enum {
2163 C1_40 = 0x40, 2518 C1_40 = 0x40,
2164 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,
2165 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,
2166 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,
2167 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,
2168}; 2523};
2169/* *INDENT-ON* */ 2524/* *INDENT-ON* */
2170 2525
2171/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2172void 2527void
2173rxvt_term::process_nonprinting (unsigned char ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2529{
2175 switch (ch) 2530 switch (ch)
2176 { 2531 {
2532 case C0_ESC:
2533 process_escape_seq ();
2534 break;
2177 case C0_ENQ: /* terminal Status */ 2535 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2536 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2539 else
2183 tt_write ((unsigned char *)VT100_ANS, 2540 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2541 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2542 break;
2186 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2187 scr_bell (); 2544 scr_bell ();
2188 break; 2545 break;
2189 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 2561 scr_charset_choose (1);
2205 break; 2562 break;
2206 case C0_SI: /* shift in - acs */ 2563 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2564 scr_charset_choose (0);
2208 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
2209 } 2579 }
2210} 2580}
2211/*}}} */ 2581/*}}} */
2212 2582
2213 2583
2214/*{{{ process VT52 escape sequences */ 2584/*{{{ process VT52 escape sequences */
2215void 2585void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 2586rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 2587{
2218 int row, col; 2588 int row, col;
2219 2589
2220 switch (ch) 2590 switch (ch)
2221 { 2591 {
… …
2273 2643
2274/*{{{ process escape sequences */ 2644/*{{{ process escape sequences */
2275void 2645void
2276rxvt_term::process_escape_seq () 2646rxvt_term::process_escape_seq ()
2277{ 2647{
2278 unsigned char ch = cmd_getc (); 2648 unicode_t ch = cmd_getc ();
2279 2649
2280 if (PrivateModes & PrivMode_vt52) 2650 if (PrivateModes & PrivMode_vt52)
2281 { 2651 {
2282 process_escape_vt52 (ch); 2652 process_escape_vt52 (ch);
2283 return; 2653 return;
… …
2331 break; 2701 break;
2332 2702
2333 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2335 { 2705 {
2336 unicode_t nlcr[] = { L'\n', L'\r' }; 2706 unicode_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, 1, 2);
2338 } 2708 }
2339 break; 2709 break;
2340 2710
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2352 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2353 scr_index (DN); 2723 scr_index (DN);
2354 break; 2724 break;
2355 2725
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /*case C1_SS2: scr_single_shift (2); break; */
2358 2728
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /*case C1_SS3: scr_single_shift (3); break; */
2361 2731
2362 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 2734 process_dcs_seq ();
2365 break; 2735 break;
… …
2380 process_osc_seq (); 2750 process_osc_seq ();
2381 break; 2751 break;
2382 2752
2383 /* 8.3.106: RESET TO INITIAL STATE */ 2753 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 2754 case 'c':
2755 mbstate.reset ();
2385 scr_poweron (); 2756 scr_poweron ();
2386 scrollbar_show (1); 2757 scrollbar_show (1);
2387 break; 2758 break;
2388 2759
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2760 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 2772
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2773/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 2774/* *INDENT-OFF* */
2404enum { 2775enum {
2405 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2406 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,
2407 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 ,
2408 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,
2409 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,
2410 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,
2411 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,
… …
2426 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, */
2427 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, [, \, ], ^, _, */
2428 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, */
2429 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, */
2430 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, */
2431 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, {, |, }, ~, */
2432 }; 2803 };
2433/* *INDENT-ON* */ 2804/* *INDENT-ON* */
2434 2805
2435void 2806void
2436rxvt_term::process_csi_seq () 2807rxvt_term::process_csi_seq ()
2437{ 2808{
2438 unsigned char ch, priv, i; 2809 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 2810 unsigned int nargs, p;
2440 int n, ndef; 2811 int n, ndef;
2441 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2442 2813
2443 for (nargs = ESC_ARGS; nargs > 0;) 2814 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 2815 arg[--nargs] = 0;
2445 2816
2446 priv = 0; 2817 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
2450 priv = ch; 2821 priv = ch;
2451 ch = cmd_getc (); 2822 ch = cmd_getc ();
2452 } 2823 }
2824
2453 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2455 { 2827 {
2456 if (isdigit (ch)) 2828 if (isdigit (ch))
2457 { 2829 {
… …
2464 { 2836 {
2465 if (nargs < ESC_ARGS) 2837 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 2838 arg[nargs++] = n;
2467 n = -1; 2839 n = -1;
2468 } 2840 }
2469 else if (ch == '\b') 2841 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 2842 process_nonprinting (ch);
2481 } 2843
2482 ch = cmd_getc (); 2844 ch = cmd_getc ();
2483 } 2845 }
2484 2846
2485 if (ch > CSI_7F) 2847 if (ch > CSI_7F)
2486 return; 2848 return;
… …
2644 tt_printf ("\033[0n"); 3006 tt_printf ("\033[0n");
2645 break; 3007 break;
2646 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
2647 scr_report_position (); 3009 scr_report_position ();
2648 break; 3010 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure)
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2652 break; 3014 break;
2653#endif
2654 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3017 break;
2657 } 3018 }
2658 break; 3019 break;
2659 3020
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3021 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2728#endif 3089#endif
2729 3090
2730 case CSI_78: /* DECREQTPARM */ 3091 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3092 if (arg[0] == 0 || arg[0] == 1)
2732 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);
2733 /* FALLTHROUGH */ 3094 break;
2734 3095
2735 default: 3096 default:
2736 break; 3097 break;
2737 } 3098 }
2738} 3099}
… …
2741#ifndef NO_FRILLS 3102#ifndef NO_FRILLS
2742/* ARGSUSED */ 3103/* ARGSUSED */
2743void 3104void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3105rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3106{
2746 int x, y; 3107 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3108 XWindowAttributes wattr;
2751 Window wdummy; 3109 Window wdummy;
2752 3110
2753 if (nargs == 0) 3111 if (nargs == 0)
2754 return; 3112 return;
3113
2755 switch (args[0]) 3114 switch (args[0])
2756 { 3115 {
2757 /* 3116 /*
2758 * commands 3117 * commands
2759 */ 3118 */
2760 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3120 XMapWindow (display->display, TermWin.parent[0]);
2762 break; 3121 break;
2763 case 2: /* iconify window */ 3122 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3123 XIconifyWindow (display->display, TermWin.parent[0],
… …
2781 break; 3140 break;
2782 case 8: /* set size (chars) */ 3141 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3143 (unsigned int) (args[1] * TermWin.fheight));
2785 break; 3144 break;
3145
3146 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3147 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3148 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3149 set_widthheight ((unsigned int)TermWin.width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3150 (unsigned int) (args[1] * TermWin.fheight));
2790 break; 3151 break;
3152
3153
2791 /* 3154 /*
2792 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
2793 */ 3156 */
2794 case 11: /* report window state */ 3157 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3160 break;
2798 case 13: /* report window position */ 3161 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3167 break;
2805 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3171 break;
2809 case 18: /* report window size (chars) */ 3172 case 18: /* report text area size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2811 break; 3174 break;
2812#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;
2813 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 {
3181 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3182 XGetIconName (display->display, TermWin.parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3184 }
2816 break; 3185 break;
2817 case 21: /* report window title */ 3186 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 {
3189 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3190 XFetchName (display->display, TermWin.parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3192 }
2820 break; 3193 break;
2821#endif
2822
2823 } 3194 }
2824} 3195}
2825#endif 3196#endif
2826 3197
2827/*----------------------------------------------------------------------*/ 3198/*----------------------------------------------------------------------*/
2828/* 3199/*
2829 * get input up until STRING TERMINATOR (or BEL) 3200 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3201 * ends_how is terminator used. returned input must be free()'d
2831 */ 3202 */
2832unsigned char * 3203unsigned char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3204rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3205{
2835 int seen_esc = 0; /* seen escape? */ 3206 unicode_t prev = 0, ch;
2836 unsigned int n = 0; 3207 unsigned int n = 0;
2837 unsigned char *s; 3208 unsigned char *s;
2838 unsigned char ch, string[STRING_MAX]; 3209 unsigned char string[STRING_MAX];
2839 3210
2840 for (; (ch = cmd_getc ());) 3211 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3212 {
2842 if (ch == C0_BEL
2843 || ch == CHAR_ST
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2845 break;
2846 if (ch == C0_ESC) 3213 if (prev == C0_ESC)
2847 {
2848 seen_esc = 1;
2849 continue;
2850 } 3214 {
2851 else if (ch == '\t') 3215 if (ch == 0x5c) /* 7bit ST */
2852 ch = ' '; /* translate '\t' to space */ 3216 break;
2853 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)
2854 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3224
2855 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
2856 string[n++] = ch; 3235 string[n++] = prev = ch;
2857 seen_esc = 0;
2858 } 3236 }
3237
2859 string[n++] = '\0'; 3238 string[n++] = '\0';
3239
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2861 return NULL; 3241 return NULL;
3242
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3243 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3244 STRNCPY (s, string, n);
2864 return s; 3245 return s;
2865} 3246}
2866 3247
2867/*----------------------------------------------------------------------*/ 3248/*----------------------------------------------------------------------*/
… …
2869 * 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)'
2870 */ 3251 */
2871void 3252void
2872rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
2873{ 3254{
2874 unsigned char eh, *s; 3255 unsigned char *s;
3256 unicode_t eh;
3257
2875 /* 3258 /*
2876 * Not handled yet 3259 * Not handled yet
2877 */ 3260 */
2878 s = get_to_st (&eh); 3261 s = get_to_st (eh);
2879 if (s) 3262 if (s)
2880 free (s); 3263 free (s);
3264
2881 return; 3265 return;
2882} 3266}
2883 3267
2884/*----------------------------------------------------------------------*/ 3268/*----------------------------------------------------------------------*/
2885/* 3269/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3270 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3271 */
2888void 3272void
2889rxvt_term::process_osc_seq () 3273rxvt_term::process_osc_seq ()
2890{ 3274{
2891 unsigned char ch, eh, *s; 3275 unicode_t ch, eh;
2892 int arg; 3276 int arg;
2893 3277
2894 ch = cmd_getc (); 3278 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
2897 3281
2898 if (ch == ';') 3282 if (ch == ';')
2899 { 3283 {
2900 s = get_to_st (&eh); 3284 unsigned char *s = get_to_st (eh);
3285
2901 if (s) 3286 if (s)
2902 { 3287 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3288 process_xterm_seq (arg, (char *)s, eh);
2915 free (s); 3289 free (s);
2916 } 3290 }
2917 } 3291 }
2918} 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
2919/* 3310/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title 3312 * 0 = change iconName/title
2922 * 1 = change iconName 3313 * 1 = change iconName
2923 * 2 = change title 3314 * 2 = change title
2924 * 4 = change color 3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
2925 * 12 = change text color 3318 * 12 = change text color
2926 * 13 = change mouse foreground color 3319 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour 3320 * 17 = change highlight character colour
2928 * 18 = change bold character color 3321 * 18 = change bold character color
2929 * 19 = change underlined character color 3322 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented) 3323 * 46 = change logfile (not implemented)
2931 * 50 = change font 3324 * 50 = change font
2932 * 3325 *
2933 * rxvt extensions: 3326 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap 3327 * 20 = bg pixmap
2936 * 39 = change default fg color 3328 * 39 = change default fg color
2937 * 49 = change default bg color 3329 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen 3330 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale 3331 * 701 = change locale
2940 * 702 = find font 3332 * 702 = find font
3333 * 703 = menu
2941 */ 3334 */
2942void 3335void
2943rxvt_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)
2944{ 3337{
2945 int changed = 0; 3338 int changed = 0;
2946 int color; 3339 int color;
2947 char *buf, *name; 3340 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1];
2948 3342
2949 assert (str != NULL); 3343 assert (str != NULL);
2950 switch (op) 3344 switch (op)
2951 { 3345 {
2952 case XTerm_name: 3346 case XTerm_name:
2953 set_title (str); 3347 set_title (str);
2954 /* FALLTHROUGH */ 3348 /* FALLTHROUGH */
2955 case XTerm_iconName: 3349 case XTerm_iconName:
2956 set_iconName (str); 3350 set_icon_name (str);
2957 break; 3351 break;
2958 case XTerm_title: 3352 case XTerm_title:
2959 set_title (str); 3353 set_title (str);
2960 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
2961 case XTerm_Color: 3397 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3398 for (buf = (char *)str; buf && *buf;)
2963 { 3399 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3400 if ((name = STRCHR (buf, ';')) == NULL)
2965 break; 3401 break;
3402
2966 *name++ = '\0'; 3403 *name++ = '\0';
2967 color = atoi (buf); 3404 color = atoi (buf);
3405
2968 if (color < 0 || color >= TOTAL_COLORS) 3406 if (color < 0 || color >= TOTAL_COLORS)
2969 break; 3407 break;
3408
2970 if ((buf = STRCHR (name, ';')) != NULL) 3409 if ((buf = STRCHR (name, ';')) != NULL)
2971 *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
2972 set_window_color (color + minCOLOR, name); 3422 set_window_color (color + minCOLOR, name);
2973 } 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);
2974 break; 3430 break;
2975#ifndef NO_CURSORCOLOR 3431#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3432 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3434 break;
2979#endif 3435#endif
2980 case XTerm_Color_pointer: 3436 case XTerm_Color_pointer_fg:
2981 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);
2982 break; 3441 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD: 3443 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str); 3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2986 break; 3445 break;
2987 case XTerm_Color_UL: 3446 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str); 3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2989 break; 3448 break;
2990 case XTerm_Color_RV: 3449 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3451 break;
2993#endif 3452#endif
2994 3453
2995 case XTerm_Menu:
2996 /*
2997 * rxvt_menubar_dispatch () violates the constness of the string,
2998 * so DON'T do it here
2999 */
3000 break;
3001 case XTerm_Pixmap: 3454 case XTerm_Pixmap:
3002 if (*str != ';') 3455 if (*str != ';')
3003 { 3456 {
3004#if XPM_BACKGROUND 3457#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3458 scale_pixmap (""); /* reset to default scaling */
… …
3028 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3029 break; 3482 break;
3030 case XTerm_restoreBG: 3483 case XTerm_restoreBG:
3031 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3032 break; 3485 break;
3486
3033 case XTerm_logfile: 3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3034 break; 3489 break;
3490
3035 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
3036 change_font (str); 3502 change_font (str);
3037 break; 3503 break;
3504
3038#ifndef NO_FRILLS 3505#ifndef NO_FRILLS
3039 case XTerm_locale: 3506 case XTerm_locale:
3040 if (str[0] == '?' && !str[1]) 3507 if (query)
3041 tt_printf ("%-.250s\n", locale); 3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3042 else 3512 else
3043 { 3513 {
3044 set_locale (str); 3514 set_locale (str);
3045# ifdef USE_XIM 3515# ifdef USE_XIM
3046 im_cb (); 3516 im_cb ();
3047# endif 3517# endif
3048 } 3518 }
3049 break; 3519 break;
3520
3050 case XTerm_findfont: 3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3051 { 3523 {
3052 int fid = TermWin.fontset->find_font (atoi (str)); 3524 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3054 } 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
3055 break; 3535 break;
3056#endif 3536#endif
3057#if 0 3537#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3538 case XTerm_dumpscreen: /* no error notices */
3059 { 3539 {
3060 int fd; 3540 int fd;
3061 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)
3062 { 3542 {
3063 scr_dump (fd); 3543 scr_dump (fd);
3064 close (fd); 3544 close (fd);
3065 } 3545 }
3066 } 3546 }
3067 break; 3547 break;
3068#endif 3548#endif
3069
3070 } 3549 }
3071} 3550}
3072/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3073 3552
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3553/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 3561 * so no need for fancy checking
3083 */ 3562 */
3084int 3563int
3085rxvt_term::privcases (int mode, unsigned long bit) 3564rxvt_term::privcases (int mode, unsigned long bit)
3086{ 3565{
3087 int state; 3566 int state;
3088 3567
3089 if (mode == 's') 3568 if (mode == 's')
3090 { 3569 {
3091 SavedModes |= (PrivateModes & bit); 3570 SavedModes |= (PrivateModes & bit);
3092 return -1; 3571 return -1;
… …
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 3577 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3100 PrivMode (state, bit); 3579 PrivMode (state, bit);
3101 } 3580 }
3581
3102 return state; 3582 return state;
3103} 3583}
3104 3584
3105/* we're not using priv _yet_ */ 3585/* we're not using priv _yet_ */
3106void 3586void
3107rxvt_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)
3108{ 3588{
3109 unsigned int i, j; 3589 unsigned int i, j;
3110 int state; 3590 int state;
3591
3111 static const struct 3592 static const struct
3112 { 3593 {
3113 const int argval; 3594 const int argval;
3114 const unsigned long bit; 3595 const unsigned long bit;
3115 } 3596 }
3597
3116 argtopriv[] = { 3598 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
… …
3150 // 1035 enable modifiers for alt, numlock NYI 3632 // 1035 enable modifiers for alt, numlock NYI
3151 // 1036 send ESC for meta keys NYI 3633 // 1036 send ESC for meta keys NYI
3152 // 1037 send DEL for keypad delete NYI 3634 // 1037 send DEL for keypad delete NYI
3153 { 1047, PrivMode_Screen }, 3635 { 1047, PrivMode_Screen },
3154 // 1048 save and restore cursor 3636 // 1048 save and restore cursor
3155 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3637 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3156 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3638 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3157 }; 3639 };
3158 3640
3159 if (nargs == 0) 3641 if (nargs == 0)
3160 return; 3642 return;
… …
3179 3661
3180 /* extra handling for values with state unkept */ 3662 /* extra handling for values with state unkept */
3181 switch (arg[i]) 3663 switch (arg[i])
3182 { 3664 {
3183 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
3184 case 1049: 3666 if (Options & Opt_secondaryScreen)
3185 if (mode == 0) 3667 if (mode == 0)
3186 scr_cursor (RESTORE); 3668 scr_cursor (RESTORE);
3187 else if (mode == 1) 3669 else if (mode == 1)
3188 scr_cursor (SAVE); 3670 scr_cursor (SAVE);
3189 /* FALLTHROUGH */ 3671 break;
3190 } 3672 }
3191 3673
3192 if (state >= 0) 3674 if (state >= 0)
3193 /* extra handling for values with valid 0 or 1 state */ 3675 /* extra handling for values with valid 0 or 1 state */
3194 switch (arg[i]) 3676 switch (arg[i])
… …
3218 scr_relative_origin (state); 3700 scr_relative_origin (state);
3219 break; 3701 break;
3220 case 7: /* autowrap */ 3702 case 7: /* autowrap */
3221 scr_autowrap (state); 3703 scr_autowrap (state);
3222 break; 3704 break;
3223 /* 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 */
3224 case 9: /* X10 mouse reporting */ 3706 case 9: /* X10 mouse reporting */
3225 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
3226 PrivateModes &= ~ (PrivMode_MouseX11); 3708 PrivateModes &= ~PrivMode_MouseX11;
3227 break; 3709 break;
3228#ifdef menuBar_esc 3710#ifdef menuBar_esc
3229 case menuBar_esc: 3711 case menuBar_esc:
3230#ifdef MENUBAR 3712#ifdef MENUBAR
3231 map_menuBar (state); 3713 map_menuBar (state);
… …
3242 break; 3724 break;
3243#endif 3725#endif
3244 case 25: /* visible/invisible cursor */ 3726 case 25: /* visible/invisible cursor */
3245 scr_cursor_visible (state); 3727 scr_cursor_visible (state);
3246 break; 3728 break;
3247 /* case 35: - shift keys */ 3729 /* case 35: - shift keys */
3248 /* case 40: - 80 <--> 132 mode */ 3730 /* case 40: - 80 <--> 132 mode */
3249 case 47: /* secondary screen */ 3731 case 47: /* secondary screen */
3250 scr_change_screen (state); 3732 scr_change_screen (state);
3251 break; 3733 break;
3252 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3253 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3254 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3255 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3256 PrivateModes &= ~ (PrivMode_MouseX10); 3738 PrivateModes &= ~PrivMode_MouseX10;
3257 break; 3739 break;
3258#if 0 3740#if 0
3259 case 1001: 3741 case 1001:
3260 break; /* X11 mouse highlighting */ 3742 break; /* X11 mouse highlighting */
3261#endif 3743#endif
… …
3269 if (state) 3751 if (state)
3270 Options |= Opt_scrollTtyKeypress; 3752 Options |= Opt_scrollTtyKeypress;
3271 else 3753 else
3272 Options &= ~Opt_scrollTtyKeypress; 3754 Options &= ~Opt_scrollTtyKeypress;
3273 break; 3755 break;
3274 case 1047: /* secondary screen w/ clearing */ 3756 case 1047: /* secondary screen w/ clearing last */
3275 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3757 if (Options & Opt_secondaryScreen)
3276 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
3277 scr_erase_screen (2); 3759 scr_erase_screen (2);
3278 scr_change_screen (state); 3760 scr_change_screen (state);
3279 /* FALLTHROUGH */ 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;
3280 default: 3768 default:
3281 break; 3769 break;
3282 } 3770 }
3283 } 3771 }
3284} 3772}
… …
3286 3774
3287/*{{{ process sgr sequences */ 3775/*{{{ process sgr sequences */
3288void 3776void
3289rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3777rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3290{ 3778{
3291 unsigned int i; 3779 unsigned int i;
3292 short rendset; 3780 short rendset;
3293 int rendstyle; 3781 int rendstyle;
3294 3782
3295 if (nargs == 0) 3783 if (nargs == 0)
3296 { 3784 {
3297 scr_rendition (0, ~RS_None); 3785 scr_rendition (0, ~RS_None);
3298 return; 3786 return;
3299 } 3787 }
3788
3300 for (i = 0; i < nargs; i++) 3789 for (i = 0; i < nargs; i++)
3301 { 3790 {
3302 rendset = -1; 3791 rendset = -1;
3303 switch (arg[i]) 3792 switch (arg[i])
3304 { 3793 {
… …
3306 rendset = 0, rendstyle = ~RS_None; 3795 rendset = 0, rendstyle = ~RS_None;
3307 break; 3796 break;
3308 case 1: 3797 case 1:
3309 rendset = 1, rendstyle = RS_Bold; 3798 rendset = 1, rendstyle = RS_Bold;
3310 break; 3799 break;
3800 //case 2: // faint or second colour
3311 case 4: 3801 case 4:
3312 rendset = 1, rendstyle = RS_Uline; 3802 rendset = 1, rendstyle = RS_Uline;
3313 break; 3803 break;
3314 case 5: 3804 case 5: // slowly blinking
3805 case 6: // rapidly blinking
3315 rendset = 1, rendstyle = RS_Blink; 3806 rendset = 1, rendstyle = RS_Blink;
3316 break; 3807 break;
3808 //case 6: // scoansi light background
3317 case 7: 3809 case 7:
3318 rendset = 1, rendstyle = RS_RVid; 3810 rendset = 1, rendstyle = RS_RVid;
3319 break; 3811 break;
3320 case 8: 3812 case 8:
3321 // invisible. NYI 3813 // invisible. NYI
3322 break; 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;
3824 break;
3323 case 22: 3825 case 22:
3324 rendset = 0, rendstyle = RS_Bold; 3826 rendset = 0, rendstyle = RS_Bold;
3325 break; 3827 break;
3828 //case 23: disable italic
3326 case 24: 3829 case 24:
3327 rendset = 0, rendstyle = RS_Uline; 3830 rendset = 0, rendstyle = RS_Uline;
3328 break; 3831 break;
3329 case 25: 3832 case 25:
3330 rendset = 0, rendstyle = RS_Blink; 3833 rendset = 0, rendstyle = RS_Blink;
3331 break; 3834 break;
3332 case 27: 3835 case 27:
3333 rendset = 0, rendstyle = RS_RVid; 3836 rendset = 0, rendstyle = RS_RVid;
3334 break; 3837 break;
3335 case 28:
3336 // visible. NYI 3838 //case 28: // visible. NYI
3337 break; 3839 //case 29: // not crossed-out
3338 } 3840 }
3339 3841
3340 if (rendset != -1) 3842 if (rendset != -1)
3341 { 3843 {
3342 scr_rendition (rendset, rendstyle); 3844 scr_rendition (rendset, rendstyle);
… …
3419 } 3921 }
3420 } 3922 }
3421} 3923}
3422/*}}} */ 3924/*}}} */
3423 3925
3424/*{{{ process Rob Nation's own graphics mode sequences */ 3926/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 3927void
3426rxvt_term::process_graphics () 3928rxvt_term::process_graphics ()
3427{ 3929{
3428 unsigned char ch, cmd = cmd_getc (); 3930 unicode_t ch, cmd = cmd_getc ();
3429 3931
3430 if (cmd == 'Q') 3932 if (cmd == 'Q')
3431 { /* query graphics */ 3933 { /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 3934 tt_printf ("\033G0\n"); /* no graphics */
3433 return; 3935 return;

Diff Legend

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