ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.19 by pcg, Thu Dec 18 05:45:11 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.10 2003/11/27 16:49:45 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 R->tt_write(&ch, 1); 245 R->tt_write (&ch, 1);
243 R->tt_write(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)
… …
656 return 0; 659 return 0;
657} 660}
658#endif /* MENUBAR_MAX */ 661#endif /* MENUBAR_MAX */
659 662
660void 663void
664rxvt_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
692void
693rxvt_term::check_cb (check_watcher &w)
694{
695 SET_R (this);
696 SET_LOCALE (locale);
697
698 flush ();
699}
700
701void
661rxvt_term::process_x_events () 702rxvt_term::process_x_events ()
662{ 703{
663 do 704 do
664 { 705 {
665 XEvent xev; 706 XEvent xev;
… …
704} 745}
705 746
706void 747void
707rxvt_term::blink_cb (time_watcher &w) 748rxvt_term::blink_cb (time_watcher &w)
708{ 749{
709 SET_R (this);
710
711 w.at += BLINK_INTERVAL; 750 w.at += BLINK_INTERVAL;
712 hidden_cursor = !hidden_cursor; 751 hidden_cursor = !hidden_cursor;
713 want_refresh = 1; 752 want_refresh = 1;
714 flush ();
715} 753}
716 754
717void 755void
718rxvt_term::x_cb (io_watcher &w, short revents) 756rxvt_term::x_cb (io_watcher &w, short revents)
719{ 757{
720 SET_R (this); 758 SET_R (this);
759 SET_LOCALE (locale);
721 760
722 process_x_events (); 761 process_x_events ();
762}
723 763
724 flush (); 764bool
765rxvt_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
786void
787rxvt_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 }
725} 901}
726 902
727// read the next character, currently handles UTF-8 903// read the next character, currently handles UTF-8
728// will probably handle all sorts of other stuff in the future 904// will probably handle all sorts of other stuff in the future
729uint32_t 905uint32_t
… …
777 } 953 }
778 954
779 return NOCHAR; 955 return NOCHAR;
780} 956}
781 957
782bool
783rxvt_term::pty_fill ()
784{
785 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
786
787 memmove (cmdbuf_base, cmdbuf_ptr, n);
788 cmdbuf_ptr = cmdbuf_base;
789 cmdbuf_endp = cmdbuf_ptr + n;
790
791 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
792
793 if (n > 0)
794 {
795 cmdbuf_endp += n;
796 return true;
797 }
798 else if (n < 0 && errno == EAGAIN)
799 return false;
800
801 destroy ();
802}
803
804void
805rxvt_term::pty_cb (io_watcher &w, short revents)
806{
807 SET_R (this);
808
809 if (revents & EVENT_WRITE)
810 tt_write (0, 0);
811 else if (revents & EVENT_READ)
812 // loop, but don't allow a single term to monopolize us
813 // the number of loops is fully arbitrary, and thus wrong
814 for (int i = 7; i-- && pty_fill (); )
815 {
816 //TODO:
817 /* once we know the shell is running, send the screen size. Again! */
818 //ch = rxvt_cmd_getc(aR); /* wait for something */
819 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
820
821 uint32_t ch = NOCHAR;
822
823 for (;;)
824 {
825 if (ch == NOCHAR)
826 ch = next_char ();
827
828 if (ch == NOCHAR) // TODO: improve
829 break;
830
831 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
832 {
833 /* Read a text string from the input buffer */
834 uint32_t buf[BUFSIZ];
835 bool refreshnow = false;
836 int nlines = 0;
837 uint32_t *str = buf;
838
839 *str++ = ch;
840
841 for (;;)
842 {
843 ch = next_char ();
844
845 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
846 break;
847 else
848 {
849 *str++ = ch;
850
851 if (ch == '\n')
852 {
853 nlines++;
854 refresh_count++;
855
856 if (!(Options & Opt_jumpScroll)
857 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
858 {
859 refreshnow = true;
860 ch = NOCHAR;
861 break;
862 }
863 }
864
865 if (str >= buf + BUFSIZ)
866 {
867 ch = NOCHAR;
868 break;
869 }
870 }
871 }
872
873 rxvt_scr_add_lines (this, buf, nlines, str - buf);
874
875 /*
876 * If there have been a lot of new lines, then update the screen
877 * What the heck I'll cheat and only refresh less than every page-full.
878 * the number of pages between refreshes is refresh_limit, which
879 * is incremented here because we must be doing flat-out scrolling.
880 *
881 * refreshing should be correct for small scrolls, because of the
882 * time-out
883 */
884 if (refreshnow)
885 {
886 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
887 refresh_limit++;
888
889 rxvt_scr_refresh (this, refresh_type);
890 }
891
892 }
893 else
894 {
895 switch (ch)
896 {
897 default:
898 rxvt_process_nonprinting (this, ch);
899 break;
900 case C0_ESC: /* escape char */
901 rxvt_process_escape_seq (this);
902 break;
903 /*case 0x9b: */ /* CSI */
904 /* rxvt_process_csi_seq (this); */
905 }
906
907 ch = NOCHAR;
908 }
909 }
910 }
911
912 flush ();
913}
914
915void
916rxvt_term::flush ()
917{
918#ifdef TRANSPARENT
919 if (want_full_refresh)
920 {
921 want_full_refresh = 0;
922 rxvt_scr_clear (this);
923 rxvt_scr_touch (this, False);
924 want_refresh = 1;
925 }
926#endif
927
928 if (want_refresh)
929 {
930 rxvt_scr_refresh (this, refresh_type);
931 rxvt_scrollbar_show (this, 1);
932#ifdef USE_XIM
933 rxvt_IMSendSpot (this);
934#endif
935 }
936
937 if (XPending (Xdisplay)) process_x_events ();
938 XFlush (Xdisplay);
939 if (XPending (Xdisplay)) process_x_events ();
940}
941
942/* rxvt_cmd_getc() - Return next input character */ 958/* rxvt_cmd_getc() - Return next input character */
943/* 959/*
944 * Return the next input character after first passing any keyboard input 960 * Return the next input character after first passing any keyboard input
945 * to the command. 961 * to the command.
946 */ 962 */
… …
1023 1039
1024void 1040void
1025rxvt_term::pointer_unblank () 1041rxvt_term::pointer_unblank ()
1026{ 1042{
1027 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1043 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1028 rxvt_recolour_cursor (this); 1044 recolour_cursor ();
1029 1045
1030#ifdef POINTER_BLANK 1046#ifdef POINTER_BLANK
1031 hidden_pointer = 0; 1047 hidden_pointer = 0;
1032 1048
1033 if (Options & Opt_pointerBlank) 1049 if (Options & Opt_pointerBlank)
… …
1052 1068
1053void 1069void
1054rxvt_term::pointer_cb (time_watcher &w) 1070rxvt_term::pointer_cb (time_watcher &w)
1055{ 1071{
1056 SET_R (this); 1072 SET_R (this);
1073 SET_LOCALE (locale);
1057 1074
1058 pointer_blank (); 1075 pointer_blank ();
1059} 1076}
1060#endif 1077#endif
1061 1078
… …
1143{ 1160{
1144 int i, want_timeout; 1161 int i, want_timeout;
1145 Window unused_root, unused_child; 1162 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1163 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1164 unsigned int unused_mask;
1148 struct timeval tp;
1149 1165
1150#ifdef DEBUG_X 1166#ifdef DEBUG_X
1151 const char *const eventnames[] = 1167 const char *const eventnames[] =
1152 { /* mason - this matches my system */ 1168 { /* mason - this matches my system */
1153 "", 1169 "",
… …
1184 "SelectionNotify", 1200 "SelectionNotify",
1185 "ColormapNotify", 1201 "ColormapNotify",
1186 "ClientMessage", 1202 "ClientMessage",
1187 "MappingNotify" 1203 "MappingNotify"
1188 }; 1204 };
1205#endif
1206
1207#ifdef DEBUG_X
1208 struct timeval tp;
1189 struct tm *ltt; 1209 struct tm *ltt;
1190#endif
1191
1192 /*
1193 * check if we need to get the time for any timeouts
1194 */
1195
1196 for (i = NUM_TIMEOUTS; i--; )
1197 if (R->timeout[i].tv_sec) {
1198 want_timeout = 1;
1199 break;
1200 }
1201
1202#ifndef DEBUG_X
1203 if (want_timeout)
1204#endif
1205 (void)gettimeofday(&tp, NULL); 1210 (void)gettimeofday(&tp, NULL);
1206
1207#ifdef DEBUG_X
1208 ltt = localtime(&(tp.tv_sec)); 1211 ltt = localtime(&(tp.tv_sec));
1209 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));
1210#endif 1213#endif
1211
1212 /* X event timeouts */
1213 if (want_timeout)
1214 for (i = NUM_TIMEOUTS; i--; ) {
1215 if (R->timeout[i].tv_sec == 0)
1216 continue;
1217 if ((tp.tv_sec < R->timeout[i].tv_sec)
1218 || (tp.tv_sec == R->timeout[i].tv_sec
1219 && tp.tv_usec < R->timeout[i].tv_usec))
1220 continue;
1221 R->timeout[i].tv_sec = 0;
1222 switch(i) {
1223 case TIMEOUT_INCR:
1224 rxvt_print_error("data loss: timeout on INCR selection paste");
1225 R->selection_wait = Sel_none;
1226 break;
1227 default:
1228 break;
1229 }
1230 }
1231 1214
1232 switch (ev->type) { 1215 switch (ev->type) {
1233 case KeyPress: 1216 case KeyPress:
1234 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1217 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1235 break; 1218 break;
… …
1451 &unused_xevent)) ; 1434 &unused_xevent)) ;
1452 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1435 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1453 GraphicsExpose, 1436 GraphicsExpose,
1454 &unused_xevent)) ; 1437 &unused_xevent)) ;
1455 if (isScrollbarWindow(ev->xany.window)) { 1438 if (isScrollbarWindow(ev->xany.window)) {
1456 scrollbar_setIdle(); 1439 R->scrollBar.setIdle();
1457 rxvt_scrollbar_show(aR_ 0); 1440 rxvt_scrollbar_show(aR_ 0);
1458 } 1441 }
1459#ifdef MENUBAR 1442#ifdef MENUBAR
1460 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1443 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1461 rxvt_menubar_expose(aR); 1444 rxvt_menubar_expose(aR);
… …
1574 */ 1557 */
1575 if (ev->window == R->TermWin.vt) 1558 if (ev->window == R->TermWin.vt)
1576 { 1559 {
1577#if RXVT_GRAPHICS 1560#if RXVT_GRAPHICS
1578 if (ev->subwindow != None) 1561 if (ev->subwindow != None)
1579 rxvt_Gr_ButtonPress(ev->x, ev->y); 1562 rxvt_Gr_ButtonPress (ev->x, ev->y);
1580 else 1563 else
1581#endif 1564#endif
1582 { 1565 {
1583 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1566 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1584 if (reportmode) 1567 if (reportmode)
… …
1646/* 1629/*
1647 * Scrollbar window processing of button press 1630 * Scrollbar window processing of button press
1648 */ 1631 */
1649 if (isScrollbarWindow(ev->window)) 1632 if (isScrollbarWindow(ev->window))
1650 { 1633 {
1651 scrollbar_setIdle(); 1634 R->scrollBar.setIdle ();
1652 /* 1635 /*
1653 * Rxvt-style scrollbar: 1636 * Rxvt-style scrollbar:
1654 * move up if mouse is above slider 1637 * move up if mouse is above slider
1655 * move dn if mouse is below slider 1638 * move dn if mouse is below slider
1656 * 1639 *
… …
1709#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1692#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1710 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1693 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1711#endif 1694#endif
1712 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1695 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1713 if (upordown < 0) 1696 if (upordown < 0)
1714 scrollbar_setUp(); 1697 R->scrollBar.setUp ();
1715 else 1698 else
1716 scrollbar_setDn(); 1699 R->scrollBar.setDn ();
1717 } 1700 }
1718 } else 1701 } else
1719 switch (ev->button) { 1702 switch (ev->button) {
1720 case Button2: 1703 case Button2:
1721 switch (R->scrollbar_align) { 1704 switch (R->scrollbar_align) {
… …
1733 || scrollbar_above_slider(ev->y) 1716 || scrollbar_above_slider(ev->y)
1734 || scrollbar_below_slider(ev->y)) 1717 || scrollbar_below_slider(ev->y))
1735 rxvt_scr_move_to(aR_ 1718 rxvt_scr_move_to(aR_
1736 scrollbar_position(ev->y) - R->csrO, 1719 scrollbar_position(ev->y) - R->csrO,
1737 scrollbar_size()); 1720 scrollbar_size());
1738 scrollbar_setMotion(); 1721 R->scrollBar.setMotion ();
1739 break; 1722 break;
1740 1723
1741 case Button1: 1724 case Button1:
1742 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1725 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1743 R->csrO = ev->y - R->scrollBar.top; 1726 R->csrO = ev->y - R->scrollBar.top;
… …
1756 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1757# else 1740# else
1758 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1741 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1759# endif 1742# endif
1760 else 1743 else
1761 scrollbar_setMotion(); 1744 R->scrollBar.setMotion ();
1762 } else { 1745 } else {
1763 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1746 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1764 (R->TermWin.nrow 1747 (R->TermWin.nrow
1765 * scrollbar_position(ev->y) 1748 * scrollbar_position(ev->y)
1766 / scrollbar_size())); 1749 / scrollbar_size()));
… …
1788 R->csrO = 0; /* reset csr Offset */ 1771 R->csrO = 0; /* reset csr Offset */
1789 if (!R->bypass_keystate) 1772 if (!R->bypass_keystate)
1790 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1773 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1791 1774
1792 if (scrollbar_isUpDn()) { 1775 if (scrollbar_isUpDn()) {
1793 scrollbar_setIdle(); 1776 R->scrollBar.setIdle ();
1794 rxvt_scrollbar_show(aR_ 0); 1777 rxvt_scrollbar_show(aR_ 0);
1795#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1778#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1796 R->refresh_type &= ~SMOOTH_REFRESH; 1779 R->refresh_type &= ~SMOOTH_REFRESH;
1797#endif 1780#endif
1798 } 1781 }
… …
1849 break; 1832 break;
1850#ifdef MOUSE_WHEEL 1833#ifdef MOUSE_WHEEL
1851 case Button4: 1834 case Button4:
1852 case Button5: 1835 case Button5:
1853 { 1836 {
1854 int i, v; 1837 int i;
1838 page_dirn v;
1855 1839
1856 v = (ev->button == Button4) ? UP : DN; 1840 v = (ev->button == Button4) ? UP : DN;
1857 if (ev->state & ShiftMask) 1841 if (ev->state & ShiftMask)
1858 i = 1; 1842 i = 1;
1859 else if ((R->Options & Opt_mouseWheelScrollPage)) 1843 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
2034 n = 0; 2018 n = 0;
2035 if (pchanged) { 2019 if (pchanged) {
2036 for (; n < (unsigned int)i; n++) { 2020 for (; n < (unsigned int)i; n++) {
2037 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2021 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2038 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"));
2039 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2023 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2040 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2024 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2041 break; 2025 break;
2042 } 2026 }
2043 } 2027 }
2044 } 2028 }
… …
2094 return stream; 2078 return stream;
2095} 2079}
2096 2080
2097/* EXTPROTO */ 2081/* EXTPROTO */
2098int 2082int
2099rxvt_pclose_printer(FILE *stream) 2083rxvt_pclose_printer (FILE *stream)
2100{ 2084{
2101 fflush(stream); 2085 fflush (stream);
2102/* pclose() reported not to work on SunOS 4.1.3 */ 2086/* pclose() reported not to work on SunOS 4.1.3 */
2103# if defined (__sun__) /* TODO: RESOLVE THIS */ 2087# if defined (__sun__) /* TODO: RESOLVE THIS */
2104/* pclose works provided SIGCHLD handler uses waitpid */ 2088/* pclose works provided SIGCHLD handler uses waitpid */
2105 return pclose(stream); /* return fclose (stream); */ 2089 return pclose (stream); /* return fclose (stream); */
2106# else 2090# else
2107 return pclose(stream); 2091 return pclose (stream);
2108# endif 2092# endif
2109} 2093}
2110 2094
2111/* 2095/*
2112 * simulate attached vt100 printer 2096 * simulate attached vt100 printer
… …
2613 2597
2614 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2598 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2615 arg[0] = -arg[0]; 2599 arg[0] = -arg[0];
2616 /* FALLTHROUGH */ 2600 /* FALLTHROUGH */
2617 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2601 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2618 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);
2619 break; 2603 break;
2620 2604
2621 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2605 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2622 R->tt_write((const unsigned char *)VT100_ANS, 2606 R->tt_write((const unsigned char *)VT100_ANS,
2623 (unsigned int)(sizeof(VT100_ANS) - 1)); 2607 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
3392 } 3376 }
3393 3377
3394 if ((cmd == 'T') && (nargs >= 5)) { 3378 if ((cmd == 'T') && (nargs >= 5)) {
3395 int i, len = args[4]; 3379 int i, len = args[4];
3396 3380
3397 text = rxvt_malloc((len + 1) * sizeof(char)); 3381 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3398 3382
3399 if (text != NULL) { 3383 if (text != NULL) {
3400 for (i = 0; i < len; i++) 3384 for (i = 0; i < len; i++)
3401 text[i] = rxvt_cmd_getc(aR); 3385 text[i] = rxvt_cmd_getc(aR);
3402 text[len] = '\0'; 3386 text[len] = '\0';

Diff Legend

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