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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.24 by pcg, Fri Dec 19 06:17:03 2003 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs. Revision 1.24 by pcg, Fri Dec 19 06:17:03 2003 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.24 by pcg, Fri Dec 19 06:17:03 2003 UTC