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.50 by pcg, Sun Feb 22 08:09:37 2004 UTC vs.
Revision 1.120 by root, Tue Aug 10 22:36:30 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
… …
252#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
254 { 249 {
255 unsigned int l; 250 unsigned int l;
256 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
257 const unsigned char ch = C0_ESC;
258 252
259 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
260 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
261 255
262 /* escape prefix */ 256 /* escape prefix */
263 if (meta) 257 if (meta
264# ifdef META8_OPTION 258# ifdef META8_OPTION
265 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
266# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
267 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
268 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
269 return; 268 return;
270 } 269 }
271 else 270 else
272#endif 271#endif
… …
282 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
283 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
284 } 283 }
285 else 284 else
286 STRCPY (kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
287# ifdef MULTICHAR_SET
288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
289 {
290 int col, row;
291
292 newlen = STRLEN (kbuf);
293 col = screen.cur.col - 1;
294 row = screen.cur.row + TermWin.saveLines;
295 if (IS_MULTI2 (screen.rend[row][col]))
296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
297 }
298# endif
299 break; 286 break;
300#endif 287#endif
301#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
302 case XK_Delete: 289 case XK_Delete:
303 STRCPY (kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
304# ifdef MULTICHAR_SET
305 if (Options & Opt_mc_hack)
306 {
307 int col, row;
308
309 newlen = STRLEN (kbuf);
310 col = screen.cur.col;
311 row = screen.cur.row + TermWin.saveLines;
312 if (IS_MULTI1 (screen.rend[row][col]))
313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
314 }
315# endif
316 break; 291 break;
317#endif 292#endif
318 case XK_Tab: 293 case XK_Tab:
319 if (shft) 294 if (shft)
320 STRCPY (kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
… …
331 newlen = 0; 306 newlen = 0;
332 } 307 }
333 break; 308 break;
334 309
335#ifdef XK_KP_Left 310#ifdef XK_KP_Left
336 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
337 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
338 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
339 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
340 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
341 { 316 {
… …
362 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
363 kbuf[2] = "dacb"[keysym - XK_Left]; 338 kbuf[2] = "dacb"[keysym - XK_Left];
364 } 339 }
365 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
366 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
367#ifdef MULTICHAR_SET
368 //TODO: ??
369 if (Options & Opt_mc_hack)
370 {
371 int col, row, m;
372
373 col = screen.cur.col;
374 row = screen.cur.row + TermWin.saveLines;
375 m = 0;
376 if (keysym == XK_Right
377 && IS_MULTI1 (screen.rend[row][col]))
378 m = 1;
379 else if (keysym == XK_Left)
380 {
381 if (col > 0)
382 {
383 if (IS_MULTI2 (screen.rend[row][col - 1]))
384 m = 1;
385 }
386 else if (screen.cur.row > 0)
387 {
388 col = screen.tlen[--row];
389 if (col == -1)
390 col = TermWin.ncol - 1;
391 else
392 col--;
393 if (col > 0
394 && IS_MULTI2 (screen.rend[row][col]))
395 m = 1;
396 }
397 }
398 if (m)
399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
400 }
401#endif
402 break; 342 break;
403 343
404#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
405# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
406 case XK_KP_Prior: 346 case XK_KP_Prior:
… …
595 break; 535 break;
596 } 536 }
597 if (newlen) 537 if (newlen)
598 len = STRLEN (kbuf); 538 len = STRLEN (kbuf);
599 } 539 }
540
600 /* 541 /*
601 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
602 */ 543 */
603#ifdef META8_OPTION 544#ifdef META8_OPTION
604 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
619 { 560 {
620 unsigned char *ch; 561 unsigned char *ch;
621 562
622 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
623 *ch |= 0x80; 564 *ch |= 0x80;
565
624 meta = 0; 566 meta = 0;
625 } 567 }
626#endif 568#endif
627 /* nil */ ; 569 /* nil */ ;
628 } 570 }
… …
653 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
654 596
655 /* escape prefix */ 597 /* escape prefix */
656 if (meta 598 if (meta
657#ifdef META8_OPTION 599#ifdef META8_OPTION
658 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
659#endif 601#endif
660 ) 602 )
661 { 603 {
662 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
663
664 tt_write (&ch, 1); 605 tt_write (&ch, 1);
665 } 606 }
607
666#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
667 if (debug_key)
668 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
669 char *p; 610 unsigned char *p;
670 int i; 611 int i;
671 612
672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
673 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
675 fprintf (stderr, "'\n"); 616 fprintf (stderr, "'\n");
676 }
677#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
678 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
679} 619}
680/*}}} */ 620/*}}} */
681 621
… …
683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
684/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
685unsigned int 625unsigned int
686rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
687{ 627{
688 unsigned int n, s; 628 unsigned int n, s;
689 629
690 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
692 if (n > 0 && s < count) 633 if (n > 0 && s < count)
693 { 634 {
694 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
696 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
697 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
698 s += n; 639 s += n;
699 } 640 }
641
700 if (count > s) 642 if (count > s)
701 { 643 {
702 rxvt_print_error ("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
703 count = s; 645 count = s;
704 } 646 }
647
705 for (; count--;) 648 for (; count--;)
706 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
707 return 0; 653 return 0;
708} 654}
709#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
710 656
711void 657void
… …
715 if (want_full_refresh) 661 if (want_full_refresh)
716 { 662 {
717 want_full_refresh = 0; 663 want_full_refresh = 0;
718 scr_clear (); 664 scr_clear ();
719 scr_touch (false); 665 scr_touch (false);
720 want_refresh = 1;
721 } 666 }
722#endif 667#endif
723 668
724 if (want_refresh) 669 if (want_refresh)
725 { 670 {
726 scr_refresh (refresh_type); 671 scr_refresh (refresh_type);
727 scrollbar_show (1); 672 scrollbar_show (1);
728#ifdef USE_XIM 673#ifdef USE_XIM
729 IMSendSpot (); 674 IMSendSpot ();
730#endif 675#endif
731
732 } 676 }
733 677
734 display->flush (); 678 display->flush ();
679
680 flush_ev.stop ();
735} 681}
736 682
737void 683void
738rxvt_term::check_cb (check_watcher &w) 684rxvt_term::check_cb (check_watcher &w)
739{ 685{
740 SET_R (this); 686 SET_R (this);
741 SET_LOCALE (locale); 687 SET_LOCALE (locale);
742 688
689 display->flush ();
690
691 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01);
693}
694
695void
696rxvt_term::flush_cb (time_watcher &w)
697{
698 SET_R (this);
699 SET_LOCALE (locale);
700
701 refresh_limit = 1;
702 refresh_count = 0;
743 flush (); 703 flush ();
744} 704}
745 705
746#ifdef CURSOR_BLINK 706#ifdef CURSOR_BLINK
747void 707void
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 725 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 726 }
767} 727}
768#endif 728#endif
769 729
730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
731void
732rxvt_term::cont_scroll_cb (time_watcher &w)
733{
734 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 }
741}
742#endif
743
744#ifdef SELECTION_SCROLLING
745void
746rxvt_term::sel_scroll_cb (time_watcher &w)
747{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 }
755}
756#endif
757
758#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
759void
760rxvt_term::slip_wheel_cb (time_watcher &w)
761{
762 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed))
765 {
766 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 }
770}
771#endif
772
770bool 773bool
771rxvt_term::pty_fill () 774rxvt_term::pty_fill ()
772{ 775{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 776 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777
778 if (CBUFSIZ == n)
779 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
781 n = 0;
782 }
774 783
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 784 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 785 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 786 cmdbuf_endp = cmdbuf_ptr + n;
778 787
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
780 789
781 if (n > 0) 790 if (n > 0)
782 { 791 {
783 cmdbuf_endp += n; 792 cmdbuf_endp += n;
784 return true; 793 return true;
785 } 794 }
786 else if (n < 0 && errno != EAGAIN) 795 else if (n < 0 && errno != EAGAIN)
787 destroy (); 796 destroy ();
788 797
789 return false; 798 return false;
790} 799}
791 800
792void 801void
793rxvt_term::pty_cb (io_watcher &w, short revents) 802rxvt_term::pty_cb (io_watcher &w, short revents)
… …
796 SET_LOCALE (locale); 805 SET_LOCALE (locale);
797 806
798 if (revents & EVENT_WRITE) 807 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 808 tt_write (0, 0);
800 else if (revents & EVENT_READ) 809 else if (revents & EVENT_READ)
801 {
802 bool flag = true;
803
804 // loop, but don't allow a single term to monopolize us 810 // loop, but don't allow a single term to monopolize us
805 // the number of loops is fully arbitrary, and thus wrong
806 while (flag && pty_fill ()) 811 while (pty_fill ())
807 { 812 if (cmd_parse ())
808 if (!seen_input)
809 {
810 seen_input = 1;
811 /* once we know the shell is running, send the screen size. Again! */
812 tt_winch ();
813 }
814
815 uint32_t ch = NOCHAR;
816
817 for (;;)
818 {
819 if (ch == NOCHAR)
820 ch = next_char ();
821
822 if (ch == NOCHAR) // TODO: improve
823 break; 813 break;
824
825 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
826 {
827 /* Read a text string from the input buffer */
828 uint32_t buf[BUFSIZ];
829 bool refreshnow = false;
830 int nlines = 0;
831 uint32_t *str = buf;
832
833 *str++ = ch;
834
835 for (;;)
836 {
837 ch = next_char ();
838
839 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
840 break;
841 else
842 {
843 *str++ = ch;
844
845 if (ch == '\n')
846 {
847 nlines++;
848 refresh_count++;
849
850 if (! (Options & Opt_jumpScroll)
851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
852 {
853 refreshnow = true;
854 flag = false;
855 ch = NOCHAR;
856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
865 }
866 }
867
868 if (str >= buf + BUFSIZ)
869 {
870 ch = NOCHAR;
871 break;
872 }
873 }
874 }
875
876 scr_add_lines (buf, nlines, str - buf);
877
878 /*
879 * If there have been a lot of new lines, then update the screen
880 * What the heck I'll cheat and only refresh less than every page-full.
881 * the number of pages between refreshes is refresh_limit, which
882 * is incremented here because we must be doing flat-out scrolling.
883 *
884 * refreshing should be correct for small scrolls, because of the
885 * time-out
886 */
887 if (refreshnow)
888 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++;
891
892 scr_refresh (refresh_type);
893 }
894
895 }
896 else
897 {
898 switch (ch)
899 {
900 default:
901 process_nonprinting (ch);
902 break;
903 case C0_ESC: /* escape char */
904 process_escape_seq ();
905 break;
906 /*case 0x9b: */ /* CSI */
907 /* process_csi_seq (); */
908 }
909
910 ch = NOCHAR;
911 }
912 }
913 }
914 }
915} 814}
916 815
917// read the next character, currently handles UTF-8 816void
918// will probably handle all sorts of other stuff in the future 817rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 818{
922 while (cmdbuf_ptr < cmdbuf_endp) 819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
923 { 820 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 821
927 wchar_t wc; 822#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 823 hidden_pointer = 0;
929 824
930 if (len == (size_t)-2) 825 if (Options & Opt_pointerBlank)
931 return NOCHAR; 826 pointer_ev.start (NOW + pointerBlankDelay);
932 827#endif
933 if (len == (size_t)-1)
934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
935
936 // assume wchar == unicode
937 cmdbuf_ptr += len;
938 return wc;
939 }
940
941 return NOCHAR;
942}
943
944/* rxvt_cmd_getc () - Return next input character */
945/*
946 * Return the next input character after first passing any keyboard input
947 * to the command.
948 */
949uint32_t
950rxvt_term::cmd_getc ()
951{
952 for (;;)
953 {
954 uint32_t c = next_char ();
955 if (c != NOCHAR)
956 return c;
957
958 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (cmd_fd, F_SETFL, 0);
961 pty_fill ();
962 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964} 828}
965 829
966#ifdef POINTER_BLANK 830#ifdef POINTER_BLANK
967void 831void
968rxvt_term::pointer_unblank ()
969{
970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
971 recolour_cursor ();
972
973 hidden_pointer = 0;
974
975 if (Options & Opt_pointerBlank)
976 pointer_ev.start (NOW + pointerBlankDelay);
977}
978
979void
980rxvt_term::pointer_blank () 832rxvt_term::pointer_blank ()
981{ 833{
982 if (! (Options & Opt_pointerBlank)) 834 if (! (Options & Opt_pointerBlank))
983 return; 835 return;
984 836
… …
997 pointer_blank (); 849 pointer_blank ();
998} 850}
999#endif 851#endif
1000 852
1001void 853void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 854rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 855{
1004 int button_number, key_state = 0; 856 int button_number, key_state = 0;
1005 int x, y; 857 int x, y;
1006 858
1007 x = ev.x; 859 x = ev.x;
1008 y = ev.y; 860 y = ev.y;
1009 pixel_position (&x, &y); 861 pixel_position (&x, &y);
1010 862
… …
1179 break; 1031 break;
1180 1032
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease: 1034 case KeyRelease:
1183 { 1035 {
1184 if (! (ev.xkey.state & ControlMask)) 1036 if (!(ev.xkey.state & ControlMask))
1185 mouse_slip_wheel_speed = 0; 1037 slip_wheel_ev.stop ();
1186 else 1038 else
1187 { 1039 {
1188 KeySym ks; 1040 KeySym ks;
1189 1041
1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1191 if (ks == XK_Control_L || ks == XK_Control_R) 1043 if (ks == XK_Control_L || ks == XK_Control_R)
1192 mouse_slip_wheel_speed = 0; 1044 mouse_slip_wheel_speed = 0;
1193 } 1045 }
… …
1213 && (ev.xclient.data.l[0] == DndFile 1065 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1066 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1067 || ev.xclient.data.l[0] == DndLink))
1216 { 1068 {
1217 /* Get Dnd data */ 1069 /* Get Dnd data */
1218 Atom ActualType; 1070 Atom ActualType;
1219 int ActualFormat; 1071 int ActualFormat;
1220 unsigned char *data; 1072 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1073 unsigned long Size, RemainingBytes;
1222 1074
1223 XGetWindowProperty (display->display, display->root, 1075 XGetWindowProperty (display->display, display->root,
1224 xa[XA_DNDSELECTION], 1076 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1077 0L, 1000000L,
1226 False, AnyPropertyType, 1078 False, AnyPropertyType,
… …
1229 &data); 1081 &data);
1230 XChangeProperty (display->display, display->root, 1082 XChangeProperty (display->display, display->root,
1231 XA_CUT_BUFFER0, XA_STRING, 1083 XA_CUT_BUFFER0, XA_STRING,
1232 8, PropModeReplace, 1084 8, PropModeReplace,
1233 data, STRLEN (data)); 1085 data, STRLEN (data));
1086 XFree (data);
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1087 selection_paste (display->root, XA_CUT_BUFFER0, True);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1236 } 1089 }
1237#endif /* OFFIX_DND */ 1090#endif /* OFFIX_DND */
1238 break; 1091 break;
1239 1092
1240 case MappingNotify: 1093 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1094 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1095 break;
1243 1096
1244 /* 1097 /*
1245 * XXX: this is not the _current_ arrangement 1098 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1099 * Here's my conclusion:
… …
1277#endif 1130#endif
1278#ifdef CURSOR_BLINK 1131#ifdef CURSOR_BLINK
1279 if (Options & Opt_cursorBlink) 1132 if (Options & Opt_cursorBlink)
1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1281#endif 1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 {
1138 PixColors = PixColorsFocused;
1139 set_colorfgbg ();
1140 scr_clear ();
1141 scr_touch (true);
1142 }
1143#endif
1282 1144
1283 } 1145 }
1284 break; 1146 break;
1285 1147
1286 case FocusOut: 1148 case FocusOut:
… …
1295#ifdef CURSOR_BLINK 1157#ifdef CURSOR_BLINK
1296 if (Options & Opt_cursorBlink) 1158 if (Options & Opt_cursorBlink)
1297 cursor_blink_ev.stop (); 1159 cursor_blink_ev.stop ();
1298 hidden_cursor = 0; 1160 hidden_cursor = 0;
1299#endif 1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1300 1171
1301 } 1172 }
1302 break; 1173 break;
1303 1174
1304 case ConfigureNotify: 1175 case ConfigureNotify:
… …
1313 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1314 } 1185 }
1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1316 1187
1317 if (szHint.width != width || szHint.height != height) 1188 if (szHint.width != width || szHint.height != height)
1318 {
1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1320 resize_all_windows (width, height, 1); 1189 resize_all_windows (width, height, 1);
1321 } 1190
1322#ifdef DEBUG_SIZE
1323 else
1324 {
1325 D_SIZE ((stderr, "Size: Not resizing"));
1326 }
1327#endif
1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1329 if (Options & Opt_transparent) 1192 if (Options & Opt_transparent)
1330 { 1193 {
1331 check_our_parents (); 1194 check_our_parents ();
1332 if (am_transparent) 1195 if (am_transparent)
1333 want_full_refresh = 1; 1196 want_refresh = want_full_refresh = 1;
1334 } 1197 }
1335#endif 1198#endif
1336
1337 } 1199 }
1338 break; 1200 break;
1339 1201
1340 case SelectionClear: 1202 case SelectionClear:
1341 display->set_selection_owner (0); 1203 selection_clear ();
1342 break; 1204 break;
1343 1205
1344 case SelectionNotify: 1206 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1207 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1208 selection_paste (ev.xselection.requestor,
… …
1373 1235
1374 case GraphicsExpose: 1236 case GraphicsExpose:
1375 case Expose: 1237 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1238 if (ev.xany.window == TermWin.vt)
1377 { 1239 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1240 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1241 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1242 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1244
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1248 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1249 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1250
1386 // ev.xexpose.width, TermWin.height, False); 1251 scr_refresh (refresh_type);
1387#endif
1388 want_refresh = 1;
1389 } 1252 }
1390 else 1253 else
1391 { 1254 {
1392 XEvent unused_event; 1255 XEvent unused_event;
1393 1256
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1395 Expose, 1258 ;
1396 &unused_event)) ;
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1398 GraphicsExpose, 1260 ;
1399 &unused_event)) ; 1261
1400 if (isScrollbarWindow (ev.xany.window)) 1262 if (isScrollbarWindow (ev.xany.window))
1401 { 1263 {
1402 scrollBar.setIdle (); 1264 scrollBar.setIdle ();
1403 scrollbar_show (0); 1265 scrollbar_show (0);
1404 } 1266 }
1405#ifdef MENUBAR 1267#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1269 menubar_expose ();
1408#endif 1270#endif
1271
1272#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window);
1275#endif
1409 } 1276 }
1410 break; 1277 break;
1411 1278
1412 case MotionNotify: 1279 case MotionNotify:
1413#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1282 pointer_unblank ();
1416#endif 1283#endif
1417#if MENUBAR 1284#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1285 if (isMenuBarWindow (ev.xany.window))
1419 { 1286 {
1420 menubar_control (& (ev.xbutton)); 1287 menubar_control (ev.xbutton);
1421 break; 1288 break;
1422 } 1289 }
1423#endif 1290#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1425 break; 1292 break;
… …
1447 if (ev.xbutton.y < TermWin.int_bwidth 1314 if (ev.xbutton.y < TermWin.int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1449 { 1316 {
1450 int dist; 1317 int dist;
1451 1318
1452 pending_scroll_selection=1;
1453
1454 /* don't clobber the current delay if we are 1319 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1320 * already in the middle of scrolling.
1456 */ 1321 */
1457 if (scroll_selection_delay<=0) 1322 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1324
1460 /* save the event params so we can highlight 1325 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1326 * the selection in the pending-scroll loop
1462 */ 1327 */
1463 selection_save_x=ev.xbutton.x; 1328 selection_save_x=ev.xbutton.x;
… …
1485 else 1350 else
1486 { 1351 {
1487 /* we are within the text window, so we 1352 /* we are within the text window, so we
1488 * shouldn't be scrolling 1353 * shouldn't be scrolling
1489 */ 1354 */
1490 pending_scroll_selection = 0; 1355 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop();
1491 } 1357 }
1492#endif 1358#endif
1493#ifdef MOUSE_THRESHOLD 1359#ifdef MOUSE_THRESHOLD
1494 1360
1495 } 1361 }
… …
1545 return; 1411 return;
1546 } 1412 }
1547 1413
1548 /* FALLTHROUGH */ 1414 /* FALLTHROUGH */
1549 case ReparentNotify: 1415 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1417 want_refresh = want_full_refresh = 1;
1553 break; 1418 break;
1554#endif 1419#endif
1555 } 1420 }
1556} 1421}
1557 1422
1558void 1423void
1559rxvt_term::button_press (const XButtonEvent &ev) 1424rxvt_term::button_press (XButtonEvent &ev)
1560{ 1425{
1561 int reportmode = 0, clickintime; 1426 int reportmode = 0, clickintime;
1562 1427
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate) 1429 if (!bypass_keystate)
… …
1713 upordown = 1; /* down */ 1578 upordown = 1; /* down */
1714 } 1579 }
1715 if (upordown) 1580 if (upordown)
1716 { 1581 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1582#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1583 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 1584#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 1585 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 1586 {
1722 if (upordown < 0) 1587 if (upordown < 0)
1723 scrollBar.setUp (); 1588 scrollBar.setUp ();
… …
1739 break; 1604 break;
1740 case R_SB_ALIGN_BOTTOM: 1605 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 1606 csrO = scrollBar.bot - scrollBar.top;
1742 break; 1607 break;
1743 } 1608 }
1609
1744 if (scrollBar.style == R_SB_XTERM 1610 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 1611 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 1612 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 1613 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 1614
1749 scrollBar.setMotion (); 1615 scrollBar.setMotion ();
1750 break; 1616 break;
1751 1617
1752 case Button1: 1618 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1777 scr_page ((ev.button == Button1 ? DN : UP), 1643 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 1644 (TermWin.nrow
1779 * scrollbar_position (ev.y) 1645 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 1646 / scrollbar_size ()));
1781 } 1647 }
1648
1782 break; 1649 break;
1783 } 1650 }
1784 } 1651 }
1785 return; 1652 return;
1786 } 1653 }
… …
1792 menubar_control (ev); 1659 menubar_control (ev);
1793#endif 1660#endif
1794} 1661}
1795 1662
1796void 1663void
1797rxvt_term::button_release (const XButtonEvent &ev) 1664rxvt_term::button_release (XButtonEvent &ev)
1798{ 1665{
1799 int reportmode = 0; 1666 int reportmode = 0;
1800 1667
1801 csrO = 0; /* reset csr Offset */ 1668 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 1669 if (!bypass_keystate)
… …
1810 refresh_type &= ~SMOOTH_REFRESH; 1677 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 1678#endif
1812 1679
1813 } 1680 }
1814#ifdef SELECTION_SCROLLING 1681#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 1682 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop();
1816#endif 1684#endif
1817 if (ev.window == TermWin.vt) 1685 if (ev.window == TermWin.vt)
1818 { 1686 {
1819 if (reportmode) 1687 if (reportmode)
1820 { 1688 {
… …
1862 case Button5: 1730 case Button5:
1863 { 1731 {
1864 int i; 1732 int i;
1865 page_dirn v; 1733 page_dirn v;
1866 1734
1867 v = (ev.button == Button4) ? UP : DN; 1735 v = ev.button == Button4 ? UP : DN;
1736
1868 if (ev.state & ShiftMask) 1737 if (ev.state & ShiftMask)
1869 i = 1; 1738 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 1739 else if (Options & Opt_mouseWheelScrollPage)
1871 i = TermWin.nrow - 1; 1740 i = TermWin.nrow - 1;
1872 else 1741 else
1873 i = 5; 1742 i = 5;
1743
1874# ifdef MOUSE_SLIP_WHEELING 1744# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 1745 if (ev.state & ControlMask)
1876 { 1746 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 1747 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1750
1751 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753
1754 slip_wheel_ev.start ();
1879 } 1755 }
1756 else
1757 {
1880# endif 1758# endif
1881# ifdef JUMP_MOUSE_WHEEL 1759# ifdef JUMP_MOUSE_WHEEL
1882 scr_page (v, i);
1883 scr_refresh (SMOOTH_REFRESH);
1884 scrollbar_show (1);
1885# else
1886 while (i--)
1887 {
1888 scr_page (v, 1); 1760 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 1761 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 1762 scrollbar_show (1);
1763# else
1764 while (i--)
1765 {
1766 scr_page (v, 1);
1767 scr_refresh (SMOOTH_REFRESH);
1768 scrollbar_show (1);
1769 }
1770# endif
1771# ifdef MOUSE_SLIP_WHEELING
1891 } 1772 }
1892# endif 1773#endif
1893
1894 } 1774 }
1895 break; 1775 break;
1896#endif 1776#endif
1897
1898 } 1777 }
1899 } 1778 }
1900#ifdef MENUBAR 1779#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 1780 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 1781 menubar_control (ev);
1903#endif 1782#endif
1904} 1783}
1905 1784
1906
1907#ifdef TRANSPARENT 1785#ifdef TRANSPARENT
1786#if TINTING
1787/* taken from aterm-0.4.2 */
1788
1789typedef uint32_t RUINT32T;
1790
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{
1793 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i;
1799
1800 Visual* visual = display->visual;
1801
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803
1804 /* for convenience */
1805 mask_r = visual->red_mask;
1806 mask_g = visual->green_mask;
1807 mask_b = visual->blue_mask;
1808
1809 /* boring lookup table pre-initialization */
1810 switch (srcImage->bits_per_pixel) {
1811 case 15:
1812 if ((mask_r != 0x7c00) ||
1813 (mask_g != 0x03e0) ||
1814 (mask_b != 0x001f))
1815 return;
1816 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1817 lookup_r = lookup;
1818 lookup_g = lookup+32;
1819 lookup_b = lookup+32+32;
1820 sh_r = 10;
1821 sh_g = 5;
1822 sh_b = 0;
1823 break;
1824 case 16:
1825 if ((mask_r != 0xf800) ||
1826 (mask_g != 0x07e0) ||
1827 (mask_b != 0x001f))
1828 return;
1829 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1830 lookup_r = lookup;
1831 lookup_g = lookup+32;
1832 lookup_b = lookup+32+64;
1833 sh_r = 11;
1834 sh_g = 5;
1835 sh_b = 0;
1836 break;
1837 case 24:
1838 if ((mask_r != 0xff0000) ||
1839 (mask_g != 0x00ff00) ||
1840 (mask_b != 0x0000ff))
1841 return;
1842 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1843 lookup_r = lookup;
1844 lookup_g = lookup+256;
1845 lookup_b = lookup+256+256;
1846 sh_r = 16;
1847 sh_g = 8;
1848 sh_b = 0;
1849 break;
1850 case 32:
1851 if ((mask_r != 0xff0000) ||
1852 (mask_g != 0x00ff00) ||
1853 (mask_b != 0x0000ff))
1854 return;
1855 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1856 lookup_r = lookup;
1857 lookup_g = lookup+256;
1858 lookup_b = lookup+256+256;
1859 sh_r = 16;
1860 sh_g = 8;
1861 sh_b = 0;
1862 break;
1863 default:
1864 return; /* we do not support this color depth */
1865 }
1866
1867 /* prepare limits for color transformation (each channel is handled separately) */
1868 if (shade < 0) {
1869 shade = -shade;
1870 if (shade < 0) shade = 0;
1871 if (shade > 100) shade = 100;
1872
1873 lower_lim_r = 65535-rm;
1874 lower_lim_g = 65535-gm;
1875 lower_lim_b = 65535-bm;
1876
1877 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1878 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1879 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1880
1881 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1882 } else {
1883 if (shade < 0) shade = 0;
1884 if (shade > 100) shade = 100;
1885
1886 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1887
1888 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1889 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1890 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1891 }
1892
1893 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1894 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1895 {
1896 unsigned int tmp;
1897
1898 tmp = lower_lim_r;
1899 lower_lim_r = lower_lim_b;
1900 lower_lim_b = tmp;
1901
1902 tmp = upper_lim_r;
1903 upper_lim_r = upper_lim_b;
1904 upper_lim_b = tmp;
1905 }
1906
1907 /* fill our lookup tables */
1908 for (i = 0; i <= mask_r>>sh_r; i++)
1909 {
1910 RUINT32T tmp;
1911 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1912 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1913 lookup_r[i] = (tmp/65535)<<sh_r;
1914 }
1915 for (i = 0; i <= mask_g>>sh_g; i++)
1916 {
1917 RUINT32T tmp;
1918 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1919 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1920 lookup_g[i] = (tmp/65535)<<sh_g;
1921 }
1922 for (i = 0; i <= mask_b>>sh_b; i++)
1923 {
1924 RUINT32T tmp;
1925 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1926 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1927 lookup_b[i] = (tmp/65535)<<sh_b;
1928 }
1929
1930 /* apply table to input image (replacing colors by newly calculated ones) */
1931 switch (srcImage->bits_per_pixel)
1932 {
1933 case 15:
1934 {
1935 unsigned short *p1, *pf, *p, *pl;
1936 p1 = (unsigned short *) srcImage->data;
1937 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1938 while (p1 < pf)
1939 {
1940 p = p1;
1941 pl = p1 + srcImage->width;
1942 for (; p < pl; p++)
1943 {
1944 *p = lookup_r[(*p & 0x7c00)>>10] |
1945 lookup_g[(*p & 0x03e0)>> 5] |
1946 lookup_b[(*p & 0x001f)];
1947 }
1948 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1949 }
1950 break;
1951 }
1952 case 16:
1953 {
1954 unsigned short *p1, *pf, *p, *pl;
1955 p1 = (unsigned short *) srcImage->data;
1956 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1957 while (p1 < pf)
1958 {
1959 p = p1;
1960 pl = p1 + srcImage->width;
1961 for (; p < pl; p++)
1962 {
1963 *p = lookup_r[(*p & 0xf800)>>11] |
1964 lookup_g[(*p & 0x07e0)>> 5] |
1965 lookup_b[(*p & 0x001f)];
1966 }
1967 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1968 }
1969 break;
1970 }
1971 case 24:
1972 {
1973 unsigned char *p1, *pf, *p, *pl;
1974 p1 = (unsigned char *) srcImage->data;
1975 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1976 while (p1 < pf)
1977 {
1978 p = p1;
1979 pl = p1 + srcImage->width * 3;
1980 for (; p < pl; p += 3)
1981 {
1982 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1983 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1984 p[2] = lookup_r[(p[2] & 0x0000ff)];
1985 }
1986 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1987 }
1988 break;
1989 }
1990 case 32:
1991 {
1992 RUINT32T *p1, *pf, *p, *pl;
1993 p1 = (RUINT32T *) srcImage->data;
1994 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1995
1996 while (p1 < pf)
1997 {
1998 p = p1;
1999 pl = p1 + srcImage->width;
2000 for (; p < pl; p++)
2001 {
2002 *p = lookup_r[(*p & 0xff0000)>>16] |
2003 lookup_g[(*p & 0x00ff00)>> 8] |
2004 lookup_b[(*p & 0x0000ff)] |
2005 (*p & ~0xffffff);
2006 }
2007 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2008 }
2009 break;
2010 }
2011 }
2012
2013 free (lookup);
2014}
2015#endif
2016
1908/* 2017/*
1909 * Check our parents are still who we think they are. 2018 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2019 * Do transparency updates if required
1911 */ 2020 */
1912int 2021int
1913rxvt_term::check_our_parents () 2022rxvt_term::check_our_parents ()
1914{ 2023{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2024 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2025 unsigned long nitems, bytes_after;
1917 Atom atype; 2026 Atom atype;
1918 unsigned char *prop = NULL; 2027 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2028 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2029 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2030 XWindowAttributes wattr, wrootattr;
1922 2031
1923 pchanged = 0; 2032 pchanged = 0;
1924 2033
1925 if (! (Options & Opt_transparent)) 2034 if (!(Options & Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2035 return pchanged; /* Don't try any more */
1927 2036
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2037 XGetWindowAttributes (display->display, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2038 rootdepth = wrootattr.depth;
1930 2039
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2041
1932 if (rootdepth != wattr.depth) 2042 if (rootdepth != wattr.depth)
1933 { 2043 {
1934 if (am_transparent) 2044 if (am_transparent)
1935 { 2045 {
1936 pchanged = 1; 2046 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2048 am_transparent = am_pixmap_trans = 0;
1940 } 2049 }
2050
1941 return pchanged; /* Don't try any more */ 2051 return pchanged; /* Don't try any more */
1942 } 2052 }
1943 2053
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2054 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2055 XSync (display->display, False);
… …
1947 /* 2057 /*
1948 * Make the frame window set by the window manager have 2058 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2059 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2060 * windows for each client, so we have to take care about that.
1951 */ 2061 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2062 i = (xa[XA_XROOTPMAPID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2065 &nitems, &bytes_after, &prop) == Success);
2066
1956 if (!i || prop == NULL) 2067 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success);
2072
2073 if (!i || prop == NULL
2074#if TINTING
2075 || !rs[Rs_color + Color_tint]
2076#endif
2077 )
1957 have_pixmap = 0; 2078 have_pixmap = 0;
1958 else 2079 else
1959 { 2080 {
1960 have_pixmap = 1; 2081 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2082 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2083 XFree (prop);
1963 } 2084 }
2085
1964 if (have_pixmap) 2086 if (have_pixmap)
1965 { 2087 {
1966 /* 2088 /*
1967 * Copy display->root pixmap transparency 2089 * Copy display->root pixmap transparency
1968 */ 2090 */
1969 int sx, sy, nx, ny; 2091 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2092 unsigned int nw, nh;
1971 Window cr; 2093 Window cr;
1972 XImage *image; 2094 XImage *image;
1973 GC gc; 2095 GC gc;
1974 XGCValues gcvalue; 2096 XGCValues gcvalue;
1975 2097
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2099 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2100 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2101 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2102 nx = ny = 0;
2103
1981 if (sx < 0) 2104 if (sx < 0)
1982 { 2105 {
1983 nw += sx; 2106 nw += sx;
1984 nx = -sx; 2107 nx = -sx;
1985 sx = 0; 2108 sx = 0;
1986 } 2109 }
2110
1987 if (sy < 0) 2111 if (sy < 0)
1988 { 2112 {
1989 nh += sy; 2113 nh += sy;
1990 ny = -sy; 2114 ny = -sy;
1991 sy = 0; 2115 sy = 0;
1992 } 2116 }
2117
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1995 allowedxerror = -1; 2120 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2122
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2124 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2125 allowedxerror = 0;
2126
2001 if (image == NULL) 2127 if (image == NULL)
2002 { 2128 {
2003 if (am_transparent && am_pixmap_trans) 2129 if (am_transparent && am_pixmap_trans)
2004 { 2130 {
2005 pchanged = 1; 2131 pchanged = 1;
… …
2007 { 2133 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2134 XFreePixmap (display->display, TermWin.pixmap);
2009 TermWin.pixmap = None; 2135 TermWin.pixmap = None;
2010 } 2136 }
2011 } 2137 }
2138
2012 am_pixmap_trans = 0; 2139 am_pixmap_trans = 0;
2013 } 2140 }
2014 else 2141 else
2015 { 2142 {
2016 if (TermWin.pixmap != None) 2143 if (TermWin.pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2144 XFreePixmap (display->display, TermWin.pixmap);
2145
2146#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint))
2148 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2153
2154 ShadeXImage (display, image, shade, rm, gm, bm);
2155 }
2156#endif
2157
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2159 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2162 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2163 XFreeGC (display->display, gc);
2027 XDestroyImage (image); 2164 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2029 TermWin.pixmap); 2166 XClearWindow (display->display, TermWin.parent[0]);
2167
2030 if (!am_transparent || !am_pixmap_trans) 2168 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2169 pchanged = 1;
2170
2032 am_transparent = am_pixmap_trans = 1; 2171 am_transparent = am_pixmap_trans = 1;
2033 } 2172 }
2034 } 2173 }
2174
2035 if (!am_pixmap_trans) 2175 if (!am_pixmap_trans)
2036 { 2176 {
2037 unsigned int n; 2177 unsigned int n;
2038 /* 2178 /*
2039 * InheritPixmap transparency 2179 * InheritPixmap transparency
2040 */ 2180 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2183 {
2045 oldp = TermWin.parent[i]; 2184 oldp = TermWin.parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2185 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2186 &TermWin.parent[i], &list, &n);
2048 XFree (list); 2187 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189
2050 if (TermWin.parent[i] == display->root) 2190 if (TermWin.parent[i] == display->root)
2051 { 2191 {
2052 if (oldp != None) 2192 if (oldp != None)
2053 pchanged = 1; 2193 pchanged = 1;
2194
2054 break; 2195 break;
2055 } 2196 }
2197
2056 if (oldp != TermWin.parent[i]) 2198 if (oldp != TermWin.parent[i])
2057 pchanged = 1; 2199 pchanged = 1;
2058 } 2200 }
2201
2059 n = 0; 2202 n = 0;
2203
2060 if (pchanged) 2204 if (pchanged)
2061 { 2205 {
2062 for (; n < (unsigned int)i; n++) 2206 for (; n < (unsigned int)i; n++)
2063 { 2207 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
… …
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2069 break; 2213 break;
2070 } 2214 }
2071 } 2215 }
2072 } 2216 }
2073 if (n > (int) (sizeof (TermWin.parent) 2217
2074 / sizeof (TermWin.parent[0]))) 2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2075 { 2219 {
2076 D_X ((stderr, "InheritPixmap Turning off")); 2220 D_X ((stderr, "InheritPixmap Turning off"));
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2078 PixColors[Color_fg]);
2079 XSetWindowBackground (display->display, TermWin.vt, 2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2080 PixColors[Color_bg]);
2081 am_transparent = 0; 2223 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2224 /* XXX: also turn off Opt_transparent? */
2083 } 2225 }
2084 else 2226 else
2085 { 2227 {
2228#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2229 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2230 * needed for fvwm2.2.2 (and before?) */
2088# ifdef HAVE_NANOSLEEP
2089 struct timespec rqt;
2090
2091 rqt.tv_sec = 1;
2092 rqt.tv_nsec = 0;
2093 nanosleep (&rqt, NULL);
2094# else
2095 sleep (1); 2231 sleep (1);
2096# endif 2232#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2234 for (n = 0; n < (unsigned int)i; n++)
2235 {
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2100 ParentRelative); 2237 XClearWindow (display->display, TermWin.parent[n]);
2238 }
2239
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2102 ParentRelative);
2103 am_transparent = 1; 2241 am_transparent = 1;
2104 } 2242 }
2243
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2245 TermWin.parent[i] = None;
2107 } 2246 }
2247
2248 // this is experimental
2249 if (scrollBar.win)
2250 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle ();
2254 scrollbar_show (0);
2255 }
2256
2108 return pchanged; 2257 return pchanged;
2109} 2258}
2110#endif 2259#endif
2111 2260
2112/*}}} */ 2261/*}}} */
2262
2263bool
2264rxvt_term::cmd_parse ()
2265{
2266 bool flag = false;
2267 unicode_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here
2269
2270 for (;;)
2271 {
2272 if (ch == NOCHAR)
2273 {
2274 seq_begin = cmdbuf_ptr;
2275 ch = next_char ();
2276 }
2277
2278 if (ch == NOCHAR) // TODO: improve
2279 break;
2280
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 {
2283 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false;
2286 int nlines = 0;
2287 unicode_t *str = buf;
2288
2289 for (;;)
2290 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break;
2293
2294 *str++ = ch;
2295
2296 if (ch == C0_LF)
2297 {
2298 nlines++;
2299 refresh_count++;
2300
2301 if (!(Options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 {
2304 refreshnow = true;
2305 ch = NOCHAR;
2306 break;
2307 }
2308
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2310 if (nlines >= TermWin.nrow - 1)
2311 {
2312 scr_add_lines (buf, nlines, str - buf);
2313 nlines = 0;
2314 str = buf;
2315 }
2316 }
2317
2318 if (str >= buf + UBUFSIZ)
2319 {
2320 ch = NOCHAR;
2321 break;
2322 }
2323
2324 seq_begin = cmdbuf_ptr;
2325 ch = next_char ();
2326 }
2327
2328 scr_add_lines (buf, nlines, str - buf);
2329
2330 /*
2331 * If there have been a lot of new lines, then update the screen
2332 * What the heck I'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */
2336 if (refreshnow)
2337 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true;
2343 scr_refresh (refresh_type);
2344 }
2345 }
2346
2347 }
2348 else
2349 {
2350 try
2351 {
2352 process_nonprinting (ch);
2353 }
2354 catch (const class out_of_input &o)
2355 {
2356 // we ran out of input, retry later
2357 cmdbuf_ptr = seq_begin;
2358 break;
2359 }
2360
2361 ch = NOCHAR;
2362 }
2363 }
2364
2365 return flag;
2366}
2367
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character
2378unicode_t
2379rxvt_term::next_char ()
2380{
2381 while (cmdbuf_ptr < cmdbuf_endp)
2382 {
2383 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++;
2386
2387 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389
2390 if (len == (size_t)-2)
2391 {
2392 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp;
2394 break;
2395 }
2396
2397 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399
2400 // assume wchar == unicode
2401 cmdbuf_ptr += len;
2402 return wc;
2403 }
2404
2405 return NOCHAR;
2406}
2407
2408/* rxvt_cmd_getc () - Return next input character */
2409/*
2410 * Return the next input character after first passing any keyboard input
2411 * to the command.
2412 */
2413unicode_t
2414rxvt_term::cmd_getc ()
2415{
2416 unicode_t c = next_char ();
2417
2418 if (c == NOCHAR)
2419 throw out_of_input;
2420
2421 return c;
2422}
2423
2424unicode_t
2425rxvt_term::cmd_get8 ()
2426{
2427 unicode_t c = next_octet ();
2428
2429 if (c == NOCHAR)
2430 throw out_of_input;
2431
2432 return c;
2433}
2113 2434
2114/*{{{ print pipe */ 2435/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2117FILE * 2438FILE *
2118rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2119{ 2440{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2442
2122 if (stream == NULL) 2443 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2445
2124 return stream; 2446 return stream;
2125} 2447}
2126 2448
2127int 2449int
2128rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2129{ 2451{
2130 fflush (stream); 2452 fflush (stream);
2131 /* pclose () reported not to work on SunOS 4.1.3 */
2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2133 /* pclose works provided SIGCHLD handler uses waitpid */
2134 return pclose (stream); /* return fclose (stream); */
2135# else
2136 return pclose (stream); 2453 return pclose (stream);
2137# endif
2138} 2454}
2139 2455
2140/* 2456/*
2141 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2142 */ 2458 */
2143void 2459void
2144rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2145{ 2461{
2146 int done; 2462 int done;
2147 FILE *fd; 2463 FILE *fd;
2148 2464
2149 if ((fd = popen_printer ()) == NULL) 2465 if ((fd = popen_printer ()) == NULL)
2150 return; 2466 return;
2151 2467
2152 /* 2468 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2470 * is received.
2155 */ 2471 */
2156 for (done = 0; !done;) 2472 for (done = 0; !done;)
2157 { 2473 {
2158 unsigned char buf[8]; 2474 unsigned char buf[8];
2159 unsigned char ch; 2475 unicode_t ch;
2160 unsigned int i, len; 2476 unsigned int i, len;
2161 2477
2162 if ((ch = cmd_getc ()) != C0_ESC) 2478 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2479 {
2164 if (putc (ch, fd) == EOF) 2480 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2481 break; /* done = 1 */
… …
2180 { 2496 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2498 break; /* done = 1 */
2183 } 2499 }
2184 } 2500 }
2501
2185 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2187 { 2504 {
2188 done = 1; 2505 done = 1;
2189 break; 2506 break;
2190 } 2507 }
2191 } 2508 }
2192 } 2509 }
2510
2193 pclose_printer (fd); 2511 pclose_printer (fd);
2194} 2512}
2195#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2196/*}}} */ 2514/*}}} */
2197 2515
2198/* *INDENT-OFF* */ 2516/* *INDENT-OFF* */
2199enum { 2517enum {
2200 C1_40 = 0x40, 2518 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2519 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2202 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2520 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2203 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2521 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2204 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2522 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2523};
2206/* *INDENT-ON* */ 2524/* *INDENT-ON* */
2207 2525
2208/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2209void 2527void
2210rxvt_term::process_nonprinting (unsigned char ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2529{
2212 switch (ch) 2530 switch (ch)
2213 { 2531 {
2532 case C0_ESC:
2533 process_escape_seq ();
2534 break;
2214 case C0_ENQ: /* terminal Status */ 2535 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2536 if (rs[Rs_answerbackstring])
2216 tt_write (
2217 (const unsigned char *)rs[Rs_answerbackstring], 2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2218 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2219 else 2539 else
2220 tt_write ((unsigned char *)VT100_ANS, 2540 tt_write ((unsigned char *)VT100_ANS,
2221 (unsigned int)STRLEN (VT100_ANS)); 2541 (unsigned int)STRLEN (VT100_ANS));
2222 break; 2542 break;
2223 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2224 scr_bell (); 2544 scr_bell ();
2225 break; 2545 break;
2226 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2561 scr_charset_choose (1);
2242 break; 2562 break;
2243 case C0_SI: /* shift in - acs */ 2563 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2564 scr_charset_choose (0);
2245 break; 2565 break;
2566
2567#ifdef EIGHT_BIT_CONTROLS
2568 // 8-bit controls
2569 case 0x90: /* DCS */
2570 process_dcs_seq ();
2571 break;
2572 case 0x9b: /* CSI */
2573 process_csi_seq ();
2574 break;
2575 case 0x9d: /* CSI */
2576 process_osc_seq ();
2577 break;
2578#endif
2246 } 2579 }
2247} 2580}
2248/*}}} */ 2581/*}}} */
2249 2582
2250 2583
2251/*{{{ process VT52 escape sequences */ 2584/*{{{ process VT52 escape sequences */
2252void 2585void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 2586rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 2587{
2255 int row, col; 2588 int row, col;
2256 2589
2257 switch (ch) 2590 switch (ch)
2258 { 2591 {
… …
2310 2643
2311/*{{{ process escape sequences */ 2644/*{{{ process escape sequences */
2312void 2645void
2313rxvt_term::process_escape_seq () 2646rxvt_term::process_escape_seq ()
2314{ 2647{
2315 unsigned char ch = cmd_getc (); 2648 unicode_t ch = cmd_getc ();
2316 2649
2317 if (PrivateModes & PrivMode_vt52) 2650 if (PrivateModes & PrivMode_vt52)
2318 { 2651 {
2319 process_escape_vt52 (ch); 2652 process_escape_vt52 (ch);
2320 return; 2653 return;
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 2671 break;
2339 case '+': 2672 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 2674 break;
2342#ifdef MULTICHAR_SET
2343 case '$':
2344 scr_charset_set (-2, (unsigned int)cmd_getc ());
2345 break;
2346#endif
2347#ifndef NO_FRILLS 2675#ifndef NO_FRILLS
2348 case '6': 2676 case '6':
2349 scr_backindex (); 2677 scr_backindex ();
2350 break; 2678 break;
2351#endif 2679#endif
… …
2373 break; 2701 break;
2374 2702
2375 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2377 { 2705 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 2706 unicode_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, 1, 2);
2380 } 2708 }
2381 break; 2709 break;
2382 2710
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2394 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2395 scr_index (DN); 2723 scr_index (DN);
2396 break; 2724 break;
2397 2725
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /*case C1_SS2: scr_single_shift (2); break; */
2400 2728
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /*case C1_SS3: scr_single_shift (3); break; */
2403 2731
2404 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 2734 process_dcs_seq ();
2407 break; 2735 break;
… …
2422 process_osc_seq (); 2750 process_osc_seq ();
2423 break; 2751 break;
2424 2752
2425 /* 8.3.106: RESET TO INITIAL STATE */ 2753 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 2754 case 'c':
2755 mbstate.reset ();
2427 scr_poweron (); 2756 scr_poweron ();
2428 scrollbar_show (1); 2757 scrollbar_show (1);
2429 break; 2758 break;
2430 2759
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2760 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 2772
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2773/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 2774/* *INDENT-OFF* */
2446enum { 2775enum {
2447 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2449 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2450 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2451 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2780 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2452 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2781 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2453 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 2803 };
2475/* *INDENT-ON* */ 2804/* *INDENT-ON* */
2476 2805
2477void 2806void
2478rxvt_term::process_csi_seq () 2807rxvt_term::process_csi_seq ()
2479{ 2808{
2480 unsigned char ch, priv, i; 2809 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 2810 unsigned int nargs, p;
2482 int n, ndef; 2811 int n, ndef;
2483 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2484 2813
2485 for (nargs = ESC_ARGS; nargs > 0;) 2814 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 2815 arg[--nargs] = 0;
2487 2816
2488 priv = 0; 2817 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
2492 priv = ch; 2821 priv = ch;
2493 ch = cmd_getc (); 2822 ch = cmd_getc ();
2494 } 2823 }
2824
2495 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2497 { 2827 {
2498 if (isdigit (ch)) 2828 if (isdigit (ch))
2499 { 2829 {
… …
2506 { 2836 {
2507 if (nargs < ESC_ARGS) 2837 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 2838 arg[nargs++] = n;
2509 n = -1; 2839 n = -1;
2510 } 2840 }
2511 else if (ch == '\b') 2841 else if (IS_CONTROL (ch))
2512 {
2513 scr_backspace ();
2514 }
2515 else if (ch == C0_ESC)
2516 {
2517 process_escape_seq ();
2518 return;
2519 }
2520 else if (ch < ' ')
2521 {
2522 process_nonprinting (ch); 2842 process_nonprinting (ch);
2523 } 2843
2524 ch = cmd_getc (); 2844 ch = cmd_getc ();
2525 } 2845 }
2526 2846
2527 if (ch > CSI_7F) 2847 if (ch > CSI_7F)
2528 return; 2848 return;
… …
2686 tt_printf ("\033[0n"); 3006 tt_printf ("\033[0n");
2687 break; 3007 break;
2688 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
2689 scr_report_position (); 3009 scr_report_position ();
2690 break; 3010 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure)
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2694 break; 3014 break;
2695#endif
2696 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3017 break;
2699 } 3018 }
2700 break; 3019 break;
2701 3020
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3021 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2770#endif 3089#endif
2771 3090
2772 case CSI_78: /* DECREQTPARM */ 3091 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3092 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3093 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3094 break;
2776 3095
2777 default: 3096 default:
2778 break; 3097 break;
2779 } 3098 }
2780} 3099}
… …
2783#ifndef NO_FRILLS 3102#ifndef NO_FRILLS
2784/* ARGSUSED */ 3103/* ARGSUSED */
2785void 3104void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3105rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3106{
2788 int x, y; 3107 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3108 XWindowAttributes wattr;
2793 Window wdummy; 3109 Window wdummy;
2794 3110
2795 if (nargs == 0) 3111 if (nargs == 0)
2796 return; 3112 return;
3113
2797 switch (args[0]) 3114 switch (args[0])
2798 { 3115 {
2799 /* 3116 /*
2800 * commands 3117 * commands
2801 */ 3118 */
2802 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3120 XMapWindow (display->display, TermWin.parent[0]);
2804 break; 3121 break;
2805 case 2: /* iconify window */ 3122 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3123 XIconifyWindow (display->display, TermWin.parent[0],
… …
2823 break; 3140 break;
2824 case 8: /* set size (chars) */ 3141 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3143 (unsigned int) (args[1] * TermWin.fheight));
2827 break; 3144 break;
3145
3146 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3147 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3148 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3149 set_widthheight ((unsigned int)TermWin.width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3150 (unsigned int) (args[1] * TermWin.fheight));
2832 break; 3151 break;
3152
3153
2833 /* 3154 /*
2834 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
2835 */ 3156 */
2836 case 11: /* report window state */ 3157 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3160 break;
2840 case 13: /* report window position */ 3161 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3167 break;
2847 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3171 break;
2851 case 18: /* report window size (chars) */ 3172 case 18: /* report text area size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2853 break; 3174 break;
2854#if 0 /* XXX: currently disabled due to security concerns */ 3175 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break;
2855 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 {
3181 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3182 XGetIconName (display->display, TermWin.parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3184 }
2858 break; 3185 break;
2859 case 21: /* report window title */ 3186 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 {
3189 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3190 XFetchName (display->display, TermWin.parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3192 }
2862 break; 3193 break;
2863#endif
2864
2865 } 3194 }
2866} 3195}
2867#endif 3196#endif
2868 3197
2869/*----------------------------------------------------------------------*/ 3198/*----------------------------------------------------------------------*/
2870/* 3199/*
2871 * get input up until STRING TERMINATOR (or BEL) 3200 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3201 * ends_how is terminator used. returned input must be free()'d
2873 */ 3202 */
2874unsigned char * 3203unsigned char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3204rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3205{
2877 int seen_esc = 0; /* seen escape? */ 3206 unicode_t prev = 0, ch;
2878 unsigned int n = 0; 3207 unsigned int n = 0;
2879 unsigned char *s; 3208 unsigned char *s;
2880 unsigned char ch, string[STRING_MAX]; 3209 unsigned char string[STRING_MAX];
2881 3210
2882 for (; (ch = cmd_getc ());) 3211 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3212 {
2884 if (ch == C0_BEL
2885 || ch == CHAR_ST
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2887 break;
2888 if (ch == C0_ESC) 3213 if (prev == C0_ESC)
2889 {
2890 seen_esc = 1;
2891 continue;
2892 } 3214 {
2893 else if (ch == '\t') 3215 if (ch == 0x5c) /* 7bit ST */
2894 ch = ' '; /* translate '\t' to space */ 3216 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3217 else
3218 return NULL;
3219 }
3220 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break;
3222 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3224
2897 if (n < sizeof (string) - 1) 3225 if (n >= sizeof (string) - 1)
3226 // stop at some sane length
3227 return NULL;
3228
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
2898 string[n++] = ch; 3235 string[n++] = prev = ch;
2899 seen_esc = 0;
2900 } 3236 }
3237
2901 string[n++] = '\0'; 3238 string[n++] = '\0';
3239
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2903 return NULL; 3241 return NULL;
3242
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3243 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3244 STRNCPY (s, string, n);
2906 return s; 3245 return s;
2907} 3246}
2908 3247
2909/*----------------------------------------------------------------------*/ 3248/*----------------------------------------------------------------------*/
… …
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3251 */
2913void 3252void
2914rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
2915{ 3254{
2916 unsigned char eh, *s; 3255 unsigned char *s;
3256 unicode_t eh;
3257
2917 /* 3258 /*
2918 * Not handled yet 3259 * Not handled yet
2919 */ 3260 */
2920 s = get_to_st (&eh); 3261 s = get_to_st (eh);
2921 if (s) 3262 if (s)
2922 free (s); 3263 free (s);
3264
2923 return; 3265 return;
2924} 3266}
2925 3267
2926/*----------------------------------------------------------------------*/ 3268/*----------------------------------------------------------------------*/
2927/* 3269/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3270 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3271 */
2930void 3272void
2931rxvt_term::process_osc_seq () 3273rxvt_term::process_osc_seq ()
2932{ 3274{
2933 unsigned char ch, eh, *s; 3275 unicode_t ch, eh;
2934 int arg; 3276 int arg;
2935 3277
2936 ch = cmd_getc (); 3278 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
2939 3281
2940 if (ch == ';') 3282 if (ch == ';')
2941 { 3283 {
2942 s = get_to_st (&eh); 3284 unsigned char *s = get_to_st (eh);
3285
2943 if (s) 3286 if (s)
2944 { 3287 {
2945 /*
2946 * rxvt_menubar_dispatch () violates the constness of the string,
2947 * so do it here
2948 */
2949 if (arg == XTerm_Menu)
2950#if 0 /* XXX: currently disabled due to security concerns */
2951 menubar_dispatch ((char *)s);
2952#else
2953 (void)0;
2954#endif
2955 else
2956 xterm_seq (arg, (char *)s, eh); 3288 process_xterm_seq (arg, (char *)s, eh);
2957 free (s); 3289 free (s);
2958 } 3290 }
2959 } 3291 }
2960} 3292}
3293
3294void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{
3297 if (str[0] == '?' && !str[1])
3298 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 }
3306 else
3307 set_window_color (color, str);
3308}
3309
2961/* 3310/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2963 * 0 = change iconName/title 3312 * 0 = change iconName/title
2964 * 1 = change iconName 3313 * 1 = change iconName
2965 * 2 = change title 3314 * 2 = change title
2966 * 4 = change color 3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
2967 * 12 = change text color 3318 * 12 = change text color
2968 * 13 = change mouse foreground color 3319 * 13 = change mouse foreground color
2969 * 17 = change highlight character colour 3320 * 17 = change highlight character colour
2970 * 18 = change bold character color 3321 * 18 = change bold character color
2971 * 19 = change underlined character color 3322 * 19 = change underlined character color
2972 * 46 = change logfile (not implemented) 3323 * 46 = change logfile (not implemented)
2973 * 50 = change font 3324 * 50 = change font
2974 * 3325 *
2975 * rxvt extensions: 3326 * rxvt extensions:
2976 * 10 = menu (may change in future)
2977 * 20 = bg pixmap 3327 * 20 = bg pixmap
2978 * 39 = change default fg color 3328 * 39 = change default fg color
2979 * 49 = change default bg color 3329 * 49 = change default bg color
2980 * 55 = dump scrollback buffer and all of screen 3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
2981 */ 3334 */
2982void 3335void
2983rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2984{ 3337{
2985 int changed = 0; 3338 int changed = 0;
2986 int color; 3339 int color;
2987 char *buf, *name; 3340 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1];
2988 3342
2989 assert (str != NULL); 3343 assert (str != NULL);
2990 switch (op) 3344 switch (op)
2991 { 3345 {
2992 case XTerm_name: 3346 case XTerm_name:
2993 set_title (str); 3347 set_title (str);
2994 /* FALLTHROUGH */ 3348 /* FALLTHROUGH */
2995 case XTerm_iconName: 3349 case XTerm_iconName:
2996 set_iconName (str); 3350 set_icon_name (str);
2997 break; 3351 break;
2998 case XTerm_title: 3352 case XTerm_title:
2999 set_title (str); 3353 set_title (str);
3000 break; 3354 break;
3355 case XTerm_property:
3356 if (str[0] == '?')
3357 {
3358 Atom prop = XInternAtom (display->display, str + 1, True);
3359 Atom actual_type;
3360 int actual_format;
3361 unsigned long nitems;
3362 unsigned long bytes_after;
3363 unsigned char *value = 0;
3364 const char *str = "";
3365
3366 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None
3372 && actual_format == 8)
3373 str = (const char *)(value);
3374
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3376
3377 XFree (value);
3378 }
3379 else
3380 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382
3383 if (eq)
3384 {
3385 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0],
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 }
3391 else
3392 XDeleteProperty (display->display, TermWin.parent[0],
3393 display->atom (str));
3394 }
3395 break;
3396
3001 case XTerm_Color: 3397 case XTerm_Color:
3002 for (buf = (char *)str; buf && *buf;) 3398 for (buf = (char *)str; buf && *buf;)
3003 { 3399 {
3004 if ((name = STRCHR (buf, ';')) == NULL) 3400 if ((name = STRCHR (buf, ';')) == NULL)
3005 break; 3401 break;
3402
3006 *name++ = '\0'; 3403 *name++ = '\0';
3007 color = atoi (buf); 3404 color = atoi (buf);
3405
3008 if (color < 0 || color >= TOTAL_COLORS) 3406 if (color < 0 || color >= TOTAL_COLORS)
3009 break; 3407 break;
3408
3010 if ((buf = STRCHR (name, ';')) != NULL) 3409 if ((buf = STRCHR (name, ';')) != NULL)
3011 *buf++ = '\0'; 3410 *buf++ = '\0';
3411
3412 if (name[0] == '?' && !name[1])
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3012 set_window_color (color + minCOLOR, name); 3422 set_window_color (color + minCOLOR, name);
3013 } 3423 }
3424 break;
3425 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3427 break;
3428 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3014 break; 3430 break;
3015#ifndef NO_CURSORCOLOR 3431#ifndef NO_CURSORCOLOR
3016 case XTerm_Color_cursor: 3432 case XTerm_Color_cursor:
3017 set_window_color (Color_cursor, str); 3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3018 break; 3434 break;
3019#endif 3435#endif
3020 case XTerm_Color_pointer: 3436 case XTerm_Color_pointer_fg:
3021 set_window_color (Color_pointer, str); 3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3438 break;
3439 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3022 break; 3441 break;
3023#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
3024 case XTerm_Color_BD: 3443 case XTerm_Color_BD:
3025 set_window_color (Color_BD, str); 3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3026 break; 3445 break;
3027 case XTerm_Color_UL: 3446 case XTerm_Color_UL:
3028 set_window_color (Color_UL, str); 3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3029 break; 3448 break;
3030 case XTerm_Color_RV: 3449 case XTerm_Color_RV:
3031 set_window_color (Color_RV, str); 3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3032 break; 3451 break;
3033#endif 3452#endif
3034 3453
3035 case XTerm_Menu:
3036 /*
3037 * rxvt_menubar_dispatch () violates the constness of the string,
3038 * so DON'T do it here
3039 */
3040 break;
3041 case XTerm_Pixmap: 3454 case XTerm_Pixmap:
3042 if (*str != ';') 3455 if (*str != ';')
3043 { 3456 {
3044#if XPM_BACKGROUND 3457#if XPM_BACKGROUND
3045 scale_pixmap (""); /* reset to default scaling */ 3458 scale_pixmap (""); /* reset to default scaling */
… …
3068 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3069 break; 3482 break;
3070 case XTerm_restoreBG: 3483 case XTerm_restoreBG:
3071 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3072 break; 3485 break;
3486
3073 case XTerm_logfile: 3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3074 break; 3489 break;
3490
3075 case XTerm_font: 3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3076 change_font (0, str); 3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3077 break; 3535 break;
3536#endif
3078#if 0 3537#if 0
3079 case XTerm_dumpscreen: /* no error notices */ 3538 case XTerm_dumpscreen: /* no error notices */
3080 { 3539 {
3081 int fd; 3540 int fd;
3082 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3083 { 3542 {
3084 scr_dump (fd); 3543 scr_dump (fd);
3085 close (fd); 3544 close (fd);
3086 } 3545 }
3087 } 3546 }
3088 break; 3547 break;
3089#endif 3548#endif
3090
3091 } 3549 }
3092} 3550}
3093/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3094 3552
3095/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3553/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3103 * so no need for fancy checking 3561 * so no need for fancy checking
3104 */ 3562 */
3105int 3563int
3106rxvt_term::privcases (int mode, unsigned long bit) 3564rxvt_term::privcases (int mode, unsigned long bit)
3107{ 3565{
3108 int state; 3566 int state;
3109 3567
3110 if (mode == 's') 3568 if (mode == 's')
3111 { 3569 {
3112 SavedModes |= (PrivateModes & bit); 3570 SavedModes |= (PrivateModes & bit);
3113 return -1; 3571 return -1;
… …
3118 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3119 else 3577 else
3120 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3121 PrivMode (state, bit); 3579 PrivMode (state, bit);
3122 } 3580 }
3581
3123 return state; 3582 return state;
3124} 3583}
3125 3584
3126/* we're not using priv _yet_ */ 3585/* we're not using priv _yet_ */
3127void 3586void
3128rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3129{ 3588{
3130 unsigned int i, j; 3589 unsigned int i, j;
3131 int state; 3590 int state;
3591
3132 static const struct 3592 static const struct
3133 { 3593 {
3134 const int argval; 3594 const int argval;
3135 const unsigned long bit; 3595 const unsigned long bit;
3136 } 3596 }
3597
3137 argtopriv[] = { 3598 argtopriv[] = {
3138 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
3139 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3140 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
3141 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
… …
3147 { menuBar_esc, PrivMode_menuBar }, 3608 { menuBar_esc, PrivMode_menuBar },
3148#endif 3609#endif
3149#ifdef scrollBar_esc 3610#ifdef scrollBar_esc
3150 { scrollBar_esc, PrivMode_scrollBar }, 3611 { scrollBar_esc, PrivMode_scrollBar },
3151#endif 3612#endif
3613 // 18, 19 printing-related
3152 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3153 { 35, PrivMode_ShiftKeys }, 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension
3154 { 40, PrivMode_132OK }, 3617 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI
3620 // 46 start logging
3155 { 47, PrivMode_Screen }, 3621 { 47, PrivMode_Screen },
3156 { 66, PrivMode_aplKP }, 3622 { 66, PrivMode_aplKP },
3157#ifndef NO_BACKSPACE_KEY 3623#ifndef NO_BACKSPACE_KEY
3158 { 67, PrivMode_BackSpace }, 3624 { 67, PrivMode_BackSpace },
3159#endif 3625#endif
3160 { 1000, PrivMode_MouseX11 }, 3626 { 1000, PrivMode_MouseX11 },
3627 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3628 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3629 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3161 { 1010, PrivMode_TtyOutputInh }, 3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3162 { 1011, PrivMode_Keypress }, 3631 { 1011, PrivMode_Keypress }, // rxvt extension
3632 // 1035 enable modifiers for alt, numlock NYI
3633 // 1036 send ESC for meta keys NYI
3634 // 1037 send DEL for keypad delete NYI
3163 { 1047, PrivMode_Screen }, 3635 { 1047, PrivMode_Screen },
3636 // 1048 save and restore cursor
3164 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3637 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3638 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3165 }; 3639 };
3166 3640
3167 if (nargs == 0) 3641 if (nargs == 0)
3168 return; 3642 return;
3169 3643
… …
3184 state = privcases (mode, argtopriv[j].bit); 3658 state = privcases (mode, argtopriv[j].bit);
3185 break; 3659 break;
3186 } 3660 }
3187 3661
3188 /* extra handling for values with state unkept */ 3662 /* extra handling for values with state unkept */
3189 if (state == -1)
3190 switch (arg[i]) 3663 switch (arg[i])
3191 { 3664 {
3192 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
3666 if (Options & Opt_secondaryScreen)
3193 if (mode == 0) 3667 if (mode == 0)
3194 scr_cursor (RESTORE); 3668 scr_cursor (RESTORE);
3195 else if (mode == 1) 3669 else if (mode == 1)
3196 scr_cursor (SAVE); 3670 scr_cursor (SAVE);
3197 /* FALLTHROUGH */
3198 default:
3199 continue; /* for (;i;) */
3200 }
3201
3202 /* extra handling for values with valid 0 or 1 state */
3203 switch (arg[i])
3204 {
3205 /* case 1: - application cursor keys */
3206 case 2: /* VT52 mode */
3207 /* oddball mode. should be set regardless of set/reset
3208 * parameter. Return from VT52 mode with an ESC < from
3209 * within VT52 mode
3210 */
3211 PrivMode (1, PrivMode_vt52);
3212 break; 3671 break;
3672 }
3673
3674 if (state >= 0)
3675 /* extra handling for values with valid 0 or 1 state */
3676 switch (arg[i])
3677 {
3678 /* case 1: - application cursor keys */
3679 case 2: /* VT52 mode */
3680 /* oddball mode. should be set regardless of set/reset
3681 * parameter. Return from VT52 mode with an ESC < from
3682 * within VT52 mode
3683 */
3684 PrivMode (1, PrivMode_vt52);
3685 break;
3213 case 3: /* 80/132 */ 3686 case 3: /* 80/132 */
3214 if (PrivateModes & PrivMode_132OK) 3687 if (PrivateModes & PrivMode_132OK)
3215 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3216 (unsigned int)TermWin.height);
3217 break; 3689 break;
3218 case 4: /* smooth scrolling */ 3690 case 4: /* smooth scrolling */
3219 if (state) 3691 if (state)
3220 Options &= ~Opt_jumpScroll; 3692 Options &= ~Opt_jumpScroll;
3221 else 3693 else
3222 Options |= Opt_jumpScroll; 3694 Options |= Opt_jumpScroll;
3223 break; 3695 break;
3224 case 5: /* reverse video */ 3696 case 5: /* reverse video */
3225 scr_rvideo_mode (state); 3697 scr_rvideo_mode (state);
3226 break; 3698 break;
3227 case 6: /* relative/absolute origins */ 3699 case 6: /* relative/absolute origins */
3228 scr_relative_origin (state); 3700 scr_relative_origin (state);
3229 break; 3701 break;
3230 case 7: /* autowrap */ 3702 case 7: /* autowrap */
3231 scr_autowrap (state); 3703 scr_autowrap (state);
3232 break; 3704 break;
3233 /* case 8: - auto repeat, can't do on a per window basis */ 3705 /* case 8: - auto repeat, can't do on a per window basis */
3234 case 9: /* X10 mouse reporting */ 3706 case 9: /* X10 mouse reporting */
3235 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
3236 PrivateModes &= ~ (PrivMode_MouseX11); 3708 PrivateModes &= ~PrivMode_MouseX11;
3237 break; 3709 break;
3238#ifdef menuBar_esc 3710#ifdef menuBar_esc
3239 case menuBar_esc: 3711 case menuBar_esc:
3240#ifdef MENUBAR 3712#ifdef MENUBAR
3241 map_menuBar (state); 3713 map_menuBar (state);
3242#endif 3714#endif
3243 break; 3715 break;
3244#endif 3716#endif
3245#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3246 case scrollBar_esc: 3718 case scrollBar_esc:
3247 if (scrollbar_mapping (state)) 3719 if (scrollbar_mapping (state))
3248 { 3720 {
3249 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3250 scr_touch (true); 3722 scr_touch (true);
3251 } 3723 }
3252 break; 3724 break;
3253#endif 3725#endif
3254 case 25: /* visible/invisible cursor */ 3726 case 25: /* visible/invisible cursor */
3255 scr_cursor_visible (state); 3727 scr_cursor_visible (state);
3256 break; 3728 break;
3257 /* case 35: - shift keys */ 3729 /* case 35: - shift keys */
3258 /* case 40: - 80 <--> 132 mode */ 3730 /* case 40: - 80 <--> 132 mode */
3259 case 47: /* secondary screen */ 3731 case 47: /* secondary screen */
3260 scr_change_screen (state); 3732 scr_change_screen (state);
3261 break; 3733 break;
3262 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3263 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3264 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3265 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3266 PrivateModes &= ~ (PrivMode_MouseX10); 3738 PrivateModes &= ~PrivMode_MouseX10;
3267 break; 3739 break;
3268#if 0 3740#if 0
3269 case 1001: 3741 case 1001:
3270 break; /* X11 mouse highlighting */ 3742 break; /* X11 mouse highlighting */
3271#endif 3743#endif
3272 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3273 if (state) 3745 if (state)
3274 Options &= ~Opt_scrollTtyOutput; 3746 Options &= ~Opt_scrollTtyOutput;
3275 else 3747 else
3276 Options |= Opt_scrollTtyOutput; 3748 Options |= Opt_scrollTtyOutput;
3277 break; 3749 break;
3278 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3279 if (state) 3751 if (state)
3280 Options |= Opt_scrollTtyKeypress; 3752 Options |= Opt_scrollTtyKeypress;
3281 else 3753 else
3282 Options &= ~Opt_scrollTtyKeypress; 3754 Options &= ~Opt_scrollTtyKeypress;
3283 break; 3755 break;
3284 case 1047: /* secondary screen w/ clearing */ 3756 case 1047: /* secondary screen w/ clearing last */
3285 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3757 if (Options & Opt_secondaryScreen)
3286 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
3287 scr_erase_screen (2); 3759 scr_erase_screen (2);
3288 scr_change_screen (state); 3760 scr_change_screen (state);
3289 /* FALLTHROUGH */
3290 default:
3291 break; 3761 break;
3762 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY)
3766 scr_erase_screen (2);
3767 break;
3768 default:
3769 break;
3292 } 3770 }
3293 } 3771 }
3294} 3772}
3295/*}}} */ 3773/*}}} */
3296 3774
3297/*{{{ process sgr sequences */ 3775/*{{{ process sgr sequences */
3298void 3776void
3299rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3777rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3300{ 3778{
3301 unsigned int i; 3779 unsigned int i;
3302 short rendset; 3780 short rendset;
3303 int rendstyle; 3781 int rendstyle;
3304 3782
3305 if (nargs == 0) 3783 if (nargs == 0)
3306 { 3784 {
3307 scr_rendition (0, ~RS_None); 3785 scr_rendition (0, ~RS_None);
3308 return; 3786 return;
3309 } 3787 }
3788
3310 for (i = 0; i < nargs; i++) 3789 for (i = 0; i < nargs; i++)
3311 { 3790 {
3312 rendset = -1; 3791 rendset = -1;
3313 switch (arg[i]) 3792 switch (arg[i])
3314 { 3793 {
… …
3316 rendset = 0, rendstyle = ~RS_None; 3795 rendset = 0, rendstyle = ~RS_None;
3317 break; 3796 break;
3318 case 1: 3797 case 1:
3319 rendset = 1, rendstyle = RS_Bold; 3798 rendset = 1, rendstyle = RS_Bold;
3320 break; 3799 break;
3800 //case 2: // faint or second colour
3321 case 4: 3801 case 4:
3322 rendset = 1, rendstyle = RS_Uline; 3802 rendset = 1, rendstyle = RS_Uline;
3323 break; 3803 break;
3324 case 5: 3804 case 5: // slowly blinking
3805 case 6: // rapidly blinking
3325 rendset = 1, rendstyle = RS_Blink; 3806 rendset = 1, rendstyle = RS_Blink;
3326 break; 3807 break;
3808 //case 6: // scoansi light background
3327 case 7: 3809 case 7:
3328 rendset = 1, rendstyle = RS_RVid; 3810 rendset = 1, rendstyle = RS_RVid;
3811 break;
3812 case 8:
3813 // invisible. NYI
3814 break;
3815 //case 9: // crossed out
3816 //case 10: // scoansi acs off, primary font
3817 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font
3819 //...
3820 //case 19: // ninth alt font
3821 //case 20: // gothic
3822 case 21: // disable bold, faint
3823 rendset = 0, rendstyle = RS_Bold;
3329 break; 3824 break;
3330 case 22: 3825 case 22:
3331 rendset = 0, rendstyle = RS_Bold; 3826 rendset = 0, rendstyle = RS_Bold;
3332 break; 3827 break;
3828 //case 23: disable italic
3333 case 24: 3829 case 24:
3334 rendset = 0, rendstyle = RS_Uline; 3830 rendset = 0, rendstyle = RS_Uline;
3335 break; 3831 break;
3336 case 25: 3832 case 25:
3337 rendset = 0, rendstyle = RS_Blink; 3833 rendset = 0, rendstyle = RS_Blink;
3338 break; 3834 break;
3339 case 27: 3835 case 27:
3340 rendset = 0, rendstyle = RS_RVid; 3836 rendset = 0, rendstyle = RS_RVid;
3341 break; 3837 break;
3838 //case 28: // visible. NYI
3839 //case 29: // not crossed-out
3342 } 3840 }
3841
3343 if (rendset != -1) 3842 if (rendset != -1)
3344 { 3843 {
3345 scr_rendition (rendset, rendstyle); 3844 scr_rendition (rendset, rendstyle);
3346 continue; /* for (;i;) */ 3845 continue; /* for (;i;) */
3347 } 3846 }
… …
3354 case 33: 3853 case 33:
3355 case 34: 3854 case 34:
3356 case 35: 3855 case 35:
3357 case 36: 3856 case 36:
3358 case 37: 3857 case 37:
3359 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3360 Color_fg);
3361 break; 3859 break;
3362#ifdef TTY_256COLOR 3860#ifdef TTY_256COLOR
3363 case 38: 3861 case 38:
3364 if (nargs > i + 2 && arg[i + 1] == 5) 3862 if (nargs > i + 2 && arg[i + 1] == 5)
3365 { 3863 {
3366 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3367 Color_fg);
3368 i += 2; 3865 i += 2;
3369 } 3866 }
3370 break; 3867 break;
3371#endif 3868#endif
3372 case 39: /* default fg */ 3869 case 39: /* default fg */
… …
3379 case 43: 3876 case 43:
3380 case 44: 3877 case 44:
3381 case 45: 3878 case 45:
3382 case 46: 3879 case 46:
3383 case 47: 3880 case 47:
3384 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3385 Color_bg);
3386 break; 3882 break;
3387#ifdef TTY_256COLOR 3883#ifdef TTY_256COLOR
3388 case 48: 3884 case 48:
3389 if (nargs > i + 2 && arg[i + 1] == 5) 3885 if (nargs > i + 2 && arg[i + 1] == 5)
3390 { 3886 {
3391 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3392 Color_bg);
3393 i += 2; 3888 i += 2;
3394 } 3889 }
3395 break; 3890 break;
3396#endif 3891#endif
3397 case 49: /* default bg */ 3892 case 49: /* default bg */
… …
3426 } 3921 }
3427 } 3922 }
3428} 3923}
3429/*}}} */ 3924/*}}} */
3430 3925
3431/*{{{ process Rob Nation's own graphics mode sequences */ 3926/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3432void 3927void
3433rxvt_term::process_graphics () 3928rxvt_term::process_graphics ()
3434{ 3929{
3435 unsigned char ch, cmd = cmd_getc (); 3930 unicode_t ch, cmd = cmd_getc ();
3436 3931
3437 if (cmd == 'Q') 3932 if (cmd == 'Q')
3438 { /* query graphics */ 3933 { /* query graphics */
3439 tt_printf ("\033G0\n"); /* no graphics */ 3934 tt_printf ("\033G0\n"); /* no graphics */
3440 return; 3935 return;

Diff Legend

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