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.28 by pcg, Fri Jan 16 22:11:09 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.28 2004/01/16 22:11:09 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
… …
741 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
742 } 753 }
743 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
744} 755}
745 756
757#ifdef CURSOR_BLINK
746void 758void
747rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
748{ 760{
749 SET_R (this);
750
751 w.at += BLINK_INTERVAL;
752 hidden_cursor = !hidden_cursor; 761 hidden_cursor = !hidden_cursor;
753 want_refresh = 1; 762 want_refresh = 1;
763
764 w.start (w.at + BLINK_INTERVAL);
754} 765}
766#endif
755 767
756void 768void
757rxvt_term::x_cb (io_watcher &w, short revents) 769rxvt_term::x_cb (io_watcher &w, short revents)
758{ 770{
759 SET_R (this); 771 SET_R (this);
772 SET_LOCALE (locale);
760 773
761 process_x_events (); 774 process_x_events ();
762} 775}
763 776
764bool 777bool
… …
785 798
786void 799void
787rxvt_term::pty_cb (io_watcher &w, short revents) 800rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 801{
789 SET_R (this); 802 SET_R (this);
803 SET_LOCALE (locale);
790 804
791 if (revents & EVENT_WRITE) 805 if (revents & EVENT_WRITE)
792 tt_write (0, 0); 806 tt_write (0, 0);
793 else if (revents & EVENT_READ) 807 else if (revents & EVENT_READ)
794 { 808 {
… …
872 if (refreshnow) 886 if (refreshnow)
873 { 887 {
874 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
875 refresh_limit++; 889 refresh_limit++;
876 890
877 rxvt_scr_refresh (this, refresh_type); 891 scr_refresh (refresh_type);
878 } 892 }
879 893
880 } 894 }
881 else 895 else
882 { 896 {
… …
902// read the next character, currently handles UTF-8 916// read the next character, currently handles UTF-8
903// will probably handle all sorts of other stuff in the future 917// will probably handle all sorts of other stuff in the future
904uint32_t 918uint32_t
905rxvt_term::next_char () 919rxvt_term::next_char ()
906{ 920{
907 struct mbstate &s = mbstate;
908
909 while (cmdbuf_ptr < cmdbuf_endp) 921 while (cmdbuf_ptr < cmdbuf_endp)
910 { 922 {
911 uint8_t ch = *cmdbuf_ptr; 923 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++; 924 return *cmdbuf_ptr++;
937 925
938 /* first byte */ 926 wchar_t wc;
939 s.orig = ch; /* for broken encodings */ 927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
940 s.reg = ch; 928
941 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 929 if (len == (size_t)-2)
942 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 930 return NOCHAR;
943 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 931
944 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 932 if (len == (size_t)-1)
945 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
946 } 934
947 else 935 // assume wchar == unicode
948 { 936 cmdbuf_ptr += len;
949 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
950 return ch; 937 return wc;
951 }
952 } 938 }
953 939
954 return NOCHAR; 940 return NOCHAR;
955} 941}
956 942
… …
1008 if (R->pending_scroll_selection) { 994 if (R->pending_scroll_selection) {
1009 quick_timeout = 1; 995 quick_timeout = 1;
1010 if (!R->scroll_selection_delay-- 996 if (!R->scroll_selection_delay--
1011 && rxvt_scr_page(aR_ R->scroll_selection_dir, 997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1012 R->scroll_selection_lines)) { 998 R->scroll_selection_lines)) {
1013 rxvt_selection_extend(aR_ R->selection_save_x, 999 R->selection_extend (R->selection_save_x,
1014 R->selection_save_y, R->selection_save_state); 1000 R->selection_save_y, R->selection_save_state);
1015 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1016 R->refresh_type |= SMOOTH_REFRESH; 1002 R->refresh_type |= SMOOTH_REFRESH;
1017 R->want_refresh = 1; 1003 R->want_refresh = 1;
1018 } 1004 }
… …
1038 1024
1039void 1025void
1040rxvt_term::pointer_unblank () 1026rxvt_term::pointer_unblank ()
1041{ 1027{
1042 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1028 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1043 rxvt_recolour_cursor (this); 1029 recolour_cursor ();
1044 1030
1045#ifdef POINTER_BLANK 1031#ifdef POINTER_BLANK
1046 hidden_pointer = 0; 1032 hidden_pointer = 0;
1047 1033
1048 if (Options & Opt_pointerBlank) 1034 if (Options & Opt_pointerBlank)
… …
1052 1038
1053#ifdef POINTER_BLANK 1039#ifdef POINTER_BLANK
1054void 1040void
1055rxvt_term::pointer_blank () 1041rxvt_term::pointer_blank ()
1056{ 1042{
1057 pointer_ev.stop ();
1058
1059 if (!(Options & Opt_pointerBlank)) 1043 if (!(Options & Opt_pointerBlank))
1060 return; 1044 return;
1061 1045
1062 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1063 XFlush (Xdisplay); 1047 XFlush (Xdisplay);
… …
1067 1051
1068void 1052void
1069rxvt_term::pointer_cb (time_watcher &w) 1053rxvt_term::pointer_cb (time_watcher &w)
1070{ 1054{
1071 SET_R (this); 1055 SET_R (this);
1056 SET_LOCALE (locale);
1072 1057
1073 pointer_blank (); 1058 pointer_blank ();
1074} 1059}
1075#endif 1060#endif
1076 1061
… …
1081 int button_number, key_state = 0; 1066 int button_number, key_state = 0;
1082 int x, y; 1067 int x, y;
1083 1068
1084 x = ev->x; 1069 x = ev->x;
1085 y = ev->y; 1070 y = ev->y;
1086 rxvt_pixel_position(aR_ &x, &y); 1071 R->pixel_position (&x, &y);
1087 1072
1088 if (R->MEvent.button == AnyButton) { 1073 if (R->MEvent.button == AnyButton) {
1089 button_number = 3; 1074 button_number = 3;
1090 } else { 1075 } else {
1091 button_number = R->MEvent.button - Button1; 1076 button_number = R->MEvent.button - Button1;
… …
1342 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1343 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1344 ConfigureNotify, ev)); 1329 ConfigureNotify, ev));
1345 if (R->szHint.width != width || R->szHint.height != height) { 1330 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)); 1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1347 rxvt_resize_all_windows(aR_ (unsigned int)width, 1332 R->resize_all_windows (width, height, 1);
1348 (unsigned int)height, 1);
1349 } 1333 }
1350#ifdef DEBUG_SIZE 1334#ifdef DEBUG_SIZE
1351 else { 1335 else {
1352 D_SIZE((stderr, "Size: Not resizing")); 1336 D_SIZE((stderr, "Size: Not resizing"));
1353 } 1337 }
… …
1412 1396
1413 case GraphicsExpose: 1397 case GraphicsExpose:
1414 case Expose: 1398 case Expose:
1415 if (ev->xany.window == R->TermWin.vt) { 1399 if (ev->xany.window == R->TermWin.vt) {
1416#ifdef NO_SLOW_LINK_SUPPORT 1400#ifdef NO_SLOW_LINK_SUPPORT
1417 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1418 ev->xexpose.width, ev->xexpose.height, False); 1402 ev->xexpose.width, ev->xexpose.height, False);
1419#else 1403#else
1420 // don't understand this, so commented it out 1404 // don't understand this, so commented it out
1421 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1422 ev->xexpose.width, ev->xexpose.height, False); 1406 ev->xexpose.width, ev->xexpose.height, False);
1423 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1424 // ev->xexpose.width, R->TermWin.height, False); 1408 // ev->xexpose.width, R->TermWin.height, False);
1425#endif 1409#endif
1426 R->want_refresh = 1; 1410 R->want_refresh = 1;
1427 } else { 1411 } else {
… …
1432 &unused_xevent)) ; 1416 &unused_xevent)) ;
1433 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1434 GraphicsExpose, 1418 GraphicsExpose,
1435 &unused_xevent)) ; 1419 &unused_xevent)) ;
1436 if (isScrollbarWindow(ev->xany.window)) { 1420 if (isScrollbarWindow(ev->xany.window)) {
1437 scrollbar_setIdle(); 1421 R->scrollBar.setIdle();
1438 rxvt_scrollbar_show(aR_ 0); 1422 rxvt_scrollbar_show(aR_ 0);
1439 } 1423 }
1440#ifdef MENUBAR 1424#ifdef MENUBAR
1441 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1425 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1442 rxvt_menubar_expose(aR); 1426 rxvt_menubar_expose(aR);
… …
1472 &unused_mask); 1456 &unused_mask);
1473#ifdef MOUSE_THRESHOLD 1457#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1458 /* deal with a `jumpy' mouse */
1475 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1476#endif 1460#endif
1477 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1478 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1462 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1479#ifdef SELECTION_SCROLLING 1463#ifdef SELECTION_SCROLLING
1480 if (ev->xbutton.y<R->TermWin.int_bwidth || 1464 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1481 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1482 int dist; 1466 int dist;
… …
1531 &unused_root_x, &unused_root_y, 1515 &unused_root_x, &unused_root_y,
1532 &(ev->xbutton.x), &(ev->xbutton.y), 1516 &(ev->xbutton.x), &(ev->xbutton.y),
1533 &unused_mask); 1517 &unused_mask);
1534 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1535 scrollbar_size()); 1519 scrollbar_size());
1536 rxvt_scr_refresh(aR_ R->refresh_type); 1520 R->scr_refresh (R->refresh_type);
1537 R->refresh_limit = 0; 1521 R->refresh_limit = 0;
1538 rxvt_scrollbar_show(aR_ 1); 1522 rxvt_scrollbar_show(aR_ 1);
1539 } 1523 }
1540 break; 1524 break;
1541 } 1525 }
… …
1543 1527
1544/* INTPROTO */ 1528/* INTPROTO */
1545void 1529void
1546rxvt_button_press(pR_ XButtonEvent *ev) 1530rxvt_button_press(pR_ XButtonEvent *ev)
1547{ 1531{
1548 int reportmode = 0, clickintime; 1532 int reportmode = 0, clickintime;
1549 1533
1550 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1551 if (!R->bypass_keystate) 1535 if (!R->bypass_keystate)
1552 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1553/* 1537/*
… …
1600 if (ev->button != R->MEvent.button) 1584 if (ev->button != R->MEvent.button)
1601 R->MEvent.clicks = 0; 1585 R->MEvent.clicks = 0;
1602 switch (ev->button) 1586 switch (ev->button)
1603 { 1587 {
1604 case Button1: 1588 case Button1:
1589 /* allow shift+left click to extend selection */
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1591 {
1605 if (R->MEvent.button == Button1 && clickintime) 1592 if (R->MEvent.button == Button1 && clickintime)
1593 R->selection_rotate (ev->x, ev->y);
1606 R->MEvent.clicks++; 1594 else
1595 R->selection_extend (ev->x, ev->y, 1);
1596 }
1607 else 1597 else
1598 {
1599 if (R->MEvent.button == Button1 && clickintime)
1600 R->MEvent.clicks++;
1601 else
1608 R->MEvent.clicks = 1; 1602 R->MEvent.clicks = 1;
1603
1609 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1605 }
1606
1610 R->MEvent.button = Button1; 1607 R->MEvent.button = Button1;
1611 break; 1608 break;
1612 1609
1613 case Button3: 1610 case Button3:
1614 if (R->MEvent.button == Button3 && clickintime) 1611 if (R->MEvent.button == Button3 && clickintime)
1615 rxvt_selection_rotate(aR_ ev->x, ev->y); 1612 R->selection_rotate (ev->x, ev->y);
1616 else 1613 else
1617 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1614 R->selection_extend (ev->x, ev->y, 1);
1618 R->MEvent.button = Button3; 1615 R->MEvent.button = Button3;
1619 break; 1616 break;
1620 } 1617 }
1621 } 1618 }
1622 R->MEvent.time = ev->time; 1619 R->MEvent.time = ev->time;
… …
1627/* 1624/*
1628 * Scrollbar window processing of button press 1625 * Scrollbar window processing of button press
1629 */ 1626 */
1630 if (isScrollbarWindow(ev->window)) 1627 if (isScrollbarWindow(ev->window))
1631 { 1628 {
1632 scrollbar_setIdle(); 1629 R->scrollBar.setIdle ();
1633 /* 1630 /*
1634 * Rxvt-style scrollbar: 1631 * Rxvt-style scrollbar:
1635 * move up if mouse is above slider 1632 * move up if mouse is above slider
1636 * move dn if mouse is below slider 1633 * move dn if mouse is below slider
1637 * 1634 *
… …
1690#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1691 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1688 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1692#endif 1689#endif
1693 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1690 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1694 if (upordown < 0) 1691 if (upordown < 0)
1695 scrollbar_setUp(); 1692 R->scrollBar.setUp ();
1696 else 1693 else
1697 scrollbar_setDn(); 1694 R->scrollBar.setDn ();
1698 } 1695 }
1699 } else 1696 } else
1700 switch (ev->button) { 1697 switch (ev->button) {
1701 case Button2: 1698 case Button2:
1702 switch (R->scrollbar_align) { 1699 switch (R->scrollbar_align) {
… …
1714 || scrollbar_above_slider(ev->y) 1711 || scrollbar_above_slider(ev->y)
1715 || scrollbar_below_slider(ev->y)) 1712 || scrollbar_below_slider(ev->y))
1716 rxvt_scr_move_to(aR_ 1713 rxvt_scr_move_to(aR_
1717 scrollbar_position(ev->y) - R->csrO, 1714 scrollbar_position(ev->y) - R->csrO,
1718 scrollbar_size()); 1715 scrollbar_size());
1719 scrollbar_setMotion(); 1716 R->scrollBar.setMotion ();
1720 break; 1717 break;
1721 1718
1722 case Button1: 1719 case Button1:
1723 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1720 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1724 R->csrO = ev->y - R->scrollBar.top; 1721 R->csrO = ev->y - R->scrollBar.top;
… …
1737 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1738# else 1735# else
1739 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1736 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1740# endif 1737# endif
1741 else 1738 else
1742 scrollbar_setMotion(); 1739 R->scrollBar.setMotion ();
1743 } else { 1740 } else {
1744 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1741 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1745 (R->TermWin.nrow 1742 (R->TermWin.nrow
1746 * scrollbar_position(ev->y) 1743 * scrollbar_position(ev->y)
1747 / scrollbar_size())); 1744 / scrollbar_size()));
… …
1769 R->csrO = 0; /* reset csr Offset */ 1766 R->csrO = 0; /* reset csr Offset */
1770 if (!R->bypass_keystate) 1767 if (!R->bypass_keystate)
1771 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1768 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1772 1769
1773 if (scrollbar_isUpDn()) { 1770 if (scrollbar_isUpDn()) {
1774 scrollbar_setIdle(); 1771 R->scrollBar.setIdle ();
1775 rxvt_scrollbar_show(aR_ 0); 1772 rxvt_scrollbar_show(aR_ 0);
1776#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1777 R->refresh_type &= ~SMOOTH_REFRESH; 1774 R->refresh_type &= ~SMOOTH_REFRESH;
1778#endif 1775#endif
1779 } 1776 }
… …
1816 * when overriding mouse reporting 1813 * when overriding mouse reporting
1817 */ 1814 */
1818 if (R->PrivateModes & PrivMode_mouse_report 1815 if (R->PrivateModes & PrivMode_mouse_report
1819 && R->bypass_keystate 1816 && R->bypass_keystate
1820 && ev->button == Button1 && R->MEvent.clicks <= 1) 1817 && ev->button == Button1 && R->MEvent.clicks <= 1)
1821 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1818 R->selection_extend (ev->x, ev->y, 0);
1822 1819
1823 switch (ev->button) { 1820 switch (ev->button) {
1824 case Button1: 1821 case Button1:
1825 case Button3: 1822 case Button3:
1826 rxvt_selection_make(aR_ ev->time); 1823 rxvt_selection_make(aR_ ev->time);
… …
1849 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1850 } 1847 }
1851# endif 1848# endif
1852# ifdef JUMP_MOUSE_WHEEL 1849# ifdef JUMP_MOUSE_WHEEL
1853 rxvt_scr_page(aR_ v, i); 1850 rxvt_scr_page(aR_ v, i);
1854 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1851 R->scr_refresh (SMOOTH_REFRESH);
1855 rxvt_scrollbar_show(aR_ 1); 1852 rxvt_scrollbar_show(aR_ 1);
1856# else 1853# else
1857 for (; i--;) 1854 while (i--)
1858 { 1855 {
1859 rxvt_scr_page(aR_ v, 1); 1856 rxvt_scr_page(aR_ v, 1);
1860 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1857 R->scr_refresh (SMOOTH_REFRESH);
1861 rxvt_scrollbar_show(aR_ 1); 1858 rxvt_scrollbar_show(aR_ 1);
1862 } 1859 }
1863# endif 1860# endif
1864 } 1861 }
1865 break; 1862 break;
… …
2219 break; 2216 break;
2220 case 'I': /* cursor up and scroll down if needed */ 2217 case 'I': /* cursor up and scroll down if needed */
2221 rxvt_scr_index(aR_ DN); 2218 rxvt_scr_index(aR_ DN);
2222 break; 2219 break;
2223 case 'J': /* erase to end of screen */ 2220 case 'J': /* erase to end of screen */
2224 rxvt_scr_erase_screen(aR_ 0); 2221 R->scr_erase_screen (0);
2225 break; 2222 break;
2226 case 'K': /* erase to end of line */ 2223 case 'K': /* erase to end of line */
2227 rxvt_scr_erase_line(aR_ 0); 2224 rxvt_scr_erase_line(aR_ 0);
2228 break; 2225 break;
2229 case 'Y': /* move to specified row and col */ 2226 case 'Y': /* move to specified row and col */
… …
2564 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2565 rxvt_scr_tab(aR_ arg[0]); 2562 rxvt_scr_tab(aR_ arg[0]);
2566 break; 2563 break;
2567 2564
2568 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2569 rxvt_scr_erase_screen(aR_ arg[0]); 2566 R->scr_erase_screen (arg[0]);
2570 break; 2567 break;
2571 2568
2572 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2573 rxvt_scr_erase_line(aR_ arg[0]); 2570 rxvt_scr_erase_line(aR_ arg[0]);
2574 break; 2571 break;
… …
2744 break; 2741 break;
2745 case 6: /* lower window */ 2742 case 6: /* lower window */
2746 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2747 break; 2744 break;
2748 case 7: /* refresh window */ 2745 case 7: /* refresh window */
2749 rxvt_scr_touch(aR_ True); 2746 R->scr_touch (true);
2750 break; 2747 break;
2751 case 8: /* set size (chars) */ 2748 case 8: /* set size (chars) */
2752 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2753 (unsigned int)(args[1] * R->TermWin.fheight)); 2750 (unsigned int)(args[1] * R->TermWin.fheight));
2754 break; 2751 break;
… …
2965 if (*str != ';') { 2962 if (*str != ';') {
2966#if XPM_BACKGROUND 2963#if XPM_BACKGROUND
2967 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2968 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2969#endif 2966#endif
2970 rxvt_scr_touch(aR_ True); 2967 R->scr_touch (true);
2971 } 2968 }
2972 while ((str = STRCHR(str, ';')) != NULL) { 2969 while ((str = STRCHR(str, ';')) != NULL) {
2973 str++; 2970 str++;
2974#if XPM_BACKGROUND 2971#if XPM_BACKGROUND
2975 changed += rxvt_scale_pixmap(aR_ str); 2972 changed += rxvt_scale_pixmap(aR_ str);
… …
2977 } 2974 }
2978 if (changed) { 2975 if (changed) {
2979#ifdef XPM_BACKGROUND 2976#ifdef XPM_BACKGROUND
2980 rxvt_resize_pixmap(aR); 2977 rxvt_resize_pixmap(aR);
2981#endif 2978#endif
2982 rxvt_scr_touch(aR_ True); 2979 R->scr_touch (true);
2983 } 2980 }
2984 break; 2981 break;
2985 2982
2986 case XTerm_restoreFG: 2983 case XTerm_restoreFG:
2987 rxvt_set_window_color(aR_ Color_fg, str); 2984 rxvt_set_window_color(aR_ Color_fg, str);
… …
3153 break; 3150 break;
3154#endif 3151#endif
3155#ifdef scrollBar_esc 3152#ifdef scrollBar_esc
3156 case scrollBar_esc: 3153 case scrollBar_esc:
3157 if (rxvt_scrollbar_mapping(aR_ state)) { 3154 if (rxvt_scrollbar_mapping(aR_ state)) {
3158 rxvt_resize_all_windows(aR_ 0, 0, 0); 3155 R->resize_all_windows (0, 0, 0);
3159 rxvt_scr_touch(aR_ True); 3156 R->scr_touch (true);
3160 } 3157 }
3161 break; 3158 break;
3162#endif 3159#endif
3163 case 25: /* visible/invisible cursor */ 3160 case 25: /* visible/invisible cursor */
3164 rxvt_scr_cursor_visible(aR_ state); 3161 rxvt_scr_cursor_visible(aR_ state);
… …
3190 else 3187 else
3191 R->Options &= ~Opt_scrollTtyKeypress; 3188 R->Options &= ~Opt_scrollTtyKeypress;
3192 break; 3189 break;
3193 case 1047: /* secondary screen w/ clearing */ 3190 case 1047: /* secondary screen w/ clearing */
3194 if (R->current_screen != PRIMARY) 3191 if (R->current_screen != PRIMARY)
3195 rxvt_scr_erase_screen(aR_ 2); 3192 R->scr_erase_screen (2);
3196 rxvt_scr_change_screen(aR_ state); 3193 rxvt_scr_change_screen(aR_ state);
3197 /* FALLTHROUGH */ 3194 /* FALLTHROUGH */
3198 default: 3195 default:
3199 break; 3196 break;
3200 } 3197 }

Diff Legend

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