ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

…		…
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
64		59
65	/*----------------------------------------------------------------------*/	60	/*----------------------------------------------------------------------*/
66		61
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		63
72	#if ENABLE_FRILLS || ISO_14755	64	#if ENABLE_FRILLS || ISO_14755
73		65
74	#define ISO_14755_STARTED 0x80000000UL	66	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	67	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	139	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	140	return;
149		141
150	for (;;)	142	for (;;)
151	{	143	{
152	const line_t &l = ROW(y - view_start);	144	const line_t &l = ROW(y + view_start);
153		145
154	text_t t = l.t[x];	146	text_t t = l.t[x];
155		147
156	if (t != NOCHAR || !x)	148	if (t != NOCHAR || !x)
157	{	149	{
…		…
230	# if !UNICODE3	222	# if !UNICODE3
231	if (ch >= 0x10000)	223	if (ch >= 0x10000)
232	ch = 0xfffd;	224	ch = 0xfffd;
233	# endif	225	# endif
234	scr_overlay_set (11, y, ch, r);	226	scr_overlay_set (11, y, ch, r);
		227
		228	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
236	}	230	}
237		231
		232	// {
		233	// char buf[4+4+3+1];
		234	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		235	// scr_overlay_set (0, 0, buf);
		236	// }
238	scr_overlay_set (0, len , attr);	237	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	238	scr_overlay_set (0, len + 1, fname);
240		239
241	free (fname);	240	free (fname);
242		241
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	301	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	302	{
304	int ctrl, meta, shft, len;	303	int ctrl, meta, shft, len;
305	unsigned int newlen;	304	unsigned int newlen;
306	KeySym keysym;	305	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	306	int valid_keysym;
311	char kbuf[KBUFSZ];	307	char kbuf[KBUFSZ];
312		308
313	/*	309	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	310	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	439	scr_move_to (0, 1);
444	return;	440	return;
445	}	441	}
446	else if (keysym == XK_End)	442	else if (keysym == XK_End)
447	{	443	{
448	scr_move_to (1, 0);	444	scr_move_to (1, 1);
449	return;	445	return;
450	}	446	}
451	}	447	}
452	#endif	448	#endif
453	}	449	}
…		…
464	{	460	{
465	switch (keysym)	461	switch (keysym)
466	{	462	{
467	/* normal XTerm key bindings */	463	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	464	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	465	selection_request (ev.time);
470	return;	466	return;
471	#if TODO	467	#if TODO
472	/* rxvt extras */	468	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	469	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	470	change_font (FONT_UP);
…		…
867	#endif	863	#endif
868	/* nil */ ;	864	/* nil */ ;
869	}	865	}
870	}	866	}
871		867
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))	868	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	869	return;
874		870
875	if (len <= 0)	871	if (len <= 0)
876	return; /* not mapped */	872	return; /* not mapped */
877		873
…		…
905	{	901	{
906	const char ch = C0_ESC;	902	const char ch = C0_ESC;
907	tt_write (&ch, 1);	903	tt_write (&ch, 1);
908	}	904	}
909		905
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	906	tt_write (kbuf, (unsigned int)len);
921	}	907	}
922	/*}}} */	908	/*}}} */
923		909
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	910	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	911	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	912	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	913	{
930	unsigned int n, s;	914	unsigned int n, s;
931		915
…		…
972		956
973	if (want_refresh)	957	if (want_refresh)
974	{	958	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	959	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	960	{
977	int row = -view_start;	961	int row = view_start;
		962	int end_row = row + nrow;
978		963
979	while (row > -nsaved && ROW (row - 1).is_longer ())	964	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	965	--row;
981		966
982	while (row < -view_start + nrow)	967	do
983	{	968	{
984	int start_row = row;	969	int start_row = row;
985	line_t *l;	970	line_t *l;
986		971
987	do	972	do
988	{	973	{
989	l = &ROW (row);	974	l = &ROW (row++);
990		975
991	if (!(l->f & LINE_FILTERED))	976	if (!(l->f & LINE_FILTERED))
992	{	977	{
993	// line not filtered, mark it as filtered	978	// line not filtered, mark it as filtered
994	l->f |= LINE_FILTERED;	979	l->f |= LINE_FILTERED;
995	while (l->is_longer ())	980	while (l->is_longer ())
996	{	981	{
997	l = &ROW (++row);	982	l = &ROW (row++);
998	l->f |= LINE_FILTERED;	983	l->f |= LINE_FILTERED;
999	}	984	}
1000		985
1001	// and filter it	986	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	987	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		988
1004	break;	989	break;
1005	}	990	}
1006	}	991	}
1007	while (l->is_longer ());	992	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	993	}
		994	while (row < end_row);
1011		995	}
1012	}
1013		996
1014	scr_refresh (refresh_type);	997	scr_refresh ();
1015	scrollbar_show (1);	998	scrollbar_show (1);
1016	#ifdef USE_XIM	999	#ifdef USE_XIM
1017	IMSendSpot ();	1000	IMSendSpot ();
1018	#endif	1001	#endif
1019	}	1002	}
…		…
1022	}	1005	}
1023		1006
1024	void	1007	void
1025	rxvt_term::check_cb (check_watcher &w)	1008	rxvt_term::check_cb (check_watcher &w)
1026	{	1009	{
1027	SET_R (this);	1010	make_current ();
1028	SET_LOCALE (locale);
1029		1011
1030	display->flush ();	1012	display->flush ();
1031		1013
1032	if (want_refresh && !flush_ev.active)	1014	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1015	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1016	}
1035		1017
1036	void	1018	void
1037	rxvt_term::flush_cb (time_watcher &w)	1019	rxvt_term::flush_cb (time_watcher &w)
1038	{	1020	{
1039	SET_R (this);	1021	make_current ();
1040	SET_LOCALE (locale);
1041		1022
1042	refresh_limit = 1;	1023	refresh_limit = 1;
1043	refresh_count = 0;	1024	refresh_count = 0;
1044	flush ();	1025	flush ();
1045	}	1026	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1030	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1031	{
1051	hidden_cursor = !hidden_cursor;	1032	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1033	want_refresh = 1;
1053		1034
1054	w.start (w.at + BLINK_INTERVAL);	1035	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1036	}
1056	#endif	1037	#endif
1057		1038
1058	#ifdef TEXT_BLINK	1039	#ifdef TEXT_BLINK
1059	void	1040	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1054	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1055	{
1075	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1056	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1057	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1058	{
1078	refresh_type |= SMOOTH_REFRESH;
1079	want_refresh = 1;	1059	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1060	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1061	}
1082	}	1062	}
1083	#endif	1063	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1067	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1068	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1069	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1070	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1071	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type |= SMOOTH_REFRESH;
1093	want_refresh = 1;	1072	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1073	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1074	}
1096	}	1075	}
1097	#endif	1076	#endif
…		…
1102	{	1081	{
1103	if (mouse_slip_wheel_speed == 0	1082	if (mouse_slip_wheel_speed == 0
1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1083	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1084	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1085	{
1107	if (view_start == nsaved ||	1086	if (view_start == top_row || view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1087	mouse_slip_wheel_speed = 0;
1110		1088
1111	refresh_type |= SMOOTH_REFRESH;
1112	want_refresh = 1;	1089	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1091	}
1115	}	1092	}
1116	#endif
1117
1118	#if HAVE_SCHED_YIELD
1119	static struct event_handler
1120	{
1121	check_watcher cw_yield;
1122
1123	void yield (check_watcher &w)
1124	{
1125	sched_yield ();
1126	w.stop ();
1127	}
1128
1129	event_handler ()
1130	: cw_yield (this, &event_handler::yield)
1131	{
1132	}
1133	} event_handler;
1134	#endif	1093	#endif
1135		1094
1136	bool	1095	bool
1137	rxvt_term::pty_fill ()	1096	rxvt_term::pty_fill ()
1138	{	1097	{
…		…
1146		1105
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1106	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1107	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1108	cmdbuf_endp = cmdbuf_ptr + n;
1150		1109
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1110	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1111
1153	if (r > 0)	1112	if (r > 0)
1154	{	1113	{
1155	cmdbuf_endp += r;	1114	cmdbuf_endp += r;
1156	return true;	1115	return true;
…		…
1174	}	1133	}
1175		1134
1176	void	1135	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1136	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1137	{
1179	SET_R (this);	1138	make_current ();
1180	SET_LOCALE (locale);
1181		1139
1182	if (revents & EVENT_READ)	1140	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1141	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1142	while (pty_fill ())
1185	if (cmd_parse ())	1143	if (cmd_parse ())
…		…
1190	}	1148	}
1191		1149
1192	void	1150	void
1193	rxvt_term::pointer_unblank ()	1151	rxvt_term::pointer_unblank ()
1194	{	1152	{
1195	XDefineCursor (display->display, vt, TermWin_cursor);	1153	XDefineCursor (xdisp, vt, TermWin_cursor);
1196	recolour_cursor ();	1154	recolour_cursor ();
1197		1155
1198	#ifdef POINTER_BLANK	1156	#ifdef POINTER_BLANK
1199	hidden_pointer = 0;	1157	hidden_pointer = 0;
1200		1158
…		…
1208	rxvt_term::pointer_blank ()	1166	rxvt_term::pointer_blank ()
1209	{	1167	{
1210	if (!OPTION (Opt_pointerBlank))	1168	if (!OPTION (Opt_pointerBlank))
1211	return;	1169	return;
1212		1170
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1171	XDefineCursor (xdisp, vt, display->blank_cursor);
1214	XFlush (display->display);	1172	XFlush (xdisp);
1215		1173
1216	hidden_pointer = 1;	1174	hidden_pointer = 1;
1217	}	1175	}
1218		1176
1219	void	1177	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1178	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1179	{
1222	SET_R (this);	1180	make_current ();
1223	SET_LOCALE (locale);
1224		1181
1225	pointer_blank ();	1182	pointer_blank ();
1226	}	1183	}
1227	#endif	1184	#endif
1228		1185
…		…
1293	(32 + button_number + key_state),	1250	(32 + button_number + key_state),
1294	(32 + x + 1),	1251	(32 + x + 1),
1295	(32 + y + 1));	1252	(32 + y + 1));
1296	}	1253	}
1297		1254
1298	#ifdef USING_W11LIB
1299	void
1300	rxvt_W11_process_x_event (XEvent *ev)
1301	{
1302	rxvt_t *r = rxvt_get_r ();
1303
1304	x_cb (*ev);
1305	}
1306	#endif
1307
1308	/*{{{ process an X event */	1255	/*{{{ process an X event */
1309	void	1256	void
1310	rxvt_term::x_cb (XEvent &ev)	1257	rxvt_term::x_cb (XEvent &ev)
1311	{	1258	{
1312	dDisp;	1259	make_current ();
1313		1260
1314	SET_R (this);	1261	dLocal (Display *, xdisp);
1315	SET_LOCALE (locale);
1316		1262
1317	#if defined(CURSOR_BLINK)	1263	if (ev.xany.window == vt
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1264	&& SHOULD_INVOKE (HOOK_X_EVENT)
1319	{	1265	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320	if (hidden_cursor)	1266	return;
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325		1267
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1268	// for XQueryPointer
1327	}
1328	#endif
1329
1330	#if defined(POINTER_BLANK)
1331	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332	{
1333	if (ev.type == MotionNotify
1334	|| ev.type == ButtonPress
1335	|| ev.type == ButtonRelease)
1336	if (hidden_pointer)
1337	pointer_unblank ();
1338
1339	if (ev.type == KeyPress && hidden_pointer == 0)
1340	pointer_blank ();
1341	}
1342	#endif
1343
1344	Window unused_root, unused_child;	1269	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1270	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1271	unsigned int unused_mask;
1347		1272
1348	switch (ev.type)	1273	switch (ev.type)
…		…
1355		1280
1356	break;	1281	break;
1357		1282
1358	case KeyRelease:	1283	case KeyRelease:
1359	{	1284	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1285	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361	KeySym ks;	1286	KeySym keysym;
1362		1287
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1288	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1289	#endif
1365		1290
1366	#if ENABLE_FRILLS || ISO_14755	1291	#if ENABLE_FRILLS || ISO_14755
1367	// ISO 14755 support	1292	// ISO 14755 support
1368	if (iso14755buf)	1293	if (iso14755buf)
…		…
1373	# endif	1298	# endif
1374	# if ISO_14755	1299	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1300	// iso14755 part 5.2 handling: release time
1376	// first: controls	1301	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1302	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1303	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	|| (ks >= 0x61 && ks <= 0x7f)))	1304	|| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1305	{
1381	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1306	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382	commit_iso14755 ();	1307	commit_iso14755 ();
1383	return; // case-break;	1308	goto skip_switch;
1384	}	1309	}
1385		1310
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1311	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1312	if (i[0] == keysym)
1388	{	1313	{
1389	iso14755buf = ISO_14755_51 | i[1];	1314	iso14755buf = ISO_14755_51 | i[1];
1390	commit_iso14755 ();	1315	commit_iso14755 ();
1391	return; // case-break;	1316	goto skip_switch;
1392	}	1317	}
1393		1318
1394	scr_bell ();	1319	scr_bell ();
1395	# endif	1320	# endif
1396	iso14755buf = 0;	1321	iso14755buf = 0;
…		…
1416	iso14755buf = 0;	1341	iso14755buf = 0;
1417	}	1342	}
1418	#endif	1343	#endif
1419		1344
1420	if (ev.xany.window == vt	1345	if (ev.xany.window == vt
1421	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1346	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1422	break;	1347	break;
1423		1348
1424	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1349	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425	if (!(ev.xkey.state & ControlMask))	1350	if (!(ev.xkey.state & ControlMask))
1426	slip_wheel_ev.stop ();	1351	slip_wheel_ev.stop ();
1427	else if (ks == XK_Control_L || ks == XK_Control_R)	1352	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1428	mouse_slip_wheel_speed = 0;	1353	mouse_slip_wheel_speed = 0;
1429	#endif	1354	#endif
1430	break;	1355	break;
1431	}	1356	}
1432		1357
…		…
1438	button_release (ev.xbutton);	1363	button_release (ev.xbutton);
1439	break;	1364	break;
1440		1365
1441	case ClientMessage:	1366	case ClientMessage:
1442	if (ev.xclient.format == 32	1367	if (ev.xclient.format == 32
1443	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1368	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444	{	1369	{
		1370	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1371	{
		1372	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1373	{
1445	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1374	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1375	{
		1376	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446	destroy ();	1377	destroy ();
		1378	}
1447	#if ENABLE_EWMH	1379	#if ENABLE_EWMH
1448	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1380	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449	XSendEvent (disp, ev.xclient.window = display->root,	1381	XSendEvent (xdisp, ev.xclient.window = display->root,
1450	False, SubstructureRedirectMask | SubstructureNotifyMask,	1382	False, SubstructureRedirectMask | SubstructureNotifyMask,
1451	&ev);	1383	&ev);
		1384	#endif
		1385	}
		1386	}
		1387	#if ENABLE_XEMBED
		1388	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1389	{
		1390	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1391	focus_in ();
		1392	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1393	focus_out ();
		1394	}
1452	#endif	1395	#endif
1453	}	1396	}
1454	#if ENABLE_XEMBED
1455	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456	{
1457	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458	focus_in ();
1459	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460	focus_out ();
1461	}
1462	#endif
1463	#ifdef OFFIX_DND
1464	/* OffiX Dnd (drag 'n' drop) protocol */
1465	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466	&& (ev.xclient.data.l[0] == DndFile
1467	|| ev.xclient.data.l[0] == DndDir
1468	|| ev.xclient.data.l[0] == DndLink))
1469	{
1470	/* Get Dnd data */
1471	Atom ActualType;
1472	int ActualFormat;
1473	unsigned char *data;
1474	unsigned long Size, RemainingBytes;
1475
1476	XGetWindowProperty (disp, display->root,
1477	xa[XA_DNDSELECTION],
1478	0L, 1000000L,
1479	False, AnyPropertyType,
1480	&ActualType, &ActualFormat,
1481	&Size, &RemainingBytes,
1482	&data);
1483	set_string_property (XA_CUT_BUFFER0, data);
1484	XFree (data);
1485	selection_paste (display->root, XA_CUT_BUFFER0, true);
1486	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487	}
1488	#endif /* OFFIX_DND */
1489	break;	1397	break;
1490		1398
1491	case MappingNotify:	1399	case MappingNotify:
1492	XRefreshKeyboardMapping (&ev.xmapping);	1400	XRefreshKeyboardMapping (&ev.xmapping);
1493	break;	1401	break;
…		…
1526	break;	1434	break;
1527		1435
1528	case ConfigureNotify:	1436	case ConfigureNotify:
1529	if (ev.xconfigure.window == parent[0])	1437	if (ev.xconfigure.window == parent[0])
1530	{	1438	{
1531	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1439	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1532	;	1440	;
1533		1441
1534	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1442	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535	{	1443	{
1536	seen_resize = 1;	1444	seen_resize = 1;
1537	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1445	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538	}	1446	}
1539		1447
		1448	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1449
1540	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541	if (OPTION (Opt_transparent))	1451	if (OPTION (Opt_transparent))
1542	check_our_parents ();	1452	check_our_parents ();
1543	#endif	1453	#endif
1544	}	1454	}
1545	break;	1455	break;
1546		1456
1547	case PropertyNotify:	1457	case PropertyNotify:
		1458	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1459	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549	&& ev.xproperty.state == PropertyNewValue)	1460	&& ev.xproperty.state == PropertyNewValue)
