[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.18 by pcg, Thu Dec 18 02:07:12 2003 UTC vs. Revision 1.27 by pcg, Tue Dec 30 01:35:58 2003 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.18 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.27 by pcg, Tue Dec 30 01:35:58 2003 UTC