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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.29 by pcg, Mon Jan 19 17:26:43 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.14 2003/12/08 23:14:40 pcg Exp $ 4 * $Id: command.C,v 1.29 2004/01/19 17:26:43 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */ 58/* INTPROTO */
57void 59void
… …
62 KeySym keysym; 64 KeySym keysym;
63#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
65#endif 67#endif
66 int valid_keysym; 68 int valid_keysym;
67 unsigned char *kbuf = R->kbuf; 69 unsigned char kbuf[KBUFSZ];
68 70
69/* 71/*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
72 * 74 *
… …
88 if (R->Input_Context) 90 if (R->Input_Context)
89 { 91 {
90 Status status_return; 92 Status status_return;
91 93
92#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0)
93 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
95#else 98 else
99#endif
100 {
101 wchar_t wkbuf[KBUFSZ + 1];
102
103 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better
96 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
97 KBUFSZ, &keysym, &status_return); 109 KBUFSZ, &keysym, &status_return);
98#endif 110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
116 wkbuf[len] = 0;
117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
123 }
124
99 valid_keysym = ((status_return == XLookupKeySym) 125 valid_keysym = status_return == XLookupKeySym
100 || (status_return == XLookupBoth)); 126 || status_return == XLookupBoth;
101 } 127 }
102 else 128 else
103#endif 129#endif
104 { 130 {
105 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
106 valid_keysym = !len; 132 valid_keysym = !len;
107 } 133 }
108 134
109 if (valid_keysym) 135 if (valid_keysym)
110 { 136 {
… …
609 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
610 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
611 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
612 } 638 }
613#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
614 R->tt_write(kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
615} 641}
616/*}}} */ 642/*}}} */
617 643
618#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
619/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
653{ 679{
654#ifdef TRANSPARENT 680#ifdef TRANSPARENT
655 if (want_full_refresh) 681 if (want_full_refresh)
656 { 682 {
657 want_full_refresh = 0; 683 want_full_refresh = 0;
658 rxvt_scr_clear (this); 684 scr_clear ();
659 rxvt_scr_touch (this, False); 685 scr_touch (false);
660 want_refresh = 1; 686 want_refresh = 1;
661 } 687 }
662#endif 688#endif
663 689
664 if (want_refresh) 690 if (want_refresh)
665 { 691 {
666 rxvt_scr_refresh (this, refresh_type); 692 scr_refresh (refresh_type);
667 rxvt_scrollbar_show (this, 1); 693 rxvt_scrollbar_show (this, 1);
668#ifdef USE_XIM 694#ifdef USE_XIM
669 rxvt_IMSendSpot (this); 695 rxvt_IMSendSpot (this);
670#endif 696#endif
671 } 697 }
672 698
673 XFlush (Xdisplay); 699 XFlush (Xdisplay);
674#if 0
675 if (XPending (Xdisplay)) process_x_events ();
676 if (XPending (Xdisplay)) process_x_events ();
677#endif
678} 700}
679 701
680void 702void
681rxvt_term::check_cb (check_watcher &w) 703rxvt_term::check_cb (check_watcher &w)
682{ 704{
683 SET_R (this); 705 SET_R (this);
706 SET_LOCALE (locale);
684 707
685 flush (); 708 flush ();
686} 709}
687 710
688void 711void
… …
729 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
730 } 753 }
731 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
732} 755}
733 756
757#ifdef CURSOR_BLINK
734void 758void
735rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
736{ 760{
737 SET_R (this);
738
739 w.at += BLINK_INTERVAL;
740 hidden_cursor = !hidden_cursor; 761 hidden_cursor = !hidden_cursor;
741 want_refresh = 1; 762 want_refresh = 1;
763
764 w.start (w.at + BLINK_INTERVAL);
742} 765}
766#endif
743 767
744void 768void
745rxvt_term::x_cb (io_watcher &w, short revents) 769rxvt_term::x_cb (io_watcher &w, short revents)
746{ 770{
747 SET_R (this); 771 SET_R (this);
772 SET_LOCALE (locale);
748 773
749 process_x_events (); 774 process_x_events ();
750} 775}
751 776
752bool 777bool
… …
773 798
774void 799void
775rxvt_term::pty_cb (io_watcher &w, short revents) 800rxvt_term::pty_cb (io_watcher &w, short revents)
776{ 801{
777 SET_R (this); 802 SET_R (this);
803 SET_LOCALE (locale);
778 804
779 if (revents & EVENT_WRITE) 805 if (revents & EVENT_WRITE)
780 tt_write (0, 0); 806 tt_write (0, 0);
781 else if (revents & EVENT_READ) 807 else if (revents & EVENT_READ)
782 { 808 {
… …
860 if (refreshnow) 886 if (refreshnow)
861 { 887 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++; 889 refresh_limit++;
864 890
865 rxvt_scr_refresh (this, refresh_type); 891 scr_refresh (refresh_type);
866 } 892 }
867 893
868 } 894 }
869 else 895 else
870 { 896 {
… …
890// read the next character, currently handles UTF-8 916// read the next character, currently handles UTF-8
891// will probably handle all sorts of other stuff in the future 917// will probably handle all sorts of other stuff in the future
892uint32_t 918uint32_t
893rxvt_term::next_char () 919rxvt_term::next_char ()
894{ 920{
895 struct mbstate &s = mbstate;
896
897 while (cmdbuf_ptr < cmdbuf_endp) 921 while (cmdbuf_ptr < cmdbuf_endp)
898 { 922 {
899 uint8_t ch = *cmdbuf_ptr; 923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
900
901 if (s.cnt)
902 {
903 if ((ch & 0xc0) == 0x80)
904 {
905 cmdbuf_ptr++;
906
907 /* continuation */
908 s.reg = (s.reg << 6) | (ch & 0x7f);
909
910 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
911 return s.reg;
912
913 continue;
914 }
915 else
916 {
917 s.cnt = 0;
918 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
919 }
920 }
921
922 if ((ch & 0xc0) == 0xc0)
923 {
924 cmdbuf_ptr++; 924 return *cmdbuf_ptr++;
925 925
926 /* first byte */ 926 wchar_t wc;
927 s.orig = ch; /* for broken encodings */ 927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928 s.reg = ch; 928
929 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 929 if (len == (size_t)-2)
930 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 930 return NOCHAR;
931 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 931
932 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 932 if (len == (size_t)-1)
933 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
934 } 934
935 else 935 // assume wchar == unicode
936 { 936 cmdbuf_ptr += len;
937 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
938 return ch; 937 return wc;
939 }
940 } 938 }
941 939
942 return NOCHAR; 940 return NOCHAR;
943} 941}
944 942
… …
996 if (R->pending_scroll_selection) { 994 if (R->pending_scroll_selection) {
997 quick_timeout = 1; 995 quick_timeout = 1;
998 if (!R->scroll_selection_delay-- 996 if (!R->scroll_selection_delay--
999 && rxvt_scr_page(aR_ R->scroll_selection_dir, 997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1000 R->scroll_selection_lines)) { 998 R->scroll_selection_lines)) {
1001 rxvt_selection_extend(aR_ R->selection_save_x, 999 R->selection_extend (R->selection_save_x,
1002 R->selection_save_y, R->selection_save_state); 1000 R->selection_save_y, R->selection_save_state);
1003 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 R->refresh_type |= SMOOTH_REFRESH; 1002 R->refresh_type |= SMOOTH_REFRESH;
1005 R->want_refresh = 1; 1003 R->want_refresh = 1;
1006 } 1004 }
… …
1022 quick_timeout |= R->want_full_refresh; 1020 quick_timeout |= R->want_full_refresh;
1023#endif 1021#endif
1024#endif 1022#endif
1025} 1023}
1026 1024
1025#ifdef POINTER_BLANK
1027void 1026void
1028rxvt_term::pointer_unblank () 1027rxvt_term::pointer_unblank ()
1029{ 1028{
1030 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1031 rxvt_recolour_cursor (this); 1030 recolour_cursor ();
1032 1031
1033#ifdef POINTER_BLANK
1034 hidden_pointer = 0; 1032 hidden_pointer = 0;
1035 1033
1036 if (Options & Opt_pointerBlank) 1034 if (Options & Opt_pointerBlank)
1037 pointer_ev.start (NOW + pointerBlankDelay); 1035 pointer_ev.start (NOW + pointerBlankDelay);
1038#endif
1039} 1036}
1040 1037
1041#ifdef POINTER_BLANK
1042void 1038void
1043rxvt_term::pointer_blank () 1039rxvt_term::pointer_blank ()
1044{ 1040{
1045 pointer_ev.stop ();
1046
1047 if (!(Options & Opt_pointerBlank)) 1041 if (!(Options & Opt_pointerBlank))
1048 return; 1042 return;
1049 1043
1050 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1044 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1051 XFlush (Xdisplay); 1045 XFlush (Xdisplay);
… …
1055 1049
1056void 1050void
1057rxvt_term::pointer_cb (time_watcher &w) 1051rxvt_term::pointer_cb (time_watcher &w)
1058{ 1052{
1059 SET_R (this); 1053 SET_R (this);
1054 SET_LOCALE (locale);
1060 1055
1061 pointer_blank (); 1056 pointer_blank ();
1062} 1057}
1063#endif 1058#endif
1064 1059
… …
1069 int button_number, key_state = 0; 1064 int button_number, key_state = 0;
1070 int x, y; 1065 int x, y;
1071 1066
1072 x = ev->x; 1067 x = ev->x;
1073 y = ev->y; 1068 y = ev->y;
1074 rxvt_pixel_position(aR_ &x, &y); 1069 R->pixel_position (&x, &y);
1075 1070
1076 if (R->MEvent.button == AnyButton) { 1071 if (R->MEvent.button == AnyButton) {
1077 button_number = 3; 1072 button_number = 3;
1078 } else { 1073 } else {
1079 button_number = R->MEvent.button - Button1; 1074 button_number = R->MEvent.button - Button1;
… …
1146{ 1141{
1147 int i, want_timeout; 1142 int i, want_timeout;
1148 Window unused_root, unused_child; 1143 Window unused_root, unused_child;
1149 int unused_root_x, unused_root_y; 1144 int unused_root_x, unused_root_y;
1150 unsigned int unused_mask; 1145 unsigned int unused_mask;
1151 struct timeval tp;
1152 1146
1153#ifdef DEBUG_X 1147#ifdef DEBUG_X
1154 const char *const eventnames[] = 1148 const char *const eventnames[] =
1155 { /* mason - this matches my system */ 1149 { /* mason - this matches my system */
1156 "", 1150 "",
… …
1187 "SelectionNotify", 1181 "SelectionNotify",
1188 "ColormapNotify", 1182 "ColormapNotify",
1189 "ClientMessage", 1183 "ClientMessage",
1190 "MappingNotify" 1184 "MappingNotify"
1191 }; 1185 };
1186#endif
1187
1188#ifdef DEBUG_X
1189 struct timeval tp;
1192 struct tm *ltt; 1190 struct tm *ltt;
1193#endif
1194
1195 /*
1196 * check if we need to get the time for any timeouts
1197 */
1198
1199 for (i = NUM_TIMEOUTS; i--; )
1200 if (R->timeout[i].tv_sec) {
1201 want_timeout = 1;
1202 break;
1203 }
1204
1205#ifndef DEBUG_X
1206 if (want_timeout)
1207#endif
1208 (void)gettimeofday(&tp, NULL); 1191 (void)gettimeofday(&tp, NULL);
1209
1210#ifdef DEBUG_X
1211 ltt = localtime(&(tp.tv_sec)); 1192 ltt = localtime(&(tp.tv_sec));
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)); 1193 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));
1213#endif 1194#endif
1214
1215 /* X event timeouts */
1216 if (want_timeout)
1217 for (i = NUM_TIMEOUTS; i--; ) {
1218 if (R->timeout[i].tv_sec == 0)
1219 continue;
1220 if ((tp.tv_sec < R->timeout[i].tv_sec)
1221 || (tp.tv_sec == R->timeout[i].tv_sec
1222 && tp.tv_usec < R->timeout[i].tv_usec))
1223 continue;
1224 R->timeout[i].tv_sec = 0;
1225 switch(i) {
1226 case TIMEOUT_INCR:
1227 rxvt_print_error("data loss: timeout on INCR selection paste");
1228 R->selection_wait = Sel_none;
1229 break;
1230 default:
1231 break;
1232 }
1233 }
1234 1195
1235 switch (ev->type) { 1196 switch (ev->type) {
1236 case KeyPress: 1197 case KeyPress:
1237 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1198 rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1238 break; 1199 break;
… …
1364 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1325 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1365 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1326 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1366 ConfigureNotify, ev)); 1327 ConfigureNotify, ev));
1367 if (R->szHint.width != width || R->szHint.height != height) { 1328 if (R->szHint.width != width || R->szHint.height != height) {
1368 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1329 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1369 rxvt_resize_all_windows(aR_ (unsigned int)width, 1330 R->resize_all_windows (width, height, 1);
1370 (unsigned int)height, 1);
1371 } 1331 }
1372#ifdef DEBUG_SIZE 1332#ifdef DEBUG_SIZE
1373 else { 1333 else {
1374 D_SIZE((stderr, "Size: Not resizing")); 1334 D_SIZE((stderr, "Size: Not resizing"));
1375 } 1335 }
… …
1434 1394
1435 case GraphicsExpose: 1395 case GraphicsExpose:
1436 case Expose: 1396 case Expose:
1437 if (ev->xany.window == R->TermWin.vt) { 1397 if (ev->xany.window == R->TermWin.vt) {
1438#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1439 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1399 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1400 ev->xexpose.width, ev->xexpose.height, False);
1441#else 1401#else
1442 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1443 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1403 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1444 ev->xexpose.width, ev->xexpose.height, False); 1404 ev->xexpose.width, ev->xexpose.height, False);
1445 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1405 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1446 // ev->xexpose.width, R->TermWin.height, False); 1406 // ev->xexpose.width, R->TermWin.height, False);
1447#endif 1407#endif
1448 R->want_refresh = 1; 1408 R->want_refresh = 1;
1449 } else { 1409 } else {
… …
1454 &unused_xevent)) ; 1414 &unused_xevent)) ;
1455 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1415 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1456 GraphicsExpose, 1416 GraphicsExpose,
1457 &unused_xevent)) ; 1417 &unused_xevent)) ;
1458 if (isScrollbarWindow(ev->xany.window)) { 1418 if (isScrollbarWindow(ev->xany.window)) {
1459 scrollbar_setIdle(); 1419 R->scrollBar.setIdle();
1460 rxvt_scrollbar_show(aR_ 0); 1420 rxvt_scrollbar_show(aR_ 0);
1461 } 1421 }
1462#ifdef MENUBAR 1422#ifdef MENUBAR
1463 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1423 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1464 rxvt_menubar_expose(aR); 1424 rxvt_menubar_expose(aR);
… …
1494 &unused_mask); 1454 &unused_mask);
1495#ifdef MOUSE_THRESHOLD 1455#ifdef MOUSE_THRESHOLD
1496 /* deal with a `jumpy' mouse */ 1456 /* deal with a `jumpy' mouse */
1497 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1457 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1498#endif 1458#endif
1499 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1459 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1500 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1460 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1501#ifdef SELECTION_SCROLLING 1461#ifdef SELECTION_SCROLLING
1502 if (ev->xbutton.y<R->TermWin.int_bwidth || 1462 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1503 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1463 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1504 int dist; 1464 int dist;
… …
1553 &unused_root_x, &unused_root_y, 1513 &unused_root_x, &unused_root_y,
1554 &(ev->xbutton.x), &(ev->xbutton.y), 1514 &(ev->xbutton.x), &(ev->xbutton.y),
1555 &unused_mask); 1515 &unused_mask);
1556 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1516 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1557 scrollbar_size()); 1517 scrollbar_size());
1558 rxvt_scr_refresh(aR_ R->refresh_type); 1518 R->scr_refresh (R->refresh_type);
1559 R->refresh_limit = 0; 1519 R->refresh_limit = 0;
1560 rxvt_scrollbar_show(aR_ 1); 1520 rxvt_scrollbar_show(aR_ 1);
1561 } 1521 }
1562 break; 1522 break;
1563 } 1523 }
… …
1565 1525
1566/* INTPROTO */ 1526/* INTPROTO */
1567void 1527void
1568rxvt_button_press(pR_ XButtonEvent *ev) 1528rxvt_button_press(pR_ XButtonEvent *ev)
1569{ 1529{
1570 int reportmode = 0, clickintime; 1530 int reportmode = 0, clickintime;
1571 1531
1572 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1532 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1573 if (!R->bypass_keystate) 1533 if (!R->bypass_keystate)
1574 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1534 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1575/* 1535/*
… …
1577 */ 1537 */
1578 if (ev->window == R->TermWin.vt) 1538 if (ev->window == R->TermWin.vt)
1579 { 1539 {
1580#if RXVT_GRAPHICS 1540#if RXVT_GRAPHICS
1581 if (ev->subwindow != None) 1541 if (ev->subwindow != None)
1582 rxvt_Gr_ButtonPress(ev->x, ev->y); 1542 rxvt_Gr_ButtonPress (ev->x, ev->y);
1583 else 1543 else
1584#endif 1544#endif
1585 { 1545 {
1586 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1546 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1587 if (reportmode) 1547 if (reportmode)
… …
1622 if (ev->button != R->MEvent.button) 1582 if (ev->button != R->MEvent.button)
1623 R->MEvent.clicks = 0; 1583 R->MEvent.clicks = 0;
1624 switch (ev->button) 1584 switch (ev->button)
1625 { 1585 {
1626 case Button1: 1586 case Button1:
1587 /* allow shift+left click to extend selection */
1588 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1589 {
1627 if (R->MEvent.button == Button1 && clickintime) 1590 if (R->MEvent.button == Button1 && clickintime)
1591 R->selection_rotate (ev->x, ev->y);
1628 R->MEvent.clicks++; 1592 else
1593 R->selection_extend (ev->x, ev->y, 1);
1594 }
1629 else 1595 else
1596 {
1597 if (R->MEvent.button == Button1 && clickintime)
1598 R->MEvent.clicks++;
1599 else
1630 R->MEvent.clicks = 1; 1600 R->MEvent.clicks = 1;
1601
1631 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1602 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1603 }
1604
1632 R->MEvent.button = Button1; 1605 R->MEvent.button = Button1;
1633 break; 1606 break;
1634 1607
1635 case Button3: 1608 case Button3:
1636 if (R->MEvent.button == Button3 && clickintime) 1609 if (R->MEvent.button == Button3 && clickintime)
1637 rxvt_selection_rotate(aR_ ev->x, ev->y); 1610 R->selection_rotate (ev->x, ev->y);
1638 else 1611 else
1639 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1612 R->selection_extend (ev->x, ev->y, 1);
1640 R->MEvent.button = Button3; 1613 R->MEvent.button = Button3;
1641 break; 1614 break;
1642 } 1615 }
1643 } 1616 }
1644 R->MEvent.time = ev->time; 1617 R->MEvent.time = ev->time;
… …
1649/* 1622/*
1650 * Scrollbar window processing of button press 1623 * Scrollbar window processing of button press
1651 */ 1624 */
1652 if (isScrollbarWindow(ev->window)) 1625 if (isScrollbarWindow(ev->window))
1653 { 1626 {
1654 scrollbar_setIdle(); 1627 R->scrollBar.setIdle ();
1655 /* 1628 /*
1656 * Rxvt-style scrollbar: 1629 * Rxvt-style scrollbar:
1657 * move up if mouse is above slider 1630 * move up if mouse is above slider
1658 * move dn if mouse is below slider 1631 * move dn if mouse is below slider
1659 * 1632 *
… …
1712#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1685#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1713 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1686 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1714#endif 1687#endif
1715 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1688 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1716 if (upordown < 0) 1689 if (upordown < 0)
1717 scrollbar_setUp(); 1690 R->scrollBar.setUp ();
1718 else 1691 else
1719 scrollbar_setDn(); 1692 R->scrollBar.setDn ();
1720 } 1693 }
1721 } else 1694 } else
1722 switch (ev->button) { 1695 switch (ev->button) {
1723 case Button2: 1696 case Button2:
1724 switch (R->scrollbar_align) { 1697 switch (R->scrollbar_align) {
… …
1736 || scrollbar_above_slider(ev->y) 1709 || scrollbar_above_slider(ev->y)
1737 || scrollbar_below_slider(ev->y)) 1710 || scrollbar_below_slider(ev->y))
1738 rxvt_scr_move_to(aR_ 1711 rxvt_scr_move_to(aR_
1739 scrollbar_position(ev->y) - R->csrO, 1712 scrollbar_position(ev->y) - R->csrO,
1740 scrollbar_size()); 1713 scrollbar_size());
1741 scrollbar_setMotion(); 1714 R->scrollBar.setMotion ();
1742 break; 1715 break;
1743 1716
1744 case Button1: 1717 case Button1:
1745 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1718 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1746 R->csrO = ev->y - R->scrollBar.top; 1719 R->csrO = ev->y - R->scrollBar.top;
… …
1759 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1732 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1760# else 1733# else
1761 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1762# endif 1735# endif
1763 else 1736 else
1764 scrollbar_setMotion(); 1737 R->scrollBar.setMotion ();
1765 } else { 1738 } else {
1766 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1739 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1767 (R->TermWin.nrow 1740 (R->TermWin.nrow
1768 * scrollbar_position(ev->y) 1741 * scrollbar_position(ev->y)
1769 / scrollbar_size())); 1742 / scrollbar_size()));
… …
1791 R->csrO = 0; /* reset csr Offset */ 1764 R->csrO = 0; /* reset csr Offset */
1792 if (!R->bypass_keystate) 1765 if (!R->bypass_keystate)
1793 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1766 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1794 1767
1795 if (scrollbar_isUpDn()) { 1768 if (scrollbar_isUpDn()) {
1796 scrollbar_setIdle(); 1769 R->scrollBar.setIdle ();
1797 rxvt_scrollbar_show(aR_ 0); 1770 rxvt_scrollbar_show(aR_ 0);
1798#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1771#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1799 R->refresh_type &= ~SMOOTH_REFRESH; 1772 R->refresh_type &= ~SMOOTH_REFRESH;
1800#endif 1773#endif
1801 } 1774 }
… …
1838 * when overriding mouse reporting 1811 * when overriding mouse reporting
1839 */ 1812 */
1840 if (R->PrivateModes & PrivMode_mouse_report 1813 if (R->PrivateModes & PrivMode_mouse_report
1841 && R->bypass_keystate 1814 && R->bypass_keystate
1842 && ev->button == Button1 && R->MEvent.clicks <= 1) 1815 && ev->button == Button1 && R->MEvent.clicks <= 1)
1843 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1816 R->selection_extend (ev->x, ev->y, 0);
1844 1817
1845 switch (ev->button) { 1818 switch (ev->button) {
1846 case Button1: 1819 case Button1:
1847 case Button3: 1820 case Button3:
1848 rxvt_selection_make(aR_ ev->time); 1821 rxvt_selection_make(aR_ ev->time);
… …
1852 break; 1825 break;
1853#ifdef MOUSE_WHEEL 1826#ifdef MOUSE_WHEEL
1854 case Button4: 1827 case Button4:
1855 case Button5: 1828 case Button5:
1856 { 1829 {
1857 int i, v; 1830 int i;
1831 page_dirn v;
1858 1832
1859 v = (ev->button == Button4) ? UP : DN; 1833 v = (ev->button == Button4) ? UP : DN;
1860 if (ev->state & ShiftMask) 1834 if (ev->state & ShiftMask)
1861 i = 1; 1835 i = 1;
1862 else if ((R->Options & Opt_mouseWheelScrollPage)) 1836 else if ((R->Options & Opt_mouseWheelScrollPage))
… …
1870 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1844 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1871 } 1845 }
1872# endif 1846# endif
1873# ifdef JUMP_MOUSE_WHEEL 1847# ifdef JUMP_MOUSE_WHEEL
1874 rxvt_scr_page(aR_ v, i); 1848 rxvt_scr_page(aR_ v, i);
1875 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1849 R->scr_refresh (SMOOTH_REFRESH);
1876 rxvt_scrollbar_show(aR_ 1); 1850 rxvt_scrollbar_show(aR_ 1);
1877# else 1851# else
1878 for (; i--;) 1852 while (i--)
1879 { 1853 {
1880 rxvt_scr_page(aR_ v, 1); 1854 rxvt_scr_page(aR_ v, 1);
1881 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1855 R->scr_refresh (SMOOTH_REFRESH);
1882 rxvt_scrollbar_show(aR_ 1); 1856 rxvt_scrollbar_show(aR_ 1);
1883 } 1857 }
1884# endif 1858# endif
1885 } 1859 }
1886 break; 1860 break;
… …
2037 n = 0; 2011 n = 0;
2038 if (pchanged) { 2012 if (pchanged) {
2039 for (; n < (unsigned int)i; n++) { 2013 for (; n < (unsigned int)i; n++) {
2040 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2014 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2041 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2015 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2042 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2043 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2017 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2044 break; 2018 break;
2045 } 2019 }
2046 } 2020 }
2047 } 2021 }
… …
2240 break; 2214 break;
2241 case 'I': /* cursor up and scroll down if needed */ 2215 case 'I': /* cursor up and scroll down if needed */
2242 rxvt_scr_index(aR_ DN); 2216 rxvt_scr_index(aR_ DN);
2243 break; 2217 break;
2244 case 'J': /* erase to end of screen */ 2218 case 'J': /* erase to end of screen */
2245 rxvt_scr_erase_screen(aR_ 0); 2219 R->scr_erase_screen (0);
2246 break; 2220 break;
2247 case 'K': /* erase to end of line */ 2221 case 'K': /* erase to end of line */
2248 rxvt_scr_erase_line(aR_ 0); 2222 rxvt_scr_erase_line(aR_ 0);
2249 break; 2223 break;
2250 case 'Y': /* move to specified row and col */ 2224 case 'Y': /* move to specified row and col */
… …
2585 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2559 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2586 rxvt_scr_tab(aR_ arg[0]); 2560 rxvt_scr_tab(aR_ arg[0]);
2587 break; 2561 break;
2588 2562
2589 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2563 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2590 rxvt_scr_erase_screen(aR_ arg[0]); 2564 R->scr_erase_screen (arg[0]);
2591 break; 2565 break;
2592 2566
2593 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2567 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2594 rxvt_scr_erase_line(aR_ arg[0]); 2568 rxvt_scr_erase_line(aR_ arg[0]);
2595 break; 2569 break;
… …
2616 2590
2617 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2591 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2618 arg[0] = -arg[0]; 2592 arg[0] = -arg[0];
2619 /* FALLTHROUGH */ 2593 /* FALLTHROUGH */
2620 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2594 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2621 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2595 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2622 break; 2596 break;
2623 2597
2624 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2598 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2625 R->tt_write((const unsigned char *)VT100_ANS, 2599 R->tt_write((const unsigned char *)VT100_ANS,
2626 (unsigned int)(sizeof(VT100_ANS) - 1)); 2600 (unsigned int)(sizeof(VT100_ANS) - 1));
… …
2765 break; 2739 break;
2766 case 6: /* lower window */ 2740 case 6: /* lower window */
2767 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2741 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2768 break; 2742 break;
2769 case 7: /* refresh window */ 2743 case 7: /* refresh window */
2770 rxvt_scr_touch(aR_ True); 2744 R->scr_touch (true);
2771 break; 2745 break;
2772 case 8: /* set size (chars) */ 2746 case 8: /* set size (chars) */
2773 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2747 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2774 (unsigned int)(args[1] * R->TermWin.fheight)); 2748 (unsigned int)(args[1] * R->TermWin.fheight));
2775 break; 2749 break;
… …
2986 if (*str != ';') { 2960 if (*str != ';') {
2987#if XPM_BACKGROUND 2961#if XPM_BACKGROUND
2988 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2962 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2989 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2963 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2990#endif 2964#endif
2991 rxvt_scr_touch(aR_ True); 2965 R->scr_touch (true);
2992 } 2966 }
2993 while ((str = STRCHR(str, ';')) != NULL) { 2967 while ((str = STRCHR(str, ';')) != NULL) {
2994 str++; 2968 str++;
2995#if XPM_BACKGROUND 2969#if XPM_BACKGROUND
2996 changed += rxvt_scale_pixmap(aR_ str); 2970 changed += rxvt_scale_pixmap(aR_ str);
… …
2998 } 2972 }
2999 if (changed) { 2973 if (changed) {
3000#ifdef XPM_BACKGROUND 2974#ifdef XPM_BACKGROUND
3001 rxvt_resize_pixmap(aR); 2975 rxvt_resize_pixmap(aR);
3002#endif 2976#endif
3003 rxvt_scr_touch(aR_ True); 2977 R->scr_touch (true);
3004 } 2978 }
3005 break; 2979 break;
3006 2980
3007 case XTerm_restoreFG: 2981 case XTerm_restoreFG:
3008 rxvt_set_window_color(aR_ Color_fg, str); 2982 rxvt_set_window_color(aR_ Color_fg, str);
… …
3174 break; 3148 break;
3175#endif 3149#endif
3176#ifdef scrollBar_esc 3150#ifdef scrollBar_esc
3177 case scrollBar_esc: 3151 case scrollBar_esc:
3178 if (rxvt_scrollbar_mapping(aR_ state)) { 3152 if (rxvt_scrollbar_mapping(aR_ state)) {
3179 rxvt_resize_all_windows(aR_ 0, 0, 0); 3153 R->resize_all_windows (0, 0, 0);
3180 rxvt_scr_touch(aR_ True); 3154 R->scr_touch (true);
3181 } 3155 }
3182 break; 3156 break;
3183#endif 3157#endif
3184 case 25: /* visible/invisible cursor */ 3158 case 25: /* visible/invisible cursor */
3185 rxvt_scr_cursor_visible(aR_ state); 3159 rxvt_scr_cursor_visible(aR_ state);
… …
3211 else 3185 else
3212 R->Options &= ~Opt_scrollTtyKeypress; 3186 R->Options &= ~Opt_scrollTtyKeypress;
3213 break; 3187 break;
3214 case 1047: /* secondary screen w/ clearing */ 3188 case 1047: /* secondary screen w/ clearing */
3215 if (R->current_screen != PRIMARY) 3189 if (R->current_screen != PRIMARY)
3216 rxvt_scr_erase_screen(aR_ 2); 3190 R->scr_erase_screen (2);
3217 rxvt_scr_change_screen(aR_ state); 3191 rxvt_scr_change_screen(aR_ state);
3218 /* FALLTHROUGH */ 3192 /* FALLTHROUGH */
3219 default: 3193 default:
3220 break; 3194 break;
3221 } 3195 }
… …
3395 } 3369 }
3396 3370
3397 if ((cmd == 'T') && (nargs >= 5)) { 3371 if ((cmd == 'T') && (nargs >= 5)) {
3398 int i, len = args[4]; 3372 int i, len = args[4];
3399 3373
3400 text = rxvt_malloc((len + 1) * sizeof(char)); 3374 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3401 3375
3402 if (text != NULL) { 3376 if (text != NULL) {
3403 for (i = 0; i < len; i++) 3377 for (i = 0; i < len; i++)
3404 text[i] = rxvt_cmd_getc(aR); 3378 text[i] = rxvt_cmd_getc(aR);
3405 text[len] = '\0'; 3379 text[len] = '\0';

Diff Legend

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