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

Diff Legend

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