1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: command.c |
2 | * File: command.c |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * $Id: command.C,v 1.9 2003/11/27 10:12:10 pcg Exp $ |
4 | * $Id: command.C,v 1.21 2003/12/18 08:06:46 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) |
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 | rxvt_scr_clear (this); |
|
|
685 | rxvt_scr_touch (this, False); |
|
|
686 | want_refresh = 1; |
|
|
687 | } |
|
|
688 | #endif |
|
|
689 | |
|
|
690 | if (want_refresh) |
|
|
691 | { |
|
|
692 | rxvt_scr_refresh (this, refresh_type); |
|
|
693 | rxvt_scrollbar_show (this, 1); |
|
|
694 | #ifdef USE_XIM |
|
|
695 | rxvt_IMSendSpot (this); |
|
|
696 | #endif |
|
|
697 | } |
|
|
698 | |
|
|
699 | XFlush (Xdisplay); |
|
|
700 | #if 0 |
|
|
701 | if (XPending (Xdisplay)) process_x_events (); |
|
|
702 | if (XPending (Xdisplay)) process_x_events (); |
|
|
703 | #endif |
|
|
704 | } |
|
|
705 | |
|
|
706 | void |
|
|
707 | rxvt_term::check_cb (check_watcher &w) |
|
|
708 | { |
|
|
709 | SET_R (this); |
|
|
710 | SET_LOCALE (locale); |
|
|
711 | |
|
|
712 | flush (); |
|
|
713 | } |
659 | |
714 | |
660 | void |
715 | void |
661 | rxvt_term::process_x_events () |
716 | rxvt_term::process_x_events () |
662 | { |
717 | { |
663 | do |
718 | do |
… | |
… | |
704 | } |
759 | } |
705 | |
760 | |
706 | void |
761 | void |
707 | rxvt_term::blink_cb (time_watcher &w) |
762 | rxvt_term::blink_cb (time_watcher &w) |
708 | { |
763 | { |
709 | SET_R (this); |
|
|
710 | |
|
|
711 | w.at += BLINK_INTERVAL; |
764 | w.at += BLINK_INTERVAL; |
712 | hidden_cursor = !hidden_cursor; |
765 | hidden_cursor = !hidden_cursor; |
713 | want_refresh = 1; |
766 | want_refresh = 1; |
714 | flush (); |
|
|
715 | } |
767 | } |
716 | |
768 | |
717 | void |
769 | void |
718 | rxvt_term::x_cb (io_watcher &w, short revents) |
770 | rxvt_term::x_cb (io_watcher &w, short revents) |
719 | { |
771 | { |
720 | SET_R (this); |
772 | SET_R (this); |
|
|
773 | SET_LOCALE (locale); |
721 | |
774 | |
722 | process_x_events (); |
775 | process_x_events (); |
723 | |
|
|
724 | flush (); |
|
|
725 | } |
|
|
726 | |
|
|
727 | // read the next character, currently handles UTF-8 |
|
|
728 | // will probably handle all sorts of other stuff in the future |
|
|
729 | uint32_t |
|
|
730 | rxvt_term::next_char () |
|
|
731 | { |
|
|
732 | struct mbstate &s = mbstate; |
|
|
733 | |
|
|
734 | while (cmdbuf_ptr < cmdbuf_endp) |
|
|
735 | { |
|
|
736 | uint8_t ch = *cmdbuf_ptr; |
|
|
737 | |
|
|
738 | if (s.cnt) |
|
|
739 | { |
|
|
740 | if ((ch & 0xc0) == 0x80) |
|
|
741 | { |
|
|
742 | cmdbuf_ptr++; |
|
|
743 | |
|
|
744 | /* continuation */ |
|
|
745 | s.reg = (s.reg << 6) | (ch & 0x7f); |
|
|
746 | |
|
|
747 | if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */ |
|
|
748 | return s.reg; |
|
|
749 | |
|
|
750 | continue; |
|
|
751 | } |
|
|
752 | else |
|
|
753 | { |
|
|
754 | s.cnt = 0; |
|
|
755 | return s.orig; /* the _occasional_ non-utf-8 character may slip through... */ |
|
|
756 | } |
|
|
757 | } |
|
|
758 | |
|
|
759 | if ((ch & 0xc0) == 0xc0) |
|
|
760 | { |
|
|
761 | cmdbuf_ptr++; |
|
|
762 | |
|
|
763 | /* first byte */ |
|
|
764 | s.orig = ch; /* for broken encodings */ |
|
|
765 | s.reg = ch; |
|
|
766 | if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } |
|
|
767 | if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } |
|
|
768 | if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } |
|
|
769 | if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } |
|
|
770 | if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } |
|
|
771 | } |
|
|
772 | else |
|
|
773 | { |
|
|
774 | cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ |
|
|
775 | return ch; |
|
|
776 | } |
|
|
777 | } |
|
|
778 | |
|
|
779 | return NOCHAR; |
|
|
780 | } |
776 | } |
781 | |
777 | |
782 | bool |
778 | bool |
783 | rxvt_term::pty_fill () |
779 | rxvt_term::pty_fill () |
784 | { |
780 | { |
… | |
… | |
793 | if (n > 0) |
789 | if (n > 0) |
794 | { |
790 | { |
795 | cmdbuf_endp += n; |
791 | cmdbuf_endp += n; |
796 | return true; |
792 | return true; |
797 | } |
793 | } |
798 | else if (n < 0 && errno == EAGAIN) |
794 | else if (n < 0 && errno != EAGAIN) |
|
|
795 | destroy (); |
|
|
796 | |
799 | return false; |
797 | return false; |
800 | |
|
|
801 | destroy (); |
|
|
802 | } |
798 | } |
803 | |
799 | |
804 | void |
800 | void |
805 | rxvt_term::pty_cb (io_watcher &w, short revents) |
801 | rxvt_term::pty_cb (io_watcher &w, short revents) |
806 | { |
802 | { |
807 | SET_R (this); |
803 | SET_R (this); |
|
|
804 | SET_LOCALE (locale); |
808 | |
805 | |
809 | // loop, but don't allow a single term to monopolize us |
806 | if (revents & EVENT_WRITE) |
810 | // the number of loops is fully arbitrary, and thus wrong |
807 | tt_write (0, 0); |
811 | for (int i = 7; i-- && pty_fill (); ) |
808 | else if (revents & EVENT_READ) |
812 | { |
809 | { |
813 | //TODO: |
810 | bool flag = true; |
814 | /* once we know the shell is running, send the screen size. Again! */ |
|
|
815 | //ch = rxvt_cmd_getc(aR); /* wait for something */ |
|
|
816 | //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid); |
|
|
817 | |
811 | |
818 | uint32_t ch = NOCHAR; |
812 | // loop, but don't allow a single term to monopolize us |
819 | |
813 | // the number of loops is fully arbitrary, and thus wrong |
820 | for (;;) |
814 | while (flag && pty_fill ()) |
821 | { |
815 | { |
822 | if (ch == NOCHAR) |
816 | if (!seen_input) |
823 | ch = next_char (); |
|
|
824 | |
|
|
825 | if (ch == NOCHAR) // TODO: improve |
|
|
826 | break; |
|
|
827 | |
|
|
828 | if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') |
|
|
829 | { |
817 | { |
830 | /* Read a text string from the input buffer */ |
818 | seen_input = 1; |
831 | uint32_t buf[BUFSIZ]; |
819 | /* once we know the shell is running, send the screen size. Again! */ |
832 | bool refreshnow = false; |
820 | tt_winch (); |
833 | int nlines = 0; |
821 | } |
834 | uint32_t *str = buf; |
|
|
835 | |
822 | |
836 | *str++ = ch; |
823 | uint32_t ch = NOCHAR; |
837 | |
824 | |
838 | for (;;) |
825 | for (;;) |
|
|
826 | { |
|
|
827 | if (ch == NOCHAR) |
|
|
828 | ch = next_char (); |
|
|
829 | |
|
|
830 | if (ch == NOCHAR) // TODO: improve |
|
|
831 | break; |
|
|
832 | |
|
|
833 | if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') |
839 | { |
834 | { |
840 | ch = next_char (); |
835 | /* Read a text string from the input buffer */ |
|
|
836 | uint32_t buf[BUFSIZ]; |
|
|
837 | bool refreshnow = false; |
|
|
838 | int nlines = 0; |
|
|
839 | uint32_t *str = buf; |
841 | |
840 | |
842 | if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) |
841 | *str++ = ch; |
|
|
842 | |
843 | break; |
843 | for (;;) |
844 | else |
|
|
845 | { |
844 | { |
|
|
845 | ch = next_char (); |
|
|
846 | |
|
|
847 | if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) |
|
|
848 | break; |
846 | *str++ = ch; |
849 | else |
847 | |
|
|
848 | if (ch == '\n') |
|
|
849 | { |
850 | { |
850 | nlines++; |
851 | *str++ = ch; |
851 | refresh_count++; |
|
|
852 | |
852 | |
853 | if (!(Options & Opt_jumpScroll) |
853 | if (ch == '\n') |
854 | || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) |
|
|
855 | { |
854 | { |
|
|
855 | nlines++; |
|
|
856 | refresh_count++; |
|
|
857 | |
|
|
858 | if (!(Options & Opt_jumpScroll) |
|
|
859 | || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) |
|
|
860 | { |
856 | refreshnow = true; |
861 | refreshnow = true; |
|
|
862 | flag = false; |
|
|
863 | ch = NOCHAR; |
|
|
864 | break; |
|
|
865 | } |
|
|
866 | } |
|
|
867 | |
|
|
868 | if (str >= buf + BUFSIZ) |
|
|
869 | { |
857 | ch = NOCHAR; |
870 | ch = NOCHAR; |
858 | break; |
871 | break; |
859 | } |
872 | } |
860 | } |
873 | } |
861 | |
|
|
862 | if (str >= buf + BUFSIZ) |
|
|
863 | { |
|
|
864 | ch = NOCHAR; |
|
|
865 | break; |
|
|
866 | } |
|
|
867 | } |
874 | } |
|
|
875 | |
|
|
876 | rxvt_scr_add_lines (this, 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 | rxvt_scr_refresh (this, refresh_type); |
|
|
893 | } |
|
|
894 | |
868 | } |
895 | } |
869 | |
|
|
870 | rxvt_scr_add_lines (this, buf, nlines, str - buf); |
|
|
871 | |
|
|
872 | /* |
896 | else |
873 | * If there have been a lot of new lines, then update the screen |
|
|
874 | * What the heck I'll cheat and only refresh less than every page-full. |
|
|
875 | * the number of pages between refreshes is refresh_limit, which |
|
|
876 | * is incremented here because we must be doing flat-out scrolling. |
|
|
877 | * |
|
|
878 | * refreshing should be correct for small scrolls, because of the |
|
|
879 | * time-out |
|
|
880 | */ |
|
|
881 | if (refreshnow) |
|
|
882 | { |
897 | { |
883 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
898 | switch (ch) |
884 | refresh_limit++; |
899 | { |
|
|
900 | default: |
|
|
901 | rxvt_process_nonprinting (this, ch); |
|
|
902 | break; |
|
|
903 | case C0_ESC: /* escape char */ |
|
|
904 | rxvt_process_escape_seq (this); |
|
|
905 | break; |
|
|
906 | /*case 0x9b: */ /* CSI */ |
|
|
907 | /* rxvt_process_csi_seq (this); */ |
|
|
908 | } |
885 | |
909 | |
886 | rxvt_scr_refresh (this, refresh_type); |
910 | ch = NOCHAR; |
887 | } |
911 | } |
888 | |
|
|
889 | } |
|
|
890 | else |
|
|
891 | { |
|
|
892 | switch (ch) |
|
|
893 | { |
|
|
894 | default: |
|
|
895 | rxvt_process_nonprinting (this, ch); |
|
|
896 | break; |
|
|
897 | case C0_ESC: /* escape char */ |
|
|
898 | rxvt_process_escape_seq (this); |
|
|
899 | break; |
|
|
900 | /*case 0x9b: */ /* CSI */ |
|
|
901 | /* rxvt_process_csi_seq (this); */ |
|
|
902 | } |
|
|
903 | |
|
|
904 | ch = NOCHAR; |
|
|
905 | } |
912 | } |
906 | } |
913 | } |
907 | } |
914 | } |
908 | |
|
|
909 | flush (); |
|
|
910 | } |
915 | } |
911 | |
916 | |
912 | void |
917 | // read the next character, currently handles UTF-8 |
913 | rxvt_term::flush () |
918 | // will probably handle all sorts of other stuff in the future |
|
|
919 | uint32_t |
|
|
920 | rxvt_term::next_char () |
914 | { |
921 | { |
915 | #ifdef TRANSPARENT |
922 | while (cmdbuf_ptr < cmdbuf_endp) |
916 | if (want_full_refresh) |
|
|
917 | { |
923 | { |
918 | want_full_refresh = 0; |
924 | if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh |
919 | rxvt_scr_clear (this); |
925 | return *cmdbuf_ptr++; |
920 | rxvt_scr_touch (this, False); |
|
|
921 | want_refresh = 1; |
|
|
922 | } |
|
|
923 | #endif |
|
|
924 | |
926 | |
925 | if (want_refresh) |
927 | wchar_t wc; |
|
|
928 | int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); |
|
|
929 | |
|
|
930 | if (len == (size_t)-2) |
|
|
931 | return NOCHAR; |
|
|
932 | |
|
|
933 | if (len == (size_t)-1) |
|
|
934 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
|
|
935 | |
|
|
936 | // assume wchar == unicode |
|
|
937 | cmdbuf_ptr += len; |
|
|
938 | return wc; |
926 | { |
939 | } |
927 | rxvt_scr_refresh (this, refresh_type); |
|
|
928 | rxvt_scrollbar_show (this, 1); |
|
|
929 | #ifdef USE_XIM |
|
|
930 | rxvt_IMSendSpot (this); |
|
|
931 | #endif |
|
|
932 | } |
|
|
933 | |
940 | |
934 | if (XPending (Xdisplay)) process_x_events (); |
941 | return NOCHAR; |
935 | XFlush (Xdisplay); |
|
|
936 | if (XPending (Xdisplay)) process_x_events (); |
|
|
937 | } |
942 | } |
938 | |
943 | |
939 | /* rxvt_cmd_getc() - Return next input character */ |
944 | /* rxvt_cmd_getc() - Return next input character */ |
940 | /* |
945 | /* |
941 | * Return the next input character after first passing any keyboard input |
946 | * Return the next input character after first passing any keyboard input |
… | |
… | |
970 | |
975 | |
971 | for (;;) { |
976 | for (;;) { |
972 | /* loop until we can return something */ |
977 | /* loop until we can return something */ |
973 | |
978 | |
974 | if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ |
979 | if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ |
975 | rxvt_tt_write(aR_ NULL, 0); |
980 | R->tt_write(NULL, 0); |
976 | |
981 | |
977 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
982 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
978 | if (R->mouse_slip_wheel_speed) { |
983 | if (R->mouse_slip_wheel_speed) { |
979 | quick_timeout = 1; |
984 | quick_timeout = 1; |
980 | if (!R->mouse_slip_wheel_delay-- |
985 | if (!R->mouse_slip_wheel_delay-- |
… | |
… | |
1020 | |
1025 | |
1021 | void |
1026 | void |
1022 | rxvt_term::pointer_unblank () |
1027 | rxvt_term::pointer_unblank () |
1023 | { |
1028 | { |
1024 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1029 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1025 | rxvt_recolour_cursor (this); |
1030 | recolour_cursor (); |
1026 | |
1031 | |
1027 | #ifdef POINTER_BLANK |
1032 | #ifdef POINTER_BLANK |
1028 | hidden_pointer = 0; |
1033 | hidden_pointer = 0; |
1029 | |
1034 | |
1030 | if (Options & Opt_pointerBlank) |
1035 | if (Options & Opt_pointerBlank) |
… | |
… | |
1049 | |
1054 | |
1050 | void |
1055 | void |
1051 | rxvt_term::pointer_cb (time_watcher &w) |
1056 | rxvt_term::pointer_cb (time_watcher &w) |
1052 | { |
1057 | { |
1053 | SET_R (this); |
1058 | SET_R (this); |
|
|
1059 | SET_LOCALE (locale); |
1054 | |
1060 | |
1055 | pointer_blank (); |
1061 | pointer_blank (); |
1056 | } |
1062 | } |
1057 | #endif |
1063 | #endif |
1058 | |
1064 | |
… | |
… | |
1113 | fprintf(stderr, "]: <%d>, %d/%d\n", |
1119 | fprintf(stderr, "]: <%d>, %d/%d\n", |
1114 | button_number, |
1120 | button_number, |
1115 | x + 1, |
1121 | x + 1, |
1116 | y + 1); |
1122 | y + 1); |
1117 | #else |
1123 | #else |
1118 | rxvt_tt_printf(aR_ "\033[M%c%c%c", |
1124 | R->tt_printf("\033[M%c%c%c", |
1119 | (32 + button_number + key_state), |
1125 | (32 + button_number + key_state), |
1120 | (32 + x + 1), |
1126 | (32 + x + 1), |
1121 | (32 + y + 1)); |
1127 | (32 + y + 1)); |
1122 | #endif |
1128 | #endif |
1123 | } |
1129 | } |
… | |
… | |
1140 | { |
1146 | { |
1141 | int i, want_timeout; |
1147 | int i, want_timeout; |
1142 | Window unused_root, unused_child; |
1148 | Window unused_root, unused_child; |
1143 | int unused_root_x, unused_root_y; |
1149 | int unused_root_x, unused_root_y; |
1144 | unsigned int unused_mask; |
1150 | unsigned int unused_mask; |
1145 | struct timeval tp; |
|
|
1146 | |
1151 | |
1147 | #ifdef DEBUG_X |
1152 | #ifdef DEBUG_X |
1148 | const char *const eventnames[] = |
1153 | const char *const eventnames[] = |
1149 | { /* mason - this matches my system */ |
1154 | { /* mason - this matches my system */ |
1150 | "", |
1155 | "", |
… | |
… | |
1181 | "SelectionNotify", |
1186 | "SelectionNotify", |
1182 | "ColormapNotify", |
1187 | "ColormapNotify", |
1183 | "ClientMessage", |
1188 | "ClientMessage", |
1184 | "MappingNotify" |
1189 | "MappingNotify" |
1185 | }; |
1190 | }; |
|
|
1191 | #endif |
|
|
1192 | |
|
|
1193 | #ifdef DEBUG_X |
|
|
1194 | struct timeval tp; |
1186 | struct tm *ltt; |
1195 | struct tm *ltt; |
1187 | #endif |
|
|
1188 | |
|
|
1189 | /* |
|
|
1190 | * check if we need to get the time for any timeouts |
|
|
1191 | */ |
|
|
1192 | |
|
|
1193 | for (i = NUM_TIMEOUTS; i--; ) |
|
|
1194 | if (R->timeout[i].tv_sec) { |
|
|
1195 | want_timeout = 1; |
|
|
1196 | break; |
|
|
1197 | } |
|
|
1198 | |
|
|
1199 | #ifndef DEBUG_X |
|
|
1200 | if (want_timeout) |
|
|
1201 | #endif |
|
|
1202 | (void)gettimeofday(&tp, NULL); |
1196 | (void)gettimeofday(&tp, NULL); |
1203 | |
|
|
1204 | #ifdef DEBUG_X |
|
|
1205 | ltt = localtime(&(tp.tv_sec)); |
1197 | ltt = localtime(&(tp.tv_sec)); |
1206 | 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)); |
1198 | 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)); |
1207 | #endif |
1199 | #endif |
1208 | |
|
|
1209 | /* X event timeouts */ |
|
|
1210 | if (want_timeout) |
|
|
1211 | for (i = NUM_TIMEOUTS; i--; ) { |
|
|
1212 | if (R->timeout[i].tv_sec == 0) |
|
|
1213 | continue; |
|
|
1214 | if ((tp.tv_sec < R->timeout[i].tv_sec) |
|
|
1215 | || (tp.tv_sec == R->timeout[i].tv_sec |
|
|
1216 | && tp.tv_usec < R->timeout[i].tv_usec)) |
|
|
1217 | continue; |
|
|
1218 | R->timeout[i].tv_sec = 0; |
|
|
1219 | switch(i) { |
|
|
1220 | case TIMEOUT_INCR: |
|
|
1221 | rxvt_print_error("data loss: timeout on INCR selection paste"); |
|
|
1222 | R->selection_wait = Sel_none; |
|
|
1223 | break; |
|
|
1224 | default: |
|
|
1225 | break; |
|
|
1226 | } |
|
|
1227 | } |
|
|
1228 | |
1200 | |
1229 | switch (ev->type) { |
1201 | switch (ev->type) { |
1230 | case KeyPress: |
1202 | case KeyPress: |
1231 | rxvt_lookup_key(aR_ (XKeyEvent *)ev); |
1203 | rxvt_lookup_key(aR_ (XKeyEvent *)ev); |
1232 | break; |
1204 | break; |
… | |
… | |
1448 | &unused_xevent)) ; |
1420 | &unused_xevent)) ; |
1449 | while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, |
1421 | while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, |
1450 | GraphicsExpose, |
1422 | GraphicsExpose, |
1451 | &unused_xevent)) ; |
1423 | &unused_xevent)) ; |
1452 | if (isScrollbarWindow(ev->xany.window)) { |
1424 | if (isScrollbarWindow(ev->xany.window)) { |
1453 | scrollbar_setIdle(); |
1425 | R->scrollBar.setIdle(); |
1454 | rxvt_scrollbar_show(aR_ 0); |
1426 | rxvt_scrollbar_show(aR_ 0); |
1455 | } |
1427 | } |
1456 | #ifdef MENUBAR |
1428 | #ifdef MENUBAR |
1457 | if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) |
1429 | if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) |
1458 | rxvt_menubar_expose(aR); |
1430 | rxvt_menubar_expose(aR); |
… | |
… | |
1571 | */ |
1543 | */ |
1572 | if (ev->window == R->TermWin.vt) |
1544 | if (ev->window == R->TermWin.vt) |
1573 | { |
1545 | { |
1574 | #if RXVT_GRAPHICS |
1546 | #if RXVT_GRAPHICS |
1575 | if (ev->subwindow != None) |
1547 | if (ev->subwindow != None) |
1576 | rxvt_Gr_ButtonPress(ev->x, ev->y); |
1548 | rxvt_Gr_ButtonPress (ev->x, ev->y); |
1577 | else |
1549 | else |
1578 | #endif |
1550 | #endif |
1579 | { |
1551 | { |
1580 | clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; |
1552 | clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; |
1581 | if (reportmode) |
1553 | if (reportmode) |
… | |
… | |
1616 | if (ev->button != R->MEvent.button) |
1588 | if (ev->button != R->MEvent.button) |
1617 | R->MEvent.clicks = 0; |
1589 | R->MEvent.clicks = 0; |
1618 | switch (ev->button) |
1590 | switch (ev->button) |
1619 | { |
1591 | { |
1620 | case Button1: |
1592 | case Button1: |
|
|
1593 | /* allow shift+left click to extend selection */ |
|
|
1594 | if (ev->state & ShiftMask) |
|
|
1595 | { |
1621 | if (R->MEvent.button == Button1 && clickintime) |
1596 | if (R->MEvent.button == Button1 && clickintime) |
|
|
1597 | rxvt_selection_rotate (aR_ ev->x, ev->y); |
1622 | R->MEvent.clicks++; |
1598 | else |
|
|
1599 | rxvt_selection_extend (aR_ ev->x, ev->y, 1); |
|
|
1600 | } |
1623 | else |
1601 | else |
|
|
1602 | { |
|
|
1603 | if (R->MEvent.button == Button1 && clickintime) |
|
|
1604 | R->MEvent.clicks++; |
|
|
1605 | else |
1624 | R->MEvent.clicks = 1; |
1606 | R->MEvent.clicks = 1; |
|
|
1607 | |
1625 | rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); |
1608 | rxvt_selection_click (aR_ R->MEvent.clicks, ev->x, ev->y); |
|
|
1609 | } |
|
|
1610 | |
1626 | R->MEvent.button = Button1; |
1611 | R->MEvent.button = Button1; |
1627 | break; |
1612 | break; |
1628 | |
1613 | |
1629 | case Button3: |
1614 | case Button3: |
1630 | if (R->MEvent.button == Button3 && clickintime) |
1615 | if (R->MEvent.button == Button3 && clickintime) |
… | |
… | |
1643 | /* |
1628 | /* |
1644 | * Scrollbar window processing of button press |
1629 | * Scrollbar window processing of button press |
1645 | */ |
1630 | */ |
1646 | if (isScrollbarWindow(ev->window)) |
1631 | if (isScrollbarWindow(ev->window)) |
1647 | { |
1632 | { |
1648 | scrollbar_setIdle(); |
1633 | R->scrollBar.setIdle (); |
1649 | /* |
1634 | /* |
1650 | * Rxvt-style scrollbar: |
1635 | * Rxvt-style scrollbar: |
1651 | * move up if mouse is above slider |
1636 | * move up if mouse is above slider |
1652 | * move dn if mouse is below slider |
1637 | * move dn if mouse is below slider |
1653 | * |
1638 | * |
… | |
… | |
1665 | */ |
1650 | */ |
1666 | if ((R->scrollBar.style == R_SB_NEXT |
1651 | if ((R->scrollBar.style == R_SB_NEXT |
1667 | && scrollbarnext_upButton(ev->y)) |
1652 | && scrollbarnext_upButton(ev->y)) |
1668 | || (R->scrollBar.style == R_SB_RXVT |
1653 | || (R->scrollBar.style == R_SB_RXVT |
1669 | && scrollbarrxvt_upButton(ev->y))) |
1654 | && scrollbarrxvt_upButton(ev->y))) |
1670 | rxvt_tt_printf(aR_ "\033[A"); |
1655 | R->tt_printf("\033[A"); |
1671 | else if ((R->scrollBar.style == R_SB_NEXT |
1656 | else if ((R->scrollBar.style == R_SB_NEXT |
1672 | && scrollbarnext_dnButton(ev->y)) |
1657 | && scrollbarnext_dnButton(ev->y)) |
1673 | || (R->scrollBar.style == R_SB_RXVT |
1658 | || (R->scrollBar.style == R_SB_RXVT |
1674 | && scrollbarrxvt_dnButton(ev->y))) |
1659 | && scrollbarrxvt_dnButton(ev->y))) |
1675 | rxvt_tt_printf(aR_ "\033[B"); |
1660 | R->tt_printf("\033[B"); |
1676 | else |
1661 | else |
1677 | switch (ev->button) { |
1662 | switch (ev->button) { |
1678 | case Button2: |
1663 | case Button2: |
1679 | rxvt_tt_printf(aR_ "\014"); |
1664 | R->tt_printf("\014"); |
1680 | break; |
1665 | break; |
1681 | case Button1: |
1666 | case Button1: |
1682 | rxvt_tt_printf(aR_ "\033[6~"); |
1667 | R->tt_printf("\033[6~"); |
1683 | break; |
1668 | break; |
1684 | case Button3: |
1669 | case Button3: |
1685 | rxvt_tt_printf(aR_ "\033[5~"); |
1670 | R->tt_printf("\033[5~"); |
1686 | break; |
1671 | break; |
1687 | } |
1672 | } |
1688 | } |
1673 | } |
1689 | else |
1674 | else |
1690 | #endif /* NO_SCROLLBAR_REPORT */ |
1675 | #endif /* NO_SCROLLBAR_REPORT */ |
… | |
… | |
1706 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1691 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1707 | R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; |
1692 | R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; |
1708 | #endif |
1693 | #endif |
1709 | if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { |
1694 | if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { |
1710 | if (upordown < 0) |
1695 | if (upordown < 0) |
1711 | scrollbar_setUp(); |
1696 | R->scrollBar.setUp (); |
1712 | else |
1697 | else |
1713 | scrollbar_setDn(); |
1698 | R->scrollBar.setDn (); |
1714 | } |
1699 | } |
1715 | } else |
1700 | } else |
1716 | switch (ev->button) { |
1701 | switch (ev->button) { |
1717 | case Button2: |
1702 | case Button2: |
1718 | switch (R->scrollbar_align) { |
1703 | switch (R->scrollbar_align) { |
… | |
… | |
1730 | || scrollbar_above_slider(ev->y) |
1715 | || scrollbar_above_slider(ev->y) |
1731 | || scrollbar_below_slider(ev->y)) |
1716 | || scrollbar_below_slider(ev->y)) |
1732 | rxvt_scr_move_to(aR_ |
1717 | rxvt_scr_move_to(aR_ |
1733 | scrollbar_position(ev->y) - R->csrO, |
1718 | scrollbar_position(ev->y) - R->csrO, |
1734 | scrollbar_size()); |
1719 | scrollbar_size()); |
1735 | scrollbar_setMotion(); |
1720 | R->scrollBar.setMotion (); |
1736 | break; |
1721 | break; |
1737 | |
1722 | |
1738 | case Button1: |
1723 | case Button1: |
1739 | if (R->scrollbar_align == R_SB_ALIGN_CENTRE) |
1724 | if (R->scrollbar_align == R_SB_ALIGN_CENTRE) |
1740 | R->csrO = ev->y - R->scrollBar.top; |
1725 | R->csrO = ev->y - R->scrollBar.top; |
… | |
… | |
1753 | rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); |
1738 | rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); |
1754 | # else |
1739 | # else |
1755 | rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); |
1740 | rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); |
1756 | # endif |
1741 | # endif |
1757 | else |
1742 | else |
1758 | scrollbar_setMotion(); |
1743 | R->scrollBar.setMotion (); |
1759 | } else { |
1744 | } else { |
1760 | rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), |
1745 | rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), |
1761 | (R->TermWin.nrow |
1746 | (R->TermWin.nrow |
1762 | * scrollbar_position(ev->y) |
1747 | * scrollbar_position(ev->y) |
1763 | / scrollbar_size())); |
1748 | / scrollbar_size())); |
… | |
… | |
1785 | R->csrO = 0; /* reset csr Offset */ |
1770 | R->csrO = 0; /* reset csr Offset */ |
1786 | if (!R->bypass_keystate) |
1771 | if (!R->bypass_keystate) |
1787 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1772 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1788 | |
1773 | |
1789 | if (scrollbar_isUpDn()) { |
1774 | if (scrollbar_isUpDn()) { |
1790 | scrollbar_setIdle(); |
1775 | R->scrollBar.setIdle (); |
1791 | rxvt_scrollbar_show(aR_ 0); |
1776 | rxvt_scrollbar_show(aR_ 0); |
1792 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1777 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1793 | R->refresh_type &= ~SMOOTH_REFRESH; |
1778 | R->refresh_type &= ~SMOOTH_REFRESH; |
1794 | #endif |
1779 | #endif |
1795 | } |
1780 | } |
… | |
… | |
1846 | break; |
1831 | break; |
1847 | #ifdef MOUSE_WHEEL |
1832 | #ifdef MOUSE_WHEEL |
1848 | case Button4: |
1833 | case Button4: |
1849 | case Button5: |
1834 | case Button5: |
1850 | { |
1835 | { |
1851 | int i, v; |
1836 | int i; |
|
|
1837 | page_dirn v; |
1852 | |
1838 | |
1853 | v = (ev->button == Button4) ? UP : DN; |
1839 | v = (ev->button == Button4) ? UP : DN; |
1854 | if (ev->state & ShiftMask) |
1840 | if (ev->state & ShiftMask) |
1855 | i = 1; |
1841 | i = 1; |
1856 | else if ((R->Options & Opt_mouseWheelScrollPage)) |
1842 | else if ((R->Options & Opt_mouseWheelScrollPage)) |
… | |
… | |
2031 | n = 0; |
2017 | n = 0; |
2032 | if (pchanged) { |
2018 | if (pchanged) { |
2033 | for (; n < (unsigned int)i; n++) { |
2019 | for (; n < (unsigned int)i; n++) { |
2034 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); |
2020 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); |
2035 | D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
2021 | D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
2036 | if (wattr.depth != rootdepth || wattr.class == InputOnly) { |
2022 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { |
2037 | n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; |
2023 | n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; |
2038 | break; |
2024 | break; |
2039 | } |
2025 | } |
2040 | } |
2026 | } |
2041 | } |
2027 | } |
… | |
… | |
2091 | return stream; |
2077 | return stream; |
2092 | } |
2078 | } |
2093 | |
2079 | |
2094 | /* EXTPROTO */ |
2080 | /* EXTPROTO */ |
2095 | int |
2081 | int |
2096 | rxvt_pclose_printer(FILE *stream) |
2082 | rxvt_pclose_printer (FILE *stream) |
2097 | { |
2083 | { |
2098 | fflush(stream); |
2084 | fflush (stream); |
2099 | /* pclose() reported not to work on SunOS 4.1.3 */ |
2085 | /* pclose() reported not to work on SunOS 4.1.3 */ |
2100 | # if defined (__sun__) /* TODO: RESOLVE THIS */ |
2086 | # if defined (__sun__) /* TODO: RESOLVE THIS */ |
2101 | /* pclose works provided SIGCHLD handler uses waitpid */ |
2087 | /* pclose works provided SIGCHLD handler uses waitpid */ |
2102 | return pclose(stream); /* return fclose (stream); */ |
2088 | return pclose (stream); /* return fclose (stream); */ |
2103 | # else |
2089 | # else |
2104 | return pclose(stream); |
2090 | return pclose (stream); |
2105 | # endif |
2091 | # endif |
2106 | } |
2092 | } |
2107 | |
2093 | |
2108 | /* |
2094 | /* |
2109 | * simulate attached vt100 printer |
2095 | * simulate attached vt100 printer |
… | |
… | |
2172 | rxvt_process_nonprinting(pR_ unsigned char ch) |
2158 | rxvt_process_nonprinting(pR_ unsigned char ch) |
2173 | { |
2159 | { |
2174 | switch (ch) { |
2160 | switch (ch) { |
2175 | case C0_ENQ: /* terminal Status */ |
2161 | case C0_ENQ: /* terminal Status */ |
2176 | if (R->rs[Rs_answerbackstring]) |
2162 | if (R->rs[Rs_answerbackstring]) |
2177 | rxvt_tt_write(aR_ |
2163 | R->tt_write( |
2178 | (const unsigned char *)R->rs[Rs_answerbackstring], |
2164 | (const unsigned char *)R->rs[Rs_answerbackstring], |
2179 | (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); |
2165 | (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); |
2180 | else |
2166 | else |
2181 | rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, |
2167 | R->tt_write((unsigned char *)VT100_ANS, |
2182 | (unsigned int)STRLEN(VT100_ANS)); |
2168 | (unsigned int)STRLEN(VT100_ANS)); |
2183 | break; |
2169 | break; |
2184 | case C0_BEL: /* bell */ |
2170 | case C0_BEL: /* bell */ |
2185 | rxvt_scr_bell(aR); |
2171 | rxvt_scr_bell(aR); |
2186 | break; |
2172 | break; |
… | |
… | |
2249 | row = rxvt_cmd_getc(aR) - ' '; |
2235 | row = rxvt_cmd_getc(aR) - ' '; |
2250 | col = rxvt_cmd_getc(aR) - ' '; |
2236 | col = rxvt_cmd_getc(aR) - ' '; |
2251 | rxvt_scr_gotorc(aR_ row, col, 0); |
2237 | rxvt_scr_gotorc(aR_ row, col, 0); |
2252 | break; |
2238 | break; |
2253 | case 'Z': /* identify the terminal type */ |
2239 | case 'Z': /* identify the terminal type */ |
2254 | rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ |
2240 | R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ |
2255 | break; |
2241 | break; |
2256 | case '<': /* turn off VT52 mode */ |
2242 | case '<': /* turn off VT52 mode */ |
2257 | PrivMode(0, PrivMode_vt52); |
2243 | PrivMode(0, PrivMode_vt52); |
2258 | break; |
2244 | break; |
2259 | case 'F': /* use special graphics character set */ |
2245 | case 'F': /* use special graphics character set */ |
… | |
… | |
2366 | rxvt_process_dcs_seq(aR); |
2352 | rxvt_process_dcs_seq(aR); |
2367 | break; |
2353 | break; |
2368 | |
2354 | |
2369 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
2355 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
2370 | case C1_SCI: /* ESC Z */ |
2356 | case C1_SCI: /* ESC Z */ |
2371 | rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, |
2357 | R->tt_write((const unsigned char *)ESCZ_ANSWER, |
2372 | (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); |
2358 | (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); |
2373 | break; /* steal obsolete ESC [ c */ |
2359 | break; /* steal obsolete ESC [ c */ |
2374 | |
2360 | |
2375 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
2361 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
2376 | case C1_CSI: /* ESC [ */ |
2362 | case C1_CSI: /* ESC [ */ |
… | |
… | |
2497 | */ |
2483 | */ |
2498 | if (priv) { |
2484 | if (priv) { |
2499 | switch (priv) { |
2485 | switch (priv) { |
2500 | case '>': |
2486 | case '>': |
2501 | if (ch == CSI_DA) /* secondary device attributes */ |
2487 | if (ch == CSI_DA) /* secondary device attributes */ |
2502 | rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); |
2488 | R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); |
2503 | break; |
2489 | break; |
2504 | case '?': |
2490 | case '?': |
2505 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2491 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2506 | rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); |
2492 | rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); |
2507 | break; |
2493 | break; |
… | |
… | |
2610 | |
2596 | |
2611 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
2597 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
2612 | arg[0] = -arg[0]; |
2598 | arg[0] = -arg[0]; |
2613 | /* FALLTHROUGH */ |
2599 | /* FALLTHROUGH */ |
2614 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
2600 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
2615 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); |
2601 | R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); |
2616 | break; |
2602 | break; |
2617 | |
2603 | |
2618 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
2604 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
2619 | rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, |
2605 | R->tt_write((const unsigned char *)VT100_ANS, |
2620 | (unsigned int)(sizeof(VT100_ANS) - 1)); |
2606 | (unsigned int)(sizeof(VT100_ANS) - 1)); |
2621 | break; |
2607 | break; |
2622 | |
2608 | |
2623 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
2609 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
2624 | rxvt_process_sgr_mode(aR_ nargs, arg); |
2610 | rxvt_process_sgr_mode(aR_ nargs, arg); |
2625 | break; |
2611 | break; |
2626 | |
2612 | |
2627 | case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ |
2613 | case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ |
2628 | switch (arg[0]) { |
2614 | switch (arg[0]) { |
2629 | case 5: /* DSR requested */ |
2615 | case 5: /* DSR requested */ |
2630 | rxvt_tt_printf(aR_ "\033[0n"); |
2616 | R->tt_printf("\033[0n"); |
2631 | break; |
2617 | break; |
2632 | case 6: /* CPR requested */ |
2618 | case 6: /* CPR requested */ |
2633 | rxvt_scr_report_position(aR); |
2619 | rxvt_scr_report_position(aR); |
2634 | break; |
2620 | break; |
2635 | #if defined (ENABLE_DISPLAY_ANSWER) |
2621 | #if defined (ENABLE_DISPLAY_ANSWER) |
2636 | case 7: /* unofficial extension */ |
2622 | case 7: /* unofficial extension */ |
2637 | rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); |
2623 | R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); |
2638 | break; |
2624 | break; |
2639 | #endif |
2625 | #endif |
2640 | case 8: /* unofficial extension */ |
2626 | case 8: /* unofficial extension */ |
2641 | rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); |
2627 | rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); |
2642 | break; |
2628 | break; |
… | |
… | |
2711 | break; |
2697 | break; |
2712 | #endif |
2698 | #endif |
2713 | |
2699 | |
2714 | case CSI_78: /* DECREQTPARM */ |
2700 | case CSI_78: /* DECREQTPARM */ |
2715 | if (arg[0] == 0 || arg[0] == 1) |
2701 | if (arg[0] == 0 || arg[0] == 1) |
2716 | rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); |
2702 | R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); |
2717 | /* FALLTHROUGH */ |
2703 | /* FALLTHROUGH */ |
2718 | |
2704 | |
2719 | default: |
2705 | default: |
2720 | break; |
2706 | break; |
2721 | } |
2707 | } |
… | |
… | |
2775 | /* |
2761 | /* |
2776 | * reports - some output format copied from XTerm |
2762 | * reports - some output format copied from XTerm |
2777 | */ |
2763 | */ |
2778 | case 11: /* report window state */ |
2764 | case 11: /* report window state */ |
2779 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2765 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2780 | rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
2766 | R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
2781 | break; |
2767 | break; |
2782 | case 13: /* report window position */ |
2768 | case 13: /* report window position */ |
2783 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2769 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2784 | XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, |
2770 | XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, |
2785 | -wattr.border_width, -wattr.border_width, |
2771 | -wattr.border_width, -wattr.border_width, |
2786 | &x, &y, &wdummy); |
2772 | &x, &y, &wdummy); |
2787 | rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); |
2773 | R->tt_printf("\033[3;%d;%dt", x, y); |
2788 | break; |
2774 | break; |
2789 | case 14: /* report window size (pixels) */ |
2775 | case 14: /* report window size (pixels) */ |
2790 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2776 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2791 | rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); |
2777 | R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); |
2792 | break; |
2778 | break; |
2793 | case 18: /* report window size (chars) */ |
2779 | case 18: /* report window size (chars) */ |
2794 | rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); |
2780 | R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); |
2795 | break; |
2781 | break; |
2796 | #if 0 /* XXX: currently disabled due to security concerns */ |
2782 | #if 0 /* XXX: currently disabled due to security concerns */ |
2797 | case 20: /* report icon label */ |
2783 | case 20: /* report icon label */ |
2798 | XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); |
2784 | XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); |
2799 | rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ |
2785 | R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ |
2800 | break; |
2786 | break; |
2801 | case 21: /* report window title */ |
2787 | case 21: /* report window title */ |
2802 | XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); |
2788 | XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); |
2803 | rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ |
2789 | R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ |
2804 | break; |
2790 | break; |
2805 | #endif |
2791 | #endif |
2806 | } |
2792 | } |
2807 | } |
2793 | } |
2808 | #endif |
2794 | #endif |
… | |
… | |
3351 | { |
3337 | { |
3352 | unsigned char ch, cmd = rxvt_cmd_getc(aR); |
3338 | unsigned char ch, cmd = rxvt_cmd_getc(aR); |
3353 | |
3339 | |
3354 | #ifndef RXVT_GRAPHICS |
3340 | #ifndef RXVT_GRAPHICS |
3355 | if (cmd == 'Q') { /* query graphics */ |
3341 | if (cmd == 'Q') { /* query graphics */ |
3356 | rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ |
3342 | R->tt_printf("\033G0\n"); /* no graphics */ |
3357 | return; |
3343 | return; |
3358 | } |
3344 | } |
3359 | /* swallow other graphics sequences until terminating ':' */ |
3345 | /* swallow other graphics sequences until terminating ':' */ |
3360 | do |
3346 | do |
3361 | ch = rxvt_cmd_getc(aR); |
3347 | ch = rxvt_cmd_getc(aR); |
… | |
… | |
3364 | unsigned int nargs; |
3350 | unsigned int nargs; |
3365 | int args[NGRX_PTS]; |
3351 | int args[NGRX_PTS]; |
3366 | unsigned char *text = NULL; |
3352 | unsigned char *text = NULL; |
3367 | |
3353 | |
3368 | if (cmd == 'Q') { /* query graphics */ |
3354 | if (cmd == 'Q') { /* query graphics */ |
3369 | rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ |
3355 | R->tt_printf("\033G1\n"); /* yes, graphics (color) */ |
3370 | return; |
3356 | return; |
3371 | } |
3357 | } |
3372 | for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { |
3358 | for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { |
3373 | int neg; |
3359 | int neg; |
3374 | |
3360 | |
… | |
… | |
3389 | } |
3375 | } |
3390 | |
3376 | |
3391 | if ((cmd == 'T') && (nargs >= 5)) { |
3377 | if ((cmd == 'T') && (nargs >= 5)) { |
3392 | int i, len = args[4]; |
3378 | int i, len = args[4]; |
3393 | |
3379 | |
3394 | text = rxvt_malloc((len + 1) * sizeof(char)); |
3380 | text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); |
3395 | |
3381 | |
3396 | if (text != NULL) { |
3382 | if (text != NULL) { |
3397 | for (i = 0; i < len; i++) |
3383 | for (i = 0; i < len; i++) |
3398 | text[i] = rxvt_cmd_getc(aR); |
3384 | text[i] = rxvt_cmd_getc(aR); |
3399 | text[len] = '\0'; |
3385 | text[len] = '\0'; |
… | |
… | |
3408 | |
3394 | |
3409 | /* |
3395 | /* |
3410 | * Send printf() formatted output to the command. |
3396 | * Send printf() formatted output to the command. |
3411 | * Only use for small amounts of data. |
3397 | * Only use for small amounts of data. |
3412 | */ |
3398 | */ |
3413 | /* EXTPROTO */ |
|
|
3414 | void |
3399 | void |
3415 | rxvt_tt_printf(pR_ const char *fmt,...) |
3400 | rxvt_term::tt_printf (const char *fmt,...) |
3416 | { |
3401 | { |
3417 | va_list arg_ptr; |
3402 | va_list arg_ptr; |
3418 | unsigned char buf[256]; |
3403 | unsigned char buf[256]; |
3419 | |
3404 | |
3420 | va_start(arg_ptr, fmt); |
3405 | va_start (arg_ptr, fmt); |
3421 | vsprintf((char *)buf, fmt, arg_ptr); |
3406 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
3422 | va_end(arg_ptr); |
3407 | va_end (arg_ptr); |
3423 | rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); |
3408 | tt_write (buf, STRLEN (buf)); |
3424 | } |
3409 | } |
3425 | |
3410 | |
3426 | /* ---------------------------------------------------------------------- */ |
3411 | /* ---------------------------------------------------------------------- */ |
3427 | /* Addresses pasting large amounts of data and rxvt hang |
|
|
3428 | * code pinched from xterm (v_write()) and applied originally to |
|
|
3429 | * rxvt-2.18 - Hops |
|
|
3430 | * Write data to the pty as typed by the user, pasted with the mouse, |
3412 | /* Write data to the pty as typed by the user, pasted with the mouse, |
3431 | * or generated by us in response to a query ESC sequence. |
3413 | * or generated by us in response to a query ESC sequence. |
3432 | */ |
3414 | */ |
3433 | /* EXTPROTO */ |
|
|
3434 | void |
3415 | void |
3435 | rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) |
3416 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
3436 | { |
3417 | { |
3437 | #define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ |
3418 | enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT |
3438 | int riten; |
|
|
3439 | unsigned int p; |
|
|
3440 | unsigned char *v_buffer, /* start of physical buffer */ |
|
|
3441 | *v_bufstr, /* start of current buffer pending */ |
|
|
3442 | *v_bufptr, /* end of current buffer pending */ |
|
|
3443 | *v_bufend; /* end of physical buffer */ |
|
|
3444 | |
3419 | |
3445 | if (R->v_bufstr == NULL && len > 0) { |
3420 | if (len) |
3446 | p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
|
|
3447 | v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p); |
|
|
3448 | v_bufend = v_buffer + p; |
|
|
3449 | } else { |
|
|
3450 | v_buffer = R->v_buffer; |
|
|
3451 | v_bufstr = R->v_bufstr; |
|
|
3452 | v_bufptr = R->v_bufptr; |
|
|
3453 | v_bufend = R->v_bufend; |
|
|
3454 | } |
3421 | { |
|
|
3422 | if (v_buflen == 0) |
|
|
3423 | { |
|
|
3424 | int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); |
|
|
3425 | if (written == len) |
|
|
3426 | return; |
3455 | |
3427 | |
3456 | /* |
3428 | data += written; |
3457 | * Append to the block we already have. Always doing this simplifies the |
3429 | len -= written; |
3458 | * code, and isn't too bad, either. If this is a short block, it isn't |
3430 | } |
3459 | * too expensive, and if this is a long block, we won't be able to write |
3431 | |
3460 | * it all anyway. |
3432 | |
3461 | */ |
3433 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
3462 | if (len > 0) { |
3434 | |
3463 | if (v_bufend < v_bufptr + len) { /* run out of room */ |
3435 | memcpy (v_buffer + v_buflen, data, len); |
3464 | if (v_bufstr != v_buffer) { |
3436 | v_buflen += len; |
3465 | /* there is unused space, move everything down */ |
|
|
3466 | MEMMOVE(v_buffer, v_bufstr, |
|
|
3467 | (unsigned int)(v_bufptr - v_bufstr)); |
|
|
3468 | v_bufptr -= v_bufstr - v_buffer; |
|
|
3469 | v_bufstr = v_buffer; |
|
|
3470 | } |
3437 | } |
3471 | if (v_bufend < v_bufptr + len) { |
|
|
3472 | /* still won't fit: get more space */ |
|
|
3473 | /* use most basic realloc because an error is not fatal. */ |
|
|
3474 | unsigned int size = v_bufptr - v_buffer; |
|
|
3475 | unsigned int reallocto; |
|
|
3476 | |
3438 | |
3477 | reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
3439 | for (;;) |
3478 | v_buffer = (unsigned char *)realloc(v_buffer, reallocto); |
3440 | { |
3479 | /* save across realloc */ |
3441 | int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); |
3480 | if (v_buffer) { |
3442 | |
3481 | v_bufstr = v_buffer; |
3443 | if (written > 0) |
3482 | v_bufptr = v_buffer + size; |
3444 | { |
3483 | v_bufend = v_buffer + reallocto; |
3445 | v_buflen -= written; |
3484 | } else { /* no memory: ignore entire write request */ |
3446 | |
3485 | rxvt_print_error("data loss: cannot allocate buffer space"); |
3447 | if (v_buflen == 0) |
3486 | v_buffer = v_bufstr; /* restore clobbered pointer */ |
3448 | { |
3487 | } |
3449 | free (v_buffer); |
|
|
3450 | v_buffer = 0; |
|
|
3451 | v_buflen = 0; |
|
|
3452 | |
|
|
3453 | pty_ev.set (EVENT_READ); |
|
|
3454 | return; |
|
|
3455 | } |
|
|
3456 | |
|
|
3457 | memmove (v_buffer, v_buffer + written, v_buflen); |
|
|
3458 | } |
|
|
3459 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
3460 | // original code just ignores this... |
|
|
3461 | destroy (); |
|
|
3462 | else |
|
|
3463 | { |
|
|
3464 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
3465 | return; |
|
|
3466 | } |
3488 | } |
3467 | } |
3489 | } |
|
|
3490 | if (v_bufend >= v_bufptr + len) { /* new stuff will fit */ |
|
|
3491 | MEMCPY(v_bufptr, d, len); |
|
|
3492 | v_bufptr += len; |
|
|
3493 | } |
|
|
3494 | } |
|
|
3495 | |
|
|
3496 | /* |
|
|
3497 | * Write out as much of the buffer as we can. |
|
|
3498 | * Be careful not to overflow the pty's input silo. |
|
|
3499 | * We are conservative here and only write a small amount at a time. |
|
|
3500 | * |
|
|
3501 | * If we can't push all the data into the pty yet, we expect write |
|
|
3502 | * to return a non-negative number less than the length requested |
|
|
3503 | * (if some data written) or -1 and set errno to EAGAIN, |
|
|
3504 | * EWOULDBLOCK, or EINTR (if no data written). |
|
|
3505 | * |
|
|
3506 | * (Not all systems do this, sigh, so the code is actually |
|
|
3507 | * a little more forgiving.) |
|
|
3508 | */ |
|
|
3509 | if ((p = v_bufptr - v_bufstr) > 0) { |
|
|
3510 | riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE)); |
|
|
3511 | if (riten < 0) |
|
|
3512 | riten = 0; |
|
|
3513 | v_bufstr += riten; |
|
|
3514 | if (v_bufstr >= v_bufptr) /* we wrote it all */ |
|
|
3515 | v_bufstr = v_bufptr = v_buffer; |
|
|
3516 | } |
|
|
3517 | /* |
|
|
3518 | * If we have lots of unused memory allocated, return it |
|
|
3519 | */ |
|
|
3520 | if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */ |
|
|
3521 | /* save pointers across realloc */ |
|
|
3522 | unsigned int start = v_bufstr - v_buffer; |
|
|
3523 | unsigned int size = v_bufptr - v_buffer; |
|
|
3524 | unsigned int reallocto; |
|
|
3525 | |
|
|
3526 | reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
|
|
3527 | v_buffer = (unsigned char *)realloc(v_buffer, reallocto); |
|
|
3528 | if (v_buffer) { |
|
|
3529 | v_bufstr = v_buffer + start; |
|
|
3530 | v_bufptr = v_buffer + size; |
|
|
3531 | v_bufend = v_buffer + reallocto; |
|
|
3532 | } else { |
|
|
3533 | /* should we print a warning if couldn't return memory? */ |
|
|
3534 | v_buffer = v_bufstr - start; /* restore clobbered pointer */ |
|
|
3535 | } |
|
|
3536 | } |
|
|
3537 | R->v_buffer = v_buffer; |
|
|
3538 | R->v_bufstr = v_bufstr; |
|
|
3539 | R->v_bufptr = v_bufptr; |
|
|
3540 | R->v_bufend = v_bufend; |
|
|
3541 | } |
3468 | } |
|
|
3469 | |
3542 | /*----------------------- end-of-file (C source) -----------------------*/ |
3470 | /*----------------------- end-of-file (C source) -----------------------*/ |
3543 | |
3471 | |