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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 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[2];
263
264	ch[0] = iso14755buf & ISO_14755_MASK;	262	wchar_t ch = iso14755buf & ISO_14755_MASK;
265	ch[1] = 0;
266		263
267	if (iso14755buf & ISO_14755_51)	264	if (iso14755buf & ISO_14755_51)
268	{	265	{
269	char mb[16];	266	char mb[MB_LEN_MAX];
270	int len;	267	int len;
271		268
272	// allow verbatim 0-bytes and control-bytes to be entered	269	// allow verbatim 0-bytes and control-bytes to be entered
273	if (ch[0] >= 0x20)	270	if (ch >= 0x20)
274	len = wcstombs (mb, ch, 16);	271	len = wctomb (mb, ch);
275	else	272	else
276	{	273	{
277	mb[0] = ch[0];	274	mb[0] = ch;
278	len = 1;	275	len = 1;
279	}	276	}
280		277
281	if (len > 0)	278	if (len > 0)
282	tt_write (mb, len);	279	tt_write (mb, len);
…		…
285	}	282	}
286		283
287	iso14755buf = 0;	284	iso14755buf = 0;
288	}	285	}
289		286
290	static int	287	static int ecb_cold
291	hex_keyval (XKeyEvent &ev)	288	hex_keyval (XKeyEvent &ev)
292	{	289	{
293	// check whether this event corresponds to a hex digit	290	// check whether this event corresponds to a hex digit
294	// if the modifiers had not been pressed.	291	// if the modifiers had not been pressed.
295	for (int index = 0; index < 8; index++)	292	for (int index = 0; index < 8; index++)
…		…
304		301
305	return -1;	302	return -1;
306	}	303	}
307	#endif	304	#endif
308		305
309	static inline KeySym	306	static inline KeySym ecb_cold
310	translate_keypad (KeySym keysym, bool kp)	307	translate_keypad (KeySym keysym, bool kp)
311	{	308	{
312	#ifdef XK_KP_Home	309	#ifdef XK_KP_Home
313	static const KeySym keypadtrans[] = {	310	static const KeySym keypadtrans[] = {
314	XK_KP_7, // XK_KP_Home	311	XK_KP_7, // XK_KP_Home
…		…
340	# endif	337	# endif
341	#endif	338	#endif
342	return keysym;	339	return keysym;
343	}	340	}
344		341
345	static inline int	342	static inline int ecb_cold
346	map_function_key (KeySym keysym)	343	map_function_key (KeySym keysym)
347	{	344	{
348	int param = 0;	345	int param = 0;
349		346
350	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
399	break;	396	break;
400	}	397	}
401	return param;	398	return param;
402	}	399	}
403		400
404	void	401	void ecb_cold
405	rxvt_term::key_press (XKeyEvent &ev)	402	rxvt_term::key_press (XKeyEvent &ev)
406	{	403	{
407	int ctrl, meta, shft, len;	404	int ctrl, meta, shft, len;
408	KeySym keysym;	405	KeySym keysym;
409	int valid_keysym;	406	int valid_keysym;
…		…
424	ctrl = ev.state & ControlMask;	421	ctrl = ev.state & ControlMask;
425	meta = ev.state & ModMetaMask;	422	meta = ev.state & ModMetaMask;
426		423
427	kbuf[0] = 0;	424	kbuf[0] = 0;
428		425
429	#ifdef USE_XIM	426	#if USE_XIM
430	if (Input_Context)	427	if (Input_Context)
431	{	428	{
432	Status status_return;	429	Status status_return;
433		430
434	#if 0	431	#if 0
…		…
569	selection_request (ev.time);	566	selection_request (ev.time);
570	return;	567	return;
571	#if TODO	568	#if TODO
572	/* rxvt extras */	569	/* rxvt extras */
573	case XK_KP_Add: /* Shift+KP_Add = bigger font */	570	case XK_KP_Add: /* Shift+KP_Add = bigger font */
574	change_font (FONT_UP);
575	return;	571	return;
576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577	change_font (FONT_DN);
578	return;	573	return;
579	#endif	574	#endif
580	}	575	}
581	}	576	}
582	}	577	}
…		…
781	}	776	}
782		777
783	if (newlen)	778	if (newlen)
784	len = strlen (kbuf);	779	len = strlen (kbuf);
785		780
		781	if (len > 0)
		782	{
786	/*	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	/*
787	* Pass meta for all function keys, if 'meta' option set	796	* Pass meta for all function keys, if 'meta' option set
788	*/	797	*/
789	#ifdef META8_OPTION	798	#ifdef META8_OPTION
790	if (meta && (meta_char == 0x80) && len > 0)	799	if (meta && (meta_char == 0x80))
791	kbuf[len - 1] \|= 0x80;	800	kbuf[len - 1] \|= 0x80;
792	#endif	801	#endif
		802	}
793		803
794	}	804	}
795	else if (ctrl && keysym == XK_minus)	805	else if (ctrl && keysym == XK_minus)
796	{	806	{
797	len = 1;	807	len = 1;
…		…
831	{	841	{
832	view_start = 0;	842	view_start = 0;
833	want_refresh = 1;	843	want_refresh = 1;
834	}	844	}
835		845
836	/*
837	* these modifications only affect the static keybuffer
838	* pass Shift/Control indicators for function keys ending with `~'
839	*
840	* eg,
841	* Prior = "ESC[5~"
842	* Shift+Prior = "ESC[5$"
843	* Ctrl+Prior = "ESC[5^"
844	* Ctrl+Shift+Prior = "ESC[5@"
845	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846	*/
847	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850	/* escape prefix */	846	/* escape prefix */
851	if (meta	847	if (meta
852	#ifdef META8_OPTION	848	#ifdef META8_OPTION
853	&& meta_char == C0_ESC	849	&& meta_char == C0_ESC
854	#endif	850	#endif
…		…
859	}	855	}
860		856
861	tt_write (kbuf, (unsigned int)len);	857	tt_write (kbuf, (unsigned int)len);
862	}	858	}
863		859
864	void	860	void ecb_cold
865	rxvt_term::key_release (XKeyEvent &ev)	861	rxvt_term::key_release (XKeyEvent &ev)
866	{	862	{
867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
868	KeySym keysym;	864	KeySym keysym;
869		865
…		…
991	while (row < end_row);	987	while (row < end_row);
992	}	988	}
993		989
994	scr_refresh ();	990	scr_refresh ();
995	scrollBar.show (1);	991	scrollBar.show (1);
996	#ifdef USE_XIM	992	#if USE_XIM
997	IMSendSpot ();	993	im_send_spot ();
998	#endif	994	#endif
999	}	995	}
1000		996
1001	display->flush ();	997	display->flush ();
1002	}	998	}
…		…
1020	flush ();	1016	flush ();
1021	}	1017	}
1022		1018
1023	#ifdef CURSOR_BLINK	1019	#ifdef CURSOR_BLINK
1024	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
1025	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1036	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1026	{	1037	{
1027	hidden_cursor = !hidden_cursor;	1038	hidden_cursor = !hidden_cursor;
1028	want_refresh = 1;	1039	want_refresh = 1;
1029	refresh_check ();	1040	refresh_check ();
…		…
1047		1058
1048	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1059	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049	void	1060	void
1050	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1061	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051	{	1062	{
1052	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1063	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1053	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1064	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054	{	1065	{
1055	want_refresh = 1;	1066	want_refresh = 1;
1056	refresh_check ();	1067	refresh_check ();
1057	}	1068	}
1058	else	1069	else
…		…
1208	pty_write ();	1219	pty_write ();
1209		1220
1210	refresh_check ();	1221	refresh_check ();
1211	}	1222	}
1212		1223
1213	void	1224	void ecb_cold
1214	rxvt_term::pointer_unblank ()	1225	rxvt_term::pointer_unblank ()
1215	{	1226	{
1216	XDefineCursor (dpy, vt, TermWin_cursor);	1227	XDefineCursor (dpy, vt, TermWin_cursor);
1217	recolour_cursor ();	1228	recolour_cursor ();
1218		1229
…		…
1223	pointer_ev.start (pointerBlankDelay);	1234	pointer_ev.start (pointerBlankDelay);
1224	#endif	1235	#endif
1225	}	1236	}
1226		1237
1227	#ifdef POINTER_BLANK	1238	#ifdef POINTER_BLANK
1228	void	1239	void ecb_cold
1229	rxvt_term::pointer_blank ()	1240	rxvt_term::pointer_blank ()
1230	{	1241	{
1231	if (!option (Opt_pointerBlank))	1242	if (!option (Opt_pointerBlank))
1232	return;	1243	return;
1233		1244
…		…
1235	XFlush (dpy);	1246	XFlush (dpy);
1236		1247
1237	hidden_pointer = 1;	1248	hidden_pointer = 1;
1238	}	1249	}
1239		1250
1240	void	1251	void ecb_cold
1241	rxvt_term::pointer_cb (ev::timer &w, int revents)	1252	rxvt_term::pointer_cb (ev::timer &w, int revents)
1242	{	1253	{
1243	make_current ();	1254	make_current ();
1244		1255
1245	pointer_blank ();	1256	pointer_blank ();
…		…
1337	32 + x,	1348	32 + x,
1338	32 + y);	1349	32 + y);
1339	}	1350	}
1340		1351
1341	/{{{ process an X event /	1352	/{{{ process an X event /
1342	void	1353	void ecb_hot
1343	rxvt_term::x_cb (XEvent &ev)	1354	rxvt_term::x_cb (XEvent &ev)
1344	{	1355	{
1345	make_current ();	1356	make_current ();
1346		1357
1347	dLocal (Display *, dpy);	1358	dLocal (Display *, dpy);
…		…
1450	if (ev.xconfigure.window == parent)	1461	if (ev.xconfigure.window == parent)
1451	{	1462	{
1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453	;	1464	;
1454		1465
		1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1467
1455	#ifdef HAVE_BG_PIXMAP	1468	#ifdef HAVE_BG_PIXMAP
		1469	if (bg_window_position_sensitive ())
		1470	want_position_change = true;
		1471	#endif
		1472
1456	bool moved = false;	1473	bool moved = false;
1457	if (bg_window_position_sensitive ())	1474
		1475	if (want_position_change)
1458	{	1476	{
1459	int x, y;	1477	int x, y;
		1478
1460	if (ev.xconfigure.send_event)	1479	if (ev.xconfigure.send_event)
1461	{	1480	{
1462	x = ev.xconfigure.x;	1481	x = ev.xconfigure.x;
1463	y = ev.xconfigure.y;	1482	y = ev.xconfigure.y;
1464	}	1483	}
1465	else	1484	else
1466	get_window_origin (x, y);	1485	get_window_origin (x, y);
1467		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
1468	if (bg_set_position (x, y)	1494	if (bg_set_position (x, y)
1469	\|\| !(bg_flags & BG_IS_VALID))	1495	\|\| !(bg_flags & BG_IS_VALID))
1470	moved = true;	1496	moved = true;
1471	}	1497	}
1472	#endif
1473		1498
1474	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1475	{	1500	{
1476	seen_resize = 1;	1501	seen_resize = 1;
1477	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1502	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478	}	1503	}
1479	else	1504	else
1480	{	1505	{
1481	#ifdef HAVE_BG_PIXMAP	1506	#ifdef HAVE_BG_PIXMAP
1482	if (moved)	1507	if (moved)
1483	{
1484	if (mapped)
1485	update_background ();	1508	update_background ();
1486	else
1487	bg_invalidate ();
1488	}
1489	#endif	1509	#endif
1490	}	1510	}
1491		1511
1492	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1512	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493	}	1513	}
…		…
1567	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1587	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568	;	1588	;
1569		1589
1570	if (scrollBar.state && ev.xany.window == scrollBar.win)	1590	if (scrollBar.state && ev.xany.window == scrollBar.win)
1571	{	1591	{
1572	scrollBar.state = STATE_IDLE;	1592	scrollBar.state = SB_STATE_IDLE;
1573	scrollBar.show (0);	1593	scrollBar.show (0);
1574	}	1594	}
1575	}	1595	}
1576	break;	1596	break;
1577		1597
…		…
1643	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1644	}	1664	}
1645	else	1665	else
1646	{	1666	{
1647	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1648	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1649	}	1669	}
1650		1670
1651	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1652	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1653	+ 1;	1673	+ 1;
…		…
1665	#ifdef MOUSE_THRESHOLD	1685	#ifdef MOUSE_THRESHOLD
1666	}	1686	}
1667	#endif	1687	#endif
1668	}	1688	}
1669	}	1689	}
1670	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1690	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671	{	1691	{
1672	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1692	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673	MotionNotify, &ev))	1693	MotionNotify, &ev))
1674	;	1694	;
1675		1695
1676	XQueryPointer (dpy, scrollBar.win,	1696	XQueryPointer (dpy, scrollBar.win,
1677	&unused_root, &unused_child,	1697	&unused_root, &unused_child,
1678	&unused_root_x, &unused_root_y,	1698	&unused_root_x, &unused_root_y,
1679	&ev.xbutton.x, &ev.xbutton.y,	1699	&ev.xbutton.x, &ev.xbutton.y,
1680	&unused_mask);	1700	&unused_mask);
1681	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1701	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682	scrollBar.size ());	1702	scrollBar.size ());
1683	want_refresh = 1;	1703	want_refresh = 1;
1684	scrollBar.show (1);	1704	scrollBar.show (1);
1685	}	1705	}
1686	break;	1706	break;
1687	}	1707	}
1688		1708
1689	#if defined(CURSOR_BLINK)	1709	#if defined(CURSOR_BLINK)
1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1710	if (ev.type == KeyPress)
1691	{
1692	if (hidden_cursor)
1693	{
1694	hidden_cursor = 0;
1695	want_refresh = 1;
1696	}
1697
1698	cursor_blink_ev.again ();	1711	cursor_blink_reset ();
1699	}
1700	#endif	1712	#endif
1701		1713
1702	#if defined(POINTER_BLANK)	1714	#if defined(POINTER_BLANK)
1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1715	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704	{	1716	{
…		…
1715		1727
1716	refresh_check ();	1728	refresh_check ();
1717	}	1729	}
1718		1730
1719	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1720	void	1732	void ecb_cold
1721	rxvt_term::set_urgency (bool enable)	1733	rxvt_term::set_urgency (bool enable)
1722	{	1734	{
1723	if (enable == urgency_hint)	1735	if (enable == urgency_hint)
1724	return;	1736	return;
1725		1737
1726	if (XWMHints *h = XGetWMHints (dpy, parent))	1738	if (XWMHints *h = XGetWMHints (dpy, parent))
1727	{	1739	{
1728	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1740	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1729	XSetWMHints (dpy, parent, h);	1741	XSetWMHints (dpy, parent, h);
1730	urgency_hint = enable;	1742	urgency_hint = enable;
		1743	XFree (h);
1731	}	1744	}
1732	}	1745	}
1733	#endif	1746	#endif
1734		1747
1735	void	1748	void ecb_cold
1736	rxvt_term::focus_in ()	1749	rxvt_term::focus_in ()
1737	{	1750	{
1738	if (!focus)	1751	if (!focus)
1739	{	1752	{
1740	focus = 1;	1753	focus = 1;
1741	want_refresh = 1;	1754	want_refresh = 1;
1742		1755
1743	#if USE_XIM	1756	#if USE_XIM
1744	if (Input_Context != NULL)	1757	if (Input_Context != NULL)
1745	{	1758	{
1746	IMSetPosition ();	1759	im_set_position ();
1747	XSetICFocus (Input_Context);	1760	XSetICFocus (Input_Context);
1748	}	1761	}
1749	#endif	1762	#endif
1750	#if CURSOR_BLINK	1763	#if CURSOR_BLINK
1751	if (option (Opt_cursorBlink))	1764	if (option (Opt_cursorBlink))
…		…
1765		1778
1766	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1779	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767	}	1780	}
1768	}	1781	}
1769		1782
1770	void	1783	void ecb_cold
1771	rxvt_term::focus_out ()	1784	rxvt_term::focus_out ()
1772	{	1785	{
1773	if (focus)	1786	if (focus)
1774	{	1787	{
1775	focus = 0;	1788	focus = 0;
…		…
1808		1821
1809	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1822	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810	}	1823	}
1811	}	1824	}
1812		1825
1813	void	1826	void ecb_cold
1814	rxvt_term::update_fade_color (unsigned int idx)	1827	rxvt_term::update_fade_color (unsigned int idx)
1815	{	1828	{
1816	#if OFF_FOCUS_FADING	1829	#if OFF_FOCUS_FADING
1817	if (rs[Rs_fade])	1830	if (rs[Rs_fade])
1818	{	1831	{
…		…
1822	}	1835	}
1823	#endif	1836	#endif
1824	}	1837	}
1825		1838
1826	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1827	void	1840	void ecb_hot
1828	rxvt_term::rootwin_cb (XEvent &ev)	1841	rxvt_term::rootwin_cb (XEvent &ev)
1829	{	1842	{
1830	make_current ();	1843	make_current ();
1831		1844
1832	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
…		…
1982	if (scrollBar.upButton (ev.y))	1995	if (scrollBar.upButton (ev.y))
1983	direction = UP; /* up */	1996	direction = UP; /* up */
1984	else if (scrollBar.dnButton (ev.y))	1997	else if (scrollBar.dnButton (ev.y))
1985	direction = DN; /* down */	1998	direction = DN; /* down */
1986		1999
1987	scrollBar.state = STATE_IDLE;	2000	scrollBar.state = SB_STATE_IDLE;
1988	/*	2001	/*
1989	* Rxvt-style scrollbar:	2002	* Rxvt-style scrollbar:
1990	* move up if mouse is above slider	2003	* move up if mouse is above slider
1991	* move dn if mouse is below slider	2004	* move dn if mouse is below slider
1992	*	2005	*
…		…
2031	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2044	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032	#endif	2045	#endif
2033	if (scr_page (direction, 1))	2046	if (scr_page (direction, 1))
2034	{	2047	{
2035	if (direction == UP)	2048	if (direction == UP)
2036	scrollBar.state = STATE_UP;	2049	scrollBar.state = SB_STATE_UP;
2037	else	2050	else
2038	scrollBar.state = STATE_DOWN;	2051	scrollBar.state = SB_STATE_DOWN;
2039	}	2052	}
2040	}	2053	}
2041	else	2054	else
2042	switch (ev.button)	2055	switch (ev.button)
2043	{	2056	{
2044	case Button2:	2057	case Button2:
2045	switch (scrollBar.align)	2058	switch (scrollBar.align)
2046	{	2059	{
2047	case R_SB_ALIGN_TOP:	2060	case SB_ALIGN_TOP:
2048	csrO = 0;	2061	csrO = 0;
2049	break;	2062	break;
2050	case R_SB_ALIGN_CENTRE:	2063	case SB_ALIGN_CENTRE:
2051	csrO = (scrollBar.bot - scrollBar.top) / 2;	2064	csrO = (scrollBar.bot - scrollBar.top) / 2;
2052	break;	2065	break;
2053	case R_SB_ALIGN_BOTTOM:	2066	case SB_ALIGN_BOTTOM:
2054	csrO = scrollBar.bot - scrollBar.top;	2067	csrO = scrollBar.bot - scrollBar.top;
2055	break;	2068	break;
2056	}	2069	}
2057		2070
2058	if (scrollBar.style == R_SB_XTERM	2071	if (scrollBar.style == SB_STYLE_XTERM
2059	\|\| scrollbar_above_slider (ev.y)	2072	\|\| scrollBar.above_slider (ev.y)
2060	\|\| scrollbar_below_slider (ev.y))	2073	\|\| scrollBar.below_slider (ev.y))
2061	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2074	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062		2075
2063	scrollBar.state = STATE_MOTION;	2076	scrollBar.state = SB_STATE_MOTION;
2064	break;	2077	break;
2065		2078
2066	case Button1:	2079	case Button1:
2067	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2080	if (scrollBar.align == SB_ALIGN_CENTRE)
2068	csrO = ev.y - scrollBar.top;	2081	csrO = ev.y - scrollBar.top;
2069	/* FALLTHROUGH */	2082	/* FALLTHROUGH */
2070		2083
2071	case Button3:	2084	case Button3:
2072	if (scrollBar.style != R_SB_XTERM)	2085	if (scrollBar.style != SB_STYLE_XTERM)
2073	{	2086	{
2074	if (scrollbar_above_slider (ev.y))	2087	if (scrollBar.above_slider (ev.y))
2075	# ifdef RXVT_SCROLL_FULL	2088	# ifdef RXVT_SCROLL_FULL
2076	scr_page (UP, nrow - 1);	2089	scr_page (UP, nrow - 1);
2077	# else	2090	# else
2078	scr_page (UP, nrow / 4);	2091	scr_page (UP, nrow / 4);
2079	# endif	2092	# endif
2080	else if (scrollbar_below_slider (ev.y))	2093	else if (scrollBar.below_slider (ev.y))
2081	# ifdef RXVT_SCROLL_FULL	2094	# ifdef RXVT_SCROLL_FULL
2082	scr_page (DN, nrow - 1);	2095	scr_page (DN, nrow - 1);
2083	# else	2096	# else
2084	scr_page (DN, nrow / 4);	2097	scr_page (DN, nrow / 4);
2085	# endif	2098	# endif
2086	else	2099	else
2087	scrollBar.state = STATE_MOTION;	2100	scrollBar.state = SB_STATE_MOTION;
2088	}	2101	}
2089	else	2102	else
2090	{	2103	{
2091	scr_page ((ev.button == Button1 ? DN : UP),	2104	scr_page ((ev.button == Button1 ? DN : UP),
2092	(nrow	2105	(nrow
2093	* scrollbar_position (ev.y)	2106	* scrollBar.position (ev.y)
2094	/ scrollBar.size ()));	2107	/ scrollBar.size ()));
2095	}	2108	}
2096		2109
2097	break;	2110	break;
2098	}	2111	}
…		…
2109		2122
2110	csrO = 0; /* reset csr Offset */	2123	csrO = 0; /* reset csr Offset */
2111	if (!bypass_keystate)	2124	if (!bypass_keystate)
2112	reportmode = !! (priv_modes & PrivMode_mouse_report);	2125	reportmode = !! (priv_modes & PrivMode_mouse_report);
2113		2126
2114	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2127	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2115	{	2128	{
2116	scrollBar.state = STATE_IDLE;	2129	scrollBar.state = SB_STATE_IDLE;
2117	scrollBar.show (0);	2130	scrollBar.show (0);
2118	}	2131	}
2119		2132
2120	#ifdef SELECTION_SCROLLING	2133	#ifdef SELECTION_SCROLLING
2121	sel_scroll_ev.stop();	2134	sel_scroll_ev.stop();
…		…
2171	case Button3:	2184	case Button3:
2172	selection_make (ev.time);	2185	selection_make (ev.time);
2173	break;	2186	break;
2174		2187
2175	case Button2:	2188	case Button2:
2176	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?
2177	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2190	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178	break;	2191	break;
2179		2192
2180	#ifdef MOUSE_WHEEL	2193	#ifdef MOUSE_WHEEL
2181	case Button4:	2194	case Button4:
…		…
2216	}	2229	}
2217	}	2230	}
2218		2231
2219	/}}} /	2232	/}}} /
2220		2233
2221	void	2234	void ecb_hot
2222	rxvt_term::cmd_parse ()	2235	rxvt_term::cmd_parse ()
2223	{	2236	{
2224	wchar_t ch = NOCHAR;	2237	wchar_t ch = NOCHAR;
2225	char *seq_begin; // remember start of esc-sequence here	2238	char *seq_begin; // remember start of esc-sequence here
2226		2239
2227	for (;;)	2240	for (;;)
2228	{	2241	{
2229	if (expect_false (ch == NOCHAR))	2242	if (ecb_unlikely (ch == NOCHAR))
2230	{	2243	{
2231	seq_begin = cmdbuf_ptr;	2244	seq_begin = cmdbuf_ptr;
2232	ch = next_char ();	2245	ch = next_char ();
2233		2246
2234	if (ch == NOCHAR)	2247	if (ch == NOCHAR)
2235	break;	2248	break;
2236	}	2249	}
2237		2250
2238	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))
2239	{	2252	{
2240	if (expect_false (!seen_input))	2253	if (ecb_unlikely (!seen_input))
2241	{	2254	{
2242	seen_input = 1;	2255	seen_input = 1;
2243	// many badly-written programs (e.g. jed) contain a race condition:	2256	// many badly-written programs (e.g. jed) contain a race condition:
2244	// they first read the screensize and then install a SIGWINCH handler.	2257	// they first read the screensize and then install a SIGWINCH handler.
2245	// some window managers resize the window early, and these programs	2258	// some window managers resize the window early, and these programs
…		…
2258	wchar_t *str = buf;	2271	wchar_t *str = buf;
2259	wchar_t *eol = str + min (ncol, UBUFSIZ);	2272	wchar_t *eol = str + min (ncol, UBUFSIZ);
2260		2273
2261	for (;;)	2274	for (;;)
2262	{	2275	{
2263	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)))
2264	break;	2277	break;
2265		2278
2266	*str++ = ch;	2279	*str++ = ch;
2267		2280
2268	if (expect_false (ch == C0_LF \|\| str >= eol))	2281	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2269	{	2282	{
2270	if (ch == C0_LF)	2283	if (ch == C0_LF)
2271	nlines++;	2284	nlines++;
2272		2285
2273	refresh_count++;	2286	refresh_count++;
…		…
2345	}	2358	}
2346	}	2359	}
2347	}	2360	}
2348		2361
2349	// read the next character	2362	// read the next character
2350	wchar_t	2363	wchar_t ecb_hot
2351	rxvt_term::next_char () NOTHROW	2364	rxvt_term::next_char () NOTHROW
2352	{	2365	{
2353	while (cmdbuf_ptr < cmdbuf_endp)	2366	while (cmdbuf_ptr < cmdbuf_endp)
2354	{	2367	{
2355	// assume 7-bit to be ascii ALWAYS	2368	// assume 7-bit to be ascii ALWAYS
2356	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2369	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2357	return *cmdbuf_ptr++;	2370	return *cmdbuf_ptr++;
2358		2371
2359	wchar_t wc;	2372	wchar_t wc;
2360	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);
2361		2374
…		…
2379		2392
2380	return NOCHAR;	2393	return NOCHAR;
2381	}	2394	}
2382		2395
2383	// read the next octet	2396	// read the next octet
2384	uint32_t	2397	uint32_t ecb_hot
2385	rxvt_term::next_octet () NOTHROW	2398	rxvt_term::next_octet () NOTHROW
2386	{	2399	{
2387	return cmdbuf_ptr < cmdbuf_endp	2400	return cmdbuf_ptr < cmdbuf_endp
2388	? (unsigned char)*cmdbuf_ptr++	2401	? (unsigned char)*cmdbuf_ptr++
2389	: NOCHAR;	2402	: NOCHAR;
2390	}	2403	}
2391		2404
2392	static class out_of_input out_of_input;	2405	static class out_of_input out_of_input;
2393		2406
2394	/* rxvt_cmd_getc () - Return next input character */	2407	wchar_t ecb_hot
2395	/*
2396	* Return the next input character after first passing any keyboard input
2397	* to the command.
2398	*/
2399	wchar_t
2400	rxvt_term::cmd_getc () THROW ((class out_of_input))	2408	rxvt_term::cmd_getc () THROW ((class out_of_input))
2401	{	2409	{
2402	wchar_t c = next_char ();	2410	wchar_t c = next_char ();
2403		2411
2404	if (c == NOCHAR)	2412	if (c == NOCHAR)
2405	throw out_of_input;	2413	throw out_of_input;
2406		2414
2407	return c;	2415	return c;
2408	}	2416	}
2409		2417
2410	uint32_t	2418	uint32_t ecb_hot
2411	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2419	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412	{	2420	{
2413	uint32_t c = next_octet ();	2421	uint32_t c = next_octet ();
2414		2422
2415	if (c == NOCHAR)	2423	if (c == NOCHAR)
…		…
2419	}	2427	}
2420		2428
2421	/{{{ print pipe /	2429	/{{{ print pipe /
2422	/----------------------------------------------------------------------/	2430	/----------------------------------------------------------------------/
2423	#ifdef PRINTPIPE	2431	#ifdef PRINTPIPE
2424	FILE *	2432	FILE * ecb_cold
2425	rxvt_term::popen_printer ()	2433	rxvt_term::popen_printer ()
2426	{	2434	{
2427	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");
2428		2436
2429	if (stream == NULL)	2437	if (stream == NULL)
2430	rxvt_warn ("can't open printer pipe, not printing.\n");	2438	rxvt_warn ("can't open printer pipe, not printing.\n");
2431		2439
2432	return stream;	2440	return stream;
2433	}	2441	}
2434		2442
2435	int	2443	int ecb_cold
2436	rxvt_term::pclose_printer (FILE *stream)	2444	rxvt_term::pclose_printer (FILE *stream)
2437	{	2445	{
2438	fflush (stream);	2446	fflush (stream);
2439	return pclose (stream);	2447	return pclose (stream);
2440	}	2448	}
2441		2449
2442	/*	2450	/*
2443	* simulate attached vt100 printer	2451	* simulate attached vt100 printer
2444	*/	2452	*/
2445	void	2453	void ecb_cold
2446	rxvt_term::process_print_pipe ()	2454	rxvt_term::process_print_pipe ()
2447	{	2455	{
2448	FILE *fd = popen_printer ();	2456	FILE *fd = popen_printer ();
2449		2457
2450	if (!fd)	2458	if (!fd)
…		…
2496	pclose_printer (fd);	2504	pclose_printer (fd);
2497	}	2505	}
2498	#endif /* PRINTPIPE */	2506	#endif /* PRINTPIPE */
2499	/}}} /	2507	/}}} /
2500		2508
2501	/* INDENT-OFF */
2502	enum {	2509	enum {
2503	C1_40 = 0x40,	2510	C1_40 = 0x40,
2504	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2511	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2512	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506	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,
2507	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,
2508	};	2515	};
2509	/* INDENT-ON */
2510		2516
2511	/{{{ process non-printing single characters /	2517	/{{{ process non-printing single characters /
2512	void	2518	void ecb_hot
2513	rxvt_term::process_nonprinting (unicode_t ch)	2519	rxvt_term::process_nonprinting (unicode_t ch)
2514	{	2520	{
2515	switch (ch)	2521	switch (ch)
2516	{	2522	{
2517	case C0_ESC:	2523	case C0_ESC:
…		…
2563	}	2569	}
2564	/}}} /	2570	/}}} /
2565		2571
2566		2572
2567	/{{{ process VT52 escape sequences /	2573	/{{{ process VT52 escape sequences /
2568	void	2574	void ecb_cold
2569	rxvt_term::process_escape_vt52 (unicode_t ch)	2575	rxvt_term::process_escape_vt52 (unicode_t ch)
2570	{	2576	{
2571	int row, col;	2577	int row, col;
2572		2578
2573	switch (ch)	2579	switch (ch)
…		…
2607	break;	2613	break;
2608	case 'Z': /* identify the terminal type */	2614	case 'Z': /* identify the terminal type */
2609	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2615	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610	break;	2616	break;
2611	case '<': /* turn off VT52 mode */	2617	case '<': /* turn off VT52 mode */
2612	set_privmode (PrivMode_vt52, 0);	2618	priv_modes &= ~PrivMode_vt52;
2613	break;	2619	break;
2614	case 'F': /* use special graphics character set */	2620	case 'F': /* use special graphics character set */
2615	case 'G': /* use regular character set */	2621	case 'G': /* use regular character set */
2616	/* unimplemented */	2622	/* unimplemented */
2617	break;	2623	break;
…		…
2623	}	2629	}
2624	/}}} /	2630	/}}} /
2625		2631
2626		2632
2627	/{{{ process escape sequences /	2633	/{{{ process escape sequences /
2628	void	2634	void ecb_hot
2629	rxvt_term::process_escape_seq ()	2635	rxvt_term::process_escape_seq ()
2630	{	2636	{
2631	unicode_t ch = cmd_getc ();	2637	unicode_t ch = cmd_getc ();
2632		2638
2633	if (priv_modes & PrivMode_vt52)	2639	if (priv_modes & PrivMode_vt52)
…		…
2636	return;	2642	return;
2637	}	2643	}
2638		2644
2639	switch (ch)	2645	switch (ch)
2640	{	2646	{
2641	/* case 1: do_tek_mode (); break; */
2642	case '#':	2647	case '#':
2643	if (cmd_getc () == '8')	2648	if (cmd_getc () == '8')
2644	scr_E ();	2649	scr_E ();
2645	break;	2650	break;
2646	case '(':	2651	case '(':
…		…
2669	#if !ENABLE_MINIMAL	2674	#if !ENABLE_MINIMAL
2670	case '9':	2675	case '9':
2671	scr_forwardindex ();	2676	scr_forwardindex ();
2672	break;	2677	break;
2673	#endif	2678	#endif
		2679	// DECPAM/DECPNM
2674	case '=':	2680	case '=':
		2681	priv_modes \|= PrivMode_aplKP;
		2682	break;
2675	case '>':	2683	case '>':
2676	set_privmode (PrivMode_aplKP, ch == '=');	2684	priv_modes &= ~PrivMode_aplKP;
2677	break;	2685	break;
2678		2686
2679	case C1_40:	2687	case C1_40:
2680	cmd_getc ();	2688	cmd_getc ();
2681	break;	2689	break;
…		…
2685		2693
2686	/* 8.3.87: NEXT LINE */	2694	/* 8.3.87: NEXT LINE */
2687	case C1_NEL: /* ESC E */	2695	case C1_NEL: /* ESC E */
2688	{	2696	{
2689	wchar_t nlcr[] = { C0_LF, C0_CR };	2697	wchar_t nlcr[] = { C0_LF, C0_CR };
2690	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2698	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691	}	2699	}
2692	break;	2700	break;
2693		2701
2694	/* kidnapped escape sequence: Should be 8.3.48 */	2702	/* kidnapped escape sequence: Should be 8.3.48 */
2695	case C1_ESA: /* ESC G */	2703	case C1_ESA: /* ESC G */
…		…
2707	case C1_RI: /* ESC M */	2715	case C1_RI: /* ESC M */
2708	scr_index (DN);	2716	scr_index (DN);
2709	break;	2717	break;
2710		2718
2711	/* 8.3.142: SINGLE-SHIFT TWO */	2719	/* 8.3.142: SINGLE-SHIFT TWO */
2712	/case C1_SS2: scr_single_shift (2); break; /	2720	/* case C1_SS2: break; */
2713		2721
2714	/* 8.3.143: SINGLE-SHIFT THREE */	2722	/* 8.3.143: SINGLE-SHIFT THREE */
2715	/case C1_SS3: scr_single_shift (3); break; /	2723	/* case C1_SS3: break; */
2716		2724
2717	/* 8.3.27: DEVICE CONTROL STRING */	2725	/* 8.3.27: DEVICE CONTROL STRING */
2718	case C1_DCS: /* ESC P */	2726	case C1_DCS: /* ESC P */
2719	process_dcs_seq ();	2727	process_dcs_seq ();
2720	break;	2728	break;
…		…
2753	}	2761	}
2754	}	2762	}
2755	/}}} /	2763	/}}} /
2756		2764
2757	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2765	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2758	/* INDENT-OFF */
2759	enum {	2766	enum {
2760	CSI_ICH = 0x40,	2767	CSI_ICH = 0x40,
2761	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2768	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2762	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2769	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2763	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2770	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2783	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2790	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2784	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, */
2785	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, */
2786	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, {, \|, }, ~, */
2787	};	2794	};
2788	/* INDENT-ON */
2789		2795
2790	void	2796	void ecb_hot
2791	rxvt_term::process_csi_seq ()	2797	rxvt_term::process_csi_seq ()
2792	{	2798	{
2793	unicode_t ch, priv, i;	2799	unicode_t ch, priv, i;
2794	unsigned int nargs, p;	2800	unsigned int nargs, p;
2795	int n, ndef;	2801	int n, ndef;
…		…
2873	scr_soft_reset ();	2879	scr_soft_reset ();
2874		2880
2875	static const int pm_h[] = { 7, 25 };	2881	static const int pm_h[] = { 7, 25 };
2876	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 };
2877		2883
2878	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2884	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2879	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2885	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2880	}	2886	}
2881	break;	2887	break;
2882	}	2888	}
2883		2889
2884	return;	2890	return;
…		…
2902	}	2908	}
2903	break;	2909	break;
2904	#endif	2910	#endif
2905		2911
2906	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2912	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2907	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2913	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2908	arg[0] = -arg[0];	2914	arg[0] = -arg[0];
2909	/* FALLTHROUGH */	2915	/* FALLTHROUGH */
2910	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2916	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2911	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2917	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2912	scr_gotorc (arg[0], 0, RELATIVE);	2918	scr_gotorc (arg[0], 0, RELATIVE);
2913	break;	2919	break;
2914		2920
2915	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2921	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2916	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2922	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3103	}	3109	}
3104	}	3110	}
3105	/}}} /	3111	/}}} /
3106		3112
3107	#if !ENABLE_MINIMAL	3113	#if !ENABLE_MINIMAL
3108	/* ARGSUSED */
3109	void	3114	void
3110	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3115	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111	{	3116	{
3112	int x, y;	3117	int x, y;
3113	XWindowAttributes wattr;	3118	XWindowAttributes wattr;
…		…
3150	break;	3155	break;
3151		3156
3152	//case 9: NYI, TODO, restore maximized window or maximize window	3157	//case 9: NYI, TODO, restore maximized window or maximize window
3153	default:	3158	default:
3154	if (args[0] >= 24) /* set height (chars) */	3159	if (args[0] >= 24) /* set height (chars) */
3155	set_widthheight ((unsigned int)width,	3160	set_widthheight ((unsigned int)vt_width,
3156	(unsigned int) (args[1] * fheight));	3161	(unsigned int) (args[1] * fheight));
3157	break;	3162	break;
3158		3163
3159	/*	3164	/*
3160	* reports - some output format copied from XTerm	3165	* reports - some output format copied from XTerm
…		…
3446	process_color_seq (op, Color_tint, str, resp);	3451	process_color_seq (op, Color_tint, str, resp);
3447	{	3452	{
3448	bool changed = false;	3453	bool changed = false;
3449		3454
3450	if (ISSET_PIXCOLOR (Color_tint))	3455	if (ISSET_PIXCOLOR (Color_tint))
3451	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3456	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3452		3457
3453	if (changed)	3458	if (changed)
3454	update_background ();	3459	update_background ();
3455	}	3460	}
3456		3461
…		…
3460	#if BG_IMAGE_FROM_FILE	3465	#if BG_IMAGE_FROM_FILE
3461	case Rxvt_Pixmap:	3466	case Rxvt_Pixmap:
3462	if (!strcmp (str, "?"))	3467	if (!strcmp (str, "?"))
3463	{	3468	{
3464	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	}
3465		3479
3466	sprintf (str, "[%dx%d+%d+%d]",	3480	sprintf (str, "[%dx%d+%d+%d]",
3467	min (h_scale, 32767), min (v_scale, 32767),	3481	h_scale, v_scale,
3468	min (h_align, 32767), min (v_align, 32767));	3482	h_align, v_align);
3469	process_xterm_seq (XTerm_title, str, CHAR_ST);	3483	process_xterm_seq (XTerm_title, str, CHAR_ST);
3470	}	3484	}
3471	else	3485	else
3472	{	3486	{
3473	int changed = 0;	3487	bool changed = false;
3474		3488
3475	if (*str != ';')	3489	if (*str != ';')
3476	{	3490	{
3477	if (bg_set_file (str)) /* change pixmap */	3491	if (image_vec.size () > 0)
		3492	changed = image_vec[0].set_file_geometry (str);
		3493	else
3478	{	3494	{
3479	changed++;	3495	rxvt_image *image = new_image ();
3480	str = strchr (str, ';');	3496	if (!image->set_file_geometry (str))
3481	if (str == NULL)	3497	image_vec.pop_back ();
3482	bg_set_default_geometry ();
3483	else	3498	else
3484	bg_set_geometry (str+1);	3499	changed = true;
3485	}	3500	}
3486	}	3501	}
3487	else	3502	else
3488	{	3503	{
3489	str++;	3504	str++;
		3505	if (image_vec.size () > 0)
3490	if (bg_set_geometry (str, true))	3506	changed = image_vec[0].set_geometry (str, true);
3491	changed++;
3492	}	3507	}
3493		3508
3494	if (changed)	3509	if (changed)
3495	{	3510	{
3496	if (bg_window_position_sensitive ())	3511	if (bg_window_position_sensitive ())
…		…
3595	* 's' = save	3610	* 's' = save
3596	* 'r' = restore	3611	* 'r' = restore
3597	* 't' = toggle	3612	* 't' = toggle
3598	* so no need for fancy checking	3613	* so no need for fancy checking
3599	*/	3614	*/
3600	int	3615	int ecb_cold
3601	rxvt_term::privcases (int mode, unsigned long bit)	3616	rxvt_term::privcases (int mode, unsigned long bit)
3602	{	3617	{
3603	int state;	3618	int state;
3604		3619
3605	if (mode == 's')	3620	if (mode == 's')
3606	{	3621	{
3607	SavedModes \|= (priv_modes & bit);	3622	if (priv_modes & bit)
		3623	SavedModes \|= bit;
		3624	else
		3625	SavedModes &= ~bit;
3608	return -1;	3626	return -1;
3609	}	3627	}
3610	else	3628	else
3611	{	3629	{
3612	if (mode == 'r')	3630	if (mode == 'r')
3613	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3631	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3614	else	3632	else
3615	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3633	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616		3634
3617	set_privmode (bit, state);	3635	if (state)
		3636	priv_modes \|= bit;
		3637	else
		3638	priv_modes &= ~bit;
3618	}	3639	}
3619		3640
3620	return state;	3641	return state;
3621	}	3642	}
3622		3643
3623	/* we're not using priv _yet_ */	3644	/* we're not using priv _yet_ */
3624	void	3645	void
3625	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)
3626	{	3647	{
3627	unsigned int i, j;	3648	unsigned int i, j;
3628	int state;	3649	int state;
3629		3650
3630	static const struct	3651	static const struct
3631	{	3652	{
3632	const int argval;	3653	const int argval;
3633	const unsigned long bit;	3654	const unsigned long bit;
3634	} argtopriv[] = {	3655	} argtopriv[] = {
3635	{ 1, PrivMode_aplCUR }, // DECCKM	3656	{ 1, PrivMode_aplCUR }, // DECCKM
3636	{ 2, PrivMode_vt52 },	3657	{ 2, PrivMode_vt52 }, // DECANM
3637	{ 3, PrivMode_132 }, // DECCOLM	3658	{ 3, PrivMode_132 }, // DECCOLM
3638	{ 4, PrivMode_smoothScroll }, // DECSCLM	3659	{ 4, PrivMode_smoothScroll }, // DECSCLM
3639	{ 5, PrivMode_rVideo }, // DECSCNM	3660	{ 5, PrivMode_rVideo }, // DECSCNM
3640	{ 6, PrivMode_relOrigin }, // DECOM	3661	{ 6, PrivMode_relOrigin }, // DECOM
3641	{ 7, PrivMode_Autowrap }, // DECAWM	3662	{ 7, PrivMode_Autowrap }, // DECAWM
3642	// 8, auto-repeat keys // DECARM	3663	// 8, auto-repeat keys // DECARM
3643	{ 9, PrivMode_MouseX10 },	3664	{ 9, PrivMode_MouseX10 },
3644	// 18 end FF to printer after print screen	3665	// 18 end FF to printer after print screen
3645	// 19 Print screen prints full screen/scroll region	3666	// 19 Print screen prints full screen/scroll region
3646	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3667	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3647	#ifdef scrollBar_esc	3668	#ifdef scrollBar_esc
3648	{ scrollBar_esc, PrivMode_scrollBar },	3669	{ scrollBar_esc, PrivMode_scrollBar },
3649	#endif	3670	#endif
3650	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3671	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3651	// 38, tektronix mode // DECTEK	3672	// 38, tektronix mode // DECTEK
3652	{ 40, PrivMode_132OK },	3673	{ 40, PrivMode_132OK },
3653	// 41 xterm more fixes NYI	3674	// 41 xterm more fixes NYI
3654	// 45 margin bell NYI	3675	// 45 margin bell NYI
3655	// 46 start logging	3676	// 46 start logging
3656	{ 47, PrivMode_Screen },	3677	{ 47, PrivMode_Screen },
3657	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3678	{ 66, PrivMode_aplKP }, // DECNKM
3658	#ifndef NO_BACKSPACE_KEY	3679	#ifndef NO_BACKSPACE_KEY
3659	{ 67, PrivMode_BackSpace }, // DECBKM	3680	{ 67, PrivMode_BackSpace }, // DECBKM
3660	#endif	3681	#endif
3661	{ 1000, PrivMode_MouseX11 },	3682	{ 1000, PrivMode_MouseX11 },
3662	{ 1002, PrivMode_MouseBtnEvent },	3683	{ 1002, PrivMode_MouseBtnEvent },
…		…
3691	for (i = 0; i < nargs; i++)	3712	for (i = 0; i < nargs; i++)
3692	{	3713	{
3693	state = -1;	3714	state = -1;
3694		3715
3695	/* basic handling */	3716	/* basic handling */
3696	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3717	for (j = 0; j < ecb_array_length (argtopriv); j++)
3697	if (argtopriv[j].argval == arg[i])	3718	if (argtopriv[j].argval == arg[i])
3698	{	3719	{
3699	state = privcases (mode, argtopriv[j].bit);	3720	state = privcases (mode, argtopriv[j].bit);
3700	break;	3721	break;
3701	}	3722	}
…		…
3727	case 2: /* VT52 mode */	3748	case 2: /* VT52 mode */
3728	/* oddball mode. should be set regardless of set/reset	3749	/* oddball mode. should be set regardless of set/reset
3729	* parameter. Return from VT52 mode with an ESC < from	3750	* parameter. Return from VT52 mode with an ESC < from
3730	* within VT52 mode	3751	* within VT52 mode
3731	*/	3752	*/
3732	set_privmode (PrivMode_vt52, 1);	3753	priv_modes \|= PrivMode_vt52;
3733	break;	3754	break;
3734	case 3: /* 80/132 */	3755	case 3: /* 80/132 */
3735	if (priv_modes & PrivMode_132OK)	3756	if (priv_modes & PrivMode_132OK)
3736	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3757	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3737	break;	3758	break;
…		…
3752	if (state) /* orthogonal */	3773	if (state) /* orthogonal */
3753	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3774	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3754	break;	3775	break;
3755	#ifdef scrollBar_esc	3776	#ifdef scrollBar_esc
3756	case scrollBar_esc:	3777	case scrollBar_esc:
3757	if (scrollBar.map (state))	3778	scrollBar.map (state);
3758	{
3759	resize_all_windows (0, 0, 0);	3779	resize_all_windows (0, 0, 0);
3760	scr_touch (true);	3780	scr_touch (true);
3761	}
3762	break;	3781	break;
3763	#endif	3782	#endif
3764	case 25: /* visible/invisible cursor */	3783	case 25: /* visible/invisible cursor */
3765	scr_cursor_visible (state);	3784	scr_cursor_visible (state);
3766	break;	3785	break;
…		…
3821	}	3840	}
3822	}	3841	}
3823	/}}} /	3842	/}}} /
3824		3843
3825	/{{{ process sgr sequences /	3844	/{{{ process sgr sequences /
3826	void	3845	void ecb_hot
3827	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3846	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3828	{	3847	{
3829	unsigned int i;	3848	unsigned int i;
3830	short rendset;	3849	short rendset;
3831	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.482 by sf-exg, Thu Apr 7 12:19:40 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.482 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC