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.18 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.31 by pcg, Thu Jan 29 23:26:01 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.18 2003/12/18 02:07:12 pcg Exp $ 4 * $Id: command.C,v 1.31 2004/01/29 23:26:01 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
96 wchar_t wkbuf[KBUFSZ + 1]; 99#endif
97
98 // assume wchar_t == unicode or better
99 len = XwcLookupString (R->Input_Context, ev, wkbuf,
100 KBUFSZ, &keysym, &status_return);
101
102 if (status_return == XLookupChars
103 || status_return == XLookupBoth)
104 { 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
108 len = XwcLookupString (R->Input_Context, ev, wkbuf,
109 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale])
111 SET_LOCALE (R->locale);
112
113 if (status_return == XLookupChars
114 || status_return == XLookupBoth)
115 {
105 wkbuf[len] = 0; 116 wkbuf[len] = 0;
106 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 117 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
118 if (len < 0)
119 len = 0;
120 }
121 else
122 len = 0;
107 } 123 }
108 else 124
109 len = 0;
110#endif
111 valid_keysym = status_return == XLookupKeySym 125 valid_keysym = status_return == XLookupKeySym
112 || status_return == XLookupBoth; 126 || status_return == XLookupBoth;
113 } 127 }
114 else 128 else
115#endif 129#endif
… …
621 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
622 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
623 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
624 } 638 }
625#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
626 R->tt_write(kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
627} 641}
628/*}}} */ 642/*}}} */
629 643
630#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
631/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
665{ 679{
666#ifdef TRANSPARENT 680#ifdef TRANSPARENT
667 if (want_full_refresh) 681 if (want_full_refresh)
668 { 682 {
669 want_full_refresh = 0; 683 want_full_refresh = 0;
670 rxvt_scr_clear (this); 684 scr_clear ();
671 rxvt_scr_touch (this, False); 685 scr_touch (false);
672 want_refresh = 1; 686 want_refresh = 1;
673 } 687 }
674#endif 688#endif
675 689
676 if (want_refresh) 690 if (want_refresh)
677 { 691 {
678 rxvt_scr_refresh (this, refresh_type); 692 scr_refresh (refresh_type);
679 rxvt_scrollbar_show (this, 1); 693 rxvt_scrollbar_show (this, 1);
680#ifdef USE_XIM 694#ifdef USE_XIM
681 rxvt_IMSendSpot (this); 695 rxvt_IMSendSpot (this);
682#endif 696#endif
683 } 697 }
684 698
685 XFlush (Xdisplay); 699 XFlush (Xdisplay);
686#if 0
687 if (XPending (Xdisplay)) process_x_events ();
688 if (XPending (Xdisplay)) process_x_events ();
689#endif
690} 700}
691 701
692void 702void
693rxvt_term::check_cb (check_watcher &w) 703rxvt_term::check_cb (check_watcher &w)
694{ 704{
695 SET_R (this); 705 SET_R (this);
706 SET_LOCALE (locale);
696 707
697 flush (); 708 flush ();
698} 709}
699 710
700void 711void
… …
705 XEvent xev; 716 XEvent xev;
706 717
707 XNextEvent (Xdisplay, &xev); 718 XNextEvent (Xdisplay, &xev);
708 719
709#if defined(CURSOR_BLINK) 720#if defined(CURSOR_BLINK)
710 if ((Options & Opt_cursorBlink) 721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
711 && xev.type == KeyPress)
712 { 722 {
713 if (hidden_cursor) 723 if (hidden_cursor)
714 { 724 {
715 hidden_cursor = 0; 725 hidden_cursor = 0;
716 want_refresh = 1; 726 want_refresh = 1;
717 } 727 }
718 728
719 blink_ev.start (NOW + BLINK_INTERVAL); 729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
720 } 730 }
721#endif 731#endif
722 732
723#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
724 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
725 && (pointerBlankDelay > 0))
726 { 735 {
727 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
728 || xev.type == ButtonPress 737 || xev.type == ButtonPress
729 || xev.type == ButtonRelease) 738 || xev.type == ButtonRelease)
730 if (hidden_pointer) 739 if (hidden_pointer)
… …
741 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
742 } 751 }
743 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
744} 753}
745 754
755#ifdef CURSOR_BLINK
746void 756void
747rxvt_term::blink_cb (time_watcher &w) 757rxvt_term::cursor_blink_cb (time_watcher &w)
748{ 758{
749 SET_R (this);
750
751 w.at += BLINK_INTERVAL;
752 hidden_cursor = !hidden_cursor; 759 hidden_cursor = !hidden_cursor;
753 want_refresh = 1; 760 want_refresh = 1;
761
762 w.start (w.at + BLINK_INTERVAL);
754} 763}
764#endif
765
766#ifdef TEXT_BLINK
767void
768rxvt_term::text_blink_cb (time_watcher &w)
769{
770 if (scr_refresh_rend (RS_Blink, RS_Blink))
771 {
772 hidden_text = !hidden_text;
773 want_refresh = 1;
774 w.start (w.at + TEXT_BLINK_INTERVAL);
775 }
776}
777#endif
755 778
756void 779void
757rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
758{ 781{
759 SET_R (this); 782 SET_R (this);
783 SET_LOCALE (locale);
760 784
761 process_x_events (); 785 process_x_events ();
762} 786}
763 787
764bool 788bool
… …
785 809
786void 810void
787rxvt_term::pty_cb (io_watcher &w, short revents) 811rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 812{
789 SET_R (this); 813 SET_R (this);
814 SET_LOCALE (locale);
790 815
791 if (revents & EVENT_WRITE) 816 if (revents & EVENT_WRITE)
792 tt_write (0, 0); 817 tt_write (0, 0);
793 else if (revents & EVENT_READ) 818 else if (revents & EVENT_READ)
794 { 819 {
… …
872 if (refreshnow) 897 if (refreshnow)
873 { 898 {
874 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 899 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
875 refresh_limit++; 900 refresh_limit++;
876 901
877 rxvt_scr_refresh (this, refresh_type); 902 scr_refresh (refresh_type);
878 } 903 }
879 904
880 } 905 }
881 else 906 else
882 { 907 {
… …
902// read the next character, currently handles UTF-8 927// read the next character, currently handles UTF-8
903// will probably handle all sorts of other stuff in the future 928// will probably handle all sorts of other stuff in the future
904uint32_t 929uint32_t
905rxvt_term::next_char () 930rxvt_term::next_char ()
906{ 931{
907 struct mbstate &s = mbstate;
908
909 while (cmdbuf_ptr < cmdbuf_endp) 932 while (cmdbuf_ptr < cmdbuf_endp)
910 { 933 {
911 uint8_t ch = *cmdbuf_ptr; 934 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
912
913 if (s.cnt)
914 {
915 if ((ch & 0xc0) == 0x80)
916 {
917 cmdbuf_ptr++;
918
919 /* continuation */
920 s.reg = (s.reg << 6) | (ch & 0x7f);
921
922 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
923 return s.reg;
924
925 continue;
926 }
927 else
928 {
929 s.cnt = 0;
930 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
931 }
932 }
933
934 if ((ch & 0xc0) == 0xc0)
935 {
936 cmdbuf_ptr++; 935 return *cmdbuf_ptr++;
937 936
938 /* first byte */ 937 wchar_t wc;
939 s.orig = ch; /* for broken encodings */ 938 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
940 s.reg = ch; 939
941 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 940 if (len == (size_t)-2)
942 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 941 return NOCHAR;
943 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 942
944 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 943 if (len == (size_t)-1)
945 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 944 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
946 } 945
947 else 946 // assume wchar == unicode
948 { 947 cmdbuf_ptr += len;
949 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
950 return ch; 948 return wc;
951 }
952 } 949 }
953 950
954 return NOCHAR; 951 return NOCHAR;
955} 952}
956 953
… …
1008 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
1009 quick_timeout = 1; 1006 quick_timeout = 1;
1010 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
1011 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1012 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
1013 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
1014 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
1015 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1016 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
1017 R->want_refresh = 1; 1014 R->want_refresh = 1;
1018 } 1015 }
… …
1034 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1035#endif 1032#endif
1036#endif 1033#endif
1037} 1034}
1038 1035
1036#ifdef POINTER_BLANK
1039void 1037void
1040rxvt_term::pointer_unblank () 1038rxvt_term::pointer_unblank ()
1041{ 1039{
1042 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1043 rxvt_recolour_cursor (this); 1041 recolour_cursor ();
1044 1042
1045#ifdef POINTER_BLANK
1046 hidden_pointer = 0; 1043 hidden_pointer = 0;
1047 1044
1048 if (Options & Opt_pointerBlank) 1045 if (Options & Opt_pointerBlank)
1049 pointer_ev.start (NOW + pointerBlankDelay); 1046 pointer_ev.start (NOW + pointerBlankDelay);
1050#endif
1051} 1047}
1052 1048
1053#ifdef POINTER_BLANK
1054void 1049void
1055rxvt_term::pointer_blank () 1050rxvt_term::pointer_blank ()
1056{ 1051{
1057 pointer_ev.stop ();
1058
1059 if (!(Options & Opt_pointerBlank)) 1052 if (!(Options & Opt_pointerBlank))
1060 return; 1053 return;
1061 1054
1062 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1063 XFlush (Xdisplay); 1056 XFlush (Xdisplay);
… …
1067 1060
1068void 1061void
1069rxvt_term::pointer_cb (time_watcher &w) 1062rxvt_term::pointer_cb (time_watcher &w)
1070{ 1063{
1071 SET_R (this); 1064 SET_R (this);
1065 SET_LOCALE (locale);
1072 1066
1073 pointer_blank (); 1067 pointer_blank ();
1074} 1068}
1075#endif 1069#endif
1076 1070
… …
1081 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1082 int x, y; 1076 int x, y;
1083 1077
1084 x = ev->x; 1078 x = ev->x;
1085 y = ev->y; 1079 y = ev->y;
1086 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1087 1081
1088 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1089 button_number = 3; 1083 button_number = 3;
1090 } else { 1084 } else {
1091 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
… …
1309 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1310 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1311#endif 1305#endif
1312#ifdef CURSOR_BLINK 1306#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink) 1307 if (R->Options & Opt_cursorBlink)
1314 R->blink_ev.start (NOW + BLINK_INTERVAL); 1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif 1309#endif
1316 } 1310 }
1317 break; 1311 break;
1318 1312
1319 case FocusOut: 1313 case FocusOut:
… …
1324 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1325 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1326#endif 1320#endif
1327#ifdef CURSOR_BLINK 1321#ifdef CURSOR_BLINK
1328 if (R->Options & Opt_cursorBlink) 1322 if (R->Options & Opt_cursorBlink)
1329 R->blink_ev.stop (); 1323 R->cursor_blink_ev.stop ();
1330 R->hidden_cursor = 0; 1324 R->hidden_cursor = 0;
1331#endif 1325#endif
1332 } 1326 }
1333 break; 1327 break;
1334 1328
… …
1342 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1343 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1344 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1345 if (R->szHint.width != width || R->szHint.height != height) { 1339 if (R->szHint.width != width || R->szHint.height != height) {
1346 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1340 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1347 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1348 (unsigned int)height, 1);
1349 } 1342 }
1350#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1351 else { 1344 else {
1352 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1353 } 1346 }
… …
1376 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1377 break; 1370 break;
1378 1371
1379 case UnmapNotify: 1372 case UnmapNotify:
1380 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1381 break; 1377 break;
1382 1378
1383 case MapNotify: 1379 case MapNotify:
1384 R->TermWin.mapped = 1; 1380 R->TermWin.mapped = 1;
1381#ifdef TEXT_BLINK
1382 R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1383#endif
1385 break; 1384 break;
1386 1385
1387 case PropertyNotify: 1386 case PropertyNotify:
1388 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1389 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
… …
1412 1411
1413 case GraphicsExpose: 1412 case GraphicsExpose:
1414 case Expose: 1413 case Expose:
1415 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1416#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1417 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1418 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1419#else 1418#else
1420 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1421 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1422 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1423 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1424 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1425#endif 1424#endif
1426 R->want_refresh = 1; 1425 R->want_refresh = 1;
1427 } else { 1426 } else {
… …
1432 &unused_xevent)) ; 1431 &unused_xevent)) ;
1433 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1432 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1434 GraphicsExpose, 1433 GraphicsExpose,
1435 &unused_xevent)) ; 1434 &unused_xevent)) ;
1436 if (isScrollbarWindow(ev->xany.window)) { 1435 if (isScrollbarWindow(ev->xany.window)) {
1437 scrollbar_setIdle(); 1436 R->scrollBar.setIdle();
1438 rxvt_scrollbar_show(aR_ 0); 1437 rxvt_scrollbar_show(aR_ 0);
1439 } 1438 }
1440#ifdef MENUBAR 1439#ifdef MENUBAR
1441 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1440 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1442 rxvt_menubar_expose(aR); 1441 rxvt_menubar_expose(aR);
… …
1472 &unused_mask); 1471 &unused_mask);
1473#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1475 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1476#endif 1475#endif
1477 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1478 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1479#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1480 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1481 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1482 int dist; 1481 int dist;
… …
1531 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1532 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1533 &unused_mask); 1532 &unused_mask);
1534 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1533 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1535 scrollbar_size()); 1534 scrollbar_size());
1536 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1537 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1538 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1539 } 1538 }
1540 break; 1539 break;
1541 } 1540 }
… …
1543 1542
1544/* INTPROTO */ 1543/* INTPROTO */
1545void 1544void
1546rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1547{ 1546{
1548 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1549 1548
1550 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1551 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1552 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1553/* 1552/*
… …
1600 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1601 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1602 switch (ev->button) 1601 switch (ev->button)
1603 { 1602 {
1604 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1605 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1606 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1607 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1608 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1609 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1610 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1611 break; 1623 break;
1612 1624
1613 case Button3: 1625 case Button3:
1614 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1615 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1616 else 1628 else
1617 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1618 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1619 break; 1631 break;
1620 } 1632 }
1621 } 1633 }
1622 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
… …
1627/* 1639/*
1628 * Scrollbar window processing of button press 1640 * Scrollbar window processing of button press
1629 */ 1641 */
1630 if (isScrollbarWindow(ev->window)) 1642 if (isScrollbarWindow(ev->window))
1631 { 1643 {
1632 scrollbar_setIdle(); 1644 R->scrollBar.setIdle ();
1633 /* 1645 /*
1634 * Rxvt-style scrollbar: 1646 * Rxvt-style scrollbar:
1635 * move up if mouse is above slider 1647 * move up if mouse is above slider
1636 * move dn if mouse is below slider 1648 * move dn if mouse is below slider
1637 * 1649 *
… …
1690#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1702#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1691 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1703 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1692#endif 1704#endif
1693 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1705 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1694 if (upordown < 0) 1706 if (upordown < 0)
1695 scrollbar_setUp(); 1707 R->scrollBar.setUp ();
1696 else 1708 else
1697 scrollbar_setDn(); 1709 R->scrollBar.setDn ();
1698 } 1710 }
1699 } else 1711 } else
1700 switch (ev->button) { 1712 switch (ev->button) {
1701 case Button2: 1713 case Button2:
1702 switch (R->scrollbar_align) { 1714 switch (R->scrollbar_align) {
… …
1714 || scrollbar_above_slider(ev->y) 1726 || scrollbar_above_slider(ev->y)
1715 || scrollbar_below_slider(ev->y)) 1727 || scrollbar_below_slider(ev->y))
1716 rxvt_scr_move_to(aR_ 1728 rxvt_scr_move_to(aR_
1717 scrollbar_position(ev->y) - R->csrO, 1729 scrollbar_position(ev->y) - R->csrO,
1718 scrollbar_size()); 1730 scrollbar_size());
1719 scrollbar_setMotion(); 1731 R->scrollBar.setMotion ();
1720 break; 1732 break;
1721 1733
1722 case Button1: 1734 case Button1:
1723 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1735 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1724 R->csrO = ev->y - R->scrollBar.top; 1736 R->csrO = ev->y - R->scrollBar.top;
… …
1737 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1749 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1738# else 1750# else
1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1751 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1740# endif 1752# endif
1741 else 1753 else
1742 scrollbar_setMotion(); 1754 R->scrollBar.setMotion ();
1743 } else { 1755 } else {
1744 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1756 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1745 (R->TermWin.nrow 1757 (R->TermWin.nrow
1746 * scrollbar_position(ev->y) 1758 * scrollbar_position(ev->y)
1747 / scrollbar_size())); 1759 / scrollbar_size()));
… …
1769 R->csrO = 0; /* reset csr Offset */ 1781 R->csrO = 0; /* reset csr Offset */
1770 if (!R->bypass_keystate) 1782 if (!R->bypass_keystate)
1771 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1783 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1772 1784
1773 if (scrollbar_isUpDn()) { 1785 if (scrollbar_isUpDn()) {
1774 scrollbar_setIdle(); 1786 R->scrollBar.setIdle ();
1775 rxvt_scrollbar_show(aR_ 0); 1787 rxvt_scrollbar_show(aR_ 0);
1776#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1788#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1777 R->refresh_type &= ~SMOOTH_REFRESH; 1789 R->refresh_type &= ~SMOOTH_REFRESH;
1778#endif 1790#endif
1779 } 1791 }
… …
1816 * when overriding mouse reporting 1828 * when overriding mouse reporting
1817 */ 1829 */
1818 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1819 && R->bypass_keystate 1831 && R->bypass_keystate
1820 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1821 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1822 1834
1823 switch (ev->button) { 1835 switch (ev->button) {
1824 case Button1: 1836 case Button1:
1825 case Button3: 1837 case Button3:
1826 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
… …
1849 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1850 } 1862 }
1851# endif 1863# endif
1852# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1853 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1854 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1855 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1856# else 1868# else
1857 for (; i--;) 1869 while (i--)
1858 { 1870 {
1859 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1860 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1861 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1862 } 1874 }
1863# endif 1875# endif
1864 } 1876 }
1865 break; 1877 break;
… …
2219 break; 2231 break;
2220 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2221 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2222 break; 2234 break;
2223 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2224 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2225 break; 2237 break;
2226 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2227 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2228 break; 2240 break;
2229 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
… …
2564 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2565 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2566 break; 2578 break;
2567 2579
2568 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2569 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2570 break; 2582 break;
2571 2583
2572 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2573 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2574 break; 2586 break;
… …
2696 break; 2708 break;
2697#endif 2709#endif
2698 2710
2699 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2700 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2701 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2713 R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2702 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2703 2715
2704 default: 2716 default:
2705 break; 2717 break;
2706 } 2718 }
… …
2744 break; 2756 break;
2745 case 6: /* lower window */ 2757 case 6: /* lower window */
2746 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2747 break; 2759 break;
2748 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2749 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2750 break; 2762 break;
2751 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2752 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2753 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2754 break; 2766 break;
… …
2965 if (*str != ';') { 2977 if (*str != ';') {
2966#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
2967 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2968 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2969#endif 2981#endif
2970 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
2971 } 2983 }
2972 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
2973 str++; 2985 str++;
2974#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
2975 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
… …
2977 } 2989 }
2978 if (changed) { 2990 if (changed) {
2979#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
2980 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
2981#endif 2993#endif
2982 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
2983 } 2995 }
2984 break; 2996 break;
2985 2997
2986 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
2987 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
… …
3153 break; 3165 break;
3154#endif 3166#endif
3155#ifdef scrollBar_esc 3167#ifdef scrollBar_esc
3156 case scrollBar_esc: 3168 case scrollBar_esc:
3157 if (rxvt_scrollbar_mapping(aR_ state)) { 3169 if (rxvt_scrollbar_mapping(aR_ state)) {
3158 rxvt_resize_all_windows(aR_ 0, 0, 0); 3170 R->resize_all_windows (0, 0, 0);
3159 rxvt_scr_touch(aR_ True); 3171 R->scr_touch (true);
3160 } 3172 }
3161 break; 3173 break;
3162#endif 3174#endif
3163 case 25: /* visible/invisible cursor */ 3175 case 25: /* visible/invisible cursor */
3164 rxvt_scr_cursor_visible(aR_ state); 3176 rxvt_scr_cursor_visible(aR_ state);
… …
3190 else 3202 else
3191 R->Options &= ~Opt_scrollTtyKeypress; 3203 R->Options &= ~Opt_scrollTtyKeypress;
3192 break; 3204 break;
3193 case 1047: /* secondary screen w/ clearing */ 3205 case 1047: /* secondary screen w/ clearing */
3194 if (R->current_screen != PRIMARY) 3206 if (R->current_screen != PRIMARY)
3195 rxvt_scr_erase_screen(aR_ 2); 3207 R->scr_erase_screen (2);
3196 rxvt_scr_change_screen(aR_ state); 3208 rxvt_scr_change_screen(aR_ state);
3197 /* FALLTHROUGH */ 3209 /* FALLTHROUGH */
3198 default: 3210 default:
3199 break; 3211 break;
3200 } 3212 }

Diff Legend

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