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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
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;
1163	{	1174
1164	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1175	if (!avail)
1165	n = 0;
1166	}	1176	{
1167		1177	// normally this indicates a "too long" command sequence - just drop the data we have
1168	memmove (cmdbuf_base, cmdbuf_ptr, n);
1169	cmdbuf_ptr = cmdbuf_base;	1178	cmdbuf_ptr = cmdbuf_base;
1170	cmdbuf_endp = cmdbuf_ptr + n;	1179	cmdbuf_endp = cmdbuf_ptr;
		1180	avail = CBUFSIZ;
		1181	}
1171		1182
1172	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1183	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173		1184
1174	if (r > 0)	1185	if (r > 0)
1175	{	1186	{
1176	cmdbuf_endp += r;	1187	cmdbuf_endp += r;
1177	return true;	1188	return true;
…		…
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);
…		…
1445	&& ev.xfocus.mode != NotifyGrab)	1456	&& ev.xfocus.mode != NotifyGrab)
1446	focus_out ();	1457	focus_out ();
1447	break;	1458	break;
1448		1459
1449	case ConfigureNotify:	1460	case ConfigureNotify:
1450	if (ev.xconfigure.window == parent[0])	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[0]))	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[0], 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)
1833	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1846	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834	return;	1847	return;
1835		1848
1836	# if ENABLE_TRANSPARENCY
1837	switch (ev.type)	1849	switch (ev.type)
1838	{	1850	{
1839	case PropertyNotify:	1851	case PropertyNotify:
1840	/*	1852	/*
1841	* if user used some Esetroot compatible prog to set the root bg,	1853	* if user used some Esetroot compatible prog to set the root bg,
1842	* use the property to determine the pixmap. We use it later on.	1854	* use the property to determine the pixmap. We use it later on.
1843	*/	1855	*/
1844	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1856	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1857	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846	{	1858	{
		1859	# if ENABLE_TRANSPARENCY
1847	bg_set_root_pixmap ();	1860	bg_set_root_pixmap ();
1848	update_background ();	1861	update_background ();
		1862	#endif
		1863	#if ENABLE_PERL
		1864	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1865	#endif
1849	}	1866	}
1850		1867
1851	break;	1868	break;
1852	}	1869	}
1853	# endif
1854		1870
1855	refresh_check ();	1871	refresh_check ();
1856	}	1872	}
1857	#endif	1873	#endif
1858		1874
…		…
1982	if (scrollBar.upButton (ev.y))	1998	if (scrollBar.upButton (ev.y))
1983	direction = UP; /* up */	1999	direction = UP; /* up */
1984	else if (scrollBar.dnButton (ev.y))	2000	else if (scrollBar.dnButton (ev.y))
1985	direction = DN; /* down */	2001	direction = DN; /* down */
1986		2002
1987	scrollBar.state = STATE_IDLE;	2003	scrollBar.state = SB_STATE_IDLE;
1988	/*	2004	/*
1989	* Rxvt-style scrollbar:	2005	* Rxvt-style scrollbar:
1990	* move up if mouse is above slider	2006	* move up if mouse is above slider
1991	* move dn if mouse is below slider	2007	* move dn if mouse is below slider
1992	*	2008	*
…		…
2031	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2047	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032	#endif	2048	#endif
2033	if (scr_page (direction, 1))	2049	if (scr_page (direction, 1))
2034	{	2050	{
2035	if (direction == UP)	2051	if (direction == UP)
2036	scrollBar.state = STATE_UP;	2052	scrollBar.state = SB_STATE_UP;
2037	else	2053	else
2038	scrollBar.state = STATE_DOWN;	2054	scrollBar.state = SB_STATE_DOWN;
2039	}	2055	}
2040	}	2056	}
2041	else	2057	else
2042	switch (ev.button)	2058	switch (ev.button)
2043	{	2059	{
2044	case Button2:	2060	case Button2:
2045	switch (scrollBar.align)	2061	switch (scrollBar.align)
2046	{	2062	{
2047	case R_SB_ALIGN_TOP:	2063	case SB_ALIGN_TOP:
2048	csrO = 0;	2064	csrO = 0;
2049	break;	2065	break;
2050	case R_SB_ALIGN_CENTRE:	2066	case SB_ALIGN_CENTRE:
2051	csrO = (scrollBar.bot - scrollBar.top) / 2;	2067	csrO = (scrollBar.bot - scrollBar.top) / 2;
2052	break;	2068	break;
2053	case R_SB_ALIGN_BOTTOM:	2069	case SB_ALIGN_BOTTOM:
2054	csrO = scrollBar.bot - scrollBar.top;	2070	csrO = scrollBar.bot - scrollBar.top;
2055	break;	2071	break;
2056	}	2072	}
2057		2073
2058	if (scrollBar.style == R_SB_XTERM	2074	if (scrollBar.style == SB_STYLE_XTERM
2059	\|\| scrollbar_above_slider (ev.y)	2075	\|\| scrollBar.above_slider (ev.y)
2060	\|\| scrollbar_below_slider (ev.y))	2076	\|\| scrollBar.below_slider (ev.y))
2061	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2077	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062		2078
2063	scrollBar.state = STATE_MOTION;	2079	scrollBar.state = SB_STATE_MOTION;
2064	break;	2080	break;
2065		2081
2066	case Button1:	2082	case Button1:
2067	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2083	if (scrollBar.align == SB_ALIGN_CENTRE)
2068	csrO = ev.y - scrollBar.top;	2084	csrO = ev.y - scrollBar.top;
2069	/* FALLTHROUGH */	2085	/* FALLTHROUGH */
2070		2086
2071	case Button3:	2087	case Button3:
2072	if (scrollBar.style != R_SB_XTERM)	2088	if (scrollBar.style != SB_STYLE_XTERM)
2073	{	2089	{
2074	if (scrollbar_above_slider (ev.y))	2090	if (scrollBar.above_slider (ev.y))
2075	# ifdef RXVT_SCROLL_FULL	2091	# ifdef RXVT_SCROLL_FULL
2076	scr_page (UP, nrow - 1);	2092	scr_page (UP, nrow - 1);
2077	# else	2093	# else
2078	scr_page (UP, nrow / 4);	2094	scr_page (UP, nrow / 4);
2079	# endif	2095	# endif
2080	else if (scrollbar_below_slider (ev.y))	2096	else if (scrollBar.below_slider (ev.y))
2081	# ifdef RXVT_SCROLL_FULL	2097	# ifdef RXVT_SCROLL_FULL
2082	scr_page (DN, nrow - 1);	2098	scr_page (DN, nrow - 1);
2083	# else	2099	# else
2084	scr_page (DN, nrow / 4);	2100	scr_page (DN, nrow / 4);
2085	# endif	2101	# endif
2086	else	2102	else
2087	scrollBar.state = STATE_MOTION;	2103	scrollBar.state = SB_STATE_MOTION;
2088	}	2104	}
2089	else	2105	else
2090	{	2106	{
2091	scr_page ((ev.button == Button1 ? DN : UP),	2107	scr_page ((ev.button == Button1 ? DN : UP),
2092	(nrow	2108	(nrow
2093	* scrollbar_position (ev.y)	2109	* scrollBar.position (ev.y)
2094	/ scrollBar.size ()));	2110	/ scrollBar.size ()));
2095	}	2111	}
2096		2112
2097	break;	2113	break;
2098	}	2114	}
…		…
2109		2125
2110	csrO = 0; /* reset csr Offset */	2126	csrO = 0; /* reset csr Offset */
2111	if (!bypass_keystate)	2127	if (!bypass_keystate)
2112	reportmode = !! (priv_modes & PrivMode_mouse_report);	2128	reportmode = !! (priv_modes & PrivMode_mouse_report);
2113		2129
2114	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2130	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2115	{	2131	{
2116	scrollBar.state = STATE_IDLE;	2132	scrollBar.state = SB_STATE_IDLE;
2117	scrollBar.show (0);	2133	scrollBar.show (0);
2118	}	2134	}
2119		2135
2120	#ifdef SELECTION_SCROLLING	2136	#ifdef SELECTION_SCROLLING
2121	sel_scroll_ev.stop();	2137	sel_scroll_ev.stop();
…		…
2171	case Button3:	2187	case Button3:
2172	selection_make (ev.time);	2188	selection_make (ev.time);
2173	break;	2189	break;
2174		2190
2175	case Button2:	2191	case Button2:
2176	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2192	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);	2193	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178	break;	2194	break;
2179		2195
2180	#ifdef MOUSE_WHEEL	2196	#ifdef MOUSE_WHEEL
2181	case Button4:	2197	case Button4:
…		…
2216	}	2232	}
2217	}	2233	}
2218		2234
2219	/}}} /	2235	/}}} /
2220		2236
2221	void	2237	void ecb_hot
2222	rxvt_term::cmd_parse ()	2238	rxvt_term::cmd_parse ()
2223	{	2239	{
2224	wchar_t ch = NOCHAR;	2240	wchar_t ch = NOCHAR;
2225	char *seq_begin; // remember start of esc-sequence here	2241	char *seq_begin; // remember start of esc-sequence here
2226		2242
2227	for (;;)	2243	for (;;)
2228	{	2244	{
2229	if (expect_false (ch == NOCHAR))	2245	if (ecb_unlikely (ch == NOCHAR))
2230	{	2246	{
2231	seq_begin = cmdbuf_ptr;	2247	seq_begin = cmdbuf_ptr;
2232	ch = next_char ();	2248	ch = next_char ();
2233		2249
2234	if (ch == NOCHAR)	2250	if (ch == NOCHAR)
2235	break;	2251	break;
2236	}	2252	}
2237		2253
2238	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2254	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2239	{	2255	{
2240	if (expect_false (!seen_input))	2256	if (ecb_unlikely (!seen_input))
2241	{	2257	{
2242	seen_input = 1;	2258	seen_input = 1;
2243	// many badly-written programs (e.g. jed) contain a race condition:	2259	// many badly-written programs (e.g. jed) contain a race condition:
2244	// they first read the screensize and then install a SIGWINCH handler.	2260	// they first read the screensize and then install a SIGWINCH handler.
2245	// some window managers resize the window early, and these programs	2261	// some window managers resize the window early, and these programs
…		…
2258	wchar_t *str = buf;	2274	wchar_t *str = buf;
2259	wchar_t *eol = str + min (ncol, UBUFSIZ);	2275	wchar_t *eol = str + min (ncol, UBUFSIZ);
2260		2276
2261	for (;;)	2277	for (;;)
2262	{	2278	{
2263	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2279	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264	break;	2280	break;
2265		2281
2266	*str++ = ch;	2282	*str++ = ch;
2267		2283
2268	if (expect_false (ch == C0_LF \|\| str >= eol))	2284	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2269	{	2285	{
2270	if (ch == C0_LF)	2286	if (ch == C0_LF)
2271	nlines++;	2287	nlines++;
2272		2288
2273	refresh_count++;	2289	refresh_count++;
…		…
2345	}	2361	}
2346	}	2362	}
2347	}	2363	}
2348		2364
2349	// read the next character	2365	// read the next character
2350	wchar_t	2366	wchar_t ecb_hot
2351	rxvt_term::next_char () NOTHROW	2367	rxvt_term::next_char () NOTHROW
2352	{	2368	{
2353	while (cmdbuf_ptr < cmdbuf_endp)	2369	while (cmdbuf_ptr < cmdbuf_endp)
2354	{	2370	{
2355	// assume 7-bit to be ascii ALWAYS	2371	// assume 7-bit to be ascii ALWAYS
2356	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2372	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2357	return *cmdbuf_ptr++;	2373	return *cmdbuf_ptr++;
2358		2374
2359	wchar_t wc;	2375	wchar_t wc;
2360	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2376	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361		2377
…		…
2379		2395
2380	return NOCHAR;	2396	return NOCHAR;
2381	}	2397	}
2382		2398
2383	// read the next octet	2399	// read the next octet
2384	uint32_t	2400	uint32_t ecb_hot
2385	rxvt_term::next_octet () NOTHROW	2401	rxvt_term::next_octet () NOTHROW
2386	{	2402	{
2387	return cmdbuf_ptr < cmdbuf_endp	2403	return cmdbuf_ptr < cmdbuf_endp
2388	? (unsigned char)*cmdbuf_ptr++	2404	? (unsigned char)*cmdbuf_ptr++
2389	: NOCHAR;	2405	: NOCHAR;
2390	}	2406	}
2391		2407
2392	static class out_of_input out_of_input;	2408	static class out_of_input out_of_input;
2393		2409
2394	/* rxvt_cmd_getc () - Return next input character */	2410	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))	2411	rxvt_term::cmd_getc () THROW ((class out_of_input))
2401	{	2412	{
2402	wchar_t c = next_char ();	2413	wchar_t c = next_char ();
2403		2414
2404	if (c == NOCHAR)	2415	if (c == NOCHAR)
2405	throw out_of_input;	2416	throw out_of_input;
2406		2417
2407	return c;	2418	return c;
2408	}	2419	}
2409		2420
2410	uint32_t	2421	uint32_t ecb_hot
2411	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2422	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412	{	2423	{
2413	uint32_t c = next_octet ();	2424	uint32_t c = next_octet ();
2414		2425
2415	if (c == NOCHAR)	2426	if (c == NOCHAR)
…		…
2419	}	2430	}
2420		2431
2421	/{{{ print pipe /	2432	/{{{ print pipe /
2422	/----------------------------------------------------------------------/	2433	/----------------------------------------------------------------------/
2423	#ifdef PRINTPIPE	2434	#ifdef PRINTPIPE
2424	FILE *	2435	FILE * ecb_cold
2425	rxvt_term::popen_printer ()	2436	rxvt_term::popen_printer ()
2426	{	2437	{
2427	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2438	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2428		2439
2429	if (stream == NULL)	2440	if (stream == NULL)
2430	rxvt_warn ("can't open printer pipe, not printing.\n");	2441	rxvt_warn ("can't open printer pipe, not printing.\n");
2431		2442
2432	return stream;	2443	return stream;
2433	}	2444	}
2434		2445
2435	int	2446	int ecb_cold
2436	rxvt_term::pclose_printer (FILE *stream)	2447	rxvt_term::pclose_printer (FILE *stream)
2437	{	2448	{
2438	fflush (stream);	2449	fflush (stream);
2439	return pclose (stream);	2450	return pclose (stream);
2440	}	2451	}
2441		2452
2442	/*	2453	/*
2443	* simulate attached vt100 printer	2454	* simulate attached vt100 printer
2444	*/	2455	*/
2445	void	2456	void ecb_cold
2446	rxvt_term::process_print_pipe ()	2457	rxvt_term::process_print_pipe ()
2447	{	2458	{
2448	FILE *fd = popen_printer ();	2459	FILE *fd = popen_printer ();
2449		2460
2450	if (!fd)	2461	if (!fd)
…		…
2496	pclose_printer (fd);	2507	pclose_printer (fd);
2497	}	2508	}
2498	#endif /* PRINTPIPE */	2509	#endif /* PRINTPIPE */
2499	/}}} /	2510	/}}} /
2500		2511
2501	/* INDENT-OFF */
2502	enum {	2512	enum {
2503	C1_40 = 0x40,	2513	C1_40 = 0x40,
2504	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2514	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,	2515	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,	2516	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,	2517	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508	};	2518	};
2509	/* INDENT-ON */
2510		2519
2511	/{{{ process non-printing single characters /	2520	/{{{ process non-printing single characters /
2512	void	2521	void ecb_hot
2513	rxvt_term::process_nonprinting (unicode_t ch)	2522	rxvt_term::process_nonprinting (unicode_t ch)
2514	{	2523	{
2515	switch (ch)	2524	switch (ch)
2516	{	2525	{
2517	case C0_ESC:	2526	case C0_ESC:
…		…
2563	}	2572	}
2564	/}}} /	2573	/}}} /
2565		2574
2566		2575
2567	/{{{ process VT52 escape sequences /	2576	/{{{ process VT52 escape sequences /
2568	void	2577	void ecb_cold
2569	rxvt_term::process_escape_vt52 (unicode_t ch)	2578	rxvt_term::process_escape_vt52 (unicode_t ch)
2570	{	2579	{
2571	int row, col;	2580	int row, col;
2572		2581
2573	switch (ch)	2582	switch (ch)
…		…
2607	break;	2616	break;
2608	case 'Z': /* identify the terminal type */	2617	case 'Z': /* identify the terminal type */
2609	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2618	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610	break;	2619	break;
2611	case '<': /* turn off VT52 mode */	2620	case '<': /* turn off VT52 mode */
2612	set_privmode (PrivMode_vt52, 0);	2621	priv_modes &= ~PrivMode_vt52;
2613	break;	2622	break;
2614	case 'F': /* use special graphics character set */	2623	case 'F': /* use special graphics character set */
2615	case 'G': /* use regular character set */	2624	case 'G': /* use regular character set */
2616	/* unimplemented */	2625	/* unimplemented */
2617	break;	2626	break;
…		…
2623	}	2632	}
2624	/}}} /	2633	/}}} /
2625		2634
2626		2635
2627	/{{{ process escape sequences /	2636	/{{{ process escape sequences /
2628	void	2637	void ecb_hot
2629	rxvt_term::process_escape_seq ()	2638	rxvt_term::process_escape_seq ()
2630	{	2639	{
2631	unicode_t ch = cmd_getc ();	2640	unicode_t ch = cmd_getc ();
2632		2641
2633	if (priv_modes & PrivMode_vt52)	2642	if (priv_modes & PrivMode_vt52)
…		…
2636	return;	2645	return;
2637	}	2646	}
2638		2647
2639	switch (ch)	2648	switch (ch)
2640	{	2649	{
2641	/* case 1: do_tek_mode (); break; */
2642	case '#':	2650	case '#':
2643	if (cmd_getc () == '8')	2651	if (cmd_getc () == '8')
2644	scr_E ();	2652	scr_E ();
2645	break;	2653	break;
2646	case '(':	2654	case '(':
…		…
2669	#if !ENABLE_MINIMAL	2677	#if !ENABLE_MINIMAL
2670	case '9':	2678	case '9':
2671	scr_forwardindex ();	2679	scr_forwardindex ();
2672	break;	2680	break;
2673	#endif	2681	#endif
		2682	// DECPAM/DECPNM
2674	case '=':	2683	case '=':
		2684	priv_modes \|= PrivMode_aplKP;
		2685	break;
2675	case '>':	2686	case '>':
2676	set_privmode (PrivMode_aplKP, ch == '=');	2687	priv_modes &= ~PrivMode_aplKP;
2677	break;	2688	break;
2678		2689
2679	case C1_40:	2690	case C1_40:
2680	cmd_getc ();	2691	cmd_getc ();
2681	break;	2692	break;
…		…
2685		2696
2686	/* 8.3.87: NEXT LINE */	2697	/* 8.3.87: NEXT LINE */
2687	case C1_NEL: /* ESC E */	2698	case C1_NEL: /* ESC E */
2688	{	2699	{
2689	wchar_t nlcr[] = { C0_LF, C0_CR };	2700	wchar_t nlcr[] = { C0_LF, C0_CR };
2690	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2701	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691	}	2702	}
2692	break;	2703	break;
2693		2704
2694	/* kidnapped escape sequence: Should be 8.3.48 */	2705	/* kidnapped escape sequence: Should be 8.3.48 */
2695	case C1_ESA: /* ESC G */	2706	case C1_ESA: /* ESC G */
2696	process_graphics ();	2707	// used by original rxvt for rob nations own graphics mode
		2708	if (cmd_getc () == 'Q')
		2709	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2697	break;	2710	break;
2698		2711
2699	/* 8.3.63: CHARACTER TABULATION SET */	2712	/* 8.3.63: CHARACTER TABULATION SET */
2700	case C1_HTS: /* ESC H */	2713	case C1_HTS: /* ESC H */
2701	scr_set_tab (1);	2714	scr_set_tab (1);
…		…
2705	case C1_RI: /* ESC M */	2718	case C1_RI: /* ESC M */
2706	scr_index (DN);	2719	scr_index (DN);
2707	break;	2720	break;
2708		2721
2709	/* 8.3.142: SINGLE-SHIFT TWO */	2722	/* 8.3.142: SINGLE-SHIFT TWO */
2710	/case C1_SS2: scr_single_shift (2); break; /	2723	/* case C1_SS2: break; */
2711		2724
2712	/* 8.3.143: SINGLE-SHIFT THREE */	2725	/* 8.3.143: SINGLE-SHIFT THREE */
2713	/case C1_SS3: scr_single_shift (3); break; /	2726	/* case C1_SS3: break; */
2714		2727
2715	/* 8.3.27: DEVICE CONTROL STRING */	2728	/* 8.3.27: DEVICE CONTROL STRING */
2716	case C1_DCS: /* ESC P */	2729	case C1_DCS: /* ESC P */
2717	process_dcs_seq ();	2730	process_dcs_seq ();
2718	break;	2731	break;
…		…
2751	}	2764	}
2752	}	2765	}
2753	/}}} /	2766	/}}} /
2754		2767
2755	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2768	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2756	/* INDENT-OFF */
2757	enum {	2769	enum {
2758	CSI_ICH = 0x40,	2770	CSI_ICH = 0x40,
2759	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2771	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2760	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2772	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2761	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2773	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2781	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2793	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2782	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2794	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2783	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2795	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2784	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2796	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2785	};	2797	};
2786	/* INDENT-ON */
2787		2798
2788	void	2799	void ecb_hot
2789	rxvt_term::process_csi_seq ()	2800	rxvt_term::process_csi_seq ()
2790	{	2801	{
2791	unicode_t ch, priv, i;	2802	unicode_t ch, priv, i;
2792	unsigned int nargs, p;	2803	unsigned int nargs, p;
2793	int n, ndef;	2804	int n, ndef;
…		…
2871	scr_soft_reset ();	2882	scr_soft_reset ();
2872		2883
2873	static const int pm_h[] = { 7, 25 };	2884	static const int pm_h[] = { 7, 25 };
2874	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2885	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875		2886
2876	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2887	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2877	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2888	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2878	}	2889	}
2879	break;	2890	break;
2880	}	2891	}
2881		2892
2882	return;	2893	return;
…		…
2900	}	2911	}
2901	break;	2912	break;
2902	#endif	2913	#endif
2903		2914
2904	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2915	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2905	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2916	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2906	arg[0] = -arg[0];	2917	arg[0] = -arg[0];
2907	/* FALLTHROUGH */	2918	/* FALLTHROUGH */
2908	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2919	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2909	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2920	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2910	scr_gotorc (arg[0], 0, RELATIVE);	2921	scr_gotorc (arg[0], 0, RELATIVE);
2911	break;	2922	break;
2912		2923
2913	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2924	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2914	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2925	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3101	}	3112	}
3102	}	3113	}
3103	/}}} /	3114	/}}} /
3104		3115
3105	#if !ENABLE_MINIMAL	3116	#if !ENABLE_MINIMAL
3106	/* ARGSUSED */
3107	void	3117	void
3108	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3118	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3109	{	3119	{
3110	int x, y;	3120	int x, y;
3111	XWindowAttributes wattr;	3121	XWindowAttributes wattr;
…		…
3120	{	3130	{
3121	/*	3131	/*
3122	* commands	3132	* commands
3123	*/	3133	*/
3124	case 1: /* deiconify window */	3134	case 1: /* deiconify window */
3125	XMapWindow (dpy, parent[0]);	3135	XMapWindow (dpy, parent);
3126	break;	3136	break;
3127	case 2: /* iconify window */	3137	case 2: /* iconify window */
3128	XIconifyWindow (dpy, parent[0], display->screen);	3138	XIconifyWindow (dpy, parent, display->screen);
3129	break;	3139	break;
3130	case 3: /* set position (pixels) */	3140	case 3: /* set position (pixels) */
3131	XMoveWindow (dpy, parent[0], args[1], args[2]);	3141	XMoveWindow (dpy, parent, args[1], args[2]);
3132	break;	3142	break;
3133	case 4: /* set size (pixels) */	3143	case 4: /* set size (pixels) */
3134	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3144	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3135	break;	3145	break;
3136	case 5: /* raise window */	3146	case 5: /* raise window */
3137	XRaiseWindow (dpy, parent[0]);	3147	XRaiseWindow (dpy, parent);
3138	break;	3148	break;
3139	case 6: /* lower window */	3149	case 6: /* lower window */
3140	XLowerWindow (dpy, parent[0]);	3150	XLowerWindow (dpy, parent);
3141	break;	3151	break;
3142	case 7: /* refresh window */	3152	case 7: /* refresh window */
3143	scr_touch (true);	3153	scr_touch (true);
3144	break;	3154	break;
3145	case 8: /* set size (chars) */	3155	case 8: /* set size (chars) */
…		…
3148	break;	3158	break;
3149		3159
3150	//case 9: NYI, TODO, restore maximized window or maximize window	3160	//case 9: NYI, TODO, restore maximized window or maximize window
3151	default:	3161	default:
3152	if (args[0] >= 24) /* set height (chars) */	3162	if (args[0] >= 24) /* set height (chars) */
3153	set_widthheight ((unsigned int)width,	3163	set_widthheight ((unsigned int)vt_width,
3154	(unsigned int) (args[1] * fheight));	3164	(unsigned int) (args[1] * fheight));
3155	break;	3165	break;
3156		3166
3157	/*	3167	/*
3158	* reports - some output format copied from XTerm	3168	* reports - some output format copied from XTerm
3159	*/	3169	*/
3160	case 11: /* report window state */	3170	case 11: /* report window state */
3161	XGetWindowAttributes (dpy, parent[0], &wattr);	3171	XGetWindowAttributes (dpy, parent, &wattr);
3162	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3172	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3163	break;	3173	break;
3164	case 13: /* report window position */	3174	case 13: /* report window position */
3165	XGetWindowAttributes (dpy, parent[0], &wattr);	3175	XGetWindowAttributes (dpy, parent, &wattr);
3166	XTranslateCoordinates (dpy, parent[0], wattr.root,	3176	XTranslateCoordinates (dpy, parent, wattr.root,
3167	-wattr.border_width, -wattr.border_width,	3177	-wattr.border_width, -wattr.border_width,
3168	&x, &y, &wdummy);	3178	&x, &y, &wdummy);
3169	tt_printf ("\033[3;%d;%dt", x, y);	3179	tt_printf ("\033[3;%d;%dt", x, y);
3170	break;	3180	break;
3171	case 14: /* report window size (pixels) */	3181	case 14: /* report window size (pixels) */
3172	XGetWindowAttributes (dpy, parent[0], &wattr);	3182	XGetWindowAttributes (dpy, parent, &wattr);
3173	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3183	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3174	break;	3184	break;
3175	case 18: /* report text area size (chars) */	3185	case 18: /* report text area size (chars) */
3176	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3186	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3177	break;	3187	break;
…		…
3179	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3189	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3180	break;	3190	break;
3181	case 20: /* report icon label */	3191	case 20: /* report icon label */
3182	{	3192	{
3183	char *s;	3193	char *s;
3184	XGetIconName (dpy, parent[0], &s);	3194	XGetIconName (dpy, parent, &s);
3185	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3195	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3186	XFree (s);	3196	XFree (s);
3187	}	3197	}
3188	break;	3198	break;
3189	case 21: /* report window title */	3199	case 21: /* report window title */
3190	{	3200	{
3191	char *s;	3201	char *s;
3192	XFetchName (dpy, parent[0], &s);	3202	XFetchName (dpy, parent, &s);
3193	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3203	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3194	XFree (s);	3204	XFree (s);
3195	}	3205	}
3196	break;	3206	break;
3197	}	3207	}
…		…
3351	unsigned long bytes_after;	3361	unsigned long bytes_after;
3352	unsigned char *value = 0;	3362	unsigned char *value = 0;
3353	const char *str = "";	3363	const char *str = "";
3354		3364
3355	if (prop	3365	if (prop
3356	&& XGetWindowProperty (dpy, parent[0],	3366	&& XGetWindowProperty (dpy, parent,
3357	prop, 0, 1<<16, 0, AnyPropertyType,	3367	prop, 0, 1<<16, 0, AnyPropertyType,
3358	&actual_type, &actual_format,	3368	&actual_type, &actual_format,
3359	&nitems, &bytes_after, &value) == Success	3369	&nitems, &bytes_after, &value) == Success
3360	&& actual_type != None	3370	&& actual_type != None
3361	&& actual_format == 8)	3371	&& actual_format == 8)
…		…
3373	{	3383	{
3374	*eq = 0;	3384	*eq = 0;
3375	set_utf8_property (display->atom (str), eq + 1);	3385	set_utf8_property (display->atom (str), eq + 1);
3376	}	3386	}
3377	else	3387	else
3378	XDeleteProperty (dpy, parent[0],	3388	XDeleteProperty (dpy, parent,
3379	display->atom (str));	3389	display->atom (str));
3380	}	3390	}
3381	break;	3391	break;
3382		3392
3383	case XTerm_Color:	3393	case XTerm_Color:
…		…
3444	process_color_seq (op, Color_tint, str, resp);	3454	process_color_seq (op, Color_tint, str, resp);
3445	{	3455	{
3446	bool changed = false;	3456	bool changed = false;
3447		3457
3448	if (ISSET_PIXCOLOR (Color_tint))	3458	if (ISSET_PIXCOLOR (Color_tint))
3449	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3459	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3450		3460
3451	if (changed)	3461	if (changed)
3452	update_background ();	3462	update_background ();
3453	}	3463	}
3454		3464
…		…
3458	#if BG_IMAGE_FROM_FILE	3468	#if BG_IMAGE_FROM_FILE
3459	case Rxvt_Pixmap:	3469	case Rxvt_Pixmap:
3460	if (!strcmp (str, "?"))	3470	if (!strcmp (str, "?"))
3461	{	3471	{
3462	char str[256];	3472	char str[256];
		3473	int h_scale = 0, v_scale = 0;
		3474	int h_align = 0, v_align = 0;
		3475	if (image_vec.size () > 0)
		3476	{
		3477	h_scale = image_vec[0].h_scale;
		3478	v_scale = image_vec[0].v_scale;
		3479	h_align = image_vec[0].h_align;
		3480	v_align = image_vec[0].v_align;
		3481	}
3463		3482
3464	sprintf (str, "[%dx%d+%d+%d]",	3483	sprintf (str, "[%dx%d+%d+%d]",
3465	min (h_scale, 32767), min (v_scale, 32767),	3484	h_scale, v_scale,
3466	min (h_align, 32767), min (v_align, 32767));	3485	h_align, v_align);
3467	process_xterm_seq (XTerm_title, str, CHAR_ST);	3486	process_xterm_seq (XTerm_title, str, CHAR_ST);
3468	}	3487	}
3469	else	3488	else
3470	{	3489	{
3471	int changed = 0;	3490	bool changed = false;
3472		3491
3473	if (*str != ';')	3492	if (*str != ';')
3474	{	3493	{
3475	if (bg_set_file (str)) /* change pixmap */	3494	if (image_vec.size () > 0)
		3495	changed = image_vec[0].set_file_geometry (str);
		3496	else
3476	{	3497	{
3477	changed++;	3498	rxvt_image *image = new_image ();
3478	str = strchr (str, ';');	3499	if (!image->set_file_geometry (str))
3479	if (str == NULL)	3500	image_vec.pop_back ();
3480	bg_set_default_geometry ();
3481	else	3501	else
3482	bg_set_geometry (str+1);	3502	changed = true;
3483	}	3503	}
3484	}	3504	}
3485	else	3505	else
3486	{	3506	{
3487	str++;	3507	str++;
		3508	if (image_vec.size () > 0)
3488	if (bg_set_geometry (str, true))	3509	changed = image_vec[0].set_geometry (str, true);
3489	changed++;
3490	}	3510	}
3491		3511
3492	if (changed)	3512	if (changed)
3493	{	3513	{
3494	if (bg_window_position_sensitive ())	3514	if (bg_window_position_sensitive ())
…		…
3593	* 's' = save	3613	* 's' = save
3594	* 'r' = restore	3614	* 'r' = restore
3595	* 't' = toggle	3615	* 't' = toggle
3596	* so no need for fancy checking	3616	* so no need for fancy checking
3597	*/	3617	*/
3598	int	3618	int ecb_cold
3599	rxvt_term::privcases (int mode, unsigned long bit)	3619	rxvt_term::privcases (int mode, unsigned long bit)
3600	{	3620	{
3601	int state;	3621	int state;
3602		3622
3603	if (mode == 's')	3623	if (mode == 's')
3604	{	3624	{
3605	SavedModes \|= (priv_modes & bit);	3625	if (priv_modes & bit)
		3626	SavedModes \|= bit;
		3627	else
		3628	SavedModes &= ~bit;
3606	return -1;	3629	return -1;
3607	}	3630	}
3608	else	3631	else
3609	{	3632	{
3610	if (mode == 'r')	3633	if (mode == 'r')
3611	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3634	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3612	else	3635	else
3613	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3636	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614		3637
3615	set_privmode (bit, state);	3638	if (state)
		3639	priv_modes \|= bit;
		3640	else
		3641	priv_modes &= ~bit;
3616	}	3642	}
3617		3643
3618	return state;	3644	return state;
3619	}	3645	}
3620		3646
3621	/* we're not using priv _yet_ */	3647	/* we're not using priv _yet_ */
3622	void	3648	void
3623	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3649	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3624	{	3650	{
3625	unsigned int i, j;	3651	unsigned int i, j;
3626	int state;	3652	int state;
3627		3653
3628	static const struct	3654	static const struct
3629	{	3655	{
3630	const int argval;	3656	const int argval;
3631	const unsigned long bit;	3657	const unsigned long bit;
3632	} argtopriv[] = {	3658	} argtopriv[] = {
3633	{ 1, PrivMode_aplCUR }, // DECCKM	3659	{ 1, PrivMode_aplCUR }, // DECCKM
3634	{ 2, PrivMode_vt52 },	3660	{ 2, PrivMode_vt52 }, // DECANM
3635	{ 3, PrivMode_132 }, // DECCOLM	3661	{ 3, PrivMode_132 }, // DECCOLM
3636	{ 4, PrivMode_smoothScroll }, // DECSCLM	3662	{ 4, PrivMode_smoothScroll }, // DECSCLM
3637	{ 5, PrivMode_rVideo }, // DECSCNM	3663	{ 5, PrivMode_rVideo }, // DECSCNM
3638	{ 6, PrivMode_relOrigin }, // DECOM	3664	{ 6, PrivMode_relOrigin }, // DECOM
3639	{ 7, PrivMode_Autowrap }, // DECAWM	3665	{ 7, PrivMode_Autowrap }, // DECAWM
3640	// 8, auto-repeat keys // DECARM	3666	// 8, auto-repeat keys // DECARM
3641	{ 9, PrivMode_MouseX10 },	3667	{ 9, PrivMode_MouseX10 },
3642	// 18 end FF to printer after print screen	3668	// 18 end FF to printer after print screen
3643	// 19 Print screen prints full screen/scroll region	3669	// 19 Print screen prints full screen/scroll region
3644	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3670	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3645	#ifdef scrollBar_esc	3671	#ifdef scrollBar_esc
3646	{ scrollBar_esc, PrivMode_scrollBar },	3672	{ scrollBar_esc, PrivMode_scrollBar },
3647	#endif	3673	#endif
3648	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3674	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3649	// 38, tektronix mode // DECTEK	3675	// 38, tektronix mode // DECTEK
3650	{ 40, PrivMode_132OK },	3676	{ 40, PrivMode_132OK },
3651	// 41 xterm more fixes NYI	3677	// 41 xterm more fixes NYI
3652	// 45 margin bell NYI	3678	// 45 margin bell NYI
3653	// 46 start logging	3679	// 46 start logging
3654	{ 47, PrivMode_Screen },	3680	{ 47, PrivMode_Screen },
3655	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3681	{ 66, PrivMode_aplKP }, // DECNKM
3656	#ifndef NO_BACKSPACE_KEY	3682	#ifndef NO_BACKSPACE_KEY
3657	{ 67, PrivMode_BackSpace }, // DECBKM	3683	{ 67, PrivMode_BackSpace }, // DECBKM
3658	#endif	3684	#endif
3659	{ 1000, PrivMode_MouseX11 },	3685	{ 1000, PrivMode_MouseX11 },
3660	{ 1002, PrivMode_MouseBtnEvent },	3686	{ 1002, PrivMode_MouseBtnEvent },
…		…
3689	for (i = 0; i < nargs; i++)	3715	for (i = 0; i < nargs; i++)
3690	{	3716	{
3691	state = -1;	3717	state = -1;
3692		3718
3693	/* basic handling */	3719	/* basic handling */
3694	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3720	for (j = 0; j < ecb_array_length (argtopriv); j++)
3695	if (argtopriv[j].argval == arg[i])	3721	if (argtopriv[j].argval == arg[i])
3696	{	3722	{
3697	state = privcases (mode, argtopriv[j].bit);	3723	state = privcases (mode, argtopriv[j].bit);
3698	break;	3724	break;
3699	}	3725	}
…		…
3725	case 2: /* VT52 mode */	3751	case 2: /* VT52 mode */
3726	/* oddball mode. should be set regardless of set/reset	3752	/* oddball mode. should be set regardless of set/reset
3727	* parameter. Return from VT52 mode with an ESC < from	3753	* parameter. Return from VT52 mode with an ESC < from
3728	* within VT52 mode	3754	* within VT52 mode
3729	*/	3755	*/
3730	set_privmode (PrivMode_vt52, 1);	3756	priv_modes \|= PrivMode_vt52;
3731	break;	3757	break;
3732	case 3: /* 80/132 */	3758	case 3: /* 80/132 */
3733	if (priv_modes & PrivMode_132OK)	3759	if (priv_modes & PrivMode_132OK)
3734	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3760	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3735	break;	3761	break;
…		…
3750	if (state) /* orthogonal */	3776	if (state) /* orthogonal */
3751	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3777	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3752	break;	3778	break;
3753	#ifdef scrollBar_esc	3779	#ifdef scrollBar_esc
3754	case scrollBar_esc:	3780	case scrollBar_esc:
3755	if (scrollBar.map (state))	3781	scrollBar.map (state);
3756	{
3757	resize_all_windows (0, 0, 0);	3782	resize_all_windows (0, 0, 0);
3758	scr_touch (true);	3783	scr_touch (true);
3759	}
3760	break;	3784	break;
3761	#endif	3785	#endif
3762	case 25: /* visible/invisible cursor */	3786	case 25: /* visible/invisible cursor */
3763	scr_cursor_visible (state);	3787	scr_cursor_visible (state);
3764	break;	3788	break;
…		…
3819	}	3843	}
3820	}	3844	}
3821	/}}} /	3845	/}}} /
3822		3846
3823	/{{{ process sgr sequences /	3847	/{{{ process sgr sequences /
3824	void	3848	void ecb_hot
3825	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3849	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3826	{	3850	{
3827	unsigned int i;	3851	unsigned int i;
3828	short rendset;	3852	short rendset;
3829	int rendstyle;	3853	int rendstyle;
…		…
3972	}	3996	}
3973	}	3997	}
3974	}	3998	}
3975	/}}} /	3999	/}}} /
3976		4000
3977	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3978	void
3979	rxvt_term::process_graphics ()
3980	{
3981	unicode_t ch, cmd = cmd_getc ();
3982
3983	if (cmd == 'Q')
3984	{
3985	/* query graphics */
3986	tt_printf ("\033G0\012"); /* no graphics */
3987	return;
3988	}
3989	/* swallow other graphics sequences until terminating ':' */
3990	do
3991	ch = cmd_getc ();
3992	while (ch != ':');
3993	}
3994	/}}} /
3995
3996	/* ------------------------------------------------------------------------- */	4001	/* ------------------------------------------------------------------------- */
3997		4002
3998	/*	4003	/*
3999	* Send printf () formatted output to the command.	4004	* Send printf () formatted output to the command.
4000	* Only use for small amounts of data.	4005	* Only use for small amounts of data.
…		…
4028		4033
4029	if (v_buflen == 0)	4034	if (v_buflen == 0)
4030	{	4035	{
4031	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	4036	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4032		4037
		4038	max_it (written, 0);
		4039
4033	if ((unsigned int)written == len)	4040	if (written == len)
4034	return;	4041	return;
4035		4042
4036	data += written;	4043	data += written;
4037	len -= written;	4044	len -= written;
4038	}	4045	}

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs. Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC