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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.15 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.32 by pcg, Thu Jan 29 23:31:45 2004 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: command.c	2	* File: command.c
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: command.C,v 1.15 2003/12/16 23:04:13 pcg Exp $	4	* $Id: command.C,v 1.32 2004/01/29 23:31:45 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
		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
680	void	702	void
681	rxvt_term::check_cb (check_watcher &w)	703	rxvt_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
688	void	711	void
…		…
693	XEvent xev;	716	XEvent xev;
694		717
695	XNextEvent (Xdisplay, &xev);	718	XNextEvent (Xdisplay, &xev);
696		719
697	#if defined(CURSOR_BLINK)	720	#if defined(CURSOR_BLINK)
698	if ((Options & Opt_cursorBlink)	721	if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
699	&& xev.type == KeyPress)
700	{	722	{
701	if (hidden_cursor)	723	if (hidden_cursor)
702	{	724	{
703	hidden_cursor = 0;	725	hidden_cursor = 0;
704	want_refresh = 1;	726	want_refresh = 1;
705	}	727	}
706		728
707	blink_ev.start (NOW + BLINK_INTERVAL);	729	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
708	}	730	}
709	#endif	731	#endif
710		732
711	#if defined(POINTER_BLANK)	733	#if defined(POINTER_BLANK)
712	if ((Options & Opt_pointerBlank)	734	if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
713	&& (pointerBlankDelay > 0))
714	{	735	{
715	if (xev.type == MotionNotify	736	if (xev.type == MotionNotify
716	\|\| xev.type == ButtonPress	737	\|\| xev.type == ButtonPress
717	\|\| xev.type == ButtonRelease)	738	\|\| xev.type == ButtonRelease)
718	if (hidden_pointer)	739	if (hidden_pointer)
…		…
729	rxvt_process_x_event (this, &xev);	750	rxvt_process_x_event (this, &xev);
730	}	751	}
731	while (XPending (Xdisplay));	752	while (XPending (Xdisplay));
732	}	753	}
733		754
		755	#ifdef CURSOR_BLINK
734	void	756	void
735	rxvt_term::blink_cb (time_watcher &w)	757	rxvt_term::cursor_blink_cb (time_watcher &w)
736	{	758	{
737	SET_R (this);
738
739	w.at += BLINK_INTERVAL;
740	hidden_cursor = !hidden_cursor;	759	hidden_cursor = !hidden_cursor;
741	want_refresh = 1;	760	want_refresh = 1;
		761
		762	w.start (w.at + BLINK_INTERVAL);
742	}	763	}
		764	#endif
		765
		766	#ifdef TEXT_BLINK
		767	void
		768	rxvt_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
743		778
744	void	779	void
745	rxvt_term::x_cb (io_watcher &w, short revents)	780	rxvt_term::x_cb (io_watcher &w, short revents)
746	{	781	{
747	SET_R (this);	782	SET_R (this);
		783	SET_LOCALE (locale);
748		784
749	process_x_events ();	785	process_x_events ();
750	}	786	}
751		787
752	bool	788	bool
…		…
773		809
774	void	810	void
775	rxvt_term::pty_cb (io_watcher &w, short revents)	811	rxvt_term::pty_cb (io_watcher &w, short revents)
776	{	812	{
777	SET_R (this);	813	SET_R (this);
		814	SET_LOCALE (locale);
778		815
779	if (revents & EVENT_WRITE)	816	if (revents & EVENT_WRITE)
780	tt_write (0, 0);	817	tt_write (0, 0);
781	else if (revents & EVENT_READ)	818	else if (revents & EVENT_READ)
782	{	819	{
…		…
860	if (refreshnow)	897	if (refreshnow)
861	{	898	{
862	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	899	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863	refresh_limit++;	900	refresh_limit++;
864		901
865	rxvt_scr_refresh (this, refresh_type);	902	scr_refresh (refresh_type);
866	}	903	}
867		904
868	}	905	}
869	else	906	else
870	{	907	{
…		…
890	// read the next character, currently handles UTF-8	927	// read the next character, currently handles UTF-8
891	// will probably handle all sorts of other stuff in the future	928	// will probably handle all sorts of other stuff in the future
892	uint32_t	929	uint32_t
893	rxvt_term::next_char ()	930	rxvt_term::next_char ()
894	{	931	{
895	struct mbstate &s = mbstate;
896
897	while (cmdbuf_ptr < cmdbuf_endp)	932	while (cmdbuf_ptr < cmdbuf_endp)
898	{	933	{
899	uint8_t ch = *cmdbuf_ptr;	934	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++;	935	return *cmdbuf_ptr++;
925		936
926	/* first byte */	937	wchar_t wc;
927	s.orig = ch; /* for broken encodings */	938	int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928	s.reg = ch;	939
929	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }	940	if (len == (size_t)-2)
930	if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }	941	return NOCHAR;
931	if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }	942
932	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }	943	if (len == (size_t)-1)
933	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }	944	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
934	}	945
935	else	946	// assume wchar == unicode
936	{	947	cmdbuf_ptr += len;
937	cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
938	return ch;	948	return wc;
939	}
940	}	949	}
941		950
942	return NOCHAR;	951	return NOCHAR;
943	}	952	}
944		953
…		…
996	if (R->pending_scroll_selection) {	1005	if (R->pending_scroll_selection) {
997	quick_timeout = 1;	1006	quick_timeout = 1;
998	if (!R->scroll_selection_delay--	1007	if (!R->scroll_selection_delay--
999	&& rxvt_scr_page(aR_ R->scroll_selection_dir,	1008	&& rxvt_scr_page(aR_ R->scroll_selection_dir,
1000	R->scroll_selection_lines)) {	1009	R->scroll_selection_lines)) {
1001	rxvt_selection_extend(aR_ R->selection_save_x,	1010	R->selection_extend (R->selection_save_x,
1002	R->selection_save_y, R->selection_save_state);	1011	R->selection_save_y, R->selection_save_state);
1003	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;	1012	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004	R->refresh_type \|= SMOOTH_REFRESH;	1013	R->refresh_type \|= SMOOTH_REFRESH;
1005	R->want_refresh = 1;	1014	R->want_refresh = 1;
1006	}	1015	}
…		…
1022	quick_timeout \|= R->want_full_refresh;	1031	quick_timeout \|= R->want_full_refresh;
1023	#endif	1032	#endif
1024	#endif	1033	#endif
1025	}	1034	}
1026		1035
		1036	#ifdef POINTER_BLANK
1027	void	1037	void
1028	rxvt_term::pointer_unblank ()	1038	rxvt_term::pointer_unblank ()
1029	{	1039	{
1030	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);	1040	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1031	rxvt_recolour_cursor (this);	1041	recolour_cursor ();
1032		1042
1033	#ifdef POINTER_BLANK
1034	hidden_pointer = 0;	1043	hidden_pointer = 0;
1035		1044
1036	if (Options & Opt_pointerBlank)	1045	if (Options & Opt_pointerBlank)
1037	pointer_ev.start (NOW + pointerBlankDelay);	1046	pointer_ev.start (NOW + pointerBlankDelay);
1038	#endif
1039	}	1047	}
1040		1048
1041	#ifdef POINTER_BLANK
1042	void	1049	void
1043	rxvt_term::pointer_blank ()	1050	rxvt_term::pointer_blank ()
1044	{	1051	{
1045	pointer_ev.stop ();
1046
1047	if (!(Options & Opt_pointerBlank))	1052	if (!(Options & Opt_pointerBlank))
1048	return;	1053	return;
1049		1054
1050	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);	1055	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1051	XFlush (Xdisplay);	1056	XFlush (Xdisplay);
…		…
1055		1060
1056	void	1061	void
1057	rxvt_term::pointer_cb (time_watcher &w)	1062	rxvt_term::pointer_cb (time_watcher &w)
1058	{	1063	{
1059	SET_R (this);	1064	SET_R (this);
		1065	SET_LOCALE (locale);
1060		1066
1061	pointer_blank ();	1067	pointer_blank ();
1062	}	1068	}
1063	#endif	1069	#endif
1064		1070
…		…
1069	int button_number, key_state = 0;	1075	int button_number, key_state = 0;
1070	int x, y;	1076	int x, y;
1071		1077
1072	x = ev->x;	1078	x = ev->x;
1073	y = ev->y;	1079	y = ev->y;
1074	rxvt_pixel_position(aR_ &x, &y);	1080	R->pixel_position (&x, &y);
1075		1081
1076	if (R->MEvent.button == AnyButton) {	1082	if (R->MEvent.button == AnyButton) {
1077	button_number = 3;	1083	button_number = 3;
1078	} else {	1084	} else {
1079	button_number = R->MEvent.button - Button1;	1085	button_number = R->MEvent.button - Button1;
…		…
1297	if (R->Input_Context != NULL)	1303	if (R->Input_Context != NULL)
1298	XSetICFocus(R->Input_Context);	1304	XSetICFocus(R->Input_Context);
1299	#endif	1305	#endif
1300	#ifdef CURSOR_BLINK	1306	#ifdef CURSOR_BLINK
1301	if (R->Options & Opt_cursorBlink)	1307	if (R->Options & Opt_cursorBlink)
1302	R->blink_ev.start (NOW + BLINK_INTERVAL);	1308	R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1303	#endif	1309	#endif
1304	}	1310	}
1305	break;	1311	break;
1306		1312
1307	case FocusOut:	1313	case FocusOut:
…		…
1312	if (R->Input_Context != NULL)	1318	if (R->Input_Context != NULL)
1313	XUnsetICFocus(R->Input_Context);	1319	XUnsetICFocus(R->Input_Context);
1314	#endif	1320	#endif
1315	#ifdef CURSOR_BLINK	1321	#ifdef CURSOR_BLINK
1316	if (R->Options & Opt_cursorBlink)	1322	if (R->Options & Opt_cursorBlink)
1317	R->blink_ev.stop ();	1323	R->cursor_blink_ev.stop ();
1318	R->hidden_cursor = 0;	1324	R->hidden_cursor = 0;
1319	#endif	1325	#endif
1320	}	1326	}
1321	break;	1327	break;
1322		1328
…		…
1330	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1336	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1331	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,	1337	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1332	ConfigureNotify, ev));	1338	ConfigureNotify, ev));
1333	if (R->szHint.width != width \|\| R->szHint.height != height) {	1339	if (R->szHint.width != width \|\| R->szHint.height != height) {
1334	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));
1335	rxvt_resize_all_windows(aR_ (unsigned int)width,	1341	R->resize_all_windows (width, height, 1);
1336	(unsigned int)height, 1);
1337	}	1342	}
1338	#ifdef DEBUG_SIZE	1343	#ifdef DEBUG_SIZE
1339	else {	1344	else {
1340	D_SIZE((stderr, "Size: Not resizing"));	1345	D_SIZE((stderr, "Size: Not resizing"));
1341	}	1346	}
…		…
1364	rxvt_selection_send(aR_ &(ev->xselectionrequest));	1369	rxvt_selection_send(aR_ &(ev->xselectionrequest));
1365	break;	1370	break;
1366		1371
1367	case UnmapNotify:	1372	case UnmapNotify:
1368	R->TermWin.mapped = 0;	1373	R->TermWin.mapped = 0;
		1374	#ifdef TEXT_BLINK
		1375	R->text_blink_ev.stop ();
		1376	#endif
1369	break;	1377	break;
1370		1378
1371	case MapNotify:	1379	case MapNotify:
1372	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
1373	break;	1384	break;
1374		1385
1375	case PropertyNotify:	1386	case PropertyNotify:
1376	if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {	1387	if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1377	if (ev->xproperty.state == PropertyNewValue)	1388	if (ev->xproperty.state == PropertyNewValue)
…		…
1400		1411
1401	case GraphicsExpose:	1412	case GraphicsExpose:
1402	case Expose:	1413	case Expose:
1403	if (ev->xany.window == R->TermWin.vt) {	1414	if (ev->xany.window == R->TermWin.vt) {
1404	#ifdef NO_SLOW_LINK_SUPPORT	1415	#ifdef NO_SLOW_LINK_SUPPORT
1405	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1416	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1406	ev->xexpose.width, ev->xexpose.height, False);	1417	ev->xexpose.width, ev->xexpose.height, False);
1407	#else	1418	#else
1408	// don't understand this, so commented it out	1419	// don't understand this, so commented it out
1409	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1420	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1410	ev->xexpose.width, ev->xexpose.height, False);	1421	ev->xexpose.width, ev->xexpose.height, False);
1411	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,	1422	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1412	// ev->xexpose.width, R->TermWin.height, False);	1423	// ev->xexpose.width, R->TermWin.height, False);
1413	#endif	1424	#endif
1414	R->want_refresh = 1;	1425	R->want_refresh = 1;
1415	} else {	1426	} else {
…		…
1420	&unused_xevent)) ;	1431	&unused_xevent)) ;
1421	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,	1432	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1422	GraphicsExpose,	1433	GraphicsExpose,
1423	&unused_xevent)) ;	1434	&unused_xevent)) ;
1424	if (isScrollbarWindow(ev->xany.window)) {	1435	if (isScrollbarWindow(ev->xany.window)) {
1425	scrollbar_setIdle();	1436	R->scrollBar.setIdle();
1426	rxvt_scrollbar_show(aR_ 0);	1437	rxvt_scrollbar_show(aR_ 0);
1427	}	1438	}
1428	#ifdef MENUBAR	1439	#ifdef MENUBAR
1429	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))	1440	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1430	rxvt_menubar_expose(aR);	1441	rxvt_menubar_expose(aR);
…		…
1460	&unused_mask);	1471	&unused_mask);
1461	#ifdef MOUSE_THRESHOLD	1472	#ifdef MOUSE_THRESHOLD
1462	/* deal with a `jumpy' mouse */	1473	/* deal with a `jumpy' mouse */
1463	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {	1474	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1464	#endif	1475	#endif
1465	rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),	1476	R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1466	(ev->xbutton.state & Button3Mask) ? 2 : 0);	1477	(ev->xbutton.state & Button3Mask) ? 2 : 0);
1467	#ifdef SELECTION_SCROLLING	1478	#ifdef SELECTION_SCROLLING
1468	if (ev->xbutton.y<R->TermWin.int_bwidth \|\|	1479	if (ev->xbutton.y<R->TermWin.int_bwidth \|\|
1469	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {	1480	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1470	int dist;	1481	int dist;
…		…
1519	&unused_root_x, &unused_root_y,	1530	&unused_root_x, &unused_root_y,
1520	&(ev->xbutton.x), &(ev->xbutton.y),	1531	&(ev->xbutton.x), &(ev->xbutton.y),
1521	&unused_mask);	1532	&unused_mask);
1522	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,
1523	scrollbar_size());	1534	scrollbar_size());
1524	rxvt_scr_refresh(aR_ R->refresh_type);	1535	R->scr_refresh (R->refresh_type);
1525	R->refresh_limit = 0;	1536	R->refresh_limit = 0;
1526	rxvt_scrollbar_show(aR_ 1);	1537	rxvt_scrollbar_show(aR_ 1);
1527	}	1538	}
1528	break;	1539	break;
1529	}	1540	}
…		…
1531		1542
1532	/* INTPROTO */	1543	/* INTPROTO */
1533	void	1544	void
1534	rxvt_button_press(pR_ XButtonEvent *ev)	1545	rxvt_button_press(pR_ XButtonEvent *ev)
1535	{	1546	{
1536	int reportmode = 0, clickintime;	1547	int reportmode = 0, clickintime;
1537		1548
1538	R->bypass_keystate = ev->state & (R->ModMetaMask \| ShiftMask);	1549	R->bypass_keystate = ev->state & (R->ModMetaMask \| ShiftMask);
1539	if (!R->bypass_keystate)	1550	if (!R->bypass_keystate)
1540	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1551	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1541	/*	1552	/*
…		…
1543	*/	1554	*/
1544	if (ev->window == R->TermWin.vt)	1555	if (ev->window == R->TermWin.vt)
1545	{	1556	{
1546	#if RXVT_GRAPHICS	1557	#if RXVT_GRAPHICS
1547	if (ev->subwindow != None)	1558	if (ev->subwindow != None)
1548	rxvt_Gr_ButtonPress(ev->x, ev->y);	1559	rxvt_Gr_ButtonPress (ev->x, ev->y);
1549	else	1560	else
1550	#endif	1561	#endif
1551	{	1562	{
1552	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;	1563	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1553	if (reportmode)	1564	if (reportmode)
…		…
1588	if (ev->button != R->MEvent.button)	1599	if (ev->button != R->MEvent.button)
1589	R->MEvent.clicks = 0;	1600	R->MEvent.clicks = 0;
1590	switch (ev->button)	1601	switch (ev->button)
1591	{	1602	{
1592	case Button1:	1603	case Button1:
		1604	/* allow shift+left click to extend selection */
		1605	if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
		1606	{
1593	if (R->MEvent.button == Button1 && clickintime)	1607	if (R->MEvent.button == Button1 && clickintime)
		1608	R->selection_rotate (ev->x, ev->y);
1594	R->MEvent.clicks++;	1609	else
		1610	R->selection_extend (ev->x, ev->y, 1);
		1611	}
1595	else	1612	else
		1613	{
		1614	if (R->MEvent.button == Button1 && clickintime)
		1615	R->MEvent.clicks++;
		1616	else
1596	R->MEvent.clicks = 1;	1617	R->MEvent.clicks = 1;
		1618
1597	rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);	1619	R->selection_click (R->MEvent.clicks, ev->x, ev->y);
		1620	}
		1621
1598	R->MEvent.button = Button1;	1622	R->MEvent.button = Button1;
1599	break;	1623	break;
1600		1624
1601	case Button3:	1625	case Button3:
1602	if (R->MEvent.button == Button3 && clickintime)	1626	if (R->MEvent.button == Button3 && clickintime)
1603	rxvt_selection_rotate(aR_ ev->x, ev->y);	1627	R->selection_rotate (ev->x, ev->y);
1604	else	1628	else
1605	rxvt_selection_extend(aR_ ev->x, ev->y, 1);	1629	R->selection_extend (ev->x, ev->y, 1);
1606	R->MEvent.button = Button3;	1630	R->MEvent.button = Button3;
1607	break;	1631	break;
1608	}	1632	}
1609	}	1633	}
1610	R->MEvent.time = ev->time;	1634	R->MEvent.time = ev->time;
…		…
1615	/*	1639	/*
1616	* Scrollbar window processing of button press	1640	* Scrollbar window processing of button press
1617	*/	1641	*/
1618	if (isScrollbarWindow(ev->window))	1642	if (isScrollbarWindow(ev->window))
1619	{	1643	{
1620	scrollbar_setIdle();	1644	R->scrollBar.setIdle ();
1621	/*	1645	/*
1622	* Rxvt-style scrollbar:	1646	* Rxvt-style scrollbar:
1623	* move up if mouse is above slider	1647	* move up if mouse is above slider
1624	* move dn if mouse is below slider	1648	* move dn if mouse is below slider
1625	*	1649	*
…		…
1678	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1702	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1679	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1703	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1680	#endif	1704	#endif
1681	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {	1705	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1682	if (upordown < 0)	1706	if (upordown < 0)
1683	scrollbar_setUp();	1707	R->scrollBar.setUp ();
1684	else	1708	else
1685	scrollbar_setDn();	1709	R->scrollBar.setDn ();
1686	}	1710	}
1687	} else	1711	} else
1688	switch (ev->button) {	1712	switch (ev->button) {
1689	case Button2:	1713	case Button2:
1690	switch (R->scrollbar_align) {	1714	switch (R->scrollbar_align) {
…		…
1702	\|\| scrollbar_above_slider(ev->y)	1726	\|\| scrollbar_above_slider(ev->y)
1703	\|\| scrollbar_below_slider(ev->y))	1727	\|\| scrollbar_below_slider(ev->y))
1704	rxvt_scr_move_to(aR_	1728	rxvt_scr_move_to(aR_
1705	scrollbar_position(ev->y) - R->csrO,	1729	scrollbar_position(ev->y) - R->csrO,
1706	scrollbar_size());	1730	scrollbar_size());
1707	scrollbar_setMotion();	1731	R->scrollBar.setMotion ();
1708	break;	1732	break;
1709		1733
1710	case Button1:	1734	case Button1:
1711	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)	1735	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1712	R->csrO = ev->y - R->scrollBar.top;	1736	R->csrO = ev->y - R->scrollBar.top;
…		…
1725	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);	1749	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1726	# else	1750	# else
1727	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);	1751	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1728	# endif	1752	# endif
1729	else	1753	else
1730	scrollbar_setMotion();	1754	R->scrollBar.setMotion ();
1731	} else {	1755	} else {
1732	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),	1756	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1733	(R->TermWin.nrow	1757	(R->TermWin.nrow
1734	* scrollbar_position(ev->y)	1758	* scrollbar_position(ev->y)
1735	/ scrollbar_size()));	1759	/ scrollbar_size()));
…		…
1757	R->csrO = 0; /* reset csr Offset */	1781	R->csrO = 0; /* reset csr Offset */
1758	if (!R->bypass_keystate)	1782	if (!R->bypass_keystate)
1759	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1783	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1760		1784
1761	if (scrollbar_isUpDn()) {	1785	if (scrollbar_isUpDn()) {
1762	scrollbar_setIdle();	1786	R->scrollBar.setIdle ();
1763	rxvt_scrollbar_show(aR_ 0);	1787	rxvt_scrollbar_show(aR_ 0);
1764	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1788	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765	R->refresh_type &= ~SMOOTH_REFRESH;	1789	R->refresh_type &= ~SMOOTH_REFRESH;
1766	#endif	1790	#endif
1767	}	1791	}
…		…
1804	* when overriding mouse reporting	1828	* when overriding mouse reporting
1805	*/	1829	*/
1806	if (R->PrivateModes & PrivMode_mouse_report	1830	if (R->PrivateModes & PrivMode_mouse_report
1807	&& R->bypass_keystate	1831	&& R->bypass_keystate
1808	&& ev->button == Button1 && R->MEvent.clicks <= 1)	1832	&& ev->button == Button1 && R->MEvent.clicks <= 1)
1809	rxvt_selection_extend(aR_ ev->x, ev->y, 0);	1833	R->selection_extend (ev->x, ev->y, 0);
1810		1834
1811	switch (ev->button) {	1835	switch (ev->button) {
1812	case Button1:	1836	case Button1:
1813	case Button3:	1837	case Button3:
1814	rxvt_selection_make(aR_ ev->time);	1838	rxvt_selection_make(aR_ ev->time);
…		…
1818	break;	1842	break;
1819	#ifdef MOUSE_WHEEL	1843	#ifdef MOUSE_WHEEL
1820	case Button4:	1844	case Button4:
1821	case Button5:	1845	case Button5:
1822	{	1846	{
1823	int i, v;	1847	int i;
		1848	page_dirn v;
1824		1849
1825	v = (ev->button == Button4) ? UP : DN;	1850	v = (ev->button == Button4) ? UP : DN;
1826	if (ev->state & ShiftMask)	1851	if (ev->state & ShiftMask)
1827	i = 1;	1852	i = 1;
1828	else if ((R->Options & Opt_mouseWheelScrollPage))	1853	else if ((R->Options & Opt_mouseWheelScrollPage))
…		…
1836	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;	1861	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1837	}	1862	}
1838	# endif	1863	# endif
1839	# ifdef JUMP_MOUSE_WHEEL	1864	# ifdef JUMP_MOUSE_WHEEL
1840	rxvt_scr_page(aR_ v, i);	1865	rxvt_scr_page(aR_ v, i);
1841	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1866	R->scr_refresh (SMOOTH_REFRESH);
1842	rxvt_scrollbar_show(aR_ 1);	1867	rxvt_scrollbar_show(aR_ 1);
1843	# else	1868	# else
1844	for (; i--;)	1869	while (i--)
1845	{	1870	{
1846	rxvt_scr_page(aR_ v, 1);	1871	rxvt_scr_page(aR_ v, 1);
1847	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1872	R->scr_refresh (SMOOTH_REFRESH);
1848	rxvt_scrollbar_show(aR_ 1);	1873	rxvt_scrollbar_show(aR_ 1);
1849	}	1874	}
1850	# endif	1875	# endif
1851	}	1876	}
1852	break;	1877	break;
…		…
2003	n = 0;	2028	n = 0;
2004	if (pchanged) {	2029	if (pchanged) {
2005	for (; n < (unsigned int)i; n++) {	2030	for (; n < (unsigned int)i; n++) {
2006	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);	2031	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2007	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));	2032	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2008	if (wattr.depth != rootdepth \|\| wattr.class == InputOnly) {	2033	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly) {
2009	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;	2034	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2010	break;	2035	break;
2011	}	2036	}
2012	}	2037	}
2013	}	2038	}
…		…
2206	break;	2231	break;
2207	case 'I': /* cursor up and scroll down if needed */	2232	case 'I': /* cursor up and scroll down if needed */
2208	rxvt_scr_index(aR_ DN);	2233	rxvt_scr_index(aR_ DN);
2209	break;	2234	break;
2210	case 'J': /* erase to end of screen */	2235	case 'J': /* erase to end of screen */
2211	rxvt_scr_erase_screen(aR_ 0);	2236	R->scr_erase_screen (0);
2212	break;	2237	break;
2213	case 'K': /* erase to end of line */	2238	case 'K': /* erase to end of line */
2214	rxvt_scr_erase_line(aR_ 0);	2239	rxvt_scr_erase_line(aR_ 0);
2215	break;	2240	break;
2216	case 'Y': /* move to specified row and col */	2241	case 'Y': /* move to specified row and col */
…		…
2551	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */	2576	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2552	rxvt_scr_tab(aR_ arg[0]);	2577	rxvt_scr_tab(aR_ arg[0]);
2553	break;	2578	break;
2554		2579
2555	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */	2580	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2556	rxvt_scr_erase_screen(aR_ arg[0]);	2581	R->scr_erase_screen (arg[0]);
2557	break;	2582	break;
2558		2583
2559	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */	2584	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2560	rxvt_scr_erase_line(aR_ arg[0]);	2585	rxvt_scr_erase_line(aR_ arg[0]);
2561	break;	2586	break;
…		…
2582		2607
2583	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	2608	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2584	arg[0] = -arg[0];	2609	arg[0] = -arg[0];
2585	/* FALLTHROUGH */	2610	/* FALLTHROUGH */
2586	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2611	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2587	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2612	R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2588	break;	2613	break;
2589		2614
2590	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2615	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2591	R->tt_write((const unsigned char *)VT100_ANS,	2616	R->tt_write((const unsigned char *)VT100_ANS,
2592	(unsigned int)(sizeof(VT100_ANS) - 1));	2617	(unsigned int)(sizeof(VT100_ANS) - 1));
…		…
2683	break;	2708	break;
2684	#endif	2709	#endif
2685		2710
2686	case CSI_78: /* DECREQTPARM */	2711	case CSI_78: /* DECREQTPARM */
2687	if (arg[0] == 0 \|\| arg[0] == 1)	2712	if (arg[0] == 0 \|\| arg[0] == 1)
2688	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);
2689	/* FALLTHROUGH */	2714	/* FALLTHROUGH */
2690		2715
2691	default:	2716	default:
2692	break;	2717	break;
2693	}	2718	}
…		…
2731	break;	2756	break;
2732	case 6: /* lower window */	2757	case 6: /* lower window */
2733	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);	2758	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2734	break;	2759	break;
2735	case 7: /* refresh window */	2760	case 7: /* refresh window */
2736	rxvt_scr_touch(aR_ True);	2761	R->scr_touch (true);
2737	break;	2762	break;
2738	case 8: /* set size (chars) */	2763	case 8: /* set size (chars) */
2739	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),	2764	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2740	(unsigned int)(args[1] * R->TermWin.fheight));	2765	(unsigned int)(args[1] * R->TermWin.fheight));
2741	break;	2766	break;
…		…
2952	if (*str != ';') {	2977	if (*str != ';') {
2953	#if XPM_BACKGROUND	2978	#if XPM_BACKGROUND
2954	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */	2979	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2955	rxvt_set_bgPixmap(aR_ str); /* change pixmap */	2980	rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2956	#endif	2981	#endif
2957	rxvt_scr_touch(aR_ True);	2982	R->scr_touch (true);
2958	}	2983	}
2959	while ((str = STRCHR(str, ';')) != NULL) {	2984	while ((str = STRCHR(str, ';')) != NULL) {
2960	str++;	2985	str++;
2961	#if XPM_BACKGROUND	2986	#if XPM_BACKGROUND
2962	changed += rxvt_scale_pixmap(aR_ str);	2987	changed += rxvt_scale_pixmap(aR_ str);
…		…
2964	}	2989	}
2965	if (changed) {	2990	if (changed) {
2966	#ifdef XPM_BACKGROUND	2991	#ifdef XPM_BACKGROUND
2967	rxvt_resize_pixmap(aR);	2992	rxvt_resize_pixmap(aR);
2968	#endif	2993	#endif
2969	rxvt_scr_touch(aR_ True);	2994	R->scr_touch (true);
2970	}	2995	}
2971	break;	2996	break;
2972		2997
2973	case XTerm_restoreFG:	2998	case XTerm_restoreFG:
2974	rxvt_set_window_color(aR_ Color_fg, str);	2999	rxvt_set_window_color(aR_ Color_fg, str);
…		…
3060	#endif	3085	#endif
3061	{ 1000, PrivMode_MouseX11 },	3086	{ 1000, PrivMode_MouseX11 },
3062	{ 1010, PrivMode_TtyOutputInh },	3087	{ 1010, PrivMode_TtyOutputInh },
3063	{ 1011, PrivMode_Keypress },	3088	{ 1011, PrivMode_Keypress },
3064	{ 1047, PrivMode_Screen },	3089	{ 1047, PrivMode_Screen },
		3090	{ 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3065	};	3091	};
