1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: command.c |
2 | * File: command.c |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * $Id: command.C,v 1.7 2003/11/25 17:34:47 pcg Exp $ |
4 | * $Id: command.C,v 1.24 2003/12/19 06:17:03 pcg Exp $ |
5 | * |
5 | * |
6 | * All portions of code are copyright by their respective author/s. |
6 | * All portions of code are copyright by their respective author/s. |
7 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
7 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
8 | * - original version |
8 | * - original version |
9 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
9 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
… | |
… | |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" /* NECESSARY */ |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" /* NECESSARY */ |
50 | #include "version.h" |
50 | #include "version.h" |
51 | #include "command.h" |
51 | #include "command.h" |
52 | |
52 | |
|
|
53 | #include <wchar.h> |
|
|
54 | |
53 | /*----------------------------------------------------------------------*/ |
55 | /*----------------------------------------------------------------------*/ |
54 | |
56 | |
55 | /*{{{ Convert the keypress event into a string */ |
57 | /*{{{ Convert the keypress event into a string */ |
56 | /* INTPROTO */ |
58 | /* INTPROTO */ |
57 | void |
59 | void |
… | |
… | |
61 | unsigned int newlen; |
63 | unsigned int newlen; |
62 | KeySym keysym; |
64 | KeySym keysym; |
63 | #ifdef DEBUG_CMD |
65 | #ifdef DEBUG_CMD |
64 | static int debug_key = 1; /* accessible by a debugger only */ |
66 | static int debug_key = 1; /* accessible by a debugger only */ |
65 | #endif |
67 | #endif |
66 | #ifdef USE_XIM |
|
|
67 | int valid_keysym; |
68 | int valid_keysym; |
68 | #endif |
|
|
69 | unsigned char *kbuf = R->kbuf; |
69 | unsigned char *kbuf = R->kbuf; |
70 | |
70 | |
71 | /* |
71 | /* |
72 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
72 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
73 | * escape sequence to toggle the Keypad. |
73 | * escape sequence to toggle the Keypad. |
… | |
… | |
75 | * Always permit `shift' to override the current setting |
75 | * Always permit `shift' to override the current setting |
76 | */ |
76 | */ |
77 | shft = (ev->state & ShiftMask); |
77 | shft = (ev->state & ShiftMask); |
78 | ctrl = (ev->state & ControlMask); |
78 | ctrl = (ev->state & ControlMask); |
79 | meta = (ev->state & R->ModMetaMask); |
79 | meta = (ev->state & R->ModMetaMask); |
|
|
80 | |
80 | if (R->numlock_state || (ev->state & R->ModNumLockMask)) { |
81 | if (R->numlock_state || (ev->state & R->ModNumLockMask)) |
|
|
82 | { |
81 | R->numlock_state = (ev->state & R->ModNumLockMask); |
83 | R->numlock_state = (ev->state & R->ModNumLockMask); |
82 | PrivMode((!R->numlock_state), PrivMode_aplKP); |
84 | PrivMode((!R->numlock_state), PrivMode_aplKP); |
83 | } |
85 | } |
|
|
86 | |
|
|
87 | kbuf[0] = 0; |
|
|
88 | |
84 | #ifdef USE_XIM |
89 | #ifdef USE_XIM |
85 | if (R->Input_Context != NULL) { |
90 | if (R->Input_Context) |
|
|
91 | { |
86 | Status status_return; |
92 | Status status_return; |
87 | |
93 | |
88 | kbuf[0] = '\0'; |
|
|
89 | #ifdef X_HAVE_UTF8_STRING |
94 | #ifdef X_HAVE_UTF8_STRING |
|
|
95 | if (R->enc_utf8 && 0) |
90 | len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, |
96 | len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, |
91 | KBUFSZ, &keysym, &status_return); |
97 | KBUFSZ, &keysym, &status_return); |
92 | #else |
98 | else |
|
|
99 | #endif |
|
|
100 | { |
|
|
101 | wchar_t wkbuf[KBUFSZ + 1]; |
|
|
102 | |
|
|
103 | // the XOpenIM manpage lies about hardcoding the locale |
|
|
104 | // at the point of XOpenIM, so temporarily switch locales |
|
|
105 | if (R->rs[Rs_imLocale]) |
|
|
106 | SET_LOCALE (R->rs[Rs_imLocale]); |
|
|
107 | // assume wchar_t == unicode or better |
93 | len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, |
108 | len = XwcLookupString (R->Input_Context, ev, wkbuf, |
94 | KBUFSZ, &keysym, &status_return); |
109 | KBUFSZ, &keysym, &status_return); |
95 | #endif |
110 | if (R->rs[Rs_imLocale]) |
|
|
111 | SET_LOCALE (R->locale); |
|
|
112 | |
|
|
113 | if (status_return == XLookupChars |
|
|
114 | || status_return == XLookupBoth) |
|
|
115 | { |
|
|
116 | wkbuf[len] = 0; |
|
|
117 | len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); |
|
|
118 | if (len < 0) |
|
|
119 | len = 0; |
|
|
120 | } |
|
|
121 | else |
|
|
122 | len = 0; |
|
|
123 | } |
|
|
124 | |
96 | valid_keysym = ((status_return == XLookupKeySym) |
125 | valid_keysym = status_return == XLookupKeySym |
97 | || (status_return == XLookupBoth)); |
126 | || status_return == XLookupBoth; |
|
|
127 | } |
98 | } else { |
128 | else |
|
|
129 | #endif |
|
|
130 | { |
99 | len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, |
131 | len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); |
100 | &R->compose); |
|
|
101 | valid_keysym = 1; |
132 | valid_keysym = !len; |
102 | } |
133 | } |
103 | #else /* USE_XIM */ |
|
|
104 | len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, |
|
|
105 | &R->compose); |
|
|
106 | /* |
|
|
107 | * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1 |
|
|
108 | * good for installations with correct fonts, but without XLOCALE |
|
|
109 | */ |
|
|
110 | if (!len) { |
|
|
111 | if ((keysym >= 0x0100) && (keysym < 0x0800)) { |
|
|
112 | kbuf[0] = (keysym & 0xFF); |
|
|
113 | kbuf[1] = '\0'; |
|
|
114 | len = 1; |
|
|
115 | } else |
|
|
116 | kbuf[0] = '\0'; |
|
|
117 | } |
|
|
118 | #endif /* USE_XIM */ |
|
|
119 | |
134 | |
120 | #ifdef USE_XIM |
|
|
121 | if (valid_keysym) |
135 | if (valid_keysym) |
122 | #endif |
|
|
123 | { |
136 | { |
124 | /* for some backwards compatibility */ |
137 | /* for some backwards compatibility */ |
125 | #if defined(HOTKEY_CTRL) || defined(HOTKEY_META) |
138 | #if defined(HOTKEY_CTRL) || defined(HOTKEY_META) |
126 | # ifdef HOTKEY_CTRL |
139 | # ifdef HOTKEY_CTRL |
127 | if (ctrl) { |
140 | if (ctrl) |
128 | # else |
141 | # else |
129 | if (meta) { |
142 | if (meta) |
130 | # endif |
143 | # endif |
|
|
144 | { |
131 | if (keysym == R->ks_bigfont) { |
145 | if (keysym == R->ks_bigfont) |
|
|
146 | { |
132 | rxvt_change_font(aR_ 0, FONT_UP); |
147 | rxvt_change_font(aR_ 0, FONT_UP); |
133 | return; |
148 | return; |
|
|
149 | } |
134 | } else if (keysym == R->ks_smallfont) { |
150 | else if (keysym == R->ks_smallfont) |
|
|
151 | { |
135 | rxvt_change_font(aR_ 0, FONT_DN); |
152 | rxvt_change_font(aR_ 0, FONT_DN); |
136 | return; |
153 | return; |
137 | } |
154 | } |
138 | } |
155 | } |
139 | #endif |
156 | #endif |
140 | |
157 | |
141 | if (R->TermWin.saveLines) { |
158 | if (R->TermWin.saveLines) { |
142 | #ifdef UNSHIFTED_SCROLLKEYS |
159 | #ifdef UNSHIFTED_SCROLLKEYS |
143 | if (!ctrl && !meta) { |
160 | if (!ctrl && !meta) { |
… | |
… | |
237 | /* escape prefix */ |
254 | /* escape prefix */ |
238 | if (meta) |
255 | if (meta) |
239 | # ifdef META8_OPTION |
256 | # ifdef META8_OPTION |
240 | if (R->meta_char == C0_ESC) |
257 | if (R->meta_char == C0_ESC) |
241 | # endif |
258 | # endif |
242 | rxvt_tt_write(aR_ &ch, 1); |
259 | R->tt_write (&ch, 1); |
243 | rxvt_tt_write(aR_ kbuf0, l); |
260 | R->tt_write (kbuf0, l); |
244 | return; |
261 | return; |
245 | } else |
262 | } else |
246 | #endif |
263 | #endif |
247 | { |
264 | { |
248 | newlen = 1; |
265 | newlen = 1; |
… | |
… | |
572 | if (R->greek_mode) |
589 | if (R->greek_mode) |
573 | len = greek_xlat(kbuf, len); |
590 | len = greek_xlat(kbuf, len); |
574 | #endif |
591 | #endif |
575 | /* nil */ ; |
592 | /* nil */ ; |
576 | } |
593 | } |
577 | } |
594 | } |
578 | |
595 | |
579 | if (len <= 0) |
596 | if (len <= 0) |
580 | return; /* not mapped */ |
597 | return; /* not mapped */ |
581 | |
598 | |
582 | if (R->Options & Opt_scrollTtyKeypress) |
599 | if (R->Options & Opt_scrollTtyKeypress) |
… | |
… | |
605 | && (R->meta_char == C0_ESC) |
622 | && (R->meta_char == C0_ESC) |
606 | #endif |
623 | #endif |
607 | ) { |
624 | ) { |
608 | const unsigned char ch = C0_ESC; |
625 | const unsigned char ch = C0_ESC; |
609 | |
626 | |
610 | rxvt_tt_write(aR_ &ch, 1); |
627 | R->tt_write(&ch, 1); |
611 | } |
628 | } |
612 | #ifdef DEBUG_CMD |
629 | #ifdef DEBUG_CMD |
613 | if (debug_key) { /* Display keyboard buffer contents */ |
630 | if (debug_key) { /* Display keyboard buffer contents */ |
614 | char *p; |
631 | char *p; |
615 | int i; |
632 | int i; |
… | |
… | |
618 | for (i = 0, p = kbuf; i < len; i++, p++) |
635 | for (i = 0, p = kbuf; i < len; i++, p++) |
619 | fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
636 | fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
620 | fprintf(stderr, "'\n"); |
637 | fprintf(stderr, "'\n"); |
621 | } |
638 | } |
622 | #endif /* DEBUG_CMD */ |
639 | #endif /* DEBUG_CMD */ |
623 | rxvt_tt_write(aR_ kbuf, (unsigned int)len); |
640 | R->tt_write (kbuf, (unsigned int)len); |
624 | } |
641 | } |
625 | /*}}} */ |
642 | /*}}} */ |
626 | |
643 | |
627 | #if (MENUBAR_MAX) |
644 | #if (MENUBAR_MAX) |
628 | /*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ |
645 | /*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ |
… | |
… | |
654 | R->cmdbuf_ptr = cmdbuf_ptr; |
671 | R->cmdbuf_ptr = cmdbuf_ptr; |
655 | R->cmdbuf_endp = cmdbuf_endp; |
672 | R->cmdbuf_endp = cmdbuf_endp; |
656 | return 0; |
673 | return 0; |
657 | } |
674 | } |
658 | #endif /* MENUBAR_MAX */ |
675 | #endif /* MENUBAR_MAX */ |
|
|
676 | |
|
|
677 | void |
|
|
678 | rxvt_term::flush () |
|
|
679 | { |
|
|
680 | #ifdef TRANSPARENT |
|
|
681 | if (want_full_refresh) |
|
|
682 | { |
|
|
683 | want_full_refresh = 0; |
|
|
684 | scr_clear (); |
|
|
685 | scr_touch (false); |
|
|
686 | want_refresh = 1; |
|
|
687 | } |
|
|
688 | #endif |
|
|
689 | |
|
|
690 | if (want_refresh) |
|
|
691 | { |
|
|
692 | scr_refresh (refresh_type); |
|
|
693 | rxvt_scrollbar_show (this, 1); |
|
|
694 | #ifdef USE_XIM |
|
|
695 | rxvt_IMSendSpot (this); |
|
|
696 | #endif |
|
|
697 | } |
|
|
698 | |
|
|
699 | XFlush (Xdisplay); |
|
|
700 | } |
|
|
701 | |
|
|
702 | void |
|
|
703 | rxvt_term::check_cb (check_watcher &w) |
|
|
704 | { |
|
|
705 | SET_R (this); |
|
|
706 | SET_LOCALE (locale); |
|
|
707 | |
|
|
708 | flush (); |
|
|
709 | } |
659 | |
710 | |
660 | void |
711 | void |
661 | rxvt_term::process_x_events () |
712 | rxvt_term::process_x_events () |
662 | { |
713 | { |
663 | do |
714 | do |
… | |
… | |
707 | rxvt_term::blink_cb (time_watcher &w) |
758 | rxvt_term::blink_cb (time_watcher &w) |
708 | { |
759 | { |
709 | w.at += BLINK_INTERVAL; |
760 | w.at += BLINK_INTERVAL; |
710 | hidden_cursor = !hidden_cursor; |
761 | hidden_cursor = !hidden_cursor; |
711 | want_refresh = 1; |
762 | want_refresh = 1; |
712 | flush(); |
|
|
713 | } |
763 | } |
714 | |
764 | |
715 | void |
765 | void |
716 | rxvt_term::x_cb (io_watcher &w, short revents) |
766 | rxvt_term::x_cb (io_watcher &w, short revents) |
717 | { |
767 | { |
|
|
768 | SET_R (this); |
|
|
769 | SET_LOCALE (locale); |
|
|
770 | |
718 | process_x_events (); |
771 | process_x_events (); |
|
|
772 | } |
719 | |
773 | |
720 | flush (); |
774 | bool |
|
|
775 | rxvt_term::pty_fill () |
|
|
776 | { |
|
|
777 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
|
|
778 | |
|
|
779 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
|
|
780 | cmdbuf_ptr = cmdbuf_base; |
|
|
781 | cmdbuf_endp = cmdbuf_ptr + n; |
|
|
782 | |
|
|
783 | n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); |
|
|
784 | |
|
|
785 | if (n > 0) |
|
|
786 | { |
|
|
787 | cmdbuf_endp += n; |
|
|
788 | return true; |
|
|
789 | } |
|
|
790 | else if (n < 0 && errno != EAGAIN) |
|
|
791 | destroy (); |
|
|
792 | |
|
|
793 | return false; |
|
|
794 | } |
|
|
795 | |
|
|
796 | void |
|
|
797 | rxvt_term::pty_cb (io_watcher &w, short revents) |
|
|
798 | { |
|
|
799 | SET_R (this); |
|
|
800 | SET_LOCALE (locale); |
|
|
801 | |
|
|
802 | if (revents & EVENT_WRITE) |
|
|
803 | tt_write (0, 0); |
|
|
804 | else if (revents & EVENT_READ) |
|
|
805 | { |
|
|
806 | bool flag = true; |
|
|
807 | |
|
|
808 | // loop, but don't allow a single term to monopolize us |
|
|
809 | // the number of loops is fully arbitrary, and thus wrong |
|
|
810 | while (flag && pty_fill ()) |
|
|
811 | { |
|
|
812 | if (!seen_input) |
|
|
813 | { |
|
|
814 | seen_input = 1; |
|
|
815 | /* once we know the shell is running, send the screen size. Again! */ |
|
|
816 | tt_winch (); |
|
|
817 | } |
|
|
818 | |
|
|
819 | uint32_t ch = NOCHAR; |
|
|
820 | |
|
|
821 | for (;;) |
|
|
822 | { |
|
|
823 | if (ch == NOCHAR) |
|
|
824 | ch = next_char (); |
|
|
825 | |
|
|
826 | if (ch == NOCHAR) // TODO: improve |
|
|
827 | break; |
|
|
828 | |
|
|
829 | if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') |
|
|
830 | { |
|
|
831 | /* Read a text string from the input buffer */ |
|
|
832 | uint32_t buf[BUFSIZ]; |
|
|
833 | bool refreshnow = false; |
|
|
834 | int nlines = 0; |
|
|
835 | uint32_t *str = buf; |
|
|
836 | |
|
|
837 | *str++ = ch; |
|
|
838 | |
|
|
839 | for (;;) |
|
|
840 | { |
|
|
841 | ch = next_char (); |
|
|
842 | |
|
|
843 | if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) |
|
|
844 | break; |
|
|
845 | else |
|
|
846 | { |
|
|
847 | *str++ = ch; |
|
|
848 | |
|
|
849 | if (ch == '\n') |
|
|
850 | { |
|
|
851 | nlines++; |
|
|
852 | refresh_count++; |
|
|
853 | |
|
|
854 | if (!(Options & Opt_jumpScroll) |
|
|
855 | || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) |
|
|
856 | { |
|
|
857 | refreshnow = true; |
|
|
858 | flag = false; |
|
|
859 | ch = NOCHAR; |
|
|
860 | break; |
|
|
861 | } |
|
|
862 | } |
|
|
863 | |
|
|
864 | if (str >= buf + BUFSIZ) |
|
|
865 | { |
|
|
866 | ch = NOCHAR; |
|
|
867 | break; |
|
|
868 | } |
|
|
869 | } |
|
|
870 | } |
|
|
871 | |
|
|
872 | rxvt_scr_add_lines (this, buf, nlines, str - buf); |
|
|
873 | |
|
|
874 | /* |
|
|
875 | * If there have been a lot of new lines, then update the screen |
|
|
876 | * What the heck I'll cheat and only refresh less than every page-full. |
|
|
877 | * the number of pages between refreshes is refresh_limit, which |
|
|
878 | * is incremented here because we must be doing flat-out scrolling. |
|
|
879 | * |
|
|
880 | * refreshing should be correct for small scrolls, because of the |
|
|
881 | * time-out |
|
|
882 | */ |
|
|
883 | if (refreshnow) |
|
|
884 | { |
|
|
885 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
|
|
886 | refresh_limit++; |
|
|
887 | |
|
|
888 | scr_refresh (refresh_type); |
|
|
889 | } |
|
|
890 | |
|
|
891 | } |
|
|
892 | else |
|
|
893 | { |
|
|
894 | switch (ch) |
|
|
895 | { |
|
|
896 | default: |
|
|
897 | rxvt_process_nonprinting (this, ch); |
|
|
898 | break; |
|
|
899 | case C0_ESC: /* escape char */ |
|
|
900 | rxvt_process_escape_seq (this); |
|
|
901 | break; |
|
|
902 | /*case 0x9b: */ /* CSI */ |
|
|
903 | /* rxvt_process_csi_seq (this); */ |
|
|
904 | } |
|
|
905 | |
|
|
906 | ch = NOCHAR; |
|
|
907 | } |
|
|
908 | } |
|
|
909 | } |
|
|
910 | } |
721 | } |
911 | } |
722 | |
912 | |
723 | // read the next character, currently handles UTF-8 |
913 | // read the next character, currently handles UTF-8 |
724 | // will probably handle all sorts of other stuff in the future |
914 | // will probably handle all sorts of other stuff in the future |
725 | uint32_t |
915 | uint32_t |
726 | rxvt_term::next_char () |
916 | rxvt_term::next_char () |
727 | { |
917 | { |
728 | struct mbstate &s = mbstate; |
|
|
729 | |
|
|
730 | while (cmdbuf_ptr < cmdbuf_endp) |
918 | while (cmdbuf_ptr < cmdbuf_endp) |
731 | { |
919 | { |
732 | uint8_t ch = *cmdbuf_ptr; |
920 | if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh |
733 | |
|
|
734 | if (s.cnt) |
|
|
735 | { |
|
|
736 | if ((ch & 0xc0) == 0x80) |
|
|
737 | { |
|
|
738 | cmdbuf_ptr++; |
|
|
739 | |
|
|
740 | /* continuation */ |
|
|
741 | s.reg = (s.reg << 6) | (ch & 0x7f); |
|
|
742 | |
|
|
743 | if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */ |
|
|
744 | return s.reg; |
|
|
745 | |
|
|
746 | continue; |
|
|
747 | } |
|
|
748 | else |
|
|
749 | { |
|
|
750 | s.cnt = 0; |
|
|
751 | return s.orig; /* the _occasional_ non-utf-8 character may slip through... */ |
|
|
752 | } |
|
|
753 | } |
|
|
754 | |
|
|
755 | if ((ch & 0xc0) == 0xc0) |
|
|
756 | { |
|
|
757 | cmdbuf_ptr++; |
921 | return *cmdbuf_ptr++; |
758 | |
922 | |
759 | /* first byte */ |
923 | wchar_t wc; |
760 | s.orig = ch; /* for broken encodings */ |
924 | int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); |
761 | s.reg = ch; |
925 | |
762 | if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } |
926 | if (len == (size_t)-2) |
763 | if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } |
927 | return NOCHAR; |
764 | if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } |
928 | |
765 | if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } |
929 | if (len == (size_t)-1) |
766 | if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } |
930 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
767 | } |
931 | |
768 | else |
932 | // assume wchar == unicode |
769 | { |
933 | cmdbuf_ptr += len; |
770 | cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ |
|
|
771 | return ch; |
934 | return wc; |
772 | } |
|
|
773 | } |
935 | } |
774 | |
936 | |
775 | return NOCHAR; |
937 | return NOCHAR; |
776 | } |
|
|
777 | |
|
|
778 | bool |
|
|
779 | rxvt_term::pty_fill (size_t count) |
|
|
780 | { |
|
|
781 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
|
|
782 | |
|
|
783 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
|
|
784 | cmdbuf_ptr = cmdbuf_base; |
|
|
785 | cmdbuf_endp = cmdbuf_ptr + n; |
|
|
786 | |
|
|
787 | n = read (cmd_fd, cmdbuf_endp, count); |
|
|
788 | |
|
|
789 | if (n > 0) |
|
|
790 | { |
|
|
791 | cmdbuf_endp += n; |
|
|
792 | return true; |
|
|
793 | } |
|
|
794 | else if (n < 0 && errno == EAGAIN) |
|
|
795 | return false; |
|
|
796 | |
|
|
797 | rxvt_clean_exit(); |
|
|
798 | exit(EXIT_FAILURE); /* bad order of events? */ |
|
|
799 | } |
|
|
800 | |
|
|
801 | void |
|
|
802 | rxvt_term::pty_cb (io_watcher &w, short revents) |
|
|
803 | { |
|
|
804 | while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr))) |
|
|
805 | { |
|
|
806 | /* once we know the shell is running, send the screen size. Again! */ |
|
|
807 | //ch = rxvt_cmd_getc(aR); /* wait for something */ |
|
|
808 | //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid); |
|
|
809 | |
|
|
810 | uint32_t ch = NOCHAR; |
|
|
811 | |
|
|
812 | for (;;) |
|
|
813 | { |
|
|
814 | if (ch == NOCHAR) |
|
|
815 | ch = next_char (); |
|
|
816 | |
|
|
817 | if (ch == NOCHAR) // TODO: improve |
|
|
818 | break; |
|
|
819 | |
|
|
820 | if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') |
|
|
821 | { |
|
|
822 | /* Read a text string from the input buffer */ |
|
|
823 | uint32_t buf[BUFSIZ]; |
|
|
824 | bool refreshnow = false; |
|
|
825 | int nlines = 0; |
|
|
826 | uint32_t *str = buf; |
|
|
827 | |
|
|
828 | *str++ = ch; |
|
|
829 | |
|
|
830 | for (;;) |
|
|
831 | { |
|
|
832 | ch = next_char (); |
|
|
833 | |
|
|
834 | if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) |
|
|
835 | break; |
|
|
836 | else |
|
|
837 | { |
|
|
838 | *str++ = ch; |
|
|
839 | |
|
|
840 | if (ch == '\n') |
|
|
841 | { |
|
|
842 | nlines++; |
|
|
843 | refresh_count++; |
|
|
844 | |
|
|
845 | if (!(Options & Opt_jumpScroll) |
|
|
846 | || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) |
|
|
847 | { |
|
|
848 | refreshnow = true; |
|
|
849 | ch = NOCHAR; |
|
|
850 | break; |
|
|
851 | } |
|
|
852 | } |
|
|
853 | |
|
|
854 | if (str >= buf + BUFSIZ) |
|
|
855 | { |
|
|
856 | ch = NOCHAR; |
|
|
857 | break; |
|
|
858 | } |
|
|
859 | } |
|
|
860 | } |
|
|
861 | |
|
|
862 | rxvt_scr_add_lines (this, buf, nlines, str - buf); |
|
|
863 | |
|
|
864 | /* |
|
|
865 | * If there have been a lot of new lines, then update the screen |
|
|
866 | * What the heck I'll cheat and only refresh less than every page-full. |
|
|
867 | * the number of pages between refreshes is refresh_limit, which |
|
|
868 | * is incremented here because we must be doing flat-out scrolling. |
|
|
869 | * |
|
|
870 | * refreshing should be correct for small scrolls, because of the |
|
|
871 | * time-out |
|
|
872 | */ |
|
|
873 | if (refreshnow) |
|
|
874 | { |
|
|
875 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
|
|
876 | refresh_limit++; |
|
|
877 | |
|
|
878 | rxvt_scr_refresh (this, refresh_type); |
|
|
879 | } |
|
|
880 | |
|
|
881 | } |
|
|
882 | else |
|
|
883 | { |
|
|
884 | switch (ch) |
|
|
885 | { |
|
|
886 | default: |
|
|
887 | rxvt_process_nonprinting (this, ch); |
|
|
888 | break; |
|
|
889 | case C0_ESC: /* escape char */ |
|
|
890 | rxvt_process_escape_seq (this); |
|
|
891 | break; |
|
|
892 | /*case 0x9b: */ /* CSI */ |
|
|
893 | /* rxvt_process_csi_seq (this); */ |
|
|
894 | } |
|
|
895 | |
|
|
896 | ch = NOCHAR; |
|
|
897 | } |
|
|
898 | } |
|
|
899 | } |
|
|
900 | |
|
|
901 | flush (); |
|
|
902 | } |
|
|
903 | |
|
|
904 | void |
|
|
905 | rxvt_term::flush () |
|
|
906 | { |
|
|
907 | #ifdef TRANSPARENT |
|
|
908 | if (want_full_refresh) |
|
|
909 | { |
|
|
910 | want_full_refresh = 0; |
|
|
911 | rxvt_scr_clear (this); |
|
|
912 | rxvt_scr_touch (this, False); |
|
|
913 | want_refresh = 1; |
|
|
914 | } |
|
|
915 | #endif |
|
|
916 | |
|
|
917 | if (want_refresh) |
|
|
918 | { |
|
|
919 | rxvt_scr_refresh (this, refresh_type); |
|
|
920 | rxvt_scrollbar_show (this, 1); |
|
|
921 | #ifdef USE_XIM |
|
|
922 | rxvt_IMSendSpot (this); |
|
|
923 | #endif |
|
|
924 | } |
|
|
925 | |
|
|
926 | XFlush (Xdisplay); |
|
|
927 | } |
938 | } |
928 | |
939 | |
929 | /* rxvt_cmd_getc() - Return next input character */ |
940 | /* rxvt_cmd_getc() - Return next input character */ |
930 | /* |
941 | /* |
931 | * Return the next input character after first passing any keyboard input |
942 | * Return the next input character after first passing any keyboard input |
… | |
… | |
942 | return c; |
953 | return c; |
943 | |
954 | |
944 | // incomplete sequences should occur rarely, still, a better solution |
955 | // incomplete sequences should occur rarely, still, a better solution |
945 | // would be preferred. either setjmp/longjmp or better design. |
956 | // would be preferred. either setjmp/longjmp or better design. |
946 | fcntl (R->cmd_fd, F_SETFL, 0); |
957 | fcntl (R->cmd_fd, F_SETFL, 0); |
947 | R->pty_fill (1); |
958 | R->pty_fill (); |
948 | fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); |
959 | fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); |
949 | } |
960 | } |
950 | |
961 | |
951 | #if 0 |
962 | #if 0 |
952 | #define TIMEOUT_USEC 5000 |
963 | #define TIMEOUT_USEC 5000 |
… | |
… | |
960 | |
971 | |
961 | for (;;) { |
972 | for (;;) { |
962 | /* loop until we can return something */ |
973 | /* loop until we can return something */ |
963 | |
974 | |
964 | if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ |
975 | if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ |
965 | rxvt_tt_write(aR_ NULL, 0); |
976 | R->tt_write(NULL, 0); |
966 | |
977 | |
967 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
978 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
968 | if (R->mouse_slip_wheel_speed) { |
979 | if (R->mouse_slip_wheel_speed) { |
969 | quick_timeout = 1; |
980 | quick_timeout = 1; |
970 | if (!R->mouse_slip_wheel_delay-- |
981 | if (!R->mouse_slip_wheel_delay-- |
… | |
… | |
980 | if (R->pending_scroll_selection) { |
991 | if (R->pending_scroll_selection) { |
981 | quick_timeout = 1; |
992 | quick_timeout = 1; |
982 | if (!R->scroll_selection_delay-- |
993 | if (!R->scroll_selection_delay-- |
983 | && rxvt_scr_page(aR_ R->scroll_selection_dir, |
994 | && rxvt_scr_page(aR_ R->scroll_selection_dir, |
984 | R->scroll_selection_lines)) { |
995 | R->scroll_selection_lines)) { |
985 | rxvt_selection_extend(aR_ R->selection_save_x, |
996 | R->selection_extend (R->selection_save_x, |
986 | R->selection_save_y, R->selection_save_state); |
997 | R->selection_save_y, R->selection_save_state); |
987 | R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; |
998 | R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; |
988 | R->refresh_type |= SMOOTH_REFRESH; |
999 | R->refresh_type |= SMOOTH_REFRESH; |
989 | R->want_refresh = 1; |
1000 | R->want_refresh = 1; |
990 | } |
1001 | } |
… | |
… | |
1010 | |
1021 | |
1011 | void |
1022 | void |
1012 | rxvt_term::pointer_unblank () |
1023 | rxvt_term::pointer_unblank () |
1013 | { |
1024 | { |
1014 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1025 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1015 | rxvt_recolour_cursor (this); |
1026 | recolour_cursor (); |
1016 | |
1027 | |
1017 | #ifdef POINTER_BLANK |
1028 | #ifdef POINTER_BLANK |
1018 | hidden_pointer = 0; |
1029 | hidden_pointer = 0; |
1019 | |
1030 | |
1020 | if (Options & Opt_pointerBlank) |
1031 | if (Options & Opt_pointerBlank) |
… | |
… | |
1038 | } |
1049 | } |
1039 | |
1050 | |
1040 | void |
1051 | void |
1041 | rxvt_term::pointer_cb (time_watcher &w) |
1052 | rxvt_term::pointer_cb (time_watcher &w) |
1042 | { |
1053 | { |
|
|
1054 | SET_R (this); |
|
|
1055 | SET_LOCALE (locale); |
|
|
1056 | |
1043 | pointer_blank (); |
1057 | pointer_blank (); |
1044 | } |
1058 | } |
1045 | #endif |
1059 | #endif |
1046 | |
1060 | |
1047 | /* INTPROTO */ |
1061 | /* INTPROTO */ |
… | |
… | |
1051 | int button_number, key_state = 0; |
1065 | int button_number, key_state = 0; |
1052 | int x, y; |
1066 | int x, y; |
1053 | |
1067 | |
1054 | x = ev->x; |
1068 | x = ev->x; |
1055 | y = ev->y; |
1069 | y = ev->y; |
1056 | rxvt_pixel_position(aR_ &x, &y); |
1070 | R->pixel_position (&x, &y); |
1057 | |
1071 | |
1058 | if (R->MEvent.button == AnyButton) { |
1072 | if (R->MEvent.button == AnyButton) { |
1059 | button_number = 3; |
1073 | button_number = 3; |
1060 | } else { |
1074 | } else { |
1061 | button_number = R->MEvent.button - Button1; |
1075 | button_number = R->MEvent.button - Button1; |
… | |
… | |
1101 | fprintf(stderr, "]: <%d>, %d/%d\n", |
1115 | fprintf(stderr, "]: <%d>, %d/%d\n", |
1102 | button_number, |
1116 | button_number, |
1103 | x + 1, |
1117 | x + 1, |
1104 | y + 1); |
1118 | y + 1); |
1105 | #else |
1119 | #else |
1106 | rxvt_tt_printf(aR_ "\033[M%c%c%c", |
1120 | R->tt_printf("\033[M%c%c%c", |
1107 | (32 + button_number + key_state), |
1121 | (32 + button_number + key_state), |
1108 | (32 + x + 1), |
1122 | (32 + x + 1), |
1109 | (32 + y + 1)); |
1123 | (32 + y + 1)); |
1110 | #endif |
1124 | #endif |
1111 | } |
1125 | } |
… | |
… | |
1128 | { |
1142 | { |
1129 | int i, want_timeout; |
1143 | int i, want_timeout; |
1130 | Window unused_root, unused_child; |
1144 | Window unused_root, unused_child; |
1131 | int unused_root_x, unused_root_y; |
1145 | int unused_root_x, unused_root_y; |
1132 | unsigned int unused_mask; |
1146 | unsigned int unused_mask; |
1133 | struct timeval tp; |
|
|
1134 | |
1147 | |
1135 | #ifdef DEBUG_X |
1148 | #ifdef DEBUG_X |
1136 | const char *const eventnames[] = |
1149 | const char *const eventnames[] = |
1137 | { /* mason - this matches my system */ |
1150 | { /* mason - this matches my system */ |
1138 | "", |
1151 | "", |
… | |
… | |
1169 | "SelectionNotify", |
1182 | "SelectionNotify", |
1170 | "ColormapNotify", |
1183 | "ColormapNotify", |
1171 | "ClientMessage", |
1184 | "ClientMessage", |
1172 | "MappingNotify" |
1185 | "MappingNotify" |
1173 | }; |
1186 | }; |
|
|
1187 | #endif |
|
|
1188 | |
|
|
1189 | #ifdef DEBUG_X |
|
|
1190 | struct timeval tp; |
1174 | struct tm *ltt; |
1191 | struct tm *ltt; |
1175 | #endif |
|
|
1176 | |
|
|
1177 | /* |
|
|
1178 | * check if we need to get the time for any timeouts |
|
|
1179 | */ |
|
|
1180 | |
|
|
1181 | for (i = NUM_TIMEOUTS; i--; ) |
|
|
1182 | if (R->timeout[i].tv_sec) { |
|
|
1183 | want_timeout = 1; |
|
|
1184 | break; |
|
|
1185 | } |
|
|
1186 | |
|
|
1187 | #ifndef DEBUG_X |
|
|
1188 | if (want_timeout) |
|
|
1189 | #endif |
|
|
1190 | (void)gettimeofday(&tp, NULL); |
1192 | (void)gettimeofday(&tp, NULL); |
1191 | |
|
|
1192 | #ifdef DEBUG_X |
|
|
1193 | ltt = localtime(&(tp.tv_sec)); |
1193 | ltt = localtime(&(tp.tv_sec)); |
1194 | D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); |
1194 | D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); |
1195 | #endif |
1195 | #endif |
1196 | |
|
|
1197 | /* X event timeouts */ |
|
|
1198 | if (want_timeout) |
|
|
1199 | for (i = NUM_TIMEOUTS; i--; ) { |
|
|
1200 | if (R->timeout[i].tv_sec == 0) |
|
|
1201 | continue; |
|
|
1202 | if ((tp.tv_sec < R->timeout[i].tv_sec) |
|
|
1203 | || (tp.tv_sec == R->timeout[i].tv_sec |
|
|
1204 | && tp.tv_usec < R->timeout[i].tv_usec)) |
|
|
1205 | continue; |
|
|
1206 | R->timeout[i].tv_sec = 0; |
|
|
1207 | switch(i) { |
|
|
1208 | case TIMEOUT_INCR: |
|
|
1209 | rxvt_print_error("data loss: timeout on INCR selection paste"); |
|
|
1210 | R->selection_wait = Sel_none; |
|
|
1211 | break; |
|
|
1212 | default: |
|
|
1213 | break; |
|
|
1214 | } |
|
|
1215 | } |
|
|
1216 | |
1196 | |
1217 | switch (ev->type) { |
1197 | switch (ev->type) { |
1218 | case KeyPress: |
1198 | case KeyPress: |
1219 | rxvt_lookup_key(aR_ (XKeyEvent *)ev); |
1199 | rxvt_lookup_key(aR_ (XKeyEvent *)ev); |
1220 | break; |
1200 | break; |
… | |
… | |
1244 | break; |
1224 | break; |
1245 | |
1225 | |
1246 | case ClientMessage: |
1226 | case ClientMessage: |
1247 | if (ev->xclient.format == 32 |
1227 | if (ev->xclient.format == 32 |
1248 | && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) |
1228 | && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) |
1249 | exit(EXIT_SUCCESS); |
1229 | R->destroy (); |
1250 | #ifdef OFFIX_DND |
1230 | #ifdef OFFIX_DND |
1251 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1231 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1252 | if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] |
1232 | else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] |
1253 | && (ev->xclient.data.l[0] == DndFile |
1233 | && (ev->xclient.data.l[0] == DndFile |
1254 | || ev->xclient.data.l[0] == DndDir |
1234 | || ev->xclient.data.l[0] == DndDir |
1255 | || ev->xclient.data.l[0] == DndLink)) { |
1235 | || ev->xclient.data.l[0] == DndLink)) { |
1256 | /* Get Dnd data */ |
1236 | /* Get Dnd data */ |
1257 | Atom ActualType; |
1237 | Atom ActualType; |
… | |
… | |
1289 | * in the GraphicsExpose parts, which means that after each refresh, |
1269 | * in the GraphicsExpose parts, which means that after each refresh, |
1290 | * we need to wait for the graphics expose or Noexpose events, |
1270 | * we need to wait for the graphics expose or Noexpose events, |
1291 | * which ought to make things real slow! |
1271 | * which ought to make things real slow! |
1292 | */ |
1272 | */ |
1293 | case VisibilityNotify: |
1273 | case VisibilityNotify: |
1294 | switch (ev->xvisibility.state) { |
1274 | switch (ev->xvisibility.state) |
|
|
1275 | { |
1295 | case VisibilityUnobscured: |
1276 | case VisibilityUnobscured: |
1296 | R->refresh_type = FAST_REFRESH; |
1277 | R->refresh_type = FAST_REFRESH; |
1297 | break; |
1278 | break; |
1298 | case VisibilityPartiallyObscured: |
1279 | case VisibilityPartiallyObscured: |
1299 | R->refresh_type = SLOW_REFRESH; |
1280 | R->refresh_type = SLOW_REFRESH; |
1300 | break; |
1281 | break; |
1301 | default: |
1282 | default: |
1302 | R->refresh_type = NO_REFRESH; |
1283 | R->refresh_type = NO_REFRESH; |
1303 | break; |
1284 | break; |
1304 | } |
1285 | } |
1305 | break; |
1286 | break; |
1306 | |
1287 | |
1307 | case FocusIn: |
1288 | case FocusIn: |
1308 | if (!R->TermWin.focus) { |
1289 | if (!R->TermWin.focus) { |
1309 | R->TermWin.focus = 1; |
1290 | R->TermWin.focus = 1; |
… | |
… | |
1345 | D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1326 | D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1346 | } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, |
1327 | } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, |
1347 | ConfigureNotify, ev)); |
1328 | ConfigureNotify, ev)); |
1348 | if (R->szHint.width != width || R->szHint.height != height) { |
1329 | if (R->szHint.width != width || R->szHint.height != height) { |
1349 | D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); |
1330 | D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); |
1350 | rxvt_resize_all_windows(aR_ (unsigned int)width, |
1331 | R->resize_all_windows (width, height, 1); |
1351 | (unsigned int)height, 1); |
|
|
1352 | } |
1332 | } |
1353 | #ifdef DEBUG_SIZE |
1333 | #ifdef DEBUG_SIZE |
1354 | else { |
1334 | else { |
1355 | D_SIZE((stderr, "Size: Not resizing")); |
1335 | D_SIZE((stderr, "Size: Not resizing")); |
1356 | } |
1336 | } |
… | |
… | |
1415 | |
1395 | |
1416 | case GraphicsExpose: |
1396 | case GraphicsExpose: |
1417 | case Expose: |
1397 | case Expose: |
1418 | if (ev->xany.window == R->TermWin.vt) { |
1398 | if (ev->xany.window == R->TermWin.vt) { |
1419 | #ifdef NO_SLOW_LINK_SUPPORT |
1399 | #ifdef NO_SLOW_LINK_SUPPORT |
1420 | rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, |
1400 | R->scr_expose (ev->xexpose.x, ev->xexpose.y, |
1421 | ev->xexpose.width, ev->xexpose.height, False); |
1401 | ev->xexpose.width, ev->xexpose.height, False); |
1422 | #else |
1402 | #else |
1423 | // don't understand this, so commented it out |
1403 | // don't understand this, so commented it out |
1424 | rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, |
1404 | R->scr_expose (ev->xexpose.x, ev->xexpose.y, |
1425 | ev->xexpose.width, ev->xexpose.height, False); |
1405 | ev->xexpose.width, ev->xexpose.height, False); |
1426 | //rxvt_scr_expose(aR_ ev->xexpose.x, 0, |
1406 | //rxvt_scr_expose(aR_ ev->xexpose.x, 0, |
1427 | // ev->xexpose.width, R->TermWin.height, False); |
1407 | // ev->xexpose.width, R->TermWin.height, False); |
1428 | #endif |
1408 | #endif |
1429 | R->want_refresh = 1; |
1409 | R->want_refresh = 1; |
1430 | } else { |
1410 | } else { |
… | |
… | |
1435 | &unused_xevent)) ; |
1415 | &unused_xevent)) ; |
1436 | while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, |
1416 | while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, |
1437 | GraphicsExpose, |
1417 | GraphicsExpose, |
1438 | &unused_xevent)) ; |
1418 | &unused_xevent)) ; |
1439 | if (isScrollbarWindow(ev->xany.window)) { |
1419 | if (isScrollbarWindow(ev->xany.window)) { |
1440 | scrollbar_setIdle(); |
1420 | R->scrollBar.setIdle(); |
1441 | rxvt_scrollbar_show(aR_ 0); |
1421 | rxvt_scrollbar_show(aR_ 0); |
1442 | } |
1422 | } |
1443 | #ifdef MENUBAR |
1423 | #ifdef MENUBAR |
1444 | if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) |
1424 | if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) |
1445 | rxvt_menubar_expose(aR); |
1425 | rxvt_menubar_expose(aR); |
… | |
… | |
1475 | &unused_mask); |
1455 | &unused_mask); |
1476 | #ifdef MOUSE_THRESHOLD |
1456 | #ifdef MOUSE_THRESHOLD |
1477 | /* deal with a `jumpy' mouse */ |
1457 | /* deal with a `jumpy' mouse */ |
1478 | if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { |
1458 | if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { |
1479 | #endif |
1459 | #endif |
1480 | rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), |
1460 | R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), |
1481 | (ev->xbutton.state & Button3Mask) ? 2 : 0); |
1461 | (ev->xbutton.state & Button3Mask) ? 2 : 0); |
1482 | #ifdef SELECTION_SCROLLING |
1462 | #ifdef SELECTION_SCROLLING |
1483 | if (ev->xbutton.y<R->TermWin.int_bwidth || |
1463 | if (ev->xbutton.y<R->TermWin.int_bwidth || |
1484 | Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { |
1464 | Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { |
1485 | int dist; |
1465 | int dist; |
… | |
… | |
1534 | &unused_root_x, &unused_root_y, |
1514 | &unused_root_x, &unused_root_y, |
1535 | &(ev->xbutton.x), &(ev->xbutton.y), |
1515 | &(ev->xbutton.x), &(ev->xbutton.y), |
1536 | &unused_mask); |
1516 | &unused_mask); |
1537 | rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, |
1517 | rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, |
1538 | scrollbar_size()); |
1518 | scrollbar_size()); |
1539 | rxvt_scr_refresh(aR_ R->refresh_type); |
1519 | R->scr_refresh (R->refresh_type); |
1540 | R->refresh_limit = 0; |
1520 | R->refresh_limit = 0; |
1541 | rxvt_scrollbar_show(aR_ 1); |
1521 | rxvt_scrollbar_show(aR_ 1); |
1542 | } |
1522 | } |
1543 | break; |
1523 | break; |
1544 | } |
1524 | } |
… | |
… | |
1558 | */ |
1538 | */ |
1559 | if (ev->window == R->TermWin.vt) |
1539 | if (ev->window == R->TermWin.vt) |
1560 | { |
1540 | { |
1561 | #if RXVT_GRAPHICS |
1541 | #if RXVT_GRAPHICS |
1562 | if (ev->subwindow != None) |
1542 | if (ev->subwindow != None) |
1563 | rxvt_Gr_ButtonPress(ev->x, ev->y); |
1543 | rxvt_Gr_ButtonPress (ev->x, ev->y); |
1564 | else |
1544 | else |
1565 | #endif |
1545 | #endif |
1566 | { |
1546 | { |
1567 | clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; |
1547 | clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; |
1568 | if (reportmode) |
1548 | if (reportmode) |
… | |
… | |
1603 | if (ev->button != R->MEvent.button) |
1583 | if (ev->button != R->MEvent.button) |
1604 | R->MEvent.clicks = 0; |
1584 | R->MEvent.clicks = 0; |
1605 | switch (ev->button) |
1585 | switch (ev->button) |
1606 | { |
1586 | { |
1607 | case Button1: |
1587 | case Button1: |
|
|
1588 | /* allow shift+left click to extend selection */ |
|
|
1589 | if (ev->state & ShiftMask) |
|
|
1590 | { |
1608 | if (R->MEvent.button == Button1 && clickintime) |
1591 | if (R->MEvent.button == Button1 && clickintime) |
|
|
1592 | R->selection_rotate (ev->x, ev->y); |
1609 | R->MEvent.clicks++; |
1593 | else |
|
|
1594 | R->selection_extend (ev->x, ev->y, 1); |
|
|
1595 | } |
1610 | else |
1596 | else |
|
|
1597 | { |
|
|
1598 | if (R->MEvent.button == Button1 && clickintime) |
|
|
1599 | R->MEvent.clicks++; |
|
|
1600 | else |
1611 | R->MEvent.clicks = 1; |
1601 | R->MEvent.clicks = 1; |
|
|
1602 | |
1612 | rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); |
1603 | R->selection_click (R->MEvent.clicks, ev->x, ev->y); |
|
|
1604 | } |
|
|
1605 | |
1613 | R->MEvent.button = Button1; |
1606 | R->MEvent.button = Button1; |
1614 | break; |
1607 | break; |
1615 | |
1608 | |
1616 | case Button3: |
1609 | case Button3: |
1617 | if (R->MEvent.button == Button3 && clickintime) |
1610 | if (R->MEvent.button == Button3 && clickintime) |
1618 | rxvt_selection_rotate(aR_ ev->x, ev->y); |
1611 | R->selection_rotate (ev->x, ev->y); |
1619 | else |
1612 | else |
1620 | rxvt_selection_extend(aR_ ev->x, ev->y, 1); |
1613 | R->selection_extend (ev->x, ev->y, 1); |
1621 | R->MEvent.button = Button3; |
1614 | R->MEvent.button = Button3; |
1622 | break; |
1615 | break; |
1623 | } |
1616 | } |
1624 | } |
1617 | } |
1625 | R->MEvent.time = ev->time; |
1618 | R->MEvent.time = ev->time; |
… | |
… | |
1630 | /* |
1623 | /* |
1631 | * Scrollbar window processing of button press |
1624 | * Scrollbar window processing of button press |
1632 | */ |
1625 | */ |
1633 | if (isScrollbarWindow(ev->window)) |
1626 | if (isScrollbarWindow(ev->window)) |
1634 | { |
1627 | { |
1635 | scrollbar_setIdle(); |
1628 | R->scrollBar.setIdle (); |
1636 | /* |
1629 | /* |
1637 | * Rxvt-style scrollbar: |
1630 | * Rxvt-style scrollbar: |
1638 | * move up if mouse is above slider |
1631 | * move up if mouse is above slider |
1639 | * move dn if mouse is below slider |
1632 | * move dn if mouse is below slider |
1640 | * |
1633 | * |
… | |
… | |
1652 | */ |
1645 | */ |
1653 | if ((R->scrollBar.style == R_SB_NEXT |
1646 | if ((R->scrollBar.style == R_SB_NEXT |
1654 | && scrollbarnext_upButton(ev->y)) |
1647 | && scrollbarnext_upButton(ev->y)) |
1655 | || (R->scrollBar.style == R_SB_RXVT |
1648 | || (R->scrollBar.style == R_SB_RXVT |
1656 | && scrollbarrxvt_upButton(ev->y))) |
1649 | && scrollbarrxvt_upButton(ev->y))) |
1657 | rxvt_tt_printf(aR_ "\033[A"); |
1650 | R->tt_printf("\033[A"); |
1658 | else if ((R->scrollBar.style == R_SB_NEXT |
1651 | else if ((R->scrollBar.style == R_SB_NEXT |
1659 | && scrollbarnext_dnButton(ev->y)) |
1652 | && scrollbarnext_dnButton(ev->y)) |
1660 | || (R->scrollBar.style == R_SB_RXVT |
1653 | || (R->scrollBar.style == R_SB_RXVT |
1661 | && scrollbarrxvt_dnButton(ev->y))) |
1654 | && scrollbarrxvt_dnButton(ev->y))) |
1662 | rxvt_tt_printf(aR_ "\033[B"); |
1655 | R->tt_printf("\033[B"); |
1663 | else |
1656 | else |
1664 | switch (ev->button) { |
1657 | switch (ev->button) { |
1665 | case Button2: |
1658 | case Button2: |
1666 | rxvt_tt_printf(aR_ "\014"); |
1659 | R->tt_printf("\014"); |
1667 | break; |
1660 | break; |
1668 | case Button1: |
1661 | case Button1: |
1669 | rxvt_tt_printf(aR_ "\033[6~"); |
1662 | R->tt_printf("\033[6~"); |
1670 | break; |
1663 | break; |
1671 | case Button3: |
1664 | case Button3: |
1672 | rxvt_tt_printf(aR_ "\033[5~"); |
1665 | R->tt_printf("\033[5~"); |
1673 | break; |
1666 | break; |
1674 | } |
1667 | } |
1675 | } |
1668 | } |
1676 | else |
1669 | else |
1677 | #endif /* NO_SCROLLBAR_REPORT */ |
1670 | #endif /* NO_SCROLLBAR_REPORT */ |
… | |
… | |
1693 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1686 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1694 | R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; |
1687 | R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; |
1695 | #endif |
1688 | #endif |
1696 | if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { |
1689 | if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { |
1697 | if (upordown < 0) |
1690 | if (upordown < 0) |
1698 | scrollbar_setUp(); |
1691 | R->scrollBar.setUp (); |
1699 | else |
1692 | else |
1700 | scrollbar_setDn(); |
1693 | R->scrollBar.setDn (); |
1701 | } |
1694 | } |
1702 | } else |
1695 | } else |
1703 | switch (ev->button) { |
1696 | switch (ev->button) { |
1704 | case Button2: |
1697 | case Button2: |
1705 | switch (R->scrollbar_align) { |
1698 | switch (R->scrollbar_align) { |
… | |
… | |
1717 | || scrollbar_above_slider(ev->y) |
1710 | || scrollbar_above_slider(ev->y) |
1718 | || scrollbar_below_slider(ev->y)) |
1711 | || scrollbar_below_slider(ev->y)) |
1719 | rxvt_scr_move_to(aR_ |
1712 | rxvt_scr_move_to(aR_ |
1720 | scrollbar_position(ev->y) - R->csrO, |
1713 | scrollbar_position(ev->y) - R->csrO, |
1721 | scrollbar_size()); |
1714 | scrollbar_size()); |
1722 | scrollbar_setMotion(); |
1715 | R->scrollBar.setMotion (); |
1723 | break; |
1716 | break; |
1724 | |
1717 | |
1725 | case Button1: |
1718 | case Button1: |
1726 | if (R->scrollbar_align == R_SB_ALIGN_CENTRE) |
1719 | if (R->scrollbar_align == R_SB_ALIGN_CENTRE) |
1727 | R->csrO = ev->y - R->scrollBar.top; |
1720 | R->csrO = ev->y - R->scrollBar.top; |
… | |
… | |
1740 | rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); |
1733 | rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); |
1741 | # else |
1734 | # else |
1742 | rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); |
1735 | rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); |
1743 | # endif |
1736 | # endif |
1744 | else |
1737 | else |
1745 | scrollbar_setMotion(); |
1738 | R->scrollBar.setMotion (); |
1746 | } else { |
1739 | } else { |
1747 | rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), |
1740 | rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), |
1748 | (R->TermWin.nrow |
1741 | (R->TermWin.nrow |
1749 | * scrollbar_position(ev->y) |
1742 | * scrollbar_position(ev->y) |
1750 | / scrollbar_size())); |
1743 | / scrollbar_size())); |
… | |
… | |
1772 | R->csrO = 0; /* reset csr Offset */ |
1765 | R->csrO = 0; /* reset csr Offset */ |
1773 | if (!R->bypass_keystate) |
1766 | if (!R->bypass_keystate) |
1774 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1767 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1775 | |
1768 | |
1776 | if (scrollbar_isUpDn()) { |
1769 | if (scrollbar_isUpDn()) { |
1777 | scrollbar_setIdle(); |
1770 | R->scrollBar.setIdle (); |
1778 | rxvt_scrollbar_show(aR_ 0); |
1771 | rxvt_scrollbar_show(aR_ 0); |
1779 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1772 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1780 | R->refresh_type &= ~SMOOTH_REFRESH; |
1773 | R->refresh_type &= ~SMOOTH_REFRESH; |
1781 | #endif |
1774 | #endif |
1782 | } |
1775 | } |
… | |
… | |
1819 | * when overriding mouse reporting |
1812 | * when overriding mouse reporting |
1820 | */ |
1813 | */ |
1821 | if (R->PrivateModes & PrivMode_mouse_report |
1814 | if (R->PrivateModes & PrivMode_mouse_report |
1822 | && R->bypass_keystate |
1815 | && R->bypass_keystate |
1823 | && ev->button == Button1 && R->MEvent.clicks <= 1) |
1816 | && ev->button == Button1 && R->MEvent.clicks <= 1) |
1824 | rxvt_selection_extend(aR_ ev->x, ev->y, 0); |
1817 | R->selection_extend (ev->x, ev->y, 0); |
1825 | |
1818 | |
1826 | switch (ev->button) { |
1819 | switch (ev->button) { |
1827 | case Button1: |
1820 | case Button1: |
1828 | case Button3: |
1821 | case Button3: |
1829 | rxvt_selection_make(aR_ ev->time); |
1822 | rxvt_selection_make(aR_ ev->time); |
… | |
… | |
1833 | break; |
1826 | break; |
1834 | #ifdef MOUSE_WHEEL |
1827 | #ifdef MOUSE_WHEEL |
1835 | case Button4: |
1828 | case Button4: |
1836 | case Button5: |
1829 | case Button5: |
1837 | { |
1830 | { |
1838 | int i, v; |
1831 | int i; |
|
|
1832 | page_dirn v; |
1839 | |
1833 | |
1840 | v = (ev->button == Button4) ? UP : DN; |
1834 | v = (ev->button == Button4) ? UP : DN; |
1841 | if (ev->state & ShiftMask) |
1835 | if (ev->state & ShiftMask) |
1842 | i = 1; |
1836 | i = 1; |
1843 | else if ((R->Options & Opt_mouseWheelScrollPage)) |
1837 | else if ((R->Options & Opt_mouseWheelScrollPage)) |
… | |
… | |
1851 | R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; |
1845 | R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; |
1852 | } |
1846 | } |
1853 | # endif |
1847 | # endif |
1854 | # ifdef JUMP_MOUSE_WHEEL |
1848 | # ifdef JUMP_MOUSE_WHEEL |
1855 | rxvt_scr_page(aR_ v, i); |
1849 | rxvt_scr_page(aR_ v, i); |
1856 | rxvt_scr_refresh(aR_ SMOOTH_REFRESH); |
1850 | R->scr_refresh (SMOOTH_REFRESH); |
1857 | rxvt_scrollbar_show(aR_ 1); |
1851 | rxvt_scrollbar_show(aR_ 1); |
1858 | # else |
1852 | # else |
1859 | for (; i--;) |
1853 | while (i--) |
1860 | { |
1854 | { |
1861 | rxvt_scr_page(aR_ v, 1); |
1855 | rxvt_scr_page(aR_ v, 1); |
1862 | rxvt_scr_refresh(aR_ SMOOTH_REFRESH); |
1856 | R->scr_refresh (SMOOTH_REFRESH); |
1863 | rxvt_scrollbar_show(aR_ 1); |
1857 | rxvt_scrollbar_show(aR_ 1); |
1864 | } |
1858 | } |
1865 | # endif |
1859 | # endif |
1866 | } |
1860 | } |
1867 | break; |
1861 | break; |
… | |
… | |
2018 | n = 0; |
2012 | n = 0; |
2019 | if (pchanged) { |
2013 | if (pchanged) { |
2020 | for (; n < (unsigned int)i; n++) { |
2014 | for (; n < (unsigned int)i; n++) { |
2021 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); |
2015 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); |
2022 | D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
2016 | D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
2023 | if (wattr.depth != rootdepth || wattr.class == InputOnly) { |
2017 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { |
2024 | n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; |
2018 | n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; |
2025 | break; |
2019 | break; |
2026 | } |
2020 | } |
2027 | } |
2021 | } |
2028 | } |
2022 | } |
… | |
… | |
2078 | return stream; |
2072 | return stream; |
2079 | } |
2073 | } |
2080 | |
2074 | |
2081 | /* EXTPROTO */ |
2075 | /* EXTPROTO */ |
2082 | int |
2076 | int |
2083 | rxvt_pclose_printer(FILE *stream) |
2077 | rxvt_pclose_printer (FILE *stream) |
2084 | { |
2078 | { |
2085 | fflush(stream); |
2079 | fflush (stream); |
2086 | /* pclose() reported not to work on SunOS 4.1.3 */ |
2080 | /* pclose() reported not to work on SunOS 4.1.3 */ |
2087 | # if defined (__sun__) /* TODO: RESOLVE THIS */ |
2081 | # if defined (__sun__) /* TODO: RESOLVE THIS */ |
2088 | /* pclose works provided SIGCHLD handler uses waitpid */ |
2082 | /* pclose works provided SIGCHLD handler uses waitpid */ |
2089 | return pclose(stream); /* return fclose (stream); */ |
2083 | return pclose (stream); /* return fclose (stream); */ |
2090 | # else |
2084 | # else |
2091 | return pclose(stream); |
2085 | return pclose (stream); |
2092 | # endif |
2086 | # endif |
2093 | } |
2087 | } |
2094 | |
2088 | |
2095 | /* |
2089 | /* |
2096 | * simulate attached vt100 printer |
2090 | * simulate attached vt100 printer |
… | |
… | |
2159 | rxvt_process_nonprinting(pR_ unsigned char ch) |
2153 | rxvt_process_nonprinting(pR_ unsigned char ch) |
2160 | { |
2154 | { |
2161 | switch (ch) { |
2155 | switch (ch) { |
2162 | case C0_ENQ: /* terminal Status */ |
2156 | case C0_ENQ: /* terminal Status */ |
2163 | if (R->rs[Rs_answerbackstring]) |
2157 | if (R->rs[Rs_answerbackstring]) |
2164 | rxvt_tt_write(aR_ |
2158 | R->tt_write( |
2165 | (const unsigned char *)R->rs[Rs_answerbackstring], |
2159 | (const unsigned char *)R->rs[Rs_answerbackstring], |
2166 | (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); |
2160 | (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); |
2167 | else |
2161 | else |
2168 | rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, |
2162 | R->tt_write((unsigned char *)VT100_ANS, |
2169 | (unsigned int)STRLEN(VT100_ANS)); |
2163 | (unsigned int)STRLEN(VT100_ANS)); |
2170 | break; |
2164 | break; |
2171 | case C0_BEL: /* bell */ |
2165 | case C0_BEL: /* bell */ |
2172 | rxvt_scr_bell(aR); |
2166 | rxvt_scr_bell(aR); |
2173 | break; |
2167 | break; |
… | |
… | |
2221 | break; |
2215 | break; |
2222 | case 'I': /* cursor up and scroll down if needed */ |
2216 | case 'I': /* cursor up and scroll down if needed */ |
2223 | rxvt_scr_index(aR_ DN); |
2217 | rxvt_scr_index(aR_ DN); |
2224 | break; |
2218 | break; |
2225 | case 'J': /* erase to end of screen */ |
2219 | case 'J': /* erase to end of screen */ |
2226 | rxvt_scr_erase_screen(aR_ 0); |
2220 | R->scr_erase_screen (0); |
2227 | break; |
2221 | break; |
2228 | case 'K': /* erase to end of line */ |
2222 | case 'K': /* erase to end of line */ |
2229 | rxvt_scr_erase_line(aR_ 0); |
2223 | rxvt_scr_erase_line(aR_ 0); |
2230 | break; |
2224 | break; |
2231 | case 'Y': /* move to specified row and col */ |
2225 | case 'Y': /* move to specified row and col */ |
… | |
… | |
2236 | row = rxvt_cmd_getc(aR) - ' '; |
2230 | row = rxvt_cmd_getc(aR) - ' '; |
2237 | col = rxvt_cmd_getc(aR) - ' '; |
2231 | col = rxvt_cmd_getc(aR) - ' '; |
2238 | rxvt_scr_gotorc(aR_ row, col, 0); |
2232 | rxvt_scr_gotorc(aR_ row, col, 0); |
2239 | break; |
2233 | break; |
2240 | case 'Z': /* identify the terminal type */ |
2234 | case 'Z': /* identify the terminal type */ |
2241 | rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ |
2235 | R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ |
2242 | break; |
2236 | break; |
2243 | case '<': /* turn off VT52 mode */ |
2237 | case '<': /* turn off VT52 mode */ |
2244 | PrivMode(0, PrivMode_vt52); |
2238 | PrivMode(0, PrivMode_vt52); |
2245 | break; |
2239 | break; |
2246 | case 'F': /* use special graphics character set */ |
2240 | case 'F': /* use special graphics character set */ |
… | |
… | |
2353 | rxvt_process_dcs_seq(aR); |
2347 | rxvt_process_dcs_seq(aR); |
2354 | break; |
2348 | break; |
2355 | |
2349 | |
2356 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
2350 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
2357 | case C1_SCI: /* ESC Z */ |
2351 | case C1_SCI: /* ESC Z */ |
2358 | rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, |
2352 | R->tt_write((const unsigned char *)ESCZ_ANSWER, |
2359 | (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); |
2353 | (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); |
2360 | break; /* steal obsolete ESC [ c */ |
2354 | break; /* steal obsolete ESC [ c */ |
2361 | |
2355 | |
2362 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
2356 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
2363 | case C1_CSI: /* ESC [ */ |
2357 | case C1_CSI: /* ESC [ */ |
… | |
… | |
2484 | */ |
2478 | */ |
2485 | if (priv) { |
2479 | if (priv) { |
2486 | switch (priv) { |
2480 | switch (priv) { |
2487 | case '>': |
2481 | case '>': |
2488 | if (ch == CSI_DA) /* secondary device attributes */ |
2482 | if (ch == CSI_DA) /* secondary device attributes */ |
2489 | rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); |
2483 | R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); |
2490 | break; |
2484 | break; |
2491 | case '?': |
2485 | case '?': |
2492 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2486 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2493 | rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); |
2487 | rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); |
2494 | break; |
2488 | break; |
… | |
… | |
2566 | case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ |
2560 | case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ |
2567 | rxvt_scr_tab(aR_ arg[0]); |
2561 | rxvt_scr_tab(aR_ arg[0]); |
2568 | break; |
2562 | break; |
2569 | |
2563 | |
2570 | case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ |
2564 | case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ |
2571 | rxvt_scr_erase_screen(aR_ arg[0]); |
2565 | R->scr_erase_screen (arg[0]); |
2572 | break; |
2566 | break; |
2573 | |
2567 | |
2574 | case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ |
2568 | case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ |
2575 | rxvt_scr_erase_line(aR_ arg[0]); |
2569 | rxvt_scr_erase_line(aR_ arg[0]); |
2576 | break; |
2570 | break; |
… | |
… | |
2597 | |
2591 | |
2598 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
2592 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
2599 | arg[0] = -arg[0]; |
2593 | arg[0] = -arg[0]; |
2600 | /* FALLTHROUGH */ |
2594 | /* FALLTHROUGH */ |
2601 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
2595 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
2602 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); |
2596 | R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); |
2603 | break; |
2597 | break; |
2604 | |
2598 | |
2605 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
2599 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
2606 | rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, |
2600 | R->tt_write((const unsigned char *)VT100_ANS, |
2607 | (unsigned int)(sizeof(VT100_ANS) - 1)); |
2601 | (unsigned int)(sizeof(VT100_ANS) - 1)); |
2608 | break; |
2602 | break; |
2609 | |
2603 | |
2610 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
2604 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
2611 | rxvt_process_sgr_mode(aR_ nargs, arg); |
2605 | rxvt_process_sgr_mode(aR_ nargs, arg); |
2612 | break; |
2606 | break; |
2613 | |
2607 | |
2614 | case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ |
2608 | case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ |
2615 | switch (arg[0]) { |
2609 | switch (arg[0]) { |
2616 | case 5: /* DSR requested */ |
2610 | case 5: /* DSR requested */ |
2617 | rxvt_tt_printf(aR_ "\033[0n"); |
2611 | R->tt_printf("\033[0n"); |
2618 | break; |
2612 | break; |
2619 | case 6: /* CPR requested */ |
2613 | case 6: /* CPR requested */ |
2620 | rxvt_scr_report_position(aR); |
2614 | rxvt_scr_report_position(aR); |
2621 | break; |
2615 | break; |
2622 | #if defined (ENABLE_DISPLAY_ANSWER) |
2616 | #if defined (ENABLE_DISPLAY_ANSWER) |
2623 | case 7: /* unofficial extension */ |
2617 | case 7: /* unofficial extension */ |
2624 | rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); |
2618 | R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); |
2625 | break; |
2619 | break; |
2626 | #endif |
2620 | #endif |
2627 | case 8: /* unofficial extension */ |
2621 | case 8: /* unofficial extension */ |
2628 | rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); |
2622 | rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); |
2629 | break; |
2623 | break; |
… | |
… | |
2698 | break; |
2692 | break; |
2699 | #endif |
2693 | #endif |
2700 | |
2694 | |
2701 | case CSI_78: /* DECREQTPARM */ |
2695 | case CSI_78: /* DECREQTPARM */ |
2702 | if (arg[0] == 0 || arg[0] == 1) |
2696 | if (arg[0] == 0 || arg[0] == 1) |
2703 | rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); |
2697 | R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); |
2704 | /* FALLTHROUGH */ |
2698 | /* FALLTHROUGH */ |
2705 | |
2699 | |
2706 | default: |
2700 | default: |
2707 | break; |
2701 | break; |
2708 | } |
2702 | } |
… | |
… | |
2746 | break; |
2740 | break; |
2747 | case 6: /* lower window */ |
2741 | case 6: /* lower window */ |
2748 | XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); |
2742 | XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); |
2749 | break; |
2743 | break; |
2750 | case 7: /* refresh window */ |
2744 | case 7: /* refresh window */ |
2751 | rxvt_scr_touch(aR_ True); |
2745 | R->scr_touch (true); |
2752 | break; |
2746 | break; |
2753 | case 8: /* set size (chars) */ |
2747 | case 8: /* set size (chars) */ |
2754 | rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), |
2748 | rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), |
2755 | (unsigned int)(args[1] * R->TermWin.fheight)); |
2749 | (unsigned int)(args[1] * R->TermWin.fheight)); |
2756 | break; |
2750 | break; |
… | |
… | |
2762 | /* |
2756 | /* |
2763 | * reports - some output format copied from XTerm |
2757 | * reports - some output format copied from XTerm |
2764 | */ |
2758 | */ |
2765 | case 11: /* report window state */ |
2759 | case 11: /* report window state */ |
2766 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2760 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2767 | rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
2761 | R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
2768 | break; |
2762 | break; |
2769 | case 13: /* report window position */ |
2763 | case 13: /* report window position */ |
2770 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2764 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2771 | XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, |
2765 | XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, |
2772 | -wattr.border_width, -wattr.border_width, |
2766 | -wattr.border_width, -wattr.border_width, |
2773 | &x, &y, &wdummy); |
2767 | &x, &y, &wdummy); |
2774 | rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); |
2768 | R->tt_printf("\033[3;%d;%dt", x, y); |
2775 | break; |
2769 | break; |
2776 | case 14: /* report window size (pixels) */ |
2770 | case 14: /* report window size (pixels) */ |
2777 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2771 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2778 | rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); |
2772 | R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); |
2779 | break; |
2773 | break; |
2780 | case 18: /* report window size (chars) */ |
2774 | case 18: /* report window size (chars) */ |
2781 | rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); |
2775 | R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); |
2782 | break; |
2776 | break; |
2783 | #if 0 /* XXX: currently disabled due to security concerns */ |
2777 | #if 0 /* XXX: currently disabled due to security concerns */ |
2784 | case 20: /* report icon label */ |
2778 | case 20: /* report icon label */ |
2785 | XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); |
2779 | XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); |
2786 | rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ |
2780 | R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ |
2787 | break; |
2781 | break; |
2788 | case 21: /* report window title */ |
2782 | case 21: /* report window title */ |
2789 | XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); |
2783 | XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); |
2790 | rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ |
2784 | R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ |
2791 | break; |
2785 | break; |
2792 | #endif |
2786 | #endif |
2793 | } |
2787 | } |
2794 | } |
2788 | } |
2795 | #endif |
2789 | #endif |
… | |
… | |
2967 | if (*str != ';') { |
2961 | if (*str != ';') { |
2968 | #if XPM_BACKGROUND |
2962 | #if XPM_BACKGROUND |
2969 | rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ |
2963 | rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ |
2970 | rxvt_set_bgPixmap(aR_ str); /* change pixmap */ |
2964 | rxvt_set_bgPixmap(aR_ str); /* change pixmap */ |
2971 | #endif |
2965 | #endif |
2972 | rxvt_scr_touch(aR_ True); |
2966 | R->scr_touch (true); |
2973 | } |
2967 | } |
2974 | while ((str = STRCHR(str, ';')) != NULL) { |
2968 | while ((str = STRCHR(str, ';')) != NULL) { |
2975 | str++; |
2969 | str++; |
2976 | #if XPM_BACKGROUND |
2970 | #if XPM_BACKGROUND |
2977 | changed += rxvt_scale_pixmap(aR_ str); |
2971 | changed += rxvt_scale_pixmap(aR_ str); |
… | |
… | |
2979 | } |
2973 | } |
2980 | if (changed) { |
2974 | if (changed) { |
2981 | #ifdef XPM_BACKGROUND |
2975 | #ifdef XPM_BACKGROUND |
2982 | rxvt_resize_pixmap(aR); |
2976 | rxvt_resize_pixmap(aR); |
2983 | #endif |
2977 | #endif |
2984 | rxvt_scr_touch(aR_ True); |
2978 | R->scr_touch (true); |
2985 | } |
2979 | } |
2986 | break; |
2980 | break; |
2987 | |
2981 | |
2988 | case XTerm_restoreFG: |
2982 | case XTerm_restoreFG: |
2989 | rxvt_set_window_color(aR_ Color_fg, str); |
2983 | rxvt_set_window_color(aR_ Color_fg, str); |
… | |
… | |
3155 | break; |
3149 | break; |
3156 | #endif |
3150 | #endif |
3157 | #ifdef scrollBar_esc |
3151 | #ifdef scrollBar_esc |
3158 | case scrollBar_esc: |
3152 | case scrollBar_esc: |
3159 | if (rxvt_scrollbar_mapping(aR_ state)) { |
3153 | if (rxvt_scrollbar_mapping(aR_ state)) { |
3160 | rxvt_resize_all_windows(aR_ 0, 0, 0); |
3154 | R->resize_all_windows (0, 0, 0); |
3161 | rxvt_scr_touch(aR_ True); |
3155 | R->scr_touch (true); |
3162 | } |
3156 | } |
3163 | break; |
3157 | break; |
3164 | #endif |
3158 | #endif |
3165 | case 25: /* visible/invisible cursor */ |
3159 | case 25: /* visible/invisible cursor */ |
3166 | rxvt_scr_cursor_visible(aR_ state); |
3160 | rxvt_scr_cursor_visible(aR_ state); |
… | |
… | |
3192 | else |
3186 | else |
3193 | R->Options &= ~Opt_scrollTtyKeypress; |
3187 | R->Options &= ~Opt_scrollTtyKeypress; |
3194 | break; |
3188 | break; |
3195 | case 1047: /* secondary screen w/ clearing */ |
3189 | case 1047: /* secondary screen w/ clearing */ |
3196 | if (R->current_screen != PRIMARY) |
3190 | if (R->current_screen != PRIMARY) |
3197 | rxvt_scr_erase_screen(aR_ 2); |
3191 | R->scr_erase_screen (2); |
3198 | rxvt_scr_change_screen(aR_ state); |
3192 | rxvt_scr_change_screen(aR_ state); |
3199 | /* FALLTHROUGH */ |
3193 | /* FALLTHROUGH */ |
3200 | default: |
3194 | default: |
3201 | break; |
3195 | break; |
3202 | } |
3196 | } |
… | |
… | |
3338 | { |
3332 | { |
3339 | unsigned char ch, cmd = rxvt_cmd_getc(aR); |
3333 | unsigned char ch, cmd = rxvt_cmd_getc(aR); |
3340 | |
3334 | |
3341 | #ifndef RXVT_GRAPHICS |
3335 | #ifndef RXVT_GRAPHICS |
3342 | if (cmd == 'Q') { /* query graphics */ |
3336 | if (cmd == 'Q') { /* query graphics */ |
3343 | rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ |
3337 | R->tt_printf("\033G0\n"); /* no graphics */ |
3344 | return; |
3338 | return; |
3345 | } |
3339 | } |
3346 | /* swallow other graphics sequences until terminating ':' */ |
3340 | /* swallow other graphics sequences until terminating ':' */ |
3347 | do |
3341 | do |
3348 | ch = rxvt_cmd_getc(aR); |
3342 | ch = rxvt_cmd_getc(aR); |
… | |
… | |
3351 | unsigned int nargs; |
3345 | unsigned int nargs; |
3352 | int args[NGRX_PTS]; |
3346 | int args[NGRX_PTS]; |
3353 | unsigned char *text = NULL; |
3347 | unsigned char *text = NULL; |
3354 | |
3348 | |
3355 | if (cmd == 'Q') { /* query graphics */ |
3349 | if (cmd == 'Q') { /* query graphics */ |
3356 | rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ |
3350 | R->tt_printf("\033G1\n"); /* yes, graphics (color) */ |
3357 | return; |
3351 | return; |
3358 | } |
3352 | } |
3359 | for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { |
3353 | for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { |
3360 | int neg; |
3354 | int neg; |
3361 | |
3355 | |
… | |
… | |
3376 | } |
3370 | } |
3377 | |
3371 | |
3378 | if ((cmd == 'T') && (nargs >= 5)) { |
3372 | if ((cmd == 'T') && (nargs >= 5)) { |
3379 | int i, len = args[4]; |
3373 | int i, len = args[4]; |
3380 | |
3374 | |
3381 | text = rxvt_malloc((len + 1) * sizeof(char)); |
3375 | text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); |
3382 | |
3376 | |
3383 | if (text != NULL) { |
3377 | if (text != NULL) { |
3384 | for (i = 0; i < len; i++) |
3378 | for (i = 0; i < len; i++) |
3385 | text[i] = rxvt_cmd_getc(aR); |
3379 | text[i] = rxvt_cmd_getc(aR); |
3386 | text[len] = '\0'; |
3380 | text[len] = '\0'; |
… | |
… | |
3395 | |
3389 | |
3396 | /* |
3390 | /* |
3397 | * Send printf() formatted output to the command. |
3391 | * Send printf() formatted output to the command. |
3398 | * Only use for small amounts of data. |
3392 | * Only use for small amounts of data. |
3399 | */ |
3393 | */ |
3400 | /* EXTPROTO */ |
|
|
3401 | void |
3394 | void |
3402 | rxvt_tt_printf(pR_ const char *fmt,...) |
3395 | rxvt_term::tt_printf (const char *fmt,...) |
3403 | { |
3396 | { |
3404 | va_list arg_ptr; |
3397 | va_list arg_ptr; |
3405 | unsigned char buf[256]; |
3398 | unsigned char buf[256]; |
3406 | |
3399 | |
3407 | va_start(arg_ptr, fmt); |
3400 | va_start (arg_ptr, fmt); |
3408 | vsprintf((char *)buf, fmt, arg_ptr); |
3401 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
3409 | va_end(arg_ptr); |
3402 | va_end (arg_ptr); |
3410 | rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); |
3403 | tt_write (buf, STRLEN (buf)); |
3411 | } |
3404 | } |
3412 | |
3405 | |
3413 | /* ---------------------------------------------------------------------- */ |
3406 | /* ---------------------------------------------------------------------- */ |
3414 | /* Addresses pasting large amounts of data and rxvt hang |
|
|
3415 | * code pinched from xterm (v_write()) and applied originally to |
|
|
3416 | * rxvt-2.18 - Hops |
|
|
3417 | * Write data to the pty as typed by the user, pasted with the mouse, |
3407 | /* Write data to the pty as typed by the user, pasted with the mouse, |
3418 | * or generated by us in response to a query ESC sequence. |
3408 | * or generated by us in response to a query ESC sequence. |
3419 | */ |
3409 | */ |
3420 | /* EXTPROTO */ |
|
|
3421 | void |
3410 | void |
3422 | rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) |
3411 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
3423 | { |
3412 | { |
3424 | #define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ |
3413 | enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT |
3425 | int riten; |
|
|
3426 | unsigned int p; |
|
|
3427 | unsigned char *v_buffer, /* start of physical buffer */ |
|
|
3428 | *v_bufstr, /* start of current buffer pending */ |
|
|
3429 | *v_bufptr, /* end of current buffer pending */ |
|
|
3430 | *v_bufend; /* end of physical buffer */ |
|
|
3431 | |
3414 | |
3432 | if (R->v_bufstr == NULL && len > 0) { |
3415 | if (len) |
3433 | p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
|
|
3434 | v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p); |
|
|
3435 | v_bufend = v_buffer + p; |
|
|
3436 | } else { |
|
|
3437 | v_buffer = R->v_buffer; |
|
|
3438 | v_bufstr = R->v_bufstr; |
|
|
3439 | v_bufptr = R->v_bufptr; |
|
|
3440 | v_bufend = R->v_bufend; |
|
|
3441 | } |
3416 | { |
|
|
3417 | if (v_buflen == 0) |
|
|
3418 | { |
|
|
3419 | int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); |
|
|
3420 | if (written == len) |
|
|
3421 | return; |
3442 | |
3422 | |
3443 | /* |
3423 | data += written; |
3444 | * Append to the block we already have. Always doing this simplifies the |
3424 | len -= written; |
3445 | * code, and isn't too bad, either. If this is a short block, it isn't |
3425 | } |
3446 | * too expensive, and if this is a long block, we won't be able to write |
3426 | |
3447 | * it all anyway. |
3427 | |
3448 | */ |
3428 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
3449 | if (len > 0) { |
3429 | |
3450 | if (v_bufend < v_bufptr + len) { /* run out of room */ |
3430 | memcpy (v_buffer + v_buflen, data, len); |
3451 | if (v_bufstr != v_buffer) { |
3431 | v_buflen += len; |
3452 | /* there is unused space, move everything down */ |
|
|
3453 | MEMMOVE(v_buffer, v_bufstr, |
|
|
3454 | (unsigned int)(v_bufptr - v_bufstr)); |
|
|
3455 | v_bufptr -= v_bufstr - v_buffer; |
|
|
3456 | v_bufstr = v_buffer; |
|
|
3457 | } |
3432 | } |
3458 | if (v_bufend < v_bufptr + len) { |
|
|
3459 | /* still won't fit: get more space */ |
|
|
3460 | /* use most basic realloc because an error is not fatal. */ |
|
|
3461 | unsigned int size = v_bufptr - v_buffer; |
|
|
3462 | unsigned int reallocto; |
|
|
3463 | |
3433 | |
3464 | reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
3434 | for (;;) |
3465 | v_buffer = (unsigned char *)realloc(v_buffer, reallocto); |
3435 | { |
3466 | /* save across realloc */ |
3436 | int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); |
3467 | if (v_buffer) { |
3437 | |
3468 | v_bufstr = v_buffer; |
3438 | if (written > 0) |
3469 | v_bufptr = v_buffer + size; |
3439 | { |
3470 | v_bufend = v_buffer + reallocto; |
3440 | v_buflen -= written; |
3471 | } else { /* no memory: ignore entire write request */ |
3441 | |
3472 | rxvt_print_error("data loss: cannot allocate buffer space"); |
3442 | if (v_buflen == 0) |
3473 | v_buffer = v_bufstr; /* restore clobbered pointer */ |
3443 | { |
3474 | } |
3444 | free (v_buffer); |
|
|
3445 | v_buffer = 0; |
|
|
3446 | v_buflen = 0; |
|
|
3447 | |
|
|
3448 | pty_ev.set (EVENT_READ); |
|
|
3449 | return; |
|
|
3450 | } |
|
|
3451 | |
|
|
3452 | memmove (v_buffer, v_buffer + written, v_buflen); |
|
|
3453 | } |
|
|
3454 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
3455 | // original code just ignores this... |
|
|
3456 | destroy (); |
|
|
3457 | else |
|
|
3458 | { |
|
|
3459 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
3460 | return; |
|
|
3461 | } |
3475 | } |
3462 | } |
3476 | } |
|
|
3477 | if (v_bufend >= v_bufptr + len) { /* new stuff will fit */ |
|
|
3478 | MEMCPY(v_bufptr, d, len); |
|
|
3479 | v_bufptr += len; |
|
|
3480 | } |
|
|
3481 | } |
|
|
3482 | |
|
|
3483 | /* |
|
|
3484 | * Write out as much of the buffer as we can. |
|
|
3485 | * Be careful not to overflow the pty's input silo. |
|
|
3486 | * We are conservative here and only write a small amount at a time. |
|
|
3487 | * |
|
|
3488 | * If we can't push all the data into the pty yet, we expect write |
|
|
3489 | * to return a non-negative number less than the length requested |
|
|
3490 | * (if some data written) or -1 and set errno to EAGAIN, |
|
|
3491 | * EWOULDBLOCK, or EINTR (if no data written). |
|
|
3492 | * |
|
|
3493 | * (Not all systems do this, sigh, so the code is actually |
|
|
3494 | * a little more forgiving.) |
|
|
3495 | */ |
|
|
3496 | if ((p = v_bufptr - v_bufstr) > 0) { |
|
|
3497 | riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE)); |
|
|
3498 | if (riten < 0) |
|
|
3499 | riten = 0; |
|
|
3500 | v_bufstr += riten; |
|
|
3501 | if (v_bufstr >= v_bufptr) /* we wrote it all */ |
|
|
3502 | v_bufstr = v_bufptr = v_buffer; |
|
|
3503 | } |
|
|
3504 | /* |
|
|
3505 | * If we have lots of unused memory allocated, return it |
|
|
3506 | */ |
|
|
3507 | if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */ |
|
|
3508 | /* save pointers across realloc */ |
|
|
3509 | unsigned int start = v_bufstr - v_buffer; |
|
|
3510 | unsigned int size = v_bufptr - v_buffer; |
|
|
3511 | unsigned int reallocto; |
|
|
3512 | |
|
|
3513 | reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
|
|
3514 | v_buffer = (unsigned char *)realloc(v_buffer, reallocto); |
|
|
3515 | if (v_buffer) { |
|
|
3516 | v_bufstr = v_buffer + start; |
|
|
3517 | v_bufptr = v_buffer + size; |
|
|
3518 | v_bufend = v_buffer + reallocto; |
|
|
3519 | } else { |
|
|
3520 | /* should we print a warning if couldn't return memory? */ |
|
|
3521 | v_buffer = v_bufstr - start; /* restore clobbered pointer */ |
|
|
3522 | } |
|
|
3523 | } |
|
|
3524 | R->v_buffer = v_buffer; |
|
|
3525 | R->v_bufstr = v_bufstr; |
|
|
3526 | R->v_bufptr = v_bufptr; |
|
|
3527 | R->v_bufend = v_bufend; |
|
|
3528 | } |
3463 | } |
|
|
3464 | |
3529 | /*----------------------- end-of-file (C source) -----------------------*/ |
3465 | /*----------------------- end-of-file (C source) -----------------------*/ |
3530 | |
3466 | |