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.97 by root, Mon Jul 26 18:01:19 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
52 52
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
57/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
58void 63void
59rxvt_term::lookup_key (XKeyEvent &ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
60{ 65{
61 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
… …
88#ifdef USE_XIM 93#ifdef USE_XIM
89 if (Input_Context) 94 if (Input_Context)
90 { 95 {
91 Status status_return; 96 Status status_return;
92 97
98#if 0
93#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
97 else 103 else
104#endif
98#endif 105#endif
99 { 106 {
100 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
101 108
102 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
… …
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}
913
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} 799}
935 800
936#ifdef POINTER_BLANK 801#ifdef POINTER_BLANK
937void 802void
938rxvt_term::pointer_unblank () 803rxvt_term::pointer_unblank ()
… …
1149 break; 1014 break;
1150 1015
1151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1152 case KeyRelease: 1017 case KeyRelease:
1153 { 1018 {
1154 if (! (ev.xkey.state & ControlMask)) 1019 if (!(ev.xkey.state & ControlMask))
1155 mouse_slip_wheel_speed = 0; 1020 slip_wheel_ev.stop ();
1156 else 1021 else
1157 { 1022 {
1158 KeySym ks; 1023 KeySym ks;
1159 1024
1160 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1161 if (ks == XK_Control_L || ks == XK_Control_R) 1026 if (ks == XK_Control_L || ks == XK_Control_R)
1162 mouse_slip_wheel_speed = 0; 1027 mouse_slip_wheel_speed = 0;
1163 } 1028 }
… …
1183 && (ev.xclient.data.l[0] == DndFile 1048 && (ev.xclient.data.l[0] == DndFile
1184 || ev.xclient.data.l[0] == DndDir 1049 || ev.xclient.data.l[0] == DndDir
1185 || ev.xclient.data.l[0] == DndLink)) 1050 || ev.xclient.data.l[0] == DndLink))
1186 { 1051 {
1187 /* Get Dnd data */ 1052 /* Get Dnd data */
1188 Atom ActualType; 1053 Atom ActualType;
1189 int ActualFormat; 1054 int ActualFormat;
1190 unsigned char *data; 1055 unsigned char *data;
1191 unsigned long Size, RemainingBytes; 1056 unsigned long Size, RemainingBytes;
1192 1057
1193 XGetWindowProperty (display->display, display->root, 1058 XGetWindowProperty (display->display, display->root,
1194 xa[XA_DNDSELECTION], 1059 xa[XA_DNDSELECTION],
1195 0L, 1000000L, 1060 0L, 1000000L,
1196 False, AnyPropertyType, 1061 False, AnyPropertyType,
… …
1199 &data); 1064 &data);
1200 XChangeProperty (display->display, display->root, 1065 XChangeProperty (display->display, display->root,
1201 XA_CUT_BUFFER0, XA_STRING, 1066 XA_CUT_BUFFER0, XA_STRING,
1202 8, PropModeReplace, 1067 8, PropModeReplace,
1203 data, STRLEN (data)); 1068 data, STRLEN (data));
1069 XFree (data);
1204 selection_paste (display->root, XA_CUT_BUFFER0, True); 1070 selection_paste (display->root, XA_CUT_BUFFER0, True);
1205 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1206 } 1072 }
1207#endif /* OFFIX_DND */ 1073#endif /* OFFIX_DND */
1208 break; 1074 break;
… …
1301 check_our_parents (); 1167 check_our_parents ();
1302 if (am_transparent) 1168 if (am_transparent)
1303 want_full_refresh = 1; 1169 want_full_refresh = 1;
1304 } 1170 }
1305#endif 1171#endif
1306
1307 } 1172 }
1308 break; 1173 break;
1309 1174
1310 case SelectionClear: 1175 case SelectionClear:
1311 display->set_selection_owner (0); 1176 selection_clear ();
1312 break; 1177 break;
1313 1178
1314 case SelectionNotify: 1179 case SelectionNotify:
1315 if (selection_wait == Sel_normal) 1180 if (selection_wait == Sel_normal)
1316 selection_paste (ev.xselection.requestor, 1181 selection_paste (ev.xselection.requestor,
… …
1347 { 1212 {
1348#ifdef NO_SLOW_LINK_SUPPORT 1213#ifdef NO_SLOW_LINK_SUPPORT
1349 scr_expose (ev.xexpose.x, ev.xexpose.y, 1214 scr_expose (ev.xexpose.x, ev.xexpose.y,
1350 ev.xexpose.width, ev.xexpose.height, False); 1215 ev.xexpose.width, ev.xexpose.height, False);
1351#else 1216#else
1352 // don't understand this, so commented it out 1217 // I don't understand this, so I changed it :)
1353 scr_expose (ev.xexpose.x, ev.xexpose.y, 1218 scr_expose (ev.xexpose.x, ev.xexpose.y,
1354 ev.xexpose.width, ev.xexpose.height, False); 1219 ev.xexpose.width, ev.xexpose.height, False);
1355 //scr_expose (ev.xexpose.x, 0, 1220 //scr_expose (ev.xexpose.x, 0,
1356 // ev.xexpose.width, TermWin.height, False); 1221 // ev.xexpose.width, TermWin.height, False);
1357#endif 1222#endif
… …
1359 } 1224 }
1360 else 1225 else
1361 { 1226 {
1362 XEvent unused_event; 1227 XEvent unused_event;
1363 1228
1364 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1365 Expose, 1230 ;
1366 &unused_event)) ;
1367 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1368 GraphicsExpose, 1232 ;
1369 &unused_event)) ; 1233
1370 if (isScrollbarWindow (ev.xany.window)) 1234 if (isScrollbarWindow (ev.xany.window))
1371 { 1235 {
1372 scrollBar.setIdle (); 1236 scrollBar.setIdle ();
1373 scrollbar_show (0); 1237 scrollbar_show (0);
1374 } 1238 }
… …
1417 if (ev.xbutton.y < TermWin.int_bwidth 1281 if (ev.xbutton.y < TermWin.int_bwidth
1418 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1419 { 1283 {
1420 int dist; 1284 int dist;
1421 1285
1422 pending_scroll_selection=1;
1423
1424 /* don't clobber the current delay if we are 1286 /* don't clobber the current delay if we are
1425 * already in the middle of scrolling. 1287 * already in the middle of scrolling.
1426 */ 1288 */
1427 if (scroll_selection_delay<=0) 1289 if (!sel_scroll_ev.active)
1428 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1429 1291
1430 /* save the event params so we can highlight 1292 /* save the event params so we can highlight
1431 * the selection in the pending-scroll loop 1293 * the selection in the pending-scroll loop
1432 */ 1294 */
1433 selection_save_x=ev.xbutton.x; 1295 selection_save_x=ev.xbutton.x;
… …
1455 else 1317 else
1456 { 1318 {
1457 /* we are within the text window, so we 1319 /* we are within the text window, so we
1458 * shouldn't be scrolling 1320 * shouldn't be scrolling
1459 */ 1321 */
1460 pending_scroll_selection = 0; 1322 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop();
1461 } 1324 }
1462#endif 1325#endif
1463#ifdef MOUSE_THRESHOLD 1326#ifdef MOUSE_THRESHOLD
1464 1327
1465 } 1328 }
… …
1515 return; 1378 return;
1516 } 1379 }
1517 1380
1518 /* FALLTHROUGH */ 1381 /* FALLTHROUGH */
1519 case ReparentNotify: 1382 case ReparentNotify:
1520 if ((Options & Opt_transparent) && check_our_parents ()) 1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1521 if (am_transparent)
1522 want_full_refresh = 1; 1384 want_full_refresh = 1;
1523 break; 1385 break;
1524#endif 1386#endif
1525 } 1387 }
1526} 1388}
1527 1389
… …
1683 upordown = 1; /* down */ 1545 upordown = 1; /* down */
1684 } 1546 }
1685 if (upordown) 1547 if (upordown)
1686 { 1548 {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1549#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1550 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1689#endif 1551#endif
1690 if (scr_page (upordown < 0 ? UP : DN, 1)) 1552 if (scr_page (upordown < 0 ? UP : DN, 1))
1691 { 1553 {
1692 if (upordown < 0) 1554 if (upordown < 0)
1693 scrollBar.setUp (); 1555 scrollBar.setUp ();
… …
1780 refresh_type &= ~SMOOTH_REFRESH; 1642 refresh_type &= ~SMOOTH_REFRESH;
1781#endif 1643#endif
1782 1644
1783 } 1645 }
1784#ifdef SELECTION_SCROLLING 1646#ifdef SELECTION_SCROLLING
1785 pending_scroll_selection=0; 1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop();
1786#endif 1649#endif
1787 if (ev.window == TermWin.vt) 1650 if (ev.window == TermWin.vt)
1788 { 1651 {
1789 if (reportmode) 1652 if (reportmode)
1790 { 1653 {
… …
1832 case Button5: 1695 case Button5:
1833 { 1696 {
1834 int i; 1697 int i;
1835 page_dirn v; 1698 page_dirn v;
1836 1699
1837 v = (ev.button == Button4) ? UP : DN; 1700 v = ev.button == Button4 ? UP : DN;
1701
1838 if (ev.state & ShiftMask) 1702 if (ev.state & ShiftMask)
1839 i = 1; 1703 i = 1;
1840 else if ((Options & Opt_mouseWheelScrollPage)) 1704 else if (Options & Opt_mouseWheelScrollPage)
1841 i = TermWin.nrow - 1; 1705 i = TermWin.nrow - 1;
1842 else 1706 else
1843 i = 5; 1707 i = 5;
1708
1844# ifdef MOUSE_SLIP_WHEELING 1709# ifdef MOUSE_SLIP_WHEELING
1845 if (ev.state & ControlMask) 1710 if (ev.state & ControlMask)
1846 { 1711 {
1847 mouse_slip_wheel_speed += (v ? -1 : 1); 1712 mouse_slip_wheel_speed += v ? -1 : 1;
1848 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY);
1849 } 1714 }
1850# endif 1715# endif
1851# ifdef JUMP_MOUSE_WHEEL 1716# ifdef JUMP_MOUSE_WHEEL
1852 scr_page (v, i); 1717 scr_page (v, i);
1853 scr_refresh (SMOOTH_REFRESH); 1718 scr_refresh (SMOOTH_REFRESH);
… …
1871 else if (isMenuBarWindow (ev.window)) 1736 else if (isMenuBarWindow (ev.window))
1872 menubar_control (ev); 1737 menubar_control (ev);
1873#endif 1738#endif
1874} 1739}
1875 1740
1876
1877#ifdef TRANSPARENT 1741#ifdef TRANSPARENT
1742#if TINTING
1743/* shading taken from eterm-0.9.2 */
1744/* RGB 15 */
1745
1746static void
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1754 /* No saturation */
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0x7c00) * rm;
1761 g = (b & 0x3e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1764 | ((g >> 8) & 0x3e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 }
1769 } else {
1770 for (y = h; --y >= 0;) {
1771 for (x = -w; x < 0; x++) {
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0x7c00) * rm;
1776 g = (b & 0x3e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 15) - 1);
1779 g |= (!(g >> 10) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1782 | ((g >> 8) & 0x3e0)
1783 | ((b >> 8) & 0x1f);
1784 }
1785 ptr += bpl;
1786 }
1787 }
1788}
1789
1790/* RGB 16 */
1791static void
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1793{
1794 unsigned char *ptr;
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 }
1814 } else {
1815 for (y = h; --y >= 0;) {
1816 for (x = -w; x < 0; x++) {
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 }
1830 ptr += bpl;
1831 }
1832 }
1833}
1834
1835/* RGB 24 */
1836static void
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1838{
1839 unsigned char *ptr;
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 }
1867 } else {
1868 for (y = h; --y >= 0;) {
1869 for (x = -(w * 3); x < 0; x += 3) {
1870 int r, g, b;
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 }
1898 ptr += bpl;
1899 }
1900 }
1901}
1902
1903/* RGB 32 */
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973}
1974
1975#endif
1976
1878/* 1977/*
1879 * Check our parents are still who we think they are. 1978 * Check our parents are still who we think they are.
1880 * Do transparency updates if required 1979 * Do transparency updates if required
1881 */ 1980 */
1882int 1981int
1883rxvt_term::check_our_parents () 1982rxvt_term::check_our_parents ()
1884{ 1983{
1885 int i, pchanged, aformat, have_pixmap, rootdepth; 1984 int i, pchanged, aformat, have_pixmap, rootdepth;
1886 unsigned long nitems, bytes_after; 1985 unsigned long nitems, bytes_after;
1887 Atom atype; 1986 Atom atype;
1888 unsigned char *prop = NULL; 1987 unsigned char *prop = NULL;
1889 Window root, oldp, *list; 1988 Window root, oldp, *list;
1890 Pixmap rootpixmap = None; 1989 Pixmap rootpixmap = None;
1891 XWindowAttributes wattr, wrootattr; 1990 XWindowAttributes wattr, wrootattr;
1892 1991
1893 pchanged = 0; 1992 pchanged = 0;
1894 1993
1895 if (! (Options & Opt_transparent)) 1994 if (!(Options & Opt_transparent))
1896 return pchanged; /* Don't try any more */ 1995 return pchanged; /* Don't try any more */
1897 1996
1898 XGetWindowAttributes (display->display, display->root, &wrootattr); 1997 XGetWindowAttributes (display->display, display->root, &wrootattr);
1899 rootdepth = wrootattr.depth; 1998 rootdepth = wrootattr.depth;
1900 1999
1901 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2001
1902 if (rootdepth != wattr.depth) 2002 if (rootdepth != wattr.depth)
1903 { 2003 {
1904 if (am_transparent) 2004 if (am_transparent)
1905 { 2005 {
1906 pchanged = 1; 2006 pchanged = 1;
1907 XSetWindowBackground (display->display, TermWin.vt, 2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1908 PixColors[Color_bg]);
1909 am_transparent = am_pixmap_trans = 0; 2008 am_transparent = am_pixmap_trans = 0;
1910 } 2009 }
2010
1911 return pchanged; /* Don't try any more */ 2011 return pchanged; /* Don't try any more */
1912 } 2012 }
1913 2013
1914 /* Get all X ops out of the queue so that our information is up-to-date. */ 2014 /* Get all X ops out of the queue so that our information is up-to-date. */
1915 XSync (display->display, False); 2015 XSync (display->display, False);
… …
1917 /* 2017 /*
1918 * Make the frame window set by the window manager have 2018 * Make the frame window set by the window manager have
1919 * the root background. Some window managers put multiple nested frame 2019 * the root background. Some window managers put multiple nested frame
1920 * windows for each client, so we have to take care about that. 2020 * windows for each client, so we have to take care about that.
1921 */ 2021 */
1922 i = (xa[XA_XROOTPMAPID] != 0 2022 i = (xa[XA_XROOTPMAPID]
1923 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1924 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1925 &nitems, &bytes_after, &prop) == Success)); 2025 &nitems, &bytes_after, &prop) == Success);
2026
2027 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success);
2032
1926 if (!i || prop == NULL) 2033 if (!i || prop == NULL)
1927 have_pixmap = 0; 2034 have_pixmap = 0;
1928 else 2035 else
1929 { 2036 {
1930 have_pixmap = 1; 2037 have_pixmap = 1;
1931 rootpixmap = * ((Pixmap *)prop); 2038 rootpixmap = *(Pixmap *)prop;
1932 XFree (prop); 2039 XFree (prop);
1933 } 2040 }
2041
1934 if (have_pixmap) 2042 if (have_pixmap)
1935 { 2043 {
1936 /* 2044 /*
1937 * Copy display->root pixmap transparency 2045 * Copy display->root pixmap transparency
1938 */ 2046 */
… …
1942 XImage *image; 2050 XImage *image;
1943 GC gc; 2051 GC gc;
1944 XGCValues gcvalue; 2052 XGCValues gcvalue;
1945 2053
1946 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1947 0, 0, &sx, &sy, &cr); 2055 0, 0, &sx, &sy, &cr);
1948 nw = (unsigned int)szHint.width; 2056 nw = (unsigned int)szHint.width;
1949 nh = (unsigned int)szHint.height; 2057 nh = (unsigned int)szHint.height;
1950 nx = ny = 0; 2058 nx = ny = 0;
1951 2059
1952 if (sx < 0) 2060 if (sx < 0)
… …
1964 } 2072 }
1965 2073
1966 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1967 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1968 allowedxerror = -1; 2076 allowedxerror = -1;
1969 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1970 ZPixmap); 2078
1971 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1972 /* XXX: may need a delay here? */ 2080 /* XXX: may need a delay here? */
1973 allowedxerror = 0; 2081 allowedxerror = 0;
2082
1974 if (image == NULL) 2083 if (image == NULL)
1975 { 2084 {
1976 if (am_transparent && am_pixmap_trans) 2085 if (am_transparent && am_pixmap_trans)
1977 { 2086 {
1978 pchanged = 1; 2087 pchanged = 1;
… …
1980 { 2089 {
1981 XFreePixmap (display->display, TermWin.pixmap); 2090 XFreePixmap (display->display, TermWin.pixmap);
1982 TermWin.pixmap = None; 2091 TermWin.pixmap = None;
1983 } 2092 }
1984 } 2093 }
2094
1985 am_pixmap_trans = 0; 2095 am_pixmap_trans = 0;
1986 } 2096 }
1987 else 2097 else
1988 { 2098 {
1989 if (TermWin.pixmap != None) 2099 if (TermWin.pixmap != None)
1990 XFreePixmap (display->display, TermWin.pixmap); 2100 XFreePixmap (display->display, TermWin.pixmap);
2101
2102#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint))
2104 {
2105 unsigned short shade, rm, gm, bm;
2106
2107 PixColors[Color_tint].get (display, rm, gm, bm);
2108
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 }
2120#endif
2121
1991 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1992 (unsigned int)szHint.width,
1993 (unsigned int)szHint.height, 2123 szHint.width, szHint.height, image->depth);
1994 (unsigned int)image->depth);
1995 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1996 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1997 nx, ny, (unsigned int)image->width,
1998 (unsigned int)image->height); 2126 nx, ny, image->width, image->height);
1999 XFreeGC (display->display, gc); 2127 XFreeGC (display->display, gc);
2000 XDestroyImage (image); 2128 XDestroyImage (image);
2001 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2002 TermWin.pixmap); 2130 TermWin.pixmap);
2131
2003 if (!am_transparent || !am_pixmap_trans) 2132 if (!am_transparent || !am_pixmap_trans)
2004 pchanged = 1; 2133 pchanged = 1;
2134
2005 am_transparent = am_pixmap_trans = 1; 2135 am_transparent = am_pixmap_trans = 1;
2006 } 2136 }
2007 } 2137 }
2008 2138
2009 if (!am_pixmap_trans) 2139 if (!am_pixmap_trans)
2010 { 2140 {
2011 unsigned int n; 2141 unsigned int n;
2012 /* 2142 /*
2013 * InheritPixmap transparency 2143 * InheritPixmap transparency
2014 */ 2144 */
2015 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2016 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2017 i++)
2018 { 2147 {
2019 oldp = TermWin.parent[i]; 2148 oldp = TermWin.parent[i];
2020 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2149 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2021 &TermWin.parent[i], &list, &n); 2150 &TermWin.parent[i], &list, &n);
2022 XFree (list); 2151 XFree (list);
2023 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153
2024 if (TermWin.parent[i] == display->root) 2154 if (TermWin.parent[i] == display->root)
2025 { 2155 {
2026 if (oldp != None) 2156 if (oldp != None)
2027 pchanged = 1; 2157 pchanged = 1;
2158
2028 break; 2159 break;
2029 } 2160 }
2161
2030 if (oldp != TermWin.parent[i]) 2162 if (oldp != TermWin.parent[i])
2031 pchanged = 1; 2163 pchanged = 1;
2032 } 2164 }
2033 2165
2034 n = 0; 2166 n = 0;
… …
2045 break; 2177 break;
2046 } 2178 }
2047 } 2179 }
2048 } 2180 }
2049 2181
2050 if (n > (int) (sizeof (TermWin.parent) 2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2051 / sizeof (TermWin.parent[0])))
2052 { 2183 {
2053 D_X ((stderr, "InheritPixmap Turning off")); 2184 D_X ((stderr, "InheritPixmap Turning off"));
2054 XSetWindowBackground (display->display, TermWin.parent[0], 2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2055 PixColors[Color_fg]);
2056 XSetWindowBackground (display->display, TermWin.vt, 2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2057 PixColors[Color_bg]);
2058 am_transparent = 0; 2187 am_transparent = 0;
2059 /* XXX: also turn off Opt_transparent? */ 2188 /* XXX: also turn off Opt_transparent? */
2060 } 2189 }
2061 else 2190 else
2062 { 2191 {
2192#if WAIT_FOR_WM
2063 /* wait (an arbitrary period) for the WM to do its thing 2193 /* wait (an arbitrary period) for the WM to do its thing
2064 * needed for fvwm2.2.2 (and before?) */ 2194 * 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); 2195 sleep (1);
2073# endif 2196#endif
2074 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2075 for (n = 0; n < (unsigned int)i; n++) 2198 for (n = 0; n < (unsigned int)i; n++)
2076 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2077 ParentRelative); 2200
2078 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2079 ParentRelative);
2080 am_transparent = 1; 2202 am_transparent = 1;
2081 } 2203 }
2082 2204
2083 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2084 TermWin.parent[i] = None; 2206 TermWin.parent[i] = None;
2085 } 2207 }
2208
2086 return pchanged; 2209 return pchanged;
2087} 2210}
2088#endif 2211#endif
2089 2212
2090/*}}} */ 2213/*}}} */
2214
2215bool
2216rxvt_term::cmd_parse ()
2217{
2218 bool flag = false;
2219 unicode_t ch = NOCHAR;
2220 unsigned char *seq_begin; // remember start of esc-sequence here
2221
2222 for (;;)
2223 {
2224 if (ch == NOCHAR)
2225 {
2226 seq_begin = cmdbuf_ptr;
2227 ch = next_char ();
2228 }
2229
2230 if (ch == NOCHAR) // TODO: improve
2231 break;
2232
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 {
2235 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ];
2237 bool refreshnow = false;
2238 int nlines = 0;
2239 unicode_t *str = buf;
2240
2241 *str++ = ch;
2242
2243 for (;;)
2244 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break;
2250
2251 *str++ = ch;
2252
2253 if (ch == C0_LF)
2254 {
2255 nlines++;
2256 refresh_count++;
2257
2258 if (! (Options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2260 {
2261 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR;
2264 break;
2265 }
2266
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1)
2269 {
2270 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0;
2272 str = buf;
2273 }
2274 }
2275
2276 if (str >= buf + UBUFSIZ)
2277 {
2278 ch = NOCHAR;
2279 break;
2280 }
2281 }
2282
2283 scr_add_lines (buf, nlines, str - buf);
2284
2285 /*
2286 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */
2294 if (refreshnow)
2295 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++;
2298 else
2299 scr_refresh (refresh_type);
2300 }
2301
2302 }
2303 else
2304 {
2305 try
2306 {
2307 process_nonprinting (ch);
2308 }
2309 catch (const class out_of_input &o)
2310 {
2311 // we ran out of input, retry later
2312 cmdbuf_ptr = seq_begin;
2313 break;
2314 }
2315
2316 ch = NOCHAR;
2317 }
2318 }
2319
2320 return flag;
2321}
2322
2323// read the next octet
2324unicode_t
2325rxvt_term::next_octet ()
2326{
2327 return cmdbuf_ptr < cmdbuf_endp
2328 ? *cmdbuf_ptr++
2329 : NOCHAR;
2330}
2331
2332// read the next character
2333unicode_t
2334rxvt_term::next_char ()
2335{
2336 while (cmdbuf_ptr < cmdbuf_endp)
2337 {
2338 // assume 7-bit to be ascii ALWAYS
2339 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2340 return *cmdbuf_ptr++;
2341
2342 wchar_t wc;
2343 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2344
2345 if (len == (size_t)-2)
2346 {
2347 // the mbstate stores incomplete sequences. didn't know this :/
2348 cmdbuf_ptr = cmdbuf_endp;
2349 break;
2350 }
2351
2352 if (len == (size_t)-1)
2353 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2354
2355 // assume wchar == unicode
2356 cmdbuf_ptr += len;
2357 return wc;
2358 }
2359
2360 return NOCHAR;
2361}
2362
2363/* rxvt_cmd_getc () - Return next input character */
2364/*
2365 * Return the next input character after first passing any keyboard input
2366 * to the command.
2367 */
2368unicode_t
2369rxvt_term::cmd_getc ()
2370{
2371 unicode_t c = next_char ();
2372
2373 if (c == NOCHAR)
2374 throw out_of_input;
2375
2376 return c;
2377}
2378
2379unicode_t
2380rxvt_term::cmd_get8 ()
2381{
2382 unicode_t c = next_octet ();
2383
2384 if (c == NOCHAR)
2385 throw out_of_input;
2386
2387 return c;
2388}
2091 2389
2092/*{{{ print pipe */ 2390/*{{{ print pipe */
2093/*----------------------------------------------------------------------*/ 2391/*----------------------------------------------------------------------*/
2094#ifdef PRINTPIPE 2392#ifdef PRINTPIPE
2095FILE * 2393FILE *
2096rxvt_term::popen_printer () 2394rxvt_term::popen_printer ()
2097{ 2395{
2098 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2396 FILE *stream = popen (rs[Rs_print_pipe], "w");
2099 2397
2100 if (stream == NULL) 2398 if (stream == NULL)
2101 rxvt_print_error ("can't open printer pipe"); 2399 rxvt_warn ("can't open printer pipe, not printing.\n");
2400
2102 return stream; 2401 return stream;
2103} 2402}
2104 2403
2105int 2404int
2106rxvt_term::pclose_printer (FILE *stream) 2405rxvt_term::pclose_printer (FILE *stream)
2107{ 2406{
2108 fflush (stream); 2407 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); 2408 return pclose (stream);
2115# endif
2116} 2409}
2117 2410
2118/* 2411/*
2119 * simulate attached vt100 printer 2412 * simulate attached vt100 printer
2120 */ 2413 */
2121void 2414void
2122rxvt_term::process_print_pipe () 2415rxvt_term::process_print_pipe ()
2123{ 2416{
2124 int done; 2417 int done;
2125 FILE *fd; 2418 FILE *fd;
2126 2419
2127 if ((fd = popen_printer ()) == NULL) 2420 if ((fd = popen_printer ()) == NULL)
2128 return; 2421 return;
2129 2422
2130 /* 2423 /*
2131 * Send all input to the printer until either ESC[4i or ESC[?4i 2424 * Send all input to the printer until either ESC[4i or ESC[?4i
2132 * is received. 2425 * is received.
2133 */ 2426 */
2134 for (done = 0; !done;) 2427 for (done = 0; !done;)
2135 { 2428 {
2136 unsigned char buf[8]; 2429 unsigned char buf[8];
2137 unsigned char ch; 2430 unicode_t ch;
2138 unsigned int i, len; 2431 unsigned int i, len;
2139 2432
2140 if ((ch = cmd_getc ()) != C0_ESC) 2433 if ((ch = cmd_getc ()) != C0_ESC)
2141 { 2434 {
2142 if (putc (ch, fd) == EOF) 2435 if (putc (ch, fd) == EOF)
2143 break; /* done = 1 */ 2436 break; /* done = 1 */
… …
2158 { 2451 {
2159 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2160 break; /* done = 1 */ 2453 break; /* done = 1 */
2161 } 2454 }
2162 } 2455 }
2456
2163 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2164 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2165 { 2459 {
2166 done = 1; 2460 done = 1;
2167 break; 2461 break;
2168 } 2462 }
2169 } 2463 }
2170 } 2464 }
2465
2171 pclose_printer (fd); 2466 pclose_printer (fd);
2172} 2467}
2173#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2174/*}}} */ 2469/*}}} */
2175 2470
2176/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2177enum { 2472enum {
2178 C1_40 = 0x40, 2473 C1_40 = 0x40,
2179 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2474 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2180 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2475 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2181 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2476 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2182 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2477 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2183}; 2478};
2184/* *INDENT-ON* */ 2479/* *INDENT-ON* */
2185 2480
2186/*{{{ process non-printing single characters */ 2481/*{{{ process non-printing single characters */
2187void 2482void
2188rxvt_term::process_nonprinting (unsigned char ch) 2483rxvt_term::process_nonprinting (unicode_t ch)
2189{ 2484{
2190 switch (ch) 2485 switch (ch)
2191 { 2486 {
2487 case C0_ESC:
2488 process_escape_seq ();
2489 break;
2192 case C0_ENQ: /* terminal Status */ 2490 case C0_ENQ: /* terminal Status */
2193 if (rs[Rs_answerbackstring]) 2491 if (rs[Rs_answerbackstring])
2194 tt_write (
2195 (const unsigned char *)rs[Rs_answerbackstring], 2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2196 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2197 else 2494 else
2198 tt_write ((unsigned char *)VT100_ANS, 2495 tt_write ((unsigned char *)VT100_ANS,
2199 (unsigned int)STRLEN (VT100_ANS)); 2496 (unsigned int)STRLEN (VT100_ANS));
2200 break; 2497 break;
2201 case C0_BEL: /* bell */ 2498 case C0_BEL: /* bell */
2202 scr_bell (); 2499 scr_bell ();
2203 break; 2500 break;
2204 case C0_BS: /* backspace */ 2501 case C0_BS: /* backspace */
… …
2219 scr_charset_choose (1); 2516 scr_charset_choose (1);
2220 break; 2517 break;
2221 case C0_SI: /* shift in - acs */ 2518 case C0_SI: /* shift in - acs */
2222 scr_charset_choose (0); 2519 scr_charset_choose (0);
2223 break; 2520 break;
2521
2522#ifdef EIGHT_BIT_CONTROLS
2523 // 8-bit controls
2524 case 0x90: /* DCS */
2525 process_dcs_seq ();
2526 break;
2527 case 0x9b: /* CSI */
2528 process_csi_seq ();
2529 break;
2530 case 0x9d: /* CSI */
2531 process_osc_seq ();
2532 break;
2533#endif
2224 } 2534 }
2225} 2535}
2226/*}}} */ 2536/*}}} */
2227 2537
2228 2538
2229/*{{{ process VT52 escape sequences */ 2539/*{{{ process VT52 escape sequences */
2230void 2540void
2231rxvt_term::process_escape_vt52 (unsigned char ch) 2541rxvt_term::process_escape_vt52 (unicode_t ch)
2232{ 2542{
2233 int row, col; 2543 int row, col;
2234 2544
2235 switch (ch) 2545 switch (ch)
2236 { 2546 {
… …
2288 2598
2289/*{{{ process escape sequences */ 2599/*{{{ process escape sequences */
2290void 2600void
2291rxvt_term::process_escape_seq () 2601rxvt_term::process_escape_seq ()
2292{ 2602{
2293 unsigned char ch = cmd_getc (); 2603 unicode_t ch = cmd_getc ();
2294 2604
2295 if (PrivateModes & PrivMode_vt52) 2605 if (PrivateModes & PrivMode_vt52)
2296 { 2606 {
2297 process_escape_vt52 (ch); 2607 process_escape_vt52 (ch);
2298 return; 2608 return;
… …
2346 break; 2656 break;
2347 2657
2348 /* 8.3.87: NEXT LINE */ 2658 /* 8.3.87: NEXT LINE */
2349 case C1_NEL: /* ESC E */ 2659 case C1_NEL: /* ESC E */
2350 { 2660 {
2351 uint32_t nlcr[] = { '\n', '\r' }; 2661 unicode_t nlcr[] = { C0_LF, C0_CR };
2352 scr_add_lines (nlcr, 1, 2); 2662 scr_add_lines (nlcr, 1, 2);
2353 } 2663 }
2354 break; 2664 break;
2355 2665
2356 /* kidnapped escape sequence: Should be 8.3.48 */ 2666 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2367 case C1_RI: /* ESC M */ 2677 case C1_RI: /* ESC M */
2368 scr_index (DN); 2678 scr_index (DN);
2369 break; 2679 break;
2370 2680
2371 /* 8.3.142: SINGLE-SHIFT TWO */ 2681 /* 8.3.142: SINGLE-SHIFT TWO */
2372 /*case C1_SS2: scr_single_shift (2); break; */ 2682 /*case C1_SS2: scr_single_shift (2); break; */
2373 2683
2374 /* 8.3.143: SINGLE-SHIFT THREE */ 2684 /* 8.3.143: SINGLE-SHIFT THREE */
2375 /*case C1_SS3: scr_single_shift (3); break; */ 2685 /*case C1_SS3: scr_single_shift (3); break; */
2376 2686
2377 /* 8.3.27: DEVICE CONTROL STRING */ 2687 /* 8.3.27: DEVICE CONTROL STRING */
2378 case C1_DCS: /* ESC P */ 2688 case C1_DCS: /* ESC P */
2379 process_dcs_seq (); 2689 process_dcs_seq ();
2380 break; 2690 break;
… …
2395 process_osc_seq (); 2705 process_osc_seq ();
2396 break; 2706 break;
2397 2707
2398 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE */
2399 case 'c': 2709 case 'c':
2710 mbstate.reset ();
2400 scr_poweron (); 2711 scr_poweron ();
2401 scrollbar_show (1); 2712 scrollbar_show (1);
2402 break; 2713 break;
2403 2714
2404 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2416 2727
2417/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2728/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2418/* *INDENT-OFF* */ 2729/* *INDENT-OFF* */
2419enum { 2730enum {
2420 CSI_ICH = 0x40, 2731 CSI_ICH = 0x40,
2421 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2732 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2422 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2733 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2423 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2734 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2424 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2735 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2425 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2736 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2426 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2737 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2441 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2752 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2442 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2753 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2443 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2754 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2444 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2755 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2445 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2756 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2446 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2757 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2447 }; 2758 };
2448/* *INDENT-ON* */ 2759/* *INDENT-ON* */
2449 2760
2450void 2761void
2451rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
2452{ 2763{
2453 unsigned char ch, priv, i; 2764 unicode_t ch, priv, i;
2454 unsigned int nargs, p; 2765 unsigned int nargs, p;
2455 int n, ndef; 2766 int n, ndef;
2456 int arg[ESC_ARGS]; 2767 int arg[ESC_ARGS];
2457 2768
2458 for (nargs = ESC_ARGS; nargs > 0;) 2769 for (nargs = ESC_ARGS; nargs > 0;)
2459 arg[--nargs] = 0; 2770 arg[--nargs] = 0;
2460 2771
2461 priv = 0; 2772 priv = 0;
… …
2463 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2464 { /* '<' '=' '>' '?' */ 2775 { /* '<' '=' '>' '?' */
2465 priv = ch; 2776 priv = ch;
2466 ch = cmd_getc (); 2777 ch = cmd_getc ();
2467 } 2778 }
2779
2468 /* read any numerical arguments */ 2780 /* read any numerical arguments */
2469 for (n = -1; ch < CSI_ICH; ) 2781 for (n = -1; ch < CSI_ICH; )
2470 { 2782 {
2471 if (isdigit (ch)) 2783 if (isdigit (ch))
2472 { 2784 {
… …
2479 { 2791 {
2480 if (nargs < ESC_ARGS) 2792 if (nargs < ESC_ARGS)
2481 arg[nargs++] = n; 2793 arg[nargs++] = n;
2482 n = -1; 2794 n = -1;
2483 } 2795 }
2484 else if (ch == '\b') 2796 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); 2797 process_nonprinting (ch);
2496 } 2798
2497 ch = cmd_getc (); 2799 ch = cmd_getc ();
2498 } 2800 }
2499 2801
2500 if (ch > CSI_7F) 2802 if (ch > CSI_7F)
2501 return; 2803 return;
… …
2659 tt_printf ("\033[0n"); 2961 tt_printf ("\033[0n");
2660 break; 2962 break;
2661 case 6: /* CPR requested */ 2963 case 6: /* CPR requested */
2662 scr_report_position (); 2964 scr_report_position ();
2663 break; 2965 break;
2664#if defined (ENABLE_DISPLAY_ANSWER)
2665 case 7: /* unofficial extension */ 2966 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure)
2666 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2968 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2667 break; 2969 break;
2668#endif
2669 case 8: /* unofficial extension */ 2970 case 8: /* unofficial extension */
2670 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2671 break; 2972 break;
2672 } 2973 }
2673 break; 2974 break;
2674 2975
2675 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2976 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2743#endif 3044#endif
2744 3045
2745 case CSI_78: /* DECREQTPARM */ 3046 case CSI_78: /* DECREQTPARM */
2746 if (arg[0] == 0 || arg[0] == 1) 3047 if (arg[0] == 0 || arg[0] == 1)
2747 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3048 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2748 /* FALLTHROUGH */ 3049 break;
2749 3050
2750 default: 3051 default:
2751 break; 3052 break;
2752 } 3053 }
2753} 3054}
… …
2756#ifndef NO_FRILLS 3057#ifndef NO_FRILLS
2757/* ARGSUSED */ 3058/* ARGSUSED */
2758void 3059void
2759rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3060rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2760{ 3061{
2761 int x, y; 3062 int x, y;
2762#if 0
2763 char *s;
2764#endif
2765 XWindowAttributes wattr; 3063 XWindowAttributes wattr;
2766 Window wdummy; 3064 Window wdummy;
2767 3065
2768 if (nargs == 0) 3066 if (nargs == 0)
2769 return; 3067 return;
3068
2770 switch (args[0]) 3069 switch (args[0])
2771 { 3070 {
2772 /* 3071 /*
2773 * commands 3072 * commands
2774 */ 3073 */
2775 case 1: /* deiconify window */ 3074 case 1: /* deiconify window */
2776 XMapWindow (display->display, TermWin.parent[0]); 3075 XMapWindow (display->display, TermWin.parent[0]);
2777 break; 3076 break;
2778 case 2: /* iconify window */ 3077 case 2: /* iconify window */
2779 XIconifyWindow (display->display, TermWin.parent[0], 3078 XIconifyWindow (display->display, TermWin.parent[0],
… …
2796 break; 3095 break;
2797 case 8: /* set size (chars) */ 3096 case 8: /* set size (chars) */
2798 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3097 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2799 (unsigned int) (args[1] * TermWin.fheight)); 3098 (unsigned int) (args[1] * TermWin.fheight));
2800 break; 3099 break;
3100
3101 //case 9: NYI, TODO, restore maximized window or maximize window
2801 default: 3102 default:
2802 if (args[0] >= 24) /* set height (chars) */ 3103 if (args[0] >= 24) /* set height (chars) */
2803 set_widthheight ((unsigned int)TermWin.width, 3104 set_widthheight ((unsigned int)TermWin.width,
2804 (unsigned int) (args[1] * TermWin.fheight)); 3105 (unsigned int) (args[1] * TermWin.fheight));
2805 break; 3106 break;
3107
3108
2806 /* 3109 /*
2807 * reports - some output format copied from XTerm 3110 * reports - some output format copied from XTerm
2808 */ 3111 */
2809 case 11: /* report window state */ 3112 case 11: /* report window state */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2812 break; 3115 break;
2813 case 13: /* report window position */ 3116 case 13: /* report window position */
2814 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2815 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2816 -wattr.border_width, -wattr.border_width, 3119 -wattr.border_width, -wattr.border_width,
2817 &x, &y, &wdummy); 3120 &x, &y, &wdummy);
2818 tt_printf ("\033[3;%d;%dt", x, y); 3121 tt_printf ("\033[3;%d;%dt", x, y);
2819 break; 3122 break;
2820 case 14: /* report window size (pixels) */ 3123 case 14: /* report window size (pixels) */
2821 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2822 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2823 break; 3126 break;
2824 case 18: /* report window size (chars) */ 3127 case 18: /* report text area size (chars) */
2825 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2826 break; 3129 break;
2827#if 0 /* XXX: currently disabled due to security concerns */ 3130 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3132 break;
2828 case 20: /* report icon label */ 3133 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 {
3136 char *s;
2829 XGetIconName (display->display, TermWin.parent[0], &s); 3137 XGetIconName (display->display, TermWin.parent[0], &s);
2830 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3139 }
2831 break; 3140 break;
2832 case 21: /* report window title */ 3141 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 {
3144 char *s;
2833 XFetchName (display->display, TermWin.parent[0], &s); 3145 XFetchName (display->display, TermWin.parent[0], &s);
2834 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3147 }
2835 break; 3148 break;
2836#endif
2837
2838 } 3149 }
2839} 3150}
2840#endif 3151#endif
2841 3152
2842/*----------------------------------------------------------------------*/ 3153/*----------------------------------------------------------------------*/
2843/* 3154/*
2844 * get input up until STRING TERMINATOR (or BEL) 3155 * get input up until STRING TERMINATOR (or BEL)
2845 * ends_how is terminator used. returned input must be free ()d 3156 * ends_how is terminator used. returned input must be free()'d
2846 */ 3157 */
2847unsigned char * 3158unsigned char *
2848rxvt_term::get_to_st (unsigned char *ends_how) 3159rxvt_term::get_to_st (unicode_t &ends_how)
2849{ 3160{
2850 int seen_esc = 0; /* seen escape? */ 3161 unicode_t prev = 0, ch;
2851 unsigned int n = 0; 3162 unsigned int n = 0;
2852 unsigned char *s; 3163 unsigned char *s;
2853 unsigned char ch, string[STRING_MAX]; 3164 unsigned char string[STRING_MAX];
2854 3165
2855 for (; (ch = cmd_getc ());) 3166 while ((ch = cmd_getc ()) != NOCHAR)
2856 { 3167 {
2857 if (ch == C0_BEL
2858 || ch == CHAR_ST
2859 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2860 break;
2861 if (ch == C0_ESC) 3168 if (prev == C0_ESC)
2862 {
2863 seen_esc = 1;
2864 continue;
2865 } 3169 {
2866 else if (ch == '\t') 3170 if (ch == 0x5c) /* 7bit ST */
2867 ch = ' '; /* translate '\t' to space */ 3171 break;
2868 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3172 else
3173 return NULL;
3174 }
3175 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break;
3177 else if (ch < 0x20)
2869 return NULL; /* other control character - exit */ 3178 return NULL; /* other control character - exit */
3179
2870 if (n < sizeof (string) - 1) 3180 if (n >= sizeof (string) - 1)
3181 // stop at some sane length
3182 return NULL;
3183
3184 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else
2871 string[n++] = ch; 3190 string[n++] = prev = ch;
2872 seen_esc = 0;
2873 } 3191 }
3192
2874 string[n++] = '\0'; 3193 string[n++] = '\0';
3194
2875 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2876 return NULL; 3196 return NULL;
3197
2877 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3198 ends_how = (ch == 0x5c ? C0_ESC : ch);
2878 STRNCPY (s, string, n); 3199 STRNCPY (s, string, n);
2879 return s; 3200 return s;
2880} 3201}
2881 3202
2882/*----------------------------------------------------------------------*/ 3203/*----------------------------------------------------------------------*/
… …
2884 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2885 */ 3206 */
2886void 3207void
2887rxvt_term::process_dcs_seq () 3208rxvt_term::process_dcs_seq ()
2888{ 3209{
2889 unsigned char eh, *s; 3210 unsigned char *s;
3211 unicode_t eh;
3212
2890 /* 3213 /*
2891 * Not handled yet 3214 * Not handled yet
2892 */ 3215 */
2893 s = get_to_st (&eh); 3216 s = get_to_st (eh);
2894 if (s) 3217 if (s)
2895 free (s); 3218 free (s);
3219
2896 return; 3220 return;
2897} 3221}
2898 3222
2899/*----------------------------------------------------------------------*/ 3223/*----------------------------------------------------------------------*/
2900/* 3224/*
2901 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3225 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2902 */ 3226 */
2903void 3227void
2904rxvt_term::process_osc_seq () 3228rxvt_term::process_osc_seq ()
2905{ 3229{
2906 unsigned char ch, eh, *s; 3230 unicode_t ch, eh;
2907 int arg; 3231 int arg;
2908 3232
2909 ch = cmd_getc (); 3233 ch = cmd_getc ();
2910 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3234 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2911 arg = arg * 10 + (ch - '0'); 3235 arg = arg * 10 + (ch - '0');
2912 3236
2913 if (ch == ';') 3237 if (ch == ';')
2914 { 3238 {
2915 s = get_to_st (&eh); 3239 unsigned char *s = get_to_st (eh);
3240
2916 if (s) 3241 if (s)
2917 { 3242 {
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); 3243 process_xterm_seq (arg, (char *)s, eh);
2930 free (s); 3244 free (s);
2931 } 3245 }
2932 } 3246 }
2933} 3247}
3248
3249void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3251{
3252 if (str[0] == '?' && !str[1])
3253 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 }
3261 else
3262 set_window_color (color, str);
3263}
3264
2934/* 3265/*
2935 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2936 * 0 = change iconName/title 3267 * 0 = change iconName/title
2937 * 1 = change iconName 3268 * 1 = change iconName
2938 * 2 = change title 3269 * 2 = change title
2939 * 4 = change color 3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
2940 * 12 = change text color 3273 * 12 = change text color
2941 * 13 = change mouse foreground color 3274 * 13 = change mouse foreground color
2942 * 17 = change highlight character colour 3275 * 17 = change highlight character colour
2943 * 18 = change bold character color 3276 * 18 = change bold character color
2944 * 19 = change underlined character color 3277 * 19 = change underlined character color
2945 * 46 = change logfile (not implemented) 3278 * 46 = change logfile (not implemented)
2946 * 50 = change font 3279 * 50 = change font
2947 * 3280 *
2948 * rxvt extensions: 3281 * rxvt extensions:
2949 * 10 = menu (may change in future)
2950 * 20 = bg pixmap 3282 * 20 = bg pixmap
2951 * 39 = change default fg color 3283 * 39 = change default fg color
2952 * 49 = change default bg color 3284 * 49 = change default bg color
2953 * 55 = dump scrollback buffer and all of screen 3285 * 55 = dump scrollback buffer and all of screen
2954 * 701 = change locale 3286 * 701 = change locale
2955 * 702 = find font 3287 * 702 = find font
3288 * 703 = menu
2956 */ 3289 */
2957void 3290void
2958rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2959{ 3292{
2960 int changed = 0; 3293 int changed = 0;
2961 int color; 3294 int color;
2962 char *buf, *name; 3295 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1];
2963 3297
2964 assert (str != NULL); 3298 assert (str != NULL);
2965 switch (op) 3299 switch (op)
2966 { 3300 {
2967 case XTerm_name: 3301 case XTerm_name:
2968 set_title (str); 3302 set_title (str);
2969 /* FALLTHROUGH */ 3303 /* FALLTHROUGH */
2970 case XTerm_iconName: 3304 case XTerm_iconName:
2971 set_iconName (str); 3305 set_icon_name (str);
2972 break; 3306 break;
2973 case XTerm_title: 3307 case XTerm_title:
2974 set_title (str); 3308 set_title (str);
2975 break; 3309 break;
3310 case XTerm_property:
3311 if (str[0] == '?')
3312 {
3313 Atom prop = XInternAtom (display->display, str + 1, True);
3314 Atom actual_type;
3315 int actual_format;
3316 unsigned long nitems;
3317 unsigned long bytes_after;
3318 unsigned char *value = 0;
3319 const char *str = "";
3320
3321 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None
3327 && actual_format == 8)
3328 str = (const char *)(value);
3329
3330 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3331
3332 XFree (value);
3333 }
3334 else
3335 {
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337
3338 if (eq)
3339 {
3340 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0],
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 }
3346 else
3347 XDeleteProperty (display->display, TermWin.parent[0],
3348 display->atom (str));
3349 }
3350 break;
3351
2976 case XTerm_Color: 3352 case XTerm_Color:
2977 for (buf = (char *)str; buf && *buf;) 3353 for (buf = (char *)str; buf && *buf;)
2978 { 3354 {
2979 if ((name = STRCHR (buf, ';')) == NULL) 3355 if ((name = STRCHR (buf, ';')) == NULL)
2980 break; 3356 break;
3357
2981 *name++ = '\0'; 3358 *name++ = '\0';
2982 color = atoi (buf); 3359 color = atoi (buf);
3360
2983 if (color < 0 || color >= TOTAL_COLORS) 3361 if (color < 0 || color >= TOTAL_COLORS)
2984 break; 3362 break;
3363
2985 if ((buf = STRCHR (name, ';')) != NULL) 3364 if ((buf = STRCHR (name, ';')) != NULL)
2986 *buf++ = '\0'; 3365 *buf++ = '\0';
3366
3367 if (name[0] == '?' && !name[1])
3368 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 }
3376 else
2987 set_window_color (color + minCOLOR, name); 3377 set_window_color (color + minCOLOR, name);
2988 } 3378 }
3379 break;
3380 case XTerm_Color00:
3381 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3382 break;
3383 case XTerm_Color01:
3384 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2989 break; 3385 break;
2990#ifndef NO_CURSORCOLOR 3386#ifndef NO_CURSORCOLOR
2991 case XTerm_Color_cursor: 3387 case XTerm_Color_cursor:
2992 set_window_color (Color_cursor, str); 3388 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2993 break; 3389 break;
2994#endif 3390#endif
2995 case XTerm_Color_pointer: 3391 case XTerm_Color_pointer_fg:
2996 set_window_color (Color_pointer, str); 3392 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3393 break;
3394 case XTerm_Color_pointer_bg:
3395 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2997 break; 3396 break;
2998#ifndef NO_BOLD_UNDERLINE_REVERSE 3397#ifndef NO_BOLD_UNDERLINE_REVERSE
2999 case XTerm_Color_BD: 3398 case XTerm_Color_BD:
3000 set_window_color (Color_BD, str); 3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3001 break; 3400 break;
3002 case XTerm_Color_UL: 3401 case XTerm_Color_UL:
3003 set_window_color (Color_UL, str); 3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3004 break; 3403 break;
3005 case XTerm_Color_RV: 3404 case XTerm_Color_RV:
3006 set_window_color (Color_RV, str); 3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3007 break; 3406 break;
3008#endif 3407#endif
3009 3408
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: 3409 case XTerm_Pixmap:
3017 if (*str != ';') 3410 if (*str != ';')
3018 { 3411 {
3019#if XPM_BACKGROUND 3412#if XPM_BACKGROUND
3020 scale_pixmap (""); /* reset to default scaling */ 3413 scale_pixmap (""); /* reset to default scaling */
… …
3043 set_window_color (Color_fg, str); 3436 set_window_color (Color_fg, str);
3044 break; 3437 break;
3045 case XTerm_restoreBG: 3438 case XTerm_restoreBG:
3046 set_window_color (Color_bg, str); 3439 set_window_color (Color_bg, str);
3047 break; 3440 break;
3441
3048 case XTerm_logfile: 3442 case XTerm_logfile:
3443 // TODO, when secure mode?
3049 break; 3444 break;
3445
3050 case XTerm_font: 3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3051 change_font (str); 3457 change_font (str);
3052 break; 3458 break;
3459
3053#ifndef NO_FRILLS 3460#ifndef NO_FRILLS
3054 case XTerm_locale: 3461 case XTerm_locale:
3055 if (str[0] == '?' && !str[1]) 3462 if (query)
3056 tt_printf ("%-.250s\n", locale); 3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 }
3057 else 3467 else
3058 { 3468 {
3059 set_locale (str); 3469 set_locale (str);
3060# ifdef USE_XIM 3470# ifdef USE_XIM
3061 im_cb (); 3471 im_cb ();
3062# endif 3472# endif
3063 } 3473 }
3064 break; 3474 break;
3475
3065 case XTerm_findfont: 3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3066 { 3478 {
3067 int fid = TermWin.fontset->find_font (atoi (str)); 3479 int fid = TermWin.fontset->find_font (atoi (str));
3068 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3069 } 3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR
3487 case XTerm_Menu:
3488 if (Options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3070 break; 3490 break;
3071#endif 3491#endif
3072#if 0 3492#if 0
3073 case XTerm_dumpscreen: /* no error notices */ 3493 case XTerm_dumpscreen: /* no error notices */
3074 { 3494 {
3075 int fd; 3495 int fd;
3076 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3496 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3077 { 3497 {
3078 scr_dump (fd); 3498 scr_dump (fd);
3079 close (fd); 3499 close (fd);
3080 } 3500 }
3081 } 3501 }
3082 break; 3502 break;
3083#endif 3503#endif
3084
3085 } 3504 }
3086} 3505}
3087/*----------------------------------------------------------------------*/ 3506/*----------------------------------------------------------------------*/
3088 3507
3089/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3508/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3097 * so no need for fancy checking 3516 * so no need for fancy checking
3098 */ 3517 */
3099int 3518int
3100rxvt_term::privcases (int mode, unsigned long bit) 3519rxvt_term::privcases (int mode, unsigned long bit)
3101{ 3520{
3102 int state; 3521 int state;
3103 3522
3104 if (mode == 's') 3523 if (mode == 's')
3105 { 3524 {
3106 SavedModes |= (PrivateModes & bit); 3525 SavedModes |= (PrivateModes & bit);
3107 return -1; 3526 return -1;
… …
3112 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3113 else 3532 else
3114 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3115 PrivMode (state, bit); 3534 PrivMode (state, bit);
3116 } 3535 }
3536
3117 return state; 3537 return state;
3118} 3538}
3119 3539
3120/* we're not using priv _yet_ */ 3540/* we're not using priv _yet_ */
3121void 3541void
3122rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3542rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3123{ 3543{
3124 unsigned int i, j; 3544 unsigned int i, j;
3125 int state; 3545 int state;
3546
3126 static const struct 3547 static const struct
3127 { 3548 {
3128 const int argval; 3549 const int argval;
3129 const unsigned long bit; 3550 const unsigned long bit;
3130 } 3551 }
3552
3131 argtopriv[] = { 3553 argtopriv[] = {
3132 { 1, PrivMode_aplCUR }, 3554 { 1, PrivMode_aplCUR },
3133 { 2, PrivMode_vt52 }, 3555 { 2, PrivMode_vt52 },
3134 { 3, PrivMode_132 }, 3556 { 3, PrivMode_132 },
3135 { 4, PrivMode_smoothScroll }, 3557 { 4, PrivMode_smoothScroll },
… …
3141 { menuBar_esc, PrivMode_menuBar }, 3563 { menuBar_esc, PrivMode_menuBar },
3142#endif 3564#endif
3143#ifdef scrollBar_esc 3565#ifdef scrollBar_esc
3144 { scrollBar_esc, PrivMode_scrollBar }, 3566 { scrollBar_esc, PrivMode_scrollBar },
3145#endif 3567#endif
3568 // 18, 19 printing-related
3146 { 25, PrivMode_VisibleCursor }, 3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3147 { 35, PrivMode_ShiftKeys }, 3571 { 35, PrivMode_ShiftKeys }, // rxvt extension
3148 { 40, PrivMode_132OK }, 3572 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI
3575 // 46 start logging
3149 { 47, PrivMode_Screen }, 3576 { 47, PrivMode_Screen },
3150 { 66, PrivMode_aplKP }, 3577 { 66, PrivMode_aplKP },
3151#ifndef NO_BACKSPACE_KEY 3578#ifndef NO_BACKSPACE_KEY
3152 { 67, PrivMode_BackSpace }, 3579 { 67, PrivMode_BackSpace },
3153#endif 3580#endif
3154 { 1000, PrivMode_MouseX11 }, 3581 { 1000, PrivMode_MouseX11 },
3582 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3583 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3584 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3155 { 1010, PrivMode_TtyOutputInh }, 3585 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3156 { 1011, PrivMode_Keypress }, 3586 { 1011, PrivMode_Keypress }, // rxvt extension
3587 // 1035 enable modifiers for alt, numlock NYI
3588 // 1036 send ESC for meta keys NYI
3589 // 1037 send DEL for keypad delete NYI
3157 { 1047, PrivMode_Screen }, 3590 { 1047, PrivMode_Screen },
3591 // 1048 save and restore cursor
3158 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3592 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3593 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3159 }; 3594 };
3160 3595
3161 if (nargs == 0) 3596 if (nargs == 0)
3162 return; 3597 return;
3163 3598
… …
3178 state = privcases (mode, argtopriv[j].bit); 3613 state = privcases (mode, argtopriv[j].bit);
3179 break; 3614 break;
3180 } 3615 }
3181 3616
3182 /* extra handling for values with state unkept */ 3617 /* extra handling for values with state unkept */
3183 if (state == -1)
3184 switch (arg[i]) 3618 switch (arg[i])
3185 { 3619 {
3186 case 1048: /* alternative cursor save */ 3620 case 1048: /* alternative cursor save */
3621 if (Options & Opt_secondaryScreen)
3187 if (mode == 0) 3622 if (mode == 0)
3188 scr_cursor (RESTORE); 3623 scr_cursor (RESTORE);
3189 else if (mode == 1) 3624 else if (mode == 1)
3190 scr_cursor (SAVE); 3625 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; 3626 break;
3627 }
3628
3629 if (state >= 0)
3630 /* extra handling for values with valid 0 or 1 state */
3631 switch (arg[i])
3632 {
3633 /* case 1: - application cursor keys */
3634 case 2: /* VT52 mode */
3635 /* oddball mode. should be set regardless of set/reset
3636 * parameter. Return from VT52 mode with an ESC < from
3637 * within VT52 mode
3638 */
3639 PrivMode (1, PrivMode_vt52);
3640 break;
3207 case 3: /* 80/132 */ 3641 case 3: /* 80/132 */
3208 if (PrivateModes & PrivMode_132OK) 3642 if (PrivateModes & PrivMode_132OK)
3209 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3210 break; 3644 break;
3211 case 4: /* smooth scrolling */ 3645 case 4: /* smooth scrolling */
3212 if (state) 3646 if (state)
3213 Options &= ~Opt_jumpScroll; 3647 Options &= ~Opt_jumpScroll;
3214 else 3648 else
3215 Options |= Opt_jumpScroll; 3649 Options |= Opt_jumpScroll;
3216 break; 3650 break;
3217 case 5: /* reverse video */ 3651 case 5: /* reverse video */
3218 scr_rvideo_mode (state); 3652 scr_rvideo_mode (state);
3219 break; 3653 break;
3220 case 6: /* relative/absolute origins */ 3654 case 6: /* relative/absolute origins */
3221 scr_relative_origin (state); 3655 scr_relative_origin (state);
3222 break; 3656 break;
3223 case 7: /* autowrap */ 3657 case 7: /* autowrap */
3224 scr_autowrap (state); 3658 scr_autowrap (state);
3225 break; 3659 break;
3226 /* case 8: - auto repeat, can't do on a per window basis */ 3660 /* case 8: - auto repeat, can't do on a per window basis */
3227 case 9: /* X10 mouse reporting */ 3661 case 9: /* X10 mouse reporting */
3228 if (state) /* orthogonal */ 3662 if (state) /* orthogonal */
3229 PrivateModes &= ~ (PrivMode_MouseX11); 3663 PrivateModes &= ~PrivMode_MouseX11;
3230 break; 3664 break;
3231#ifdef menuBar_esc 3665#ifdef menuBar_esc
3232 case menuBar_esc: 3666 case menuBar_esc:
3233#ifdef MENUBAR 3667#ifdef MENUBAR
3234 map_menuBar (state); 3668 map_menuBar (state);
3235#endif 3669#endif
3236 break; 3670 break;
3237#endif 3671#endif
3238#ifdef scrollBar_esc 3672#ifdef scrollBar_esc
3239 case scrollBar_esc: 3673 case scrollBar_esc:
3240 if (scrollbar_mapping (state)) 3674 if (scrollbar_mapping (state))
3241 { 3675 {
3242 resize_all_windows (0, 0, 0); 3676 resize_all_windows (0, 0, 0);
3243 scr_touch (true); 3677 scr_touch (true);
3244 } 3678 }
3245 break; 3679 break;
3246#endif 3680#endif
3247 case 25: /* visible/invisible cursor */ 3681 case 25: /* visible/invisible cursor */
3248 scr_cursor_visible (state); 3682 scr_cursor_visible (state);
3249 break; 3683 break;
3250 /* case 35: - shift keys */ 3684 /* case 35: - shift keys */
3251 /* case 40: - 80 <--> 132 mode */ 3685 /* case 40: - 80 <--> 132 mode */
3252 case 47: /* secondary screen */ 3686 case 47: /* secondary screen */
3253 scr_change_screen (state); 3687 scr_change_screen (state);
3254 break; 3688 break;
3255 /* case 66: - application key pad */ 3689 /* case 66: - application key pad */
3256 /* case 67: - backspace key */ 3690 /* case 67: - backspace key */
3257 case 1000: /* X11 mouse reporting */ 3691 case 1000: /* X11 mouse reporting */
3258 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3259 PrivateModes &= ~ (PrivMode_MouseX10); 3693 PrivateModes &= ~PrivMode_MouseX10;
3260 break; 3694 break;
3261#if 0 3695#if 0
3262 case 1001: 3696 case 1001:
3263 break; /* X11 mouse highlighting */ 3697 break; /* X11 mouse highlighting */
3264#endif 3698#endif
3265 case 1010: /* scroll to bottom on TTY output inhibit */ 3699 case 1010: /* scroll to bottom on TTY output inhibit */
3266 if (state) 3700 if (state)
3267 Options &= ~Opt_scrollTtyOutput; 3701 Options &= ~Opt_scrollTtyOutput;
3268 else 3702 else
3269 Options |= Opt_scrollTtyOutput; 3703 Options |= Opt_scrollTtyOutput;
3270 break; 3704 break;
3271 case 1011: /* scroll to bottom on key press */ 3705 case 1011: /* scroll to bottom on key press */
3272 if (state) 3706 if (state)
3273 Options |= Opt_scrollTtyKeypress; 3707 Options |= Opt_scrollTtyKeypress;
3274 else 3708 else
3275 Options &= ~Opt_scrollTtyKeypress; 3709 Options &= ~Opt_scrollTtyKeypress;
3276 break; 3710 break;
3277 case 1047: /* secondary screen w/ clearing */ 3711 case 1047: /* secondary screen w/ clearing last */
3278 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3712 if (Options & Opt_secondaryScreen)
3279 if (current_screen != PRIMARY) 3713 if (current_screen != PRIMARY)
3280 scr_erase_screen (2); 3714 scr_erase_screen (2);
3281 scr_change_screen (state); 3715 scr_change_screen (state);
3282 /* FALLTHROUGH */
3283 default:
3284 break; 3716 break;
3717 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen)
3720 if (current_screen != PRIMARY)
3721 scr_erase_screen (2);
3722 break;
3723 default:
3724 break;
3285 } 3725 }
3286 } 3726 }
3287} 3727}
3288/*}}} */ 3728/*}}} */
3289 3729
3290/*{{{ process sgr sequences */ 3730/*{{{ process sgr sequences */
3291void 3731void
3292rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3732rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3293{ 3733{
3294 unsigned int i; 3734 unsigned int i;
3295 short rendset; 3735 short rendset;
3296 int rendstyle; 3736 int rendstyle;
3297 3737
3298 if (nargs == 0) 3738 if (nargs == 0)
3299 { 3739 {
3300 scr_rendition (0, ~RS_None); 3740 scr_rendition (0, ~RS_None);
3301 return; 3741 return;
3302 } 3742 }
3743
3303 for (i = 0; i < nargs; i++) 3744 for (i = 0; i < nargs; i++)
3304 { 3745 {
3305 rendset = -1; 3746 rendset = -1;
3306 switch (arg[i]) 3747 switch (arg[i])
3307 { 3748 {
… …
3315 rendset = 1, rendstyle = RS_Uline; 3756 rendset = 1, rendstyle = RS_Uline;
3316 break; 3757 break;
3317 case 5: 3758 case 5:
3318 rendset = 1, rendstyle = RS_Blink; 3759 rendset = 1, rendstyle = RS_Blink;
3319 break; 3760 break;
3761 //case 6: // scoansi light background
3320 case 7: 3762 case 7:
3321 rendset = 1, rendstyle = RS_RVid; 3763 rendset = 1, rendstyle = RS_RVid;
3764 break;
3765 case 8:
3766 // invisible. NYI
3767 break;
3768 //case 10: // scoansi acs off
3769 //case 11: // scoansi acs on
3770 //case 12: // scoansi acs on, |0x80
3771 case 21: // disable bold, blink and invis (some terminals use this)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink;
3322 break; 3773 break;
3323 case 22: 3774 case 22:
3324 rendset = 0, rendstyle = RS_Bold; 3775 rendset = 0, rendstyle = RS_Bold;
3325 break; 3776 break;
3326 case 24: 3777 case 24:
… …
3330 rendset = 0, rendstyle = RS_Blink; 3781 rendset = 0, rendstyle = RS_Blink;
3331 break; 3782 break;
3332 case 27: 3783 case 27:
3333 rendset = 0, rendstyle = RS_RVid; 3784 rendset = 0, rendstyle = RS_RVid;
3334 break; 3785 break;
3786 case 28:
3787 // visible. NYI
3788 break;
3335 } 3789 }
3790
3336 if (rendset != -1) 3791 if (rendset != -1)
3337 { 3792 {
3338 scr_rendition (rendset, rendstyle); 3793 scr_rendition (rendset, rendstyle);
3339 continue; /* for (;i;) */ 3794 continue; /* for (;i;) */
3340 } 3795 }
… …
3347 case 33: 3802 case 33:
3348 case 34: 3803 case 34:
3349 case 35: 3804 case 35:
3350 case 36: 3805 case 36:
3351 case 37: 3806 case 37:
3352 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3353 Color_fg);
3354 break; 3808 break;
3355#ifdef TTY_256COLOR 3809#ifdef TTY_256COLOR
3356 case 38: 3810 case 38:
3357 if (nargs > i + 2 && arg[i + 1] == 5) 3811 if (nargs > i + 2 && arg[i + 1] == 5)
3358 { 3812 {
3359 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3360 Color_fg);
3361 i += 2; 3814 i += 2;
3362 } 3815 }
3363 break; 3816 break;
3364#endif 3817#endif
3365 case 39: /* default fg */ 3818 case 39: /* default fg */
… …
3372 case 43: 3825 case 43:
3373 case 44: 3826 case 44:
3374 case 45: 3827 case 45:
3375 case 46: 3828 case 46:
3376 case 47: 3829 case 47:
3377 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3378 Color_bg);
3379 break; 3831 break;
3380#ifdef TTY_256COLOR 3832#ifdef TTY_256COLOR
3381 case 48: 3833 case 48:
3382 if (nargs > i + 2 && arg[i + 1] == 5) 3834 if (nargs > i + 2 && arg[i + 1] == 5)
3383 { 3835 {
3384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3385 Color_bg);
3386 i += 2; 3837 i += 2;
3387 } 3838 }
3388 break; 3839 break;
3389#endif 3840#endif
3390 case 49: /* default bg */ 3841 case 49: /* default bg */
… …
3419 } 3870 }
3420 } 3871 }
3421} 3872}
3422/*}}} */ 3873/*}}} */
3423 3874
3424/*{{{ process Rob Nation's own graphics mode sequences */ 3875/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3425void 3876void
3426rxvt_term::process_graphics () 3877rxvt_term::process_graphics ()
3427{ 3878{
3428 unsigned char ch, cmd = cmd_getc (); 3879 unicode_t ch, cmd = cmd_getc ();
3429 3880
3430 if (cmd == 'Q') 3881 if (cmd == 'Q')
3431 { /* query graphics */ 3882 { /* query graphics */
3432 tt_printf ("\033G0\n"); /* no graphics */ 3883 tt_printf ("\033G0\n"); /* no graphics */
3433 return; 3884 return;

Diff Legend

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