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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.486 by sf-exg, Fri Apr 29 13:29:45 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	IMSendSpot ();	993	im_send_spot ();
993	#endif	994	#endif
994	}	995	}
995		996
996	display->flush ();	997	display->flush ();
997	}	998	}
…		…
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);
1473	}	1503	}
1474	else	1504	else
1475	{	1505	{
1476	#ifdef HAVE_BG_PIXMAP	1506	#ifdef HAVE_BG_PIXMAP
1477	if (moved)	1507	if (moved)
1478	{
1479	if (mapped)
1480	update_background ();	1508	update_background ();
1481	else
1482	bg_invalidate ();
1483	}
1484	#endif	1509	#endif
1485	}	1510	}
1486		1511
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1512	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488	}	1513	}
…		…
1562	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1587	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1588	;
1564		1589
1565	if (scrollBar.state && ev.xany.window == scrollBar.win)	1590	if (scrollBar.state && ev.xany.window == scrollBar.win)
1566	{	1591	{
1567	scrollBar.state = STATE_IDLE;	1592	scrollBar.state = SB_STATE_IDLE;
1568	scrollBar.show (0);	1593	scrollBar.show (0);
1569	}	1594	}
1570	}	1595	}
1571	break;	1596	break;
1572		1597
…		…
1638	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1639	}	1664	}
1640	else	1665	else
1641	{	1666	{
1642	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1643	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1644	}	1669	}
1645		1670
1646	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1647	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1648	+ 1;	1673	+ 1;
…		…
1660	#ifdef MOUSE_THRESHOLD	1685	#ifdef MOUSE_THRESHOLD
1661	}	1686	}
1662	#endif	1687	#endif
1663	}	1688	}
1664	}	1689	}
1665	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1690	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666	{	1691	{
1667	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1692	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668	MotionNotify, &ev))	1693	MotionNotify, &ev))
1669	;	1694	;
1670		1695
1671	XQueryPointer (dpy, scrollBar.win,	1696	XQueryPointer (dpy, scrollBar.win,
1672	&unused_root, &unused_child,	1697	&unused_root, &unused_child,
1673	&unused_root_x, &unused_root_y,	1698	&unused_root_x, &unused_root_y,
1674	&ev.xbutton.x, &ev.xbutton.y,	1699	&ev.xbutton.x, &ev.xbutton.y,
1675	&unused_mask);	1700	&unused_mask);
1676	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1701	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677	scrollBar.size ());	1702	scrollBar.size ());
1678	want_refresh = 1;	1703	want_refresh = 1;
1679	scrollBar.show (1);	1704	scrollBar.show (1);
1680	}	1705	}
1681	break;	1706	break;
1682	}	1707	}
1683		1708
1684	#if defined(CURSOR_BLINK)	1709	#if defined(CURSOR_BLINK)
1685	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1710	if (ev.type == KeyPress)
1686	{
1687	if (hidden_cursor)
1688	{
1689	hidden_cursor = 0;
1690	want_refresh = 1;
1691	}
1692
1693	cursor_blink_ev.again ();	1711	cursor_blink_reset ();
1694	}
1695	#endif	1712	#endif
1696		1713
1697	#if defined(POINTER_BLANK)	1714	#if defined(POINTER_BLANK)
1698	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1715	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699	{	1716	{
…		…
1710		1727
1711	refresh_check ();	1728	refresh_check ();
1712	}	1729	}
1713		1730
1714	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1715	void	1732	void ecb_cold
1716	rxvt_term::set_urgency (bool enable)	1733	rxvt_term::set_urgency (bool enable)
1717	{	1734	{
1718	if (enable == urgency_hint)	1735	if (enable == urgency_hint)
1719	return;	1736	return;
1720		1737
1721	if (XWMHints *h = XGetWMHints (dpy, parent))	1738	if (XWMHints *h = XGetWMHints (dpy, parent))
1722	{	1739	{
1723	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1740	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1724	XSetWMHints (dpy, parent, h);	1741	XSetWMHints (dpy, parent, h);
1725	urgency_hint = enable;	1742	urgency_hint = enable;
		1743	XFree (h);
1726	}	1744	}
1727	}	1745	}
1728	#endif	1746	#endif
1729		1747
1730	void	1748	void ecb_cold
1731	rxvt_term::focus_in ()	1749	rxvt_term::focus_in ()
1732	{	1750	{
1733	if (!focus)	1751	if (!focus)
1734	{	1752	{
1735	focus = 1;	1753	focus = 1;
1736	want_refresh = 1;	1754	want_refresh = 1;
1737		1755
1738	#if USE_XIM	1756	#if USE_XIM
1739	if (Input_Context != NULL)	1757	if (Input_Context != NULL)
1740	{	1758	{
1741	IMSetPosition ();	1759	im_set_position ();
1742	XSetICFocus (Input_Context);	1760	XSetICFocus (Input_Context);
1743	}	1761	}
1744	#endif	1762	#endif
1745	#if CURSOR_BLINK	1763	#if CURSOR_BLINK
1746	if (option (Opt_cursorBlink))	1764	if (option (Opt_cursorBlink))
…		…
1760		1778
1761	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1779	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762	}	1780	}
1763	}	1781	}
1764		1782
1765	void	1783	void ecb_cold
1766	rxvt_term::focus_out ()	1784	rxvt_term::focus_out ()
1767	{	1785	{
1768	if (focus)	1786	if (focus)
1769	{	1787	{
1770	focus = 0;	1788	focus = 0;
…		…
1803		1821
1804	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1822	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805	}	1823	}
1806	}	1824	}
1807		1825
1808	void	1826	void ecb_cold
1809	rxvt_term::update_fade_color (unsigned int idx)	1827	rxvt_term::update_fade_color (unsigned int idx)
1810	{	1828	{
1811	#if OFF_FOCUS_FADING	1829	#if OFF_FOCUS_FADING
1812	if (rs[Rs_fade])	1830	if (rs[Rs_fade])
1813	{	1831	{
…		…
1817	}	1835	}
1818	#endif	1836	#endif
1819	}	1837	}
1820		1838
1821	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1822	void	1840	void ecb_hot
1823	rxvt_term::rootwin_cb (XEvent &ev)	1841	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1842	{
1825	make_current ();	1843	make_current ();
1826		1844
1827	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
…		…
1977	if (scrollBar.upButton (ev.y))	1995	if (scrollBar.upButton (ev.y))
1978	direction = UP; /* up */	1996	direction = UP; /* up */
1979	else if (scrollBar.dnButton (ev.y))	1997	else if (scrollBar.dnButton (ev.y))
1980	direction = DN; /* down */	1998	direction = DN; /* down */
1981		1999
1982	scrollBar.state = STATE_IDLE;	2000	scrollBar.state = SB_STATE_IDLE;
1983	/*	2001	/*
1984	* Rxvt-style scrollbar:	2002	* Rxvt-style scrollbar:
1985	* move up if mouse is above slider	2003	* move up if mouse is above slider
1986	* move dn if mouse is below slider	2004	* move dn if mouse is below slider
1987	*	2005	*
…		…
2026	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2044	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027	#endif	2045	#endif
2028	if (scr_page (direction, 1))	2046	if (scr_page (direction, 1))
2029	{	2047	{
2030	if (direction == UP)	2048	if (direction == UP)
2031	scrollBar.state = STATE_UP;	2049	scrollBar.state = SB_STATE_UP;
2032	else	2050	else
2033	scrollBar.state = STATE_DOWN;	2051	scrollBar.state = SB_STATE_DOWN;
2034	}	2052	}
2035	}	2053	}
2036	else	2054	else
2037	switch (ev.button)	2055	switch (ev.button)
2038	{	2056	{
2039	case Button2:	2057	case Button2:
2040	switch (scrollBar.align)	2058	switch (scrollBar.align)
2041	{	2059	{
2042	case R_SB_ALIGN_TOP:	2060	case SB_ALIGN_TOP:
2043	csrO = 0;	2061	csrO = 0;
2044	break;	2062	break;
2045	case R_SB_ALIGN_CENTRE:	2063	case SB_ALIGN_CENTRE:
2046	csrO = (scrollBar.bot - scrollBar.top) / 2;	2064	csrO = (scrollBar.bot - scrollBar.top) / 2;
2047	break;	2065	break;
2048	case R_SB_ALIGN_BOTTOM:	2066	case SB_ALIGN_BOTTOM:
2049	csrO = scrollBar.bot - scrollBar.top;	2067	csrO = scrollBar.bot - scrollBar.top;
2050	break;	2068	break;
2051	}	2069	}
2052		2070
2053	if (scrollBar.style == R_SB_XTERM	2071	if (scrollBar.style == SB_STYLE_XTERM
2054	\|\| scrollbar_above_slider (ev.y)	2072	\|\| scrollBar.above_slider (ev.y)
2055	\|\| scrollbar_below_slider (ev.y))	2073	\|\| scrollBar.below_slider (ev.y))
2056	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2074	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057		2075
2058	scrollBar.state = STATE_MOTION;	2076	scrollBar.state = SB_STATE_MOTION;
2059	break;	2077	break;
2060		2078
2061	case Button1:	2079	case Button1:
2062	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2080	if (scrollBar.align == SB_ALIGN_CENTRE)
2063	csrO = ev.y - scrollBar.top;	2081	csrO = ev.y - scrollBar.top;
2064	/* FALLTHROUGH */	2082	/* FALLTHROUGH */
2065		2083
2066	case Button3:	2084	case Button3:
2067	if (scrollBar.style != R_SB_XTERM)	2085	if (scrollBar.style != SB_STYLE_XTERM)
2068	{	2086	{
2069	if (scrollbar_above_slider (ev.y))	2087	if (scrollBar.above_slider (ev.y))
2070	# ifdef RXVT_SCROLL_FULL	2088	# ifdef RXVT_SCROLL_FULL
2071	scr_page (UP, nrow - 1);	2089	scr_page (UP, nrow - 1);
2072	# else	2090	# else
2073	scr_page (UP, nrow / 4);	2091	scr_page (UP, nrow / 4);
2074	# endif	2092	# endif
2075	else if (scrollbar_below_slider (ev.y))	2093	else if (scrollBar.below_slider (ev.y))
2076	# ifdef RXVT_SCROLL_FULL	2094	# ifdef RXVT_SCROLL_FULL
2077	scr_page (DN, nrow - 1);	2095	scr_page (DN, nrow - 1);
2078	# else	2096	# else
2079	scr_page (DN, nrow / 4);	2097	scr_page (DN, nrow / 4);
2080	# endif	2098	# endif
2081	else	2099	else
2082	scrollBar.state = STATE_MOTION;	2100	scrollBar.state = SB_STATE_MOTION;
2083	}	2101	}
2084	else	2102	else
2085	{	2103	{
2086	scr_page ((ev.button == Button1 ? DN : UP),	2104	scr_page ((ev.button == Button1 ? DN : UP),
2087	(nrow	2105	(nrow
2088	* scrollbar_position (ev.y)	2106	* scrollBar.position (ev.y)
2089	/ scrollBar.size ()));	2107	/ scrollBar.size ()));
2090	}	2108	}
2091		2109
2092	break;	2110	break;
2093	}	2111	}
…		…
2104		2122
2105	csrO = 0; /* reset csr Offset */	2123	csrO = 0; /* reset csr Offset */
2106	if (!bypass_keystate)	2124	if (!bypass_keystate)
2107	reportmode = !! (priv_modes & PrivMode_mouse_report);	2125	reportmode = !! (priv_modes & PrivMode_mouse_report);
2108		2126
2109	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2127	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2110	{	2128	{
2111	scrollBar.state = STATE_IDLE;	2129	scrollBar.state = SB_STATE_IDLE;
2112	scrollBar.show (0);	2130	scrollBar.show (0);
2113	}	2131	}
2114		2132
2115	#ifdef SELECTION_SCROLLING	2133	#ifdef SELECTION_SCROLLING
2116	sel_scroll_ev.stop();	2134	sel_scroll_ev.stop();
…		…
2166	case Button3:	2184	case Button3:
2167	selection_make (ev.time);	2185	selection_make (ev.time);
2168	break;	2186	break;
2169		2187
2170	case Button2:	2188	case Button2:
2171	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?
2172	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2190	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173	break;	2191	break;
2174		2192
2175	#ifdef MOUSE_WHEEL	2193	#ifdef MOUSE_WHEEL
2176	case Button4:	2194	case Button4:
…		…
2211	}	2229	}
2212	}	2230	}
2213		2231
2214	/}}} /	2232	/}}} /
2215		2233
2216	void	2234	void ecb_hot
2217	rxvt_term::cmd_parse ()	2235	rxvt_term::cmd_parse ()
2218	{	2236	{
2219	wchar_t ch = NOCHAR;	2237	wchar_t ch = NOCHAR;
2220	char *seq_begin; // remember start of esc-sequence here	2238	char *seq_begin; // remember start of esc-sequence here
2221		2239
2222	for (;;)	2240	for (;;)
2223	{	2241	{
2224	if (expect_false (ch == NOCHAR))	2242	if (ecb_unlikely (ch == NOCHAR))
2225	{	2243	{
2226	seq_begin = cmdbuf_ptr;	2244	seq_begin = cmdbuf_ptr;
2227	ch = next_char ();	2245	ch = next_char ();
2228		2246
2229	if (ch == NOCHAR)	2247	if (ch == NOCHAR)
2230	break;	2248	break;
2231	}	2249	}
2232		2250
2233	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2251	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2234	{	2252	{
2235	if (expect_false (!seen_input))	2253	if (ecb_unlikely (!seen_input))
2236	{	2254	{
2237	seen_input = 1;	2255	seen_input = 1;
2238	// many badly-written programs (e.g. jed) contain a race condition:	2256	// many badly-written programs (e.g. jed) contain a race condition:
2239	// they first read the screensize and then install a SIGWINCH handler.	2257	// they first read the screensize and then install a SIGWINCH handler.
2240	// some window managers resize the window early, and these programs	2258	// some window managers resize the window early, and these programs
…		…
2253	wchar_t *str = buf;	2271	wchar_t *str = buf;
2254	wchar_t *eol = str + min (ncol, UBUFSIZ);	2272	wchar_t *eol = str + min (ncol, UBUFSIZ);
2255		2273
2256	for (;;)	2274	for (;;)
2257	{	2275	{
2258	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2276	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259	break;	2277	break;
2260		2278
2261	*str++ = ch;	2279	*str++ = ch;
2262		2280
2263	if (expect_false (ch == C0_LF \|\| str >= eol))	2281	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2264	{	2282	{
2265	if (ch == C0_LF)	2283	if (ch == C0_LF)
2266	nlines++;	2284	nlines++;
2267		2285
2268	refresh_count++;	2286	refresh_count++;
…		…
2340	}	2358	}
2341	}	2359	}
2342	}	2360	}
2343		2361
2344	// read the next character	2362	// read the next character
2345	wchar_t	2363	wchar_t ecb_hot
2346	rxvt_term::next_char () NOTHROW	2364	rxvt_term::next_char () NOTHROW
2347	{	2365	{
2348	while (cmdbuf_ptr < cmdbuf_endp)	2366	while (cmdbuf_ptr < cmdbuf_endp)
2349	{	2367	{
2350	// assume 7-bit to be ascii ALWAYS	2368	// assume 7-bit to be ascii ALWAYS
2351	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2369	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2352	return *cmdbuf_ptr++;	2370	return *cmdbuf_ptr++;
2353		2371
2354	wchar_t wc;	2372	wchar_t wc;
2355	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2373	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356		2374
…		…
2374		2392
2375	return NOCHAR;	2393	return NOCHAR;
2376	}	2394	}
2377		2395
2378	// read the next octet	2396	// read the next octet
2379	uint32_t	2397	uint32_t ecb_hot
2380	rxvt_term::next_octet () NOTHROW	2398	rxvt_term::next_octet () NOTHROW
2381	{	2399	{
2382	return cmdbuf_ptr < cmdbuf_endp	2400	return cmdbuf_ptr < cmdbuf_endp
2383	? (unsigned char)*cmdbuf_ptr++	2401	? (unsigned char)*cmdbuf_ptr++
2384	: NOCHAR;	2402	: NOCHAR;
2385	}	2403	}
2386		2404
2387	static class out_of_input out_of_input;	2405	static class out_of_input out_of_input;
2388		2406
2389	wchar_t	2407	wchar_t ecb_hot
2390	rxvt_term::cmd_getc () THROW ((class out_of_input))	2408	rxvt_term::cmd_getc () THROW ((class out_of_input))
2391	{	2409	{
2392	wchar_t c = next_char ();	2410	wchar_t c = next_char ();
2393		2411
2394	if (c == NOCHAR)	2412	if (c == NOCHAR)
2395	throw out_of_input;	2413	throw out_of_input;
2396		2414
2397	return c;	2415	return c;
2398	}	2416	}
2399		2417
2400	uint32_t	2418	uint32_t ecb_hot
2401	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2419	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402	{	2420	{
2403	uint32_t c = next_octet ();	2421	uint32_t c = next_octet ();
2404		2422
2405	if (c == NOCHAR)	2423	if (c == NOCHAR)
…		…
2409	}	2427	}
2410		2428
2411	/{{{ print pipe /	2429	/{{{ print pipe /
2412	/----------------------------------------------------------------------/	2430	/----------------------------------------------------------------------/
2413	#ifdef PRINTPIPE	2431	#ifdef PRINTPIPE
2414	FILE *	2432	FILE * ecb_cold
2415	rxvt_term::popen_printer ()	2433	rxvt_term::popen_printer ()
2416	{	2434	{
2417	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");
2418		2436
2419	if (stream == NULL)	2437	if (stream == NULL)
2420	rxvt_warn ("can't open printer pipe, not printing.\n");	2438	rxvt_warn ("can't open printer pipe, not printing.\n");
2421		2439
2422	return stream;	2440	return stream;
2423	}	2441	}
2424		2442
2425	int	2443	int ecb_cold
2426	rxvt_term::pclose_printer (FILE *stream)	2444	rxvt_term::pclose_printer (FILE *stream)
2427	{	2445	{
2428	fflush (stream);	2446	fflush (stream);
2429	return pclose (stream);	2447	return pclose (stream);
2430	}	2448	}
2431		2449
2432	/*	2450	/*
2433	* simulate attached vt100 printer	2451	* simulate attached vt100 printer
2434	*/	2452	*/
2435	void	2453	void ecb_cold
2436	rxvt_term::process_print_pipe ()	2454	rxvt_term::process_print_pipe ()
2437	{	2455	{
2438	FILE *fd = popen_printer ();	2456	FILE *fd = popen_printer ();
2439		2457
2440	if (!fd)	2458	if (!fd)
…		…
2495	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,
2496	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,
2497	};	2515	};
2498		2516
2499	/{{{ process non-printing single characters /	2517	/{{{ process non-printing single characters /
2500	void	2518	void ecb_hot
2501	rxvt_term::process_nonprinting (unicode_t ch)	2519	rxvt_term::process_nonprinting (unicode_t ch)
2502	{	2520	{
2503	switch (ch)	2521	switch (ch)
2504	{	2522	{
2505	case C0_ESC:	2523	case C0_ESC:
…		…
2551	}	2569	}
2552	/}}} /	2570	/}}} /
2553		2571
2554		2572
2555	/{{{ process VT52 escape sequences /	2573	/{{{ process VT52 escape sequences /
2556	void	2574	void ecb_cold
2557	rxvt_term::process_escape_vt52 (unicode_t ch)	2575	rxvt_term::process_escape_vt52 (unicode_t ch)
2558	{	2576	{
2559	int row, col;	2577	int row, col;
2560		2578
2561	switch (ch)	2579	switch (ch)
…		…
2595	break;	2613	break;
2596	case 'Z': /* identify the terminal type */	2614	case 'Z': /* identify the terminal type */
2597	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2615	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598	break;	2616	break;
2599	case '<': /* turn off VT52 mode */	2617	case '<': /* turn off VT52 mode */
2600	set_privmode (PrivMode_vt52, 0);	2618	priv_modes &= ~PrivMode_vt52;
2601	break;	2619	break;
2602	case 'F': /* use special graphics character set */	2620	case 'F': /* use special graphics character set */
2603	case 'G': /* use regular character set */	2621	case 'G': /* use regular character set */
2604	/* unimplemented */	2622	/* unimplemented */
2605	break;	2623	break;
…		…
2611	}	2629	}
2612	/}}} /	2630	/}}} /
2613		2631
2614		2632
2615	/{{{ process escape sequences /	2633	/{{{ process escape sequences /
2616	void	2634	void ecb_hot
2617	rxvt_term::process_escape_seq ()	2635	rxvt_term::process_escape_seq ()
2618	{	2636	{
2619	unicode_t ch = cmd_getc ();	2637	unicode_t ch = cmd_getc ();
2620		2638
2621	if (priv_modes & PrivMode_vt52)	2639	if (priv_modes & PrivMode_vt52)
…		…
2624	return;	2642	return;
2625	}	2643	}
2626		2644
2627	switch (ch)	2645	switch (ch)
2628	{	2646	{
2629	/* case 1: do_tek_mode (); break; */
2630	case '#':	2647	case '#':
2631	if (cmd_getc () == '8')	2648	if (cmd_getc () == '8')
2632	scr_E ();	2649	scr_E ();
2633	break;	2650	break;
2634	case '(':	2651	case '(':
…		…
2657	#if !ENABLE_MINIMAL	2674	#if !ENABLE_MINIMAL
2658	case '9':	2675	case '9':
2659	scr_forwardindex ();	2676	scr_forwardindex ();
2660	break;	2677	break;
2661	#endif	2678	#endif
		2679	// DECPAM/DECPNM
2662	case '=':	2680	case '=':
		2681	priv_modes \|= PrivMode_aplKP;
		2682	break;
2663	case '>':	2683	case '>':
2664	set_privmode (PrivMode_aplKP, ch == '=');	2684	priv_modes &= ~PrivMode_aplKP;
2665	break;	2685	break;
2666		2686
2667	case C1_40:	2687	case C1_40:
2668	cmd_getc ();	2688	cmd_getc ();
2669	break;	2689	break;
…		…
2673		2693
2674	/* 8.3.87: NEXT LINE */	2694	/* 8.3.87: NEXT LINE */
2675	case C1_NEL: /* ESC E */	2695	case C1_NEL: /* ESC E */
2676	{	2696	{
2677	wchar_t nlcr[] = { C0_LF, C0_CR };	2697	wchar_t nlcr[] = { C0_LF, C0_CR };
2678	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2698	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2679	}	2699	}
2680	break;	2700	break;
2681		2701
2682	/* kidnapped escape sequence: Should be 8.3.48 */	2702	/* kidnapped escape sequence: Should be 8.3.48 */
2683	case C1_ESA: /* ESC G */	2703	case C1_ESA: /* ESC G */
…		…
2695	case C1_RI: /* ESC M */	2715	case C1_RI: /* ESC M */
2696	scr_index (DN);	2716	scr_index (DN);
2697	break;	2717	break;
2698		2718
2699	/* 8.3.142: SINGLE-SHIFT TWO */	2719	/* 8.3.142: SINGLE-SHIFT TWO */
2700	/case C1_SS2: scr_single_shift (2); break; /	2720	/* case C1_SS2: break; */
2701		2721
2702	/* 8.3.143: SINGLE-SHIFT THREE */	2722	/* 8.3.143: SINGLE-SHIFT THREE */
2703	/case C1_SS3: scr_single_shift (3); break; /	2723	/* case C1_SS3: break; */
2704		2724
2705	/* 8.3.27: DEVICE CONTROL STRING */	2725	/* 8.3.27: DEVICE CONTROL STRING */
2706	case C1_DCS: /* ESC P */	2726	case C1_DCS: /* ESC P */
2707	process_dcs_seq ();	2727	process_dcs_seq ();
2708	break;	2728	break;
…		…
2771	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, */
2772	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, */
2773	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, {, \|, }, ~, */
2774	};	2794	};
2775		2795
2776	void	2796	void ecb_hot
2777	rxvt_term::process_csi_seq ()	2797	rxvt_term::process_csi_seq ()
2778	{	2798	{
2779	unicode_t ch, priv, i;	2799	unicode_t ch, priv, i;
2780	unsigned int nargs, p;	2800	unsigned int nargs, p;
2781	int n, ndef;	2801	int n, ndef;
…		…
2859	scr_soft_reset ();	2879	scr_soft_reset ();
2860		2880
2861	static const int pm_h[] = { 7, 25 };	2881	static const int pm_h[] = { 7, 25 };
2862	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2882	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863		2883
2864	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2884	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2885	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2866	}	2886	}
2867	break;	2887	break;
2868	}	2888	}
2869		2889
2870	return;	2890	return;
…		…
2888	}	2908	}
2889	break;	2909	break;
2890	#endif	2910	#endif
2891		2911
2892	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2912	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2893	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2913	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2894	arg[0] = -arg[0];	2914	arg[0] = -arg[0];
2895	/* FALLTHROUGH */	2915	/* FALLTHROUGH */
2896	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2916	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2897	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2917	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2898	scr_gotorc (arg[0], 0, RELATIVE);	2918	scr_gotorc (arg[0], 0, RELATIVE);
2899	break;	2919	break;
2900		2920
2901	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2921	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2902	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2922	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3135	break;	3155	break;
3136		3156
3137	//case 9: NYI, TODO, restore maximized window or maximize window	3157	//case 9: NYI, TODO, restore maximized window or maximize window
3138	default:	3158	default:
3139	if (args[0] >= 24) /* set height (chars) */	3159	if (args[0] >= 24) /* set height (chars) */
3140	set_widthheight ((unsigned int)width,	3160	set_widthheight ((unsigned int)vt_width,
3141	(unsigned int) (args[1] * fheight));	3161	(unsigned int) (args[1] * fheight));
3142	break;	3162	break;
3143		3163
3144	/*	3164	/*
3145	* reports - some output format copied from XTerm	3165	* reports - some output format copied from XTerm
…		…
3431	process_color_seq (op, Color_tint, str, resp);	3451	process_color_seq (op, Color_tint, str, resp);
3432	{	3452	{
3433	bool changed = false;	3453	bool changed = false;
3434		3454
3435	if (ISSET_PIXCOLOR (Color_tint))	3455	if (ISSET_PIXCOLOR (Color_tint))
3436	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3456	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3437		3457
3438	if (changed)	3458	if (changed)
3439	update_background ();	3459	update_background ();
3440	}	3460	}
3441		3461
…		…
3445	#if BG_IMAGE_FROM_FILE	3465	#if BG_IMAGE_FROM_FILE
3446	case Rxvt_Pixmap:	3466	case Rxvt_Pixmap:
3447	if (!strcmp (str, "?"))	3467	if (!strcmp (str, "?"))
3448	{	3468	{
3449	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	}
3450		3479
3451	sprintf (str, "[%dx%d+%d+%d]",	3480	sprintf (str, "[%dx%d+%d+%d]",
3452	min (h_scale, 32767), min (v_scale, 32767),	3481	h_scale, v_scale,
3453	min (h_align, 32767), min (v_align, 32767));	3482	h_align, v_align);
3454	process_xterm_seq (XTerm_title, str, CHAR_ST);	3483	process_xterm_seq (XTerm_title, str, CHAR_ST);
3455	}	3484	}
3456	else	3485	else
3457	{	3486	{
3458	int changed = 0;	3487	bool changed = false;
3459		3488
3460	if (*str != ';')	3489	if (*str != ';')
3461	{	3490	{
3462	if (bg_set_file (str)) /* change pixmap */	3491	if (image_vec.size () > 0)
		3492	changed = image_vec[0].set_file_geometry (str);
		3493	else
3463	{	3494	{
3464	changed++;	3495	rxvt_image *image = new_image ();
3465	str = strchr (str, ';');	3496	if (!image->set_file_geometry (str))
3466	if (str == NULL)	3497	image_vec.pop_back ();
3467	bg_set_default_geometry ();
3468	else	3498	else
3469	bg_set_geometry (str+1);	3499	changed = true;
3470	}	3500	}
3471	}	3501	}
3472	else	3502	else
3473	{	3503	{
3474	str++;	3504	str++;
		3505	if (image_vec.size () > 0)
3475	if (bg_set_geometry (str, true))	3506	changed = image_vec[0].set_geometry (str, true);
3476	changed++;
3477	}	3507	}
3478		3508
3479	if (changed)	3509	if (changed)
3480	{	3510	{
3481	if (bg_window_position_sensitive ())	3511	if (bg_window_position_sensitive ())
…		…
3580	* 's' = save	3610	* 's' = save
3581	* 'r' = restore	3611	* 'r' = restore
3582	* 't' = toggle	3612	* 't' = toggle
3583	* so no need for fancy checking	3613	* so no need for fancy checking
3584	*/	3614	*/
3585	int	3615	int ecb_cold
3586	rxvt_term::privcases (int mode, unsigned long bit)	3616	rxvt_term::privcases (int mode, unsigned long bit)
3587	{	3617	{
3588	int state;	3618	int state;
3589		3619
3590	if (mode == 's')	3620	if (mode == 's')
3591	{	3621	{
3592	SavedModes \|= (priv_modes & bit);	3622	if (priv_modes & bit)
		3623	SavedModes \|= bit;
		3624	else
		3625	SavedModes &= ~bit;
3593	return -1;	3626	return -1;
3594	}	3627	}
3595	else	3628	else
3596	{	3629	{
3597	if (mode == 'r')	3630	if (mode == 'r')
3598	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3631	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3599	else	3632	else
3600	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3633	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3601		3634
3602	set_privmode (bit, state);	3635	if (state)
		3636	priv_modes \|= bit;
		3637	else
		3638	priv_modes &= ~bit;
3603	}	3639	}
3604		3640
3605	return state;	3641	return state;
3606	}	3642	}
3607		3643
3608	/* we're not using priv _yet_ */	3644	/* we're not using priv _yet_ */
3609	void	3645	void
3610	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3646	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3611	{	3647	{
3612	unsigned int i, j;	3648	unsigned int i, j;
3613	int state;	3649	int state;
3614		3650
3615	static const struct	3651	static const struct
3616	{	3652	{
3617	const int argval;	3653	const int argval;
3618	const unsigned long bit;	3654	const unsigned long bit;
3619	} argtopriv[] = {	3655	} argtopriv[] = {
3620	{ 1, PrivMode_aplCUR }, // DECCKM	3656	{ 1, PrivMode_aplCUR }, // DECCKM
3621	{ 2, PrivMode_vt52 },	3657	{ 2, PrivMode_vt52 }, // DECANM
3622	{ 3, PrivMode_132 }, // DECCOLM	3658	{ 3, PrivMode_132 }, // DECCOLM
3623	{ 4, PrivMode_smoothScroll }, // DECSCLM	3659	{ 4, PrivMode_smoothScroll }, // DECSCLM
3624	{ 5, PrivMode_rVideo }, // DECSCNM	3660	{ 5, PrivMode_rVideo }, // DECSCNM
3625	{ 6, PrivMode_relOrigin }, // DECOM	3661	{ 6, PrivMode_relOrigin }, // DECOM
3626	{ 7, PrivMode_Autowrap }, // DECAWM	3662	{ 7, PrivMode_Autowrap }, // DECAWM
3627	// 8, auto-repeat keys // DECARM	3663	// 8, auto-repeat keys // DECARM
3628	{ 9, PrivMode_MouseX10 },	3664	{ 9, PrivMode_MouseX10 },
3629	// 18 end FF to printer after print screen	3665	// 18 end FF to printer after print screen
3630	// 19 Print screen prints full screen/scroll region	3666	// 19 Print screen prints full screen/scroll region
3631	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3667	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3632	#ifdef scrollBar_esc	3668	#ifdef scrollBar_esc
3633	{ scrollBar_esc, PrivMode_scrollBar },	3669	{ scrollBar_esc, PrivMode_scrollBar },
3634	#endif	3670	#endif
3635	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3671	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3636	// 38, tektronix mode // DECTEK	3672	// 38, tektronix mode // DECTEK
3637	{ 40, PrivMode_132OK },	3673	{ 40, PrivMode_132OK },
3638	// 41 xterm more fixes NYI	3674	// 41 xterm more fixes NYI
3639	// 45 margin bell NYI	3675	// 45 margin bell NYI
3640	// 46 start logging	3676	// 46 start logging
3641	{ 47, PrivMode_Screen },	3677	{ 47, PrivMode_Screen },
3642	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3678	{ 66, PrivMode_aplKP }, // DECNKM
3643	#ifndef NO_BACKSPACE_KEY	3679	#ifndef NO_BACKSPACE_KEY
3644	{ 67, PrivMode_BackSpace }, // DECBKM	3680	{ 67, PrivMode_BackSpace }, // DECBKM
3645	#endif	3681	#endif
3646	{ 1000, PrivMode_MouseX11 },	3682	{ 1000, PrivMode_MouseX11 },
3647	{ 1002, PrivMode_MouseBtnEvent },	3683	{ 1002, PrivMode_MouseBtnEvent },
…		…
3676	for (i = 0; i < nargs; i++)	3712	for (i = 0; i < nargs; i++)
3677	{	3713	{
3678	state = -1;	3714	state = -1;
3679		3715
3680	/* basic handling */	3716	/* basic handling */
3681	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3717	for (j = 0; j < ecb_array_length (argtopriv); j++)
3682	if (argtopriv[j].argval == arg[i])	3718	if (argtopriv[j].argval == arg[i])
3683	{	3719	{
3684	state = privcases (mode, argtopriv[j].bit);	3720	state = privcases (mode, argtopriv[j].bit);
3685	break;	3721	break;
3686	}	3722	}
…		…
3712	case 2: /* VT52 mode */	3748	case 2: /* VT52 mode */
3713	/* oddball mode. should be set regardless of set/reset	3749	/* oddball mode. should be set regardless of set/reset
3714	* parameter. Return from VT52 mode with an ESC < from	3750	* parameter. Return from VT52 mode with an ESC < from
3715	* within VT52 mode	3751	* within VT52 mode
3716	*/	3752	*/
3717	set_privmode (PrivMode_vt52, 1);	3753	priv_modes \|= PrivMode_vt52;
3718	break;	3754	break;
3719	case 3: /* 80/132 */	3755	case 3: /* 80/132 */
3720	if (priv_modes & PrivMode_132OK)	3756	if (priv_modes & PrivMode_132OK)
3721	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3757	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3722	break;	3758	break;
…		…
3737	if (state) /* orthogonal */	3773	if (state) /* orthogonal */
3738	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3774	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3739	break;	3775	break;
3740	#ifdef scrollBar_esc	3776	#ifdef scrollBar_esc
3741	case scrollBar_esc:	3777	case scrollBar_esc:
3742	if (scrollBar.map (state))	3778	scrollBar.map (state);
3743	{
3744	resize_all_windows (0, 0, 0);	3779	resize_all_windows (0, 0, 0);
3745	scr_touch (true);	3780	scr_touch (true);
3746	}
3747	break;	3781	break;
3748	#endif	3782	#endif
3749	case 25: /* visible/invisible cursor */	3783	case 25: /* visible/invisible cursor */
3750	scr_cursor_visible (state);	3784	scr_cursor_visible (state);
3751	break;	3785	break;
…		…
3806	}	3840	}
3807	}	3841	}
3808	/}}} /	3842	/}}} /
3809		3843
3810	/{{{ process sgr sequences /	3844	/{{{ process sgr sequences /
3811	void	3845	void ecb_hot
3812	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3846	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3813	{	3847	{
3814	unsigned int i;	3848	unsigned int i;
3815	short rendset;	3849	short rendset;
3816	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.486 by sf-exg, Fri Apr 29 13:29:45 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.486 by sf-exg, Fri Apr 29 13:29:45 2011 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC