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.49 by pcg, Sat Feb 21 22:14:00 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 (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, 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 {
… …
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 224 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 225 selection_request (ev.time, 0, 0);
231 return; 226 return;
232 /* rxvt extras */ 227 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 228 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 229 change_font (FONT_UP);
235 return; 230 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 232 change_font (FONT_DN);
238 return; 233 return;
239 } 234 }
240 } 235 }
241 } 236 }
242#ifdef PRINTPIPE 237#ifdef PRINTPIPE
243 if (keysym == XK_Print) 238 if (keysym == XK_Print)
244 { 239 {
245 scr_printscreen (ctrl | shft); 240 scr_printscreen (ctrl | shft);
246 return;
247 }
248#endif
249#ifdef GREEK_SUPPORT
250 if (keysym == ks_greekmodeswith)
251 {
252 greek_mode = !greek_mode;
253 if (greek_mode)
254 {
255 xterm_seq (XTerm_title,
256 (greek_getmode () == GREEK_ELOT928
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
258 greek_reset ();
259 }
260 else
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return; 241 return;
263 } 242 }
264#endif 243#endif
265 244
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 245 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
… …
268#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 249 {
271 unsigned int l; 250 unsigned int l;
272 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
273 const unsigned char ch = C0_ESC;
274 252
275 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
277 255
278 /* escape prefix */ 256 /* escape prefix */
279 if (meta) 257 if (meta
280# ifdef META8_OPTION 258# ifdef META8_OPTION
281 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
282# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
283 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
284 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
285 return; 268 return;
286 } 269 }
287 else 270 else
288#endif 271#endif
… …
298 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
300 } 283 }
301 else 284 else
302 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
303# ifdef MULTICHAR_SET
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
305 {
306 int col, row;
307
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 }
314# endif
315 break; 286 break;
316#endif 287#endif
317#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
318 case XK_Delete: 289 case XK_Delete:
319 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 291 break;
333#endif 292#endif
334 case XK_Tab: 293 case XK_Tab:
335 if (shft) 294 if (shft)
336 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
378 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 339 }
381 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 342 break;
419 343
420#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
422 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
611 break; 535 break;
612 } 536 }
613 if (newlen) 537 if (newlen)
614 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
615 } 539 }
540
616 /* 541 /*
617 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
618 */ 543 */
619#ifdef META8_OPTION 544#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
635 { 560 {
636 unsigned char *ch; 561 unsigned char *ch;
637 562
638 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 564 *ch |= 0x80;
565
640 meta = 0; 566 meta = 0;
641 } 567 }
642#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif 568#endif
647 /* nil */ ; 569 /* nil */ ;
648 } 570 }
649 } 571 }
650 572
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 596
675 /* escape prefix */ 597 /* escape prefix */
676 if (meta 598 if (meta
677#ifdef META8_OPTION 599#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
679#endif 601#endif
680 ) 602 )
681 { 603 {
682 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
683
684 tt_write (&ch, 1); 605 tt_write (&ch, 1);
685 } 606 }
607
686#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
687 if (debug_key)
688 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
689 char *p; 610 unsigned char *p;
690 int i; 611 int i;
691 612
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n"); 616 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
699} 619}
700/*}}} */ 620/*}}} */
701 621
… …
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
704/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
705unsigned int 625unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
707{ 627{
708 unsigned int n, s; 628 unsigned int n, s;
709 629
710 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
712 if (n > 0 && s < count) 633 if (n > 0 && s < count)
713 { 634 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
718 s += n; 639 s += n;
719 } 640 }
641
720 if (count > s) 642 if (count > s)
721 { 643 {
722 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 645 count = s;
724 } 646 }
647
725 for (; count--;) 648 for (; count--;)
726 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
727 return 0; 653 return 0;
728} 654}
729#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
730 656
731void 657void
… …
746 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
747 scrollbar_show (1); 673 scrollbar_show (1);
748#ifdef USE_XIM 674#ifdef USE_XIM
749 IMSendSpot (); 675 IMSendSpot ();
750#endif 676#endif
751
752 } 677 }
753 678
754 display->flush (); 679 display->flush ();
755} 680}
756 681
… …
790bool 715bool
791rxvt_term::pty_fill () 716rxvt_term::pty_fill ()
792{ 717{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 718 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
794 719
720 if (CBUFSIZ == n)
721 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
723 n = 0;
724 }
725
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 726 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 727 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 728 cmdbuf_endp = cmdbuf_ptr + n;
798 729
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
800 731
801 if (n > 0) 732 if (n > 0)
802 { 733 {
803 cmdbuf_endp += n; 734 cmdbuf_endp += n;
804 return true; 735 return true;
805 } 736 }
806 else if (n < 0 && errno != EAGAIN) 737 else if (n < 0 && errno != EAGAIN)
807 destroy (); 738 destroy ();
808 739
809 return false; 740 return false;
810} 741}
811 742
812void 743void
813rxvt_term::pty_cb (io_watcher &w, short revents) 744rxvt_term::pty_cb (io_watcher &w, short revents)
… …
816 SET_LOCALE (locale); 747 SET_LOCALE (locale);
817 748
818 if (revents & EVENT_WRITE) 749 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 750 tt_write (0, 0);
820 else if (revents & EVENT_READ) 751 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us 752 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ()) 753 while (pty_fill ())
827 { 754 if (cmd_parse ())
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break; 755 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
935}
936
937// read the next character, currently handles UTF-8
938// will probably handle all sorts of other stuff in the future
939uint32_t
940rxvt_term::next_char ()
941{
942 while (cmdbuf_ptr < cmdbuf_endp)
943 {
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946
947 wchar_t wc;
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
949
950 if (len == (size_t)-2)
951 return NOCHAR;
952
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 }
984} 756}
985 757
986#ifdef POINTER_BLANK 758#ifdef POINTER_BLANK
987void 759void
988rxvt_term::pointer_unblank () 760rxvt_term::pointer_unblank ()
… …
1017 pointer_blank (); 789 pointer_blank ();
1018} 790}
1019#endif 791#endif
1020 792
1021void 793void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 794rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 795{
1024 int button_number, key_state = 0; 796 int button_number, key_state = 0;
1025 int x, y; 797 int x, y;
1026 798
1027 x = ev.x; 799 x = ev.x;
1028 y = ev.y; 800 y = ev.y;
1029 pixel_position (&x, &y); 801 pixel_position (&x, &y);
1030 802
… …
1233 && (ev.xclient.data.l[0] == DndFile 1005 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1006 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1007 || ev.xclient.data.l[0] == DndLink))
1236 { 1008 {
1237 /* Get Dnd data */ 1009 /* Get Dnd data */
1238 Atom ActualType; 1010 Atom ActualType;
1239 int ActualFormat; 1011 int ActualFormat;
1240 unsigned char *data; 1012 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1013 unsigned long Size, RemainingBytes;
1242 1014
1243 XGetWindowProperty (display->display, display->root, 1015 XGetWindowProperty (display->display, display->root,
1244 xa[XA_DNDSELECTION], 1016 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1017 0L, 1000000L,
1246 False, AnyPropertyType, 1018 False, AnyPropertyType,
… …
1249 &data); 1021 &data);
1250 XChangeProperty (display->display, display->root, 1022 XChangeProperty (display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1023 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1024 8, PropModeReplace,
1253 data, STRLEN (data)); 1025 data, STRLEN (data));
1026 XFree (data);
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1027 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1256 } 1029 }
1257#endif /* OFFIX_DND */ 1030#endif /* OFFIX_DND */
1258 break; 1031 break;
… …
1351 check_our_parents (); 1124 check_our_parents ();
1352 if (am_transparent) 1125 if (am_transparent)
1353 want_full_refresh = 1; 1126 want_full_refresh = 1;
1354 } 1127 }
1355#endif 1128#endif
1356
1357 } 1129 }
1358 break; 1130 break;
1359 1131
1360 case SelectionClear: 1132 case SelectionClear:
1361 display->set_selection_owner (0); 1133 selection_clear ();
1362 break; 1134 break;
1363 1135
1364 case SelectionNotify: 1136 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1137 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1138 selection_paste (ev.xselection.requestor,
… …
1397 { 1169 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1170#ifdef NO_SLOW_LINK_SUPPORT
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1171 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1172 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1173#else
1402 // don't understand this, so commented it out 1174 // I don't understand this, so I changed it :)
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1175 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1176 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1177 //scr_expose (ev.xexpose.x, 0,
1406 // ev.xexpose.width, TermWin.height, False); 1178 // ev.xexpose.width, TermWin.height, False);
1407#endif 1179#endif
… …
1409 } 1181 }
1410 else 1182 else
1411 { 1183 {
1412 XEvent unused_event; 1184 XEvent unused_event;
1413 1185
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1415 Expose, 1187 ;
1416 &unused_event)) ;
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1418 GraphicsExpose, 1189 ;
1419 &unused_event)) ; 1190
1420 if (isScrollbarWindow (ev.xany.window)) 1191 if (isScrollbarWindow (ev.xany.window))
1421 { 1192 {
1422 scrollBar.setIdle (); 1193 scrollBar.setIdle ();
1423 scrollbar_show (0); 1194 scrollbar_show (0);
1424 } 1195 }
1425#ifdef MENUBAR 1196#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1198 menubar_expose ();
1428#endif 1199#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432
1433 } 1200 }
1434 break; 1201 break;
1435 1202
1436 case MotionNotify: 1203 case MotionNotify:
1437#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1206 pointer_unblank ();
1440#endif 1207#endif
1441#if MENUBAR 1208#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1209 if (isMenuBarWindow (ev.xany.window))
1443 { 1210 {
1444 menubar_control (& (ev.xbutton)); 1211 menubar_control (ev.xbutton);
1445 break; 1212 break;
1446 } 1213 }
1447#endif 1214#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1216 break;
… …
1569 return; 1336 return;
1570 } 1337 }
1571 1338
1572 /* FALLTHROUGH */ 1339 /* FALLTHROUGH */
1573 case ReparentNotify: 1340 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1342 want_full_refresh = 1;
1577 break; 1343 break;
1578#endif 1344#endif
1579 } 1345 }
1580} 1346}
1581 1347
1582void 1348void
1583rxvt_term::button_press (const XButtonEvent &ev) 1349rxvt_term::button_press (XButtonEvent &ev)
1584{ 1350{
1585 int reportmode = 0, clickintime; 1351 int reportmode = 0, clickintime;
1586 1352
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1354 if (!bypass_keystate)
… …
1590 /* 1356 /*
1591 * VT window processing of button press 1357 * VT window processing of button press
1592 */ 1358 */
1593 if (ev.window == TermWin.vt) 1359 if (ev.window == TermWin.vt)
1594 { 1360 {
1595#if RXVT_GRAPHICS
1596 if (ev.subwindow != None)
1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1598 else
1599#endif
1600
1601 {
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode) 1362 if (reportmode)
1363 {
1364 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state;
1367#ifdef MOUSE_REPORT_DOUBLECLICK
1368 if (ev.button == MEvent.button && clickintime)
1604 { 1369 {
1605 /* mouse report from vt window */ 1370 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1371 MEvent.clicks++;
1607 MEvent.state = ev.state; 1372 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1373 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1374 /* only report double clicks */
1616 MEvent.clicks = 2; 1375 MEvent.clicks = 2;
1617 mouse_report (ev); 1376 mouse_report (ev);
1618 1377
1619 /* don't report the release */ 1378 /* don't report the release */
1620 MEvent.clicks = 0; 1379 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1380 MEvent.button = AnyButton;
1622 }
1623 } 1381 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1382 }
1637 else 1383 else
1638 { 1384 {
1385 /* different button, or time expired */
1386 MEvent.clicks = 1;
1387 MEvent.button = ev.button;
1388 mouse_report (ev);
1389 }
1390#else
1391 MEvent.button = ev.button;
1392 mouse_report (ev);
1393#endif /* MOUSE_REPORT_DOUBLECLICK */
1394
1395 }
1396 else
1397 {
1639 if (ev.button != MEvent.button) 1398 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1399 MEvent.clicks = 0;
1641 switch (ev.button) 1400 switch (ev.button)
1642 { 1401 {
1643 case Button1: 1402 case Button1:
1644 /* allow shift+left click to extend selection */ 1403 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1646 { 1405 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1406 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1407 selection_rotate (ev.x, ev.y);
1668 else 1408 else
1669 selection_extend (ev.x, ev.y, 1); 1409 selection_extend (ev.x, ev.y, 1);
1410 }
1411 else
1412 {
1413 if (MEvent.button == Button1 && clickintime)
1414 MEvent.clicks++;
1415 else
1416 MEvent.clicks = 1;
1417
1418 selection_click (MEvent.clicks, ev.x, ev.y);
1419 }
1420
1421 MEvent.button = Button1;
1422 break;
1423
1424 case Button3:
1425 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y);
1427 else
1428 selection_extend (ev.x, ev.y, 1);
1670 MEvent.button = Button3; 1429 MEvent.button = Button3;
1671 break; 1430 break;
1672 }
1673 } 1431 }
1432 }
1674 MEvent.time = ev.time; 1433 MEvent.time = ev.time;
1675 return; 1434 return;
1676 }
1677 } 1435 }
1678 1436
1679 /* 1437 /*
1680 * Scrollbar window processing of button press 1438 * Scrollbar window processing of button press
1681 */ 1439 */
… …
1824 menubar_control (ev); 1582 menubar_control (ev);
1825#endif 1583#endif
1826} 1584}
1827 1585
1828void 1586void
1829rxvt_term::button_release (const XButtonEvent &ev) 1587rxvt_term::button_release (XButtonEvent &ev)
1830{ 1588{
1831 int reportmode = 0; 1589 int reportmode = 0;
1832 1590
1833 csrO = 0; /* reset csr Offset */ 1591 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 1592 if (!bypass_keystate)
… …
1846#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 1605 pending_scroll_selection=0;
1848#endif 1606#endif
1849 if (ev.window == TermWin.vt) 1607 if (ev.window == TermWin.vt)
1850 { 1608 {
1851#ifdef RXVT_GRAPHICS
1852 if (ev.subwindow != None)
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1854 else
1855#endif
1856
1857 {
1858 if (reportmode) 1609 if (reportmode)
1610 {
1611 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4)
1614 return;
1615#ifdef MOUSE_REPORT_DOUBLECLICK
1616 /* only report the release of 'slow' single clicks */
1617 if (MEvent.button != AnyButton
1618 && (ev.button != MEvent.button
1619 || (ev.time - MEvent.time
1620 > MULTICLICK_TIME / 2)))
1859 { 1621 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 1622 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 1623 MEvent.button = AnyButton;
1877 mouse_report (ev); 1624 mouse_report (ev);
1625 }
1626#else /* MOUSE_REPORT_DOUBLECLICK */
1627 MEvent.button = AnyButton;
1628 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 1629#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 1630 return;
1880 } 1631 }
1881 /* 1632 /*
1882 * dumb hack to compensate for the failure of click-and-drag 1633 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 1634 * when overriding mouse reporting
1884 */ 1635 */
1885 if (PrivateModes & PrivMode_mouse_report 1636 if (PrivateModes & PrivMode_mouse_report
1886 && bypass_keystate 1637 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 1638 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 1639 selection_extend (ev.x, ev.y, 0);
1889 1640
1890 switch (ev.button) 1641 switch (ev.button)
1642 {
1643 case Button1:
1644 case Button3:
1645 selection_make (ev.time);
1646 break;
1647 case Button2:
1648 selection_request (ev.time, ev.x, ev.y);
1649 break;
1650#ifdef MOUSE_WHEEL
1651 case Button4:
1652 case Button5:
1891 { 1653 {
1892 case Button1: 1654 int i;
1893 case Button3: 1655 page_dirn v;
1894 selection_make (ev.time); 1656
1657 v = (ev.button == Button4) ? UP : DN;
1658 if (ev.state & ShiftMask)
1895 break; 1659 i = 1;
1896 case Button2: 1660 else if ((Options & Opt_mouseWheelScrollPage))
1897 selection_request (ev.time, ev.x, ev.y); 1661 i = TermWin.nrow - 1;
1662 else
1898 break; 1663 i = 5;
1899#ifdef MOUSE_WHEEL 1664# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 1665 if (ev.state & ControlMask)
1901 case Button5:
1902 { 1666 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 mouse_slip_wheel_speed += (v ? -1 : 1); 1667 mouse_slip_wheel_speed += (v ? -1 : 1);
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1918 } 1669 }
1919# endif 1670# endif
1920# ifdef JUMP_MOUSE_WHEEL 1671# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1921 scr_page (v, i); 1678 scr_page (v, 1);
1922 scr_refresh (SMOOTH_REFRESH); 1679 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 1680 scrollbar_show (1);
1924# else
1925 while (i--)
1926 {
1927 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1);
1930 } 1681 }
1931# endif 1682# endif
1932 1683
1933 }
1934 break;
1935#endif
1936
1937 } 1684 }
1685 break;
1686#endif
1687
1938 } 1688 }
1939 } 1689 }
1940#ifdef MENUBAR 1690#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 1691 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 1692 menubar_control (ev);
1943#endif 1693#endif
1944} 1694}
1945 1695
1946
1947#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
1948/* 1932/*
1949 * Check our parents are still who we think they are. 1933 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 1934 * Do transparency updates if required
1951 */ 1935 */
1952int 1936int
1953rxvt_term::check_our_parents () 1937rxvt_term::check_our_parents ()
1954{ 1938{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 1939 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 1940 unsigned long nitems, bytes_after;
1957 Atom atype; 1941 Atom atype;
1958 unsigned char *prop = NULL; 1942 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 1943 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 1944 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 1945 XWindowAttributes wattr, wrootattr;
1962 1946
1963 pchanged = 0; 1947 pchanged = 0;
1964 1948
1965 if (! (Options & Opt_transparent)) 1949 if (!(Options & Opt_transparent))
1966 return pchanged; /* Don't try any more */ 1950 return pchanged; /* Don't try any more */
1967 1951
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 1952 XGetWindowAttributes (display->display, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 1953 rootdepth = wrootattr.depth;
1970 1954
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1956
1972 if (rootdepth != wattr.depth) 1957 if (rootdepth != wattr.depth)
1973 { 1958 {
1974 if (am_transparent) 1959 if (am_transparent)
1975 { 1960 {
1976 pchanged = 1; 1961 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 1963 am_transparent = am_pixmap_trans = 0;
1980 } 1964 }
1965
1981 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1982 } 1967 }
1983 1968
1984 /* 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. */
1985 XSync (display->display, False); 1970 XSync (display->display, False);
… …
1987 /* 1972 /*
1988 * Make the frame window set by the window manager have 1973 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 1974 * the root background. Some window managers put multiple nested frame
1990 * 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.
1991 */ 1976 */
1992 i = (xa[XA_XROOTPMAPID] != 0 1977 i = (xa[XA_XROOTPMAPID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &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
1996 if (!i || prop == NULL) 1988 if (!i || prop == NULL)
1997 have_pixmap = 0; 1989 have_pixmap = 0;
1998 else 1990 else
1999 { 1991 {
2000 have_pixmap = 1; 1992 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 1993 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 1994 XFree (prop);
2003 } 1995 }
1996
2004 if (have_pixmap) 1997 if (have_pixmap)
2005 { 1998 {
2006 /* 1999 /*
2007 * Copy display->root pixmap transparency 2000 * Copy display->root pixmap transparency
2008 */ 2001 */
2009 int sx, sy, nx, ny; 2002 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2003 unsigned int nw, nh;
2011 Window cr; 2004 Window cr;
2012 XImage *image; 2005 XImage *image;
2013 GC gc; 2006 GC gc;
2014 XGCValues gcvalue; 2007 XGCValues gcvalue;
2015 2008
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2010 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2011 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2012 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2013 nx = ny = 0;
2014
2021 if (sx < 0) 2015 if (sx < 0)
2022 { 2016 {
2023 nw += sx; 2017 nw += sx;
2024 nx = -sx; 2018 nx = -sx;
2025 sx = 0; 2019 sx = 0;
2026 } 2020 }
2021
2027 if (sy < 0) 2022 if (sy < 0)
2028 { 2023 {
2029 nh += sy; 2024 nh += sy;
2030 ny = -sy; 2025 ny = -sy;
2031 sy = 0; 2026 sy = 0;
2032 } 2027 }
2028
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2035 allowedxerror = -1; 2031 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2033
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2035 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2036 allowedxerror = 0;
2037
2041 if (image == NULL) 2038 if (image == NULL)
2042 { 2039 {
2043 if (am_transparent && am_pixmap_trans) 2040 if (am_transparent && am_pixmap_trans)
2044 { 2041 {
2045 pchanged = 1; 2042 pchanged = 1;
… …
2047 { 2044 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2045 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None; 2046 TermWin.pixmap = None;
2050 } 2047 }
2051 } 2048 }
2049
2052 am_pixmap_trans = 0; 2050 am_pixmap_trans = 0;
2053 } 2051 }
2054 else 2052 else
2055 { 2053 {
2056 if (TermWin.pixmap != None) 2054 if (TermWin.pixmap != None)
2057 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
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2078 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2081 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2082 XFreeGC (display->display, gc);
2067 XDestroyImage (image); 2083 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2069 TermWin.pixmap); 2085 TermWin.pixmap);
2086
2070 if (!am_transparent || !am_pixmap_trans) 2087 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2088 pchanged = 1;
2089
2072 am_transparent = am_pixmap_trans = 1; 2090 am_transparent = am_pixmap_trans = 1;
2073 } 2091 }
2074 } 2092 }
2093
2075 if (!am_pixmap_trans) 2094 if (!am_pixmap_trans)
2076 { 2095 {
2077 unsigned int n; 2096 unsigned int n;
2078 /* 2097 /*
2079 * InheritPixmap transparency 2098 * InheritPixmap transparency
2080 */ 2099 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2102 {
2085 oldp = TermWin.parent[i]; 2103 oldp = TermWin.parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2104 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2105 &TermWin.parent[i], &list, &n);
2088 XFree (list); 2106 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108
2090 if (TermWin.parent[i] == display->root) 2109 if (TermWin.parent[i] == display->root)
2091 { 2110 {
2092 if (oldp != None) 2111 if (oldp != None)
2093 pchanged = 1; 2112 pchanged = 1;
2113
2094 break; 2114 break;
2095 } 2115 }
2116
2096 if (oldp != TermWin.parent[i]) 2117 if (oldp != TermWin.parent[i])
2097 pchanged = 1; 2118 pchanged = 1;
2098 } 2119 }
2120
2099 n = 0; 2121 n = 0;
2122
2100 if (pchanged) 2123 if (pchanged)
2101 { 2124 {
2102 for (; n < (unsigned int)i; n++) 2125 for (; n < (unsigned int)i; n++)
2103 { 2126 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2109 break; 2132 break;
2110 } 2133 }
2111 } 2134 }
2112 } 2135 }
2113 if (n > (int) (sizeof (TermWin.parent) 2136
2114 / sizeof (TermWin.parent[0]))) 2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2115 { 2138 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2139 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt, 2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2120 PixColors[Color_bg]);
2121 am_transparent = 0; 2142 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2143 /* XXX: also turn off Opt_transparent? */
2123 } 2144 }
2124 else 2145 else
2125 { 2146 {
2147#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2148 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2149 * needed for fvwm2.2.2 (and before?) */
2128# ifdef HAVE_NANOSLEEP
2129 struct timespec rqt;
2130
2131 rqt.tv_sec = 1;
2132 rqt.tv_nsec = 0;
2133 nanosleep (&rqt, NULL);
2134# else
2135 sleep (1); 2150 sleep (1);
2136# endif 2151#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2153 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2140 ParentRelative); 2155
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2142 ParentRelative);
2143 am_transparent = 1; 2157 am_transparent = 1;
2144 } 2158 }
2159
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2161 TermWin.parent[i] = None;
2147 } 2162 }
2163
2148 return pchanged; 2164 return pchanged;
2149} 2165}
2150#endif 2166#endif
2151 2167
2152/*}}} */ 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}
2153 2324
2154/*{{{ print pipe */ 2325/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2326/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2327#ifdef PRINTPIPE
2157FILE * 2328FILE *
2158rxvt_term::popen_printer () 2329rxvt_term::popen_printer ()
2159{ 2330{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2331 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2332
2162 if (stream == NULL) 2333 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2334 rxvt_warn ("can't open printer pipe, not printing.\n");
2335
2164 return stream; 2336 return stream;
2165} 2337}
2166 2338
2167int 2339int
2168rxvt_term::pclose_printer (FILE *stream) 2340rxvt_term::pclose_printer (FILE *stream)
2169{ 2341{
2170 fflush (stream); 2342 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2343 return pclose (stream);
2177# endif
2178} 2344}
2179 2345
2180/* 2346/*
2181 * simulate attached vt100 printer 2347 * simulate attached vt100 printer
2182 */ 2348 */
2183void 2349void
2184rxvt_term::process_print_pipe () 2350rxvt_term::process_print_pipe ()
2185{ 2351{
2186 int done; 2352 int done;
2187 FILE *fd; 2353 FILE *fd;
2188 2354
2189 if ((fd = popen_printer ()) == NULL) 2355 if ((fd = popen_printer ()) == NULL)
2190 return; 2356 return;
2191 2357
2192 /* 2358 /*
2193 * 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
2194 * is received. 2360 * is received.
2195 */ 2361 */
2196 for (done = 0; !done;) 2362 for (done = 0; !done;)
2197 { 2363 {
2198 unsigned char buf[8]; 2364 unsigned char buf[8];
2199 unsigned char ch; 2365 unicode_t ch;
2200 unsigned int i, len; 2366 unsigned int i, len;
2201 2367
2202 if ((ch = cmd_getc ()) != C0_ESC) 2368 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2369 {
2204 if (putc (ch, fd) == EOF) 2370 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2371 break; /* done = 1 */
… …
2220 { 2386 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2387 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2388 break; /* done = 1 */
2223 } 2389 }
2224 } 2390 }
2391
2225 for (i = 0; i < len; i++) 2392 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2393 if (putc (buf[i], fd) == EOF)
2227 { 2394 {
2228 done = 1; 2395 done = 1;
2229 break; 2396 break;
2230 } 2397 }
2231 } 2398 }
2232 } 2399 }
2400
2233 pclose_printer (fd); 2401 pclose_printer (fd);
2234} 2402}
2235#endif /* PRINTPIPE */ 2403#endif /* PRINTPIPE */
2236/*}}} */ 2404/*}}} */
2237 2405
2238/* *INDENT-OFF* */ 2406/* *INDENT-OFF* */
2239enum { 2407enum {
2240 C1_40 = 0x40, 2408 C1_40 = 0x40,
2241 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,
2242 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,
2243 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,
2244 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,
2245}; 2413};
2246/* *INDENT-ON* */ 2414/* *INDENT-ON* */
2247 2415
2248/*{{{ process non-printing single characters */ 2416/*{{{ process non-printing single characters */
2249void 2417void
2250rxvt_term::process_nonprinting (unsigned char ch) 2418rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2419{
2252 switch (ch) 2420 switch (ch)
2253 { 2421 {
2422 case C0_ESC:
2423 process_escape_seq ();
2424 break;
2254 case C0_ENQ: /* terminal Status */ 2425 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2426 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2428 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2259 else 2429 else
2260 tt_write ((unsigned char *)VT100_ANS, 2430 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2431 (unsigned int)STRLEN (VT100_ANS));
2262 break; 2432 break;
2263 case C0_BEL: /* bell */ 2433 case C0_BEL: /* bell */
2264 scr_bell (); 2434 scr_bell ();
2265 break; 2435 break;
2266 case C0_BS: /* backspace */ 2436 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2451 scr_charset_choose (1);
2282 break; 2452 break;
2283 case C0_SI: /* shift in - acs */ 2453 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2454 scr_charset_choose (0);
2285 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;
2286 } 2467 }
2287} 2468}
2288/*}}} */ 2469/*}}} */
2289 2470
2290 2471
2291/*{{{ process VT52 escape sequences */ 2472/*{{{ process VT52 escape sequences */
2292void 2473void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2474rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2475{
2295 int row, col; 2476 int row, col;
2296 2477
2297 switch (ch) 2478 switch (ch)
2298 { 2479 {
… …
2350 2531
2351/*{{{ process escape sequences */ 2532/*{{{ process escape sequences */
2352void 2533void
2353rxvt_term::process_escape_seq () 2534rxvt_term::process_escape_seq ()
2354{ 2535{
2355 unsigned char ch = cmd_getc (); 2536 unicode_t ch = cmd_getc ();
2356 2537
2357 if (PrivateModes & PrivMode_vt52) 2538 if (PrivateModes & PrivMode_vt52)
2358 { 2539 {
2359 process_escape_vt52 (ch); 2540 process_escape_vt52 (ch);
2360 return; 2541 return;
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 2558 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 2559 break;
2379 case '+': 2560 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 2561 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 2562 break;
2382#ifdef MULTICHAR_SET
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS 2563#ifndef NO_FRILLS
2388 case '6': 2564 case '6':
2389 scr_backindex (); 2565 scr_backindex ();
2390 break; 2566 break;
2391#endif 2567#endif
… …
2413 break; 2589 break;
2414 2590
2415 /* 8.3.87: NEXT LINE */ 2591 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 2592 case C1_NEL: /* ESC E */
2417 { 2593 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 2594 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 2595 scr_add_lines (nlcr, 1, 2);
2420 } 2596 }
2421 break; 2597 break;
2422 2598
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 2599 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 2610 case C1_RI: /* ESC M */
2435 scr_index (DN); 2611 scr_index (DN);
2436 break; 2612 break;
2437 2613
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 2614 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 2615 /*case C1_SS2: scr_single_shift (2); break; */
2440 2616
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 2617 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 2618 /*case C1_SS3: scr_single_shift (3); break; */
2443 2619
2444 /* 8.3.27: DEVICE CONTROL STRING */ 2620 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 2621 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 2622 process_dcs_seq ();
2447 break; 2623 break;
… …
2462 process_osc_seq (); 2638 process_osc_seq ();
2463 break; 2639 break;
2464 2640
2465 /* 8.3.106: RESET TO INITIAL STATE */ 2641 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 2642 case 'c':
2643 mbstate.reset ();
2467 scr_poweron (); 2644 scr_poweron ();
2468 scrollbar_show (1); 2645 scrollbar_show (1);
2469 break; 2646 break;
2470 2647
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2648 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 2660
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2661/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 2662/* *INDENT-OFF* */
2486enum { 2663enum {
2487 CSI_ICH = 0x40, 2664 CSI_ICH = 0x40,
2488 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,
2489 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 ,
2490 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,
2491 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,
2492 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,
2493 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,
… …
2508 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, */
2509 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, [, \, ], ^, _, */
2510 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, */
2511 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, */
2512 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, */
2513 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, {, |, }, ~, */
2514 }; 2691 };
2515/* *INDENT-ON* */ 2692/* *INDENT-ON* */
2516 2693
2517void 2694void
2518rxvt_term::process_csi_seq () 2695rxvt_term::process_csi_seq ()
2519{ 2696{
2520 unsigned char ch, priv, i; 2697 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 2698 unsigned int nargs, p;
2522 int n, ndef; 2699 int n, ndef;
2523 int arg[ESC_ARGS]; 2700 int arg[ESC_ARGS];
2524 2701
2525 for (nargs = ESC_ARGS; nargs > 0;) 2702 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 2703 arg[--nargs] = 0;
2527 2704
2528 priv = 0; 2705 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 2707 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 2708 { /* '<' '=' '>' '?' */
2532 priv = ch; 2709 priv = ch;
2533 ch = cmd_getc (); 2710 ch = cmd_getc ();
2534 } 2711 }
2712
2535 /* read any numerical arguments */ 2713 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 2714 for (n = -1; ch < CSI_ICH; )
2537 { 2715 {
2538 if (isdigit (ch)) 2716 if (isdigit (ch))
2539 { 2717 {
… …
2546 { 2724 {
2547 if (nargs < ESC_ARGS) 2725 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 2726 arg[nargs++] = n;
2549 n = -1; 2727 n = -1;
2550 } 2728 }
2551 else if (ch == '\b') 2729 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 2730 process_nonprinting (ch);
2563 } 2731
2564 ch = cmd_getc (); 2732 ch = cmd_getc ();
2565 } 2733 }
2566 2734
2567 if (ch > CSI_7F) 2735 if (ch > CSI_7F)
2568 return; 2736 return;
… …
2726 tt_printf ("\033[0n"); 2894 tt_printf ("\033[0n");
2727 break; 2895 break;
2728 case 6: /* CPR requested */ 2896 case 6: /* CPR requested */
2729 scr_report_position (); 2897 scr_report_position ();
2730 break; 2898 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 2899 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure)
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2901 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2734 break; 2902 break;
2735#endif
2736 case 8: /* unofficial extension */ 2903 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 2905 break;
2739 } 2906 }
2740 break; 2907 break;
2741 2908
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2909 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2810#endif 2977#endif
2811 2978
2812 case CSI_78: /* DECREQTPARM */ 2979 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 2980 if (arg[0] == 0 || arg[0] == 1)
2814 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);
2815 /* FALLTHROUGH */ 2982 break;
2816 2983
2817 default: 2984 default:
2818 break; 2985 break;
2819 } 2986 }
2820} 2987}
… …
2823#ifndef NO_FRILLS 2990#ifndef NO_FRILLS
2824/* ARGSUSED */ 2991/* ARGSUSED */
2825void 2992void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2993rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 2994{
2828 int x, y; 2995 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 2996 XWindowAttributes wattr;
2833 Window wdummy; 2997 Window wdummy;
2834 2998
2835 if (nargs == 0) 2999 if (nargs == 0)
2836 return; 3000 return;
3001
2837 switch (args[0]) 3002 switch (args[0])
2838 { 3003 {
2839 /* 3004 /*
2840 * commands 3005 * commands
2841 */ 3006 */
2842 case 1: /* deiconify window */ 3007 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3008 XMapWindow (display->display, TermWin.parent[0]);
2844 break; 3009 break;
2845 case 2: /* iconify window */ 3010 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3011 XIconifyWindow (display->display, TermWin.parent[0],
… …
2863 break; 3028 break;
2864 case 8: /* set size (chars) */ 3029 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3031 (unsigned int) (args[1] * TermWin.fheight));
2867 break; 3032 break;
3033
3034 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3035 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3036 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3037 set_widthheight ((unsigned int)TermWin.width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3038 (unsigned int) (args[1] * TermWin.fheight));
2872 break; 3039 break;
3040
3041
2873 /* 3042 /*
2874 * reports - some output format copied from XTerm 3043 * reports - some output format copied from XTerm
2875 */ 3044 */
2876 case 11: /* report window state */ 3045 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3048 break;
2880 case 13: /* report window position */ 3049 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3052 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3053 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3054 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3055 break;
2887 case 14: /* report window size (pixels) */ 3056 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3059 break;
2891 case 18: /* report window size (chars) */ 3060 case 18: /* report text area size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2893 break; 3062 break;
2894#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;
2895 case 20: /* report icon label */ 3066 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 {
3069 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3070 XGetIconName (display->display, TermWin.parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3072 }
2898 break; 3073 break;
2899 case 21: /* report window title */ 3074 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3078 XFetchName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2902 break; 3081 break;
2903#endif
2904
2905 } 3082 }
2906} 3083}
2907#endif 3084#endif
2908 3085
2909/*----------------------------------------------------------------------*/ 3086/*----------------------------------------------------------------------*/
2910/* 3087/*
2911 * get input up until STRING TERMINATOR (or BEL) 3088 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3089 * ends_how is terminator used. returned input must be free()'d
2913 */ 3090 */
2914unsigned char * 3091unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3092rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3093{
2917 int seen_esc = 0; /* seen escape? */ 3094 int seen_esc = 0; /* seen escape? */
2918 unsigned int n = 0; 3095 unsigned int n = 0;
2919 unsigned char *s; 3096 unsigned char *s;
3097 unicode_t ch;
2920 unsigned char ch, string[STRING_MAX]; 3098 unsigned char string[STRING_MAX];
2921 3099
2922 for (; (ch = cmd_getc ());) 3100 while ((ch = cmd_getc ()))
2923 { 3101 {
2924 if (ch == C0_BEL 3102 if (ch == C0_BEL || ch == CHAR_ST)
2925 || ch == CHAR_ST 3103 break;
3104
3105 if (seen_esc)
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3106 if (ch == 0x5c) /* 7bit ST */
2927 break; 3107 break;
3108 else
3109 return NULL;
3110
2928 if (ch == C0_ESC) 3111 if (ch == C0_ESC)
2929 { 3112 {
2930 seen_esc = 1; 3113 seen_esc = 1;
2931 continue; 3114 continue;
2932 } 3115 }
2933 else if (ch == '\t') 3116 else if (ch == C0_HT)
2934 ch = ' '; /* translate '\t' to space */ 3117 ch = ' '; /* translate '\t' to space */
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
2936 return NULL; /* other control character - exit */ 3119 return NULL; /* other control character - exit */
3120
2937 if (n < sizeof (string) - 1) 3121 if (n >= sizeof (string) - 1)
3122 // stop at some sane length
3123 return NULL;
3124
2938 string[n++] = ch; 3125 string[n++] = ch;
2939 seen_esc = 0; 3126 seen_esc = 0;
2940 } 3127 }
3128
2941 string[n++] = '\0'; 3129 string[n++] = '\0';
3130
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2943 return NULL; 3132 return NULL;
3133
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3134 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3135 STRNCPY (s, string, n);
2946 return s; 3136 return s;
2947} 3137}
2948 3138
2949/*----------------------------------------------------------------------*/ 3139/*----------------------------------------------------------------------*/
… …
2951 * 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)'
2952 */ 3142 */
2953void 3143void
2954rxvt_term::process_dcs_seq () 3144rxvt_term::process_dcs_seq ()
2955{ 3145{
2956 unsigned char eh, *s; 3146 unsigned char *s;
3147 unicode_t eh;
3148
2957 /* 3149 /*
2958 * Not handled yet 3150 * Not handled yet
2959 */ 3151 */
2960 s = get_to_st (&eh); 3152 s = get_to_st (eh);
2961 if (s) 3153 if (s)
2962 free (s); 3154 free (s);
3155
2963 return; 3156 return;
2964} 3157}
2965 3158
2966/*----------------------------------------------------------------------*/ 3159/*----------------------------------------------------------------------*/
2967/* 3160/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3161 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3162 */
2970void 3163void
2971rxvt_term::process_osc_seq () 3164rxvt_term::process_osc_seq ()
2972{ 3165{
2973 unsigned char ch, eh, *s; 3166 unicode_t ch, eh;
2974 int arg; 3167 int arg;
2975 3168
2976 ch = cmd_getc (); 3169 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3170 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3171 arg = arg * 10 + (ch - '0');
2979 3172
2980 if (ch == ';') 3173 if (ch == ';')
2981 { 3174 {
2982 s = get_to_st (&eh); 3175 unsigned char *s = get_to_st (eh);
3176
2983 if (s) 3177 if (s)
2984 { 3178 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3179 process_xterm_seq (arg, (char *)s, eh);
2997 free (s); 3180 free (s);
2998 } 3181 }
2999 } 3182 }
3000} 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
3001/* 3201/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title 3203 * 0 = change iconName/title
3004 * 1 = change iconName 3204 * 1 = change iconName
3005 * 2 = change title 3205 * 2 = change title
3006 * 4 = change color 3206 * 4 = change color
3207 * 10 = change fg color
3208 * 11 = change bg color
3007 * 12 = change text color 3209 * 12 = change text color
3008 * 13 = change mouse foreground color 3210 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour 3211 * 17 = change highlight character colour
3010 * 18 = change bold character color 3212 * 18 = change bold character color
3011 * 19 = change underlined character color 3213 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented) 3214 * 46 = change logfile (not implemented)
3013 * 50 = change font 3215 * 50 = change font
3014 * 3216 *
3015 * rxvt extensions: 3217 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap 3218 * 20 = bg pixmap
3018 * 39 = change default fg color 3219 * 39 = change default fg color
3019 * 49 = change default bg color 3220 * 49 = change default bg color
3020 * 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
3021 */ 3225 */
3022void 3226void
3023rxvt_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)
3024{ 3228{
3025 int changed = 0; 3229 int changed = 0;
3026 int color; 3230 int color;
3027 char *buf, *name; 3231 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1];
3028 3233
3029 assert (str != NULL); 3234 assert (str != NULL);
3030 switch (op) 3235 switch (op)
3031 { 3236 {
3032 case XTerm_name: 3237 case XTerm_name:
3033 set_title (str); 3238 set_title (str);
3034 /* FALLTHROUGH */ 3239 /* FALLTHROUGH */
3035 case XTerm_iconName: 3240 case XTerm_iconName:
3036 set_iconName (str); 3241 set_icon_name (str);
3037 break; 3242 break;
3038 case XTerm_title: 3243 case XTerm_title:
3039 set_title (str); 3244 set_title (str);
3040 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
3041 case XTerm_Color: 3288 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3289 for (buf = (char *)str; buf && *buf;)
3043 { 3290 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3291 if ((name = STRCHR (buf, ';')) == NULL)
3045 break; 3292 break;
3293
3046 *name++ = '\0'; 3294 *name++ = '\0';
3047 color = atoi (buf); 3295 color = atoi (buf);
3296
3048 if (color < 0 || color >= TOTAL_COLORS) 3297 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3298 break;
3299
3050 if ((buf = STRCHR (name, ';')) != NULL) 3300 if ((buf = STRCHR (name, ';')) != NULL)
3051 *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
3052 set_window_color (color + minCOLOR, name); 3313 set_window_color (color + minCOLOR, name);
3053 } 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);
3054 break; 3321 break;
3055#ifndef NO_CURSORCOLOR 3322#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3323 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3324 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3325 break;
3059#endif 3326#endif
3060 case XTerm_Color_pointer: 3327 case XTerm_Color_pointer_fg:
3061 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);
3062 break; 3332 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3333#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3334 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3066 break; 3336 break;
3067 case XTerm_Color_UL: 3337 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3339 break;
3070 case XTerm_Color_RV: 3340 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3342 break;
3073#endif 3343#endif
3074 3344
3075 case XTerm_Menu:
3076 /*
3077 * rxvt_menubar_dispatch () violates the constness of the string,
3078 * so DON'T do it here
3079 */
3080 break;
3081 case XTerm_Pixmap: 3345 case XTerm_Pixmap:
3082 if (*str != ';') 3346 if (*str != ';')
3083 { 3347 {
3084#if XPM_BACKGROUND 3348#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3349 scale_pixmap (""); /* reset to default scaling */
… …
3108 set_window_color (Color_fg, str); 3372 set_window_color (Color_fg, str);
3109 break; 3373 break;
3110 case XTerm_restoreBG: 3374 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3375 set_window_color (Color_bg, str);
3112 break; 3376 break;
3377
3113 case XTerm_logfile: 3378 case XTerm_logfile:
3379 // TODO, when secure mode?
3114 break; 3380 break;
3381
3115 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
3116 change_font (0, str); 3393 change_font (str);
3394 break;
3395
3396#ifndef NO_FRILLS
3397 case XTerm_locale:
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
3117 break; 3426 break;
3427#endif
3118#if 0 3428#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3429 case XTerm_dumpscreen: /* no error notices */
3120 { 3430 {
3121 int fd; 3431 int fd;
3122 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)
3123 { 3433 {
3124 scr_dump (fd); 3434 scr_dump (fd);
3125 close (fd); 3435 close (fd);
3126 } 3436 }
3127 } 3437 }
3128 break; 3438 break;
3129#endif 3439#endif
3130
3131 } 3440 }
3132} 3441}
3133/*----------------------------------------------------------------------*/ 3442/*----------------------------------------------------------------------*/
3134 3443
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3444/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3452 * so no need for fancy checking
3144 */ 3453 */
3145int 3454int
3146rxvt_term::privcases (int mode, unsigned long bit) 3455rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3456{
3148 int state; 3457 int state;
3149 3458
3150 if (mode == 's') 3459 if (mode == 's')
3151 { 3460 {
3152 SavedModes |= (PrivateModes & bit); 3461 SavedModes |= (PrivateModes & bit);
3153 return -1; 3462 return -1;
… …
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3468 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3161 PrivMode (state, bit); 3470 PrivMode (state, bit);
3162 } 3471 }
3472
3163 return state; 3473 return state;
3164} 3474}
3165 3475
3166/* we're not using priv _yet_ */ 3476/* we're not using priv _yet_ */
3167void 3477void
3168rxvt_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)
3169{ 3479{
3170 unsigned int i, j; 3480 unsigned int i, j;
3171 int state; 3481 int state;
3482
3172 static const struct 3483 static const struct
3173 { 3484 {
3174 const int argval; 3485 const int argval;
3175 const unsigned long bit; 3486 const unsigned long bit;
3176 } 3487 }
3488
3177 argtopriv[] = { 3489 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3490 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3491 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3492 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3493 { 4, PrivMode_smoothScroll },
… …
3187 { menuBar_esc, PrivMode_menuBar }, 3499 { menuBar_esc, PrivMode_menuBar },
3188#endif 3500#endif
3189#ifdef scrollBar_esc 3501#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3502 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3503#endif
3504 // 18, 19 printing-related
3192 { 25, PrivMode_VisibleCursor }, 3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3193 { 35, PrivMode_ShiftKeys }, 3507 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3508 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI
3511 // 46 start logging
3195 { 47, PrivMode_Screen }, 3512 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3513 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3514#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3515 { 67, PrivMode_BackSpace },
3199#endif 3516#endif
3200 { 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
3201 { 1010, PrivMode_TtyOutputInh }, 3521 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 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
3203 { 1047, PrivMode_Screen }, 3526 { 1047, PrivMode_Screen },
3527 // 1048 save and restore cursor
3204 { 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
3205 }; 3530 };
3206 3531
3207 if (nargs == 0) 3532 if (nargs == 0)
3208 return; 3533 return;
3209 3534
… …
3224 state = privcases (mode, argtopriv[j].bit); 3549 state = privcases (mode, argtopriv[j].bit);
3225 break; 3550 break;
3226 } 3551 }
3227 3552
3228 /* extra handling for values with state unkept */ 3553 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 3554 switch (arg[i])
3231 { 3555 {
3232 case 1048: /* alternative cursor save */ 3556 case 1048: /* alternative cursor save */
3557 if (Options & Opt_secondaryScreen)
3233 if (mode == 0) 3558 if (mode == 0)
3234 scr_cursor (RESTORE); 3559 scr_cursor (RESTORE);
3235 else if (mode == 1) 3560 else if (mode == 1)
3236 scr_cursor (SAVE); 3561 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 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;
3253 case 3: /* 80/132 */ 3577 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 3578 if (PrivateModes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3256 (unsigned int)TermWin.height);
3257 break; 3580 break;
3258 case 4: /* smooth scrolling */ 3581 case 4: /* smooth scrolling */
3259 if (state) 3582 if (state)
3260 Options &= ~Opt_jumpScroll; 3583 Options &= ~Opt_jumpScroll;
3261 else 3584 else
3262 Options |= Opt_jumpScroll; 3585 Options |= Opt_jumpScroll;
3263 break; 3586 break;
3264 case 5: /* reverse video */ 3587 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 3588 scr_rvideo_mode (state);
3266 break; 3589 break;
3267 case 6: /* relative/absolute origins */ 3590 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 3591 scr_relative_origin (state);
3269 break; 3592 break;
3270 case 7: /* autowrap */ 3593 case 7: /* autowrap */
3271 scr_autowrap (state); 3594 scr_autowrap (state);
3272 break; 3595 break;
3273 /* 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 */
3274 case 9: /* X10 mouse reporting */ 3597 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 3598 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 3599 PrivateModes &= ~PrivMode_MouseX11;
3277 break; 3600 break;
3278#ifdef menuBar_esc 3601#ifdef menuBar_esc
3279 case menuBar_esc: 3602 case menuBar_esc:
3280#ifdef MENUBAR 3603#ifdef MENUBAR
3281 map_menuBar (state); 3604 map_menuBar (state);
3282#endif 3605#endif
3283 break; 3606 break;
3284#endif 3607#endif
3285#ifdef scrollBar_esc 3608#ifdef scrollBar_esc
3286 case scrollBar_esc: 3609 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 3610 if (scrollbar_mapping (state))
3288 { 3611 {
3289 resize_all_windows (0, 0, 0); 3612 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 3613 scr_touch (true);
3291 } 3614 }
3292 break; 3615 break;
3293#endif 3616#endif
3294 case 25: /* visible/invisible cursor */ 3617 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 3618 scr_cursor_visible (state);
3296 break; 3619 break;
3297 /* case 35: - shift keys */ 3620 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 3621 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 3622 case 47: /* secondary screen */
3300 scr_change_screen (state); 3623 scr_change_screen (state);
3301 break; 3624 break;
3302 /* case 66: - application key pad */ 3625 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 3626 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 3627 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 3628 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 3629 PrivateModes &= ~PrivMode_MouseX10;
3307 break; 3630 break;
3308#if 0 3631#if 0
3309 case 1001: 3632 case 1001:
3310 break; /* X11 mouse highlighting */ 3633 break; /* X11 mouse highlighting */
3311#endif 3634#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 3635 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 3636 if (state)
3314 Options &= ~Opt_scrollTtyOutput; 3637 Options &= ~Opt_scrollTtyOutput;
3315 else 3638 else
3316 Options |= Opt_scrollTtyOutput; 3639 Options |= Opt_scrollTtyOutput;
3317 break; 3640 break;
3318 case 1011: /* scroll to bottom on key press */ 3641 case 1011: /* scroll to bottom on key press */
3319 if (state) 3642 if (state)
3320 Options |= Opt_scrollTtyKeypress; 3643 Options |= Opt_scrollTtyKeypress;
3321 else 3644 else
3322 Options &= ~Opt_scrollTtyKeypress; 3645 Options &= ~Opt_scrollTtyKeypress;
3323 break; 3646 break;
3324 case 1047: /* secondary screen w/ clearing */ 3647 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3648 if (Options & Opt_secondaryScreen)
3326 if (current_screen != PRIMARY) 3649 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 3650 scr_erase_screen (2);
3328 scr_change_screen (state); 3651 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 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;
3332 } 3661 }
3333 } 3662 }
3334} 3663}
3335/*}}} */ 3664/*}}} */
3336 3665
3337/*{{{ process sgr sequences */ 3666/*{{{ process sgr sequences */
3338void 3667void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3668rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 3669{
3341 unsigned int i; 3670 unsigned int i;
3342 short rendset; 3671 short rendset;
3343 int rendstyle; 3672 int rendstyle;
3344 3673
3345 if (nargs == 0) 3674 if (nargs == 0)
3346 { 3675 {
3347 scr_rendition (0, ~RS_None); 3676 scr_rendition (0, ~RS_None);
3348 return; 3677 return;
3349 } 3678 }
3679
3350 for (i = 0; i < nargs; i++) 3680 for (i = 0; i < nargs; i++)
3351 { 3681 {
3352 rendset = -1; 3682 rendset = -1;
3353 switch (arg[i]) 3683 switch (arg[i])
3354 { 3684 {
… …
3362 rendset = 1, rendstyle = RS_Uline; 3692 rendset = 1, rendstyle = RS_Uline;
3363 break; 3693 break;
3364 case 5: 3694 case 5:
3365 rendset = 1, rendstyle = RS_Blink; 3695 rendset = 1, rendstyle = RS_Blink;
3366 break; 3696 break;
3697 //case 6: // scoansi light background
3367 case 7: 3698 case 7:
3368 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;
3369 break; 3709 break;
3370 case 22: 3710 case 22:
3371 rendset = 0, rendstyle = RS_Bold; 3711 rendset = 0, rendstyle = RS_Bold;
3372 break; 3712 break;
3373 case 24: 3713 case 24:
… …
3377 rendset = 0, rendstyle = RS_Blink; 3717 rendset = 0, rendstyle = RS_Blink;
3378 break; 3718 break;
3379 case 27: 3719 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 3720 rendset = 0, rendstyle = RS_RVid;
3381 break; 3721 break;
3722 case 28:
3723 // visible. NYI
3724 break;
3382 } 3725 }
3726
3383 if (rendset != -1) 3727 if (rendset != -1)
3384 { 3728 {
3385 scr_rendition (rendset, rendstyle); 3729 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 3730 continue; /* for (;i;) */
3387 } 3731 }
… …
3394 case 33: 3738 case 33:
3395 case 34: 3739 case 34:
3396 case 35: 3740 case 35:
3397 case 36: 3741 case 36:
3398 case 37: 3742 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 3744 break;
3402#ifdef TTY_256COLOR 3745#ifdef TTY_256COLOR
3403 case 38: 3746 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 3747 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 3748 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 3750 i += 2;
3409 } 3751 }
3410 break; 3752 break;
3411#endif 3753#endif
3412 case 39: /* default fg */ 3754 case 39: /* default fg */
… …
3419 case 43: 3761 case 43:
3420 case 44: 3762 case 44:
3421 case 45: 3763 case 45:
3422 case 46: 3764 case 46:
3423 case 47: 3765 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 3767 break;
3427#ifdef TTY_256COLOR 3768#ifdef TTY_256COLOR
3428 case 48: 3769 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 3770 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 3771 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 3773 i += 2;
3434 } 3774 }
3435 break; 3775 break;
3436#endif 3776#endif
3437 case 49: /* default bg */ 3777 case 49: /* default bg */
… …
3466 } 3806 }
3467 } 3807 }
3468} 3808}
3469/*}}} */ 3809/*}}} */
3470 3810
3471/*{{{ process Rob Nation's own graphics mode sequences */ 3811/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 3812void
3473rxvt_term::process_graphics () 3813rxvt_term::process_graphics ()
3474{ 3814{
3475 unsigned char ch, cmd = cmd_getc (); 3815 unicode_t ch, cmd = cmd_getc ();
3476 3816
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 3817 if (cmd == 'Q')
3479 { /* query graphics */ 3818 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 3819 tt_printf ("\033G0\n"); /* no graphics */
3481 return; 3820 return;
3482 } 3821 }
3483 /* swallow other graphics sequences until terminating ':' */ 3822 /* swallow other graphics sequences until terminating ':' */
3484 do 3823 do
3485 ch = cmd_getc (); 3824 ch = cmd_getc ();
3486 while (ch != ':'); 3825 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 3826}
3533/*}}} */ 3827/*}}} */
3534 3828
3535/* ------------------------------------------------------------------------- */ 3829/* ------------------------------------------------------------------------- */
3536 3830

Diff Legend

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