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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t chr, alloc, ch2, **fname;	167	wchar_t chr, alloc, ch2, **fname;
168	int len;	168	int len;
…		…
254	delete [] alloc;	254	delete [] alloc;
255	# endif	255	# endif
256	}	256	}
257	#endif	257	#endif
258		258
259	void	259	void ecb_cold
260	rxvt_term::commit_iso14755 ()	260	rxvt_term::commit_iso14755 ()
261	{	261	{
262	wchar_t ch = iso14755buf & ISO_14755_MASK;	262	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		263
264	if (iso14755buf & ISO_14755_51)	264	if (iso14755buf & ISO_14755_51)
…		…
282	}	282	}
283		283
284	iso14755buf = 0;	284	iso14755buf = 0;
285	}	285	}
286		286
287	static int	287	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	288	hex_keyval (XKeyEvent &ev)
289	{	289	{
290	// check whether this event corresponds to a hex digit	290	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	291	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	292	for (int index = 0; index < 8; index++)
…		…
301		301
302	return -1;	302	return -1;
303	}	303	}
304	#endif	304	#endif
305		305
306	static inline KeySym	306	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	307	translate_keypad (KeySym keysym, bool kp)
308	{	308	{
309	#ifdef XK_KP_Home	309	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	310	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	311	XK_KP_7, // XK_KP_Home
…		…
337	# endif	337	# endif
338	#endif	338	#endif
339	return keysym;	339	return keysym;
340	}	340	}
341		341
342	static inline int	342	static inline int ecb_cold
343	map_function_key (KeySym keysym)	343	map_function_key (KeySym keysym)
344	{	344	{
345	int param = 0;	345	int param = 0;
346		346
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	396	break;
397	}	397	}
398	return param;	398	return param;
399	}	399	}
400		400
401	void	401	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	402	rxvt_term::key_press (XKeyEvent &ev)
403	{	403	{
404	int ctrl, meta, shft, len;	404	int ctrl, meta, shft, len;
405	KeySym keysym;	405	KeySym keysym;
406	int valid_keysym;	406	int valid_keysym;
…		…
421	ctrl = ev.state & ControlMask;	421	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	422	meta = ev.state & ModMetaMask;
423		423
424	kbuf[0] = 0;	424	kbuf[0] = 0;
425		425
426	#ifdef USE_XIM	426	#if USE_XIM
427	if (Input_Context)	427	if (Input_Context)
428	{	428	{
429	Status status_return;	429	Status status_return;
430		430
431	#if 0	431	#if 0
…		…
776	}	776	}
777		777
778	if (newlen)	778	if (newlen)
779	len = strlen (kbuf);	779	len = strlen (kbuf);
780		780
		781	if (len > 0)
		782	{
781	/*	783	/*
		784	* pass Shift/Control indicators for function keys ending with `~'
		785	*
		786	* eg,
		787	* Prior = "ESC[5~"
		788	* Shift+Prior = "ESC[5$"
		789	* Ctrl+Prior = "ESC[5^"
		790	* Ctrl+Shift+Prior = "ESC[5@"
		791	*/
		792	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		793	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		794
		795	/*
782	* Pass meta for all function keys, if 'meta' option set	796	* Pass meta for all function keys, if 'meta' option set
783	*/	797	*/
784	#ifdef META8_OPTION	798	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)	799	if (meta && (meta_char == 0x80))
786	kbuf[len - 1] \|= 0x80;	800	kbuf[len - 1] \|= 0x80;
787	#endif	801	#endif
		802	}
788		803
789	}	804	}
790	else if (ctrl && keysym == XK_minus)	805	else if (ctrl && keysym == XK_minus)
791	{	806	{
792	len = 1;	807	len = 1;
…		…
826	{	841	{
827	view_start = 0;	842	view_start = 0;
828	want_refresh = 1;	843	want_refresh = 1;
829	}	844	}
830		845
831	/*
832	* these modifications only affect the static keybuffer
833	* pass Shift/Control indicators for function keys ending with `~'
834	*
835	* eg,
836	* Prior = "ESC[5~"
837	* Shift+Prior = "ESC[5$"
838	* Ctrl+Prior = "ESC[5^"
839	* Ctrl+Shift+Prior = "ESC[5@"
840	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841	*/
842	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845	/* escape prefix */	846	/* escape prefix */
846	if (meta	847	if (meta
847	#ifdef META8_OPTION	848	#ifdef META8_OPTION
848	&& meta_char == C0_ESC	849	&& meta_char == C0_ESC
849	#endif	850	#endif
…		…
854	}	855	}
855		856
856	tt_write (kbuf, (unsigned int)len);	857	tt_write (kbuf, (unsigned int)len);
857	}	858	}
858		859
859	void	860	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	861	rxvt_term::key_release (XKeyEvent &ev)
861	{	862	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
863	KeySym keysym;	864	KeySym keysym;
864		865
…		…
986	while (row < end_row);	987	while (row < end_row);
987	}	988	}
988		989
989	scr_refresh ();	990	scr_refresh ();
990	scrollBar.show (1);	991	scrollBar.show (1);
991	#ifdef USE_XIM	992	#if USE_XIM
992	im_send_spot ();	993	im_send_spot ();
993	#endif	994	#endif
994	}	995	}
995		996
996	display->flush ();	997	display->flush ();
…		…
1015	flush ();	1016	flush ();
1016	}	1017	}
1017		1018
1018	#ifdef CURSOR_BLINK	1019	#ifdef CURSOR_BLINK
1019	void	1020	void
		1021	rxvt_term::cursor_blink_reset ()
		1022	{
		1023	if (hidden_cursor)
		1024	{
		1025	hidden_cursor = 0;
		1026	want_refresh = 1;
		1027	}
		1028
		1029	if (option (Opt_cursorBlink))
		1030	cursor_blink_ev.again ();
		1031	else
		1032	cursor_blink_ev.stop ();
		1033	}
		1034
		1035	void
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1036	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1037	{
1022	hidden_cursor = !hidden_cursor;	1038	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1039	want_refresh = 1;
1024	refresh_check ();	1040	refresh_check ();
…		…
1042		1058
1043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1059	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044	void	1060	void
1045	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1061	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046	{	1062	{
1047	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1063	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1048	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1064	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049	{	1065	{
1050	want_refresh = 1;	1066	want_refresh = 1;
1051	refresh_check ();	1067	refresh_check ();
1052	}	1068	}
1053	else	1069	else
…		…
1203	pty_write ();	1219	pty_write ();
1204		1220
1205	refresh_check ();	1221	refresh_check ();
1206	}	1222	}
1207		1223
1208	void	1224	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1225	rxvt_term::pointer_unblank ()
1210	{	1226	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1227	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1228	recolour_cursor ();
1213		1229
…		…
1218	pointer_ev.start (pointerBlankDelay);	1234	pointer_ev.start (pointerBlankDelay);
1219	#endif	1235	#endif
1220	}	1236	}
1221		1237
1222	#ifdef POINTER_BLANK	1238	#ifdef POINTER_BLANK
1223	void	1239	void ecb_cold
1224	rxvt_term::pointer_blank ()	1240	rxvt_term::pointer_blank ()
1225	{	1241	{
1226	if (!option (Opt_pointerBlank))	1242	if (!option (Opt_pointerBlank))
1227	return;	1243	return;
1228		1244
…		…
1230	XFlush (dpy);	1246	XFlush (dpy);
1231		1247
1232	hidden_pointer = 1;	1248	hidden_pointer = 1;
1233	}	1249	}
1234		1250
1235	void	1251	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1252	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1253	{
1238	make_current ();	1254	make_current ();
1239		1255
1240	pointer_blank ();	1256	pointer_blank ();
…		…
1332	32 + x,	1348	32 + x,
1333	32 + y);	1349	32 + y);
1334	}	1350	}
1335		1351
1336	/{{{ process an X event /	1352	/{{{ process an X event /
1337	void	1353	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1354	rxvt_term::x_cb (XEvent &ev)
1339	{	1355	{
1340	make_current ();	1356	make_current ();
1341		1357
1342	dLocal (Display *, dpy);	1358	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1461	if (ev.xconfigure.window == parent)
1446	{	1462	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1464	;
1449		1465
		1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1467
1450	#ifdef HAVE_BG_PIXMAP	1468	#ifdef HAVE_BG_PIXMAP
		1469	if (bg_window_position_sensitive ())
		1470	want_position_change = true;
		1471	#endif
		1472
1451	bool moved = false;	1473	bool moved = false;
1452	if (bg_window_position_sensitive ())	1474
		1475	if (want_position_change)
1453	{	1476	{
1454	int x, y;	1477	int x, y;
		1478
1455	if (ev.xconfigure.send_event)	1479	if (ev.xconfigure.send_event)
1456	{	1480	{
1457	x = ev.xconfigure.x;	1481	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1482	y = ev.xconfigure.y;
1459	}	1483	}
1460	else	1484	else
1461	get_window_origin (x, y);	1485	get_window_origin (x, y);
1462		1486
		1487	if (x != parent_x \|\| y != parent_y)
		1488	{
		1489	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1490	parent_x = x;
		1491	parent_y = y;
		1492	}
		1493
1463	if (bg_set_position (x, y)	1494	if (bg_set_position (x, y)
1464	\|\| !(bg_flags & BG_IS_VALID))	1495	\|\| !(bg_flags & BG_IS_VALID))
1465	moved = true;	1496	moved = true;
1466	}	1497	}
1467	#endif
1468		1498
1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1470	{	1500	{
1471	seen_resize = 1;	1501	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1502	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1587	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558	;	1588	;
1559		1589
1560	if (scrollBar.state && ev.xany.window == scrollBar.win)	1590	if (scrollBar.state && ev.xany.window == scrollBar.win)
1561	{	1591	{
1562	scrollBar.state = STATE_IDLE;	1592	scrollBar.state = SB_STATE_IDLE;
1563	scrollBar.show (0);	1593	scrollBar.show (0);
1564	}	1594	}
1565	}	1595	}
1566	break;	1596	break;
1567		1597
…		…
1633	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1634	}	1664	}
1635	else	1665	else
1636	{	1666	{
1637	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1638	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1639	}	1669	}
1640		1670
1641	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1642	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1643	+ 1;	1673	+ 1;
…		…
1655	#ifdef MOUSE_THRESHOLD	1685	#ifdef MOUSE_THRESHOLD
1656	}	1686	}
1657	#endif	1687	#endif
1658	}	1688	}
1659	}	1689	}
1660	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1690	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661	{	1691	{
1662	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1692	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663	MotionNotify, &ev))	1693	MotionNotify, &ev))
1664	;	1694	;
1665		1695
…		…
1675	}	1705	}
1676	break;	1706	break;
1677	}	1707	}
1678		1708
1679	#if defined(CURSOR_BLINK)	1709	#if defined(CURSOR_BLINK)
1680	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1710	if (ev.type == KeyPress)
1681	{
1682	if (hidden_cursor)
1683	{
1684	hidden_cursor = 0;
1685	want_refresh = 1;
1686	}
1687
1688	cursor_blink_ev.again ();	1711	cursor_blink_reset ();
1689	}
1690	#endif	1712	#endif
1691		1713
1692	#if defined(POINTER_BLANK)	1714	#if defined(POINTER_BLANK)
1693	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1715	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694	{	1716	{
…		…
1705		1727
1706	refresh_check ();	1728	refresh_check ();
1707	}	1729	}
1708		1730
1709	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1710	void	1732	void ecb_cold
1711	rxvt_term::set_urgency (bool enable)	1733	rxvt_term::set_urgency (bool enable)
1712	{	1734	{
1713	if (enable == urgency_hint)	1735	if (enable == urgency_hint)
1714	return;	1736	return;
1715		1737
1716	if (XWMHints *h = XGetWMHints (dpy, parent))	1738	if (XWMHints *h = XGetWMHints (dpy, parent))
1717	{	1739	{
1718	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1740	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1719	XSetWMHints (dpy, parent, h);	1741	XSetWMHints (dpy, parent, h);
1720	urgency_hint = enable;	1742	urgency_hint = enable;
		1743	XFree (h);
1721	}	1744	}
1722	}	1745	}
1723	#endif	1746	#endif
1724		1747
1725	void	1748	void ecb_cold
1726	rxvt_term::focus_in ()	1749	rxvt_term::focus_in ()
1727	{	1750	{
1728	if (!focus)	1751	if (!focus)
1729	{	1752	{
1730	focus = 1;	1753	focus = 1;
…		…
1755		1778
1756	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1779	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757	}	1780	}
1758	}	1781	}
1759		1782
1760	void	1783	void ecb_cold
1761	rxvt_term::focus_out ()	1784	rxvt_term::focus_out ()
1762	{	1785	{
1763	if (focus)	1786	if (focus)
1764	{	1787	{
1765	focus = 0;	1788	focus = 0;
…		…
1798		1821
1799	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1822	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800	}	1823	}
1801	}	1824	}
1802		1825
1803	void	1826	void ecb_cold
1804	rxvt_term::update_fade_color (unsigned int idx)	1827	rxvt_term::update_fade_color (unsigned int idx)
1805	{	1828	{
1806	#if OFF_FOCUS_FADING	1829	#if OFF_FOCUS_FADING
1807	if (rs[Rs_fade])	1830	if (rs[Rs_fade])
1808	{	1831	{
…		…
1812	}	1835	}
1813	#endif	1836	#endif
1814	}	1837	}
1815		1838
1816	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1817	void	1840	void ecb_hot
1818	rxvt_term::rootwin_cb (XEvent &ev)	1841	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1842	{
1820	make_current ();	1843	make_current ();
1821		1844
1822	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
…		…
1972	if (scrollBar.upButton (ev.y))	1995	if (scrollBar.upButton (ev.y))
1973	direction = UP; /* up */	1996	direction = UP; /* up */
1974	else if (scrollBar.dnButton (ev.y))	1997	else if (scrollBar.dnButton (ev.y))
1975	direction = DN; /* down */	1998	direction = DN; /* down */
1976		1999
1977	scrollBar.state = STATE_IDLE;	2000	scrollBar.state = SB_STATE_IDLE;
1978	/*	2001	/*
1979	* Rxvt-style scrollbar:	2002	* Rxvt-style scrollbar:
1980	* move up if mouse is above slider	2003	* move up if mouse is above slider
1981	* move dn if mouse is below slider	2004	* move dn if mouse is below slider
1982	*	2005	*
…		…
2021	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2044	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022	#endif	2045	#endif
2023	if (scr_page (direction, 1))	2046	if (scr_page (direction, 1))
2024	{	2047	{
2025	if (direction == UP)	2048	if (direction == UP)
2026	scrollBar.state = STATE_UP;	2049	scrollBar.state = SB_STATE_UP;
2027	else	2050	else
2028	scrollBar.state = STATE_DOWN;	2051	scrollBar.state = SB_STATE_DOWN;
2029	}	2052	}
2030	}	2053	}
2031	else	2054	else
2032	switch (ev.button)	2055	switch (ev.button)
2033	{	2056	{
2034	case Button2:	2057	case Button2:
2035	switch (scrollBar.align)	2058	switch (scrollBar.align)
2036	{	2059	{
2037	case R_SB_ALIGN_TOP:	2060	case SB_ALIGN_TOP:
2038	csrO = 0;	2061	csrO = 0;
2039	break;	2062	break;
2040	case R_SB_ALIGN_CENTRE:	2063	case SB_ALIGN_CENTRE:
2041	csrO = (scrollBar.bot - scrollBar.top) / 2;	2064	csrO = (scrollBar.bot - scrollBar.top) / 2;
2042	break;	2065	break;
2043	case R_SB_ALIGN_BOTTOM:	2066	case SB_ALIGN_BOTTOM:
2044	csrO = scrollBar.bot - scrollBar.top;	2067	csrO = scrollBar.bot - scrollBar.top;
2045	break;	2068	break;
2046	}	2069	}
2047		2070
2048	if (scrollBar.style == R_SB_XTERM	2071	if (scrollBar.style == SB_STYLE_XTERM
2049	\|\| scrollBar.above_slider (ev.y)	2072	\|\| scrollBar.above_slider (ev.y)
2050	\|\| scrollBar.below_slider (ev.y))	2073	\|\| scrollBar.below_slider (ev.y))
2051	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());	2074	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052		2075
2053	scrollBar.state = STATE_MOTION;	2076	scrollBar.state = SB_STATE_MOTION;
2054	break;	2077	break;
2055		2078
2056	case Button1:	2079	case Button1:
2057	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2080	if (scrollBar.align == SB_ALIGN_CENTRE)
2058	csrO = ev.y - scrollBar.top;	2081	csrO = ev.y - scrollBar.top;
2059	/* FALLTHROUGH */	2082	/* FALLTHROUGH */
2060		2083
2061	case Button3:	2084	case Button3:
2062	if (scrollBar.style != R_SB_XTERM)	2085	if (scrollBar.style != SB_STYLE_XTERM)
2063	{	2086	{
2064	if (scrollBar.above_slider (ev.y))	2087	if (scrollBar.above_slider (ev.y))
2065	# ifdef RXVT_SCROLL_FULL	2088	# ifdef RXVT_SCROLL_FULL
2066	scr_page (UP, nrow - 1);	2089	scr_page (UP, nrow - 1);
2067	# else	2090	# else
…		…
2072	scr_page (DN, nrow - 1);	2095	scr_page (DN, nrow - 1);
2073	# else	2096	# else
2074	scr_page (DN, nrow / 4);	2097	scr_page (DN, nrow / 4);
2075	# endif	2098	# endif
2076	else	2099	else
2077	scrollBar.state = STATE_MOTION;	2100	scrollBar.state = SB_STATE_MOTION;
2078	}	2101	}
2079	else	2102	else
2080	{	2103	{
2081	scr_page ((ev.button == Button1 ? DN : UP),	2104	scr_page ((ev.button == Button1 ? DN : UP),
2082	(nrow	2105	(nrow
…		…
2099		2122
2100	csrO = 0; /* reset csr Offset */	2123	csrO = 0; /* reset csr Offset */
2101	if (!bypass_keystate)	2124	if (!bypass_keystate)
2102	reportmode = !! (priv_modes & PrivMode_mouse_report);	2125	reportmode = !! (priv_modes & PrivMode_mouse_report);
2103		2126
2104	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2127	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2105	{	2128	{
2106	scrollBar.state = STATE_IDLE;	2129	scrollBar.state = SB_STATE_IDLE;
2107	scrollBar.show (0);	2130	scrollBar.show (0);
2108	}	2131	}
2109		2132
2110	#ifdef SELECTION_SCROLLING	2133	#ifdef SELECTION_SCROLLING
2111	sel_scroll_ev.stop();	2134	sel_scroll_ev.stop();
…		…
2161	case Button3:	2184	case Button3:
2162	selection_make (ev.time);	2185	selection_make (ev.time);
2163	break;	2186	break;
2164		2187
2165	case Button2:	2188	case Button2:
2166	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2189	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2190	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168	break;	2191	break;
2169		2192
2170	#ifdef MOUSE_WHEEL	2193	#ifdef MOUSE_WHEEL
2171	case Button4:	2194	case Button4:
…		…
2206	}	2229	}
2207	}	2230	}
2208		2231
2209	/}}} /	2232	/}}} /
2210		2233
2211	void	2234	void ecb_hot
2212	rxvt_term::cmd_parse ()	2235	rxvt_term::cmd_parse ()
2213	{	2236	{
2214	wchar_t ch = NOCHAR;	2237	wchar_t ch = NOCHAR;
2215	char *seq_begin; // remember start of esc-sequence here	2238	char *seq_begin; // remember start of esc-sequence here
2216		2239
…		…
2335	}	2358	}
2336	}	2359	}
2337	}	2360	}
2338		2361
2339	// read the next character	2362	// read the next character
2340	wchar_t	2363	wchar_t ecb_hot
2341	rxvt_term::next_char () NOTHROW	2364	rxvt_term::next_char () NOTHROW
2342	{	2365	{
2343	while (cmdbuf_ptr < cmdbuf_endp)	2366	while (cmdbuf_ptr < cmdbuf_endp)
2344	{	2367	{
2345	// assume 7-bit to be ascii ALWAYS	2368	// assume 7-bit to be ascii ALWAYS
…		…
2369		2392
2370	return NOCHAR;	2393	return NOCHAR;
2371	}	2394	}
2372		2395
2373	// read the next octet	2396	// read the next octet
2374	uint32_t	2397	uint32_t ecb_hot
2375	rxvt_term::next_octet () NOTHROW	2398	rxvt_term::next_octet () NOTHROW
2376	{	2399	{
2377	return cmdbuf_ptr < cmdbuf_endp	2400	return cmdbuf_ptr < cmdbuf_endp
2378	? (unsigned char)*cmdbuf_ptr++	2401	? (unsigned char)*cmdbuf_ptr++
2379	: NOCHAR;	2402	: NOCHAR;
2380	}	2403	}
2381		2404
2382	static class out_of_input out_of_input;	2405	static class out_of_input out_of_input;
2383		2406
2384	wchar_t	2407	wchar_t ecb_hot
2385	rxvt_term::cmd_getc () THROW ((class out_of_input))	2408	rxvt_term::cmd_getc () THROW ((class out_of_input))
2386	{	2409	{
2387	wchar_t c = next_char ();	2410	wchar_t c = next_char ();
2388		2411
2389	if (c == NOCHAR)	2412	if (c == NOCHAR)
2390	throw out_of_input;	2413	throw out_of_input;
2391		2414
2392	return c;	2415	return c;
2393	}	2416	}
2394		2417
2395	uint32_t	2418	uint32_t ecb_hot
2396	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2419	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397	{	2420	{
2398	uint32_t c = next_octet ();	2421	uint32_t c = next_octet ();
2399		2422
2400	if (c == NOCHAR)	2423	if (c == NOCHAR)
…		…
2404	}	2427	}
2405		2428
2406	/{{{ print pipe /	2429	/{{{ print pipe /
2407	/----------------------------------------------------------------------/	2430	/----------------------------------------------------------------------/
2408	#ifdef PRINTPIPE	2431	#ifdef PRINTPIPE
2409	FILE *	2432	FILE * ecb_cold
2410	rxvt_term::popen_printer ()	2433	rxvt_term::popen_printer ()
2411	{	2434	{
2412	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2435	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413		2436
2414	if (stream == NULL)	2437	if (stream == NULL)
2415	rxvt_warn ("can't open printer pipe, not printing.\n");	2438	rxvt_warn ("can't open printer pipe, not printing.\n");
2416		2439
2417	return stream;	2440	return stream;
2418	}	2441	}
2419		2442
2420	int	2443	int ecb_cold
2421	rxvt_term::pclose_printer (FILE *stream)	2444	rxvt_term::pclose_printer (FILE *stream)
2422	{	2445	{
2423	fflush (stream);	2446	fflush (stream);
2424	return pclose (stream);	2447	return pclose (stream);
2425	}	2448	}
2426		2449
2427	/*	2450	/*
2428	* simulate attached vt100 printer	2451	* simulate attached vt100 printer
2429	*/	2452	*/
2430	void	2453	void ecb_cold
2431	rxvt_term::process_print_pipe ()	2454	rxvt_term::process_print_pipe ()
2432	{	2455	{
2433	FILE *fd = popen_printer ();	2456	FILE *fd = popen_printer ();
2434		2457
2435	if (!fd)	2458	if (!fd)
…		…
2490	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2513	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2514	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492	};	2515	};
2493		2516
2494	/{{{ process non-printing single characters /	2517	/{{{ process non-printing single characters /
2495	void	2518	void ecb_hot
2496	rxvt_term::process_nonprinting (unicode_t ch)	2519	rxvt_term::process_nonprinting (unicode_t ch)
2497	{	2520	{
2498	switch (ch)	2521	switch (ch)
2499	{	2522	{
2500	case C0_ESC:	2523	case C0_ESC:
…		…
2546	}	2569	}
2547	/}}} /	2570	/}}} /
2548		2571
2549		2572
2550	/{{{ process VT52 escape sequences /	2573	/{{{ process VT52 escape sequences /
2551	void	2574	void ecb_cold
2552	rxvt_term::process_escape_vt52 (unicode_t ch)	2575	rxvt_term::process_escape_vt52 (unicode_t ch)
2553	{	2576	{
2554	int row, col;	2577	int row, col;
2555		2578
2556	switch (ch)	2579	switch (ch)
…		…
2606	}	2629	}
2607	/}}} /	2630	/}}} /
2608		2631
2609		2632
2610	/{{{ process escape sequences /	2633	/{{{ process escape sequences /
2611	void	2634	void ecb_hot
2612	rxvt_term::process_escape_seq ()	2635	rxvt_term::process_escape_seq ()
2613	{	2636	{
2614	unicode_t ch = cmd_getc ();	2637	unicode_t ch = cmd_getc ();
2615		2638
2616	if (priv_modes & PrivMode_vt52)	2639	if (priv_modes & PrivMode_vt52)
…		…
2768	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2791	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2769	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2792	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2770	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2793	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2771	};	2794	};
2772		2795
2773	void	2796	void ecb_hot
2774	rxvt_term::process_csi_seq ()	2797	rxvt_term::process_csi_seq ()
2775	{	2798	{
2776	unicode_t ch, priv, i;	2799	unicode_t ch, priv, i;
2777	unsigned int nargs, p;	2800	unsigned int nargs, p;
2778	int n, ndef;	2801	int n, ndef;
…		…
2885	}	2908	}
2886	break;	2909	break;
2887	#endif	2910	#endif
2888		2911
2889	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2912	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2913	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891	arg[0] = -arg[0];	2914	arg[0] = -arg[0];
2892	/* FALLTHROUGH */	2915	/* FALLTHROUGH */
2893	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2916	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2917	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895	scr_gotorc (arg[0], 0, RELATIVE);	2918	scr_gotorc (arg[0], 0, RELATIVE);
2896	break;	2919	break;
2897		2920
2898	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2921	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2922	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3132	break;	3155	break;
3133		3156
3134	//case 9: NYI, TODO, restore maximized window or maximize window	3157	//case 9: NYI, TODO, restore maximized window or maximize window
3135	default:	3158	default:
3136	if (args[0] >= 24) /* set height (chars) */	3159	if (args[0] >= 24) /* set height (chars) */
3137	set_widthheight ((unsigned int)width,	3160	set_widthheight ((unsigned int)vt_width,
3138	(unsigned int) (args[1] * fheight));	3161	(unsigned int) (args[1] * fheight));
3139	break;	3162	break;
3140		3163
3141	/*	3164	/*
3142	* reports - some output format copied from XTerm	3165	* reports - some output format copied from XTerm
…		…
3428	process_color_seq (op, Color_tint, str, resp);	3451	process_color_seq (op, Color_tint, str, resp);
3429	{	3452	{
3430	bool changed = false;	3453	bool changed = false;
3431		3454
3432	if (ISSET_PIXCOLOR (Color_tint))	3455	if (ISSET_PIXCOLOR (Color_tint))
3433	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3456	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3434		3457
3435	if (changed)	3458	if (changed)
3436	update_background ();	3459	update_background ();
3437	}	3460	}
3438		3461
…		…
3442	#if BG_IMAGE_FROM_FILE	3465	#if BG_IMAGE_FROM_FILE
3443	case Rxvt_Pixmap:	3466	case Rxvt_Pixmap:
3444	if (!strcmp (str, "?"))	3467	if (!strcmp (str, "?"))
3445	{	3468	{
3446	char str[256];	3469	char str[256];
		3470	int h_scale = 0, v_scale = 0;
		3471	int h_align = 0, v_align = 0;
		3472	if (image_vec.size () > 0)
		3473	{
		3474	h_scale = image_vec[0].h_scale;
		3475	v_scale = image_vec[0].v_scale;
		3476	h_align = image_vec[0].h_align;
		3477	v_align = image_vec[0].v_align;
		3478	}
3447		3479
3448	sprintf (str, "[%dx%d+%d+%d]",	3480	sprintf (str, "[%dx%d+%d+%d]",
3449	min (h_scale, 32767), min (v_scale, 32767),	3481	h_scale, v_scale,
3450	min (h_align, 32767), min (v_align, 32767));	3482	h_align, v_align);
3451	process_xterm_seq (XTerm_title, str, CHAR_ST);	3483	process_xterm_seq (XTerm_title, str, CHAR_ST);
3452	}	3484	}
3453	else	3485	else
3454	{	3486	{
3455	bool changed = false;	3487	bool changed = false;
3456		3488
3457	if (*str != ';')	3489	if (*str != ';')
3458	{	3490	{
3459	if (bg_set_file (str)) /* change pixmap */	3491	if (image_vec.size () > 0)
		3492	changed = image_vec[0].set_file_geometry (str);
		3493	else
		3494	{
		3495	rxvt_image *image = new_image ();
		3496	if (!image->set_file_geometry (str))
		3497	image_vec.pop_back ();
		3498	else
3460	changed = true;	3499	changed = true;
		3500	}
3461	}	3501	}
3462	else	3502	else
3463	{	3503	{
3464	str++;	3504	str++;
		3505	if (image_vec.size () > 0)
3465	if (bg_set_geometry (str, true))	3506	changed = image_vec[0].set_geometry (str, true);
3466	changed = true;
3467	}	3507	}
3468		3508
3469	if (changed)	3509	if (changed)
3470	{	3510	{
3471	if (bg_window_position_sensitive ())	3511	if (bg_window_position_sensitive ())
…		…
3570	* 's' = save	3610	* 's' = save
3571	* 'r' = restore	3611	* 'r' = restore
3572	* 't' = toggle	3612	* 't' = toggle
3573	* so no need for fancy checking	3613	* so no need for fancy checking
3574	*/	3614	*/
3575	int	3615	int ecb_cold
3576	rxvt_term::privcases (int mode, unsigned long bit)	3616	rxvt_term::privcases (int mode, unsigned long bit)
3577	{	3617	{
3578	int state;	3618	int state;
3579		3619
3580	if (mode == 's')	3620	if (mode == 's')
3581	{	3621	{
3582	SavedModes \|= (priv_modes & bit);	3622	if (priv_modes & bit)
		3623	SavedModes \|= bit;
		3624	else
		3625	SavedModes &= ~bit;
3583	return -1;	3626	return -1;
3584	}	3627	}
3585	else	3628	else
3586	{	3629	{
3587	if (mode == 'r')	3630	if (mode == 'r')
…		…
3797	}	3840	}
3798	}	3841	}
3799	/}}} /	3842	/}}} /
3800		3843
3801	/{{{ process sgr sequences /	3844	/{{{ process sgr sequences /
3802	void	3845	void ecb_hot
3803	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3846	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804	{	3847	{
3805	unsigned int i;	3848	unsigned int i;
3806	short rendset;	3849	short rendset;
3807	int rendstyle;	3850	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs. Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC