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.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
… …
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,
… …
1384 { 1169 {
1385#ifdef NO_SLOW_LINK_SUPPORT 1170#ifdef NO_SLOW_LINK_SUPPORT
1386 scr_expose (ev.xexpose.x, ev.xexpose.y, 1171 scr_expose (ev.xexpose.x, ev.xexpose.y,
1387 ev.xexpose.width, ev.xexpose.height, False); 1172 ev.xexpose.width, ev.xexpose.height, False);
1388#else 1173#else
1389 // don't understand this, so commented it out 1174 // I don't understand this, so I changed it :)
1390 scr_expose (ev.xexpose.x, ev.xexpose.y, 1175 scr_expose (ev.xexpose.x, ev.xexpose.y,
1391 ev.xexpose.width, ev.xexpose.height, False); 1176 ev.xexpose.width, ev.xexpose.height, False);
1392 //scr_expose (ev.xexpose.x, 0, 1177 //scr_expose (ev.xexpose.x, 0,
1393 // ev.xexpose.width, TermWin.height, False); 1178 // ev.xexpose.width, TermWin.height, False);
1394#endif 1179#endif
… …
1396 } 1181 }
1397 else 1182 else
1398 { 1183 {
1399 XEvent unused_event; 1184 XEvent unused_event;
1400 1185
1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1402 Expose, 1187 ;
1403 &unused_event)) ;
1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1405 GraphicsExpose, 1189 ;
1406 &unused_event)) ; 1190
1407 if (isScrollbarWindow (ev.xany.window)) 1191 if (isScrollbarWindow (ev.xany.window))
1408 { 1192 {
1409 scrollBar.setIdle (); 1193 scrollBar.setIdle ();
1410 scrollbar_show (0); 1194 scrollbar_show (0);
1411 } 1195 }
… …
1422 pointer_unblank (); 1206 pointer_unblank ();
1423#endif 1207#endif
1424#if MENUBAR 1208#if MENUBAR
1425 if (isMenuBarWindow (ev.xany.window)) 1209 if (isMenuBarWindow (ev.xany.window))
1426 { 1210 {
1427 menubar_control (& (ev.xbutton)); 1211 menubar_control (ev.xbutton);
1428 break; 1212 break;
1429 } 1213 }
1430#endif 1214#endif
1431 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1432 break; 1216 break;
… …
1552 return; 1336 return;
1553 } 1337 }
1554 1338
1555 /* FALLTHROUGH */ 1339 /* FALLTHROUGH */
1556 case ReparentNotify: 1340 case ReparentNotify:
1557 if ((Options & Opt_transparent) && check_our_parents ()) 1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1558 if (am_transparent)
1559 want_full_refresh = 1; 1342 want_full_refresh = 1;
1560 break; 1343 break;
1561#endif 1344#endif
1562 } 1345 }
1563} 1346}
1564 1347
1565void 1348void
1566rxvt_term::button_press (const XButtonEvent &ev) 1349rxvt_term::button_press (XButtonEvent &ev)
1567{ 1350{
1568 int reportmode = 0, clickintime; 1351 int reportmode = 0, clickintime;
1569 1352
1570 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1571 if (!bypass_keystate) 1354 if (!bypass_keystate)
… …
1799 menubar_control (ev); 1582 menubar_control (ev);
1800#endif 1583#endif
1801} 1584}
1802 1585
1803void 1586void
1804rxvt_term::button_release (const XButtonEvent &ev) 1587rxvt_term::button_release (XButtonEvent &ev)
1805{ 1588{
1806 int reportmode = 0; 1589 int reportmode = 0;
1807 1590
1808 csrO = 0; /* reset csr Offset */ 1591 csrO = 0; /* reset csr Offset */
1809 if (!bypass_keystate) 1592 if (!bypass_keystate)
… …
1908 else if (isMenuBarWindow (ev.window)) 1691 else if (isMenuBarWindow (ev.window))
1909 menubar_control (ev); 1692 menubar_control (ev);
1910#endif 1693#endif
1911} 1694}
1912 1695
1913
1914#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
1915/* 1932/*
1916 * Check our parents are still who we think they are. 1933 * Check our parents are still who we think they are.
1917 * Do transparency updates if required 1934 * Do transparency updates if required
1918 */ 1935 */
1919int 1936int
1920rxvt_term::check_our_parents () 1937rxvt_term::check_our_parents ()
1921{ 1938{
1922 int i, pchanged, aformat, have_pixmap, rootdepth; 1939 int i, pchanged, aformat, have_pixmap, rootdepth;
1923 unsigned long nitems, bytes_after; 1940 unsigned long nitems, bytes_after;
1924 Atom atype; 1941 Atom atype;
1925 unsigned char *prop = NULL; 1942 unsigned char *prop = NULL;
1926 Window root, oldp, *list; 1943 Window root, oldp, *list;
1927 Pixmap rootpixmap = None; 1944 Pixmap rootpixmap = None;
1928 XWindowAttributes wattr, wrootattr; 1945 XWindowAttributes wattr, wrootattr;
1929 1946
1930 pchanged = 0; 1947 pchanged = 0;
1931 1948
1932 if (! (Options & Opt_transparent)) 1949 if (!(Options & Opt_transparent))
1933 return pchanged; /* Don't try any more */ 1950 return pchanged; /* Don't try any more */
1934 1951
1935 XGetWindowAttributes (display->display, display->root, &wrootattr); 1952 XGetWindowAttributes (display->display, display->root, &wrootattr);
1936 rootdepth = wrootattr.depth; 1953 rootdepth = wrootattr.depth;
1937 1954
1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1956
1939 if (rootdepth != wattr.depth) 1957 if (rootdepth != wattr.depth)
1940 { 1958 {
1941 if (am_transparent) 1959 if (am_transparent)
1942 { 1960 {
1943 pchanged = 1; 1961 pchanged = 1;
1944 XSetWindowBackground (display->display, TermWin.vt, 1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1945 PixColors[Color_bg]);
1946 am_transparent = am_pixmap_trans = 0; 1963 am_transparent = am_pixmap_trans = 0;
1947 } 1964 }
1965
1948 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1949 } 1967 }
1950 1968
1951 /* 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. */
1952 XSync (display->display, False); 1970 XSync (display->display, False);
… …
1954 /* 1972 /*
1955 * Make the frame window set by the window manager have 1973 * Make the frame window set by the window manager have
1956 * the root background. Some window managers put multiple nested frame 1974 * the root background. Some window managers put multiple nested frame
1957 * 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.
1958 */ 1976 */
1959 i = (xa[XA_XROOTPMAPID] != 0 1977 i = (xa[XA_XROOTPMAPID]
1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1962 &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
1963 if (!i || prop == NULL) 1988 if (!i || prop == NULL)
1964 have_pixmap = 0; 1989 have_pixmap = 0;
1965 else 1990 else
1966 { 1991 {
1967 have_pixmap = 1; 1992 have_pixmap = 1;
1968 rootpixmap = * ((Pixmap *)prop); 1993 rootpixmap = *(Pixmap *)prop;
1969 XFree (prop); 1994 XFree (prop);
1970 } 1995 }
1996
1971 if (have_pixmap) 1997 if (have_pixmap)
1972 { 1998 {
1973 /* 1999 /*
1974 * Copy display->root pixmap transparency 2000 * Copy display->root pixmap transparency
1975 */ 2001 */
1976 int sx, sy, nx, ny; 2002 int sx, sy, nx, ny;
1977 unsigned int nw, nh; 2003 unsigned int nw, nh;
1978 Window cr; 2004 Window cr;
1979 XImage *image; 2005 XImage *image;
1980 GC gc; 2006 GC gc;
1981 XGCValues gcvalue; 2007 XGCValues gcvalue;
1982 2008
1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1984 0, 0, &sx, &sy, &cr); 2010 0, 0, &sx, &sy, &cr);
1985 nw = (unsigned int)szHint.width; 2011 nw = (unsigned int)szHint.width;
1986 nh = (unsigned int)szHint.height; 2012 nh = (unsigned int)szHint.height;
1987 nx = ny = 0; 2013 nx = ny = 0;
2014
1988 if (sx < 0) 2015 if (sx < 0)
1989 { 2016 {
1990 nw += sx; 2017 nw += sx;
1991 nx = -sx; 2018 nx = -sx;
1992 sx = 0; 2019 sx = 0;
1993 } 2020 }
2021
1994 if (sy < 0) 2022 if (sy < 0)
1995 { 2023 {
1996 nh += sy; 2024 nh += sy;
1997 ny = -sy; 2025 ny = -sy;
1998 sy = 0; 2026 sy = 0;
1999 } 2027 }
2028
2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2002 allowedxerror = -1; 2031 allowedxerror = -1;
2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2004 ZPixmap); 2033
2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2006 /* XXX: may need a delay here? */ 2035 /* XXX: may need a delay here? */
2007 allowedxerror = 0; 2036 allowedxerror = 0;
2037
2008 if (image == NULL) 2038 if (image == NULL)
2009 { 2039 {
2010 if (am_transparent && am_pixmap_trans) 2040 if (am_transparent && am_pixmap_trans)
2011 { 2041 {
2012 pchanged = 1; 2042 pchanged = 1;
… …
2014 { 2044 {
2015 XFreePixmap (display->display, TermWin.pixmap); 2045 XFreePixmap (display->display, TermWin.pixmap);
2016 TermWin.pixmap = None; 2046 TermWin.pixmap = None;
2017 } 2047 }
2018 } 2048 }
2049
2019 am_pixmap_trans = 0; 2050 am_pixmap_trans = 0;
2020 } 2051 }
2021 else 2052 else
2022 { 2053 {
2023 if (TermWin.pixmap != None) 2054 if (TermWin.pixmap != None)
2024 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
2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2026 (unsigned int)szHint.width,
2027 (unsigned int)szHint.height, 2078 szHint.width, szHint.height, image->depth);
2028 (unsigned int)image->depth);
2029 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2030 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2031 nx, ny, (unsigned int)image->width,
2032 (unsigned int)image->height); 2081 nx, ny, image->width, image->height);
2033 XFreeGC (display->display, gc); 2082 XFreeGC (display->display, gc);
2034 XDestroyImage (image); 2083 XDestroyImage (image);
2035 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2036 TermWin.pixmap); 2085 TermWin.pixmap);
2086
2037 if (!am_transparent || !am_pixmap_trans) 2087 if (!am_transparent || !am_pixmap_trans)
2038 pchanged = 1; 2088 pchanged = 1;
2089
2039 am_transparent = am_pixmap_trans = 1; 2090 am_transparent = am_pixmap_trans = 1;
2040 } 2091 }
2041 } 2092 }
2093
2042 if (!am_pixmap_trans) 2094 if (!am_pixmap_trans)
2043 { 2095 {
2044 unsigned int n; 2096 unsigned int n;
2045 /* 2097 /*
2046 * InheritPixmap transparency 2098 * InheritPixmap transparency
2047 */ 2099 */
2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2050 i++)
2051 { 2102 {
2052 oldp = TermWin.parent[i]; 2103 oldp = TermWin.parent[i];
2053 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2104 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2054 &TermWin.parent[i], &list, &n); 2105 &TermWin.parent[i], &list, &n);
2055 XFree (list); 2106 XFree (list);
2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108
2057 if (TermWin.parent[i] == display->root) 2109 if (TermWin.parent[i] == display->root)
2058 { 2110 {
2059 if (oldp != None) 2111 if (oldp != None)
2060 pchanged = 1; 2112 pchanged = 1;
2113
2061 break; 2114 break;
2062 } 2115 }
2116
2063 if (oldp != TermWin.parent[i]) 2117 if (oldp != TermWin.parent[i])
2064 pchanged = 1; 2118 pchanged = 1;
2065 } 2119 }
2120
2066 n = 0; 2121 n = 0;
2122
2067 if (pchanged) 2123 if (pchanged)
2068 { 2124 {
2069 for (; n < (unsigned int)i; n++) 2125 for (; n < (unsigned int)i; n++)
2070 { 2126 {
2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2076 break; 2132 break;
2077 } 2133 }
2078 } 2134 }
2079 } 2135 }
2080 if (n > (int) (sizeof (TermWin.parent) 2136
2081 / sizeof (TermWin.parent[0]))) 2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2082 { 2138 {
2083 D_X ((stderr, "InheritPixmap Turning off")); 2139 D_X ((stderr, "InheritPixmap Turning off"));
2084 XSetWindowBackground (display->display, TermWin.parent[0], 2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2085 PixColors[Color_fg]);
2086 XSetWindowBackground (display->display, TermWin.vt, 2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2087 PixColors[Color_bg]);
2088 am_transparent = 0; 2142 am_transparent = 0;
2089 /* XXX: also turn off Opt_transparent? */ 2143 /* XXX: also turn off Opt_transparent? */
2090 } 2144 }
2091 else 2145 else
2092 { 2146 {
2147#if WAIT_FOR_WM
2093 /* wait (an arbitrary period) for the WM to do its thing 2148 /* wait (an arbitrary period) for the WM to do its thing
2094 * needed for fvwm2.2.2 (and before?) */ 2149 * 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); 2150 sleep (1);
2103# endif 2151#endif
2104 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2105 for (n = 0; n < (unsigned int)i; n++) 2153 for (n = 0; n < (unsigned int)i; n++)
2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2107 ParentRelative); 2155
2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2109 ParentRelative);
2110 am_transparent = 1; 2157 am_transparent = 1;
2111 } 2158 }
2159
2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2113 TermWin.parent[i] = None; 2161 TermWin.parent[i] = None;
2114 } 2162 }
2163
2115 return pchanged; 2164 return pchanged;
2116} 2165}
2117#endif 2166#endif
2118 2167
2119/*}}} */ 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}
2120 2324
2121/*{{{ print pipe */ 2325/*{{{ print pipe */
2122/*----------------------------------------------------------------------*/ 2326/*----------------------------------------------------------------------*/
2123#ifdef PRINTPIPE 2327#ifdef PRINTPIPE
2124FILE * 2328FILE *
2125rxvt_term::popen_printer () 2329rxvt_term::popen_printer ()
2126{ 2330{
2127 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2331 FILE *stream = popen (rs[Rs_print_pipe], "w");
2128 2332
2129 if (stream == NULL) 2333 if (stream == NULL)
2130 rxvt_print_error ("can't open printer pipe"); 2334 rxvt_warn ("can't open printer pipe, not printing.\n");
2335
2131 return stream; 2336 return stream;
2132} 2337}
2133 2338
2134int 2339int
2135rxvt_term::pclose_printer (FILE *stream) 2340rxvt_term::pclose_printer (FILE *stream)
2136{ 2341{
2137 fflush (stream); 2342 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); 2343 return pclose (stream);
2144# endif
2145} 2344}
2146 2345
2147/* 2346/*
2148 * simulate attached vt100 printer 2347 * simulate attached vt100 printer
2149 */ 2348 */
2150void 2349void
2151rxvt_term::process_print_pipe () 2350rxvt_term::process_print_pipe ()
2152{ 2351{
2153 int done; 2352 int done;
2154 FILE *fd; 2353 FILE *fd;
2155 2354
2156 if ((fd = popen_printer ()) == NULL) 2355 if ((fd = popen_printer ()) == NULL)
2157 return; 2356 return;
2158 2357
2159 /* 2358 /*
2160 * 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
2161 * is received. 2360 * is received.
2162 */ 2361 */
2163 for (done = 0; !done;) 2362 for (done = 0; !done;)
2164 { 2363 {
2165 unsigned char buf[8]; 2364 unsigned char buf[8];
2166 unsigned char ch; 2365 unicode_t ch;
2167 unsigned int i, len; 2366 unsigned int i, len;
2168 2367
2169 if ((ch = cmd_getc ()) != C0_ESC) 2368 if ((ch = cmd_getc ()) != C0_ESC)
2170 { 2369 {
2171 if (putc (ch, fd) == EOF) 2370 if (putc (ch, fd) == EOF)
2172 break; /* done = 1 */ 2371 break; /* done = 1 */
… …
2187 { 2386 {
2188 if ((buf[len++] = cmd_getc ()) == 'i') 2387 if ((buf[len++] = cmd_getc ()) == 'i')
2189 break; /* done = 1 */ 2388 break; /* done = 1 */
2190 } 2389 }
2191 } 2390 }
2391
2192 for (i = 0; i < len; i++) 2392 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF) 2393 if (putc (buf[i], fd) == EOF)
2194 { 2394 {
2195 done = 1; 2395 done = 1;
2196 break; 2396 break;
2197 } 2397 }
2198 } 2398 }
2199 } 2399 }
2400
2200 pclose_printer (fd); 2401 pclose_printer (fd);
2201} 2402}
2202#endif /* PRINTPIPE */ 2403#endif /* PRINTPIPE */
2203/*}}} */ 2404/*}}} */
2204 2405
2205/* *INDENT-OFF* */ 2406/* *INDENT-OFF* */
2206enum { 2407enum {
2207 C1_40 = 0x40, 2408 C1_40 = 0x40,
2208 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,
2209 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,
2210 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,
2211 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,
2212}; 2413};
2213/* *INDENT-ON* */ 2414/* *INDENT-ON* */
2214 2415
2215/*{{{ process non-printing single characters */ 2416/*{{{ process non-printing single characters */
2216void 2417void
2217rxvt_term::process_nonprinting (unsigned char ch) 2418rxvt_term::process_nonprinting (unicode_t ch)
2218{ 2419{
2219 switch (ch) 2420 switch (ch)
2220 { 2421 {
2422 case C0_ESC:
2423 process_escape_seq ();
2424 break;
2221 case C0_ENQ: /* terminal Status */ 2425 case C0_ENQ: /* terminal Status */
2222 if (rs[Rs_answerbackstring]) 2426 if (rs[Rs_answerbackstring])
2223 tt_write (
2224 (const unsigned char *)rs[Rs_answerbackstring], 2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2225 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2428 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2226 else 2429 else
2227 tt_write ((unsigned char *)VT100_ANS, 2430 tt_write ((unsigned char *)VT100_ANS,
2228 (unsigned int)STRLEN (VT100_ANS)); 2431 (unsigned int)STRLEN (VT100_ANS));
2229 break; 2432 break;
2230 case C0_BEL: /* bell */ 2433 case C0_BEL: /* bell */
2231 scr_bell (); 2434 scr_bell ();
2232 break; 2435 break;
2233 case C0_BS: /* backspace */ 2436 case C0_BS: /* backspace */
… …
2248 scr_charset_choose (1); 2451 scr_charset_choose (1);
2249 break; 2452 break;
2250 case C0_SI: /* shift in - acs */ 2453 case C0_SI: /* shift in - acs */
2251 scr_charset_choose (0); 2454 scr_charset_choose (0);
2252 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;
2253 } 2467 }
2254} 2468}
2255/*}}} */ 2469/*}}} */
2256 2470
2257 2471
2258/*{{{ process VT52 escape sequences */ 2472/*{{{ process VT52 escape sequences */
2259void 2473void
2260rxvt_term::process_escape_vt52 (unsigned char ch) 2474rxvt_term::process_escape_vt52 (unicode_t ch)
2261{ 2475{
2262 int row, col; 2476 int row, col;
2263 2477
2264 switch (ch) 2478 switch (ch)
2265 { 2479 {
… …
2317 2531
2318/*{{{ process escape sequences */ 2532/*{{{ process escape sequences */
2319void 2533void
2320rxvt_term::process_escape_seq () 2534rxvt_term::process_escape_seq ()
2321{ 2535{
2322 unsigned char ch = cmd_getc (); 2536 unicode_t ch = cmd_getc ();
2323 2537
2324 if (PrivateModes & PrivMode_vt52) 2538 if (PrivateModes & PrivMode_vt52)
2325 { 2539 {
2326 process_escape_vt52 (ch); 2540 process_escape_vt52 (ch);
2327 return; 2541 return;
… …
2344 scr_charset_set (2, (unsigned int)cmd_getc ()); 2558 scr_charset_set (2, (unsigned int)cmd_getc ());
2345 break; 2559 break;
2346 case '+': 2560 case '+':
2347 scr_charset_set (3, (unsigned int)cmd_getc ()); 2561 scr_charset_set (3, (unsigned int)cmd_getc ());
2348 break; 2562 break;
2349#ifdef MULTICHAR_SET
2350 case '$':
2351 scr_charset_set (-2, (unsigned int)cmd_getc ());
2352 break;
2353#endif
2354#ifndef NO_FRILLS 2563#ifndef NO_FRILLS
2355 case '6': 2564 case '6':
2356 scr_backindex (); 2565 scr_backindex ();
2357 break; 2566 break;
2358#endif 2567#endif
… …
2380 break; 2589 break;
2381 2590
2382 /* 8.3.87: NEXT LINE */ 2591 /* 8.3.87: NEXT LINE */
2383 case C1_NEL: /* ESC E */ 2592 case C1_NEL: /* ESC E */
2384 { 2593 {
2385 uint32_t nlcr[] = { '\n', '\r' }; 2594 unicode_t nlcr[] = { C0_LF, C0_CR };
2386 scr_add_lines (nlcr, 1, 2); 2595 scr_add_lines (nlcr, 1, 2);
2387 } 2596 }
2388 break; 2597 break;
2389 2598
2390 /* kidnapped escape sequence: Should be 8.3.48 */ 2599 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2401 case C1_RI: /* ESC M */ 2610 case C1_RI: /* ESC M */
2402 scr_index (DN); 2611 scr_index (DN);
2403 break; 2612 break;
2404 2613
2405 /* 8.3.142: SINGLE-SHIFT TWO */ 2614 /* 8.3.142: SINGLE-SHIFT TWO */
2406 /*case C1_SS2: scr_single_shift (2); break; */ 2615 /*case C1_SS2: scr_single_shift (2); break; */
2407 2616
2408 /* 8.3.143: SINGLE-SHIFT THREE */ 2617 /* 8.3.143: SINGLE-SHIFT THREE */
2409 /*case C1_SS3: scr_single_shift (3); break; */ 2618 /*case C1_SS3: scr_single_shift (3); break; */
2410 2619
2411 /* 8.3.27: DEVICE CONTROL STRING */ 2620 /* 8.3.27: DEVICE CONTROL STRING */
2412 case C1_DCS: /* ESC P */ 2621 case C1_DCS: /* ESC P */
2413 process_dcs_seq (); 2622 process_dcs_seq ();
2414 break; 2623 break;
… …
2429 process_osc_seq (); 2638 process_osc_seq ();
2430 break; 2639 break;
2431 2640
2432 /* 8.3.106: RESET TO INITIAL STATE */ 2641 /* 8.3.106: RESET TO INITIAL STATE */
2433 case 'c': 2642 case 'c':
2643 mbstate.reset ();
2434 scr_poweron (); 2644 scr_poweron ();
2435 scrollbar_show (1); 2645 scrollbar_show (1);
2436 break; 2646 break;
2437 2647
2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2648 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2450 2660
2451/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2661/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2452/* *INDENT-OFF* */ 2662/* *INDENT-OFF* */
2453enum { 2663enum {
2454 CSI_ICH = 0x40, 2664 CSI_ICH = 0x40,
2455 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,
2456 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 ,
2457 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,
2458 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,
2459 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,
2460 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,
… …
2475 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, */
2476 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, [, \, ], ^, _, */
2477 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, */
2478 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, */
2479 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, */
2480 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, {, |, }, ~, */
2481 }; 2691 };
2482/* *INDENT-ON* */ 2692/* *INDENT-ON* */
2483 2693
2484void 2694void
2485rxvt_term::process_csi_seq () 2695rxvt_term::process_csi_seq ()
2486{ 2696{
2487 unsigned char ch, priv, i; 2697 unicode_t ch, priv, i;
2488 unsigned int nargs, p; 2698 unsigned int nargs, p;
2489 int n, ndef; 2699 int n, ndef;
2490 int arg[ESC_ARGS]; 2700 int arg[ESC_ARGS];
2491 2701
2492 for (nargs = ESC_ARGS; nargs > 0;) 2702 for (nargs = ESC_ARGS; nargs > 0;)
2493 arg[--nargs] = 0; 2703 arg[--nargs] = 0;
2494 2704
2495 priv = 0; 2705 priv = 0;
… …
2497 if (ch >= '<' && ch <= '?') 2707 if (ch >= '<' && ch <= '?')
2498 { /* '<' '=' '>' '?' */ 2708 { /* '<' '=' '>' '?' */
2499 priv = ch; 2709 priv = ch;
2500 ch = cmd_getc (); 2710 ch = cmd_getc ();
2501 } 2711 }
2712
2502 /* read any numerical arguments */ 2713 /* read any numerical arguments */
2503 for (n = -1; ch < CSI_ICH; ) 2714 for (n = -1; ch < CSI_ICH; )
2504 { 2715 {
2505 if (isdigit (ch)) 2716 if (isdigit (ch))
2506 { 2717 {
… …
2513 { 2724 {
2514 if (nargs < ESC_ARGS) 2725 if (nargs < ESC_ARGS)
2515 arg[nargs++] = n; 2726 arg[nargs++] = n;
2516 n = -1; 2727 n = -1;
2517 } 2728 }
2518 else if (ch == '\b') 2729 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); 2730 process_nonprinting (ch);
2530 } 2731
2531 ch = cmd_getc (); 2732 ch = cmd_getc ();
2532 } 2733 }
2533 2734
2534 if (ch > CSI_7F) 2735 if (ch > CSI_7F)
2535 return; 2736 return;
… …
2693 tt_printf ("\033[0n"); 2894 tt_printf ("\033[0n");
2694 break; 2895 break;
2695 case 6: /* CPR requested */ 2896 case 6: /* CPR requested */
2696 scr_report_position (); 2897 scr_report_position ();
2697 break; 2898 break;
2698#if defined (ENABLE_DISPLAY_ANSWER)
2699 case 7: /* unofficial extension */ 2899 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure)
2700 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2901 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2701 break; 2902 break;
2702#endif
2703 case 8: /* unofficial extension */ 2903 case 8: /* unofficial extension */
2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2705 break; 2905 break;
2706 } 2906 }
2707 break; 2907 break;
2708 2908
2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2909 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2777#endif 2977#endif
2778 2978
2779 case CSI_78: /* DECREQTPARM */ 2979 case CSI_78: /* DECREQTPARM */
2780 if (arg[0] == 0 || arg[0] == 1) 2980 if (arg[0] == 0 || arg[0] == 1)
2781 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);
2782 /* FALLTHROUGH */ 2982 break;
2783 2983
2784 default: 2984 default:
2785 break; 2985 break;
2786 } 2986 }
2787} 2987}
… …
2790#ifndef NO_FRILLS 2990#ifndef NO_FRILLS
2791/* ARGSUSED */ 2991/* ARGSUSED */
2792void 2992void
2793rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2993rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2794{ 2994{
2795 int x, y; 2995 int x, y;
2796#if 0
2797 char *s;
2798#endif
2799 XWindowAttributes wattr; 2996 XWindowAttributes wattr;
2800 Window wdummy; 2997 Window wdummy;
2801 2998
2802 if (nargs == 0) 2999 if (nargs == 0)
2803 return; 3000 return;
3001
2804 switch (args[0]) 3002 switch (args[0])
2805 { 3003 {
2806 /* 3004 /*
2807 * commands 3005 * commands
2808 */ 3006 */
2809 case 1: /* deiconify window */ 3007 case 1: /* deiconify window */
2810 XMapWindow (display->display, TermWin.parent[0]); 3008 XMapWindow (display->display, TermWin.parent[0]);
2811 break; 3009 break;
2812 case 2: /* iconify window */ 3010 case 2: /* iconify window */
2813 XIconifyWindow (display->display, TermWin.parent[0], 3011 XIconifyWindow (display->display, TermWin.parent[0],
… …
2830 break; 3028 break;
2831 case 8: /* set size (chars) */ 3029 case 8: /* set size (chars) */
2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2833 (unsigned int) (args[1] * TermWin.fheight)); 3031 (unsigned int) (args[1] * TermWin.fheight));
2834 break; 3032 break;
3033
3034 //case 9: NYI, TODO, restore maximized window or maximize window
2835 default: 3035 default:
2836 if (args[0] >= 24) /* set height (chars) */ 3036 if (args[0] >= 24) /* set height (chars) */
2837 set_widthheight ((unsigned int)TermWin.width, 3037 set_widthheight ((unsigned int)TermWin.width,
2838 (unsigned int) (args[1] * TermWin.fheight)); 3038 (unsigned int) (args[1] * TermWin.fheight));
2839 break; 3039 break;
3040
3041
2840 /* 3042 /*
2841 * reports - some output format copied from XTerm 3043 * reports - some output format copied from XTerm
2842 */ 3044 */
2843 case 11: /* report window state */ 3045 case 11: /* report window state */
2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2846 break; 3048 break;
2847 case 13: /* report window position */ 3049 case 13: /* report window position */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2850 -wattr.border_width, -wattr.border_width, 3052 -wattr.border_width, -wattr.border_width,
2851 &x, &y, &wdummy); 3053 &x, &y, &wdummy);
2852 tt_printf ("\033[3;%d;%dt", x, y); 3054 tt_printf ("\033[3;%d;%dt", x, y);
2853 break; 3055 break;
2854 case 14: /* report window size (pixels) */ 3056 case 14: /* report window size (pixels) */
2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2857 break; 3059 break;
2858 case 18: /* report window size (chars) */ 3060 case 18: /* report text area size (chars) */
2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2860 break; 3062 break;
2861#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;
2862 case 20: /* report icon label */ 3066 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 {
3069 char *s;
2863 XGetIconName (display->display, TermWin.parent[0], &s); 3070 XGetIconName (display->display, TermWin.parent[0], &s);
2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3072 }
2865 break; 3073 break;
2866 case 21: /* report window title */ 3074 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2867 XFetchName (display->display, TermWin.parent[0], &s); 3078 XFetchName (display->display, TermWin.parent[0], &s);
2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2869 break; 3081 break;
2870#endif
2871
2872 } 3082 }
2873} 3083}
2874#endif 3084#endif
2875 3085
2876/*----------------------------------------------------------------------*/ 3086/*----------------------------------------------------------------------*/
2877/* 3087/*
2878 * get input up until STRING TERMINATOR (or BEL) 3088 * get input up until STRING TERMINATOR (or BEL)
2879 * ends_how is terminator used. returned input must be free ()d 3089 * ends_how is terminator used. returned input must be free()'d
2880 */ 3090 */
2881unsigned char * 3091unsigned char *
2882rxvt_term::get_to_st (unsigned char *ends_how) 3092rxvt_term::get_to_st (unicode_t &ends_how)
2883{ 3093{
2884 int seen_esc = 0; /* seen escape? */ 3094 int seen_esc = 0; /* seen escape? */
2885 unsigned int n = 0; 3095 unsigned int n = 0;
2886 unsigned char *s; 3096 unsigned char *s;
3097 unicode_t ch;
2887 unsigned char ch, string[STRING_MAX]; 3098 unsigned char string[STRING_MAX];
2888 3099
2889 for (; (ch = cmd_getc ());) 3100 while ((ch = cmd_getc ()))
2890 { 3101 {
2891 if (ch == C0_BEL 3102 if (ch == C0_BEL || ch == CHAR_ST)
2892 || ch == CHAR_ST 3103 break;
3104
3105 if (seen_esc)
2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3106 if (ch == 0x5c) /* 7bit ST */
2894 break; 3107 break;
3108 else
3109 return NULL;
3110
2895 if (ch == C0_ESC) 3111 if (ch == C0_ESC)
2896 { 3112 {
2897 seen_esc = 1; 3113 seen_esc = 1;
2898 continue; 3114 continue;
2899 } 3115 }
2900 else if (ch == '\t') 3116 else if (ch == C0_HT)
2901 ch = ' '; /* translate '\t' to space */ 3117 ch = ' '; /* translate '\t' to space */
2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
2903 return NULL; /* other control character - exit */ 3119 return NULL; /* other control character - exit */
3120
2904 if (n < sizeof (string) - 1) 3121 if (n >= sizeof (string) - 1)
3122 // stop at some sane length
3123 return NULL;
3124
2905 string[n++] = ch; 3125 string[n++] = ch;
2906 seen_esc = 0; 3126 seen_esc = 0;
2907 } 3127 }
3128
2908 string[n++] = '\0'; 3129 string[n++] = '\0';
3130
2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2910 return NULL; 3132 return NULL;
3133
2911 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3134 ends_how = (ch == 0x5c ? C0_ESC : ch);
2912 STRNCPY (s, string, n); 3135 STRNCPY (s, string, n);
2913 return s; 3136 return s;
2914} 3137}
2915 3138
2916/*----------------------------------------------------------------------*/ 3139/*----------------------------------------------------------------------*/
… …
2918 * 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)'
2919 */ 3142 */
2920void 3143void
2921rxvt_term::process_dcs_seq () 3144rxvt_term::process_dcs_seq ()
2922{ 3145{
2923 unsigned char eh, *s; 3146 unsigned char *s;
3147 unicode_t eh;
3148
2924 /* 3149 /*
2925 * Not handled yet 3150 * Not handled yet
2926 */ 3151 */
2927 s = get_to_st (&eh); 3152 s = get_to_st (eh);
2928 if (s) 3153 if (s)
2929 free (s); 3154 free (s);
3155
2930 return; 3156 return;
2931} 3157}
2932 3158
2933/*----------------------------------------------------------------------*/ 3159/*----------------------------------------------------------------------*/
2934/* 3160/*
2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3161 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2936 */ 3162 */
2937void 3163void
2938rxvt_term::process_osc_seq () 3164rxvt_term::process_osc_seq ()
2939{ 3165{
2940 unsigned char ch, eh, *s; 3166 unicode_t ch, eh;
2941 int arg; 3167 int arg;
2942 3168
2943 ch = cmd_getc (); 3169 ch = cmd_getc ();
2944 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3170 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2945 arg = arg * 10 + (ch - '0'); 3171 arg = arg * 10 + (ch - '0');
2946 3172
2947 if (ch == ';') 3173 if (ch == ';')
2948 { 3174 {
2949 s = get_to_st (&eh); 3175 unsigned char *s = get_to_st (eh);
3176
2950 if (s) 3177 if (s)
2951 { 3178 {
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); 3179 process_xterm_seq (arg, (char *)s, eh);
2964 free (s); 3180 free (s);
2965 } 3181 }
2966 } 3182 }
2967} 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
2968/* 3201/*
2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2970 * 0 = change iconName/title 3203 * 0 = change iconName/title
2971 * 1 = change iconName 3204 * 1 = change iconName
2972 * 2 = change title 3205 * 2 = change title
2973 * 4 = change color 3206 * 4 = change color
3207 * 10 = change fg color
3208 * 11 = change bg color
2974 * 12 = change text color 3209 * 12 = change text color
2975 * 13 = change mouse foreground color 3210 * 13 = change mouse foreground color
2976 * 17 = change highlight character colour 3211 * 17 = change highlight character colour
2977 * 18 = change bold character color 3212 * 18 = change bold character color
2978 * 19 = change underlined character color 3213 * 19 = change underlined character color
2979 * 46 = change logfile (not implemented) 3214 * 46 = change logfile (not implemented)
2980 * 50 = change font 3215 * 50 = change font
2981 * 3216 *
2982 * rxvt extensions: 3217 * rxvt extensions:
2983 * 9 = change locale (NYI)
2984 * 10 = menu (may change in future)
2985 * 20 = bg pixmap 3218 * 20 = bg pixmap
2986 * 39 = change default fg color 3219 * 39 = change default fg color
2987 * 49 = change default bg color 3220 * 49 = change default bg color
2988 * 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
2989 */ 3225 */
2990void 3226void
2991rxvt_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)
2992{ 3228{
2993 int changed = 0; 3229 int changed = 0;
2994 int color; 3230 int color;
2995 char *buf, *name; 3231 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1];
2996 3233
2997 assert (str != NULL); 3234 assert (str != NULL);
2998 switch (op) 3235 switch (op)
2999 { 3236 {
3000 case XTerm_name: 3237 case XTerm_name:
3001 set_title (str); 3238 set_title (str);
3002 /* FALLTHROUGH */ 3239 /* FALLTHROUGH */
3003 case XTerm_iconName: 3240 case XTerm_iconName:
3004 set_iconName (str); 3241 set_icon_name (str);
3005 break; 3242 break;
3006 case XTerm_title: 3243 case XTerm_title:
3007 set_title (str); 3244 set_title (str);
3008 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
3009 case XTerm_Color: 3288 case XTerm_Color:
3010 for (buf = (char *)str; buf && *buf;) 3289 for (buf = (char *)str; buf && *buf;)
3011 { 3290 {
3012 if ((name = STRCHR (buf, ';')) == NULL) 3291 if ((name = STRCHR (buf, ';')) == NULL)
3013 break; 3292 break;
3293
3014 *name++ = '\0'; 3294 *name++ = '\0';
3015 color = atoi (buf); 3295 color = atoi (buf);
3296
3016 if (color < 0 || color >= TOTAL_COLORS) 3297 if (color < 0 || color >= TOTAL_COLORS)
3017 break; 3298 break;
3299
3018 if ((buf = STRCHR (name, ';')) != NULL) 3300 if ((buf = STRCHR (name, ';')) != NULL)
3019 *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
3020 set_window_color (color + minCOLOR, name); 3313 set_window_color (color + minCOLOR, name);
3021 } 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);
3022 break; 3321 break;
3023#ifndef NO_CURSORCOLOR 3322#ifndef NO_CURSORCOLOR
3024 case XTerm_Color_cursor: 3323 case XTerm_Color_cursor:
3025 set_window_color (Color_cursor, str); 3324 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3026 break; 3325 break;
3027#endif 3326#endif
3028 case XTerm_Color_pointer: 3327 case XTerm_Color_pointer_fg:
3029 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);
3030 break; 3332 break;
3031#ifndef NO_BOLD_UNDERLINE_REVERSE 3333#ifndef NO_BOLD_UNDERLINE_REVERSE
3032 case XTerm_Color_BD: 3334 case XTerm_Color_BD:
3033 set_window_color (Color_BD, str); 3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3034 break; 3336 break;
3035 case XTerm_Color_UL: 3337 case XTerm_Color_UL:
3036 set_window_color (Color_UL, str); 3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3037 break; 3339 break;
3038 case XTerm_Color_RV: 3340 case XTerm_Color_RV:
3039 set_window_color (Color_RV, str); 3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3040 break; 3342 break;
3041#endif 3343#endif
3042 3344
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: 3345 case XTerm_Pixmap:
3050 if (*str != ';') 3346 if (*str != ';')
3051 { 3347 {
3052#if XPM_BACKGROUND 3348#if XPM_BACKGROUND
3053 scale_pixmap (""); /* reset to default scaling */ 3349 scale_pixmap (""); /* reset to default scaling */
… …
3076 set_window_color (Color_fg, str); 3372 set_window_color (Color_fg, str);
3077 break; 3373 break;
3078 case XTerm_restoreBG: 3374 case XTerm_restoreBG:
3079 set_window_color (Color_bg, str); 3375 set_window_color (Color_bg, str);
3080 break; 3376 break;
3377
3081 case XTerm_logfile: 3378 case XTerm_logfile:
3379 // TODO, when secure mode?
3082 break; 3380 break;
3381
3083 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
3084 change_font (str); 3393 change_font (str);
3085 break; 3394 break;
3395
3396#ifndef NO_FRILLS
3086 case XTerm_locale: 3397 case XTerm_locale:
3087 if (str[0] == '?' && !str[1]) 3398 if (query)
3088 tt_printf ("%-.250s\n", locale); 3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3402 }
3089 else 3403 else
3090 { 3404 {
3091 set_locale (str); 3405 set_locale (str);
3406# ifdef USE_XIM
3092 im_cb (); 3407 im_cb ();
3408# endif
3093 } 3409 }
3094 break; 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
3426 break;
3427#endif
3095#if 0 3428#if 0
3096 case XTerm_dumpscreen: /* no error notices */ 3429 case XTerm_dumpscreen: /* no error notices */
3097 { 3430 {
3098 int fd; 3431 int fd;
3099 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)
3100 { 3433 {
3101 scr_dump (fd); 3434 scr_dump (fd);
3102 close (fd); 3435 close (fd);
3103 } 3436 }
3104 } 3437 }
3105 break; 3438 break;
3106#endif 3439#endif
3107
3108 } 3440 }
3109} 3441}
3110/*----------------------------------------------------------------------*/ 3442/*----------------------------------------------------------------------*/
3111 3443
3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3444/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3120 * so no need for fancy checking 3452 * so no need for fancy checking
3121 */ 3453 */
3122int 3454int
3123rxvt_term::privcases (int mode, unsigned long bit) 3455rxvt_term::privcases (int mode, unsigned long bit)
3124{ 3456{
3125 int state; 3457 int state;
3126 3458
3127 if (mode == 's') 3459 if (mode == 's')
3128 { 3460 {
3129 SavedModes |= (PrivateModes & bit); 3461 SavedModes |= (PrivateModes & bit);
3130 return -1; 3462 return -1;
… …
3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3136 else 3468 else
3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3138 PrivMode (state, bit); 3470 PrivMode (state, bit);
3139 } 3471 }
3472
3140 return state; 3473 return state;
3141} 3474}
3142 3475
3143/* we're not using priv _yet_ */ 3476/* we're not using priv _yet_ */
3144void 3477void
3145rxvt_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)
3146{ 3479{
3147 unsigned int i, j; 3480 unsigned int i, j;
3148 int state; 3481 int state;
3482
3149 static const struct 3483 static const struct
3150 { 3484 {
3151 const int argval; 3485 const int argval;
3152 const unsigned long bit; 3486 const unsigned long bit;
3153 } 3487 }
3488
3154 argtopriv[] = { 3489 argtopriv[] = {
3155 { 1, PrivMode_aplCUR }, 3490 { 1, PrivMode_aplCUR },
3156 { 2, PrivMode_vt52 }, 3491 { 2, PrivMode_vt52 },
3157 { 3, PrivMode_132 }, 3492 { 3, PrivMode_132 },
3158 { 4, PrivMode_smoothScroll }, 3493 { 4, PrivMode_smoothScroll },
… …
3164 { menuBar_esc, PrivMode_menuBar }, 3499 { menuBar_esc, PrivMode_menuBar },
3165#endif 3500#endif
3166#ifdef scrollBar_esc 3501#ifdef scrollBar_esc
3167 { scrollBar_esc, PrivMode_scrollBar }, 3502 { scrollBar_esc, PrivMode_scrollBar },
3168#endif 3503#endif
3504 // 18, 19 printing-related
3169 { 25, PrivMode_VisibleCursor }, 3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3170 { 35, PrivMode_ShiftKeys }, 3507 { 35, PrivMode_ShiftKeys }, // rxvt extension
3171 { 40, PrivMode_132OK }, 3508 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI
3511 // 46 start logging
3172 { 47, PrivMode_Screen }, 3512 { 47, PrivMode_Screen },
3173 { 66, PrivMode_aplKP }, 3513 { 66, PrivMode_aplKP },
3174#ifndef NO_BACKSPACE_KEY 3514#ifndef NO_BACKSPACE_KEY
3175 { 67, PrivMode_BackSpace }, 3515 { 67, PrivMode_BackSpace },
3176#endif 3516#endif
3177 { 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
3178 { 1010, PrivMode_TtyOutputInh }, 3521 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3179 { 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
3180 { 1047, PrivMode_Screen }, 3526 { 1047, PrivMode_Screen },
3527 // 1048 save and restore cursor
3181 { 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
3182 }; 3530 };
3183 3531
3184 if (nargs == 0) 3532 if (nargs == 0)
3185 return; 3533 return;
3186 3534
… …
3201 state = privcases (mode, argtopriv[j].bit); 3549 state = privcases (mode, argtopriv[j].bit);
3202 break; 3550 break;
3203 } 3551 }
3204 3552
3205 /* extra handling for values with state unkept */ 3553 /* extra handling for values with state unkept */
3206 if (state == -1)
3207 switch (arg[i]) 3554 switch (arg[i])
3208 { 3555 {
3209 case 1048: /* alternative cursor save */ 3556 case 1048: /* alternative cursor save */
3557 if (Options & Opt_secondaryScreen)
3210 if (mode == 0) 3558 if (mode == 0)
3211 scr_cursor (RESTORE); 3559 scr_cursor (RESTORE);
3212 else if (mode == 1) 3560 else if (mode == 1)
3213 scr_cursor (SAVE); 3561 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; 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;
3230 case 3: /* 80/132 */ 3577 case 3: /* 80/132 */
3231 if (PrivateModes & PrivMode_132OK) 3578 if (PrivateModes & PrivMode_132OK)
3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3233 (unsigned int)TermWin.height);
3234 break; 3580 break;
3235 case 4: /* smooth scrolling */ 3581 case 4: /* smooth scrolling */
3236 if (state) 3582 if (state)
3237 Options &= ~Opt_jumpScroll; 3583 Options &= ~Opt_jumpScroll;
3238 else 3584 else
3239 Options |= Opt_jumpScroll; 3585 Options |= Opt_jumpScroll;
3240 break; 3586 break;
3241 case 5: /* reverse video */ 3587 case 5: /* reverse video */
3242 scr_rvideo_mode (state); 3588 scr_rvideo_mode (state);
3243 break; 3589 break;
3244 case 6: /* relative/absolute origins */ 3590 case 6: /* relative/absolute origins */
3245 scr_relative_origin (state); 3591 scr_relative_origin (state);
3246 break; 3592 break;
3247 case 7: /* autowrap */ 3593 case 7: /* autowrap */
3248 scr_autowrap (state); 3594 scr_autowrap (state);
3249 break; 3595 break;
3250 /* 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 */
3251 case 9: /* X10 mouse reporting */ 3597 case 9: /* X10 mouse reporting */
3252 if (state) /* orthogonal */ 3598 if (state) /* orthogonal */
3253 PrivateModes &= ~ (PrivMode_MouseX11); 3599 PrivateModes &= ~PrivMode_MouseX11;
3254 break; 3600 break;
3255#ifdef menuBar_esc 3601#ifdef menuBar_esc
3256 case menuBar_esc: 3602 case menuBar_esc:
3257#ifdef MENUBAR 3603#ifdef MENUBAR
3258 map_menuBar (state); 3604 map_menuBar (state);
3259#endif 3605#endif
3260 break; 3606 break;
3261#endif 3607#endif
3262#ifdef scrollBar_esc 3608#ifdef scrollBar_esc
3263 case scrollBar_esc: 3609 case scrollBar_esc:
3264 if (scrollbar_mapping (state)) 3610 if (scrollbar_mapping (state))
3265 { 3611 {
3266 resize_all_windows (0, 0, 0); 3612 resize_all_windows (0, 0, 0);
3267 scr_touch (true); 3613 scr_touch (true);
3268 } 3614 }
3269 break; 3615 break;
3270#endif 3616#endif
3271 case 25: /* visible/invisible cursor */ 3617 case 25: /* visible/invisible cursor */
3272 scr_cursor_visible (state); 3618 scr_cursor_visible (state);
3273 break; 3619 break;
3274 /* case 35: - shift keys */ 3620 /* case 35: - shift keys */
3275 /* case 40: - 80 <--> 132 mode */ 3621 /* case 40: - 80 <--> 132 mode */
3276 case 47: /* secondary screen */ 3622 case 47: /* secondary screen */
3277 scr_change_screen (state); 3623 scr_change_screen (state);
3278 break; 3624 break;
3279 /* case 66: - application key pad */ 3625 /* case 66: - application key pad */
3280 /* case 67: - backspace key */ 3626 /* case 67: - backspace key */
3281 case 1000: /* X11 mouse reporting */ 3627 case 1000: /* X11 mouse reporting */
3282 if (state) /* orthogonal */ 3628 if (state) /* orthogonal */
3283 PrivateModes &= ~ (PrivMode_MouseX10); 3629 PrivateModes &= ~PrivMode_MouseX10;
3284 break; 3630 break;
3285#if 0 3631#if 0
3286 case 1001: 3632 case 1001:
3287 break; /* X11 mouse highlighting */ 3633 break; /* X11 mouse highlighting */
3288#endif 3634#endif
3289 case 1010: /* scroll to bottom on TTY output inhibit */ 3635 case 1010: /* scroll to bottom on TTY output inhibit */
3290 if (state) 3636 if (state)
3291 Options &= ~Opt_scrollTtyOutput; 3637 Options &= ~Opt_scrollTtyOutput;
3292 else 3638 else
3293 Options |= Opt_scrollTtyOutput; 3639 Options |= Opt_scrollTtyOutput;
3294 break; 3640 break;
3295 case 1011: /* scroll to bottom on key press */ 3641 case 1011: /* scroll to bottom on key press */
3296 if (state) 3642 if (state)
3297 Options |= Opt_scrollTtyKeypress; 3643 Options |= Opt_scrollTtyKeypress;
3298 else 3644 else
3299 Options &= ~Opt_scrollTtyKeypress; 3645 Options &= ~Opt_scrollTtyKeypress;
3300 break; 3646 break;
3301 case 1047: /* secondary screen w/ clearing */ 3647 case 1047: /* secondary screen w/ clearing last */
3302 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3648 if (Options & Opt_secondaryScreen)
3303 if (current_screen != PRIMARY) 3649 if (current_screen != PRIMARY)
3304 scr_erase_screen (2); 3650 scr_erase_screen (2);
3305 scr_change_screen (state); 3651 scr_change_screen (state);
3306 /* FALLTHROUGH */
3307 default:
3308 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;
3309 } 3661 }
3310 } 3662 }
3311} 3663}
3312/*}}} */ 3664/*}}} */
3313 3665
3314/*{{{ process sgr sequences */ 3666/*{{{ process sgr sequences */
3315void 3667void
3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3668rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3317{ 3669{
3318 unsigned int i; 3670 unsigned int i;
3319 short rendset; 3671 short rendset;
3320 int rendstyle; 3672 int rendstyle;
3321 3673
3322 if (nargs == 0) 3674 if (nargs == 0)
3323 { 3675 {
3324 scr_rendition (0, ~RS_None); 3676 scr_rendition (0, ~RS_None);
3325 return; 3677 return;
3326 } 3678 }
3679
3327 for (i = 0; i < nargs; i++) 3680 for (i = 0; i < nargs; i++)
3328 { 3681 {
3329 rendset = -1; 3682 rendset = -1;
3330 switch (arg[i]) 3683 switch (arg[i])
3331 { 3684 {
… …
3339 rendset = 1, rendstyle = RS_Uline; 3692 rendset = 1, rendstyle = RS_Uline;
3340 break; 3693 break;
3341 case 5: 3694 case 5:
3342 rendset = 1, rendstyle = RS_Blink; 3695 rendset = 1, rendstyle = RS_Blink;
3343 break; 3696 break;
3697 //case 6: // scoansi light background
3344 case 7: 3698 case 7:
3345 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;
3346 break; 3709 break;
3347 case 22: 3710 case 22:
3348 rendset = 0, rendstyle = RS_Bold; 3711 rendset = 0, rendstyle = RS_Bold;
3349 break; 3712 break;
3350 case 24: 3713 case 24:
… …
3354 rendset = 0, rendstyle = RS_Blink; 3717 rendset = 0, rendstyle = RS_Blink;
3355 break; 3718 break;
3356 case 27: 3719 case 27:
3357 rendset = 0, rendstyle = RS_RVid; 3720 rendset = 0, rendstyle = RS_RVid;
3358 break; 3721 break;
3722 case 28:
3723 // visible. NYI
3724 break;
3359 } 3725 }
3726
3360 if (rendset != -1) 3727 if (rendset != -1)
3361 { 3728 {
3362 scr_rendition (rendset, rendstyle); 3729 scr_rendition (rendset, rendstyle);
3363 continue; /* for (;i;) */ 3730 continue; /* for (;i;) */
3364 } 3731 }
… …
3371 case 33: 3738 case 33:
3372 case 34: 3739 case 34:
3373 case 35: 3740 case 35:
3374 case 36: 3741 case 36:
3375 case 37: 3742 case 37:
3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3377 Color_fg);
3378 break; 3744 break;
3379#ifdef TTY_256COLOR 3745#ifdef TTY_256COLOR
3380 case 38: 3746 case 38:
3381 if (nargs > i + 2 && arg[i + 1] == 5) 3747 if (nargs > i + 2 && arg[i + 1] == 5)
3382 { 3748 {
3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3384 Color_fg);
3385 i += 2; 3750 i += 2;
3386 } 3751 }
3387 break; 3752 break;
3388#endif 3753#endif
3389 case 39: /* default fg */ 3754 case 39: /* default fg */
… …
3396 case 43: 3761 case 43:
3397 case 44: 3762 case 44:
3398 case 45: 3763 case 45:
3399 case 46: 3764 case 46:
3400 case 47: 3765 case 47:
3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3402 Color_bg);
3403 break; 3767 break;
3404#ifdef TTY_256COLOR 3768#ifdef TTY_256COLOR
3405 case 48: 3769 case 48:
3406 if (nargs > i + 2 && arg[i + 1] == 5) 3770 if (nargs > i + 2 && arg[i + 1] == 5)
3407 { 3771 {
3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3409 Color_bg);
3410 i += 2; 3773 i += 2;
3411 } 3774 }
3412 break; 3775 break;
3413#endif 3776#endif
3414 case 49: /* default bg */ 3777 case 49: /* default bg */
… …
3443 } 3806 }
3444 } 3807 }
3445} 3808}
3446/*}}} */ 3809/*}}} */
3447 3810
3448/*{{{ process Rob Nation's own graphics mode sequences */ 3811/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3449void 3812void
3450rxvt_term::process_graphics () 3813rxvt_term::process_graphics ()
3451{ 3814{
3452 unsigned char ch, cmd = cmd_getc (); 3815 unicode_t ch, cmd = cmd_getc ();
3453 3816
3454 if (cmd == 'Q') 3817 if (cmd == 'Q')
3455 { /* query graphics */ 3818 { /* query graphics */
3456 tt_printf ("\033G0\n"); /* no graphics */ 3819 tt_printf ("\033G0\n"); /* no graphics */
3457 return; 3820 return;

Diff Legend

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