3066		3092
3067	if (nargs == 0)	3093	if (nargs == 0)
3068	return;	3094	return;
3069		3095
…		…
3140	break;	3166	break;
3141	#endif	3167	#endif
3142	#ifdef scrollBar_esc	3168	#ifdef scrollBar_esc
3143	case scrollBar_esc:	3169	case scrollBar_esc:
3144	if (rxvt_scrollbar_mapping(aR_ state)) {	3170	if (rxvt_scrollbar_mapping(aR_ state)) {
3145	rxvt_resize_all_windows(aR_ 0, 0, 0);	3171	R->resize_all_windows (0, 0, 0);
3146	rxvt_scr_touch(aR_ True);	3172	R->scr_touch (true);
3147	}	3173	}
3148	break;	3174	break;
3149	#endif	3175	#endif
3150	case 25: /* visible/invisible cursor */	3176	case 25: /* visible/invisible cursor */
3151	rxvt_scr_cursor_visible(aR_ state);	3177	rxvt_scr_cursor_visible(aR_ state);
…		…
3176	R->Options \|= Opt_scrollTtyKeypress;	3202	R->Options \|= Opt_scrollTtyKeypress;
3177	else	3203	else
3178	R->Options &= ~Opt_scrollTtyKeypress;	3204	R->Options &= ~Opt_scrollTtyKeypress;
3179	break;	3205	break;
3180	case 1047: /* secondary screen w/ clearing */	3206	case 1047: /* secondary screen w/ clearing */
		3207	case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3181	if (R->current_screen != PRIMARY)	3208	if (R->current_screen != PRIMARY)