1550	selection_property (ev.xproperty.window, ev.xproperty.atom);	1461	selection_property (ev.xproperty.window, ev.xproperty.atom);
1551		1462
1552	break;	1463	break;
1553		1464
1554	case SelectionClear:	1465	case SelectionClear:
1555	selection_clear ();	1466	selection_clear ();
…		…
1560	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1471	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561	break;	1472	break;
1562		1473
1563	case SelectionRequest:	1474	case SelectionRequest:
1564	selection_send (ev.xselectionrequest);	1475	selection_send (ev.xselectionrequest);
		1476	break;
		1477
		1478	case MapNotify:
		1479	mapped = 1;
		1480	#ifdef TEXT_BLINK
		1481	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1482	#endif
		1483	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565	break;	1484	break;
1566		1485
1567	case UnmapNotify:	1486	case UnmapNotify:
1568	mapped = 0;	1487	mapped = 0;
1569	#ifdef TEXT_BLINK	1488	#ifdef TEXT_BLINK
1570	text_blink_ev.stop ();	1489	text_blink_ev.stop ();
1571	#endif	1490	#endif
1572	break;	1491	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574	case MapNotify:
1575	mapped = 1;
1576	#ifdef TEXT_BLINK
1577	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578	#endif
1579	break;	1492	break;
1580		1493
1581	#ifdef TRANSPARENT	1494	#ifdef TRANSPARENT
1582	case ReparentNotify:	1495	case ReparentNotify:
1583	rootwin_cb (ev);	1496	rootwin_cb (ev);
…		…
1589	if (ev.xany.window == vt)	1502	if (ev.xany.window == vt)
1590	{	1503	{
1591	do	1504	do
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1505	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1506	ev.xexpose.width, ev.xexpose.height, False);
1594	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1507	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1595		1508
1596	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597		1510
1598	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1511	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1599	scr_expose (ev.xexpose.x, ev.xexpose.y,	1512	scr_expose (ev.xexpose.x, ev.xexpose.y,
1600	ev.xexpose.width, ev.xexpose.height, False);	1513	ev.xexpose.width, ev.xexpose.height, False);
1601		1514
1602	scr_refresh (refresh_type);	1515	want_refresh = 1;
1603	}	1516	}
1604	else	1517	else
1605	{	1518	{
1606	XEvent unused_event;	1519	XEvent unused_event;
1607		1520
1608	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1521	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1609	;	1522	;
1610	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1523	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1611	;	1524	;
1612		1525
1613	if (isScrollbarWindow (ev.xany.window))	1526	if (isScrollbarWindow (ev.xany.window))
1614	{	1527	{
1615	scrollBar.setIdle ();	1528	scrollBar.setIdle ();
1616	scrollbar_show (0);	1529	scrollbar_show (0);
1617	}	1530	}
1618	#ifdef MENUBAR
1619	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620	menubar_expose ();
1621	#endif
1622		1531
1623	#ifdef TRANSPARENT	1532	#ifdef TRANSPARENT
1624	if (am_transparent && ev.xany.window == parent[0])	1533	if (am_transparent && ev.xany.window == parent[0])
1625	XClearWindow (disp, ev.xany.window);	1534	XClearWindow (xdisp, ev.xany.window);
1626	#endif	1535	#endif
1627	}	1536	}
1628	break;	1537	break;
1629		1538
1630	case MotionNotify:	1539	case MotionNotify:
1631	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1632	if (hidden_pointer)	1541	if (hidden_pointer)
1633	pointer_unblank ();	1542	pointer_unblank ();
1634	#endif	1543	#endif
1635	#if MENUBAR
1636	if (isMenuBarWindow (ev.xany.window))
1637	{
1638	menubar_control (ev.xbutton);
1639	break;
1640	}
1641	#endif
1642	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1544	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643	break;	1545	break;
1644		1546
1645	if (ev.xany.window == vt)	1547	if (ev.xany.window == vt)
1646	{	1548	{
		1549	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1550	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648	; // nop	1551	; // nop
1649	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1552	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650	{	1553	{
1651	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1554	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1652	;	1555	;
1653		1556
1654	XQueryPointer (disp, vt,	1557	XQueryPointer (xdisp, vt,
1655	&unused_root, &unused_child,	1558	&unused_root, &unused_child,
1656	&unused_root_x, &unused_root_y,	1559	&unused_root_x, &unused_root_y,
1657	&ev.xbutton.x, &ev.xbutton.y,	1560	&ev.xbutton.x, &ev.xbutton.y,
1658	&ev.xbutton.state);	1561	&ev.xbutton.state);
1659	#ifdef MOUSE_THRESHOLD	1562	#ifdef MOUSE_THRESHOLD
…		…
1723	#endif	1626	#endif
1724	}	1627	}
1725	}	1628	}
1726	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1629	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727	{	1630	{
1728	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1631	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1729	MotionNotify, &ev))	1632	MotionNotify, &ev))
1730	;	1633	;
1731		1634
1732	XQueryPointer (disp, scrollBar.win,	1635	XQueryPointer (xdisp, scrollBar.win,
1733	&unused_root, &unused_child,	1636	&unused_root, &unused_child,
1734	&unused_root_x, &unused_root_y,	1637	&unused_root_x, &unused_root_y,
1735	&ev.xbutton.x, &ev.xbutton.y,	1638	&ev.xbutton.x, &ev.xbutton.y,
1736	&unused_mask);	1639	&unused_mask);
1737	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1640	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738	scrollbar_size ());	1641	scrollbar_size ());
1739	scr_refresh (refresh_type);	1642	want_refresh = 1;
1740	refresh_limit = 0;	1643	refresh_limit = 0;
1741	scrollbar_show (1);	1644	scrollbar_show (1);
1742	}	1645	}
1743	break;	1646	break;
1744	}	1647	}
		1648
		1649	skip_switch: ;
		1650
		1651	#if defined(CURSOR_BLINK)
		1652	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1653	{
		1654	if (hidden_cursor)
		1655	{
		1656	hidden_cursor = 0;
		1657	want_refresh = 1;
		1658	}
		1659
		1660	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1661	}
		1662	#endif
		1663
		1664	#if defined(POINTER_BLANK)
		1665	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1666	{
		1667	if (ev.type == MotionNotify
		1668	|| ev.type == ButtonPress
		1669	|| ev.type == ButtonRelease)
		1670	if (hidden_pointer)
		1671	pointer_unblank ();
		1672
		1673	if (ev.type == KeyPress && hidden_pointer == 0)
		1674	pointer_blank ();
		1675	}
		1676	#endif
