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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
52 52
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
57/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
58void 63void
59rxvt_term::lookup_key (XKeyEvent &ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
60{ 65{
61 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
… …
88#ifdef USE_XIM 93#ifdef USE_XIM
89 if (Input_Context) 94 if (Input_Context)
90 { 95 {
91 Status status_return; 96 Status status_return;
92 97
98#if 0
93#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
97 else 103 else
104#endif
98#endif 105#endif
99 { 106 {
100 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
101 108
102 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
… …
140 valid_keysym = keysym != NoSymbol; 147 valid_keysym = keysym != NoSymbol;
141 } 148 }
142 149
143 if (valid_keysym) 150 if (valid_keysym)
144 { 151 {
145 /* for some backwards compatibility */
146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
147# ifdef HOTKEY_CTRL
148 if (ctrl)
149# else
150 if (meta)
151# endif
152 {
153 if (keysym == ks_bigfont)
154 {
155 change_font (FONT_UP);
156 return;
157 }
158 else if (keysym == ks_smallfont)
159 {
160 change_font (FONT_DN);
161 return;
162 }
163 }
164#endif
165
166 if (TermWin.saveLines) 152 if (TermWin.saveLines)
167 { 153 {
168#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
169 if (!ctrl && !meta) 155 if (!ctrl && !meta)
170 { 156 {
… …
261#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
263 { 249 {
264 unsigned int l; 250 unsigned int l;
265 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
266 const unsigned char ch = C0_ESC;
267 252
268 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
269 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
270 255
271 /* escape prefix */ 256 /* escape prefix */
272 if (meta) 257 if (meta
273# ifdef META8_OPTION 258# ifdef META8_OPTION
274 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
275# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
276 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
277 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
278 return; 268 return;
279 } 269 }
280 else 270 else
281#endif 271#endif
… …
291 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
292 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
293 } 283 }
294 else 284 else
295 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
296# ifdef MULTICHAR_SET
297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
298 {
299 int col, row;
300
301 newlen = STRLEN (kbuf);
302 col = screen.cur.col - 1;
303 row = screen.cur.row + TermWin.saveLines;
304 if (IS_MULTI2 (screen.rend[row][col]))
305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
306 }
307# endif
308 break; 286 break;
309#endif 287#endif
310#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
311 case XK_Delete: 289 case XK_Delete:
312 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
313# ifdef MULTICHAR_SET
314 if (Options & Opt_mc_hack)
315 {
316 int col, row;
317
318 newlen = STRLEN (kbuf);
319 col = screen.cur.col;
320 row = screen.cur.row + TermWin.saveLines;
321 if (IS_MULTI1 (screen.rend[row][col]))
322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
323 }
324# endif
325 break; 291 break;
326#endif 292#endif
327 case XK_Tab: 293 case XK_Tab:
328 if (shft) 294 if (shft)
329 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
371 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
372 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
373 } 339 }
374 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
375 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
376#ifdef MULTICHAR_SET
377 //TODO: ??
378 if (Options & Opt_mc_hack)
379 {
380 int col, row, m;
381
382 col = screen.cur.col;
383 row = screen.cur.row + TermWin.saveLines;
384 m = 0;
385 if (keysym == XK_Right
386 && IS_MULTI1 (screen.rend[row][col]))
387 m = 1;
388 else if (keysym == XK_Left)
389 {
390 if (col > 0)
391 {
392 if (IS_MULTI2 (screen.rend[row][col - 1]))
393 m = 1;
394 }
395 else if (screen.cur.row > 0)
396 {
397 col = screen.tlen[--row];
398 if (col == -1)
399 col = TermWin.ncol - 1;
400 else
401 col--;
402 if (col > 0
403 && IS_MULTI2 (screen.rend[row][col]))
404 m = 1;
405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
410#endif
411 break; 342 break;
412 343
413#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
414# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
415 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
604 break; 535 break;
605 } 536 }
606 if (newlen) 537 if (newlen)
607 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
608 } 539 }
540
609 /* 541 /*
610 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
611 */ 543 */
612#ifdef META8_OPTION 544#ifdef META8_OPTION
613 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
628 { 560 {
629 unsigned char *ch; 561 unsigned char *ch;
630 562
631 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
632 *ch |= 0x80; 564 *ch |= 0x80;
565
633 meta = 0; 566 meta = 0;
634 } 567 }
635#endif 568#endif
636 /* nil */ ; 569 /* nil */ ;
637 } 570 }
… …
690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
691/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
692unsigned int 625unsigned int
693rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
694{ 627{
695 unsigned int n, s; 628 unsigned int n, s;
696 629
697 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
699 if (n > 0 && s < count) 633 if (n > 0 && s < count)
700 { 634 {
701 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
702 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
703 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
704 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
705 s += n; 639 s += n;
706 } 640 }
641
707 if (count > s) 642 if (count > s)
708 { 643 {
709 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
710 count = s; 645 count = s;
711 } 646 }
647
712 for (; count--;) 648 for (; count--;)
713 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
714 return 0; 653 return 0;
715} 654}
716#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
717 656
718void 657void
… …
733 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
734 scrollbar_show (1); 673 scrollbar_show (1);
735#ifdef USE_XIM 674#ifdef USE_XIM
736 IMSendSpot (); 675 IMSendSpot ();
737#endif 676#endif
738
739 } 677 }
740 678
741 display->flush (); 679 display->flush ();
742} 680}
743 681
… …
777bool 715bool
778rxvt_term::pty_fill () 716rxvt_term::pty_fill ()
779{ 717{
780 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 718 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
781 719
720 if (CBUFSIZ == n)
721 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
723 n = 0;
724 }
725
782 memmove (cmdbuf_base, cmdbuf_ptr, n); 726 memmove (cmdbuf_base, cmdbuf_ptr, n);
783 cmdbuf_ptr = cmdbuf_base; 727 cmdbuf_ptr = cmdbuf_base;
784 cmdbuf_endp = cmdbuf_ptr + n; 728 cmdbuf_endp = cmdbuf_ptr + n;
785 729
786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
787 731
788 if (n > 0) 732 if (n > 0)
789 { 733 {
790 cmdbuf_endp += n; 734 cmdbuf_endp += n;
791 return true; 735 return true;
792 } 736 }
793 else if (n < 0 && errno != EAGAIN) 737 else if (n < 0 && errno != EAGAIN)
794 destroy (); 738 destroy ();
795 739
796 return false; 740 return false;
797} 741}
798 742
799void 743void
800rxvt_term::pty_cb (io_watcher &w, short revents) 744rxvt_term::pty_cb (io_watcher &w, short revents)
… …
803 SET_LOCALE (locale); 747 SET_LOCALE (locale);
804 748
805 if (revents & EVENT_WRITE) 749 if (revents & EVENT_WRITE)
806 tt_write (0, 0); 750 tt_write (0, 0);
807 else if (revents & EVENT_READ) 751 else if (revents & EVENT_READ)
808 {
809 bool flag = true;
810
811 // loop, but don't allow a single term to monopolize us 752 // loop, but don't allow a single term to monopolize us
812 // the number of loops is fully arbitrary, and thus wrong
813 while (flag && pty_fill ()) 753 while (pty_fill ())
814 { 754 if (cmd_parse ())
815 if (!seen_input)
816 {
817 seen_input = 1;
818 /* once we know the shell is running, send the screen size. Again! */
819 tt_winch ();
820 }
821
822 uint32_t ch = NOCHAR;
823
824 for (;;)
825 {
826 if (ch == NOCHAR)
827 ch = next_char ();
828
829 if (ch == NOCHAR) // TODO: improve
830 break; 755 break;
831
832 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
833 {
834 /* Read a text string from the input buffer */
835 uint32_t buf[BUFSIZ];
836 bool refreshnow = false;
837 int nlines = 0;
838 uint32_t *str = buf;
839
840 *str++ = ch;
841
842 for (;;)
843 {
844 ch = next_char ();
845
846 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break;
848 else
849 {
850 *str++ = ch;
851
852 if (ch == '\n')
853 {
854 nlines++;
855 refresh_count++;
856
857 if (! (Options & Opt_jumpScroll)
858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
859 {
860 refreshnow = true;
861 flag = false;
862 ch = NOCHAR;
863 break;
864 }
865
866 // scr_add_lines only works for nlines < TermWin.nrow - 1.
867 if (nlines >= TermWin.nrow - 1)
868 {
869 scr_add_lines (buf, nlines, str - buf);
870 nlines = 0;
871 str = buf;
872 }
873 }
874
875 if (str >= buf + BUFSIZ)
876 {
877 ch = NOCHAR;
878 break;
879 }
880 }
881 }
882
883 scr_add_lines (buf, nlines, str - buf);
884
885 /*
886 * If there have been a lot of new lines, then update the screen
887 * What the heck I'll cheat and only refresh less than every page-full.
888 * the number of pages between refreshes is refresh_limit, which
889 * is incremented here because we must be doing flat-out scrolling.
890 *
891 * refreshing should be correct for small scrolls, because of the
892 * time-out
893 */
894 if (refreshnow)
895 {
896 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
897 refresh_limit++;
898
899 scr_refresh (refresh_type);
900 }
901
902 }
903 else
904 {
905 switch (ch)
906 {
907 default:
908 process_nonprinting (ch);
909 break;
910 case C0_ESC: /* escape char */
911 process_escape_seq ();
912 break;
913 /*case 0x9b: */ /* CSI */
914 /* process_csi_seq (); */
915 }
916
917 ch = NOCHAR;
918 }
919 }
920 }
921 }
922}
923
924// read the next character, currently handles UTF-8
925// will probably handle all sorts of other stuff in the future
926uint32_t
927rxvt_term::next_char ()
928{
929 while (cmdbuf_ptr < cmdbuf_endp)
930 {
931 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
932 return *cmdbuf_ptr++;
933
934 wchar_t wc;
935 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
936
937 if (len == (size_t)-2)
938 return NOCHAR;
939
940 if (len == (size_t)-1)
941 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
942
943 // assume wchar == unicode
944 cmdbuf_ptr += len;
945 return wc;
946 }
947
948 return NOCHAR;
949}
950
951/* rxvt_cmd_getc () - Return next input character */
952/*
953 * Return the next input character after first passing any keyboard input
954 * to the command.
955 */
956uint32_t
957rxvt_term::cmd_getc ()
958{
959 for (;;)
960 {
961 uint32_t c = next_char ();
962 if (c != NOCHAR)
963 return c;
964
965 // incomplete sequences should occur rarely, still, a better solution
966 // would be preferred. either setjmp/longjmp or better design.
967 fcntl (cmd_fd, F_SETFL, 0);
968 pty_fill ();
969 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
970 }
971} 756}
972 757
973#ifdef POINTER_BLANK 758#ifdef POINTER_BLANK
974void 759void
975rxvt_term::pointer_unblank () 760rxvt_term::pointer_unblank ()
… …
1004 pointer_blank (); 789 pointer_blank ();
1005} 790}
1006#endif 791#endif
1007 792
1008void 793void
1009rxvt_term::mouse_report (const XButtonEvent &ev) 794rxvt_term::mouse_report (XButtonEvent &ev)
1010{ 795{
1011 int button_number, key_state = 0; 796 int button_number, key_state = 0;
1012 int x, y; 797 int x, y;
1013 798
1014 x = ev.x; 799 x = ev.x;
1015 y = ev.y; 800 y = ev.y;
1016 pixel_position (&x, &y); 801 pixel_position (&x, &y);
1017 802
… …
1220 && (ev.xclient.data.l[0] == DndFile 1005 && (ev.xclient.data.l[0] == DndFile
1221 || ev.xclient.data.l[0] == DndDir 1006 || ev.xclient.data.l[0] == DndDir
1222 || ev.xclient.data.l[0] == DndLink)) 1007 || ev.xclient.data.l[0] == DndLink))
1223 { 1008 {
1224 /* Get Dnd data */ 1009 /* Get Dnd data */
1225 Atom ActualType; 1010 Atom ActualType;
1226 int ActualFormat; 1011 int ActualFormat;
1227 unsigned char *data; 1012 unsigned char *data;
1228 unsigned long Size, RemainingBytes; 1013 unsigned long Size, RemainingBytes;
1229 1014
1230 XGetWindowProperty (display->display, display->root, 1015 XGetWindowProperty (display->display, display->root,
1231 xa[XA_DNDSELECTION], 1016 xa[XA_DNDSELECTION],
1232 0L, 1000000L, 1017 0L, 1000000L,
1233 False, AnyPropertyType, 1018 False, AnyPropertyType,
… …
1236 &data); 1021 &data);
1237 XChangeProperty (display->display, display->root, 1022 XChangeProperty (display->display, display->root,
1238 XA_CUT_BUFFER0, XA_STRING, 1023 XA_CUT_BUFFER0, XA_STRING,
1239 8, PropModeReplace, 1024 8, PropModeReplace,
1240 data, STRLEN (data)); 1025 data, STRLEN (data));
1026 XFree (data);
1241 selection_paste (display->root, XA_CUT_BUFFER0, True); 1027 selection_paste (display->root, XA_CUT_BUFFER0, True);
1242 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1243 } 1029 }
1244#endif /* OFFIX_DND */ 1030#endif /* OFFIX_DND */
1245 break; 1031 break;
… …
1338 check_our_parents (); 1124 check_our_parents ();
1339 if (am_transparent) 1125 if (am_transparent)
1340 want_full_refresh = 1; 1126 want_full_refresh = 1;
1341 } 1127 }
1342#endif 1128#endif
1343
1344 } 1129 }
1345 break; 1130 break;
1346 1131
1347 case SelectionClear: 1132 case SelectionClear:
1348 display->set_selection_owner (0); 1133 selection_clear ();
1349 break; 1134 break;
1350 1135
1351 case SelectionNotify: 1136 case SelectionNotify:
1352 if (selection_wait == Sel_normal) 1137 if (selection_wait == Sel_normal)
1353 selection_paste (ev.xselection.requestor, 1138 selection_paste (ev.xselection.requestor,
… …
1422 pointer_unblank (); 1207 pointer_unblank ();
1423#endif 1208#endif
1424#if MENUBAR 1209#if MENUBAR
1425 if (isMenuBarWindow (ev.xany.window)) 1210 if (isMenuBarWindow (ev.xany.window))
1426 { 1211 {
1427 menubar_control (& (ev.xbutton)); 1212 menubar_control (ev.xbutton);
1428 break; 1213 break;
1429 } 1214 }
1430#endif 1215#endif
1431 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1432 break; 1217 break;
… …
1552 return; 1337 return;
1553 } 1338 }
1554 1339
1555 /* FALLTHROUGH */ 1340 /* FALLTHROUGH */
1556 case ReparentNotify: 1341 case ReparentNotify:
1557 if ((Options & Opt_transparent) && check_our_parents ()) 1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1558 if (am_transparent)
1559 want_full_refresh = 1; 1343 want_full_refresh = 1;
1560 break; 1344 break;
1561#endif 1345#endif
1562 } 1346 }
1563} 1347}
1564 1348
1565void 1349void
1566rxvt_term::button_press (const XButtonEvent &ev) 1350rxvt_term::button_press (XButtonEvent &ev)
1567{ 1351{
1568 int reportmode = 0, clickintime; 1352 int reportmode = 0, clickintime;
1569 1353
1570 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1571 if (!bypass_keystate) 1355 if (!bypass_keystate)
… …
1799 menubar_control (ev); 1583 menubar_control (ev);
1800#endif 1584#endif
1801} 1585}
1802 1586
1803void 1587void
1804rxvt_term::button_release (const XButtonEvent &ev) 1588rxvt_term::button_release (XButtonEvent &ev)
1805{ 1589{
1806 int reportmode = 0; 1590 int reportmode = 0;
1807 1591
1808 csrO = 0; /* reset csr Offset */ 1592 csrO = 0; /* reset csr Offset */
1809 if (!bypass_keystate) 1593 if (!bypass_keystate)
… …
1908 else if (isMenuBarWindow (ev.window)) 1692 else if (isMenuBarWindow (ev.window))
1909 menubar_control (ev); 1693 menubar_control (ev);
1910#endif 1694#endif
1911} 1695}
1912 1696
1913
1914#ifdef TRANSPARENT 1697#ifdef TRANSPARENT
1698#if TINTING
1699/* shading taken from eterm-0.9.2 */
1700/* RGB 15 */
1701
1702static void
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1710 /* No saturation */
1711 for (y = h; --y >= 0;) {
1712 for (x = -w; x < 0; x++) {
1713 int r, g, b;
1714
1715 b = ((uint16_t *) ptr)[x];
1716 r = (b & 0x7c00) * rm;
1717 g = (b & 0x3e0) * gm;
1718 b = (b & 0x1f) * bm;
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1720 | ((g >> 8) & 0x3e0)
1721 | ((b >> 8) & 0x1f);
1722 }
1723 ptr += bpl;
1724 }
1725 } else {
1726 for (y = h; --y >= 0;) {
1727 for (x = -w; x < 0; x++) {
1728 int r, g, b;
1729
1730 b = ((uint16_t *) ptr)[x];
1731 r = (b & 0x7c00) * rm;
1732 g = (b & 0x3e0) * gm;
1733 b = (b & 0x1f) * bm;
1734 r |= (!(r >> 15) - 1);
1735 g |= (!(g >> 10) - 1);
1736 b |= (!(b >> 5) - 1);
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1738 | ((g >> 8) & 0x3e0)
1739 | ((b >> 8) & 0x1f);
1740 }
1741 ptr += bpl;
1742 }
1743 }
1744}
1745
1746/* RGB 16 */
1747static void
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1749{
1750 unsigned char *ptr;
1751 int x, y;
1752
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1755 /* No saturation */
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 }
1770 } else {
1771 for (y = h; --y >= 0;) {
1772 for (x = -w; x < 0; x++) {
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 }
1786 ptr += bpl;
1787 }
1788 }
1789}
1790
1791/* RGB 24 */
1792static void
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1794{
1795 unsigned char *ptr;
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 }
1823 } else {
1824 for (y = h; --y >= 0;) {
1825 for (x = -(w * 3); x < 0; x += 3) {
1826 int r, g, b;
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 }
1854 ptr += bpl;
1855 }
1856 }
1857}
1858
1859/* RGB 32 */
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929}
1930
1931#endif
1932
1915/* 1933/*
1916 * Check our parents are still who we think they are. 1934 * Check our parents are still who we think they are.
1917 * Do transparency updates if required 1935 * Do transparency updates if required
1918 */ 1936 */
1919int 1937int
1920rxvt_term::check_our_parents () 1938rxvt_term::check_our_parents ()
1921{ 1939{
1922 int i, pchanged, aformat, have_pixmap, rootdepth; 1940 int i, pchanged, aformat, have_pixmap, rootdepth;
1923 unsigned long nitems, bytes_after; 1941 unsigned long nitems, bytes_after;
1924 Atom atype; 1942 Atom atype;
1925 unsigned char *prop = NULL; 1943 unsigned char *prop = NULL;
1926 Window root, oldp, *list; 1944 Window root, oldp, *list;
1927 Pixmap rootpixmap = None; 1945 Pixmap rootpixmap = None;
1928 XWindowAttributes wattr, wrootattr; 1946 XWindowAttributes wattr, wrootattr;
1929 1947
1930 pchanged = 0; 1948 pchanged = 0;
1931 1949
1932 if (! (Options & Opt_transparent)) 1950 if (!(Options & Opt_transparent))
1933 return pchanged; /* Don't try any more */ 1951 return pchanged; /* Don't try any more */
1934 1952
1935 XGetWindowAttributes (display->display, display->root, &wrootattr); 1953 XGetWindowAttributes (display->display, display->root, &wrootattr);
1936 rootdepth = wrootattr.depth; 1954 rootdepth = wrootattr.depth;
1937 1955
1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1957
1939 if (rootdepth != wattr.depth) 1958 if (rootdepth != wattr.depth)
1940 { 1959 {
1941 if (am_transparent) 1960 if (am_transparent)
1942 { 1961 {
1943 pchanged = 1; 1962 pchanged = 1;
1944 XSetWindowBackground (display->display, TermWin.vt, 1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1945 PixColors[Color_bg]);
1946 am_transparent = am_pixmap_trans = 0; 1964 am_transparent = am_pixmap_trans = 0;
1947 } 1965 }
1966
1948 return pchanged; /* Don't try any more */ 1967 return pchanged; /* Don't try any more */
1949 } 1968 }
1950 1969
1951 /* Get all X ops out of the queue so that our information is up-to-date. */ 1970 /* Get all X ops out of the queue so that our information is up-to-date. */
1952 XSync (display->display, False); 1971 XSync (display->display, False);
… …
1954 /* 1973 /*
1955 * Make the frame window set by the window manager have 1974 * Make the frame window set by the window manager have
1956 * the root background. Some window managers put multiple nested frame 1975 * the root background. Some window managers put multiple nested frame
1957 * windows for each client, so we have to take care about that. 1976 * windows for each client, so we have to take care about that.
1958 */ 1977 */
1959 i = (xa[XA_XROOTPMAPID] != 0 1978 i = (xa[XA_XROOTPMAPID]
1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1962 &nitems, &bytes_after, &prop) == Success)); 1981 &nitems, &bytes_after, &prop) == Success);
1982
1983 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success);
1988
1963 if (!i || prop == NULL) 1989 if (!i || prop == NULL)
1964 have_pixmap = 0; 1990 have_pixmap = 0;
1965 else 1991 else
1966 { 1992 {
1967 have_pixmap = 1; 1993 have_pixmap = 1;
1968 rootpixmap = * ((Pixmap *)prop); 1994 rootpixmap = *(Pixmap *)prop;
1969 XFree (prop); 1995 XFree (prop);
1970 } 1996 }
1997
1971 if (have_pixmap) 1998 if (have_pixmap)
1972 { 1999 {
1973 /* 2000 /*
1974 * Copy display->root pixmap transparency 2001 * Copy display->root pixmap transparency
1975 */ 2002 */
1976 int sx, sy, nx, ny; 2003 int sx, sy, nx, ny;
1977 unsigned int nw, nh; 2004 unsigned int nw, nh;
1978 Window cr; 2005 Window cr;
1979 XImage *image; 2006 XImage *image;
1980 GC gc; 2007 GC gc;
1981 XGCValues gcvalue; 2008 XGCValues gcvalue;
1982 2009
1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1984 0, 0, &sx, &sy, &cr); 2011 0, 0, &sx, &sy, &cr);
1985 nw = (unsigned int)szHint.width; 2012 nw = (unsigned int)szHint.width;
1986 nh = (unsigned int)szHint.height; 2013 nh = (unsigned int)szHint.height;
1987 nx = ny = 0; 2014 nx = ny = 0;
2015
1988 if (sx < 0) 2016 if (sx < 0)
1989 { 2017 {
1990 nw += sx; 2018 nw += sx;
1991 nx = -sx; 2019 nx = -sx;
1992 sx = 0; 2020 sx = 0;
1993 } 2021 }
2022
1994 if (sy < 0) 2023 if (sy < 0)
1995 { 2024 {
1996 nh += sy; 2025 nh += sy;
1997 ny = -sy; 2026 ny = -sy;
1998 sy = 0; 2027 sy = 0;
1999 } 2028 }
2029
2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2002 allowedxerror = -1; 2032 allowedxerror = -1;
2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2004 ZPixmap); 2034
2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2006 /* XXX: may need a delay here? */ 2036 /* XXX: may need a delay here? */
2007 allowedxerror = 0; 2037 allowedxerror = 0;
2038
2008 if (image == NULL) 2039 if (image == NULL)
2009 { 2040 {
2010 if (am_transparent && am_pixmap_trans) 2041 if (am_transparent && am_pixmap_trans)
2011 { 2042 {
2012 pchanged = 1; 2043 pchanged = 1;
… …
2014 { 2045 {
2015 XFreePixmap (display->display, TermWin.pixmap); 2046 XFreePixmap (display->display, TermWin.pixmap);
2016 TermWin.pixmap = None; 2047 TermWin.pixmap = None;
2017 } 2048 }
2018 } 2049 }
2050
2019 am_pixmap_trans = 0; 2051 am_pixmap_trans = 0;
2020 } 2052 }
2021 else 2053 else
2022 { 2054 {
2023 if (TermWin.pixmap != None) 2055 if (TermWin.pixmap != None)
2024 XFreePixmap (display->display, TermWin.pixmap); 2056 XFreePixmap (display->display, TermWin.pixmap);
2057
2058#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint))
2060 {
2061 unsigned short shade, rm, gm, bm;
2062
2063 PixColors[Color_tint].get (display, rm, gm, bm);
2064
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 }
2076#endif
2077
2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2026 (unsigned int)szHint.width,
2027 (unsigned int)szHint.height, 2079 szHint.width, szHint.height, image->depth);
2028 (unsigned int)image->depth);
2029 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2030 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2031 nx, ny, (unsigned int)image->width,
2032 (unsigned int)image->height); 2082 nx, ny, image->width, image->height);
2033 XFreeGC (display->display, gc); 2083 XFreeGC (display->display, gc);
2034 XDestroyImage (image); 2084 XDestroyImage (image);
2035 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2036 TermWin.pixmap); 2086 TermWin.pixmap);
2087
2037 if (!am_transparent || !am_pixmap_trans) 2088 if (!am_transparent || !am_pixmap_trans)
2038 pchanged = 1; 2089 pchanged = 1;
2090
2039 am_transparent = am_pixmap_trans = 1; 2091 am_transparent = am_pixmap_trans = 1;
2040 } 2092 }
2041 } 2093 }
2094
2042 if (!am_pixmap_trans) 2095 if (!am_pixmap_trans)
2043 { 2096 {
2044 unsigned int n; 2097 unsigned int n;
2045 /* 2098 /*
2046 * InheritPixmap transparency 2099 * InheritPixmap transparency
2047 */ 2100 */
2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2050 i++)
2051 { 2103 {
2052 oldp = TermWin.parent[i]; 2104 oldp = TermWin.parent[i];
2053 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2105 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2054 &TermWin.parent[i], &list, &n); 2106 &TermWin.parent[i], &list, &n);
2055 XFree (list); 2107 XFree (list);
2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109
2057 if (TermWin.parent[i] == display->root) 2110 if (TermWin.parent[i] == display->root)
2058 { 2111 {
2059 if (oldp != None) 2112 if (oldp != None)
2060 pchanged = 1; 2113 pchanged = 1;
2114
2061 break; 2115 break;
2062 } 2116 }
2117
2063 if (oldp != TermWin.parent[i]) 2118 if (oldp != TermWin.parent[i])
2064 pchanged = 1; 2119 pchanged = 1;
2065 } 2120 }
2121
2066 n = 0; 2122 n = 0;
2123
2067 if (pchanged) 2124 if (pchanged)
2068 { 2125 {
2069 for (; n < (unsigned int)i; n++) 2126 for (; n < (unsigned int)i; n++)
2070 { 2127 {
2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2076 break; 2133 break;
2077 } 2134 }
2078 } 2135 }
2079 } 2136 }
2080 if (n > (int) (sizeof (TermWin.parent) 2137
2081 / sizeof (TermWin.parent[0]))) 2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2082 { 2139 {
2083 D_X ((stderr, "InheritPixmap Turning off")); 2140 D_X ((stderr, "InheritPixmap Turning off"));
2084 XSetWindowBackground (display->display, TermWin.parent[0], 2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2085 PixColors[Color_fg]);
2086 XSetWindowBackground (display->display, TermWin.vt, 2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2087 PixColors[Color_bg]);
2088 am_transparent = 0; 2143 am_transparent = 0;
2089 /* XXX: also turn off Opt_transparent? */ 2144 /* XXX: also turn off Opt_transparent? */
2090 } 2145 }
2091 else 2146 else
2092 { 2147 {
2148#if WAIT_FOR_WM
2093 /* wait (an arbitrary period) for the WM to do its thing 2149 /* wait (an arbitrary period) for the WM to do its thing
2094 * needed for fvwm2.2.2 (and before?) */ 2150 * needed for fvwm2.2.2 (and before?) */
2095# ifdef HAVE_NANOSLEEP
2096 struct timespec rqt;
2097
2098 rqt.tv_sec = 1;
2099 rqt.tv_nsec = 0;
2100 nanosleep (&rqt, NULL);
2101# else
2102 sleep (1); 2151 sleep (1);
2103# endif 2152#endif
2104 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2105 for (n = 0; n < (unsigned int)i; n++) 2154 for (n = 0; n < (unsigned int)i; n++)
2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2107 ParentRelative); 2156
2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2109 ParentRelative);
2110 am_transparent = 1; 2158 am_transparent = 1;
2111 } 2159 }
2160
2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2113 TermWin.parent[i] = None; 2162 TermWin.parent[i] = None;
2114 } 2163 }
2164
2115 return pchanged; 2165 return pchanged;
2116} 2166}
2117#endif 2167#endif
2118 2168
2119/*}}} */ 2169/*}}} */
2170
2171bool
2172rxvt_term::cmd_parse ()
2173{
2174 bool flag = false;
2175 unicode_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here
2177
2178 for (;;)
2179 {
2180 if (ch == NOCHAR)
2181 {
2182 seq_begin = cmdbuf_ptr;
2183 ch = next_char ();
2184 }
2185
2186 if (ch == NOCHAR) // TODO: improve
2187 break;
2188
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 {
2191 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false;
2194 int nlines = 0;
2195 unicode_t *str = buf;
2196
2197 *str++ = ch;
2198
2199 for (;;)
2200 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break;
2206
2207 *str++ = ch;
2208
2209 if (ch == C0_LF)
2210 {
2211 nlines++;
2212 refresh_count++;
2213
2214 if (! (Options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2216 {
2217 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR;
2220 break;
2221 }
2222
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1)
2225 {
2226 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0;
2228 str = buf;
2229 }
2230 }
2231
2232 if (str >= buf + UBUFSIZ)
2233 {
2234 ch = NOCHAR;
2235 break;
2236 }
2237 }
2238
2239 scr_add_lines (buf, nlines, str - buf);
2240
2241 /*
2242 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */
2250 if (refreshnow)
2251 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++;
2254 else
2255 scr_refresh (refresh_type);
2256 }
2257
2258 }
2259 else
2260 {
2261 try
2262 {
2263 process_nonprinting (ch);
2264 }
2265 catch (const class out_of_input &o)
2266 {
2267 // we ran out of input, retry later
2268 cmdbuf_ptr = seq_begin;
2269 break;
2270 }
2271
2272 ch = NOCHAR;
2273 }
2274 }
2275
2276 return flag;
2277}
2278
2279// read the next character
2280unicode_t
2281rxvt_term::next_char ()
2282{
2283 while (cmdbuf_ptr < cmdbuf_endp)
2284 {
2285 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2287 return *cmdbuf_ptr++;
2288
2289 wchar_t wc;
2290 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2291
2292 if (len == (size_t)-2)
2293 {
2294 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp;
2296 break;
2297 }
2298
2299 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301
2302 // assume wchar == unicode
2303 cmdbuf_ptr += len;
2304 return wc;
2305 }
2306
2307 return NOCHAR;
2308}
2309
2310/* rxvt_cmd_getc () - Return next input character */
2311/*
2312 * Return the next input character after first passing any keyboard input
2313 * to the command.
2314 */
2315unicode_t
2316rxvt_term::cmd_getc ()
2317{
2318 unicode_t c = next_char ();
2319
2320 if (c == NOCHAR)
2321 throw out_of_input;
2322
2323 return c;
2324}
2120 2325
2121/*{{{ print pipe */ 2326/*{{{ print pipe */
2122/*----------------------------------------------------------------------*/ 2327/*----------------------------------------------------------------------*/
2123#ifdef PRINTPIPE 2328#ifdef PRINTPIPE
2124FILE * 2329FILE *
2125rxvt_term::popen_printer () 2330rxvt_term::popen_printer ()
2126{ 2331{
2127 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2332 FILE *stream = popen (rs[Rs_print_pipe], "w");
2128 2333
2129 if (stream == NULL) 2334 if (stream == NULL)
2130 rxvt_print_error ("can't open printer pipe"); 2335 rxvt_warn ("can't open printer pipe, not printing.\n");
2336
2131 return stream; 2337 return stream;
2132} 2338}
2133 2339
2134int 2340int
2135rxvt_term::pclose_printer (FILE *stream) 2341rxvt_term::pclose_printer (FILE *stream)
2136{ 2342{
2137 fflush (stream); 2343 fflush (stream);
2138 /* pclose () reported not to work on SunOS 4.1.3 */
2139# if defined (__sun__) /* TODO: RESOLVE THIS */
2140 /* pclose works provided SIGCHLD handler uses waitpid */
2141 return pclose (stream); /* return fclose (stream); */
2142# else
2143 return pclose (stream); 2344 return pclose (stream);
2144# endif
2145} 2345}
2146 2346
2147/* 2347/*
2148 * simulate attached vt100 printer 2348 * simulate attached vt100 printer
2149 */ 2349 */
2150void 2350void
2151rxvt_term::process_print_pipe () 2351rxvt_term::process_print_pipe ()
2152{ 2352{
2153 int done; 2353 int done;
2154 FILE *fd; 2354 FILE *fd;
2155 2355
2156 if ((fd = popen_printer ()) == NULL) 2356 if ((fd = popen_printer ()) == NULL)
2157 return; 2357 return;
2158 2358
2159 /* 2359 /*
2160 * Send all input to the printer until either ESC[4i or ESC[?4i 2360 * Send all input to the printer until either ESC[4i or ESC[?4i
2161 * is received. 2361 * is received.
2162 */ 2362 */
2163 for (done = 0; !done;) 2363 for (done = 0; !done;)
2164 { 2364 {
2165 unsigned char buf[8]; 2365 unsigned char buf[8];
2166 unsigned char ch; 2366 unicode_t ch;
2167 unsigned int i, len; 2367 unsigned int i, len;
2168 2368
2169 if ((ch = cmd_getc ()) != C0_ESC) 2369 if ((ch = cmd_getc ()) != C0_ESC)
2170 { 2370 {
2171 if (putc (ch, fd) == EOF) 2371 if (putc (ch, fd) == EOF)
2172 break; /* done = 1 */ 2372 break; /* done = 1 */
… …
2187 { 2387 {
2188 if ((buf[len++] = cmd_getc ()) == 'i') 2388 if ((buf[len++] = cmd_getc ()) == 'i')
2189 break; /* done = 1 */ 2389 break; /* done = 1 */
2190 } 2390 }
2191 } 2391 }
2392
2192 for (i = 0; i < len; i++) 2393 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF) 2394 if (putc (buf[i], fd) == EOF)
2194 { 2395 {
2195 done = 1; 2396 done = 1;
2196 break; 2397 break;
2197 } 2398 }
2198 } 2399 }
2199 } 2400 }
2401
2200 pclose_printer (fd); 2402 pclose_printer (fd);
2201} 2403}
2202#endif /* PRINTPIPE */ 2404#endif /* PRINTPIPE */
2203/*}}} */ 2405/*}}} */
2204 2406
2205/* *INDENT-OFF* */ 2407/* *INDENT-OFF* */
2206enum { 2408enum {
2207 C1_40 = 0x40, 2409 C1_40 = 0x40,
2208 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2410 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2209 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2411 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2210 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2412 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2211 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2413 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2212}; 2414};
2213/* *INDENT-ON* */ 2415/* *INDENT-ON* */
2214 2416
2215/*{{{ process non-printing single characters */ 2417/*{{{ process non-printing single characters */
2216void 2418void
2217rxvt_term::process_nonprinting (unsigned char ch) 2419rxvt_term::process_nonprinting (unicode_t ch)
2218{ 2420{
2219 switch (ch) 2421 switch (ch)
2220 { 2422 {
2423 case C0_ESC:
2424 process_escape_seq ();
2425 break;
2221 case C0_ENQ: /* terminal Status */ 2426 case C0_ENQ: /* terminal Status */
2222 if (rs[Rs_answerbackstring]) 2427 if (rs[Rs_answerbackstring])
2223 tt_write (
2224 (const unsigned char *)rs[Rs_answerbackstring], 2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2225 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2226 else 2430 else
2227 tt_write ((unsigned char *)VT100_ANS, 2431 tt_write ((unsigned char *)VT100_ANS,
2228 (unsigned int)STRLEN (VT100_ANS)); 2432 (unsigned int)STRLEN (VT100_ANS));
2229 break; 2433 break;
2230 case C0_BEL: /* bell */ 2434 case C0_BEL: /* bell */
2231 scr_bell (); 2435 scr_bell ();
2232 break; 2436 break;
2233 case C0_BS: /* backspace */ 2437 case C0_BS: /* backspace */
… …
2248 scr_charset_choose (1); 2452 scr_charset_choose (1);
2249 break; 2453 break;
2250 case C0_SI: /* shift in - acs */ 2454 case C0_SI: /* shift in - acs */
2251 scr_charset_choose (0); 2455 scr_charset_choose (0);
2252 break; 2456 break;
2457
2458 // 8-bit controls
2459 case 0x90: /* DCS */
2460 process_dcs_seq ();
2461 break;
2462 case 0x9b: /* CSI */
2463 process_csi_seq ();
2464 break;
2465 case 0x9d: /* CSI */
2466 process_osc_seq ();
2467 break;
2253 } 2468 }
2254} 2469}
2255/*}}} */ 2470/*}}} */
2256 2471
2257 2472
2258/*{{{ process VT52 escape sequences */ 2473/*{{{ process VT52 escape sequences */
2259void 2474void
2260rxvt_term::process_escape_vt52 (unsigned char ch) 2475rxvt_term::process_escape_vt52 (unicode_t ch)
2261{ 2476{
2262 int row, col; 2477 int row, col;
2263 2478
2264 switch (ch) 2479 switch (ch)
2265 { 2480 {
… …
2317 2532
2318/*{{{ process escape sequences */ 2533/*{{{ process escape sequences */
2319void 2534void
2320rxvt_term::process_escape_seq () 2535rxvt_term::process_escape_seq ()
2321{ 2536{
2322 unsigned char ch = cmd_getc (); 2537 unicode_t ch = cmd_getc ();
2323 2538
2324 if (PrivateModes & PrivMode_vt52) 2539 if (PrivateModes & PrivMode_vt52)
2325 { 2540 {
2326 process_escape_vt52 (ch); 2541 process_escape_vt52 (ch);
2327 return; 2542 return;
… …
2344 scr_charset_set (2, (unsigned int)cmd_getc ()); 2559 scr_charset_set (2, (unsigned int)cmd_getc ());
2345 break; 2560 break;
2346 case '+': 2561 case '+':
2347 scr_charset_set (3, (unsigned int)cmd_getc ()); 2562 scr_charset_set (3, (unsigned int)cmd_getc ());
2348 break; 2563 break;
2349#ifdef MULTICHAR_SET
2350 case '$':
2351 scr_charset_set (-2, (unsigned int)cmd_getc ());
2352 break;
2353#endif
2354#ifndef NO_FRILLS 2564#ifndef NO_FRILLS
2355 case '6': 2565 case '6':
2356 scr_backindex (); 2566 scr_backindex ();
2357 break; 2567 break;
2358#endif 2568#endif
… …
2380 break; 2590 break;
2381 2591
2382 /* 8.3.87: NEXT LINE */ 2592 /* 8.3.87: NEXT LINE */
2383 case C1_NEL: /* ESC E */ 2593 case C1_NEL: /* ESC E */
2384 { 2594 {
2385 uint32_t nlcr[] = { '\n', '\r' }; 2595 unicode_t nlcr[] = { C0_LF, C0_CR };
2386 scr_add_lines (nlcr, 1, 2); 2596 scr_add_lines (nlcr, 1, 2);
2387 } 2597 }
2388 break; 2598 break;
2389 2599
2390 /* kidnapped escape sequence: Should be 8.3.48 */ 2600 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2401 case C1_RI: /* ESC M */ 2611 case C1_RI: /* ESC M */
2402 scr_index (DN); 2612 scr_index (DN);
2403 break; 2613 break;
2404 2614
2405 /* 8.3.142: SINGLE-SHIFT TWO */ 2615 /* 8.3.142: SINGLE-SHIFT TWO */
2406 /*case C1_SS2: scr_single_shift (2); break; */ 2616 /*case C1_SS2: scr_single_shift (2); break; */
2407 2617
2408 /* 8.3.143: SINGLE-SHIFT THREE */ 2618 /* 8.3.143: SINGLE-SHIFT THREE */
2409 /*case C1_SS3: scr_single_shift (3); break; */ 2619 /*case C1_SS3: scr_single_shift (3); break; */
2410 2620
2411 /* 8.3.27: DEVICE CONTROL STRING */ 2621 /* 8.3.27: DEVICE CONTROL STRING */
2412 case C1_DCS: /* ESC P */ 2622 case C1_DCS: /* ESC P */
2413 process_dcs_seq (); 2623 process_dcs_seq ();
2414 break; 2624 break;
… …
2429 process_osc_seq (); 2639 process_osc_seq ();
2430 break; 2640 break;
2431 2641
2432 /* 8.3.106: RESET TO INITIAL STATE */ 2642 /* 8.3.106: RESET TO INITIAL STATE */
2433 case 'c': 2643 case 'c':
2644 mbstate.reset ();
2434 scr_poweron (); 2645 scr_poweron ();
2435 scrollbar_show (1); 2646 scrollbar_show (1);
2436 break; 2647 break;
2437 2648
2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2649 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2475 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2686 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2476 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2687 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2477 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2688 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2478 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2689 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2479 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2690 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2480 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2691 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2481 }; 2692 };
2482/* *INDENT-ON* */ 2693/* *INDENT-ON* */
2483 2694
2484void 2695void
2485rxvt_term::process_csi_seq () 2696rxvt_term::process_csi_seq ()
2486{ 2697{
2487 unsigned char ch, priv, i; 2698 unicode_t ch, priv, i;
2488 unsigned int nargs, p; 2699 unsigned int nargs, p;
2489 int n, ndef; 2700 int n, ndef;
2490 int arg[ESC_ARGS]; 2701 int arg[ESC_ARGS];
2491 2702
2492 for (nargs = ESC_ARGS; nargs > 0;) 2703 for (nargs = ESC_ARGS; nargs > 0;)
2493 arg[--nargs] = 0; 2704 arg[--nargs] = 0;
2494 2705
2495 priv = 0; 2706 priv = 0;
… …
2497 if (ch >= '<' && ch <= '?') 2708 if (ch >= '<' && ch <= '?')
2498 { /* '<' '=' '>' '?' */ 2709 { /* '<' '=' '>' '?' */
2499 priv = ch; 2710 priv = ch;
2500 ch = cmd_getc (); 2711 ch = cmd_getc ();
2501 } 2712 }
2713
2502 /* read any numerical arguments */ 2714 /* read any numerical arguments */
2503 for (n = -1; ch < CSI_ICH; ) 2715 for (n = -1; ch < CSI_ICH; )
2504 { 2716 {
2505 if (isdigit (ch)) 2717 if (isdigit (ch))
2506 { 2718 {
… …
2513 { 2725 {
2514 if (nargs < ESC_ARGS) 2726 if (nargs < ESC_ARGS)
2515 arg[nargs++] = n; 2727 arg[nargs++] = n;
2516 n = -1; 2728 n = -1;
2517 } 2729 }
2518 else if (ch == '\b') 2730 else if (IS_CONTROL (ch))
2519 {
2520 scr_backspace ();
2521 }
2522 else if (ch == C0_ESC)
2523 {
2524 process_escape_seq ();
2525 return;
2526 }
2527 else if (ch < ' ')
2528 {
2529 process_nonprinting (ch); 2731 process_nonprinting (ch);
2530 } 2732
2531 ch = cmd_getc (); 2733 ch = cmd_getc ();
2532 } 2734 }
2533 2735
2534 if (ch > CSI_7F) 2736 if (ch > CSI_7F)
2535 return; 2737 return;
… …
2693 tt_printf ("\033[0n"); 2895 tt_printf ("\033[0n");
2694 break; 2896 break;
2695 case 6: /* CPR requested */ 2897 case 6: /* CPR requested */
2696 scr_report_position (); 2898 scr_report_position ();
2697 break; 2899 break;
2698#if defined (ENABLE_DISPLAY_ANSWER)
2699 case 7: /* unofficial extension */ 2900 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure)
2700 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2902 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2701 break; 2903 break;
2702#endif
2703 case 8: /* unofficial extension */ 2904 case 8: /* unofficial extension */
2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2705 break; 2906 break;
2706 } 2907 }
2707 break; 2908 break;
2708 2909
2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2910 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2777#endif 2978#endif
2778 2979
2779 case CSI_78: /* DECREQTPARM */ 2980 case CSI_78: /* DECREQTPARM */
2780 if (arg[0] == 0 || arg[0] == 1) 2981 if (arg[0] == 0 || arg[0] == 1)
2781 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2982 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2782 /* FALLTHROUGH */ 2983 break;
2783 2984
2784 default: 2985 default:
2785 break; 2986 break;
2786 } 2987 }
2787} 2988}
… …
2790#ifndef NO_FRILLS 2991#ifndef NO_FRILLS
2791/* ARGSUSED */ 2992/* ARGSUSED */
2792void 2993void
2793rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2994rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2794{ 2995{
2795 int x, y; 2996 int x, y;
2796#if 0
2797 char *s;
2798#endif
2799 XWindowAttributes wattr; 2997 XWindowAttributes wattr;
2800 Window wdummy; 2998 Window wdummy;
2801 2999
2802 if (nargs == 0) 3000 if (nargs == 0)
2803 return; 3001 return;
3002
2804 switch (args[0]) 3003 switch (args[0])
2805 { 3004 {
2806 /* 3005 /*
2807 * commands 3006 * commands
2808 */ 3007 */
2809 case 1: /* deiconify window */ 3008 case 1: /* deiconify window */
2810 XMapWindow (display->display, TermWin.parent[0]); 3009 XMapWindow (display->display, TermWin.parent[0]);
2811 break; 3010 break;
2812 case 2: /* iconify window */ 3011 case 2: /* iconify window */
2813 XIconifyWindow (display->display, TermWin.parent[0], 3012 XIconifyWindow (display->display, TermWin.parent[0],
… …
2830 break; 3029 break;
2831 case 8: /* set size (chars) */ 3030 case 8: /* set size (chars) */
2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2833 (unsigned int) (args[1] * TermWin.fheight)); 3032 (unsigned int) (args[1] * TermWin.fheight));
2834 break; 3033 break;
3034
3035 //case 9: NYI, TODO, restore maximized window or maximize window
2835 default: 3036 default:
2836 if (args[0] >= 24) /* set height (chars) */ 3037 if (args[0] >= 24) /* set height (chars) */
2837 set_widthheight ((unsigned int)TermWin.width, 3038 set_widthheight ((unsigned int)TermWin.width,
2838 (unsigned int) (args[1] * TermWin.fheight)); 3039 (unsigned int) (args[1] * TermWin.fheight));
2839 break; 3040 break;
3041
3042
2840 /* 3043 /*
2841 * reports - some output format copied from XTerm 3044 * reports - some output format copied from XTerm
2842 */ 3045 */
2843 case 11: /* report window state */ 3046 case 11: /* report window state */
2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2846 break; 3049 break;
2847 case 13: /* report window position */ 3050 case 13: /* report window position */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2850 -wattr.border_width, -wattr.border_width, 3053 -wattr.border_width, -wattr.border_width,
2851 &x, &y, &wdummy); 3054 &x, &y, &wdummy);
2852 tt_printf ("\033[3;%d;%dt", x, y); 3055 tt_printf ("\033[3;%d;%dt", x, y);
2853 break; 3056 break;
2854 case 14: /* report window size (pixels) */ 3057 case 14: /* report window size (pixels) */
2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2857 break; 3060 break;
2858 case 18: /* report window size (chars) */ 3061 case 18: /* report text area size (chars) */
2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2860 break; 3063 break;
2861#if 0 /* XXX: currently disabled due to security concerns */ 3064 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066 break;
2862 case 20: /* report icon label */ 3067 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 {
3070 char *s;
2863 XGetIconName (display->display, TermWin.parent[0], &s); 3071 XGetIconName (display->display, TermWin.parent[0], &s);
2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3073 }
2865 break; 3074 break;
2866 case 21: /* report window title */ 3075 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 {
3078 char *s;
2867 XFetchName (display->display, TermWin.parent[0], &s); 3079 XFetchName (display->display, TermWin.parent[0], &s);
2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3081 }
2869 break; 3082 break;
2870#endif
2871
2872 } 3083 }
2873} 3084}
2874#endif 3085#endif
2875 3086
2876/*----------------------------------------------------------------------*/ 3087/*----------------------------------------------------------------------*/
2877/* 3088/*
2878 * get input up until STRING TERMINATOR (or BEL) 3089 * get input up until STRING TERMINATOR (or BEL)
2879 * ends_how is terminator used. returned input must be free ()d 3090 * ends_how is terminator used. returned input must be free()'d
2880 */ 3091 */
2881unsigned char * 3092unsigned char *
2882rxvt_term::get_to_st (unsigned char *ends_how) 3093rxvt_term::get_to_st (unicode_t &ends_how)
2883{ 3094{
2884 int seen_esc = 0; /* seen escape? */ 3095 int seen_esc = 0; /* seen escape? */
2885 unsigned int n = 0; 3096 unsigned int n = 0;
2886 unsigned char *s; 3097 unsigned char *s;
3098 unicode_t ch;
2887 unsigned char ch, string[STRING_MAX]; 3099 unsigned char string[STRING_MAX];
2888 3100
2889 for (; (ch = cmd_getc ());) 3101 while ((ch = cmd_getc ()))
2890 { 3102 {
2891 if (ch == C0_BEL 3103 if (ch == C0_BEL || ch == CHAR_ST)
2892 || ch == CHAR_ST 3104 break;
3105
3106 if (seen_esc)
2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3107 if (ch == 0x5c) /* 7bit ST */
2894 break; 3108 break;
3109 else
3110 return NULL;
3111
2895 if (ch == C0_ESC) 3112 if (ch == C0_ESC)
2896 { 3113 {
2897 seen_esc = 1; 3114 seen_esc = 1;
2898 continue; 3115 continue;
2899 } 3116 }
2900 else if (ch == '\t') 3117 else if (ch == C0_HT)
2901 ch = ' '; /* translate '\t' to space */ 3118 ch = ' '; /* translate '\t' to space */
2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
2903 return NULL; /* other control character - exit */ 3120 return NULL; /* other control character - exit */
3121
2904 if (n < sizeof (string) - 1) 3122 if (n >= sizeof (string) - 1)
3123 // stop at some sane length
3124 return NULL;
3125
2905 string[n++] = ch; 3126 string[n++] = ch;
2906 seen_esc = 0; 3127 seen_esc = 0;
2907 } 3128 }
3129
2908 string[n++] = '\0'; 3130 string[n++] = '\0';
3131
2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2910 return NULL; 3133 return NULL;
3134
2911 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3135 ends_how = (ch == 0x5c ? C0_ESC : ch);
2912 STRNCPY (s, string, n); 3136 STRNCPY (s, string, n);
2913 return s; 3137 return s;
2914} 3138}
2915 3139
2916/*----------------------------------------------------------------------*/ 3140/*----------------------------------------------------------------------*/
… …
2918 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2919 */ 3143 */
2920void 3144void
2921rxvt_term::process_dcs_seq () 3145rxvt_term::process_dcs_seq ()
2922{ 3146{
2923 unsigned char eh, *s; 3147 unsigned char *s;
3148 unicode_t eh;
3149
2924 /* 3150 /*
2925 * Not handled yet 3151 * Not handled yet
2926 */ 3152 */
2927 s = get_to_st (&eh); 3153 s = get_to_st (eh);
2928 if (s) 3154 if (s)
2929 free (s); 3155 free (s);
3156
2930 return; 3157 return;
2931} 3158}
2932 3159
2933/*----------------------------------------------------------------------*/ 3160/*----------------------------------------------------------------------*/
2934/* 3161/*
2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3162 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2936 */ 3163 */
2937void 3164void
2938rxvt_term::process_osc_seq () 3165rxvt_term::process_osc_seq ()
2939{ 3166{
2940 unsigned char ch, eh, *s; 3167 unicode_t ch, eh;
2941 int arg; 3168 int arg;
2942 3169
2943 ch = cmd_getc (); 3170 ch = cmd_getc ();
2944 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3171 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2945 arg = arg * 10 + (ch - '0'); 3172 arg = arg * 10 + (ch - '0');
2946 3173
2947 if (ch == ';') 3174 if (ch == ';')
2948 { 3175 {
2949 s = get_to_st (&eh); 3176 unsigned char *s = get_to_st (eh);
3177
2950 if (s) 3178 if (s)
2951 { 3179 {
2952 /*
2953 * rxvt_menubar_dispatch () violates the constness of the string,
2954 * so do it here
2955 */
2956 if (arg == XTerm_Menu)
2957#if 0 /* XXX: currently disabled due to security concerns */
2958 menubar_dispatch ((char *)s);
2959#else
2960 (void)0;
2961#endif
2962 else
2963 xterm_seq (arg, (char *)s, eh); 3180 process_xterm_seq (arg, (char *)s, eh);
2964 free (s); 3181 free (s);
2965 } 3182 }
2966 } 3183 }
2967} 3184}
3185
3186void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3188{
3189 if (str[0] == '?' && !str[1])
3190 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 }
3198 else
3199 set_window_color (color, str);
3200}
3201
2968/* 3202/*
2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2970 * 0 = change iconName/title 3204 * 0 = change iconName/title
2971 * 1 = change iconName 3205 * 1 = change iconName
2972 * 2 = change title 3206 * 2 = change title
2973 * 4 = change color 3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
2974 * 12 = change text color 3210 * 12 = change text color
2975 * 13 = change mouse foreground color 3211 * 13 = change mouse foreground color
2976 * 17 = change highlight character colour 3212 * 17 = change highlight character colour
2977 * 18 = change bold character color 3213 * 18 = change bold character color
2978 * 19 = change underlined character color 3214 * 19 = change underlined character color
2979 * 46 = change logfile (not implemented) 3215 * 46 = change logfile (not implemented)
2980 * 50 = change font 3216 * 50 = change font
2981 * 3217 *
2982 * rxvt extensions: 3218 * rxvt extensions:
2983 * 9 = change locale (NYI)
2984 * 10 = menu (may change in future)
2985 * 20 = bg pixmap 3219 * 20 = bg pixmap
2986 * 39 = change default fg color 3220 * 39 = change default fg color
2987 * 49 = change default bg color 3221 * 49 = change default bg color
2988 * 55 = dump scrollback buffer and all of screen 3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
2989 */ 3226 */
2990void 3227void
2991rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2992{ 3229{
2993 int changed = 0; 3230 int changed = 0;
2994 int color; 3231 int color;
2995 char *buf, *name; 3232 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1];
2996 3234
2997 assert (str != NULL); 3235 assert (str != NULL);
2998 switch (op) 3236 switch (op)
2999 { 3237 {
3000 case XTerm_name: 3238 case XTerm_name:
3001 set_title (str); 3239 set_title (str);
3002 /* FALLTHROUGH */ 3240 /* FALLTHROUGH */
3003 case XTerm_iconName: 3241 case XTerm_iconName:
3004 set_iconName (str); 3242 set_icon_name (str);
3005 break; 3243 break;
3006 case XTerm_title: 3244 case XTerm_title:
3007 set_title (str); 3245 set_title (str);
3008 break; 3246 break;
3247 case XTerm_property:
3248 if (str[0] == '?')
3249 {
3250 Atom prop = XInternAtom (display->display, str + 1, True);
3251 Atom actual_type;
3252 int actual_format;
3253 unsigned long nitems;
3254 unsigned long bytes_after;
3255 unsigned char *value = 0;
3256 const char *str = "";
3257
3258 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None
3264 && actual_format == 8)
3265 str = (const char *)(value);
3266
3267 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3268
3269 XFree (value);
3270 }
3271 else
3272 {
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274
3275 if (eq)
3276 {
3277 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0],
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 }
3283 else
3284 XDeleteProperty (display->display, TermWin.parent[0],
3285 display->atom (str));
3286 }
3287 break;
3288
3009 case XTerm_Color: 3289 case XTerm_Color:
3010 for (buf = (char *)str; buf && *buf;) 3290 for (buf = (char *)str; buf && *buf;)
3011 { 3291 {
3012 if ((name = STRCHR (buf, ';')) == NULL) 3292 if ((name = STRCHR (buf, ';')) == NULL)
3013 break; 3293 break;
3294
3014 *name++ = '\0'; 3295 *name++ = '\0';
3015 color = atoi (buf); 3296 color = atoi (buf);
3297
3016 if (color < 0 || color >= TOTAL_COLORS) 3298 if (color < 0 || color >= TOTAL_COLORS)
3017 break; 3299 break;
3300
3018 if ((buf = STRCHR (name, ';')) != NULL) 3301 if ((buf = STRCHR (name, ';')) != NULL)
3019 *buf++ = '\0'; 3302 *buf++ = '\0';
3303
3304 if (name[0] == '?' && !name[1])
3305 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 }
3313 else
3020 set_window_color (color + minCOLOR, name); 3314 set_window_color (color + minCOLOR, name);
3021 } 3315 }
3316 break;
3317 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3319 break;
3320 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3022 break; 3322 break;
3023#ifndef NO_CURSORCOLOR 3323#ifndef NO_CURSORCOLOR
3024 case XTerm_Color_cursor: 3324 case XTerm_Color_cursor:
3025 set_window_color (Color_cursor, str); 3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3026 break; 3326 break;
3027#endif 3327#endif
3028 case XTerm_Color_pointer: 3328 case XTerm_Color_pointer_fg:
3029 set_window_color (Color_pointer, str); 3329 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3330 break;
3331 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3030 break; 3333 break;
3031#ifndef NO_BOLD_UNDERLINE_REVERSE 3334#ifndef NO_BOLD_UNDERLINE_REVERSE
3032 case XTerm_Color_BD: 3335 case XTerm_Color_BD:
3033 set_window_color (Color_BD, str); 3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3034 break; 3337 break;
3035 case XTerm_Color_UL: 3338 case XTerm_Color_UL:
3036 set_window_color (Color_UL, str); 3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3037 break; 3340 break;
3038 case XTerm_Color_RV: 3341 case XTerm_Color_RV:
3039 set_window_color (Color_RV, str); 3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3040 break; 3343 break;
3041#endif 3344#endif
3042 3345
3043 case XTerm_Menu:
3044 /*
3045 * rxvt_menubar_dispatch () violates the constness of the string,
3046 * so DON'T do it here
3047 */
3048 break;
3049 case XTerm_Pixmap: 3346 case XTerm_Pixmap:
3050 if (*str != ';') 3347 if (*str != ';')
3051 { 3348 {
3052#if XPM_BACKGROUND 3349#if XPM_BACKGROUND
3053 scale_pixmap (""); /* reset to default scaling */ 3350 scale_pixmap (""); /* reset to default scaling */
… …
3076 set_window_color (Color_fg, str); 3373 set_window_color (Color_fg, str);
3077 break; 3374 break;
3078 case XTerm_restoreBG: 3375 case XTerm_restoreBG:
3079 set_window_color (Color_bg, str); 3376 set_window_color (Color_bg, str);
3080 break; 3377 break;
3378
3081 case XTerm_logfile: 3379 case XTerm_logfile:
3380 // TODO, when secure mode?
3082 break; 3381 break;
3382
3083 case XTerm_font: 3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3084 change_font (str); 3394 change_font (str);
3085 break; 3395 break;
3396
3397#ifndef NO_FRILLS
3086 case XTerm_locale: 3398 case XTerm_locale:
3087 if (str[0] == '?' && !str[1]) 3399 if (query)
3088 tt_printf ("%-.250s\n", locale); 3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3089 else 3404 else
3090 { 3405 {
3091 set_locale (str); 3406 set_locale (str);
3407# ifdef USE_XIM
3092 im_cb (); 3408 im_cb ();
3409# endif
3093 } 3410 }
3094 break; 3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR
3424 case XTerm_Menu:
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break;
3428#endif
3095#if 0 3429#if 0
3096 case XTerm_dumpscreen: /* no error notices */ 3430 case XTerm_dumpscreen: /* no error notices */
3097 { 3431 {
3098 int fd; 3432 int fd;
3099 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3433 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3100 { 3434 {
3101 scr_dump (fd); 3435 scr_dump (fd);
3102 close (fd); 3436 close (fd);
3103 } 3437 }
3104 } 3438 }
3105 break; 3439 break;
3106#endif 3440#endif
3107
3108 } 3441 }
3109} 3442}
3110/*----------------------------------------------------------------------*/ 3443/*----------------------------------------------------------------------*/
3111 3444
3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3445/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3120 * so no need for fancy checking 3453 * so no need for fancy checking
3121 */ 3454 */
3122int 3455int
3123rxvt_term::privcases (int mode, unsigned long bit) 3456rxvt_term::privcases (int mode, unsigned long bit)
3124{ 3457{
3125 int state; 3458 int state;
3126 3459
3127 if (mode == 's') 3460 if (mode == 's')
3128 { 3461 {
3129 SavedModes |= (PrivateModes & bit); 3462 SavedModes |= (PrivateModes & bit);
3130 return -1; 3463 return -1;
… …
3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3136 else 3469 else
3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3138 PrivMode (state, bit); 3471 PrivMode (state, bit);
3139 } 3472 }
3473
3140 return state; 3474 return state;
3141} 3475}
3142 3476
3143/* we're not using priv _yet_ */ 3477/* we're not using priv _yet_ */
3144void 3478void
3145rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3479rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3146{ 3480{
3147 unsigned int i, j; 3481 unsigned int i, j;
3148 int state; 3482 int state;
3483
3149 static const struct 3484 static const struct
3150 { 3485 {
3151 const int argval; 3486 const int argval;
3152 const unsigned long bit; 3487 const unsigned long bit;
3153 } 3488 }
3489
3154 argtopriv[] = { 3490 argtopriv[] = {
3155 { 1, PrivMode_aplCUR }, 3491 { 1, PrivMode_aplCUR },
3156 { 2, PrivMode_vt52 }, 3492 { 2, PrivMode_vt52 },
3157 { 3, PrivMode_132 }, 3493 { 3, PrivMode_132 },
3158 { 4, PrivMode_smoothScroll }, 3494 { 4, PrivMode_smoothScroll },
… …
3164 { menuBar_esc, PrivMode_menuBar }, 3500 { menuBar_esc, PrivMode_menuBar },
3165#endif 3501#endif
3166#ifdef scrollBar_esc 3502#ifdef scrollBar_esc
3167 { scrollBar_esc, PrivMode_scrollBar }, 3503 { scrollBar_esc, PrivMode_scrollBar },
3168#endif 3504#endif
3505 // 18, 19 printing-related
3169 { 25, PrivMode_VisibleCursor }, 3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3170 { 35, PrivMode_ShiftKeys }, 3508 { 35, PrivMode_ShiftKeys }, // rxvt extension
3171 { 40, PrivMode_132OK }, 3509 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI
3512 // 46 start logging
3172 { 47, PrivMode_Screen }, 3513 { 47, PrivMode_Screen },
3173 { 66, PrivMode_aplKP }, 3514 { 66, PrivMode_aplKP },
3174#ifndef NO_BACKSPACE_KEY 3515#ifndef NO_BACKSPACE_KEY
3175 { 67, PrivMode_BackSpace }, 3516 { 67, PrivMode_BackSpace },
3176#endif 3517#endif
3177 { 1000, PrivMode_MouseX11 }, 3518 { 1000, PrivMode_MouseX11 },
3519 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3520 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3521 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3178 { 1010, PrivMode_TtyOutputInh }, 3522 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3179 { 1011, PrivMode_Keypress }, 3523 { 1011, PrivMode_Keypress }, // rxvt extension
3524 // 1035 enable modifiers for alt, numlock NYI
3525 // 1036 send ESC for meta keys NYI
3526 // 1037 send DEL for keypad delete NYI
3180 { 1047, PrivMode_Screen }, 3527 { 1047, PrivMode_Screen },
3528 // 1048 save and restore cursor
3181 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3529 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3530 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3531 };
3183 3532
3184 if (nargs == 0) 3533 if (nargs == 0)
3185 return; 3534 return;
3186 3535
… …
3201 state = privcases (mode, argtopriv[j].bit); 3550 state = privcases (mode, argtopriv[j].bit);
3202 break; 3551 break;
3203 } 3552 }
3204 3553
3205 /* extra handling for values with state unkept */ 3554 /* extra handling for values with state unkept */
3206 if (state == -1)
3207 switch (arg[i]) 3555 switch (arg[i])
3208 { 3556 {
3209 case 1048: /* alternative cursor save */ 3557 case 1048: /* alternative cursor save */
3558 if (Options & Opt_secondaryScreen)
3210 if (mode == 0) 3559 if (mode == 0)
3211 scr_cursor (RESTORE); 3560 scr_cursor (RESTORE);
3212 else if (mode == 1) 3561 else if (mode == 1)
3213 scr_cursor (SAVE); 3562 scr_cursor (SAVE);
3214 /* FALLTHROUGH */
3215 default:
3216 continue; /* for (;i;) */
3217 }
3218
3219 /* extra handling for values with valid 0 or 1 state */
3220 switch (arg[i])
3221 {
3222 /* case 1: - application cursor keys */
3223 case 2: /* VT52 mode */
3224 /* oddball mode. should be set regardless of set/reset
3225 * parameter. Return from VT52 mode with an ESC < from
3226 * within VT52 mode
3227 */
3228 PrivMode (1, PrivMode_vt52);
3229 break; 3563 break;
3564 }
3565
3566 if (state >= 0)
3567 /* extra handling for values with valid 0 or 1 state */
3568 switch (arg[i])
3569 {
3570 /* case 1: - application cursor keys */
3571 case 2: /* VT52 mode */
3572 /* oddball mode. should be set regardless of set/reset
3573 * parameter. Return from VT52 mode with an ESC < from
3574 * within VT52 mode
3575 */
3576 PrivMode (1, PrivMode_vt52);
3577 break;
3230 case 3: /* 80/132 */ 3578 case 3: /* 80/132 */
3231 if (PrivateModes & PrivMode_132OK) 3579 if (PrivateModes & PrivMode_132OK)
3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3233 (unsigned int)TermWin.height);
3234 break; 3581 break;
3235 case 4: /* smooth scrolling */ 3582 case 4: /* smooth scrolling */
3236 if (state) 3583 if (state)
3237 Options &= ~Opt_jumpScroll; 3584 Options &= ~Opt_jumpScroll;
3238 else 3585 else
3239 Options |= Opt_jumpScroll; 3586 Options |= Opt_jumpScroll;
3240 break; 3587 break;
3241 case 5: /* reverse video */ 3588 case 5: /* reverse video */
3242 scr_rvideo_mode (state); 3589 scr_rvideo_mode (state);
3243 break; 3590 break;
3244 case 6: /* relative/absolute origins */ 3591 case 6: /* relative/absolute origins */
3245 scr_relative_origin (state); 3592 scr_relative_origin (state);
3246 break; 3593 break;
3247 case 7: /* autowrap */ 3594 case 7: /* autowrap */
3248 scr_autowrap (state); 3595 scr_autowrap (state);
3249 break; 3596 break;
3250 /* case 8: - auto repeat, can't do on a per window basis */ 3597 /* case 8: - auto repeat, can't do on a per window basis */
3251 case 9: /* X10 mouse reporting */ 3598 case 9: /* X10 mouse reporting */
3252 if (state) /* orthogonal */ 3599 if (state) /* orthogonal */
3253 PrivateModes &= ~ (PrivMode_MouseX11); 3600 PrivateModes &= ~PrivMode_MouseX11;
3254 break; 3601 break;
3255#ifdef menuBar_esc 3602#ifdef menuBar_esc
3256 case menuBar_esc: 3603 case menuBar_esc:
3257#ifdef MENUBAR 3604#ifdef MENUBAR
3258 map_menuBar (state); 3605 map_menuBar (state);
3259#endif 3606#endif
3260 break; 3607 break;
3261#endif 3608#endif
3262#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3263 case scrollBar_esc: 3610 case scrollBar_esc:
3264 if (scrollbar_mapping (state)) 3611 if (scrollbar_mapping (state))
3265 { 3612 {
3266 resize_all_windows (0, 0, 0); 3613 resize_all_windows (0, 0, 0);
3267 scr_touch (true); 3614 scr_touch (true);
3268 } 3615 }
3269 break; 3616 break;
3270#endif 3617#endif
3271 case 25: /* visible/invisible cursor */ 3618 case 25: /* visible/invisible cursor */
3272 scr_cursor_visible (state); 3619 scr_cursor_visible (state);
3273 break; 3620 break;
3274 /* case 35: - shift keys */ 3621 /* case 35: - shift keys */
3275 /* case 40: - 80 <--> 132 mode */ 3622 /* case 40: - 80 <--> 132 mode */
3276 case 47: /* secondary screen */ 3623 case 47: /* secondary screen */
3277 scr_change_screen (state); 3624 scr_change_screen (state);
3278 break; 3625 break;
3279 /* case 66: - application key pad */ 3626 /* case 66: - application key pad */
3280 /* case 67: - backspace key */ 3627 /* case 67: - backspace key */
3281 case 1000: /* X11 mouse reporting */ 3628 case 1000: /* X11 mouse reporting */
3282 if (state) /* orthogonal */ 3629 if (state) /* orthogonal */
3283 PrivateModes &= ~ (PrivMode_MouseX10); 3630 PrivateModes &= ~PrivMode_MouseX10;
3284 break; 3631 break;
3285#if 0 3632#if 0
3286 case 1001: 3633 case 1001:
3287 break; /* X11 mouse highlighting */ 3634 break; /* X11 mouse highlighting */
3288#endif 3635#endif
3289 case 1010: /* scroll to bottom on TTY output inhibit */ 3636 case 1010: /* scroll to bottom on TTY output inhibit */
3290 if (state) 3637 if (state)
3291 Options &= ~Opt_scrollTtyOutput; 3638 Options &= ~Opt_scrollTtyOutput;
3292 else 3639 else
3293 Options |= Opt_scrollTtyOutput; 3640 Options |= Opt_scrollTtyOutput;
3294 break; 3641 break;
3295 case 1011: /* scroll to bottom on key press */ 3642 case 1011: /* scroll to bottom on key press */
3296 if (state) 3643 if (state)
3297 Options |= Opt_scrollTtyKeypress; 3644 Options |= Opt_scrollTtyKeypress;
3298 else 3645 else
3299 Options &= ~Opt_scrollTtyKeypress; 3646 Options &= ~Opt_scrollTtyKeypress;
3300 break; 3647 break;
3301 case 1047: /* secondary screen w/ clearing */ 3648 case 1047: /* secondary screen w/ clearing last */
3302 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3649 if (Options & Opt_secondaryScreen)
3303 if (current_screen != PRIMARY) 3650 if (current_screen != PRIMARY)
3304 scr_erase_screen (2); 3651 scr_erase_screen (2);
3305 scr_change_screen (state); 3652 scr_change_screen (state);
3306 /* FALLTHROUGH */
3307 default:
3308 break; 3653 break;
3654 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY)
3658 scr_erase_screen (2);
3659 break;
3660 default:
3661 break;
3309 } 3662 }
3310 } 3663 }
3311} 3664}
3312/*}}} */ 3665/*}}} */
3313 3666
3314/*{{{ process sgr sequences */ 3667/*{{{ process sgr sequences */
3315void 3668void
3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3669rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3317{ 3670{
3318 unsigned int i; 3671 unsigned int i;
3319 short rendset; 3672 short rendset;
3320 int rendstyle; 3673 int rendstyle;
3321 3674
3322 if (nargs == 0) 3675 if (nargs == 0)
3323 { 3676 {
3324 scr_rendition (0, ~RS_None); 3677 scr_rendition (0, ~RS_None);
3325 return; 3678 return;
3326 } 3679 }
3680
3327 for (i = 0; i < nargs; i++) 3681 for (i = 0; i < nargs; i++)
3328 { 3682 {
3329 rendset = -1; 3683 rendset = -1;
3330 switch (arg[i]) 3684 switch (arg[i])
3331 { 3685 {
… …
3339 rendset = 1, rendstyle = RS_Uline; 3693 rendset = 1, rendstyle = RS_Uline;
3340 break; 3694 break;
3341 case 5: 3695 case 5:
3342 rendset = 1, rendstyle = RS_Blink; 3696 rendset = 1, rendstyle = RS_Blink;
3343 break; 3697 break;
3698 //case 6: // scoansi light background
3344 case 7: 3699 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3700 rendset = 1, rendstyle = RS_RVid;
3701 break;
3702 case 8:
3703 // invisible. NYI
3704 break;
3705 //case 10: // scoansi acs off
3706 //case 11: // scoansi acs on
3707 //case 12: // scoansi acs on, |0x80
3708 case 21: // disable bold, blink and invis (some terminals use this)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink;
3346 break; 3710 break;
3347 case 22: 3711 case 22:
3348 rendset = 0, rendstyle = RS_Bold; 3712 rendset = 0, rendstyle = RS_Bold;
3349 break; 3713 break;
3350 case 24: 3714 case 24:
… …
3354 rendset = 0, rendstyle = RS_Blink; 3718 rendset = 0, rendstyle = RS_Blink;
3355 break; 3719 break;
3356 case 27: 3720 case 27:
3357 rendset = 0, rendstyle = RS_RVid; 3721 rendset = 0, rendstyle = RS_RVid;
3358 break; 3722 break;
3723 case 28:
3724 // visible. NYI
3725 break;
3359 } 3726 }
3727
3360 if (rendset != -1) 3728 if (rendset != -1)
3361 { 3729 {
3362 scr_rendition (rendset, rendstyle); 3730 scr_rendition (rendset, rendstyle);
3363 continue; /* for (;i;) */ 3731 continue; /* for (;i;) */
3364 } 3732 }
… …
3371 case 33: 3739 case 33:
3372 case 34: 3740 case 34:
3373 case 35: 3741 case 35:
3374 case 36: 3742 case 36:
3375 case 37: 3743 case 37:
3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3377 Color_fg);
3378 break; 3745 break;
3379#ifdef TTY_256COLOR 3746#ifdef TTY_256COLOR
3380 case 38: 3747 case 38:
3381 if (nargs > i + 2 && arg[i + 1] == 5) 3748 if (nargs > i + 2 && arg[i + 1] == 5)
3382 { 3749 {
3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3384 Color_fg);
3385 i += 2; 3751 i += 2;
3386 } 3752 }
3387 break; 3753 break;
3388#endif 3754#endif
3389 case 39: /* default fg */ 3755 case 39: /* default fg */
… …
3396 case 43: 3762 case 43:
3397 case 44: 3763 case 44:
3398 case 45: 3764 case 45:
3399 case 46: 3765 case 46:
3400 case 47: 3766 case 47:
3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3402 Color_bg);
3403 break; 3768 break;
3404#ifdef TTY_256COLOR 3769#ifdef TTY_256COLOR
3405 case 48: 3770 case 48:
3406 if (nargs > i + 2 && arg[i + 1] == 5) 3771 if (nargs > i + 2 && arg[i + 1] == 5)
3407 { 3772 {
3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3409 Color_bg);
3410 i += 2; 3774 i += 2;
3411 } 3775 }
3412 break; 3776 break;
3413#endif 3777#endif
3414 case 49: /* default bg */ 3778 case 49: /* default bg */
… …
3443 } 3807 }
3444 } 3808 }
3445} 3809}
3446/*}}} */ 3810/*}}} */
3447 3811
3448/*{{{ process Rob Nation's own graphics mode sequences */ 3812/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3449void 3813void
3450rxvt_term::process_graphics () 3814rxvt_term::process_graphics ()
3451{ 3815{
3452 unsigned char ch, cmd = cmd_getc (); 3816 unicode_t ch, cmd = cmd_getc ();
3453 3817
3454 if (cmd == 'Q') 3818 if (cmd == 'Q')
3455 { /* query graphics */ 3819 { /* query graphics */
3456 tt_printf ("\033G0\n"); /* no graphics */ 3820 tt_printf ("\033G0\n"); /* no graphics */
3457 return; 3821 return;

Diff Legend

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