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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.480 by sf-exg, Mon Mar 7 11:48:55 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
…		…
936	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)	932	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
937	mouse_slip_wheel_speed = 0;	933	mouse_slip_wheel_speed = 0;
938	#endif	934	#endif
939	}	935	}
940		936
941	#if defined (KEYSYM_RESOURCE)
942	unsigned int
943	rxvt_term::cmd_write (const char *str, unsigned int count)
944	{
945	unsigned int n, s;
946
947	n = cmdbuf_ptr - cmdbuf_base;
948	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950	if (n > 0 && s < count)
951	{
952	memmove (cmdbuf_base, cmdbuf_ptr,
953	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954	cmdbuf_ptr = cmdbuf_base;
955	cmdbuf_endp -= n;
956	s += n;
957	}
958
959	if (count > s)
960	{
961	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962	count = s;
963	}
964
965	for (; count--;)
966	cmdbuf_endp++ = str++;
967
968	cmd_parse ();
969
970	return 0;
971	}
972	#endif
973
974	void	937	void
975	rxvt_term::flush ()	938	rxvt_term::flush ()
976	{	939	{
977	flush_ev.stop ();	940	flush_ev.stop ();
978		941
…		…
1024	while (row < end_row);	987	while (row < end_row);
1025	}	988	}
1026		989
1027	scr_refresh ();	990	scr_refresh ();
1028	scrollBar.show (1);	991	scrollBar.show (1);
1029	#ifdef USE_XIM	992	#if USE_XIM
1030	IMSendSpot ();	993	im_send_spot ();
1031	#endif	994	#endif
1032	}	995	}
1033		996
1034	display->flush ();	997	display->flush ();
1035	}	998	}
…		…
1053	flush ();	1016	flush ();
1054	}	1017	}
1055		1018
1056	#ifdef CURSOR_BLINK	1019	#ifdef CURSOR_BLINK
1057	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
1058	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1036	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059	{	1037	{
1060	hidden_cursor = !hidden_cursor;	1038	hidden_cursor = !hidden_cursor;
1061	want_refresh = 1;	1039	want_refresh = 1;
1062	refresh_check ();	1040	refresh_check ();
…		…
1080		1058
1081	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1059	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082	void	1060	void
1083	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1061	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084	{	1062	{
1085	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1063	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1086	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1064	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087	{	1065	{
1088	want_refresh = 1;	1066	want_refresh = 1;
1089	refresh_check ();	1067	refresh_check ();
1090	}	1068	}
1091	else	1069	else
…		…
1152	{	1130	{
1153	}	1131	}
1154	} event_handler;	1132	} event_handler;
1155	#endif	1133	#endif
1156		1134
		1135	/* make sure all the cmd data is at beginning of cmdbuf */
		1136	void
		1137	rxvt_term::cmdbuf_reify ()
		1138	{
		1139	if (cmdbuf_ptr == cmdbuf_base)
		1140	return;
		1141
		1142	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1143
		1144	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1145	cmdbuf_ptr = cmdbuf_base;
		1146	cmdbuf_endp = cmdbuf_ptr + used;
		1147
		1148	}
		1149
		1150	#if defined (KEYSYM_RESOURCE)
		1151	void
		1152	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1153	{
		1154	cmdbuf_reify ();
		1155
		1156	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1157
		1158	if (count > avail)
		1159	return;
		1160
		1161	memcpy (cmdbuf_endp, str, count);
		1162	cmdbuf_endp += count;
		1163
		1164	cmd_parse ();
		1165	}
		1166	#endif
		1167
1157	bool	1168	bool
1158	rxvt_term::pty_fill ()	1169	rxvt_term::pty_fill ()
1159	{	1170	{
1160	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1171	cmdbuf_reify ();
1161		1172
1162	if (CBUFSIZ == n)	1173	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1174
		1175	if (!avail)
		1176	{
1163	n = 0; // normally this indicates a "too long" command sequence - just drop the data we have	1177	// normally this indicates a "too long" command sequence - just drop the data we have
1164
1165	memmove (cmdbuf_base, cmdbuf_ptr, n);
1166	cmdbuf_ptr = cmdbuf_base;	1178	cmdbuf_ptr = cmdbuf_base;
1167	cmdbuf_endp = cmdbuf_ptr + n;	1179	cmdbuf_endp = cmdbuf_ptr;
		1180	avail = CBUFSIZ;
		1181	}
1168		1182
1169	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1183	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170		1184
1171	if (r > 0)	1185	if (r > 0)
1172	{	1186	{
1173	cmdbuf_endp += r;	1187	cmdbuf_endp += r;
1174	return true;	1188	return true;
…		…
1205	pty_write ();	1219	pty_write ();
1206		1220
1207	refresh_check ();	1221	refresh_check ();
1208	}	1222	}
1209		1223
1210	void	1224	void ecb_cold
1211	rxvt_term::pointer_unblank ()	1225	rxvt_term::pointer_unblank ()
1212	{	1226	{
1213	XDefineCursor (dpy, vt, TermWin_cursor);	1227	XDefineCursor (dpy, vt, TermWin_cursor);
1214	recolour_cursor ();	1228	recolour_cursor ();
1215		1229
…		…
1220	pointer_ev.start (pointerBlankDelay);	1234	pointer_ev.start (pointerBlankDelay);
1221	#endif	1235	#endif
1222	}	1236	}
1223		1237
1224	#ifdef POINTER_BLANK	1238	#ifdef POINTER_BLANK
1225	void	1239	void ecb_cold
1226	rxvt_term::pointer_blank ()	1240	rxvt_term::pointer_blank ()
1227	{	1241	{
1228	if (!option (Opt_pointerBlank))	1242	if (!option (Opt_pointerBlank))
1229	return;	1243	return;
1230		1244
…		…
1232	XFlush (dpy);	1246	XFlush (dpy);
1233		1247
1234	hidden_pointer = 1;	1248	hidden_pointer = 1;
1235	}	1249	}
1236		1250
1237	void	1251	void ecb_cold
1238	rxvt_term::pointer_cb (ev::timer &w, int revents)	1252	rxvt_term::pointer_cb (ev::timer &w, int revents)
1239	{	1253	{
1240	make_current ();	1254	make_current ();
1241		1255
1242	pointer_blank ();	1256	pointer_blank ();
…		…
1334	32 + x,	1348	32 + x,
1335	32 + y);	1349	32 + y);
1336	}	1350	}
1337		1351
1338	/{{{ process an X event /	1352	/{{{ process an X event /
1339	void	1353	void ecb_hot
1340	rxvt_term::x_cb (XEvent &ev)	1354	rxvt_term::x_cb (XEvent &ev)
1341	{	1355	{
1342	make_current ();	1356	make_current ();
1343		1357
1344	dLocal (Display *, dpy);	1358	dLocal (Display *, dpy);
…		…
1442	&& ev.xfocus.mode != NotifyGrab)	1456	&& ev.xfocus.mode != NotifyGrab)
1443	focus_out ();	1457	focus_out ();
1444	break;	1458	break;
1445		1459
1446	case ConfigureNotify:	1460	case ConfigureNotify:
1447	if (ev.xconfigure.window == parent[0])	1461	if (ev.xconfigure.window == parent)
1448	{	1462	{
1449	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450	;	1464	;
1451		1465
		1466	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1467
1452	#ifdef HAVE_BG_PIXMAP	1468	#ifdef HAVE_BG_PIXMAP
		1469	if (bg_window_position_sensitive ())
		1470	want_position_change = true;
		1471	#endif
		1472
1453	bool moved = false;	1473	bool moved = false;
1454	if (bg_window_position_sensitive ())	1474
		1475	if (want_position_change)
1455	{	1476	{
1456	int x, y;	1477	int x, y;
		1478
1457	if (ev.xconfigure.send_event)	1479	if (ev.xconfigure.send_event)
1458	{	1480	{
1459	x = ev.xconfigure.x;	1481	x = ev.xconfigure.x;
1460	y = ev.xconfigure.y;	1482	y = ev.xconfigure.y;
1461	}	1483	}
1462	else	1484	else
1463	get_window_origin (x, y);	1485	get_window_origin (x, y);
1464		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
1465	if (bg_set_position (x, y)	1494	if (bg_set_position (x, y)
1466	\|\| !(bg_flags & BG_IS_VALID))	1495	\|\| !(bg_flags & BG_IS_VALID))
1467	moved = true;	1496	moved = true;
1468	}	1497	}
1469	#endif
1470		1498
1471	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1499	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1472	{	1500	{
1473	seen_resize = 1;	1501	seen_resize = 1;
1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1502	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475	}	1503	}
1476	else	1504	else
1477	{	1505	{
1478	#ifdef HAVE_BG_PIXMAP	1506	#ifdef HAVE_BG_PIXMAP
1479	if (moved)	1507	if (moved)
1480	{
1481	if (mapped)
1482	update_background ();	1508	update_background ();
1483	else
1484	bg_invalidate ();
1485	}
1486	#endif	1509	#endif
1487	}	1510	}
1488		1511
1489	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1512	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1490	}	1513	}
…		…
1564	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1587	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565	;	1588	;
1566		1589
1567	if (scrollBar.state && ev.xany.window == scrollBar.win)	1590	if (scrollBar.state && ev.xany.window == scrollBar.win)
1568	{	1591	{
1569	scrollBar.state = STATE_IDLE;	1592	scrollBar.state = SB_STATE_IDLE;
1570	scrollBar.show (0);	1593	scrollBar.show (0);
1571	}	1594	}
1572	}	1595	}
1573	break;	1596	break;
1574		1597
…		…
1640	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1641	}	1664	}
1642	else	1665	else
1643	{	1666	{
1644	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1645	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1646	}	1669	}
1647		1670
1648	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1649	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1650	+ 1;	1673	+ 1;
…		…
1662	#ifdef MOUSE_THRESHOLD	1685	#ifdef MOUSE_THRESHOLD
1663	}	1686	}
1664	#endif	1687	#endif
1665	}	1688	}
1666	}	1689	}
1667	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1690	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1668	{	1691	{
1669	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1692	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670	MotionNotify, &ev))	1693	MotionNotify, &ev))
1671	;	1694	;
1672		1695
1673	XQueryPointer (dpy, scrollBar.win,	1696	XQueryPointer (dpy, scrollBar.win,
1674	&unused_root, &unused_child,	1697	&unused_root, &unused_child,
1675	&unused_root_x, &unused_root_y,	1698	&unused_root_x, &unused_root_y,
1676	&ev.xbutton.x, &ev.xbutton.y,	1699	&ev.xbutton.x, &ev.xbutton.y,
1677	&unused_mask);	1700	&unused_mask);
1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1701	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679	scrollBar.size ());	1702	scrollBar.size ());
1680	want_refresh = 1;	1703	want_refresh = 1;
1681	scrollBar.show (1);	1704	scrollBar.show (1);
1682	}	1705	}
1683	break;	1706	break;
1684	}	1707	}
1685		1708
1686	#if defined(CURSOR_BLINK)	1709	#if defined(CURSOR_BLINK)
1687	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1710	if (ev.type == KeyPress)
1688	{
1689	if (hidden_cursor)
1690	{
1691	hidden_cursor = 0;
1692	want_refresh = 1;
1693	}
1694
1695	cursor_blink_ev.again ();	1711	cursor_blink_reset ();
1696	}
1697	#endif	1712	#endif
1698		1713
1699	#if defined(POINTER_BLANK)	1714	#if defined(POINTER_BLANK)
1700	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1715	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701	{	1716	{
…		…
1712		1727
1713	refresh_check ();	1728	refresh_check ();
1714	}	1729	}
1715		1730
1716	#if ENABLE_FRILLS	1731	#if ENABLE_FRILLS
1717	void	1732	void ecb_cold
1718	rxvt_term::set_urgency (bool enable)	1733	rxvt_term::set_urgency (bool enable)
1719	{	1734	{
1720	if (enable == urgency_hint)	1735	if (enable == urgency_hint)
1721	return;	1736	return;
1722		1737
1723	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1738	if (XWMHints *h = XGetWMHints (dpy, parent))
1724	{	1739	{
1725	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1740	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1726	XSetWMHints (dpy, parent[0], h);	1741	XSetWMHints (dpy, parent, h);
1727	urgency_hint = enable;	1742	urgency_hint = enable;
		1743	XFree (h);
1728	}	1744	}
1729	}	1745	}
1730	#endif	1746	#endif
1731		1747
1732	void	1748	void ecb_cold
1733	rxvt_term::focus_in ()	1749	rxvt_term::focus_in ()
1734	{	1750	{
1735	if (!focus)	1751	if (!focus)
1736	{	1752	{
1737	focus = 1;	1753	focus = 1;
1738	want_refresh = 1;	1754	want_refresh = 1;
1739		1755
1740	#if USE_XIM	1756	#if USE_XIM
1741	if (Input_Context != NULL)	1757	if (Input_Context != NULL)
1742	{	1758	{
1743	IMSetPosition ();	1759	im_set_position ();
1744	XSetICFocus (Input_Context);	1760	XSetICFocus (Input_Context);
1745	}	1761	}
1746	#endif	1762	#endif
1747	#if CURSOR_BLINK	1763	#if CURSOR_BLINK
1748	if (option (Opt_cursorBlink))	1764	if (option (Opt_cursorBlink))
…		…
1762		1778
1763	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1779	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1764	}	1780	}
1765	}	1781	}
1766		1782
1767	void	1783	void ecb_cold
1768	rxvt_term::focus_out ()	1784	rxvt_term::focus_out ()
1769	{	1785	{
1770	if (focus)	1786	if (focus)
1771	{	1787	{
1772	focus = 0;	1788	focus = 0;
…		…
1805		1821
1806	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1822	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1807	}	1823	}
1808	}	1824	}
1809		1825
1810	void	1826	void ecb_cold
1811	rxvt_term::update_fade_color (unsigned int idx)	1827	rxvt_term::update_fade_color (unsigned int idx)
1812	{	1828	{
1813	#if OFF_FOCUS_FADING	1829	#if OFF_FOCUS_FADING
1814	if (rs[Rs_fade])	1830	if (rs[Rs_fade])
1815	{	1831	{
…		…
1819	}	1835	}
1820	#endif	1836	#endif
1821	}	1837	}
1822		1838
1823	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1839	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1824	void	1840	void ecb_hot
1825	rxvt_term::rootwin_cb (XEvent &ev)	1841	rxvt_term::rootwin_cb (XEvent &ev)
1826	{	1842	{
1827	make_current ();	1843	make_current ();
1828		1844
1829	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1845	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
…		…
1979	if (scrollBar.upButton (ev.y))	1995	if (scrollBar.upButton (ev.y))
1980	direction = UP; /* up */	1996	direction = UP; /* up */
1981	else if (scrollBar.dnButton (ev.y))	1997	else if (scrollBar.dnButton (ev.y))
1982	direction = DN; /* down */	1998	direction = DN; /* down */
1983		1999
1984	scrollBar.state = STATE_IDLE;	2000	scrollBar.state = SB_STATE_IDLE;
1985	/*	2001	/*
1986	* Rxvt-style scrollbar:	2002	* Rxvt-style scrollbar:
1987	* move up if mouse is above slider	2003	* move up if mouse is above slider
1988	* move dn if mouse is below slider	2004	* move dn if mouse is below slider
1989	*	2005	*
…		…
2028	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2044	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029	#endif	2045	#endif
2030	if (scr_page (direction, 1))	2046	if (scr_page (direction, 1))
2031	{	2047	{
2032	if (direction == UP)	2048	if (direction == UP)
2033	scrollBar.state = STATE_UP;	2049	scrollBar.state = SB_STATE_UP;
2034	else	2050	else
2035	scrollBar.state = STATE_DOWN;	2051	scrollBar.state = SB_STATE_DOWN;
2036	}	2052	}
2037	}	2053	}
2038	else	2054	else
2039	switch (ev.button)	2055	switch (ev.button)
2040	{	2056	{
2041	case Button2:	2057	case Button2:
2042	switch (scrollBar.align)	2058	switch (scrollBar.align)
2043	{	2059	{
2044	case R_SB_ALIGN_TOP:	2060	case SB_ALIGN_TOP:
2045	csrO = 0;	2061	csrO = 0;
2046	break;	2062	break;
2047	case R_SB_ALIGN_CENTRE:	2063	case SB_ALIGN_CENTRE:
2048	csrO = (scrollBar.bot - scrollBar.top) / 2;	2064	csrO = (scrollBar.bot - scrollBar.top) / 2;
2049	break;	2065	break;
2050	case R_SB_ALIGN_BOTTOM:	2066	case SB_ALIGN_BOTTOM:
2051	csrO = scrollBar.bot - scrollBar.top;	2067	csrO = scrollBar.bot - scrollBar.top;
2052	break;	2068	break;
2053	}	2069	}
2054		2070
2055	if (scrollBar.style == R_SB_XTERM	2071	if (scrollBar.style == SB_STYLE_XTERM
2056	\|\| scrollbar_above_slider (ev.y)	2072	\|\| scrollBar.above_slider (ev.y)
2057	\|\| scrollbar_below_slider (ev.y))	2073	\|\| scrollBar.below_slider (ev.y))
2058	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2074	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2059		2075
2060	scrollBar.state = STATE_MOTION;	2076	scrollBar.state = SB_STATE_MOTION;
2061	break;	2077	break;
2062		2078
2063	case Button1:	2079	case Button1:
2064	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2080	if (scrollBar.align == SB_ALIGN_CENTRE)
2065	csrO = ev.y - scrollBar.top;	2081	csrO = ev.y - scrollBar.top;
2066	/* FALLTHROUGH */	2082	/* FALLTHROUGH */
2067		2083
2068	case Button3:	2084	case Button3:
2069	if (scrollBar.style != R_SB_XTERM)	2085	if (scrollBar.style != SB_STYLE_XTERM)
2070	{	2086	{
2071	if (scrollbar_above_slider (ev.y))	2087	if (scrollBar.above_slider (ev.y))
2072	# ifdef RXVT_SCROLL_FULL	2088	# ifdef RXVT_SCROLL_FULL
2073	scr_page (UP, nrow - 1);	2089	scr_page (UP, nrow - 1);
2074	# else	2090	# else
2075	scr_page (UP, nrow / 4);	2091	scr_page (UP, nrow / 4);
2076	# endif	2092	# endif
2077	else if (scrollbar_below_slider (ev.y))	2093	else if (scrollBar.below_slider (ev.y))
2078	# ifdef RXVT_SCROLL_FULL	2094	# ifdef RXVT_SCROLL_FULL
2079	scr_page (DN, nrow - 1);	2095	scr_page (DN, nrow - 1);
2080	# else	2096	# else
2081	scr_page (DN, nrow / 4);	2097	scr_page (DN, nrow / 4);
2082	# endif	2098	# endif
2083	else	2099	else
2084	scrollBar.state = STATE_MOTION;	2100	scrollBar.state = SB_STATE_MOTION;
2085	}	2101	}
2086	else	2102	else
2087	{	2103	{
2088	scr_page ((ev.button == Button1 ? DN : UP),	2104	scr_page ((ev.button == Button1 ? DN : UP),
2089	(nrow	2105	(nrow
2090	* scrollbar_position (ev.y)	2106	* scrollBar.position (ev.y)
2091	/ scrollBar.size ()));	2107	/ scrollBar.size ()));
2092	}	2108	}
2093		2109
2094	break;	2110	break;
2095	}	2111	}
…		…
2106		2122
2107	csrO = 0; /* reset csr Offset */	2123	csrO = 0; /* reset csr Offset */
2108	if (!bypass_keystate)	2124	if (!bypass_keystate)
2109	reportmode = !! (priv_modes & PrivMode_mouse_report);	2125	reportmode = !! (priv_modes & PrivMode_mouse_report);
2110		2126
2111	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2127	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2112	{	2128	{
2113	scrollBar.state = STATE_IDLE;	2129	scrollBar.state = SB_STATE_IDLE;
2114	scrollBar.show (0);	2130	scrollBar.show (0);
2115	}	2131	}
2116		2132
2117	#ifdef SELECTION_SCROLLING	2133	#ifdef SELECTION_SCROLLING
2118	sel_scroll_ev.stop();	2134	sel_scroll_ev.stop();
…		…
2168	case Button3:	2184	case Button3:
2169	selection_make (ev.time);	2185	selection_make (ev.time);
2170	break;	2186	break;
2171		2187
2172	case Button2:	2188	case Button2:
2173	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?
2174	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2190	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2175	break;	2191	break;
2176		2192
2177	#ifdef MOUSE_WHEEL	2193	#ifdef MOUSE_WHEEL
2178	case Button4:	2194	case Button4:
…		…
2213	}	2229	}
2214	}	2230	}
2215		2231
2216	/}}} /	2232	/}}} /
2217		2233
2218	void	2234	void ecb_hot
2219	rxvt_term::cmd_parse ()	2235	rxvt_term::cmd_parse ()
2220	{	2236	{
2221	wchar_t ch = NOCHAR;	2237	wchar_t ch = NOCHAR;
2222	char *seq_begin; // remember start of esc-sequence here	2238	char *seq_begin; // remember start of esc-sequence here
2223		2239
2224	for (;;)	2240	for (;;)
2225	{	2241	{
2226	if (expect_false (ch == NOCHAR))	2242	if (ecb_unlikely (ch == NOCHAR))
2227	{	2243	{
2228	seq_begin = cmdbuf_ptr;	2244	seq_begin = cmdbuf_ptr;
2229	ch = next_char ();	2245	ch = next_char ();
2230		2246
2231	if (ch == NOCHAR)	2247	if (ch == NOCHAR)
2232	break;	2248	break;
2233	}	2249	}
2234		2250
2235	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))
2236	{	2252	{
2237	if (expect_false (!seen_input))	2253	if (ecb_unlikely (!seen_input))
2238	{	2254	{
2239	seen_input = 1;	2255	seen_input = 1;
2240	// many badly-written programs (e.g. jed) contain a race condition:	2256	// many badly-written programs (e.g. jed) contain a race condition:
2241	// they first read the screensize and then install a SIGWINCH handler.	2257	// they first read the screensize and then install a SIGWINCH handler.
2242	// some window managers resize the window early, and these programs	2258	// some window managers resize the window early, and these programs
…		…
2255	wchar_t *str = buf;	2271	wchar_t *str = buf;
2256	wchar_t *eol = str + min (ncol, UBUFSIZ);	2272	wchar_t *eol = str + min (ncol, UBUFSIZ);
2257		2273
2258	for (;;)	2274	for (;;)
2259	{	2275	{
2260	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)))
2261	break;	2277	break;
2262		2278
2263	*str++ = ch;	2279	*str++ = ch;
2264		2280
2265	if (expect_false (ch == C0_LF \|\| str >= eol))	2281	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2266	{	2282	{
2267	if (ch == C0_LF)	2283	if (ch == C0_LF)
2268	nlines++;	2284	nlines++;
2269		2285
2270	refresh_count++;	2286	refresh_count++;
…		…
2342	}	2358	}
2343	}	2359	}
2344	}	2360	}
2345		2361
2346	// read the next character	2362	// read the next character
2347	wchar_t	2363	wchar_t ecb_hot
2348	rxvt_term::next_char () NOTHROW	2364	rxvt_term::next_char () NOTHROW
2349	{	2365	{
2350	while (cmdbuf_ptr < cmdbuf_endp)	2366	while (cmdbuf_ptr < cmdbuf_endp)
2351	{	2367	{
2352	// assume 7-bit to be ascii ALWAYS	2368	// assume 7-bit to be ascii ALWAYS
2353	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2369	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2354	return *cmdbuf_ptr++;	2370	return *cmdbuf_ptr++;
2355		2371
2356	wchar_t wc;	2372	wchar_t wc;
2357	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);
2358		2374
…		…
2376		2392
2377	return NOCHAR;	2393	return NOCHAR;
2378	}	2394	}
2379		2395
2380	// read the next octet	2396	// read the next octet
2381	uint32_t	2397	uint32_t ecb_hot
2382	rxvt_term::next_octet () NOTHROW	2398	rxvt_term::next_octet () NOTHROW
2383	{	2399	{
2384	return cmdbuf_ptr < cmdbuf_endp	2400	return cmdbuf_ptr < cmdbuf_endp
2385	? (unsigned char)*cmdbuf_ptr++	2401	? (unsigned char)*cmdbuf_ptr++
2386	: NOCHAR;	2402	: NOCHAR;
2387	}	2403	}
2388		2404
2389	static class out_of_input out_of_input;	2405	static class out_of_input out_of_input;
2390		2406
2391	/* rxvt_cmd_getc () - Return next input character */	2407	wchar_t ecb_hot
2392	/*
2393	* Return the next input character after first passing any keyboard input
2394	* to the command.
2395	*/
2396	wchar_t
2397	rxvt_term::cmd_getc () THROW ((class out_of_input))	2408	rxvt_term::cmd_getc () THROW ((class out_of_input))
2398	{	2409	{
2399	wchar_t c = next_char ();	2410	wchar_t c = next_char ();
2400		2411
2401	if (c == NOCHAR)	2412	if (c == NOCHAR)
2402	throw out_of_input;	2413	throw out_of_input;
2403		2414
2404	return c;	2415	return c;
2405	}	2416	}
2406		2417
2407	uint32_t	2418	uint32_t ecb_hot
2408	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2419	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2409	{	2420	{
2410	uint32_t c = next_octet ();	2421	uint32_t c = next_octet ();
2411		2422
2412	if (c == NOCHAR)	2423	if (c == NOCHAR)
…		…
2416	}	2427	}
2417		2428
2418	/{{{ print pipe /	2429	/{{{ print pipe /
2419	/----------------------------------------------------------------------/	2430	/----------------------------------------------------------------------/
2420	#ifdef PRINTPIPE	2431	#ifdef PRINTPIPE
2421	FILE *	2432	FILE * ecb_cold
2422	rxvt_term::popen_printer ()	2433	rxvt_term::popen_printer ()
2423	{	2434	{
2424	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");
2425		2436
2426	if (stream == NULL)	2437	if (stream == NULL)
2427	rxvt_warn ("can't open printer pipe, not printing.\n");	2438	rxvt_warn ("can't open printer pipe, not printing.\n");
2428		2439
2429	return stream;	2440	return stream;
2430	}	2441	}
2431		2442
2432	int	2443	int ecb_cold
2433	rxvt_term::pclose_printer (FILE *stream)	2444	rxvt_term::pclose_printer (FILE *stream)
2434	{	2445	{
2435	fflush (stream);	2446	fflush (stream);
2436	return pclose (stream);	2447	return pclose (stream);
2437	}	2448	}
2438		2449
2439	/*	2450	/*
2440	* simulate attached vt100 printer	2451	* simulate attached vt100 printer
2441	*/	2452	*/
2442	void	2453	void ecb_cold
2443	rxvt_term::process_print_pipe ()	2454	rxvt_term::process_print_pipe ()
2444	{	2455	{
2445	FILE *fd = popen_printer ();	2456	FILE *fd = popen_printer ();
2446		2457
2447	if (!fd)	2458	if (!fd)
…		…
2493	pclose_printer (fd);	2504	pclose_printer (fd);
2494	}	2505	}
2495	#endif /* PRINTPIPE */	2506	#endif /* PRINTPIPE */
2496	/}}} /	2507	/}}} /
2497		2508
2498	/* INDENT-OFF */
2499	enum {	2509	enum {
2500	C1_40 = 0x40,	2510	C1_40 = 0x40,
2501	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,
2502	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,
2503	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,
2504	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,
2505	};	2515	};
2506	/* INDENT-ON */
2507		2516
2508	/{{{ process non-printing single characters /	2517	/{{{ process non-printing single characters /
2509	void	2518	void ecb_hot
2510	rxvt_term::process_nonprinting (unicode_t ch)	2519	rxvt_term::process_nonprinting (unicode_t ch)
2511	{	2520	{
2512	switch (ch)	2521	switch (ch)
2513	{	2522	{
2514	case C0_ESC:	2523	case C0_ESC:
…		…
2560	}	2569	}
2561	/}}} /	2570	/}}} /
2562		2571
2563		2572
2564	/{{{ process VT52 escape sequences /	2573	/{{{ process VT52 escape sequences /
2565	void	2574	void ecb_cold
2566	rxvt_term::process_escape_vt52 (unicode_t ch)	2575	rxvt_term::process_escape_vt52 (unicode_t ch)
2567	{	2576	{
2568	int row, col;	2577	int row, col;
2569		2578
2570	switch (ch)	2579	switch (ch)
…		…
2604	break;	2613	break;
2605	case 'Z': /* identify the terminal type */	2614	case 'Z': /* identify the terminal type */
2606	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2615	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2607	break;	2616	break;
2608	case '<': /* turn off VT52 mode */	2617	case '<': /* turn off VT52 mode */
2609	set_privmode (PrivMode_vt52, 0);	2618	priv_modes &= ~PrivMode_vt52;
2610	break;	2619	break;
2611	case 'F': /* use special graphics character set */	2620	case 'F': /* use special graphics character set */
2612	case 'G': /* use regular character set */	2621	case 'G': /* use regular character set */
2613	/* unimplemented */	2622	/* unimplemented */
2614	break;	2623	break;
…		…
2620	}	2629	}
2621	/}}} /	2630	/}}} /
2622		2631
2623		2632
2624	/{{{ process escape sequences /	2633	/{{{ process escape sequences /
2625	void	2634	void ecb_hot
2626	rxvt_term::process_escape_seq ()	2635	rxvt_term::process_escape_seq ()
2627	{	2636	{
2628	unicode_t ch = cmd_getc ();	2637	unicode_t ch = cmd_getc ();
2629		2638
2630	if (priv_modes & PrivMode_vt52)	2639	if (priv_modes & PrivMode_vt52)
…		…
2633	return;	2642	return;
2634	}	2643	}
2635		2644
2636	switch (ch)	2645	switch (ch)
2637	{	2646	{
2638	/* case 1: do_tek_mode (); break; */
2639	case '#':	2647	case '#':
2640	if (cmd_getc () == '8')	2648	if (cmd_getc () == '8')
2641	scr_E ();	2649	scr_E ();
2642	break;	2650	break;
2643	case '(':	2651	case '(':
…		…
2666	#if !ENABLE_MINIMAL	2674	#if !ENABLE_MINIMAL
2667	case '9':	2675	case '9':
2668	scr_forwardindex ();	2676	scr_forwardindex ();
2669	break;	2677	break;
2670	#endif	2678	#endif
		2679	// DECPAM/DECPNM
2671	case '=':	2680	case '=':
		2681	priv_modes \|= PrivMode_aplKP;
		2682	break;
2672	case '>':	2683	case '>':
2673	set_privmode (PrivMode_aplKP, ch == '=');	2684	priv_modes &= ~PrivMode_aplKP;
2674	break;	2685	break;
2675		2686
2676	case C1_40:	2687	case C1_40:
2677	cmd_getc ();	2688	cmd_getc ();
2678	break;	2689	break;
…		…
2682		2693
2683	/* 8.3.87: NEXT LINE */	2694	/* 8.3.87: NEXT LINE */
2684	case C1_NEL: /* ESC E */	2695	case C1_NEL: /* ESC E */
2685	{	2696	{
2686	wchar_t nlcr[] = { C0_LF, C0_CR };	2697	wchar_t nlcr[] = { C0_LF, C0_CR };
2687	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2698	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2688	}	2699	}
2689	break;	2700	break;
2690		2701
2691	/* kidnapped escape sequence: Should be 8.3.48 */	2702	/* kidnapped escape sequence: Should be 8.3.48 */
2692	case C1_ESA: /* ESC G */	2703	case C1_ESA: /* ESC G */
…		…
2704	case C1_RI: /* ESC M */	2715	case C1_RI: /* ESC M */
2705	scr_index (DN);	2716	scr_index (DN);
2706	break;	2717	break;
2707		2718
2708	/* 8.3.142: SINGLE-SHIFT TWO */	2719	/* 8.3.142: SINGLE-SHIFT TWO */
2709	/case C1_SS2: scr_single_shift (2); break; /	2720	/* case C1_SS2: break; */
2710		2721
2711	/* 8.3.143: SINGLE-SHIFT THREE */	2722	/* 8.3.143: SINGLE-SHIFT THREE */
2712	/case C1_SS3: scr_single_shift (3); break; /	2723	/* case C1_SS3: break; */
2713		2724
2714	/* 8.3.27: DEVICE CONTROL STRING */	2725	/* 8.3.27: DEVICE CONTROL STRING */
2715	case C1_DCS: /* ESC P */	2726	case C1_DCS: /* ESC P */
2716	process_dcs_seq ();	2727	process_dcs_seq ();
2717	break;	2728	break;
…		…
2750	}	2761	}
2751	}	2762	}
2752	/}}} /	2763	/}}} /
2753		2764
2754	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2765	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2755	/* INDENT-OFF */
2756	enum {	2766	enum {
2757	CSI_ICH = 0x40,	2767	CSI_ICH = 0x40,
2758	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,
2759	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 ,
2760	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,
…		…
2780	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, */
2781	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, */
2782	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, */
2783	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, {, \|, }, ~, */
2784	};	2794	};
2785	/* INDENT-ON */
2786		2795
2787	void	2796	void ecb_hot
2788	rxvt_term::process_csi_seq ()	2797	rxvt_term::process_csi_seq ()
2789	{	2798	{
2790	unicode_t ch, priv, i;	2799	unicode_t ch, priv, i;
2791	unsigned int nargs, p;	2800	unsigned int nargs, p;
2792	int n, ndef;	2801	int n, ndef;
…		…
2870	scr_soft_reset ();	2879	scr_soft_reset ();
2871		2880
2872	static const int pm_h[] = { 7, 25 };	2881	static const int pm_h[] = { 7, 25 };
2873	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 };
2874		2883
2875	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2884	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2876	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2885	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2877	}	2886	}
2878	break;	2887	break;
2879	}	2888	}
2880		2889
2881	return;	2890	return;
…		…
2899	}	2908	}
2900	break;	2909	break;
2901	#endif	2910	#endif
2902		2911
2903	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2912	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2904	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2913	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2905	arg[0] = -arg[0];	2914	arg[0] = -arg[0];
2906	/* FALLTHROUGH */	2915	/* FALLTHROUGH */
2907	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2916	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2908	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2917	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2909	scr_gotorc (arg[0], 0, RELATIVE);	2918	scr_gotorc (arg[0], 0, RELATIVE);
2910	break;	2919	break;
2911		2920
2912	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2921	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2913	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2922	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3100	}	3109	}
3101	}	3110	}
3102	/}}} /	3111	/}}} /
3103		3112
3104	#if !ENABLE_MINIMAL	3113	#if !ENABLE_MINIMAL
3105	/* ARGSUSED */
3106	void	3114	void
3107	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3115	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3108	{	3116	{
3109	int x, y;	3117	int x, y;
3110	XWindowAttributes wattr;	3118	XWindowAttributes wattr;
…		…
3119	{	3127	{
3120	/*	3128	/*
3121	* commands	3129	* commands
3122	*/	3130	*/
3123	case 1: /* deiconify window */	3131	case 1: /* deiconify window */
3124	XMapWindow (dpy, parent[0]);	3132	XMapWindow (dpy, parent);
3125	break;	3133	break;
3126	case 2: /* iconify window */	3134	case 2: /* iconify window */
3127	XIconifyWindow (dpy, parent[0], display->screen);	3135	XIconifyWindow (dpy, parent, display->screen);
3128	break;	3136	break;
3129	case 3: /* set position (pixels) */	3137	case 3: /* set position (pixels) */
3130	XMoveWindow (dpy, parent[0], args[1], args[2]);	3138	XMoveWindow (dpy, parent, args[1], args[2]);
3131	break;	3139	break;
3132	case 4: /* set size (pixels) */	3140	case 4: /* set size (pixels) */
3133	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3141	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134	break;	3142	break;
3135	case 5: /* raise window */	3143	case 5: /* raise window */
3136	XRaiseWindow (dpy, parent[0]);	3144	XRaiseWindow (dpy, parent);
3137	break;	3145	break;
3138	case 6: /* lower window */	3146	case 6: /* lower window */
3139	XLowerWindow (dpy, parent[0]);	3147	XLowerWindow (dpy, parent);
3140	break;	3148	break;
3141	case 7: /* refresh window */	3149	case 7: /* refresh window */
3142	scr_touch (true);	3150	scr_touch (true);
3143	break;	3151	break;
3144	case 8: /* set size (chars) */	3152	case 8: /* set size (chars) */
…		…
3147	break;	3155	break;
3148		3156
3149	//case 9: NYI, TODO, restore maximized window or maximize window	3157	//case 9: NYI, TODO, restore maximized window or maximize window
3150	default:	3158	default:
3151	if (args[0] >= 24) /* set height (chars) */	3159	if (args[0] >= 24) /* set height (chars) */
3152	set_widthheight ((unsigned int)width,	3160	set_widthheight ((unsigned int)vt_width,
3153	(unsigned int) (args[1] * fheight));	3161	(unsigned int) (args[1] * fheight));
3154	break;	3162	break;
3155		3163
3156	/*	3164	/*
3157	* reports - some output format copied from XTerm	3165	* reports - some output format copied from XTerm
3158	*/	3166	*/
3159	case 11: /* report window state */	3167	case 11: /* report window state */
3160	XGetWindowAttributes (dpy, parent[0], &wattr);	3168	XGetWindowAttributes (dpy, parent, &wattr);
3161	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3169	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162	break;	3170	break;
3163	case 13: /* report window position */	3171	case 13: /* report window position */
3164	XGetWindowAttributes (dpy, parent[0], &wattr);	3172	XGetWindowAttributes (dpy, parent, &wattr);
3165	XTranslateCoordinates (dpy, parent[0], wattr.root,	3173	XTranslateCoordinates (dpy, parent, wattr.root,
3166	-wattr.border_width, -wattr.border_width,	3174	-wattr.border_width, -wattr.border_width,
3167	&x, &y, &wdummy);	3175	&x, &y, &wdummy);
3168	tt_printf ("\033[3;%d;%dt", x, y);	3176	tt_printf ("\033[3;%d;%dt", x, y);
3169	break;	3177	break;
3170	case 14: /* report window size (pixels) */	3178	case 14: /* report window size (pixels) */
3171	XGetWindowAttributes (dpy, parent[0], &wattr);	3179	XGetWindowAttributes (dpy, parent, &wattr);
3172	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3180	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173	break;	3181	break;
3174	case 18: /* report text area size (chars) */	3182	case 18: /* report text area size (chars) */
3175	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3183	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176	break;	3184	break;
…		…
3178	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3186	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179	break;	3187	break;
3180	case 20: /* report icon label */	3188	case 20: /* report icon label */
3181	{	3189	{
3182	char *s;	3190	char *s;
3183	XGetIconName (dpy, parent[0], &s);	3191	XGetIconName (dpy, parent, &s);
3184	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3192	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185	XFree (s);	3193	XFree (s);
3186	}	3194	}
3187	break;	3195	break;
3188	case 21: /* report window title */	3196	case 21: /* report window title */
3189	{	3197	{
3190	char *s;	3198	char *s;
3191	XFetchName (dpy, parent[0], &s);	3199	XFetchName (dpy, parent, &s);
3192	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3200	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193	XFree (s);	3201	XFree (s);
3194	}	3202	}
3195	break;	3203	break;
3196	}	3204	}
…		…
3350	unsigned long bytes_after;	3358	unsigned long bytes_after;
3351	unsigned char *value = 0;	3359	unsigned char *value = 0;
3352	const char *str = "";	3360	const char *str = "";
3353		3361
3354	if (prop	3362	if (prop
3355	&& XGetWindowProperty (dpy, parent[0],	3363	&& XGetWindowProperty (dpy, parent,
3356	prop, 0, 1<<16, 0, AnyPropertyType,	3364	prop, 0, 1<<16, 0, AnyPropertyType,
3357	&actual_type, &actual_format,	3365	&actual_type, &actual_format,
3358	&nitems, &bytes_after, &value) == Success	3366	&nitems, &bytes_after, &value) == Success
3359	&& actual_type != None	3367	&& actual_type != None
3360	&& actual_format == 8)	3368	&& actual_format == 8)
…		…
3372	{	3380	{
3373	*eq = 0;	3381	*eq = 0;
3374	set_utf8_property (display->atom (str), eq + 1);	3382	set_utf8_property (display->atom (str), eq + 1);
3375	}	3383	}
3376	else	3384	else
3377	XDeleteProperty (dpy, parent[0],	3385	XDeleteProperty (dpy, parent,
3378	display->atom (str));	3386	display->atom (str));
3379	}	3387	}
3380	break;	3388	break;
3381		3389
3382	case XTerm_Color:	3390	case XTerm_Color:
…		…
3443	process_color_seq (op, Color_tint, str, resp);	3451	process_color_seq (op, Color_tint, str, resp);
3444	{	3452	{
3445	bool changed = false;	3453	bool changed = false;
3446		3454
3447	if (ISSET_PIXCOLOR (Color_tint))	3455	if (ISSET_PIXCOLOR (Color_tint))
3448	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3456	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3449		3457
3450	if (changed)	3458	if (changed)
3451	update_background ();	3459	update_background ();
3452	}	3460	}
3453		3461
…		…
3457	#if BG_IMAGE_FROM_FILE	3465	#if BG_IMAGE_FROM_FILE
3458	case Rxvt_Pixmap:	3466	case Rxvt_Pixmap:
3459	if (!strcmp (str, "?"))	3467	if (!strcmp (str, "?"))
3460	{	3468	{
3461	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	}
3462		3479
3463	sprintf (str, "[%dx%d+%d+%d]",	3480	sprintf (str, "[%dx%d+%d+%d]",
3464	min (h_scale, 32767), min (v_scale, 32767),	3481	h_scale, v_scale,
3465	min (h_align, 32767), min (v_align, 32767));	3482	h_align, v_align);
3466	process_xterm_seq (XTerm_title, str, CHAR_ST);	3483	process_xterm_seq (XTerm_title, str, CHAR_ST);
3467	}	3484	}
3468	else	3485	else
3469	{	3486	{
3470	int changed = 0;	3487	bool changed = false;
3471		3488
3472	if (*str != ';')	3489	if (*str != ';')
3473	{	3490	{
3474	if (bg_set_file (str)) /* change pixmap */	3491	if (image_vec.size () > 0)
		3492	changed = image_vec[0].set_file_geometry (str);
		3493	else
3475	{	3494	{
3476	changed++;	3495	rxvt_image *image = new_image ();
3477	str = strchr (str, ';');	3496	if (!image->set_file_geometry (str))
3478	if (str == NULL)	3497	image_vec.pop_back ();
3479	bg_set_default_geometry ();
3480	else	3498	else
3481	bg_set_geometry (str+1);	3499	changed = true;
3482	}	3500	}
3483	}	3501	}
3484	else	3502	else
3485	{	3503	{
3486	str++;	3504	str++;
		3505	if (image_vec.size () > 0)
3487	if (bg_set_geometry (str, true))	3506	changed = image_vec[0].set_geometry (str, true);
3488	changed++;
3489	}	3507	}
3490		3508
3491	if (changed)	3509	if (changed)
3492	{	3510	{
3493	if (bg_window_position_sensitive ())	3511	if (bg_window_position_sensitive ())
…		…
3592	* 's' = save	3610	* 's' = save
3593	* 'r' = restore	3611	* 'r' = restore
3594	* 't' = toggle	3612	* 't' = toggle
3595	* so no need for fancy checking	3613	* so no need for fancy checking
3596	*/	3614	*/
3597	int	3615	int ecb_cold
3598	rxvt_term::privcases (int mode, unsigned long bit)	3616	rxvt_term::privcases (int mode, unsigned long bit)
3599	{	3617	{
3600	int state;	3618	int state;
3601		3619
3602	if (mode == 's')	3620	if (mode == 's')
3603	{	3621	{
3604	SavedModes \|= (priv_modes & bit);	3622	if (priv_modes & bit)
		3623	SavedModes \|= bit;
		3624	else
		3625	SavedModes &= ~bit;
3605	return -1;	3626	return -1;
3606	}	3627	}
3607	else	3628	else
3608	{	3629	{
3609	if (mode == 'r')	3630	if (mode == 'r')
3610	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3631	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3611	else	3632	else
3612	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3633	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3613		3634
3614	set_privmode (bit, state);	3635	if (state)
		3636	priv_modes \|= bit;
		3637	else
		3638	priv_modes &= ~bit;
3615	}	3639	}
3616		3640
3617	return state;	3641	return state;
3618	}	3642	}
3619		3643
3620	/* we're not using priv _yet_ */	3644	/* we're not using priv _yet_ */
3621	void	3645	void
3622	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)
3623	{	3647	{
3624	unsigned int i, j;	3648	unsigned int i, j;
3625	int state;	3649	int state;
3626		3650
3627	static const struct	3651	static const struct
3628	{	3652	{
3629	const int argval;	3653	const int argval;
3630	const unsigned long bit;	3654	const unsigned long bit;
3631	} argtopriv[] = {	3655	} argtopriv[] = {
3632	{ 1, PrivMode_aplCUR }, // DECCKM	3656	{ 1, PrivMode_aplCUR }, // DECCKM
3633	{ 2, PrivMode_vt52 },	3657	{ 2, PrivMode_vt52 }, // DECANM
3634	{ 3, PrivMode_132 }, // DECCOLM	3658	{ 3, PrivMode_132 }, // DECCOLM
3635	{ 4, PrivMode_smoothScroll }, // DECSCLM	3659	{ 4, PrivMode_smoothScroll }, // DECSCLM
3636	{ 5, PrivMode_rVideo }, // DECSCNM	3660	{ 5, PrivMode_rVideo }, // DECSCNM
3637	{ 6, PrivMode_relOrigin }, // DECOM	3661	{ 6, PrivMode_relOrigin }, // DECOM
3638	{ 7, PrivMode_Autowrap }, // DECAWM	3662	{ 7, PrivMode_Autowrap }, // DECAWM
3639	// 8, auto-repeat keys // DECARM	3663	// 8, auto-repeat keys // DECARM
3640	{ 9, PrivMode_MouseX10 },	3664	{ 9, PrivMode_MouseX10 },
3641	// 18 end FF to printer after print screen	3665	// 18 end FF to printer after print screen
3642	// 19 Print screen prints full screen/scroll region	3666	// 19 Print screen prints full screen/scroll region
3643	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3667	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3644	#ifdef scrollBar_esc	3668	#ifdef scrollBar_esc
3645	{ scrollBar_esc, PrivMode_scrollBar },	3669	{ scrollBar_esc, PrivMode_scrollBar },
3646	#endif	3670	#endif
3647	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3671	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3648	// 38, tektronix mode // DECTEK	3672	// 38, tektronix mode // DECTEK
3649	{ 40, PrivMode_132OK },	3673	{ 40, PrivMode_132OK },
3650	// 41 xterm more fixes NYI	3674	// 41 xterm more fixes NYI
3651	// 45 margin bell NYI	3675	// 45 margin bell NYI
3652	// 46 start logging	3676	// 46 start logging
3653	{ 47, PrivMode_Screen },	3677	{ 47, PrivMode_Screen },
3654	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3678	{ 66, PrivMode_aplKP }, // DECNKM
3655	#ifndef NO_BACKSPACE_KEY	3679	#ifndef NO_BACKSPACE_KEY
3656	{ 67, PrivMode_BackSpace }, // DECBKM	3680	{ 67, PrivMode_BackSpace }, // DECBKM
3657	#endif	3681	#endif
3658	{ 1000, PrivMode_MouseX11 },	3682	{ 1000, PrivMode_MouseX11 },
3659	{ 1002, PrivMode_MouseBtnEvent },	3683	{ 1002, PrivMode_MouseBtnEvent },
…		…
3688	for (i = 0; i < nargs; i++)	3712	for (i = 0; i < nargs; i++)
3689	{	3713	{
3690	state = -1;	3714	state = -1;
3691		3715
3692	/* basic handling */	3716	/* basic handling */
3693	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3717	for (j = 0; j < ecb_array_length (argtopriv); j++)
3694	if (argtopriv[j].argval == arg[i])	3718	if (argtopriv[j].argval == arg[i])
3695	{	3719	{
3696	state = privcases (mode, argtopriv[j].bit);	3720	state = privcases (mode, argtopriv[j].bit);
3697	break;	3721	break;
3698	}	3722	}
…		…
3724	case 2: /* VT52 mode */	3748	case 2: /* VT52 mode */
3725	/* oddball mode. should be set regardless of set/reset	3749	/* oddball mode. should be set regardless of set/reset
3726	* parameter. Return from VT52 mode with an ESC < from	3750	* parameter. Return from VT52 mode with an ESC < from
3727	* within VT52 mode	3751	* within VT52 mode
3728	*/	3752	*/
3729	set_privmode (PrivMode_vt52, 1);	3753	priv_modes \|= PrivMode_vt52;
3730	break;	3754	break;
3731	case 3: /* 80/132 */	3755	case 3: /* 80/132 */
3732	if (priv_modes & PrivMode_132OK)	3756	if (priv_modes & PrivMode_132OK)
3733	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3757	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3734	break;	3758	break;
…		…
3749	if (state) /* orthogonal */	3773	if (state) /* orthogonal */
3750	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3774	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3751	break;	3775	break;
3752	#ifdef scrollBar_esc	3776	#ifdef scrollBar_esc
3753	case scrollBar_esc:	3777	case scrollBar_esc:
3754	if (scrollBar.map (state))	3778	scrollBar.map (state);
3755	{
3756	resize_all_windows (0, 0, 0);	3779	resize_all_windows (0, 0, 0);
3757	scr_touch (true);	3780	scr_touch (true);
3758	}
3759	break;	3781	break;
3760	#endif	3782	#endif
3761	case 25: /* visible/invisible cursor */	3783	case 25: /* visible/invisible cursor */
3762	scr_cursor_visible (state);	3784	scr_cursor_visible (state);
3763	break;	3785	break;
…		…
3818	}	3840	}
3819	}	3841	}
3820	/}}} /	3842	/}}} /
3821		3843
3822	/{{{ process sgr sequences /	3844	/{{{ process sgr sequences /
3823	void	3845	void ecb_hot
3824	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3846	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3825	{	3847	{
3826	unsigned int i;	3848	unsigned int i;
3827	short rendset;	3849	short rendset;
3828	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.480 by sf-exg, Mon Mar 7 11:48:55 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.480 by sf-exg, Mon Mar 7 11:48:55 2011 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC