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.24 by pcg, Fri Dec 19 06:17:03 2003 UTC vs.
Revision 1.27 by pcg, Tue Dec 30 01:35:58 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.24 2003/12/19 06:17:03 pcg Exp $ 4 * $Id: command.C,v 1.27 2003/12/30 01:35:58 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>
… …
64 KeySym keysym; 64 KeySym keysym;
65#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
67#endif 67#endif
68 int valid_keysym; 68 int valid_keysym;
69 unsigned char *kbuf = R->kbuf; 69 unsigned char kbuf[KBUFSZ];
70 70
71/* 71/*
72 * 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
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
… …
752 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
753 } 753 }
754 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
755} 755}
756 756
757#ifdef CURSOR_BLINK
757void 758void
758rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
759{ 760{
760 w.at += BLINK_INTERVAL; 761 w.at += BLINK_INTERVAL;
761 hidden_cursor = !hidden_cursor; 762 hidden_cursor = !hidden_cursor;
762 want_refresh = 1; 763 want_refresh = 1;
763} 764}
765#endif
764 766
765void 767void
766rxvt_term::x_cb (io_watcher &w, short revents) 768rxvt_term::x_cb (io_watcher &w, short revents)
767{ 769{
768 SET_R (this); 770 SET_R (this);
… …
1526 1528
1527/* INTPROTO */ 1529/* INTPROTO */
1528void 1530void
1529rxvt_button_press(pR_ XButtonEvent *ev) 1531rxvt_button_press(pR_ XButtonEvent *ev)
1530{ 1532{
1531 int reportmode = 0, clickintime; 1533 int reportmode = 0, clickintime;
1532 1534
1533 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1535 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1534 if (!R->bypass_keystate) 1536 if (!R->bypass_keystate)
1535 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1537 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1536/* 1538/*
… …
1584 R->MEvent.clicks = 0; 1586 R->MEvent.clicks = 0;
1585 switch (ev->button) 1587 switch (ev->button)
1586 { 1588 {
1587 case Button1: 1589 case Button1:
1588 /* allow shift+left click to extend selection */ 1590 /* allow shift+left click to extend selection */
1589 if (ev->state & ShiftMask) 1591 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1590 { 1592 {
1591 if (R->MEvent.button == Button1 && clickintime) 1593 if (R->MEvent.button == Button1 && clickintime)
1592 R->selection_rotate (ev->x, ev->y); 1594 R->selection_rotate (ev->x, ev->y);
1593 else 1595 else
1594 R->selection_extend (ev->x, ev->y, 1); 1596 R->selection_extend (ev->x, ev->y, 1);

Diff Legend

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