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.11 by pcg, Tue Dec 2 21:49:46 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.11 2003/12/02 21:49:46 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)
… …
688 691
689void 692void
690rxvt_term::check_cb (check_watcher &w) 693rxvt_term::check_cb (check_watcher &w)
691{ 694{
692 SET_R (this); 695 SET_R (this);
696 SET_LOCALE (locale);
693 697
694 flush (); 698 flush ();
695} 699}
696 700
697void 701void
… …
741} 745}
742 746
743void 747void
744rxvt_term::blink_cb (time_watcher &w) 748rxvt_term::blink_cb (time_watcher &w)
745{ 749{
746 SET_R (this);
747
748 w.at += BLINK_INTERVAL; 750 w.at += BLINK_INTERVAL;
749 hidden_cursor = !hidden_cursor; 751 hidden_cursor = !hidden_cursor;
750 want_refresh = 1; 752 want_refresh = 1;
751} 753}
752 754
753void 755void
754rxvt_term::x_cb (io_watcher &w, short revents) 756rxvt_term::x_cb (io_watcher &w, short revents)
755{ 757{
756 SET_R (this); 758 SET_R (this);
759 SET_LOCALE (locale);
757 760
758 process_x_events (); 761 process_x_events ();
759} 762}
760 763
761bool 764bool
… …
772 if (n > 0) 775 if (n > 0)
773 { 776 {
774 cmdbuf_endp += n; 777 cmdbuf_endp += n;
775 return true; 778 return true;
776 } 779 }
777 else if (n < 0 && errno == EAGAIN) 780 else if (n < 0 && errno != EAGAIN)
781 destroy ();
782
778 return false; 783 return false;
779
780 destroy ();
781} 784}
782 785
783void 786void
784rxvt_term::pty_cb (io_watcher &w, short revents) 787rxvt_term::pty_cb (io_watcher &w, short revents)
785{ 788{
786 SET_R (this); 789 SET_R (this);
790 SET_LOCALE (locale);
787 791
788 if (revents & EVENT_WRITE) 792 if (revents & EVENT_WRITE)
789 tt_write (0, 0); 793 tt_write (0, 0);
790 else if (revents & EVENT_READ) 794 else if (revents & EVENT_READ)
795 {
796 bool flag = true;
797
791 // loop, but don't allow a single term to monopolize us 798 // loop, but don't allow a single term to monopolize us
792 // the number of loops is fully arbitrary, and thus wrong 799 // the number of loops is fully arbitrary, and thus wrong
793 for (int i = 1; i-- && pty_fill (); ) 800 while (flag && pty_fill ())
794 { 801 {
795 if (!seen_input) 802 if (!seen_input)
796 { 803 {
797 seen_input = 1; 804 seen_input = 1;
798 /* once we know the shell is running, send the screen size. Again! */ 805 /* once we know the shell is running, send the screen size. Again! */
799 tt_winch (); 806 tt_winch ();
800 } 807 }
801 808
802 uint32_t ch = NOCHAR; 809 uint32_t ch = NOCHAR;
803 810
804 for (;;) 811 for (;;)
805 { 812 {
806 if (ch == NOCHAR) 813 if (ch == NOCHAR)
807 ch = next_char (); 814 ch = next_char ();
808 815
809 if (ch == NOCHAR) // TODO: improve 816 if (ch == NOCHAR) // TODO: improve
810 break; 817 break;
811 818
812 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 819 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
813 { 820 {
814 /* Read a text string from the input buffer */ 821 /* Read a text string from the input buffer */
815 uint32_t buf[BUFSIZ]; 822 uint32_t buf[BUFSIZ];
816 bool refreshnow = false; 823 bool refreshnow = false;
817 int nlines = 0; 824 int nlines = 0;
818 uint32_t *str = buf; 825 uint32_t *str = buf;
819 826
820 *str++ = ch; 827 *str++ = ch;
821 828
822 for (;;) 829 for (;;)
823 { 830 {
824 ch = next_char (); 831 ch = next_char ();
825 832
826 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 833 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break; 834 break;
828 else 835 else
829 { 836 {
830 *str++ = ch; 837 *str++ = ch;
831 838
832 if (ch == '\n') 839 if (ch == '\n')
833 { 840 {
834 nlines++; 841 nlines++;
835 refresh_count++; 842 refresh_count++;
836 843
837 if (!(Options & Opt_jumpScroll) 844 if (!(Options & Opt_jumpScroll)
838 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 845 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839 { 846 {
840 refreshnow = true; 847 refreshnow = true;
848 flag = false;
841 ch = NOCHAR; 849 ch = NOCHAR;
842 break; 850 break;
843 } 851 }
844 } 852 }
845 853
846 if (str >= buf + BUFSIZ) 854 if (str >= buf + BUFSIZ)
847 { 855 {
848 ch = NOCHAR; 856 ch = NOCHAR;
849 break; 857 break;
850 } 858 }
851 } 859 }
852 } 860 }
853 861
854 rxvt_scr_add_lines (this, buf, nlines, str - buf); 862 rxvt_scr_add_lines (this, buf, nlines, str - buf);
855 863
856 /* 864 /*
857 * If there have been a lot of new lines, then update the screen 865 * If there have been a lot of new lines, then update the screen
858 * What the heck I'll cheat and only refresh less than every page-full. 866 * What the heck I'll cheat and only refresh less than every page-full.
859 * the number of pages between refreshes is refresh_limit, which 867 * the number of pages between refreshes is refresh_limit, which
860 * is incremented here because we must be doing flat-out scrolling. 868 * is incremented here because we must be doing flat-out scrolling.
861 * 869 *
862 * refreshing should be correct for small scrolls, because of the 870 * refreshing should be correct for small scrolls, because of the
863 * time-out 871 * time-out
864 */ 872 */
865 if (refreshnow) 873 if (refreshnow)
866 { 874 {
867 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868 refresh_limit++; 876 refresh_limit++;
869 877
870 rxvt_scr_refresh (this, refresh_type); 878 rxvt_scr_refresh (this, refresh_type);
871 } 879 }
872 880
873 } 881 }
874 else 882 else
875 { 883 {
876 switch (ch) 884 switch (ch)
877 { 885 {
878 default: 886 default:
879 rxvt_process_nonprinting (this, ch); 887 rxvt_process_nonprinting (this, ch);
880 break; 888 break;
881 case C0_ESC: /* escape char */ 889 case C0_ESC: /* escape char */
882 rxvt_process_escape_seq (this); 890 rxvt_process_escape_seq (this);
883 break; 891 break;
884 /*case 0x9b: */ /* CSI */ 892 /*case 0x9b: */ /* CSI */
885 /* rxvt_process_csi_seq (this); */ 893 /* rxvt_process_csi_seq (this); */
886 } 894 }
887 895
888 ch = NOCHAR; 896 ch = NOCHAR;
889 } 897 }
890 } 898 }
891 } 899 }
900 }
892} 901}
893 902
894// read the next character, currently handles UTF-8 903// read the next character, currently handles UTF-8
895// will probably handle all sorts of other stuff in the future 904// will probably handle all sorts of other stuff in the future
896uint32_t 905uint32_t
… …
1030 1039
1031void 1040void
1032rxvt_term::pointer_unblank () 1041rxvt_term::pointer_unblank ()
1033{ 1042{
1034 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1043 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1035 rxvt_recolour_cursor (this); 1044 recolour_cursor ();
1036 1045
1037#ifdef POINTER_BLANK 1046#ifdef POINTER_BLANK
1038 hidden_pointer = 0; 1047 hidden_pointer = 0;
1039 1048
1040 if (Options & Opt_pointerBlank) 1049 if (Options & Opt_pointerBlank)
… …
1059 1068
1060void 1069void
1061rxvt_term::pointer_cb (time_watcher &w) 1070rxvt_term::pointer_cb (time_watcher &w)
1062{ 1071{
1063 SET_R (this); 1072 SET_R (this);
1073 SET_LOCALE (locale);
1064 1074
1065 pointer_blank (); 1075 pointer_blank ();
1066} 1076}
1067#endif 1077#endif
1068 1078
… …
1150{ 1160{
1151 int i, want_timeout; 1161 int i, want_timeout;
1152 Window unused_root, unused_child; 1162 Window unused_root, unused_child;
1153 int unused_root_x, unused_root_y; 1163 int unused_root_x, unused_root_y;
1154 unsigned int unused_mask; 1164 unsigned int unused_mask;
1155 struct timeval tp;
1156 1165
1157#ifdef DEBUG_X 1166#ifdef DEBUG_X
1158 const char *const eventnames[] = 1167 const char *const eventnames[] =
1159 { /* mason - this matches my system */ 1168 { /* mason - this matches my system */
1160 "", 1169 "",
… …
1191 "SelectionNotify", 1200 "SelectionNotify",
1192 "ColormapNotify", 1201 "ColormapNotify",
1193 "ClientMessage", 1202 "ClientMessage",
1194 "MappingNotify" 1203 "MappingNotify"
1195 }; 1204 };
1205#endif
1206
1207#ifdef DEBUG_X
1208 struct timeval tp;
1196 struct tm *ltt; 1209 struct tm *ltt;
1197#endif
1198
1199 /*
1200 * check if we need to get the time for any timeouts
1201 */
1202
1203 for (i = NUM_TIMEOUTS; i--; )
1204 if (R->timeout[i].tv_sec) {
1205 want_timeout = 1;
1206 break;
1207 }
1208
1209#ifndef DEBUG_X
1210 if (want_timeout)
1211#endif
1212 (void)gettimeofday(&tp, NULL); 1210 (void)gettimeofday(&tp, NULL);
1213
1214#ifdef DEBUG_X
1215 ltt = localtime(&(tp.tv_sec)); 1211 ltt = localtime(&(tp.tv_sec));
1216 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));
1217#endif 1213#endif
1218
1219 /* X event timeouts */
1220 if (want_timeout)
1221 for (i = NUM_TIMEOUTS; i--; ) {
1222 if (R->timeout[i].tv_sec == 0)
1223 continue;
1224 if ((tp.tv_sec < R->timeout[i].tv_sec)
1225 || (tp.tv_sec == R->timeout[i].tv_sec
1226 && tp.tv_usec < R->timeout[i].tv_usec))
1227 continue;
1228 R->timeout[i].tv_sec = 0;
1229 switch(i) {
1230 case TIMEOUT_INCR:
1231 rxvt_print_error("data loss: timeout on INCR selection paste");
1232 R->selection_wait = Sel_none;
1233 break;
1234 default:
1235 break;
1236 }
1237 }
1238 1214
1239 switch (ev->type) { 1215 switch (ev->type) {
1240 case KeyPress: 1216 case KeyPress:
1241 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1217 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1242 break; 1218 break;
… …
1458 &unused_xevent)) ; 1434 &unused_xevent)) ;
1459 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1435 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1460 GraphicsExpose, 1436 GraphicsExpose,
1461 &unused_xevent)) ; 1437 &unused_xevent)) ;
1462 if (isScrollbarWindow(ev->xany.window)) { 1438 if (isScrollbarWindow(ev->xany.window)) {
1463 scrollbar_setIdle(); 1439 R->scrollBar.setIdle();
1464 rxvt_scrollbar_show(aR_ 0); 1440 rxvt_scrollbar_show(aR_ 0);
1465 } 1441 }
1466#ifdef MENUBAR 1442#ifdef MENUBAR
1467 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1443 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1468 rxvt_menubar_expose(aR); 1444 rxvt_menubar_expose(aR);
… …
1581 */ 1557 */
1582 if (ev->window == R->TermWin.vt) 1558 if (ev->window == R->TermWin.vt)
1583 { 1559 {
1584#if RXVT_GRAPHICS 1560#if RXVT_GRAPHICS
1585 if (ev->subwindow != None) 1561 if (ev->subwindow != None)
1586 rxvt_Gr_ButtonPress(ev->x, ev->y); 1562 rxvt_Gr_ButtonPress (ev->x, ev->y);
1587 else 1563 else
1588#endif 1564#endif
1589 { 1565 {
1590 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1566 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1591 if (reportmode) 1567 if (reportmode)
… …
1653/* 1629/*
1654 * Scrollbar window processing of button press 1630 * Scrollbar window processing of button press
1655 */ 1631 */
1656 if (isScrollbarWindow(ev->window)) 1632 if (isScrollbarWindow(ev->window))
1657 { 1633 {
1658 scrollbar_setIdle(); 1634 R->scrollBar.setIdle ();
1659 /* 1635 /*
1660 * Rxvt-style scrollbar: 1636 * Rxvt-style scrollbar:
1661 * move up if mouse is above slider 1637 * move up if mouse is above slider
1662 * move dn if mouse is below slider 1638 * move dn if mouse is below slider
1663 * 1639 *
… …
1716#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1692#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1717 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1693 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1718#endif 1694#endif
1719 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1695 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1720 if (upordown < 0) 1696 if (upordown < 0)
1721 scrollbar_setUp(); 1697 R->scrollBar.setUp ();
1722 else 1698 else
1723 scrollbar_setDn(); 1699 R->scrollBar.setDn ();
1724 } 1700 }
1725 } else 1701 } else
1726 switch (ev->button) { 1702 switch (ev->button) {
1727 case Button2: 1703 case Button2:
1728 switch (R->scrollbar_align) { 1704 switch (R->scrollbar_align) {
… …
1740 || scrollbar_above_slider(ev->y) 1716 || scrollbar_above_slider(ev->y)
1741 || scrollbar_below_slider(ev->y)) 1717 || scrollbar_below_slider(ev->y))
1742 rxvt_scr_move_to(aR_ 1718 rxvt_scr_move_to(aR_
1743 scrollbar_position(ev->y) - R->csrO, 1719 scrollbar_position(ev->y) - R->csrO,
1744 scrollbar_size()); 1720 scrollbar_size());
1745 scrollbar_setMotion(); 1721 R->scrollBar.setMotion ();
1746 break; 1722 break;
1747 1723
1748 case Button1: 1724 case Button1:
1749 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1725 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1750 R->csrO = ev->y - R->scrollBar.top; 1726 R->csrO = ev->y - R->scrollBar.top;
… …
1763 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1764# else 1740# else
1765 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1741 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1766# endif 1742# endif
1767 else 1743 else
1768 scrollbar_setMotion(); 1744 R->scrollBar.setMotion ();
1769 } else { 1745 } else {
1770 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1746 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1771 (R->TermWin.nrow 1747 (R->TermWin.nrow
1772 * scrollbar_position(ev->y) 1748 * scrollbar_position(ev->y)
1773 / scrollbar_size())); 1749 / scrollbar_size()));
… …
1795 R->csrO = 0; /* reset csr Offset */ 1771 R->csrO = 0; /* reset csr Offset */
1796 if (!R->bypass_keystate) 1772 if (!R->bypass_keystate)
1797 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1773 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1798 1774
1799 if (scrollbar_isUpDn()) { 1775 if (scrollbar_isUpDn()) {
1800 scrollbar_setIdle(); 1776 R->scrollBar.setIdle ();
1801 rxvt_scrollbar_show(aR_ 0); 1777 rxvt_scrollbar_show(aR_ 0);
1802#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1778#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1803 R->refresh_type &= ~SMOOTH_REFRESH; 1779 R->refresh_type &= ~SMOOTH_REFRESH;
1804#endif 1780#endif
1805 } 1781 }
… …
1856 break; 1832 break;
1857#ifdef MOUSE_WHEEL 1833#ifdef MOUSE_WHEEL
1858 case Button4: 1834 case Button4:
1859 case Button5: 1835 case Button5:
1860 { 1836 {
1861 int i, v; 1837 int i;
1838 page_dirn v;
1862 1839
1863 v = (ev->button == Button4) ? UP : DN; 1840 v = (ev->button == Button4) ? UP : DN;
1864 if (ev->state & ShiftMask) 1841 if (ev->state & ShiftMask)
1865 i = 1; 1842 i = 1;
1866 else if ((R->Options & Opt_mouseWheelScrollPage)) 1843 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
2041 n = 0; 2018 n = 0;
2042 if (pchanged) { 2019 if (pchanged) {
2043 for (; n < (unsigned int)i; n++) { 2020 for (; n < (unsigned int)i; n++) {
2044 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2021 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2045 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"));
2046 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2023 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2047 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2024 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2048 break; 2025 break;
2049 } 2026 }
2050 } 2027 }
2051 } 2028 }
… …
2620 2597
2621 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2598 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2622 arg[0] = -arg[0]; 2599 arg[0] = -arg[0];
2623 /* FALLTHROUGH */ 2600 /* FALLTHROUGH */
2624 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2601 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2625 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);
2626 break; 2603 break;
2627 2604
2628 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2605 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2629 R->tt_write((const unsigned char *)VT100_ANS, 2606 R->tt_write((const unsigned char *)VT100_ANS,
2630 (unsigned int)(sizeof(VT100_ANS) - 1)); 2607 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
3399 } 3376 }
3400 3377
3401 if ((cmd == 'T') && (nargs >= 5)) { 3378 if ((cmd == 'T') && (nargs >= 5)) {
3402 int i, len = args[4]; 3379 int i, len = args[4];
3403 3380
3404 text = rxvt_malloc((len + 1) * sizeof(char)); 3381 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3405 3382
3406 if (text != NULL) { 3383 if (text != NULL) {
3407 for (i = 0; i < len; i++) 3384 for (i = 0; i < len; i++)
3408 text[i] = rxvt_cmd_getc(aR); 3385 text[i] = rxvt_cmd_getc(aR);
3409 text[len] = '\0'; 3386 text[len] = '\0';

Diff Legend

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