1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: command.c |
2 | * File: command.c |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * $Id: command.C,v 1.8 2003/11/26 10:42:34 pcg Exp $ |
4 | * $Id: command.C,v 1.19 2003/12/18 05:45:11 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> |
… | |
… | |
61 | unsigned int newlen; |
61 | unsigned int newlen; |
62 | KeySym keysym; |
62 | KeySym keysym; |
63 | #ifdef DEBUG_CMD |
63 | #ifdef DEBUG_CMD |
64 | static int debug_key = 1; /* accessible by a debugger only */ |
64 | static int debug_key = 1; /* accessible by a debugger only */ |
65 | #endif |
65 | #endif |
66 | #ifdef USE_XIM |
|
|
67 | int valid_keysym; |
66 | int valid_keysym; |
68 | #endif |
|
|
69 | unsigned char *kbuf = R->kbuf; |
67 | unsigned char *kbuf = R->kbuf; |
70 | |
68 | |
71 | /* |
69 | /* |
72 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
70 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
73 | * escape sequence to toggle the Keypad. |
71 | * escape sequence to toggle the Keypad. |
… | |
… | |
75 | * Always permit `shift' to override the current setting |
73 | * Always permit `shift' to override the current setting |
76 | */ |
74 | */ |
77 | shft = (ev->state & ShiftMask); |
75 | shft = (ev->state & ShiftMask); |
78 | ctrl = (ev->state & ControlMask); |
76 | ctrl = (ev->state & ControlMask); |
79 | meta = (ev->state & R->ModMetaMask); |
77 | meta = (ev->state & R->ModMetaMask); |
|
|
78 | |
80 | if (R->numlock_state || (ev->state & R->ModNumLockMask)) { |
79 | if (R->numlock_state || (ev->state & R->ModNumLockMask)) |
|
|
80 | { |
81 | R->numlock_state = (ev->state & R->ModNumLockMask); |
81 | R->numlock_state = (ev->state & R->ModNumLockMask); |
82 | PrivMode((!R->numlock_state), PrivMode_aplKP); |
82 | PrivMode((!R->numlock_state), PrivMode_aplKP); |
83 | } |
83 | } |
|
|
84 | |
|
|
85 | kbuf[0] = 0; |
|
|
86 | |
84 | #ifdef USE_XIM |
87 | #ifdef USE_XIM |
85 | if (R->Input_Context != NULL) { |
88 | if (R->Input_Context) |
|
|
89 | { |
86 | Status status_return; |
90 | Status status_return; |
87 | |
91 | |
88 | kbuf[0] = '\0'; |
|
|
89 | #ifdef X_HAVE_UTF8_STRING |
92 | #ifdef X_HAVE_UTF8_STRING |
90 | len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, |
93 | len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, |
91 | KBUFSZ, &keysym, &status_return); |
94 | KBUFSZ, &keysym, &status_return); |
92 | #else |
95 | #else |
|
|
96 | wchar_t wkbuf[KBUFSZ + 1]; |
|
|
97 | |
|
|
98 | // assume wchar_t == unicode or better |
93 | len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, |
99 | len = XwcLookupString (R->Input_Context, ev, wkbuf, |
94 | KBUFSZ, &keysym, &status_return); |
100 | KBUFSZ, &keysym, &status_return); |
|
|
101 | |
|
|
102 | if (status_return == XLookupChars |
|
|
103 | || status_return == XLookupBoth) |
|
|
104 | { |
|
|
105 | wkbuf[len] = 0; |
|
|
106 | len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); |
|
|
107 | } |
|
|
108 | else |
|
|
109 | len = 0; |
95 | #endif |
110 | #endif |
96 | valid_keysym = ((status_return == XLookupKeySym) |
111 | valid_keysym = status_return == XLookupKeySym |
97 | || (status_return == XLookupBoth)); |
112 | || status_return == XLookupBoth; |
|
|
113 | } |
98 | } else { |
114 | else |
|
|
115 | #endif |
|
|
116 | { |
99 | len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, |
117 | len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); |
100 | &R->compose); |
|
|
101 | valid_keysym = 1; |
118 | valid_keysym = !len; |
102 | } |
119 | } |
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 | |
120 | |
120 | #ifdef USE_XIM |
|
|
121 | if (valid_keysym) |
121 | if (valid_keysym) |
122 | #endif |
|
|
123 | { |
122 | { |
124 | /* for some backwards compatibility */ |
123 | /* for some backwards compatibility */ |
125 | #if defined(HOTKEY_CTRL) || defined(HOTKEY_META) |
124 | #if defined(HOTKEY_CTRL) || defined(HOTKEY_META) |
126 | # ifdef HOTKEY_CTRL |
125 | # ifdef HOTKEY_CTRL |
127 | if (ctrl) { |
126 | if (ctrl) |
128 | # else |
127 | # else |
129 | if (meta) { |
128 | if (meta) |
130 | # endif |
129 | # endif |
|
|
130 | { |
131 | if (keysym == R->ks_bigfont) { |
131 | if (keysym == R->ks_bigfont) |
|
|
132 | { |
132 | rxvt_change_font(aR_ 0, FONT_UP); |
133 | rxvt_change_font(aR_ 0, FONT_UP); |
133 | return; |
134 | return; |
|
|
135 | } |
134 | } else if (keysym == R->ks_smallfont) { |
136 | else if (keysym == R->ks_smallfont) |
|
|
137 | { |
135 | rxvt_change_font(aR_ 0, FONT_DN); |
138 | rxvt_change_font(aR_ 0, FONT_DN); |
136 | return; |
139 | return; |
137 | } |
140 | } |
138 | } |
141 | } |
139 | #endif |
142 | #endif |
140 | |
143 | |
141 | if (R->TermWin.saveLines) { |
144 | if (R->TermWin.saveLines) { |
142 | #ifdef UNSHIFTED_SCROLLKEYS |
145 | #ifdef UNSHIFTED_SCROLLKEYS |
143 | if (!ctrl && !meta) { |
146 | if (!ctrl && !meta) { |
… | |
… | |
237 | /* escape prefix */ |
240 | /* escape prefix */ |
238 | if (meta) |
241 | if (meta) |
239 | # ifdef META8_OPTION |
242 | # ifdef META8_OPTION |
240 | if (R->meta_char == C0_ESC) |
243 | if (R->meta_char == C0_ESC) |
241 | # endif |
244 | # endif |
242 | rxvt_tt_write(aR_ &ch, 1); |
245 | R->tt_write (&ch, 1); |
243 | rxvt_tt_write(aR_ kbuf0, l); |
246 | R->tt_write (kbuf0, l); |
244 | return; |
247 | return; |
245 | } else |
248 | } else |
246 | #endif |
249 | #endif |
247 | { |
250 | { |
248 | newlen = 1; |
251 | newlen = 1; |
… | |
… | |
572 | if (R->greek_mode) |
575 | if (R->greek_mode) |
573 | len = greek_xlat(kbuf, len); |
576 | len = greek_xlat(kbuf, len); |
574 | #endif |
577 | #endif |
575 | /* nil */ ; |
578 | /* nil */ ; |
576 | } |
579 | } |
577 | } |
580 | } |
578 | |
581 | |
579 | if (len <= 0) |
582 | if (len <= 0) |
580 | return; /* not mapped */ |
583 | return; /* not mapped */ |
581 | |
584 | |
582 | if (R->Options & Opt_scrollTtyKeypress) |
585 | if (R->Options & Opt_scrollTtyKeypress) |
… | |
… | |
605 | && (R->meta_char == C0_ESC) |
608 | && (R->meta_char == C0_ESC) |
606 | #endif |
609 | #endif |
607 | ) { |
610 | ) { |
608 | const unsigned char ch = C0_ESC; |
611 | const unsigned char ch = C0_ESC; |
609 | |
612 | |
610 | rxvt_tt_write(aR_ &ch, 1); |
613 | R->tt_write(&ch, 1); |
611 | } |
614 | } |
612 | #ifdef DEBUG_CMD |
615 | #ifdef DEBUG_CMD |
613 | if (debug_key) { /* Display keyboard buffer contents */ |
616 | if (debug_key) { /* Display keyboard buffer contents */ |
614 | char *p; |
617 | char *p; |
615 | int i; |
618 | int i; |
… | |
… | |
618 | for (i = 0, p = kbuf; i < len; i++, p++) |
621 | for (i = 0, p = kbuf; i < len; i++, p++) |
619 | fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
622 | fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
620 | fprintf(stderr, "'\n"); |
623 | fprintf(stderr, "'\n"); |
621 | } |
624 | } |
622 | #endif /* DEBUG_CMD */ |
625 | #endif /* DEBUG_CMD */ |
623 | rxvt_tt_write(aR_ kbuf, (unsigned int)len); |
626 | R->tt_write(kbuf, (unsigned int)len); |
624 | } |
627 | } |
625 | /*}}} */ |
628 | /*}}} */ |
626 | |
629 | |
627 | #if (MENUBAR_MAX) |
630 | #if (MENUBAR_MAX) |
628 | /*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ |
631 | /*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ |
… | |
… | |
654 | R->cmdbuf_ptr = cmdbuf_ptr; |
657 | R->cmdbuf_ptr = cmdbuf_ptr; |
655 | R->cmdbuf_endp = cmdbuf_endp; |
658 | R->cmdbuf_endp = cmdbuf_endp; |
656 | return 0; |
659 | return 0; |
657 | } |
660 | } |
658 | #endif /* MENUBAR_MAX */ |
661 | #endif /* MENUBAR_MAX */ |
|
|
662 | |
|
|
663 | void |
|
|
664 | rxvt_term::flush () |
|
|
665 | { |
|
|
666 | #ifdef TRANSPARENT |
|
|
667 | if (want_full_refresh) |
|
|
668 | { |
|
|
669 | want_full_refresh = 0; |
|
|
670 | rxvt_scr_clear (this); |
|
|
671 | rxvt_scr_touch (this, False); |
|
|
672 | want_refresh = 1; |
|
|
673 | } |
|
|
674 | #endif |
|
|
675 | |
|
|
676 | if (want_refresh) |
|
|
677 | { |
|
|
678 | rxvt_scr_refresh (this, refresh_type); |
|
|
679 | rxvt_scrollbar_show (this, 1); |
|
|
680 | #ifdef USE_XIM |
|
|
681 | rxvt_IMSendSpot (this); |
|
|
682 | #endif |
|
|
683 | } |
|
|
684 | |
|
|
685 | XFlush (Xdisplay); |
|
|
686 | #if 0 |
|
|
687 | if (XPending (Xdisplay)) process_x_events (); |
|
|
688 | if (XPending (Xdisplay)) process_x_events (); |
|
|
689 | #endif |
|
|
690 | } |
|
|
691 | |
|
|
692 | void |
|
|
693 | rxvt_term::check_cb (check_watcher &w) |
|
|
694 | { |
|
|
695 | SET_R (this); |
|
|
696 | SET_LOCALE (locale); |
|
|
697 | |
|
|
698 | flush (); |
|
|
699 | } |
659 | |
700 | |
660 | void |
701 | void |
661 | rxvt_term::process_x_events () |
702 | rxvt_term::process_x_events () |
662 | { |
703 | { |
663 | do |
704 | do |
… | |
… | |
707 | rxvt_term::blink_cb (time_watcher &w) |
748 | rxvt_term::blink_cb (time_watcher &w) |
708 | { |
749 | { |
709 | w.at += BLINK_INTERVAL; |
750 | w.at += BLINK_INTERVAL; |
710 | hidden_cursor = !hidden_cursor; |
751 | hidden_cursor = !hidden_cursor; |
711 | want_refresh = 1; |
752 | want_refresh = 1; |
712 | flush (); |
|
|
713 | } |
753 | } |
714 | |
754 | |
715 | void |
755 | void |
716 | rxvt_term::x_cb (io_watcher &w, short revents) |
756 | rxvt_term::x_cb (io_watcher &w, short revents) |
717 | { |
757 | { |
|
|
758 | SET_R (this); |
|
|
759 | SET_LOCALE (locale); |
|
|
760 | |
718 | process_x_events (); |
761 | process_x_events (); |
|
|
762 | } |
719 | |
763 | |
720 | flush (); |
764 | bool |
|
|
765 | rxvt_term::pty_fill () |
|
|
766 | { |
|
|
767 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
|
|
768 | |
|
|
769 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
|
|
770 | cmdbuf_ptr = cmdbuf_base; |
|
|
771 | cmdbuf_endp = cmdbuf_ptr + n; |
|
|
772 | |
|
|
773 | n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); |
|
|
774 | |
|
|
775 | if (n > 0) |
|
|
776 | { |
|
|
777 | cmdbuf_endp += n; |
|
|
778 | return true; |
|
|
779 | } |
|
|
780 | else if (n < 0 && errno != EAGAIN) |
|
|
781 | destroy (); |
|
|
782 | |
|
|
783 | return false; |
|
|
784 | } |
|
|
785 | |
|
|
786 | void |
|
|
787 | rxvt_term::pty_cb (io_watcher &w, short revents) |
|
|
788 | { |
|
|
789 | SET_R (this); |
|
|
790 | SET_LOCALE (locale); |
|
|
791 | |
|
|
792 | if (revents & EVENT_WRITE) |
|
|
793 | tt_write (0, 0); |
|
|
794 | else if (revents & EVENT_READ) |
|
|
795 | { |
|
|
796 | bool flag = true; |
|
|
797 | |
|
|
798 | // loop, but don't allow a single term to monopolize us |
|
|
799 | // the number of loops is fully arbitrary, and thus wrong |
|
|
800 | while (flag && pty_fill ()) |
|
|
801 | { |
|
|
802 | if (!seen_input) |
|
|
803 | { |
|
|
804 | seen_input = 1; |
|
|
805 | /* once we know the shell is running, send the screen size. Again! */ |
|
|
806 | tt_winch (); |
|
|
807 | } |
|
|
808 | |
|
|
809 | uint32_t ch = NOCHAR; |
|
|
810 | |
|
|
811 | for (;;) |
|
|
812 | { |
|
|
813 | if (ch == NOCHAR) |
|
|
814 | ch = next_char (); |
|
|
815 | |
|
|
816 | if (ch == NOCHAR) // TODO: improve |
|
|
817 | break; |
|
|
818 | |
|
|
819 | if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') |
|
|
820 | { |
|
|
821 | /* Read a text string from the input buffer */ |
|
|
822 | uint32_t buf[BUFSIZ]; |
|
|
823 | bool refreshnow = false; |
|
|
824 | int nlines = 0; |
|
|
825 | uint32_t *str = buf; |
|
|
826 | |
|
|
827 | *str++ = ch; |
|
|
828 | |
|
|
829 | for (;;) |
|
|
830 | { |
|
|
831 | ch = next_char (); |
|
|
832 | |
|
|
833 | if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) |
|
|
834 | break; |
|
|
835 | else |
|
|
836 | { |
|
|
837 | *str++ = ch; |
|
|
838 | |
|
|
839 | if (ch == '\n') |
|
|
840 | { |
|
|
841 | nlines++; |
|
|
842 | refresh_count++; |
|
|
843 | |
|
|
844 | if (!(Options & Opt_jumpScroll) |
|
|
845 | || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) |
|
|
846 | { |
|
|
847 | refreshnow = true; |
|
|
848 | flag = false; |
|
|
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 | } |
721 | } |
901 | } |
722 | |
902 | |
723 | // read the next character, currently handles UTF-8 |
903 | // read the next character, currently handles UTF-8 |
724 | // will probably handle all sorts of other stuff in the future |
904 | // will probably handle all sorts of other stuff in the future |
725 | uint32_t |
905 | uint32_t |
… | |
… | |
773 | } |
953 | } |
774 | |
954 | |
775 | return NOCHAR; |
955 | return NOCHAR; |
776 | } |
956 | } |
777 | |
957 | |
778 | bool |
|
|
779 | rxvt_term::pty_fill () |
|
|
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, BUFSIZ - n); |
|
|
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 | // loop, but don't allow a single term to monopolize us |
|
|
805 | // the number of loops is fully arbitrary, and thus wrong |
|
|
806 | for (int i = 7; i-- && pty_fill (); ) |
|
|
807 | { |
|
|
808 | //TODO: |
|
|
809 | /* once we know the shell is running, send the screen size. Again! */ |
|
|
810 | //ch = rxvt_cmd_getc(aR); /* wait for something */ |
|
|
811 | //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid); |
|
|
812 | |
|
|
813 | uint32_t ch = NOCHAR; |
|
|
814 | |
|
|
815 | for (;;) |
|
|
816 | { |
|
|
817 | if (ch == NOCHAR) |
|
|
818 | ch = next_char (); |
|
|
819 | |
|
|
820 | if (ch == NOCHAR) // TODO: improve |
|
|
821 | break; |
|
|
822 | |
|
|
823 | if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') |
|
|
824 | { |
|
|
825 | /* Read a text string from the input buffer */ |
|
|
826 | uint32_t buf[BUFSIZ]; |
|
|
827 | bool refreshnow = false; |
|
|
828 | int nlines = 0; |
|
|
829 | uint32_t *str = buf; |
|
|
830 | |
|
|
831 | *str++ = ch; |
|
|
832 | |
|
|
833 | for (;;) |
|
|
834 | { |
|
|
835 | ch = next_char (); |
|
|
836 | |
|
|
837 | if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) |
|
|
838 | break; |
|
|
839 | else |
|
|
840 | { |
|
|
841 | *str++ = ch; |
|
|
842 | |
|
|
843 | if (ch == '\n') |
|
|
844 | { |
|
|
845 | nlines++; |
|
|
846 | refresh_count++; |
|
|
847 | |
|
|
848 | if (!(Options & Opt_jumpScroll) |
|
|
849 | || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) |
|
|
850 | { |
|
|
851 | refreshnow = true; |
|
|
852 | ch = NOCHAR; |
|
|
853 | break; |
|
|
854 | } |
|
|
855 | } |
|
|
856 | |
|
|
857 | if (str >= buf + BUFSIZ) |
|
|
858 | { |
|
|
859 | ch = NOCHAR; |
|
|
860 | break; |
|
|
861 | } |
|
|
862 | } |
|
|
863 | } |
|
|
864 | |
|
|
865 | rxvt_scr_add_lines (this, buf, nlines, str - buf); |
|
|
866 | |
|
|
867 | /* |
|
|
868 | * If there have been a lot of new lines, then update the screen |
|
|
869 | * What the heck I'll cheat and only refresh less than every page-full. |
|
|
870 | * the number of pages between refreshes is refresh_limit, which |
|
|
871 | * is incremented here because we must be doing flat-out scrolling. |
|
|
872 | * |
|
|
873 | * refreshing should be correct for small scrolls, because of the |
|
|
874 | * time-out |
|
|
875 | */ |
|
|
876 | if (refreshnow) |
|
|
877 | { |
|
|
878 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
|
|
879 | refresh_limit++; |
|
|
880 | |
|
|
881 | rxvt_scr_refresh (this, refresh_type); |
|
|
882 | } |
|
|
883 | |
|
|
884 | } |
|
|
885 | else |
|
|
886 | { |
|
|
887 | switch (ch) |
|
|
888 | { |
|
|
889 | default: |
|
|
890 | rxvt_process_nonprinting (this, ch); |
|
|
891 | break; |
|
|
892 | case C0_ESC: /* escape char */ |
|
|
893 | rxvt_process_escape_seq (this); |
|
|
894 | break; |
|
|
895 | /*case 0x9b: */ /* CSI */ |
|
|
896 | /* rxvt_process_csi_seq (this); */ |
|
|
897 | } |
|
|
898 | |
|
|
899 | ch = NOCHAR; |
|
|
900 | } |
|
|
901 | } |
|
|
902 | } |
|
|
903 | |
|
|
904 | flush (); |
|
|
905 | } |
|
|
906 | |
|
|
907 | void |
|
|
908 | rxvt_term::flush () |
|
|
909 | { |
|
|
910 | #ifdef TRANSPARENT |
|
|
911 | if (want_full_refresh) |
|
|
912 | { |
|
|
913 | want_full_refresh = 0; |
|
|
914 | rxvt_scr_clear (this); |
|
|
915 | rxvt_scr_touch (this, False); |
|
|
916 | want_refresh = 1; |
|
|
917 | } |
|
|
918 | #endif |
|
|
919 | |
|
|
920 | if (want_refresh) |
|
|
921 | { |
|
|
922 | rxvt_scr_refresh (this, refresh_type); |
|
|
923 | rxvt_scrollbar_show (this, 1); |
|
|
924 | #ifdef USE_XIM |
|
|
925 | rxvt_IMSendSpot (this); |
|
|
926 | #endif |
|
|
927 | } |
|
|
928 | |
|
|
929 | if (XPending (Xdisplay)) process_x_events (); |
|
|
930 | XFlush (Xdisplay); |
|
|
931 | if (XPending (Xdisplay)) process_x_events (); |
|
|
932 | } |
|
|
933 | |
|
|
934 | /* rxvt_cmd_getc() - Return next input character */ |
958 | /* rxvt_cmd_getc() - Return next input character */ |
935 | /* |
959 | /* |
936 | * Return the next input character after first passing any keyboard input |
960 | * Return the next input character after first passing any keyboard input |
937 | * to the command. |
961 | * to the command. |
938 | */ |
962 | */ |
… | |
… | |
965 | |
989 | |
966 | for (;;) { |
990 | for (;;) { |
967 | /* loop until we can return something */ |
991 | /* loop until we can return something */ |
968 | |
992 | |
969 | if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ |
993 | if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ |
970 | rxvt_tt_write(aR_ NULL, 0); |
994 | R->tt_write(NULL, 0); |
971 | |
995 | |
972 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
996 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
973 | if (R->mouse_slip_wheel_speed) { |
997 | if (R->mouse_slip_wheel_speed) { |
974 | quick_timeout = 1; |
998 | quick_timeout = 1; |
975 | if (!R->mouse_slip_wheel_delay-- |
999 | if (!R->mouse_slip_wheel_delay-- |
… | |
… | |
1015 | |
1039 | |
1016 | void |
1040 | void |
1017 | rxvt_term::pointer_unblank () |
1041 | rxvt_term::pointer_unblank () |
1018 | { |
1042 | { |
1019 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1043 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1020 | rxvt_recolour_cursor (this); |
1044 | recolour_cursor (); |
1021 | |
1045 | |
1022 | #ifdef POINTER_BLANK |
1046 | #ifdef POINTER_BLANK |
1023 | hidden_pointer = 0; |
1047 | hidden_pointer = 0; |
1024 | |
1048 | |
1025 | if (Options & Opt_pointerBlank) |
1049 | if (Options & Opt_pointerBlank) |
… | |
… | |
1043 | } |
1067 | } |
1044 | |
1068 | |
1045 | void |
1069 | void |
1046 | rxvt_term::pointer_cb (time_watcher &w) |
1070 | rxvt_term::pointer_cb (time_watcher &w) |
1047 | { |
1071 | { |
|
|
1072 | SET_R (this); |
|
|
1073 | SET_LOCALE (locale); |
|
|
1074 | |
1048 | pointer_blank (); |
1075 | pointer_blank (); |
1049 | } |
1076 | } |
1050 | #endif |
1077 | #endif |
1051 | |
1078 | |
1052 | /* INTPROTO */ |
1079 | /* INTPROTO */ |
… | |
… | |
1106 | fprintf(stderr, "]: <%d>, %d/%d\n", |
1133 | fprintf(stderr, "]: <%d>, %d/%d\n", |
1107 | button_number, |
1134 | button_number, |
1108 | x + 1, |
1135 | x + 1, |
1109 | y + 1); |
1136 | y + 1); |
1110 | #else |
1137 | #else |
1111 | rxvt_tt_printf(aR_ "\033[M%c%c%c", |
1138 | R->tt_printf("\033[M%c%c%c", |
1112 | (32 + button_number + key_state), |
1139 | (32 + button_number + key_state), |
1113 | (32 + x + 1), |
1140 | (32 + x + 1), |
1114 | (32 + y + 1)); |
1141 | (32 + y + 1)); |
1115 | #endif |
1142 | #endif |
1116 | } |
1143 | } |
… | |
… | |
1133 | { |
1160 | { |
1134 | int i, want_timeout; |
1161 | int i, want_timeout; |
1135 | Window unused_root, unused_child; |
1162 | Window unused_root, unused_child; |
1136 | int unused_root_x, unused_root_y; |
1163 | int unused_root_x, unused_root_y; |
1137 | unsigned int unused_mask; |
1164 | unsigned int unused_mask; |
1138 | struct timeval tp; |
|
|
1139 | |
1165 | |
1140 | #ifdef DEBUG_X |
1166 | #ifdef DEBUG_X |
1141 | const char *const eventnames[] = |
1167 | const char *const eventnames[] = |
1142 | { /* mason - this matches my system */ |
1168 | { /* mason - this matches my system */ |
1143 | "", |
1169 | "", |
… | |
… | |
1174 | "SelectionNotify", |
1200 | "SelectionNotify", |
1175 | "ColormapNotify", |
1201 | "ColormapNotify", |
1176 | "ClientMessage", |
1202 | "ClientMessage", |
1177 | "MappingNotify" |
1203 | "MappingNotify" |
1178 | }; |
1204 | }; |
|
|
1205 | #endif |
|
|
1206 | |
|
|
1207 | #ifdef DEBUG_X |
|
|
1208 | struct timeval tp; |
1179 | struct tm *ltt; |
1209 | struct tm *ltt; |
1180 | #endif |
|
|
1181 | |
|
|
1182 | /* |
|
|
1183 | * check if we need to get the time for any timeouts |
|
|
1184 | */ |
|
|
1185 | |
|
|
1186 | for (i = NUM_TIMEOUTS; i--; ) |
|
|
1187 | if (R->timeout[i].tv_sec) { |
|
|
1188 | want_timeout = 1; |
|
|
1189 | break; |
|
|
1190 | } |
|
|
1191 | |
|
|
1192 | #ifndef DEBUG_X |
|
|
1193 | if (want_timeout) |
|
|
1194 | #endif |
|
|
1195 | (void)gettimeofday(&tp, NULL); |
1210 | (void)gettimeofday(&tp, NULL); |
1196 | |
|
|
1197 | #ifdef DEBUG_X |
|
|
1198 | ltt = localtime(&(tp.tv_sec)); |
1211 | ltt = localtime(&(tp.tv_sec)); |
1199 | 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)); |
1212 | 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)); |
1200 | #endif |
1213 | #endif |
1201 | |
|
|
1202 | /* X event timeouts */ |
|
|
1203 | if (want_timeout) |
|
|
1204 | for (i = NUM_TIMEOUTS; i--; ) { |
|
|
1205 | if (R->timeout[i].tv_sec == 0) |
|
|
1206 | continue; |
|
|
1207 | if ((tp.tv_sec < R->timeout[i].tv_sec) |
|
|
1208 | || (tp.tv_sec == R->timeout[i].tv_sec |
|
|
1209 | && tp.tv_usec < R->timeout[i].tv_usec)) |
|
|
1210 | continue; |
|
|
1211 | R->timeout[i].tv_sec = 0; |
|
|
1212 | switch(i) { |
|
|
1213 | case TIMEOUT_INCR: |
|
|
1214 | rxvt_print_error("data loss: timeout on INCR selection paste"); |
|
|
1215 | R->selection_wait = Sel_none; |
|
|
1216 | break; |
|
|
1217 | default: |
|
|
1218 | break; |
|
|
1219 | } |
|
|
1220 | } |
|
|
1221 | |
1214 | |
1222 | switch (ev->type) { |
1215 | switch (ev->type) { |
1223 | case KeyPress: |
1216 | case KeyPress: |
1224 | rxvt_lookup_key(aR_ (XKeyEvent *)ev); |
1217 | rxvt_lookup_key(aR_ (XKeyEvent *)ev); |
1225 | break; |
1218 | break; |
… | |
… | |
1249 | break; |
1242 | break; |
1250 | |
1243 | |
1251 | case ClientMessage: |
1244 | case ClientMessage: |
1252 | if (ev->xclient.format == 32 |
1245 | if (ev->xclient.format == 32 |
1253 | && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) |
1246 | && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) |
1254 | exit(EXIT_SUCCESS); |
1247 | R->destroy (); |
1255 | #ifdef OFFIX_DND |
1248 | #ifdef OFFIX_DND |
1256 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1249 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1257 | if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] |
1250 | else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] |
1258 | && (ev->xclient.data.l[0] == DndFile |
1251 | && (ev->xclient.data.l[0] == DndFile |
1259 | || ev->xclient.data.l[0] == DndDir |
1252 | || ev->xclient.data.l[0] == DndDir |
1260 | || ev->xclient.data.l[0] == DndLink)) { |
1253 | || ev->xclient.data.l[0] == DndLink)) { |
1261 | /* Get Dnd data */ |
1254 | /* Get Dnd data */ |
1262 | Atom ActualType; |
1255 | Atom ActualType; |
… | |
… | |
1441 | &unused_xevent)) ; |
1434 | &unused_xevent)) ; |
1442 | while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, |
1435 | while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, |
1443 | GraphicsExpose, |
1436 | GraphicsExpose, |
1444 | &unused_xevent)) ; |
1437 | &unused_xevent)) ; |
1445 | if (isScrollbarWindow(ev->xany.window)) { |
1438 | if (isScrollbarWindow(ev->xany.window)) { |
1446 | scrollbar_setIdle(); |
1439 | R->scrollBar.setIdle(); |
1447 | rxvt_scrollbar_show(aR_ 0); |
1440 | rxvt_scrollbar_show(aR_ 0); |
1448 | } |
1441 | } |
1449 | #ifdef MENUBAR |
1442 | #ifdef MENUBAR |
1450 | if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) |
1443 | if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) |
1451 | rxvt_menubar_expose(aR); |
1444 | rxvt_menubar_expose(aR); |
… | |
… | |
1564 | */ |
1557 | */ |
1565 | if (ev->window == R->TermWin.vt) |
1558 | if (ev->window == R->TermWin.vt) |
1566 | { |
1559 | { |
1567 | #if RXVT_GRAPHICS |
1560 | #if RXVT_GRAPHICS |
1568 | if (ev->subwindow != None) |
1561 | if (ev->subwindow != None) |
1569 | rxvt_Gr_ButtonPress(ev->x, ev->y); |
1562 | rxvt_Gr_ButtonPress (ev->x, ev->y); |
1570 | else |
1563 | else |
1571 | #endif |
1564 | #endif |
1572 | { |
1565 | { |
1573 | clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; |
1566 | clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; |
1574 | if (reportmode) |
1567 | if (reportmode) |
… | |
… | |
1636 | /* |
1629 | /* |
1637 | * Scrollbar window processing of button press |
1630 | * Scrollbar window processing of button press |
1638 | */ |
1631 | */ |
1639 | if (isScrollbarWindow(ev->window)) |
1632 | if (isScrollbarWindow(ev->window)) |
1640 | { |
1633 | { |
1641 | scrollbar_setIdle(); |
1634 | R->scrollBar.setIdle (); |
1642 | /* |
1635 | /* |
1643 | * Rxvt-style scrollbar: |
1636 | * Rxvt-style scrollbar: |
1644 | * move up if mouse is above slider |
1637 | * move up if mouse is above slider |
1645 | * move dn if mouse is below slider |
1638 | * move dn if mouse is below slider |
1646 | * |
1639 | * |
… | |
… | |
1658 | */ |
1651 | */ |
1659 | if ((R->scrollBar.style == R_SB_NEXT |
1652 | if ((R->scrollBar.style == R_SB_NEXT |
1660 | && scrollbarnext_upButton(ev->y)) |
1653 | && scrollbarnext_upButton(ev->y)) |
1661 | || (R->scrollBar.style == R_SB_RXVT |
1654 | || (R->scrollBar.style == R_SB_RXVT |
1662 | && scrollbarrxvt_upButton(ev->y))) |
1655 | && scrollbarrxvt_upButton(ev->y))) |
1663 | rxvt_tt_printf(aR_ "\033[A"); |
1656 | R->tt_printf("\033[A"); |
1664 | else if ((R->scrollBar.style == R_SB_NEXT |
1657 | else if ((R->scrollBar.style == R_SB_NEXT |
1665 | && scrollbarnext_dnButton(ev->y)) |
1658 | && scrollbarnext_dnButton(ev->y)) |
1666 | || (R->scrollBar.style == R_SB_RXVT |
1659 | || (R->scrollBar.style == R_SB_RXVT |
1667 | && scrollbarrxvt_dnButton(ev->y))) |
1660 | && scrollbarrxvt_dnButton(ev->y))) |
1668 | rxvt_tt_printf(aR_ "\033[B"); |
1661 | R->tt_printf("\033[B"); |
1669 | else |
1662 | else |
1670 | switch (ev->button) { |
1663 | switch (ev->button) { |
1671 | case Button2: |
1664 | case Button2: |
1672 | rxvt_tt_printf(aR_ "\014"); |
1665 | R->tt_printf("\014"); |
1673 | break; |
1666 | break; |
1674 | case Button1: |
1667 | case Button1: |
1675 | rxvt_tt_printf(aR_ "\033[6~"); |
1668 | R->tt_printf("\033[6~"); |
1676 | break; |
1669 | break; |
1677 | case Button3: |
1670 | case Button3: |
1678 | rxvt_tt_printf(aR_ "\033[5~"); |
1671 | R->tt_printf("\033[5~"); |
1679 | break; |
1672 | break; |
1680 | } |
1673 | } |
1681 | } |
1674 | } |
1682 | else |
1675 | else |
1683 | #endif /* NO_SCROLLBAR_REPORT */ |
1676 | #endif /* NO_SCROLLBAR_REPORT */ |
… | |
… | |
1699 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1692 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1700 | R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; |
1693 | R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; |
1701 | #endif |
1694 | #endif |
1702 | if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { |
1695 | if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { |
1703 | if (upordown < 0) |
1696 | if (upordown < 0) |
1704 | scrollbar_setUp(); |
1697 | R->scrollBar.setUp (); |
1705 | else |
1698 | else |
1706 | scrollbar_setDn(); |
1699 | R->scrollBar.setDn (); |
1707 | } |
1700 | } |
1708 | } else |
1701 | } else |
1709 | switch (ev->button) { |
1702 | switch (ev->button) { |
1710 | case Button2: |
1703 | case Button2: |
1711 | switch (R->scrollbar_align) { |
1704 | switch (R->scrollbar_align) { |
… | |
… | |
1723 | || scrollbar_above_slider(ev->y) |
1716 | || scrollbar_above_slider(ev->y) |
1724 | || scrollbar_below_slider(ev->y)) |
1717 | || scrollbar_below_slider(ev->y)) |
1725 | rxvt_scr_move_to(aR_ |
1718 | rxvt_scr_move_to(aR_ |
1726 | scrollbar_position(ev->y) - R->csrO, |
1719 | scrollbar_position(ev->y) - R->csrO, |
1727 | scrollbar_size()); |
1720 | scrollbar_size()); |
1728 | scrollbar_setMotion(); |
1721 | R->scrollBar.setMotion (); |
1729 | break; |
1722 | break; |
1730 | |
1723 | |
1731 | case Button1: |
1724 | case Button1: |
1732 | if (R->scrollbar_align == R_SB_ALIGN_CENTRE) |
1725 | if (R->scrollbar_align == R_SB_ALIGN_CENTRE) |
1733 | R->csrO = ev->y - R->scrollBar.top; |
1726 | R->csrO = ev->y - R->scrollBar.top; |
… | |
… | |
1746 | rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); |
1739 | rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); |
1747 | # else |
1740 | # else |
1748 | rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); |
1741 | rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); |
1749 | # endif |
1742 | # endif |
1750 | else |
1743 | else |
1751 | scrollbar_setMotion(); |
1744 | R->scrollBar.setMotion (); |
1752 | } else { |
1745 | } else { |
1753 | rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), |
1746 | rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), |
1754 | (R->TermWin.nrow |
1747 | (R->TermWin.nrow |
1755 | * scrollbar_position(ev->y) |
1748 | * scrollbar_position(ev->y) |
1756 | / scrollbar_size())); |
1749 | / scrollbar_size())); |
… | |
… | |
1778 | R->csrO = 0; /* reset csr Offset */ |
1771 | R->csrO = 0; /* reset csr Offset */ |
1779 | if (!R->bypass_keystate) |
1772 | if (!R->bypass_keystate) |
1780 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1773 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1781 | |
1774 | |
1782 | if (scrollbar_isUpDn()) { |
1775 | if (scrollbar_isUpDn()) { |
1783 | scrollbar_setIdle(); |
1776 | R->scrollBar.setIdle (); |
1784 | rxvt_scrollbar_show(aR_ 0); |
1777 | rxvt_scrollbar_show(aR_ 0); |
1785 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1778 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1786 | R->refresh_type &= ~SMOOTH_REFRESH; |
1779 | R->refresh_type &= ~SMOOTH_REFRESH; |
1787 | #endif |
1780 | #endif |
1788 | } |
1781 | } |
… | |
… | |
1839 | break; |
1832 | break; |
1840 | #ifdef MOUSE_WHEEL |
1833 | #ifdef MOUSE_WHEEL |
1841 | case Button4: |
1834 | case Button4: |
1842 | case Button5: |
1835 | case Button5: |
1843 | { |
1836 | { |
1844 | int i, v; |
1837 | int i; |
|
|
1838 | page_dirn v; |
1845 | |
1839 | |
1846 | v = (ev->button == Button4) ? UP : DN; |
1840 | v = (ev->button == Button4) ? UP : DN; |
1847 | if (ev->state & ShiftMask) |
1841 | if (ev->state & ShiftMask) |
1848 | i = 1; |
1842 | i = 1; |
1849 | else if ((R->Options & Opt_mouseWheelScrollPage)) |
1843 | else if ((R->Options & Opt_mouseWheelScrollPage)) |
… | |
… | |
2024 | n = 0; |
2018 | n = 0; |
2025 | if (pchanged) { |
2019 | if (pchanged) { |
2026 | for (; n < (unsigned int)i; n++) { |
2020 | for (; n < (unsigned int)i; n++) { |
2027 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); |
2021 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); |
2028 | D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
2022 | D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
2029 | if (wattr.depth != rootdepth || wattr.class == InputOnly) { |
2023 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { |
2030 | n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; |
2024 | n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; |
2031 | break; |
2025 | break; |
2032 | } |
2026 | } |
2033 | } |
2027 | } |
2034 | } |
2028 | } |
… | |
… | |
2084 | return stream; |
2078 | return stream; |
2085 | } |
2079 | } |
2086 | |
2080 | |
2087 | /* EXTPROTO */ |
2081 | /* EXTPROTO */ |
2088 | int |
2082 | int |
2089 | rxvt_pclose_printer(FILE *stream) |
2083 | rxvt_pclose_printer (FILE *stream) |
2090 | { |
2084 | { |
2091 | fflush(stream); |
2085 | fflush (stream); |
2092 | /* pclose() reported not to work on SunOS 4.1.3 */ |
2086 | /* pclose() reported not to work on SunOS 4.1.3 */ |
2093 | # if defined (__sun__) /* TODO: RESOLVE THIS */ |
2087 | # if defined (__sun__) /* TODO: RESOLVE THIS */ |
2094 | /* pclose works provided SIGCHLD handler uses waitpid */ |
2088 | /* pclose works provided SIGCHLD handler uses waitpid */ |
2095 | return pclose(stream); /* return fclose (stream); */ |
2089 | return pclose (stream); /* return fclose (stream); */ |
2096 | # else |
2090 | # else |
2097 | return pclose(stream); |
2091 | return pclose (stream); |
2098 | # endif |
2092 | # endif |
2099 | } |
2093 | } |
2100 | |
2094 | |
2101 | /* |
2095 | /* |
2102 | * simulate attached vt100 printer |
2096 | * simulate attached vt100 printer |
… | |
… | |
2165 | rxvt_process_nonprinting(pR_ unsigned char ch) |
2159 | rxvt_process_nonprinting(pR_ unsigned char ch) |
2166 | { |
2160 | { |
2167 | switch (ch) { |
2161 | switch (ch) { |
2168 | case C0_ENQ: /* terminal Status */ |
2162 | case C0_ENQ: /* terminal Status */ |
2169 | if (R->rs[Rs_answerbackstring]) |
2163 | if (R->rs[Rs_answerbackstring]) |
2170 | rxvt_tt_write(aR_ |
2164 | R->tt_write( |
2171 | (const unsigned char *)R->rs[Rs_answerbackstring], |
2165 | (const unsigned char *)R->rs[Rs_answerbackstring], |
2172 | (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); |
2166 | (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); |
2173 | else |
2167 | else |
2174 | rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, |
2168 | R->tt_write((unsigned char *)VT100_ANS, |
2175 | (unsigned int)STRLEN(VT100_ANS)); |
2169 | (unsigned int)STRLEN(VT100_ANS)); |
2176 | break; |
2170 | break; |
2177 | case C0_BEL: /* bell */ |
2171 | case C0_BEL: /* bell */ |
2178 | rxvt_scr_bell(aR); |
2172 | rxvt_scr_bell(aR); |
2179 | break; |
2173 | break; |
… | |
… | |
2242 | row = rxvt_cmd_getc(aR) - ' '; |
2236 | row = rxvt_cmd_getc(aR) - ' '; |
2243 | col = rxvt_cmd_getc(aR) - ' '; |
2237 | col = rxvt_cmd_getc(aR) - ' '; |
2244 | rxvt_scr_gotorc(aR_ row, col, 0); |
2238 | rxvt_scr_gotorc(aR_ row, col, 0); |
2245 | break; |
2239 | break; |
2246 | case 'Z': /* identify the terminal type */ |
2240 | case 'Z': /* identify the terminal type */ |
2247 | rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ |
2241 | R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ |
2248 | break; |
2242 | break; |
2249 | case '<': /* turn off VT52 mode */ |
2243 | case '<': /* turn off VT52 mode */ |
2250 | PrivMode(0, PrivMode_vt52); |
2244 | PrivMode(0, PrivMode_vt52); |
2251 | break; |
2245 | break; |
2252 | case 'F': /* use special graphics character set */ |
2246 | case 'F': /* use special graphics character set */ |
… | |
… | |
2359 | rxvt_process_dcs_seq(aR); |
2353 | rxvt_process_dcs_seq(aR); |
2360 | break; |
2354 | break; |
2361 | |
2355 | |
2362 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
2356 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
2363 | case C1_SCI: /* ESC Z */ |
2357 | case C1_SCI: /* ESC Z */ |
2364 | rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, |
2358 | R->tt_write((const unsigned char *)ESCZ_ANSWER, |
2365 | (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); |
2359 | (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); |
2366 | break; /* steal obsolete ESC [ c */ |
2360 | break; /* steal obsolete ESC [ c */ |
2367 | |
2361 | |
2368 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
2362 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
2369 | case C1_CSI: /* ESC [ */ |
2363 | case C1_CSI: /* ESC [ */ |
… | |
… | |
2490 | */ |
2484 | */ |
2491 | if (priv) { |
2485 | if (priv) { |
2492 | switch (priv) { |
2486 | switch (priv) { |
2493 | case '>': |
2487 | case '>': |
2494 | if (ch == CSI_DA) /* secondary device attributes */ |
2488 | if (ch == CSI_DA) /* secondary device attributes */ |
2495 | rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); |
2489 | R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); |
2496 | break; |
2490 | break; |
2497 | case '?': |
2491 | case '?': |
2498 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2492 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2499 | rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); |
2493 | rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); |
2500 | break; |
2494 | break; |
… | |
… | |
2603 | |
2597 | |
2604 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
2598 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
2605 | arg[0] = -arg[0]; |
2599 | arg[0] = -arg[0]; |
2606 | /* FALLTHROUGH */ |
2600 | /* FALLTHROUGH */ |
2607 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
2601 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
2608 | rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); |
2602 | R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); |
2609 | break; |
2603 | break; |
2610 | |
2604 | |
2611 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
2605 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
2612 | rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, |
2606 | R->tt_write((const unsigned char *)VT100_ANS, |
2613 | (unsigned int)(sizeof(VT100_ANS) - 1)); |
2607 | (unsigned int)(sizeof(VT100_ANS) - 1)); |
2614 | break; |
2608 | break; |
2615 | |
2609 | |
2616 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
2610 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
2617 | rxvt_process_sgr_mode(aR_ nargs, arg); |
2611 | rxvt_process_sgr_mode(aR_ nargs, arg); |
2618 | break; |
2612 | break; |
2619 | |
2613 | |
2620 | case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ |
2614 | case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ |
2621 | switch (arg[0]) { |
2615 | switch (arg[0]) { |
2622 | case 5: /* DSR requested */ |
2616 | case 5: /* DSR requested */ |
2623 | rxvt_tt_printf(aR_ "\033[0n"); |
2617 | R->tt_printf("\033[0n"); |
2624 | break; |
2618 | break; |
2625 | case 6: /* CPR requested */ |
2619 | case 6: /* CPR requested */ |
2626 | rxvt_scr_report_position(aR); |
2620 | rxvt_scr_report_position(aR); |
2627 | break; |
2621 | break; |
2628 | #if defined (ENABLE_DISPLAY_ANSWER) |
2622 | #if defined (ENABLE_DISPLAY_ANSWER) |
2629 | case 7: /* unofficial extension */ |
2623 | case 7: /* unofficial extension */ |
2630 | rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); |
2624 | R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); |
2631 | break; |
2625 | break; |
2632 | #endif |
2626 | #endif |
2633 | case 8: /* unofficial extension */ |
2627 | case 8: /* unofficial extension */ |
2634 | rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); |
2628 | rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); |
2635 | break; |
2629 | break; |
… | |
… | |
2704 | break; |
2698 | break; |
2705 | #endif |
2699 | #endif |
2706 | |
2700 | |
2707 | case CSI_78: /* DECREQTPARM */ |
2701 | case CSI_78: /* DECREQTPARM */ |
2708 | if (arg[0] == 0 || arg[0] == 1) |
2702 | if (arg[0] == 0 || arg[0] == 1) |
2709 | rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); |
2703 | R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); |
2710 | /* FALLTHROUGH */ |
2704 | /* FALLTHROUGH */ |
2711 | |
2705 | |
2712 | default: |
2706 | default: |
2713 | break; |
2707 | break; |
2714 | } |
2708 | } |
… | |
… | |
2768 | /* |
2762 | /* |
2769 | * reports - some output format copied from XTerm |
2763 | * reports - some output format copied from XTerm |
2770 | */ |
2764 | */ |
2771 | case 11: /* report window state */ |
2765 | case 11: /* report window state */ |
2772 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2766 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2773 | rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
2767 | R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
2774 | break; |
2768 | break; |
2775 | case 13: /* report window position */ |
2769 | case 13: /* report window position */ |
2776 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2770 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2777 | XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, |
2771 | XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, |
2778 | -wattr.border_width, -wattr.border_width, |
2772 | -wattr.border_width, -wattr.border_width, |
2779 | &x, &y, &wdummy); |
2773 | &x, &y, &wdummy); |
2780 | rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); |
2774 | R->tt_printf("\033[3;%d;%dt", x, y); |
2781 | break; |
2775 | break; |
2782 | case 14: /* report window size (pixels) */ |
2776 | case 14: /* report window size (pixels) */ |
2783 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2777 | XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); |
2784 | rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); |
2778 | R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); |
2785 | break; |
2779 | break; |
2786 | case 18: /* report window size (chars) */ |
2780 | case 18: /* report window size (chars) */ |
2787 | rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); |
2781 | R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); |
2788 | break; |
2782 | break; |
2789 | #if 0 /* XXX: currently disabled due to security concerns */ |
2783 | #if 0 /* XXX: currently disabled due to security concerns */ |
2790 | case 20: /* report icon label */ |
2784 | case 20: /* report icon label */ |
2791 | XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); |
2785 | XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); |
2792 | rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ |
2786 | R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ |
2793 | break; |
2787 | break; |
2794 | case 21: /* report window title */ |
2788 | case 21: /* report window title */ |
2795 | XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); |
2789 | XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); |
2796 | rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ |
2790 | R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ |
2797 | break; |
2791 | break; |
2798 | #endif |
2792 | #endif |
2799 | } |
2793 | } |
2800 | } |
2794 | } |
2801 | #endif |
2795 | #endif |
… | |
… | |
3344 | { |
3338 | { |
3345 | unsigned char ch, cmd = rxvt_cmd_getc(aR); |
3339 | unsigned char ch, cmd = rxvt_cmd_getc(aR); |
3346 | |
3340 | |
3347 | #ifndef RXVT_GRAPHICS |
3341 | #ifndef RXVT_GRAPHICS |
3348 | if (cmd == 'Q') { /* query graphics */ |
3342 | if (cmd == 'Q') { /* query graphics */ |
3349 | rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ |
3343 | R->tt_printf("\033G0\n"); /* no graphics */ |
3350 | return; |
3344 | return; |
3351 | } |
3345 | } |
3352 | /* swallow other graphics sequences until terminating ':' */ |
3346 | /* swallow other graphics sequences until terminating ':' */ |
3353 | do |
3347 | do |
3354 | ch = rxvt_cmd_getc(aR); |
3348 | ch = rxvt_cmd_getc(aR); |
… | |
… | |
3357 | unsigned int nargs; |
3351 | unsigned int nargs; |
3358 | int args[NGRX_PTS]; |
3352 | int args[NGRX_PTS]; |
3359 | unsigned char *text = NULL; |
3353 | unsigned char *text = NULL; |
3360 | |
3354 | |
3361 | if (cmd == 'Q') { /* query graphics */ |
3355 | if (cmd == 'Q') { /* query graphics */ |
3362 | rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ |
3356 | R->tt_printf("\033G1\n"); /* yes, graphics (color) */ |
3363 | return; |
3357 | return; |
3364 | } |
3358 | } |
3365 | for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { |
3359 | for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { |
3366 | int neg; |
3360 | int neg; |
3367 | |
3361 | |
… | |
… | |
3382 | } |
3376 | } |
3383 | |
3377 | |
3384 | if ((cmd == 'T') && (nargs >= 5)) { |
3378 | if ((cmd == 'T') && (nargs >= 5)) { |
3385 | int i, len = args[4]; |
3379 | int i, len = args[4]; |
3386 | |
3380 | |
3387 | text = rxvt_malloc((len + 1) * sizeof(char)); |
3381 | text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); |
3388 | |
3382 | |
3389 | if (text != NULL) { |
3383 | if (text != NULL) { |
3390 | for (i = 0; i < len; i++) |
3384 | for (i = 0; i < len; i++) |
3391 | text[i] = rxvt_cmd_getc(aR); |
3385 | text[i] = rxvt_cmd_getc(aR); |
3392 | text[len] = '\0'; |
3386 | text[len] = '\0'; |
… | |
… | |
3401 | |
3395 | |
3402 | /* |
3396 | /* |
3403 | * Send printf() formatted output to the command. |
3397 | * Send printf() formatted output to the command. |
3404 | * Only use for small amounts of data. |
3398 | * Only use for small amounts of data. |
3405 | */ |
3399 | */ |
3406 | /* EXTPROTO */ |
|
|
3407 | void |
3400 | void |
3408 | rxvt_tt_printf(pR_ const char *fmt,...) |
3401 | rxvt_term::tt_printf (const char *fmt,...) |
3409 | { |
3402 | { |
3410 | va_list arg_ptr; |
3403 | va_list arg_ptr; |
3411 | unsigned char buf[256]; |
3404 | unsigned char buf[256]; |
3412 | |
3405 | |
3413 | va_start(arg_ptr, fmt); |
3406 | va_start (arg_ptr, fmt); |
3414 | vsprintf((char *)buf, fmt, arg_ptr); |
3407 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
3415 | va_end(arg_ptr); |
3408 | va_end (arg_ptr); |
3416 | rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); |
3409 | tt_write (buf, STRLEN (buf)); |
3417 | } |
3410 | } |
3418 | |
3411 | |
3419 | /* ---------------------------------------------------------------------- */ |
3412 | /* ---------------------------------------------------------------------- */ |
3420 | /* Addresses pasting large amounts of data and rxvt hang |
|
|
3421 | * code pinched from xterm (v_write()) and applied originally to |
|
|
3422 | * rxvt-2.18 - Hops |
|
|
3423 | * Write data to the pty as typed by the user, pasted with the mouse, |
3413 | /* Write data to the pty as typed by the user, pasted with the mouse, |
3424 | * or generated by us in response to a query ESC sequence. |
3414 | * or generated by us in response to a query ESC sequence. |
3425 | */ |
3415 | */ |
3426 | /* EXTPROTO */ |
|
|
3427 | void |
3416 | void |
3428 | rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) |
3417 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
3429 | { |
3418 | { |
3430 | #define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ |
3419 | enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT |
3431 | int riten; |
|
|
3432 | unsigned int p; |
|
|
3433 | unsigned char *v_buffer, /* start of physical buffer */ |
|
|
3434 | *v_bufstr, /* start of current buffer pending */ |
|
|
3435 | *v_bufptr, /* end of current buffer pending */ |
|
|
3436 | *v_bufend; /* end of physical buffer */ |
|
|
3437 | |
3420 | |
3438 | if (R->v_bufstr == NULL && len > 0) { |
3421 | if (len) |
3439 | p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
|
|
3440 | v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p); |
|
|
3441 | v_bufend = v_buffer + p; |
|
|
3442 | } else { |
|
|
3443 | v_buffer = R->v_buffer; |
|
|
3444 | v_bufstr = R->v_bufstr; |
|
|
3445 | v_bufptr = R->v_bufptr; |
|
|
3446 | v_bufend = R->v_bufend; |
|
|
3447 | } |
3422 | { |
|
|
3423 | if (v_buflen == 0) |
|
|
3424 | { |
|
|
3425 | int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); |
|
|
3426 | if (written == len) |
|
|
3427 | return; |
3448 | |
3428 | |
3449 | /* |
3429 | data += written; |
3450 | * Append to the block we already have. Always doing this simplifies the |
3430 | len -= written; |
3451 | * code, and isn't too bad, either. If this is a short block, it isn't |
3431 | } |
3452 | * too expensive, and if this is a long block, we won't be able to write |
3432 | |
3453 | * it all anyway. |
3433 | |
3454 | */ |
3434 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
3455 | if (len > 0) { |
3435 | |
3456 | if (v_bufend < v_bufptr + len) { /* run out of room */ |
3436 | memcpy (v_buffer + v_buflen, data, len); |
3457 | if (v_bufstr != v_buffer) { |
3437 | v_buflen += len; |
3458 | /* there is unused space, move everything down */ |
|
|
3459 | MEMMOVE(v_buffer, v_bufstr, |
|
|
3460 | (unsigned int)(v_bufptr - v_bufstr)); |
|
|
3461 | v_bufptr -= v_bufstr - v_buffer; |
|
|
3462 | v_bufstr = v_buffer; |
|
|
3463 | } |
3438 | } |
3464 | if (v_bufend < v_bufptr + len) { |
|
|
3465 | /* still won't fit: get more space */ |
|
|
3466 | /* use most basic realloc because an error is not fatal. */ |
|
|
3467 | unsigned int size = v_bufptr - v_buffer; |
|
|
3468 | unsigned int reallocto; |
|
|
3469 | |
3439 | |
3470 | reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
3440 | for (;;) |
3471 | v_buffer = (unsigned char *)realloc(v_buffer, reallocto); |
3441 | { |
3472 | /* save across realloc */ |
3442 | int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); |
3473 | if (v_buffer) { |
3443 | |
3474 | v_bufstr = v_buffer; |
3444 | if (written > 0) |
3475 | v_bufptr = v_buffer + size; |
3445 | { |
3476 | v_bufend = v_buffer + reallocto; |
3446 | v_buflen -= written; |
3477 | } else { /* no memory: ignore entire write request */ |
3447 | |
3478 | rxvt_print_error("data loss: cannot allocate buffer space"); |
3448 | if (v_buflen == 0) |
3479 | v_buffer = v_bufstr; /* restore clobbered pointer */ |
3449 | { |
3480 | } |
3450 | free (v_buffer); |
|
|
3451 | v_buffer = 0; |
|
|
3452 | v_buflen = 0; |
|
|
3453 | |
|
|
3454 | pty_ev.set (EVENT_READ); |
|
|
3455 | return; |
|
|
3456 | } |
|
|
3457 | |
|
|
3458 | memmove (v_buffer, v_buffer + written, v_buflen); |
|
|
3459 | } |
|
|
3460 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
3461 | // original code just ignores this... |
|
|
3462 | destroy (); |
|
|
3463 | else |
|
|
3464 | { |
|
|
3465 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
3466 | return; |
|
|
3467 | } |
3481 | } |
3468 | } |
3482 | } |
|
|
3483 | if (v_bufend >= v_bufptr + len) { /* new stuff will fit */ |
|
|
3484 | MEMCPY(v_bufptr, d, len); |
|
|
3485 | v_bufptr += len; |
|
|
3486 | } |
|
|
3487 | } |
|
|
3488 | |
|
|
3489 | /* |
|
|
3490 | * Write out as much of the buffer as we can. |
|
|
3491 | * Be careful not to overflow the pty's input silo. |
|
|
3492 | * We are conservative here and only write a small amount at a time. |
|
|
3493 | * |
|
|
3494 | * If we can't push all the data into the pty yet, we expect write |
|
|
3495 | * to return a non-negative number less than the length requested |
|
|
3496 | * (if some data written) or -1 and set errno to EAGAIN, |
|
|
3497 | * EWOULDBLOCK, or EINTR (if no data written). |
|
|
3498 | * |
|
|
3499 | * (Not all systems do this, sigh, so the code is actually |
|
|
3500 | * a little more forgiving.) |
|
|
3501 | */ |
|
|
3502 | if ((p = v_bufptr - v_bufstr) > 0) { |
|
|
3503 | riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE)); |
|
|
3504 | if (riten < 0) |
|
|
3505 | riten = 0; |
|
|
3506 | v_bufstr += riten; |
|
|
3507 | if (v_bufstr >= v_bufptr) /* we wrote it all */ |
|
|
3508 | v_bufstr = v_bufptr = v_buffer; |
|
|
3509 | } |
|
|
3510 | /* |
|
|
3511 | * If we have lots of unused memory allocated, return it |
|
|
3512 | */ |
|
|
3513 | if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */ |
|
|
3514 | /* save pointers across realloc */ |
|
|
3515 | unsigned int start = v_bufstr - v_buffer; |
|
|
3516 | unsigned int size = v_bufptr - v_buffer; |
|
|
3517 | unsigned int reallocto; |
|
|
3518 | |
|
|
3519 | reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; |
|
|
3520 | v_buffer = (unsigned char *)realloc(v_buffer, reallocto); |
|
|
3521 | if (v_buffer) { |
|
|
3522 | v_bufstr = v_buffer + start; |
|
|
3523 | v_bufptr = v_buffer + size; |
|
|
3524 | v_bufend = v_buffer + reallocto; |
|
|
3525 | } else { |
|
|
3526 | /* should we print a warning if couldn't return memory? */ |
|
|
3527 | v_buffer = v_bufstr - start; /* restore clobbered pointer */ |
|
|
3528 | } |
|
|
3529 | } |
|
|
3530 | R->v_buffer = v_buffer; |
|
|
3531 | R->v_bufstr = v_bufstr; |
|
|
3532 | R->v_bufptr = v_bufptr; |
|
|
3533 | R->v_bufend = v_bufend; |
|
|
3534 | } |
3469 | } |
|
|
3470 | |
3535 | /*----------------------- end-of-file (C source) -----------------------*/ |
3471 | /*----------------------- end-of-file (C source) -----------------------*/ |
3536 | |
3472 | |