3182	rxvt_scr_erase_screen(aR_ 2);	3209	R->scr_erase_screen (2);
3183	rxvt_scr_change_screen(aR_ state);	3210	rxvt_scr_change_screen(aR_ state);
3184	/* FALLTHROUGH */	3211	/* FALLTHROUGH */
3185	default:	3212	default:
3186	break;	3213	break;
3187	}	3214	}
…		…
3361	}	3388	}
3362		3389
3363	if ((cmd == 'T') && (nargs >= 5)) {	3390	if ((cmd == 'T') && (nargs >= 5)) {
3364	int i, len = args[4];	3391	int i, len = args[4];
3365		3392
3366	text = rxvt_malloc((len + 1) * sizeof(char));	3393	text = (unsigned char )rxvt_malloc((len + 1) sizeof(char));
3367		3394
3368	if (text != NULL) {	3395	if (text != NULL) {
3369	for (i = 0; i < len; i++)	3396	for (i = 0; i < len; i++)
3370	text[i] = rxvt_cmd_getc(aR);	3397	text[i] = rxvt_cmd_getc(aR);
3371	text[len] = '\0';	3398	text[len] = '\0';

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.15 by pcg, Tue Dec 16 23:04:13 2003 UTC vs. Revision 1.32 by pcg, Thu Jan 29 23:31:45 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.15 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.32 by pcg, Thu Jan 29 23:31:45 2004 UTC