1745	}	1677	}
1746		1678
1747	void	1679	void
1748	rxvt_term::focus_in ()	1680	rxvt_term::focus_in ()
1749	{	1681	{
…		…
1761	XSetICFocus (Input_Context);	1693	XSetICFocus (Input_Context);
1762	}	1694	}
1763	#endif	1695	#endif
1764	#if CURSOR_BLINK	1696	#if CURSOR_BLINK
1765	if (OPTION (Opt_cursorBlink))	1697	if (OPTION (Opt_cursorBlink))
1766	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767	#endif	1699	#endif
1768	#if OFF_FOCUS_FADING	1700	#if OFF_FOCUS_FADING
1769	if (rs[Rs_fade])	1701	if (rs[Rs_fade])
1770	{	1702	{
1771	pix_colors = pix_colors_focused;	1703	pix_colors = pix_colors_focused;
…		…
1815		1747
1816	#if TRANSPARENT	1748	#if TRANSPARENT
1817	void	1749	void
1818	rxvt_term::rootwin_cb (XEvent &ev)	1750	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1751	{
1820	SET_R (this);	1752	make_current ();
1821	SET_LOCALE (locale);
1822		1753
1823	switch (ev.type)	1754	switch (ev.type)
1824	{	1755	{
1825	case PropertyNotify:	1756	case PropertyNotify:
1826	/*	1757	/*
…		…
1853	/*	1784	/*
1854	* VT window processing of button press	1785	* VT window processing of button press
1855	*/	1786	*/
1856	if (ev.window == vt)	1787	if (ev.window == vt)
1857	{	1788	{
		1789	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1790	return;
		1791
1858	#if ISO_14755	1792	#if ISO_14755
1859	// 5.4	1793	// 5.4
1860	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1794	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861	{	1795	{
1862	iso14755_54 (ev.x, ev.y);	1796	iso14755_54 (ev.x, ev.y);
…		…
1904	else	1838	else
1905	{	1839	{
1906	if (ev.button != MEvent.button)	1840	if (ev.button != MEvent.button)
1907	MEvent.clicks = 0;	1841	MEvent.clicks = 0;
1908		1842
1909	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910	switch (ev.button)	1843	switch (ev.button)
1911	{	1844	{
1912	case Button1:	1845	case Button1:
1913	/* allow meta + click to select rectangular areas */	1846	/* allow meta + click to select rectangular areas */
1914	/* should be done in screen.C */	1847	/* should be done in screen.C */
1915	#if ENABLE_FRILLS	1848	#if ENABLE_FRILLS
1916	selection.rect = !!(ev.state & ModMetaMask);	1849	selection.rect = !!(ev.state & ModMetaMask);
1917	#else	1850	#else
1918	selection.rect = false;	1851	selection.rect = false;
1919	#endif	1852	#endif
1920		1853
1921	/* allow shift+left click to extend selection */	1854	/* allow shift+left click to extend selection */
1922	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1855	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923	{	1856	{
1924	if (MEvent.button == Button1 && clickintime)	1857	if (MEvent.button == Button1 && clickintime)
1925	selection_rotate (ev.x, ev.y);	1858	selection_rotate (ev.x, ev.y);
1926	else	1859	else
1927	selection_extend (ev.x, ev.y, 1);	1860	selection_extend (ev.x, ev.y, 1);
1928	}	1861	}
1929	else	1862	else
1930	{	1863	{
1931	if (MEvent.button == Button1 && clickintime)	1864	if (MEvent.button == Button1 && clickintime)
1932	MEvent.clicks++;	1865	MEvent.clicks++;
1933	else	1866	else
1934	MEvent.clicks = 1;	1867	MEvent.clicks = 1;
1935		1868
1936	selection_click (MEvent.clicks, ev.x, ev.y);	1869	selection_click (MEvent.clicks, ev.x, ev.y);
1937	}	1870	}
1938		1871
1939	MEvent.button = Button1;	1872	MEvent.button = Button1;
1940	break;	1873	break;
1941		1874
1942	case Button3:	1875	case Button3:
1943	if (MEvent.button == Button3 && clickintime)	1876	if (MEvent.button == Button3 && clickintime)
1944	selection_rotate (ev.x, ev.y);	1877	selection_rotate (ev.x, ev.y);
1945	else	1878	else
1946	selection_extend (ev.x, ev.y, 1);	1879	selection_extend (ev.x, ev.y, 1);
1947		1880
1948	MEvent.button = Button3;	1881	MEvent.button = Button3;
1949	break;	1882	break;
1950	}	1883	}
1951	}	1884	}
1952		1885
1953	MEvent.time = ev.time;	1886	MEvent.time = ev.time;
1954	return;	1887	return;
1955	}	1888	}
1956		1889
…		…
2095	}	2028	}
2096	}	2029	}
2097		2030
2098	return;	2031	return;
2099	}	2032	}
2100
2101	#if MENUBAR
2102	/*
2103	* Menubar window processing of button press
2104	*/
2105	if (isMenuBarWindow (ev.window))
2106	menubar_control (ev);
2107	#endif
2108	}	2033	}
2109		2034
2110	void	2035	void
2111	rxvt_term::button_release (XButtonEvent &ev)	2036	rxvt_term::button_release (XButtonEvent &ev)
2112	{	2037	{
…		…
2118		2043
2119	if (scrollbar_isUpDn ())	2044	if (scrollbar_isUpDn ())
2120	{	2045	{
2121	scrollBar.setIdle ();	2046	scrollBar.setIdle ();
2122	scrollbar_show (0);	2047	scrollbar_show (0);
2123	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124	refresh_type &= ~SMOOTH_REFRESH;
2125	#endif
2126	}	2048	}
2127		2049
2128	#ifdef SELECTION_SCROLLING	2050	#ifdef SELECTION_SCROLLING
2129	if (sel_scroll_ev.active)	2051	if (sel_scroll_ev.active)
2130	sel_scroll_ev.stop();	2052	sel_scroll_ev.stop();
2131	#endif	2053	#endif
2132		2054
2133	if (ev.window == vt)	2055	if (ev.window == vt)
2134	{	2056	{
		2057	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2058	return;
		2059
2135	#if ISO_14755	2060	#if ISO_14755
2136	// 5.4	2061	// 5.4
2137	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2062	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138	return;	2063	return;
2139	#endif	2064	#endif
		2065
2140	if (reportmode)	2066	if (reportmode)
2141	{	2067	{
2142	/* mouse report from vt window */	2068	/* mouse report from vt window */
2143	/* don't report release of wheel "buttons" */	2069	/* don't report release of wheel "buttons" */
2144	if (ev.button >= 4)	2070	if (ev.button >= 4)
…		…
2168	if (priv_modes & PrivMode_mouse_report	2094	if (priv_modes & PrivMode_mouse_report
2169	&& bypass_keystate	2095	&& bypass_keystate
2170	&& ev.button == Button1 && MEvent.clicks <= 1)	2096	&& ev.button == Button1 && MEvent.clicks <= 1)
2171	selection_extend (ev.x, ev.y, 0);	2097	selection_extend (ev.x, ev.y, 0);
2172		2098
2173	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174	return;
2175
2176	switch (ev.button)	2099	switch (ev.button)
2177	{	2100	{
2178	case Button1:	2101	case Button1:
2179	case Button3:	2102	case Button3:
2180	selection_make (ev.time);	2103	selection_make (ev.time);
2181	break;	2104	break;
		2105
2182	case Button2:	2106	case Button2:
2183	selection_request (ev.time, ev.x, ev.y);	2107	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2108	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2184	break;	2109	break;
		2110
2185	#ifdef MOUSE_WHEEL	2111	#ifdef MOUSE_WHEEL
2186	case Button4:	2112	case Button4:
2187	case Button5:	2113	case Button5:
2188	{	2114	{
2189	int i;	2115	int i;
…		…
2211	slip_wheel_ev.start ();	2137	slip_wheel_ev.start ();
2212	}	2138	}
2213	else	2139	else
2214	{	2140	{
2215	# endif	2141	# endif
2216	# ifdef JUMP_MOUSE_WHEEL
2217	scr_page (v, i);	2142	scr_page (v, i);
2218	scr_refresh (SMOOTH_REFRESH);
2219	scrollbar_show (1);	2143	scrollbar_show (1);
2220	# else
2221	while (i--)
2222	{
2223	scr_page (v, 1);
2224	scr_refresh (SMOOTH_REFRESH);
2225	scrollbar_show (1);
2226	}
2227	# endif
2228	# ifdef MOUSE_SLIP_WHEELING	2144	# ifdef MOUSE_SLIP_WHEELING
2229	}	2145	}
2230	#endif	2146	# endif
2231	}	2147	}
2232	break;	2148	break;
2233	#endif	2149	#endif
2234	}	2150	}
2235	}	2151	}
2236	#ifdef MENUBAR
2237	else if (isMenuBarWindow (ev.window))
2238	menubar_control (ev);
2239	#endif
2240	}	2152	}
2241		2153
2242	#ifdef TRANSPARENT	2154	#ifdef TRANSPARENT
2243	#if TINTING	2155	#if TINTING
2244	/* taken from aterm-0.4.2 */	2156	/* taken from aterm-0.4.2 */
2245		2157
2246	typedef uint32_t RUINT32T;	2158	typedef uint32_t RUINT32T;
2247		2159
2248	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2160	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2249	{	2161	{
2250	int sh_r, sh_g, sh_b;	2162	int sh_r, sh_g, sh_b;
2251	RUINT32T mask_r, mask_g, mask_b;	2163	RUINT32T mask_r, mask_g, mask_b;
2252	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2164	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2165	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2166	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255	int i;	2167	int i;
2256		2168
2257	Visual *visual = display->visual;	2169	Visual *visual = term->visual;
2258		2170
2259	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2171	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260		2172
2261	/* for convenience */	2173	/* for convenience */
2262	mask_r = visual->red_mask;	2174	mask_r = visual->red_mask;
…		…
2483	Atom atype;	2395	Atom atype;
2484	unsigned char *prop = NULL;	2396	unsigned char *prop = NULL;
2485	Window root, oldp, *list;	2397	Window root, oldp, *list;
2486	Pixmap rootpixmap = None;	2398	Pixmap rootpixmap = None;
2487	XWindowAttributes wattr, wrootattr;	2399	XWindowAttributes wattr, wrootattr;
2488	dDisp;
2489		2400
2490	pchanged = 0;	2401	pchanged = 0;
2491		2402
2492	if (!OPTION (Opt_transparent))	2403	if (!OPTION (Opt_transparent))
2493	return pchanged; /* Don't try any more */	2404	return pchanged; /* Don't try any more */
2494		2405
2495	XGetWindowAttributes (disp, display->root, &wrootattr);	2406	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2496	rootdepth = wrootattr.depth;	2407	rootdepth = wrootattr.depth;
2497		2408
2498	XGetWindowAttributes (disp, parent[0], &wattr);	2409	XGetWindowAttributes (xdisp, parent[0], &wattr);
2499		2410
2500	if (rootdepth != wattr.depth)	2411	if (rootdepth != wattr.depth)
2501	{	2412	{
2502	if (am_transparent)	2413	if (am_transparent)
2503	{	2414	{
2504	pchanged = 1;	2415	pchanged = 1;
2505	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2416	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2506	am_transparent = am_pixmap_trans = 0;	2417	am_transparent = am_pixmap_trans = 0;
2507	}	2418	}
2508		2419
2509	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2510	}	2421	}
2511		2422
2512	/* Get all X ops out of the queue so that our information is up-to-date. */	2423	/* Get all X ops out of the queue so that our information is up-to-date. */
2513	XSync (disp, False);	2424	XSync (xdisp, False);
2514		2425
2515	/*	2426	/*
2516	* Make the frame window set by the window manager have	2427	* Make the frame window set by the window manager have
2517	* the root background. Some window managers put multiple nested frame	2428	* the root background. Some window managers put multiple nested frame
2518	* windows for each client, so we have to take care about that.	2429	* windows for each client, so we have to take care about that.
2519	*/	2430	*/
2520	i = (xa[XA_XROOTPMAP_ID]	2431	i = (xa[XA_XROOTPMAP_ID]
2521	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2432	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2522	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2524		2435
2525	if (!i || prop == NULL)	2436	if (!i || prop == NULL)
2526	i = (xa[XA_ESETROOT_PMAP_ID]	2437	i = (xa[XA_ESETROOT_PMAP_ID]
2527	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2438	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2439	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529	&nitems, &bytes_after, &prop) == Success);	2440	&nitems, &bytes_after, &prop) == Success);
2530		2441
2531	if (!i || prop == NULL	2442	if (!i || prop == NULL
2532	#if TINTING	2443	#if TINTING
2533	|| !rs[Rs_color + Color_tint]	2444	|| !ISSET_PIXCOLOR (Color_tint)
2534	#endif	2445	#endif
2535	)	2446	)
2536	have_pixmap = 0;	2447	have_pixmap = 0;
2537	else	2448	else
2538	{	2449	{
…		…
2551	Window cr;	2462	Window cr;
2552	XImage *image;	2463	XImage *image;
2553	GC gc;	2464	GC gc;
2554	XGCValues gcvalue;	2465	XGCValues gcvalue;
2555		2466
2556	XTranslateCoordinates (disp, parent[0], display->root,	2467	XTranslateCoordinates (xdisp, parent[0], display->root,
2557	0, 0, &sx, &sy, &cr);	2468	0, 0, &sx, &sy, &cr);
2558	nw = (unsigned int)szHint.width;	2469	nw = (unsigned int)szHint.width;
2559	nh = (unsigned int)szHint.height;	2470	nh = (unsigned int)szHint.height;
2560	nx = ny = 0;	2471	nx = ny = 0;
2561		2472
…		…
2574	}	2485	}
2575		2486
2576	min_it (nw, (unsigned int) (wrootattr.width - sx));	2487	min_it (nw, (unsigned int) (wrootattr.width - sx));
2577	min_it (nh, (unsigned int) (wrootattr.height - sy));	2488	min_it (nh, (unsigned int) (wrootattr.height - sy));
2578		2489
2579	XSync (disp, False);	2490	XSync (xdisp, False);
2580	allowedxerror = -1;	2491	allowedxerror = -1;
2581	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2492	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582		2493
2583	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2494	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2584	/* XXX: may need a delay here? */	2495	/* XXX: may need a delay here? */
2585	allowedxerror = 0;	2496	allowedxerror = 0;
2586		2497
…		…
2589	if (am_transparent && am_pixmap_trans)	2500	if (am_transparent && am_pixmap_trans)
2590	{	2501	{
2591	pchanged = 1;	2502	pchanged = 1;
2592	if (pixmap != None)	2503	if (pixmap != None)
2593	{	2504	{
2594	XFreePixmap (disp, pixmap);	2505	XFreePixmap (xdisp, pixmap);
2595	pixmap = None;	2506	pixmap = None;
2596	}	2507	}
2597	}	2508	}
2598		2509
2599	am_pixmap_trans = 0;	2510	am_pixmap_trans = 0;
2600	}	2511	}
2601	else	2512	else
2602	{	2513	{
2603	if (pixmap != None)	2514	if (pixmap != None)
2604	XFreePixmap (disp, pixmap);	2515	XFreePixmap (xdisp, pixmap);
2605		2516
2606	#if TINTING	2517	#if TINTING
2607	if (ISSET_PIXCOLOR (Color_tint))	2518	if (ISSET_PIXCOLOR (Color_tint))
2608	{	2519	{
2609	unsigned short rm, gm, bm;
2610	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2520	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611		2521
		2522	rgba c;
2612	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2523	pix_colors_focused [Color_tint].get (c);
2613		2524
2614	ShadeXImage (display, image, shade, rm, gm, bm);	2525	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2615	}	2526	}
2616	#endif	2527	#endif
2617		2528
2618	pixmap = XCreatePixmap (disp, vt,	2529	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2619	szHint.width, szHint.height, image->depth);
2620	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2530	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2621	XPutImage (disp, pixmap, gc, image, 0, 0,	2531	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2622	nx, ny, image->width, image->height);	2532	nx, ny, image->width, image->height);
2623	XFreeGC (disp, gc);	2533	XFreeGC (xdisp, gc);
2624	XDestroyImage (image);	2534	XDestroyImage (image);
2625	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2535	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2626	XClearWindow (disp, parent[0]);	2536	XClearWindow (xdisp, parent[0]);
2627		2537
2628	if (!am_transparent || !am_pixmap_trans)	2538	if (!am_transparent || !am_pixmap_trans)
2629	pchanged = 1;	2539	pchanged = 1;
2630		2540
2631	am_transparent = am_pixmap_trans = 1;	2541	am_transparent = am_pixmap_trans = 1;
2632	}	2542	}
2633	}	2543	}
2634		2544
2635	if (am_pixmap_trans)	2545	if (am_pixmap_trans)
2636	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2546	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2637	else	2547	else
2638	{	2548	{
2639	unsigned int n;	2549	unsigned int n;
2640	/*	2550	/*
2641	* InheritPixmap transparency	2551	* InheritPixmap transparency
2642	*/	2552	*/
2643	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2553	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644	{	2554	{
2645	oldp = parent[i];	2555	oldp = parent[i];
2646	XQueryTree (disp, parent[i - 1], &root,	2556	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2647	&parent[i], &list, &n);
2648	XFree (list);	2557	XFree (list);
2649		2558
2650	if (parent[i] == display->root)	2559	if (parent[i] == display->root)
2651	{	2560	{
2652	if (oldp != None)	2561	if (oldp != None)
…		…
2660	}	2569	}
2661		2570
2662	n = 0;	2571	n = 0;
2663		2572
2664	if (pchanged)	2573	if (pchanged)
2665	{
2666	for (; n < (unsigned int)i; n++)	2574	for (; n < (unsigned int)i; n++)
2667	{	2575	{
2668	XGetWindowAttributes (disp, parent[n], &wattr);	2576	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2577
2669	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2578	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670	{	2579	{
2671	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2580	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672	break;	2581	break;
2673	}	2582	}
2674	}	2583	}
2675	}
2676		2584
2677	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2585	if (n > (sizeof (parent) / sizeof (parent[0])))
2678	{	2586	{
2679	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2587	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2680	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2588	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2681	am_transparent = 0;	2589	am_transparent = 0;
2682	/* XXX: also turn off Opt_transparent? */	2590	/* XXX: also turn off Opt_transparent? */
2683	}	2591	}
2684	else	2592	else
2685	{	2593	{
2686	#if WAIT_FOR_WM
2687	/* wait (an arbitrary period) for the WM to do its thing
2688	* needed for fvwm2.2.2 (and before?) */
2689	sleep (1);
2690	#endif
2691	for (n = 0; n < (unsigned int)i; n++)	2594	for (n = 0; n < (unsigned int)i; n++)
2692	{	2595	{
2693	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2596	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2694	XClearWindow (disp, parent[n]);	2597	XClearWindow (xdisp, parent[n]);
2695	}	2598	}
2696		2599
2697	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2600	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2698	am_transparent = 1;	2601	am_transparent = 1;
2699	}	2602	}
2700		2603
2701	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2604	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702	parent[i] = None;	2605	parent[i] = None;
2703	}	2606	}
2704		2607
2705	if (scrollBar.win)	2608	if (scrollBar.win)
2706	{	2609	{
2707	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2610	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2708	scrollBar.setIdle ();	2611	scrollBar.setIdle ();
2709	scrollbar_show (0);	2612	scrollbar_show (0);
2710	}	2613	}
2711		2614
2712	if (am_transparent)	2615	if (am_transparent)
…		…
2724		2627
2725	bool	2628	bool
2726	rxvt_term::cmd_parse ()	2629	rxvt_term::cmd_parse ()
2727	{	2630	{
2728	bool flag = false;	2631	bool flag = false;
2729	unicode_t ch = NOCHAR;	2632	wchar_t ch = NOCHAR;
2730	char *seq_begin; // remember start of esc-sequence here	2633	char *seq_begin; // remember start of esc-sequence here
2731		2634
2732	for (;;)	2635	for (;;)
2733	{	2636	{
2734	if (ch == NOCHAR)	2637	if (ch == NOCHAR)
…		…
2755	if (seen_resize && cmd_pid)	2658	if (seen_resize && cmd_pid)
2756	kill (-cmd_pid, SIGWINCH);	2659	kill (-cmd_pid, SIGWINCH);
2757	}	2660	}
2758		2661
2759	/* Read a text string from the input buffer */	2662	/* Read a text string from the input buffer */
2760	unicode_t buf[UBUFSIZ];	2663	wchar_t buf[UBUFSIZ];
2761	bool refreshnow = false;	2664	bool refreshnow = false;
2762	int nlines = 0;	2665	int nlines = 0;
2763	unicode_t *str = buf;	2666	wchar_t *str = buf;
2764	unicode_t *eol = str + min (ncol, UBUFSIZ);	2667	wchar_t *eol = str + min (ncol, UBUFSIZ);
2765		2668
2766	for (;;)	2669	for (;;)
2767	{	2670	{
2768	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2671	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2769	break;	2672	break;
…		…
2787	}	2690	}
2788		2691
2789	// scr_add_lines only works for nlines <= nrow - 1.	2692	// scr_add_lines only works for nlines <= nrow - 1.
2790	if (nlines >= nrow - 1)	2693	if (nlines >= nrow - 1)
2791	{	2694	{
		2695	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2696	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793	scr_add_lines (buf, nlines, str - buf);	2697	scr_add_lines (buf, str - buf, nlines);
2794		2698
2795	nlines = 0;	2699	nlines = 0;
2796	str = buf;	2700	str = buf;
2797	eol = str + min (ncol, UBUFSIZ);	2701	eol = str + min (ncol, UBUFSIZ);
2798	}	2702	}
…		…
2812		2716
2813	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2814	ch = next_char ();	2718	ch = next_char ();
2815	}	2719	}
2816		2720
		2721	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2722	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818	scr_add_lines (buf, nlines, str - buf);	2723	scr_add_lines (buf, str - buf, nlines);
2819		2724
2820	/*	2725	/*
2821	* If there have been a lot of new lines, then update the screen	2726	* If there have been a lot of new lines, then update the screen
2822	* What the heck I'll cheat and only refresh less than every page-full.	2727	* What the heck I'll cheat and only refresh less than every page-full.
2823	* the number of pages between refreshes is refresh_limit, which	2728	* the number of pages between refreshes is refresh_limit, which
…		…
2828	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2733	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829	refresh_limit++;	2734	refresh_limit++;
2830	else	2735	else
2831	{	2736	{
2832	flag = true;	2737	flag = true;
2833	scr_refresh (refresh_type);	2738	scr_refresh ();
2834	flush_ev.stop ();	2739	want_refresh = 1;
2835	}	2740	}
2836	}	2741	}
2837		2742
2838	}	2743	}
2839	else	2744	else
…		…
2854	}	2759	}
2855		2760
2856	return flag;	2761	return flag;
2857	}	2762	}
2858		2763
2859	// read the next octet
2860	unicode_t
2861	rxvt_term::next_octet ()
2862	{
2863	return cmdbuf_ptr < cmdbuf_endp
2864	? *cmdbuf_ptr++
2865	: NOCHAR;
2866	}
2867
2868	// read the next character	2764	// read the next character
2869	unicode_t	2765	wchar_t
2870	rxvt_term::next_char ()	2766	rxvt_term::next_char () NOTHROW
2871	{	2767	{
2872	while (cmdbuf_ptr < cmdbuf_endp)	2768	while (cmdbuf_ptr < cmdbuf_endp)
2873	{	2769	{
2874	// assume 7-bit to be ascii ALWAYS	2770	// assume 7-bit to be ascii ALWAYS
2875	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2771	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2884	cmdbuf_ptr = cmdbuf_endp;	2780	cmdbuf_ptr = cmdbuf_endp;
2885	break;	2781	break;
2886	}	2782	}
2887		2783
2888	if (len == (size_t)-1)	2784	if (len == (size_t)-1)
2889	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2785	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2890		2786
2891	// assume wchar == unicode	2787	// assume wchar == unicode
2892	cmdbuf_ptr += len;	2788	cmdbuf_ptr += len;
2893	return wc & UNICODE_MASK;	2789	return wc & UNICODE_MASK;
2894	}	2790	}
2895		2791
2896	return NOCHAR;	2792	return NOCHAR;
2897	}	2793	}
		2794
		2795	// read the next octet
		2796	uint32_t
		2797	rxvt_term::next_octet () NOTHROW
		2798	{
		2799	return cmdbuf_ptr < cmdbuf_endp
		2800	? (unsigned char)*cmdbuf_ptr++
		2801	: NOCHAR;
		2802	}
		2803
		2804	static class out_of_input out_of_input;
2898		2805
2899	/* rxvt_cmd_getc () - Return next input character */	2806	/* rxvt_cmd_getc () - Return next input character */
2900	/*	2807	/*
2901	* Return the next input character after first passing any keyboard input	2808	* Return the next input character after first passing any keyboard input
2902	* to the command.	2809	* to the command.
2903	*/	2810	*/
2904	unicode_t	2811	wchar_t
2905	rxvt_term::cmd_getc ()	2812	rxvt_term::cmd_getc () THROW ((class out_of_input))
2906	{	2813	{
2907	unicode_t c = next_char ();	2814	wchar_t c = next_char ();
2908		2815
2909	if (c == NOCHAR)	2816	if (c == NOCHAR)
2910	throw out_of_input;	2817	throw out_of_input;
2911		2818
2912	return c;	2819	return c;
2913	}	2820	}
2914		2821
2915	unicode_t	2822	uint32_t
2916	rxvt_term::cmd_get8 ()	2823	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917	{	2824	{
2918	unicode_t c = next_octet ();	2825	uint32_t c = next_octet ();
2919		2826
2920	if (c == NOCHAR)	2827	if (c == NOCHAR)
2921	throw out_of_input;	2828	throw out_of_input;
2922		2829
2923	return c;	2830	return c;
…		…
3159	scr_charset_set (2, (unsigned int)cmd_getc ());	3066	scr_charset_set (2, (unsigned int)cmd_getc ());
3160	break;	3067	break;
3161	case '+':	3068	case '+':
3162	scr_charset_set (3, (unsigned int)cmd_getc ());	3069	scr_charset_set (3, (unsigned int)cmd_getc ());
3163	break;	3070	break;
3164	#if ENABLE_FRILLS	3071	#if !ENABLE_MINIMAL
3165	case '6':	3072	case '6':
3166	scr_backindex ();	3073	scr_backindex ();
3167	break;	3074	break;
3168	#endif	3075	#endif
3169	case '7':	3076	case '7':
3170	scr_cursor (SAVE);	3077	scr_cursor (SAVE);
3171	break;	3078	break;
3172	case '8':	3079	case '8':
3173	scr_cursor (RESTORE);	3080	scr_cursor (RESTORE);
3174	break;	3081	break;
3175	#if ENABLE_FRILLS	3082	#if !ENABLE_MINIMAL
3176	case '9':	3083	case '9':
3177	scr_forwardindex ();	3084	scr_forwardindex ();
3178	break;	3085	break;
3179	#endif	3086	#endif
3180	case '=':	3087	case '=':
…		…
3190	break;	3097	break;
3191		3098
3192	/* 8.3.87: NEXT LINE */	3099	/* 8.3.87: NEXT LINE */
3193	case C1_NEL: /* ESC E */	3100	case C1_NEL: /* ESC E */
3194	{	3101	{
3195	unicode_t nlcr[] = { C0_LF, C0_CR };	3102	wchar_t nlcr[] = { C0_LF, C0_CR };
3196	scr_add_lines (nlcr, 1, 2);	3103	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3197	}	3104	}
3198	break;	3105	break;
3199		3106
3200	/* kidnapped escape sequence: Should be 8.3.48 */	3107	/* kidnapped escape sequence: Should be 8.3.48 */
3201	case C1_ESA: /* ESC G */	3108	case C1_ESA: /* ESC G */
…		…
3342	ndef = get_byte_array_bit (csi_defaults, i);	3249	ndef = get_byte_array_bit (csi_defaults, i);
3343	for (p = 0; p < nargs; p++)	3250	for (p = 0; p < nargs; p++)
3344	if (arg[p] == -1)	3251	if (arg[p] == -1)
3345	arg[p] = ndef;	3252	arg[p] = ndef;
3346		3253
3347	#ifdef DEBUG_CMD
3348	fprintf (stderr, "CSI ");
3349	for (p = 0; p < nargs; p++)
3350	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351	fprintf (stderr, "%c\n", ch);
3352	#endif
3353
3354	/*	3254	/*
3355	* private mode handling	3255	* private mode handling
3356	*/	3256	*/
3357	if (priv)	3257	if (priv)
3358	{	3258	{
3359	switch (priv)	3259	switch (priv)
3360	{	3260	{
3361	case '>':	3261	case '>':
3362	if (ch == CSI_DA) /* secondary device attributes */	3262	if (ch == CSI_DA) /* secondary device attributes */
3363	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3263	{
		3264	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3265	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3266	//
		3267	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3268	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3269	// that we do not support xterm mouse reporting (should be 95 when we do).
		3270	//
		3271	tt_printf ("\033[>%d;94;0c", 'U');
		3272	}
3364	break;	3273	break;
3365	case '?':	3274	case '?':
3366	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3275	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367	process_terminal_mode (ch, priv, nargs, arg);	3276	process_terminal_mode (ch, priv, nargs, arg);
3368	break;	3277	break;
…		…
3571	break;	3480	break;
3572	case CSI_75:	3481	case CSI_75:
3573	scr_cursor (RESTORE);	3482	scr_cursor (RESTORE);
3574	break;	3483	break;
3575		3484
3576	#if ENABLE_FRILLS	3485	#if !ENABLE_MINIMAL
3577	case CSI_74:	3486	case CSI_74:
3578	process_window_ops (arg, nargs);	3487	process_window_ops (arg, nargs);
3579	break;	3488	break;
3580	#endif	3489	#endif
3581		3490
…		…
3588	break;	3497	break;
3589	}	3498	}
3590	}	3499	}
3591	/*}}} */	3500	/*}}} */
3592		3501
3593	#if ENABLE_FRILLS	3502	#if !ENABLE_MINIMAL
3594	/* ARGSUSED */	3503	/* ARGSUSED */
3595	void	3504	void
3596	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3505	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597	{	3506	{
3598	int x, y;	3507	int x, y;
3599	XWindowAttributes wattr;	3508	XWindowAttributes wattr;
3600	Window wdummy;	3509	Window wdummy;
3601	dDisp;	3510
		3511	dLocal (Display *, xdisp);
3602		3512
3603	if (nargs == 0)	3513	if (nargs == 0)
3604	return;	3514	return;
3605		3515
3606	switch (args[0])	3516	switch (args[0])
3607	{	3517	{
3608	/*	3518	/*
3609	* commands	3519	* commands
3610	*/	3520	*/
3611	case 1: /* deiconify window */	3521	case 1: /* deiconify window */
3612	XMapWindow (disp, parent[0]);	3522	XMapWindow (xdisp, parent[0]);
3613	break;	3523	break;
3614	case 2: /* iconify window */	3524	case 2: /* iconify window */
3615	XIconifyWindow (disp, parent[0], display->screen);	3525	XIconifyWindow (xdisp, parent[0], display->screen);
3616	break;	3526	break;
3617	case 3: /* set position (pixels) */	3527	case 3: /* set position (pixels) */
3618	XMoveWindow (disp, parent[0], args[1], args[2]);	3528	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3619	break;	3529	break;
3620	case 4: /* set size (pixels) */	3530	case 4: /* set size (pixels) */
3621	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3531	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622	break;	3532	break;
3623	case 5: /* raise window */	3533	case 5: /* raise window */
3624	XRaiseWindow (disp, parent[0]);	3534	XRaiseWindow (xdisp, parent[0]);
3625	break;	3535	break;
3626	case 6: /* lower window */	3536	case 6: /* lower window */
3627	XLowerWindow (disp, parent[0]);	3537	XLowerWindow (xdisp, parent[0]);
3628	break;	3538	break;
3629	case 7: /* refresh window */	3539	case 7: /* refresh window */
3630	scr_touch (true);	3540	scr_touch (true);
3631	break;	3541	break;
3632	case 8: /* set size (chars) */	3542	case 8: /* set size (chars) */
…		…
3639	if (args[0] >= 24) /* set height (chars) */	3549	if (args[0] >= 24) /* set height (chars) */
3640	set_widthheight ((unsigned int)width,	3550	set_widthheight ((unsigned int)width,
3641	(unsigned int) (args[1] * fheight));	3551	(unsigned int) (args[1] * fheight));
3642	break;	3552	break;
3643		3553
3644
3645	/*	3554	/*
3646	* reports - some output format copied from XTerm	3555	* reports - some output format copied from XTerm
3647	*/	3556	*/
3648	case 11: /* report window state */	3557	case 11: /* report window state */
3649	XGetWindowAttributes (disp, parent[0], &wattr);	3558	XGetWindowAttributes (xdisp, parent[0], &wattr);
3650	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3559	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651	break;	3560	break;
3652	case 13: /* report window position */	3561	case 13: /* report window position */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3562	XGetWindowAttributes (xdisp, parent[0], &wattr);
3654	XTranslateCoordinates (disp, parent[0], wattr.root,	3563	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3655	-wattr.border_width, -wattr.border_width,	3564	-wattr.border_width, -wattr.border_width,
3656	&x, &y, &wdummy);	3565	&x, &y, &wdummy);
3657	tt_printf ("\033[3;%d;%dt", x, y);	3566	tt_printf ("\033[3;%d;%dt", x, y);
3658	break;	3567	break;
3659	case 14: /* report window size (pixels) */	3568	case 14: /* report window size (pixels) */
3660	XGetWindowAttributes (disp, parent[0], &wattr);	3569	XGetWindowAttributes (xdisp, parent[0], &wattr);
3661	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3570	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662	break;	3571	break;
3663	case 18: /* report text area size (chars) */	3572	case 18: /* report text area size (chars) */
3664	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3573	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665	break;	3574	break;
…		…
3667	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3576	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668	break;	3577	break;
3669	case 20: /* report icon label */	3578	case 20: /* report icon label */
3670	{	3579	{
3671	char *s;	3580	char *s;
3672	XGetIconName (disp, parent[0], &s);	3581	XGetIconName (xdisp, parent[0], &s);
3673	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3582	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674	XFree (s);	3583	XFree (s);
3675	}	3584	}
3676	break;	3585	break;
3677	case 21: /* report window title */	3586	case 21: /* report window title */
3678	{	3587	{
3679	char *s;	3588	char *s;
3680	XFetchName (disp, parent[0], &s);	3589	XFetchName (xdisp, parent[0], &s);
3681	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3590	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682	XFree (s);	3591	XFree (s);
3683	}	3592	}
3684	break;	3593	break;
3685	}	3594	}
…		…
3786	void	3695	void
3787	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3696	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788	{	3697	{
3789	if (str[0] == '?' && !str[1])	3698	if (str[0] == '?' && !str[1])
3790	{	3699	{
3791	unsigned short r, g, b;	3700	rgba c;
3792	pix_colors_focused[color].get (display, r, g, b);	3701	pix_colors_focused[color].get (c);
		3702
		3703	#if XFT
		3704	if (c.a != rgba::MAX_CC)
		3705	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3706	else
		3707	#endif
3793	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3708	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794	}	3709	}
3795	else	3710	else
3796	set_window_color (color, str);	3711	set_window_color (color, str);
3797	}	3712	}
3798		3713
…		…
3800	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3715	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801	*/	3716	*/
3802	void	3717	void
3803	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3718	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804	{	3719	{
3805	int changed = 0;
3806	int color;	3720	int color;
3807	char *buf, *name;	3721	char *buf, *name;
3808	bool query = str[0] == '?' && !str[1];	3722	bool query = str[0] == '?' && !str[1];
3809	int saveop = op;	3723	int saveop = op;
3810	dDisp;	3724
		3725	dLocal (Display *, xdisp);
3811		3726
3812	assert (str != NULL);	3727	assert (str != NULL);
3813	switch (op)	3728	switch (op)
3814	{	3729	{
3815	case XTerm_name:	3730	case XTerm_name:
…		…
3831	unsigned long bytes_after;	3746	unsigned long bytes_after;
3832	unsigned char *value = 0;	3747	unsigned char *value = 0;
3833	const char *str = "";	3748	const char *str = "";
3834		3749
3835	if (prop	3750	if (prop
3836	&& XGetWindowProperty (disp, parent[0],	3751	&& XGetWindowProperty (xdisp, parent[0],
3837	prop, 0, 1<<16, 0, AnyPropertyType,	3752	prop, 0, 1<<16, 0, AnyPropertyType,
3838	&actual_type, &actual_format,	3753	&actual_type, &actual_format,
3839	&nitems, &bytes_after, &value) == Success	3754	&nitems, &bytes_after, &value) == Success
3840	&& actual_type != None	3755	&& actual_type != None
3841	&& actual_format == 8)	3756	&& actual_format == 8)
3842	str = (const char *)(value);	3757	str = (const char *)(value);
3843		3758
3844	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3759	tt_printf ("\033]%d;%s%c", op, str, resp);
3845		3760
3846	XFree (value);	3761	XFree (value);
3847	}	3762	}
3848	else	3763	else
3849	{	3764	{
…		…
3853	{	3768	{
3854	*eq = 0;	3769	*eq = 0;
3855	set_utf8_property (display->atom (str), eq + 1);	3770	set_utf8_property (display->atom (str), eq + 1);
3856	}	3771	}
3857	else	3772	else
3858	XDeleteProperty (disp, parent[0],	3773	XDeleteProperty (xdisp, parent[0],
3859	display->atom (str));	3774	display->atom (str));
3860	}	3775	}
3861	break;	3776	break;
3862		3777
3863	case XTerm_Color:	3778	case XTerm_Color:
…		…
3865	{	3780	{
3866	if ((name = strchr (buf, ';')) == NULL)	3781	if ((name = strchr (buf, ';')) == NULL)
3867	break;	3782	break;
3868		3783
3869	*name++ = '\0';	3784	*name++ = '\0';
3870	color = atoi (buf);	3785	color = atoi (buf) + minCOLOR;
3871		3786
3872	if (color < 0 || color >= TOTAL_COLORS)	3787	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873	break;	3788	break;
3874		3789
3875	if ((buf = strchr (name, ';')) != NULL)	3790	if ((buf = strchr (name, ';')) != NULL)
3876	*buf++ = '\0';	3791	*buf++ = '\0';
3877		3792
3878	if (name[0] == '?' && !name[1])	3793	process_color_seq (op, color, name, resp);
3879	{
3880	unsigned short r, g, b;
3881	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883	}
3884	else
3885	set_window_color (color + minCOLOR, name);
3886	}	3794	}
3887	break;	3795	break;
3888	case XTerm_Color00:	3796	case XTerm_Color00:
3889	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3797	process_color_seq (op, Color_fg, str, resp);
3890	break;	3798	break;
3891	case XTerm_Color01:	3799	case XTerm_Color01:
3892	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3800	process_color_seq (op, Color_bg, str, resp);
3893	break;	3801	break;
3894	#ifndef NO_CURSORCOLOR	3802	#ifndef NO_CURSORCOLOR
3895	case XTerm_Color_cursor:	3803	case XTerm_Color_cursor:
3896	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3804	process_color_seq (op, Color_cursor, str, resp);
3897	break;	3805	break;
3898	#endif	3806	#endif
3899	case XTerm_Color_pointer_fg:	3807	case XTerm_Color_pointer_fg:
3900	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3808	process_color_seq (op, Color_pointer_fg, str, resp);
3901	break;	3809	break;
3902	case XTerm_Color_pointer_bg:	3810	case XTerm_Color_pointer_bg:
3903	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3811	process_color_seq (op, Color_pointer_bg, str, resp);
3904	break;	3812	break;
3905	#ifndef NO_BOLD_UNDERLINE_REVERSE	3813	#ifndef NO_BOLD_UNDERLINE_REVERSE
3906	case XTerm_Color_BD:
3907	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908	break;
3909	case XTerm_Color_UL:
3910	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911	break;
3912	case XTerm_Color_RV:	3814	case XTerm_Color_RV:
3913	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3815	process_color_seq (op, Color_RV, str, resp);
		3816	break;
		3817	case Rxvt_Color_BD:
		3818	case URxvt_Color_BD:
		3819	process_color_seq (op, Color_BD, str, resp);
		3820	break;
		3821	case Rxvt_Color_UL:
		3822	case URxvt_Color_UL:
		3823	process_color_seq (op, Color_UL, str, resp);
3914	break;	3824	break;
3915	case URxvt_Color_IT:	3825	case URxvt_Color_IT:
3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3826	process_color_seq (op, Color_IT, str, resp);
3917	break;	3827	break;
3918	#endif	3828	#endif
3919	#if TRANSPARENT && TINTING	3829	#if TRANSPARENT && TINTING
3920	case URxvt_Color_tint:	3830	case URxvt_Color_tint:
3921	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3831	process_color_seq (op, Color_tint, str, resp);
		3832
3922	check_our_parents ();	3833	check_our_parents ();
		3834
3923	if (am_transparent)	3835	if (am_transparent)
3924	want_full_refresh = want_refresh = 1;	3836	want_full_refresh = want_refresh = 1;
3925	break;
3926	#endif
3927		3837
		3838	break;
		3839	#endif
		3840
3928	case XTerm_Pixmap:	3841	case Rxvt_Pixmap:
		3842	{
3929	if (*str != ';')	3843	if (*str != ';')
3930	{	3844	{
3931	#if XPM_BACKGROUND	3845	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3846	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3847	set_bgPixmap (str); /* change pixmap */
3934	#endif
3935	scr_touch (true);	3848	scr_touch (true);
		3849	#endif
3936	}	3850	}
		3851
		3852	int changed = 0;
		3853
3937	while ((str = strchr (str, ';')) != NULL)	3854	while ((str = strchr (str, ';')) != NULL)
3938	{	3855	{
3939	str++;	3856	str++;
3940	#if XPM_BACKGROUND	3857	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3858	changed += scale_pixmap (str);
3942	#endif	3859	#endif
3943	}	3860	}
3944		3861
3945	if (changed)	3862	if (changed)
3946	{	3863	{
3947	#ifdef XPM_BACKGROUND	3864	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3865	resize_pixmap ();
3949	#endif
3950	scr_touch (true);	3866	scr_touch (true);
		3867	#endif
3951	}	3868	}
		3869	}
3952	break;	3870	break;
3953		3871
3954	case XTerm_restoreFG:	3872	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3873	set_window_color (Color_fg, str);
3956	break;	3874	break;
3957	case XTerm_restoreBG:	3875	case Rxvt_restoreBG:
3958	set_window_color (Color_bg, str);	3876	set_window_color (Color_bg, str);
3959	break;	3877	break;
3960		3878
3961	case XTerm_logfile:	3879	case XTerm_logfile:
3962	// TODO, when secure mode?	3880	// TODO, when secure mode?
3963	break;	3881	break;
3964		3882
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3883	#if 0
3972	case XTerm_dumpscreen: /* no error notices */	3884	case Rxvt_dumpscreen: /* no error notices */
3973	{	3885	{
3974	int fd;	3886	int fd;
3975	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3887	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976	{	3888	{
3977	scr_dump (fd);	3889	scr_dump (fd);
…		…
4001	allocated.push_back ((void *)res);	3913	allocated.push_back ((void *)res);
4002	set_fonts ();	3914	set_fonts ();
4003	}	3915	}
4004	break;	3916	break;
4005		3917
4006	#if ENABLE_FRILLS	3918	case URxvt_version:
		3919	if (query)
		3920	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3921	op,
		3922	rs[Rs_name], VERSION[0], VERSION[2],
		3923	resp);
		3924	break;
		3925
		3926	#if !ENABLE_MINIMAL
4007	case URxvt_locale:	3927	case URxvt_locale:
4008	if (query)	3928	if (query)
4009	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3929	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010	else	3930	else
4011	{	3931	{
4012	set_locale (str);	3932	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3933	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3934	init_xlocale ();
4015	}	3935	}
4016	break;	3936	break;
4017		3937
4018	case URxvt_view_up:	3938	case URxvt_view_up:
…		…
4029	break;	3949	break;
4030	#endif	3950	#endif
4031		3951
4032	#if ENABLE_PERL	3952	#if ENABLE_PERL
4033	case URxvt_perl:	3953	case URxvt_perl:
4034	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	3954	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035	; // no responses yet	3955	; // no responses yet
4036	break;	3956	break;
4037	#endif	3957	#endif
4038	}	3958	}
4039	}	3959	}
…		…
4071	return state;	3991	return state;
4072	}	3992	}
4073		3993
4074	/* we're not using priv _yet_ */	3994	/* we're not using priv _yet_ */
4075	void	3995	void
4076	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	3996	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077	{	3997	{
4078	unsigned int i, j;	3998	unsigned int i, j;
4079	int state;	3999	int state;
4080		4000
4081	static const struct	4001	static const struct
…		…
4092	{ 5, PrivMode_rVideo },	4012	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4013	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4014	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4015	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4016	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4017	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4018	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4019	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4020	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4021	#endif
…		…
4151	/* extra handling for values with state unkept */	4068	/* extra handling for values with state unkept */
4152	switch (arg[i])	4069	switch (arg[i])
4153	{	4070	{
4154	#if ENABLE_STYLES	4071	#if ENABLE_STYLES
4155	case 1021:	4072	case 1021:
4156	if (mode)	4073	set_option (Opt_intensityStyles, mode);
4157	SET_OPTION (Opt_intensityStyles);
4158	else
4159	CLR_OPTION (Opt_intensityStyles);
4160		4074
4161	scr_touch (true);	4075	scr_touch (true);
4162	break;	4076	break;
4163	#endif	4077	#endif
4164	case 1048: /* alternative cursor save */	4078	case 1048: /* alternative cursor save */
…		…
4186	case 3: /* 80/132 */	4100	case 3: /* 80/132 */
4187	if (priv_modes & PrivMode_132OK)	4101	if (priv_modes & PrivMode_132OK)
4188	set_widthheight (((state ? 132 : 80) * fwidth), height);	4102	set_widthheight (((state ? 132 : 80) * fwidth), height);
4189	break;	4103	break;
4190	case 4: /* smooth scrolling */	4104	case 4: /* smooth scrolling */
4191	if (!state)	4105	set_option (Opt_jumpScroll, !state);
4192	SET_OPTION (Opt_jumpScroll);
4193	else
4194	CLR_OPTION (Opt_jumpScroll);
4195	break;	4106	break;
4196	case 5: /* reverse video */	4107	case 5: /* reverse video */
4197	scr_rvideo_mode (state);	4108	scr_rvideo_mode (state);
4198	break;	4109	break;
4199	case 6: /* relative/absolute origins */	4110	case 6: /* relative/absolute origins */
…		…
4205	/* case 8: - auto repeat, can't do on a per window basis */	4116	/* case 8: - auto repeat, can't do on a per window basis */
4206	case 9: /* X10 mouse reporting */	4117	case 9: /* X10 mouse reporting */
4207	if (state) /* orthogonal */	4118	if (state) /* orthogonal */
4208	priv_modes &= ~PrivMode_MouseX11;	4119	priv_modes &= ~PrivMode_MouseX11;
4209	break;	4120	break;
4210	#ifdef menuBar_esc
4211	case menuBar_esc:
4212	#ifdef MENUBAR
4213	map_menuBar (state);
4214	#endif
4215	break;
4216	#endif
4217	#ifdef scrollBar_esc	4121	#ifdef scrollBar_esc
4218	case scrollBar_esc:	4122	case scrollBar_esc:
4219	if (scrollbar_mapping (state))	4123	if (scrollbar_mapping (state))
4220	{	4124	{
4221	resize_all_windows (0, 0, 0);	4125	resize_all_windows (0, 0, 0);
…		…
4240	#if 0	4144	#if 0
4241	case 1001:	4145	case 1001:
4242	break; /* X11 mouse highlighting */	4146	break; /* X11 mouse highlighting */
4243	#endif	4147	#endif
4244	case 1010: /* scroll to bottom on TTY output inhibit */	4148	case 1010: /* scroll to bottom on TTY output inhibit */
4245	if (!state)	4149	set_option (Opt_scrollTtyOutput, !state);
4246	SET_OPTION (Opt_scrollTtyOutput);
4247	else
4248	CLR_OPTION (Opt_scrollTtyOutput);
4249	break;	4150	break;
4250	case 1011: /* scroll to bottom on key press */	4151	case 1011: /* scroll to bottom on key press */
4251	if (state)	4152	set_option (Opt_scrollTtyKeypress, state);
4252	SET_OPTION (Opt_scrollTtyKeypress);
4253	else
4254	CLR_OPTION (Opt_scrollTtyKeypress);
4255	break;	4153	break;
4256	case 1047: /* secondary screen w/ clearing last */	4154	case 1047: /* secondary screen w/ clearing last */
4257	if (OPTION (Opt_secondaryScreen))	4155	if (OPTION (Opt_secondaryScreen))
4258	if (current_screen != PRIMARY)	4156	if (current_screen != PRIMARY)
4259	scr_erase_screen (2);	4157	scr_erase_screen (2);
…		…
4397	scr_color (Color_bg, Color_bg);	4295	scr_color (Color_bg, Color_bg);
4398	break;	4296	break;
4399		4297
4400	//case 50: // not variable spacing	4298	//case 50: // not variable spacing
4401		4299
4402	#if ENABLE_FRILLS	4300	#if !ENABLE_MINIMAL
4403	case 90:	4301	case 90:
4404	case 91: /* set bright fg color */	4302	case 91: /* set bright fg color */
4405	case 92:	4303	case 92:
4406	case 93:	4304	case 93:
4407	case 94:	4305	case 94:
…		…
4469	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4367	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470		4368
4471	void	4369	void
4472	rxvt_term::tt_write (const char *data, unsigned int len)	4370	rxvt_term::tt_write (const char *data, unsigned int len)
4473	{	4371	{
4474	if (pty.pty < 0)	4372	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475	return;	4373	return;
4476		4374
		4375	if (pty->pty < 0)
		4376	return;
		4377
4477	if (v_buflen == 0)	4378	if (v_buflen == 0)
4478	{	4379	{
4479	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4380	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480		4381
4481	if ((unsigned int)written == len)	4382	if ((unsigned int)written == len)
4482	return;	4383	return;
4483		4384
4484	data += written;	4385	data += written;
…		…
4493	pty_ev.set (EVENT_READ | EVENT_WRITE);	4394	pty_ev.set (EVENT_READ | EVENT_WRITE);
4494	}	4395	}
4495		4396
4496	void rxvt_term::pty_write ()	4397	void rxvt_term::pty_write ()
4497	{	4398	{
4498	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4399	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499		4400
4500	if (written > 0)	4401	if (written > 0)
4501	{	4402	{
4502	v_buflen -= written;	4403	v_buflen -= written;
4503		4404

Diff Legend

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