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.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.290 by root, Sat Jan 28 20:41:38 2006 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-2005 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
64		64
65	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS || ISO_14755	69	#if ENABLE_FRILLS || ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	144	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR || !x)	153	if (t != NOCHAR || !x)
157	{	154	{
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	437	scr_move_to (0, 1);
444	return;	438	return;
445	}	439	}
446	else if (keysym == XK_End)	440	else if (keysym == XK_End)
447	{	441	{
448	scr_move_to (1, 0);	442	scr_move_to (1, 1);
449	return;	443	return;
450	}	444	}
451	}	445	}
452	#endif	446	#endif
453	}	447	}
…		…
464	{	458	{
465	switch (keysym)	459	switch (keysym)
466	{	460	{
467	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	463	selection_request (ev.time);
470	return;	464	return;
471	#if TODO	465	#if TODO
472	/* rxvt extras */	466	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
867	#endif	861	#endif
868	/* nil */ ;	862	/* nil */ ;
869	}	863	}
870	}	864	}
871		865
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))	866	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	867	return;
874		868
875	if (len <= 0)	869	if (len <= 0)
876	return; /* not mapped */	870	return; /* not mapped */
877		871
…		…
905	{	899	{
906	const char ch = C0_ESC;	900	const char ch = C0_ESC;
907	tt_write (&ch, 1);	901	tt_write (&ch, 1);
908	}	902	}
909		903
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);	904	tt_write (kbuf, (unsigned int)len);
921	}	905	}
922	/*}}} */	906	/*}}} */
923		907
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	909	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	910	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	911	{
930	unsigned int n, s;	912	unsigned int n, s;
931		913
…		…
972		954
973	if (want_refresh)	955	if (want_refresh)
974	{	956	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	957	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	958	{
977	int row = -view_start;	959	int row = view_start;
		960	int end_row = row + nrow;
978		961
979	while (row > -nsaved && ROW (row - 1).is_longer ())	962	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	963	--row;
981		964
982	while (row < -view_start + nrow)	965	do
983	{	966	{
984	int start_row = row;	967	int start_row = row;
985	line_t *l;	968	line_t *l;
986		969
987	do	970	do
988	{	971	{
989	l = &ROW (row);	972	l = &ROW (row++);
990		973
991	if (!(l->f & LINE_FILTERED))	974	if (!(l->f & LINE_FILTERED))
992	{	975	{
993	// line not filtered, mark it as filtered	976	// line not filtered, mark it as filtered
994	l->f |= LINE_FILTERED;	977	l->f |= LINE_FILTERED;
995	while (l->is_longer ())	978	while (l->is_longer ())
996	{	979	{
997	l = &ROW (++row);	980	l = &ROW (row++);
998	l->f |= LINE_FILTERED;	981	l->f |= LINE_FILTERED;
999	}	982	}
1000		983
1001	// and filter it	984	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	985	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		986
1004	break;	987	break;
1005	}	988	}
1006	}	989	}
1007	while (l->is_longer ());	990	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	991	}
		992	while (row < end_row);
1011		993	}
1012	}
1013		994
1014	scr_refresh (refresh_type);	995	scr_refresh ();
1015	scrollbar_show (1);	996	scrollbar_show (1);
1016	#ifdef USE_XIM	997	#ifdef USE_XIM
1017	IMSendSpot ();	998	IMSendSpot ();
1018	#endif	999	#endif
1019	}	1000	}
…		…
1022	}	1003	}
1023		1004
1024	void	1005	void
1025	rxvt_term::check_cb (check_watcher &w)	1006	rxvt_term::check_cb (check_watcher &w)
1026	{	1007	{
1027	SET_R (this);	1008	make_current ();
1028	SET_LOCALE (locale);
1029		1009
1030	display->flush ();	1010	display->flush ();
1031		1011
1032	if (want_refresh && !flush_ev.active)	1012	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1013	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1014	}
1035		1015
1036	void	1016	void
1037	rxvt_term::flush_cb (time_watcher &w)	1017	rxvt_term::flush_cb (time_watcher &w)
1038	{	1018	{
1039	SET_R (this);	1019	make_current ();
1040	SET_LOCALE (locale);
1041		1020
1042	refresh_limit = 1;	1021	refresh_limit = 1;
1043	refresh_count = 0;	1022	refresh_count = 0;
1044	flush ();	1023	flush ();
1045	}	1024	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1029	{
1051	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1031	want_refresh = 1;
1053		1032
1054	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1034	}
1056	#endif	1035	#endif
1057		1036
1058	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1059	void	1038	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1052	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1053	{
1075	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1054	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1055	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1056	{
1078	refresh_type |= SMOOTH_REFRESH;
1079	want_refresh = 1;	1057	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1058	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1059	}
1082	}	1060	}
1083	#endif	1061	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1065	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1066	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1067	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1068	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1069	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type |= SMOOTH_REFRESH;
1093	want_refresh = 1;	1070	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1072	}
1096	}	1073	}
1097	#endif	1074	#endif
…		…
1102	{	1079	{
1103	if (mouse_slip_wheel_speed == 0	1080	if (mouse_slip_wheel_speed == 0
1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1081	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1082	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1083	{
1107	if (view_start == nsaved ||	1084	if (view_start == top_row || view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1085	mouse_slip_wheel_speed = 0;
1110		1086
1111	refresh_type |= SMOOTH_REFRESH;
1112	want_refresh = 1;	1087	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1089	}
1115	}	1090	}
1116	#endif	1091	#endif
…		…
1146		1121
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1122	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1123	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1124	cmdbuf_endp = cmdbuf_ptr + n;
1150		1125
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1126	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1127
1153	if (r > 0)	1128	if (r > 0)
1154	{	1129	{
1155	cmdbuf_endp += r;	1130	cmdbuf_endp += r;
1156	return true;	1131	return true;
…		…
1174	}	1149	}
1175		1150
1176	void	1151	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1152	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1153	{
1179	SET_R (this);	1154	make_current ();
1180	SET_LOCALE (locale);
1181		1155
1182	if (revents & EVENT_READ)	1156	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1157	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1158	while (pty_fill ())
1185	if (cmd_parse ())	1159	if (cmd_parse ())
…		…
1190	}	1164	}
1191		1165
1192	void	1166	void
1193	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1194	{	1168	{
1195	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1196	recolour_cursor ();	1170	recolour_cursor ();
1197		1171
1198	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1199	hidden_pointer = 0;	1173	hidden_pointer = 0;
1200		1174
…		…
1205		1179
1206	#ifdef POINTER_BLANK	1180	#ifdef POINTER_BLANK
1207	void	1181	void
1208	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1209	{	1183	{
1210	if (! OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1211	return;	1185	return;
1212		1186
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1214	XFlush (display->display);	1188	XFlush (xdisp);
1215		1189
1216	hidden_pointer = 1;	1190	hidden_pointer = 1;
1217	}	1191	}
1218		1192
1219	void	1193	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1194	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1195	{
1222	SET_R (this);	1196	make_current ();
1223	SET_LOCALE (locale);
1224		1197
1225	pointer_blank ();	1198	pointer_blank ();
1226	}	1199	}
1227	#endif	1200	#endif
1228		1201
…		…
1293	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1294	(32 + x + 1),	1267	(32 + x + 1),
1295	(32 + y + 1));	1268	(32 + y + 1));
1296	}	1269	}
1297		1270
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 */	1271	/*{{{ process an X event */
1309	void	1272	void
1310	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1311	{	1274	{
1312	dDisp;	1275	make_current ();
1313		1276
1314	SET_R (this);	1277	dLocal (Display *, xdisp);
1315	SET_LOCALE (locale);
1316		1278
1317	#if defined(CURSOR_BLINK)	1279	if (ev.xany.window == vt
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
1319	{	1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320	if (hidden_cursor)	1282	return;
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325		1283
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1284	// 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;	1285	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1286	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1287	unsigned int unused_mask;
1347		1288
1348	switch (ev.type)	1289	switch (ev.type)
…		…
1355		1296
1356	break;	1297	break;
1357		1298
1358	case KeyRelease:	1299	case KeyRelease:
1359	{	1300	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1301	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361	KeySym ks;	1302	KeySym keysym;
1362		1303
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1304	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1305	#endif
1365		1306
1366	#if ENABLE_FRILLS || ISO_14755	1307	#if ENABLE_FRILLS || ISO_14755
1367	// ISO 14755 support	1308	// ISO 14755 support
1368	if (iso14755buf)	1309	if (iso14755buf)
…		…
1373	# endif	1314	# endif
1374	# if ISO_14755	1315	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1316	// iso14755 part 5.2 handling: release time
1376	// first: controls	1317	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1318	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1319	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	|| (ks >= 0x61 && ks <= 0x7f)))	1320	|| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1321	{
1381	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1322	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382	commit_iso14755 ();	1323	commit_iso14755 ();
1383	return; // case-break;	1324	goto skip_switch;
1384	}	1325	}
1385		1326
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1327	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1328	if (i[0] == keysym)
1388	{	1329	{
1389	iso14755buf = ISO_14755_51 | i[1];	1330	iso14755buf = ISO_14755_51 | i[1];
1390	commit_iso14755 ();	1331	commit_iso14755 ();
1391	return; // case-break;	1332	goto skip_switch;
1392	}	1333	}
1393		1334
1394	scr_bell ();	1335	scr_bell ();
1395	# endif	1336	# endif
1396	iso14755buf = 0;	1337	iso14755buf = 0;
…		…
1415	else	1356	else
1416	iso14755buf = 0;	1357	iso14755buf = 0;
1417	}	1358	}
1418	#endif	1359	#endif
1419		1360
		1361	if (ev.xany.window == vt
		1362	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1363	break;
		1364
1420	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1365	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421	if (!(ev.xkey.state & ControlMask))	1366	if (!(ev.xkey.state & ControlMask))
1422	slip_wheel_ev.stop ();	1367	slip_wheel_ev.stop ();
1423	else if (ks == XK_Control_L || ks == XK_Control_R)	1368	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1424	mouse_slip_wheel_speed = 0;	1369	mouse_slip_wheel_speed = 0;
1425	#endif	1370	#endif
1426	break;	1371	break;
1427	}	1372	}
1428		1373
…		…
1434	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1435	break;	1380	break;
1436		1381
1437	case ClientMessage:	1382	case ClientMessage:
1438	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1439	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1440	{	1385	{
		1386	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1387	{
		1388	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1389	{
1441	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1390	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1391	{
		1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1442	destroy ();	1393	destroy ();
		1394	}
1443	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1444	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1396	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1445	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1446	False, SubstructureRedirectMask | SubstructureNotifyMask,	1398	False, SubstructureRedirectMask | SubstructureNotifyMask,
1447	&ev);	1399	&ev);
		1400	#endif
		1401	}
		1402	}
		1403	#if ENABLE_XEMBED
		1404	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1405	{
		1406	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1407	focus_in ();
		1408	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1409	focus_out ();
		1410	}
1448	#endif	1411	#endif
1449	}	1412	}
1450	#if ENABLE_XEMBED
1451	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1452	{
1453	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1454	focus_in ();
1455	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1456	focus_out ();
1457	}
1458	#endif
1459	#ifdef OFFIX_DND
1460	/* OffiX Dnd (drag 'n' drop) protocol */
1461	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1462	&& (ev.xclient.data.l[0] == DndFile
1463	|| ev.xclient.data.l[0] == DndDir
1464	|| ev.xclient.data.l[0] == DndLink))
1465	{
1466	/* Get Dnd data */
1467	Atom ActualType;
1468	int ActualFormat;
1469	unsigned char *data;
1470	unsigned long Size, RemainingBytes;
1471
1472	XGetWindowProperty (disp, display->root,
1473	xa[XA_DNDSELECTION],
1474	0L, 1000000L,
1475	False, AnyPropertyType,
1476	&ActualType, &ActualFormat,
1477	&Size, &RemainingBytes,
1478	&data);
1479	set_string_property (XA_CUT_BUFFER0, data);
1480	XFree (data);
1481	selection_paste (display->root, XA_CUT_BUFFER0, true);
1482	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1483	}
1484	#endif /* OFFIX_DND */
1485	break;	1413	break;
1486		1414
1487	case MappingNotify:	1415	case MappingNotify:
1488	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1489	break;	1417	break;
…		…
1522	break;	1450	break;
1523		1451
1524	case ConfigureNotify:	1452	case ConfigureNotify:
1525	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1526	{	1454	{
1527	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1528	;	1456	;
1529		1457
1530	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1531	{	1459	{
1532	seen_resize = 1;	1460	seen_resize = 1;
1533	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1461	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1534	}	1462	}
1535		1463
		1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1465
1536	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1466	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1537	if (OPTION (Opt_transparent))	1467	if (OPTION (Opt_transparent))
1538	check_our_parents ();	1468	check_our_parents ();
1539	#endif	1469	#endif
1540	}	1470	}
1541	break;	1471	break;
1542		1472
1543	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1544	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1545	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1546	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1547		1478
1548	break;	1479	break;
1549		1480
1550	case SelectionClear:	1481	case SelectionClear:
1551	selection_clear ();	1482	selection_clear ();
…		…
1556	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1487	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1557	break;	1488	break;
1558		1489
1559	case SelectionRequest:	1490	case SelectionRequest:
1560	selection_send (ev.xselectionrequest);	1491	selection_send (ev.xselectionrequest);
		1492	break;
		1493
		1494	case MapNotify:
		1495	mapped = 1;
		1496	#ifdef TEXT_BLINK
		1497	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1498	#endif
		1499	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1561	break;	1500	break;
1562		1501
1563	case UnmapNotify:	1502	case UnmapNotify:
1564	mapped = 0;	1503	mapped = 0;
1565	#ifdef TEXT_BLINK	1504	#ifdef TEXT_BLINK
1566	text_blink_ev.stop ();	1505	text_blink_ev.stop ();
1567	#endif	1506	#endif
1568	break;	1507	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1569
1570	case MapNotify:
1571	mapped = 1;
1572	#ifdef TEXT_BLINK
1573	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1574	#endif
1575	break;	1508	break;
1576		1509
1577	#ifdef TRANSPARENT	1510	#ifdef TRANSPARENT
1578	case ReparentNotify:	1511	case ReparentNotify:
1579	rootwin_cb (ev);	1512	rootwin_cb (ev);
…		…
1585	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1586	{	1519	{
1587	do	1520	do
1588	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1589	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1590	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1591		1524
1592	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1593		1526
1594	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1595	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1596	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1597		1530
1598	scr_refresh (refresh_type);	1531	want_refresh = 1;
1599	}	1532	}
1600	else	1533	else
1601	{	1534	{
1602	XEvent unused_event;	1535	XEvent unused_event;
1603		1536
1604	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1605	;	1538	;
1606	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1607	;	1540	;
1608		1541
1609	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1610	{	1543	{
1611	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1612	scrollbar_show (0);	1545	scrollbar_show (0);
1613	}	1546	}
1614	#ifdef MENUBAR
1615	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1616	menubar_expose ();
1617	#endif
1618		1547
1619	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1620	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1621	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1622	#endif	1551	#endif
1623	}	1552	}
1624	break;	1553	break;
1625		1554
1626	case MotionNotify:	1555	case MotionNotify:
1627	#ifdef POINTER_BLANK	1556	#ifdef POINTER_BLANK
1628	if (hidden_pointer)	1557	if (hidden_pointer)
1629	pointer_unblank ();	1558	pointer_unblank ();
1630	#endif	1559	#endif
1631	#if MENUBAR
1632	if (isMenuBarWindow (ev.xany.window))
1633	{
1634	menubar_control (ev.xbutton);
1635	break;
1636	}
1637	#endif
1638	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1560	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1639	break;	1561	break;
1640		1562
1641	if (ev.xany.window == vt)	1563	if (ev.xany.window == vt)
1642	{	1564	{
		1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1643	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1644	; // nop	1567	; // nop
1645	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1646	{	1569	{
1647	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1648	;	1571	;
1649		1572
1650	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1651	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1652	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1653	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1654	&ev.xbutton.state);	1577	&ev.xbutton.state);
1655	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1719	#endif	1642	#endif
1720	}	1643	}
1721	}	1644	}
1722	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1723	{	1646	{
1724	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1725	MotionNotify, &ev))	1648	MotionNotify, &ev))
1726	;	1649	;
1727		1650
1728	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1729	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1730	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1731	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1732	&unused_mask);	1655	&unused_mask);
1733	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1734	scrollbar_size ());	1657	scrollbar_size ());
1735	scr_refresh (refresh_type);	1658	want_refresh = 1;
1736	refresh_limit = 0;	1659	refresh_limit = 0;
1737	scrollbar_show (1);	1660	scrollbar_show (1);
1738	}	1661	}
1739	break;	1662	break;
1740	}	1663	}
		1664
		1665	skip_switch: ;
		1666
		1667	#if defined(CURSOR_BLINK)
		1668	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1669	{
		1670	if (hidden_cursor)
		1671	{
		1672	hidden_cursor = 0;
		1673	want_refresh = 1;
		1674	}
		1675
		1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1677	}
		1678	#endif
		1679
		1680	#if defined(POINTER_BLANK)
		1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1682	{
		1683	if (ev.type == MotionNotify
		1684	|| ev.type == ButtonPress
		1685	|| ev.type == ButtonRelease)
		1686	if (hidden_pointer)
		1687	pointer_unblank ();
		1688
		1689	if (ev.type == KeyPress && hidden_pointer == 0)
		1690	pointer_blank ();
		1691	}
		1692	#endif
1741	}	1693	}
1742		1694
1743	void	1695	void
1744	rxvt_term::focus_in ()	1696	rxvt_term::focus_in ()
1745	{	1697	{
…		…
1757	XSetICFocus (Input_Context);	1709	XSetICFocus (Input_Context);
1758	}	1710	}
1759	#endif	1711	#endif
1760	#if CURSOR_BLINK	1712	#if CURSOR_BLINK
1761	if (OPTION (Opt_cursorBlink))	1713	if (OPTION (Opt_cursorBlink))
1762	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1763	#endif	1715	#endif
1764	#if OFF_FOCUS_FADING	1716	#if OFF_FOCUS_FADING
1765	if (rs[Rs_fade])	1717	if (rs[Rs_fade])
1766	{	1718	{
1767	pix_colors = pix_colors_focused;	1719	pix_colors = pix_colors_focused;
…		…
1811		1763
1812	#if TRANSPARENT	1764	#if TRANSPARENT
1813	void	1765	void
1814	rxvt_term::rootwin_cb (XEvent &ev)	1766	rxvt_term::rootwin_cb (XEvent &ev)
1815	{	1767	{
1816	SET_R (this);	1768	make_current ();
1817	SET_LOCALE (locale);
1818		1769
1819	switch (ev.type)	1770	switch (ev.type)
1820	{	1771	{
1821	case PropertyNotify:	1772	case PropertyNotify:
1822	/*	1773	/*
…		…
1849	/*	1800	/*
1850	* VT window processing of button press	1801	* VT window processing of button press
1851	*/	1802	*/
1852	if (ev.window == vt)	1803	if (ev.window == vt)
1853	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1854	#if ISO_14755	1808	#if ISO_14755
1855	// 5.4	1809	// 5.4
1856	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1857	{	1811	{
1858	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1870	#ifdef MOUSE_REPORT_DOUBLECLICK	1824	#ifdef MOUSE_REPORT_DOUBLECLICK
1871	if (ev.button == MEvent.button && clickintime)	1825	if (ev.button == MEvent.button && clickintime)
1872	{	1826	{
1873	/* same button, within alloted time */	1827	/* same button, within alloted time */
1874	MEvent.clicks++;	1828	MEvent.clicks++;
		1829
1875	if (MEvent.clicks > 1)	1830	if (MEvent.clicks > 1)
1876	{	1831	{
1877	/* only report double clicks */	1832	/* only report double clicks */
1878	MEvent.clicks = 2;	1833	MEvent.clicks = 2;
1879	mouse_report (ev);	1834	mouse_report (ev);
…		…
1899	else	1854	else
1900	{	1855	{
1901	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1902	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1903		1858
1904	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1905	switch (ev.button)	1859	switch (ev.button)
1906	{	1860	{
1907	case Button1:	1861	case Button1:
1908	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1909	/* should be done in screen.C */	1863	/* should be done in screen.C */
1910	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1911	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1912	#else	1866	#else
1913	selection.rect = false;	1867	selection.rect = false;
1914	#endif	1868	#endif
1915		1869
1916	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1917	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1918	{	1872	{
1919	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1920	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1921	else	1875	else
1922	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1923	}	1877	}
1924	else	1878	else
1925	{	1879	{
1926	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1927	MEvent.clicks++;	1881	MEvent.clicks++;
1928	else	1882	else
1929	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1930		1884
1931	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1932	}	1886	}
1933		1887
1934	MEvent.button = Button1;	1888	MEvent.button = Button1;
1935	break;	1889	break;
1936		1890
1937	case Button3:	1891	case Button3:
1938	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1939	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1940	else	1894	else
1941	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1942		1896
1943	MEvent.button = Button3;	1897	MEvent.button = Button3;
1944	break;	1898	break;
1945	}	1899	}
1946	}	1900	}
1947		1901
1948	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1949	return;	1903	return;
1950	}	1904	}
1951		1905
…		…
2087	}	2041	}
2088		2042
2089	break;	2043	break;
2090	}	2044	}
2091	}	2045	}
		2046
2092	return;	2047	return;
2093	}	2048	}
2094	#if MENUBAR
2095	/*
2096	* Menubar window processing of button press
2097	*/
2098	if (isMenuBarWindow (ev.window))
2099	menubar_control (ev);
2100	#endif
2101	}	2049	}
2102		2050
2103	void	2051	void
2104	rxvt_term::button_release (XButtonEvent &ev)	2052	rxvt_term::button_release (XButtonEvent &ev)
2105	{	2053	{
…		…
2111		2059
2112	if (scrollbar_isUpDn ())	2060	if (scrollbar_isUpDn ())
2113	{	2061	{
2114	scrollBar.setIdle ();	2062	scrollBar.setIdle ();
2115	scrollbar_show (0);	2063	scrollbar_show (0);
2116	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2117	refresh_type &= ~SMOOTH_REFRESH;
2118	#endif
2119	}	2064	}
2120		2065
2121	#ifdef SELECTION_SCROLLING	2066	#ifdef SELECTION_SCROLLING
2122	if (sel_scroll_ev.active)	2067	if (sel_scroll_ev.active)
2123	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2124	#endif	2069	#endif
2125		2070
2126	if (ev.window == vt)	2071	if (ev.window == vt)
2127	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2128	#if ISO_14755	2076	#if ISO_14755
2129	// 5.4	2077	// 5.4
2130	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2131	return;	2079	return;
2132	#endif	2080	#endif
		2081
2133	if (reportmode)	2082	if (reportmode)
2134	{	2083	{
2135	/* mouse report from vt window */	2084	/* mouse report from vt window */
2136	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2137	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2161	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2162	&& bypass_keystate	2111	&& bypass_keystate
2163	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2164	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2165		2114
2166	if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167	return;
2168
2169	switch (ev.button)	2115	switch (ev.button)
2170	{	2116	{
2171	case Button1:	2117	case Button1:
2172	case Button3:	2118	case Button3:
2173	selection_make (ev.time);	2119	selection_make (ev.time);
2174	break;	2120	break;
		2121
2175	case Button2:	2122	case Button2:
2176	selection_request (ev.time, ev.x, ev.y);	2123	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2177	break;	2125	break;
		2126
2178	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2179	case Button4:	2128	case Button4:
2180	case Button5:	2129	case Button5:
2181	{	2130	{
2182	int i;	2131	int i;
…		…
2204	slip_wheel_ev.start ();	2153	slip_wheel_ev.start ();
2205	}	2154	}
2206	else	2155	else
2207	{	2156	{
2208	# endif	2157	# endif
2209	# ifdef JUMP_MOUSE_WHEEL
2210	scr_page (v, i);	2158	scr_page (v, i);
2211	scr_refresh (SMOOTH_REFRESH);
2212	scrollbar_show (1);	2159	scrollbar_show (1);
2213	# else
2214	while (i--)
2215	{
2216	scr_page (v, 1);
2217	scr_refresh (SMOOTH_REFRESH);
2218	scrollbar_show (1);
2219	}
2220	# endif
2221	# ifdef MOUSE_SLIP_WHEELING	2160	# ifdef MOUSE_SLIP_WHEELING
2222	}	2161	}
2223	#endif	2162	# endif
2224	}	2163	}
2225	break;	2164	break;
2226	#endif	2165	#endif
2227	}	2166	}
2228	}	2167	}
2229	#ifdef MENUBAR
2230	else if (isMenuBarWindow (ev.window))
2231	menubar_control (ev);
2232	#endif
2233	}	2168	}
2234		2169
2235	#ifdef TRANSPARENT	2170	#ifdef TRANSPARENT
2236	#if TINTING	2171	#if TINTING
2237	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2238		2173
2239	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2240		2175
2241	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2176	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2242	{	2177	{
2243	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2244	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2245	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2180	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248	int i;	2183	int i;
2249		2184
2250	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2251		2186
2252	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253		2188
2254	/* for convenience */	2189	/* for convenience */
2255	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2476	Atom atype;	2411	Atom atype;
2477	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2478	Window root, oldp, *list;	2413	Window root, oldp, *list;
2479	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2480	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2481	dDisp;
2482		2416
2483	pchanged = 0;	2417	pchanged = 0;
2484		2418
2485	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2486	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2487		2421
2488	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2489	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2490		2424
2491	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2492		2426
2493	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2494	{	2428	{
2495	if (am_transparent)	2429	if (am_transparent)
2496	{	2430	{
2497	pchanged = 1;	2431	pchanged = 1;
2498	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2499	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2500	}	2434	}
2501		2435
2502	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2503	}	2437	}
2504		2438
2505	/* Get all X ops out of the queue so that our information is up-to-date. */	2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2506	XSync (disp, False);	2440	XSync (xdisp, False);
2507		2441
2508	/*	2442	/*
2509	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2510	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2511	* windows for each client, so we have to take care about that.	2445	* windows for each client, so we have to take care about that.
2512	*/	2446	*/
2513	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2514	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2515	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2517		2451
2518	if (!i || prop == NULL)	2452	if (!i || prop == NULL)
2519	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2520	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2523		2457
2524	if (!i || prop == NULL	2458	if (!i || prop == NULL
2525	#if TINTING	2459	#if TINTING
…		…
2544	Window cr;	2478	Window cr;
2545	XImage *image;	2479	XImage *image;
2546	GC gc;	2480	GC gc;
2547	XGCValues gcvalue;	2481	XGCValues gcvalue;
2548		2482
2549	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2550	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2551	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2552	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2553	nx = ny = 0;	2487	nx = ny = 0;
2554		2488
…		…
2567	}	2501	}
2568		2502
2569	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2570	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2571		2505
2572	XSync (disp, False);	2506	XSync (xdisp, False);
2573	allowedxerror = -1;	2507	allowedxerror = -1;
2574	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575		2509
2576	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2577	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2578	allowedxerror = 0;	2512	allowedxerror = 0;
2579		2513
…		…
2582	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2583	{	2517	{
2584	pchanged = 1;	2518	pchanged = 1;
2585	if (pixmap != None)	2519	if (pixmap != None)
2586	{	2520	{
2587	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2588	pixmap = None;	2522	pixmap = None;
2589	}	2523	}
2590	}	2524	}
2591		2525
2592	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2593	}	2527	}
2594	else	2528	else
2595	{	2529	{
2596	if (pixmap != None)	2530	if (pixmap != None)
2597	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2598		2532
2599	#if TINTING	2533	#if TINTING
2600	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2601	{	2535	{
2602	unsigned short rm, gm, bm;	2536	unsigned short rm, gm, bm;
2603	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604		2538
2605	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2606		2540
2607	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, rm, gm, bm);
2608	}	2542	}
2609	#endif	2543	#endif
2610		2544
2611	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2612	szHint.width, szHint.height, image->depth);
2613	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2614	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2615	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2616	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2617	XDestroyImage (image);	2550	XDestroyImage (image);
2618	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2619	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2620		2553
2621	if (!am_transparent || !am_pixmap_trans)	2554	if (!am_transparent || !am_pixmap_trans)
2622	pchanged = 1;	2555	pchanged = 1;
2623		2556
2624	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2625	}	2558	}
2626	}	2559	}
2627		2560
2628	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2629	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630	else	2563	else
2631	{	2564	{
2632	unsigned int n;	2565	unsigned int n;
2633	/*	2566	/*
2634	* InheritPixmap transparency	2567	* InheritPixmap transparency
2635	*/	2568	*/
2636	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	{	2570	{
2638	oldp = parent[i];	2571	oldp = parent[i];
2639	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2640	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2641	XFree (list);	2574	XFree (list);
2642		2575
2643	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2644	{	2577	{
…		…
2656		2589
2657	if (pchanged)	2590	if (pchanged)
2658	{	2591	{
2659	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2660	{	2593	{
2661	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2662	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663	{	2596	{
2664	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665	break;	2598	break;
2666	}	2599	}
2667	}	2600	}
2668	}	2601	}
2669		2602
2670	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671	{	2604	{
2672	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2673	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2674	am_transparent = 0;	2607	am_transparent = 0;
2675	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2676	}	2609	}
2677	else	2610	else
2678	{	2611	{
2679	#if WAIT_FOR_WM
2680	/* wait (an arbitrary period) for the WM to do its thing
2681	* needed for fvwm2.2.2 (and before?) */
2682	sleep (1);
2683	#endif
2684	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2685	{	2613	{
2686	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2687	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2688	}	2616	}
2689		2617
2690	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2691	am_transparent = 1;	2619	am_transparent = 1;
2692	}	2620	}
2693		2621
2694	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695	parent[i] = None;	2623	parent[i] = None;
2696	}	2624	}
2697		2625
2698	if (scrollBar.win)	2626	if (scrollBar.win)
2699	{	2627	{
2700	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2701	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2702	scrollbar_show (0);	2630	scrollbar_show (0);
2703	}	2631	}
2704		2632
2705	if (am_transparent)	2633	if (am_transparent)
…		…
2717		2645
2718	bool	2646	bool
2719	rxvt_term::cmd_parse ()	2647	rxvt_term::cmd_parse ()
2720	{	2648	{
2721	bool flag = false;	2649	bool flag = false;
2722	unicode_t ch = NOCHAR;	2650	wchar_t ch = NOCHAR;
2723	char *seq_begin; // remember start of esc-sequence here	2651	char *seq_begin; // remember start of esc-sequence here
2724		2652
2725	for (;;)	2653	for (;;)
2726	{	2654	{
2727	if (ch == NOCHAR)	2655	if (ch == NOCHAR)
…		…
2748	if (seen_resize && cmd_pid)	2676	if (seen_resize && cmd_pid)
2749	kill (-cmd_pid, SIGWINCH);	2677	kill (-cmd_pid, SIGWINCH);
2750	}	2678	}
2751		2679
2752	/* Read a text string from the input buffer */	2680	/* Read a text string from the input buffer */
2753	unicode_t buf[UBUFSIZ];	2681	wchar_t buf[UBUFSIZ];
2754	bool refreshnow = false;	2682	bool refreshnow = false;
2755	int nlines = 0;	2683	int nlines = 0;
2756	unicode_t *str = buf;	2684	wchar_t *str = buf;
2757	unicode_t *eol = str + min (ncol, UBUFSIZ);	2685	wchar_t *eol = str + min (ncol, UBUFSIZ);
2758		2686
2759	for (;;)	2687	for (;;)
2760	{	2688	{
2761	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2689	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2762	break;	2690	break;
…		…
2780	}	2708	}
2781		2709
2782	// scr_add_lines only works for nlines <= nrow - 1.	2710	// scr_add_lines only works for nlines <= nrow - 1.
2783	if (nlines >= nrow - 1)	2711	if (nlines >= nrow - 1)
2784	{	2712	{
		2713	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2714	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786	scr_add_lines (buf, nlines, str - buf);	2715	scr_add_lines (buf, str - buf, nlines);
2787		2716
2788	nlines = 0;	2717	nlines = 0;
2789	str = buf;	2718	str = buf;
2790	eol = str + min (ncol, UBUFSIZ);	2719	eol = str + min (ncol, UBUFSIZ);
2791	}	2720	}
…		…
2805		2734
2806	seq_begin = cmdbuf_ptr;	2735	seq_begin = cmdbuf_ptr;
2807	ch = next_char ();	2736	ch = next_char ();
2808	}	2737	}
2809		2738
		2739	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2740	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811	scr_add_lines (buf, nlines, str - buf);	2741	scr_add_lines (buf, str - buf, nlines);
2812		2742
2813	/*	2743	/*
2814	* If there have been a lot of new lines, then update the screen	2744	* If there have been a lot of new lines, then update the screen
2815	* What the heck I'll cheat and only refresh less than every page-full.	2745	* What the heck I'll cheat and only refresh less than every page-full.
2816	* the number of pages between refreshes is refresh_limit, which	2746	* the number of pages between refreshes is refresh_limit, which
…		…
2821	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2751	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822	refresh_limit++;	2752	refresh_limit++;
2823	else	2753	else
2824	{	2754	{
2825	flag = true;	2755	flag = true;
2826	scr_refresh (refresh_type);	2756	scr_refresh ();
2827	flush_ev.stop ();	2757	want_refresh = 1;
2828	}	2758	}
2829	}	2759	}
2830		2760
2831	}	2761	}
2832	else	2762	else
…		…
2847	}	2777	}
2848		2778
2849	return flag;	2779	return flag;
2850	}	2780	}
2851		2781
2852	// read the next octet
2853	unicode_t
2854	rxvt_term::next_octet ()
2855	{
2856	return cmdbuf_ptr < cmdbuf_endp
2857	? *cmdbuf_ptr++
2858	: NOCHAR;
2859	}
2860
2861	// read the next character	2782	// read the next character
2862	unicode_t	2783	wchar_t
2863	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2864	{	2785	{
2865	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2866	{	2787	{
2867	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2868	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2877	cmdbuf_ptr = cmdbuf_endp;	2798	cmdbuf_ptr = cmdbuf_endp;
2878	break;	2799	break;
2879	}	2800	}
2880		2801
2881	if (len == (size_t)-1)	2802	if (len == (size_t)-1)
2882	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2803	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2883		2804
2884	// assume wchar == unicode	2805	// assume wchar == unicode
2885	cmdbuf_ptr += len;	2806	cmdbuf_ptr += len;
2886	return wc & UNICODE_MASK;	2807	return wc & UNICODE_MASK;
2887	}	2808	}
2888		2809
2889	return NOCHAR;	2810	return NOCHAR;
2890	}	2811	}
		2812
		2813	// read the next octet
		2814	uint32_t
		2815	rxvt_term::next_octet () NOTHROW
		2816	{
		2817	return cmdbuf_ptr < cmdbuf_endp
		2818	? (unsigned char)*cmdbuf_ptr++
		2819	: NOCHAR;
		2820	}
		2821
		2822	static class out_of_input out_of_input;
2891		2823
2892	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2893	/*	2825	/*
2894	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2895	* to the command.	2827	* to the command.
2896	*/	2828	*/
2897	unicode_t	2829	wchar_t
2898	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2899	{	2831	{
2900	unicode_t c = next_char ();	2832	wchar_t c = next_char ();
2901		2833
2902	if (c == NOCHAR)	2834	if (c == NOCHAR)
2903	throw out_of_input;	2835	throw out_of_input;
2904		2836
2905	return c;	2837	return c;
2906	}	2838	}
2907		2839
2908	unicode_t	2840	uint32_t
2909	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910	{	2842	{
2911	unicode_t c = next_octet ();	2843	uint32_t c = next_octet ();
2912		2844
2913	if (c == NOCHAR)	2845	if (c == NOCHAR)
2914	throw out_of_input;	2846	throw out_of_input;
2915		2847
2916	return c;	2848	return c;
…		…
3183	break;	3115	break;
3184		3116
3185	/* 8.3.87: NEXT LINE */	3117	/* 8.3.87: NEXT LINE */
3186	case C1_NEL: /* ESC E */	3118	case C1_NEL: /* ESC E */
3187	{	3119	{
3188	unicode_t nlcr[] = { C0_LF, C0_CR };	3120	wchar_t nlcr[] = { C0_LF, C0_CR };
3189	scr_add_lines (nlcr, 1, 2);	3121	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190	}	3122	}
3191	break;	3123	break;
3192		3124
3193	/* kidnapped escape sequence: Should be 8.3.48 */	3125	/* kidnapped escape sequence: Should be 8.3.48 */
3194	case C1_ESA: /* ESC G */	3126	case C1_ESA: /* ESC G */
…		…
3335	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3336	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3337	if (arg[p] == -1)	3269	if (arg[p] == -1)
3338	arg[p] = ndef;	3270	arg[p] = ndef;
3339		3271
3340	#ifdef DEBUG_CMD
3341	fprintf (stderr, "CSI ");
3342	for (p = 0; p < nargs; p++)
3343	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344	fprintf (stderr, "%c\n", ch);
3345	#endif
3346
3347	/*	3272	/*
3348	* private mode handling	3273	* private mode handling
3349	*/	3274	*/
3350	if (priv)	3275	if (priv)
3351	{	3276	{
3352	switch (priv)	3277	switch (priv)
3353	{	3278	{
3354	case '>':	3279	case '>':
3355	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3356	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3357	break;	3291	break;
3358	case '?':	3292	case '?':
3359	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3293	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3361	break;	3295	break;
…		…
3589	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590	{	3524	{
3591	int x, y;	3525	int x, y;
3592	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3593	Window wdummy;	3527	Window wdummy;
3594	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3595		3530
3596	if (nargs == 0)	3531	if (nargs == 0)
3597	return;	3532	return;
3598		3533
3599	switch (args[0])	3534	switch (args[0])
3600	{	3535	{
3601	/*	3536	/*
3602	* commands	3537	* commands
3603	*/	3538	*/
3604	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3605	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3606	break;	3541	break;
3607	case 2: /* iconify window */	3542	case 2: /* iconify window */
3608	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3609	break;	3544	break;
3610	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3611	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3612	break;	3547	break;
3613	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3614	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615	break;	3550	break;
3616	case 5: /* raise window */	3551	case 5: /* raise window */
3617	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3618	break;	3553	break;
3619	case 6: /* lower window */	3554	case 6: /* lower window */
3620	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3621	break;	3556	break;
3622	case 7: /* refresh window */	3557	case 7: /* refresh window */
3623	scr_touch (true);	3558	scr_touch (true);
3624	break;	3559	break;
3625	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3637		3572
3638	/*	3573	/*
3639	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3640	*/	3575	*/
3641	case 11: /* report window state */	3576	case 11: /* report window state */
3642	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3643	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644	break;	3579	break;
3645	case 13: /* report window position */	3580	case 13: /* report window position */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3647	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3648	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3649	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3650	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3651	break;	3586	break;
3652	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3654	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655	break;	3590	break;
3656	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3657	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658	break;	3593	break;
…		…
3660	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661	break;	3596	break;
3662	case 20: /* report icon label */	3597	case 20: /* report icon label */
3663	{	3598	{
3664	char *s;	3599	char *s;
3665	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3666	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3601	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667	XFree (s);	3602	XFree (s);
3668	}	3603	}
3669	break;	3604	break;
3670	case 21: /* report window title */	3605	case 21: /* report window title */
3671	{	3606	{
3672	char *s;	3607	char *s;
3673	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3674	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3609	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675	XFree (s);	3610	XFree (s);
3676	}	3611	}
3677	break;	3612	break;
3678	}	3613	}
…		…
3780	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3715	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781	{	3716	{
3782	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3783	{	3718	{
3784	unsigned short r, g, b;	3719	unsigned short r, g, b;
3785	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, r, g, b);
3786	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3721	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3787	}	3722	}
3788	else	3723	else
3789	set_window_color (color, str);	3724	set_window_color (color, str);
3790	}	3725	}
…		…
3793	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3728	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794	*/	3729	*/
3795	void	3730	void
3796	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3731	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797	{	3732	{
3798	int changed = 0;
3799	int color;	3733	int color;
3800	char *buf, *name;	3734	char *buf, *name;
3801	bool query = str[0] == '?' && !str[1];	3735	bool query = str[0] == '?' && !str[1];
3802	int saveop = op;	3736	int saveop = op;
3803	dDisp;	3737
		3738	dLocal (Display *, xdisp);
3804		3739
3805	assert (str != NULL);	3740	assert (str != NULL);
3806	switch (op)	3741	switch (op)
3807	{	3742	{
3808	case XTerm_name:	3743	case XTerm_name:
…		…
3824	unsigned long bytes_after;	3759	unsigned long bytes_after;
3825	unsigned char *value = 0;	3760	unsigned char *value = 0;
3826	const char *str = "";	3761	const char *str = "";
3827		3762
3828	if (prop	3763	if (prop
3829	&& XGetWindowProperty (disp, parent[0],	3764	&& XGetWindowProperty (xdisp, parent[0],
3830	prop, 0, 1<<16, 0, AnyPropertyType,	3765	prop, 0, 1<<16, 0, AnyPropertyType,
3831	&actual_type, &actual_format,	3766	&actual_type, &actual_format,
3832	&nitems, &bytes_after, &value) == Success	3767	&nitems, &bytes_after, &value) == Success
3833	&& actual_type != None	3768	&& actual_type != None
3834	&& actual_format == 8)	3769	&& actual_format == 8)
3835	str = (const char *)(value);	3770	str = (const char *)(value);
3836		3771
3837	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3772	tt_printf ("\033]%d;%s%c", op, str, resp);
3838		3773
3839	XFree (value);	3774	XFree (value);
3840	}	3775	}
3841	else	3776	else
3842	{	3777	{
…		…
3846	{	3781	{
3847	*eq = 0;	3782	*eq = 0;
3848	set_utf8_property (display->atom (str), eq + 1);	3783	set_utf8_property (display->atom (str), eq + 1);
3849	}	3784	}
3850	else	3785	else
3851	XDeleteProperty (disp, parent[0],	3786	XDeleteProperty (xdisp, parent[0],
3852	display->atom (str));	3787	display->atom (str));
3853	}	3788	}
3854	break;	3789	break;
3855		3790
3856	case XTerm_Color:	3791	case XTerm_Color:
…		…
3858	{	3793	{
3859	if ((name = strchr (buf, ';')) == NULL)	3794	if ((name = strchr (buf, ';')) == NULL)
3860	break;	3795	break;
3861		3796
3862	*name++ = '\0';	3797	*name++ = '\0';
3863	color = atoi (buf);	3798	color = atoi (buf) + minCOLOR;
3864		3799
3865	if (color < 0 || color >= TOTAL_COLORS)	3800	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866	break;	3801	break;
3867		3802
3868	if ((buf = strchr (name, ';')) != NULL)	3803	if ((buf = strchr (name, ';')) != NULL)
3869	*buf++ = '\0';	3804	*buf++ = '\0';
3870		3805
3871	if (name[0] == '?' && !name[1])	3806	if (name[0] == '?' && !name[1])
3872	{	3807	{
3873	unsigned short r, g, b;	3808	unsigned short r, g, b;
3874	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3809	pix_colors_focused[color].get (this, r, g, b);
3875	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3810	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", op, color, r, g, b, resp);
3876	}	3811	}
3877	else	3812	else
3878	set_window_color (color + minCOLOR, name);	3813	set_window_color (color, name);
3879	}	3814	}
3880	break;	3815	break;
3881	case XTerm_Color00:	3816	case XTerm_Color00:
3882	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3817	process_color_seq (op, Color_fg, str, resp);
3883	break;	3818	break;
3884	case XTerm_Color01:	3819	case XTerm_Color01:
3885	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3820	process_color_seq (op, Color_bg, str, resp);
3886	break;	3821	break;
3887	#ifndef NO_CURSORCOLOR	3822	#ifndef NO_CURSORCOLOR
3888	case XTerm_Color_cursor:	3823	case XTerm_Color_cursor:
3889	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3824	process_color_seq (op, Color_cursor, str, resp);
3890	break;	3825	break;
3891	#endif	3826	#endif
3892	case XTerm_Color_pointer_fg:	3827	case XTerm_Color_pointer_fg:
3893	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3828	process_color_seq (op, Color_pointer_fg, str, resp);
3894	break;	3829	break;
3895	case XTerm_Color_pointer_bg:	3830	case XTerm_Color_pointer_bg:
3896	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3831	process_color_seq (op, Color_pointer_bg, str, resp);
3897	break;	3832	break;
3898	#ifndef NO_BOLD_UNDERLINE_REVERSE	3833	#ifndef NO_BOLD_UNDERLINE_REVERSE
3899	case XTerm_Color_BD:
3900	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901	break;
3902	case XTerm_Color_UL:
3903	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904	break;
3905	case XTerm_Color_RV:	3834	case XTerm_Color_RV:
3906	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3835	process_color_seq (op, Color_RV, str, resp);
		3836	break;
		3837	case Rxvt_Color_BD:
		3838	case URxvt_Color_BD:
		3839	process_color_seq (op, Color_BD, str, resp);
		3840	break;
		3841	case Rxvt_Color_UL:
		3842	case URxvt_Color_UL:
		3843	process_color_seq (op, Color_UL, str, resp);
3907	break;	3844	break;
3908	case URxvt_Color_IT:	3845	case URxvt_Color_IT:
3909	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3846	process_color_seq (op, Color_IT, str, resp);
3910	break;	3847	break;
3911	#endif	3848	#endif
3912	#if TRANSPARENT && TINTING	3849	#if TRANSPARENT && TINTING
3913	case URxvt_Color_tint:	3850	case URxvt_Color_tint:
3914	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3851	process_color_seq (op, Color_tint, str, resp);
3915	check_our_parents ();	3852	check_our_parents ();
3916	if (am_transparent)	3853	if (am_transparent)
3917	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
3918	break;	3855	break;
3919	#endif	3856	#endif
3920		3857
3921	case XTerm_Pixmap:	3858	case Rxvt_Pixmap:
		3859	{
3922	if (*str != ';')	3860	if (*str != ';')
3923	{	3861	{
3924	#if XPM_BACKGROUND	3862	#if XPM_BACKGROUND
3925	scale_pixmap (""); /* reset to default scaling */	3863	scale_pixmap (""); /* reset to default scaling */
3926	set_bgPixmap (str); /* change pixmap */	3864	set_bgPixmap (str); /* change pixmap */
3927	#endif
3928	scr_touch (true);	3865	scr_touch (true);
		3866	#endif
3929	}	3867	}
		3868
		3869	int changed = 0;
		3870
3930	while ((str = strchr (str, ';')) != NULL)	3871	while ((str = strchr (str, ';')) != NULL)
3931	{	3872	{
3932	str++;	3873	str++;
3933	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3934	changed += scale_pixmap (str);	3875	changed += scale_pixmap (str);
3935	#endif	3876	#endif
3936	}	3877	}
3937		3878
3938	if (changed)	3879	if (changed)
3939	{	3880	{
3940	#ifdef XPM_BACKGROUND	3881	#ifdef XPM_BACKGROUND
3941	resize_pixmap ();	3882	resize_pixmap ();
3942	#endif
3943	scr_touch (true);	3883	scr_touch (true);
		3884	#endif
3944	}	3885	}
		3886	}
3945	break;	3887	break;
3946		3888
3947	case XTerm_restoreFG:	3889	case Rxvt_restoreFG:
3948	set_window_color (Color_fg, str);	3890	set_window_color (Color_fg, str);
3949	break;	3891	break;
3950	case XTerm_restoreBG:	3892	case Rxvt_restoreBG:
3951	set_window_color (Color_bg, str);	3893	set_window_color (Color_bg, str);
3952	break;	3894	break;
3953		3895
3954	case XTerm_logfile:	3896	case XTerm_logfile:
3955	// TODO, when secure mode?	3897	// TODO, when secure mode?
3956	break;	3898	break;
3957		3899
3958	#ifdef MENUBAR
3959	case URxvt_Menu:
3960	if (OPTION (Opt_insecure))
3961	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962	break;
3963	#endif
3964	#if 0	3900	#if 0
3965	case XTerm_dumpscreen: /* no error notices */	3901	case Rxvt_dumpscreen: /* no error notices */
3966	{	3902	{
3967	int fd;	3903	int fd;
3968	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3904	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3969	{	3905	{
3970	scr_dump (fd);	3906	scr_dump (fd);
…		…
3994	allocated.push_back ((void *)res);	3930	allocated.push_back ((void *)res);
3995	set_fonts ();	3931	set_fonts ();
3996	}	3932	}
3997	break;	3933	break;
3998		3934
		3935	case URxvt_version:
		3936	if (query)
		3937	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3938	op,
		3939	rs[Rs_name], VERSION[0], VERSION[2],
		3940	resp);
		3941	break;
		3942
3999	#if ENABLE_FRILLS	3943	#if ENABLE_FRILLS
4000	case URxvt_locale:	3944	case URxvt_locale:
4001	if (query)	3945	if (query)
4002	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3946	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4003	else	3947	else
4004	{	3948	{
4005	set_locale (str);	3949	set_locale (str);
4006	pty.set_utf8_mode (enc_utf8);	3950	pty->set_utf8_mode (enc_utf8);
4007	init_xlocale ();	3951	init_xlocale ();
4008	}	3952	}
4009	break;	3953	break;
4010		3954
4011	case URxvt_view_up:	3955	case URxvt_view_up:
…		…
4022	break;	3966	break;
4023	#endif	3967	#endif
4024		3968
4025	#if ENABLE_PERL	3969	#if ENABLE_PERL
4026	case URxvt_perl:	3970	case URxvt_perl:
4027	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	3971	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4028	; // no responses yet	3972	; // no responses yet
4029	break;	3973	break;
4030	#endif	3974	#endif
4031	}	3975	}
4032	}	3976	}
…		…
4064	return state;	4008	return state;
4065	}	4009	}
4066		4010
4067	/* we're not using priv _yet_ */	4011	/* we're not using priv _yet_ */
4068	void	4012	void
4069	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4013	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4070	{	4014	{
4071	unsigned int i, j;	4015	unsigned int i, j;
4072	int state;	4016	int state;
4073		4017
4074	static const struct	4018	static const struct
…		…
4085	{ 5, PrivMode_rVideo },	4029	{ 5, PrivMode_rVideo },
4086	{ 6, PrivMode_relOrigin },	4030	{ 6, PrivMode_relOrigin },
4087	{ 7, PrivMode_Autowrap },	4031	{ 7, PrivMode_Autowrap },
4088	// 8, bi-directional support mode	4032	// 8, bi-directional support mode
4089	{ 9, PrivMode_MouseX10 },	4033	{ 9, PrivMode_MouseX10 },
4090	#ifdef menuBar_esc
4091	{ menuBar_esc, PrivMode_menuBar },
4092	#endif
4093	// 18, 19 printing-related	4034	// 18, 19 printing-related
4094	{ 25, PrivMode_VisibleCursor },	4035	{ 25, PrivMode_VisibleCursor },
4095	#ifdef scrollBar_esc	4036	#ifdef scrollBar_esc
4096	{ scrollBar_esc, PrivMode_scrollBar },	4037	{ scrollBar_esc, PrivMode_scrollBar },
4097	#endif	4038	#endif
…		…
4144	/* extra handling for values with state unkept */	4085	/* extra handling for values with state unkept */
4145	switch (arg[i])	4086	switch (arg[i])
4146	{	4087	{
4147	#if ENABLE_STYLES	4088	#if ENABLE_STYLES
4148	case 1021:	4089	case 1021:
4149	if (mode)	4090	set_option (Opt_intensityStyles, mode);
4150	SET_OPTION (Opt_intensityStyles);
4151	else
4152	CLR_OPTION (Opt_intensityStyles);
4153		4091
4154	scr_touch (true);	4092	scr_touch (true);
4155	break;	4093	break;
4156	#endif	4094	#endif
4157	case 1048: /* alternative cursor save */	4095	case 1048: /* alternative cursor save */
…		…
4179	case 3: /* 80/132 */	4117	case 3: /* 80/132 */
4180	if (priv_modes & PrivMode_132OK)	4118	if (priv_modes & PrivMode_132OK)
4181	set_widthheight (((state ? 132 : 80) * fwidth), height);	4119	set_widthheight (((state ? 132 : 80) * fwidth), height);
4182	break;	4120	break;
4183	case 4: /* smooth scrolling */	4121	case 4: /* smooth scrolling */
4184	if (!state)	4122	set_option (Opt_jumpScroll, !state);
4185	SET_OPTION (Opt_jumpScroll);
4186	else
4187	CLR_OPTION (Opt_jumpScroll);
4188	break;	4123	break;
4189	case 5: /* reverse video */	4124	case 5: /* reverse video */
4190	scr_rvideo_mode (state);	4125	scr_rvideo_mode (state);
4191	break;	4126	break;
4192	case 6: /* relative/absolute origins */	4127	case 6: /* relative/absolute origins */
…		…
4198	/* case 8: - auto repeat, can't do on a per window basis */	4133	/* case 8: - auto repeat, can't do on a per window basis */
4199	case 9: /* X10 mouse reporting */	4134	case 9: /* X10 mouse reporting */
4200	if (state) /* orthogonal */	4135	if (state) /* orthogonal */
4201	priv_modes &= ~PrivMode_MouseX11;	4136	priv_modes &= ~PrivMode_MouseX11;
4202	break;	4137	break;
4203	#ifdef menuBar_esc
4204	case menuBar_esc:
4205	#ifdef MENUBAR
4206	map_menuBar (state);
4207	#endif
4208	break;
4209	#endif
4210	#ifdef scrollBar_esc	4138	#ifdef scrollBar_esc
4211	case scrollBar_esc:	4139	case scrollBar_esc:
4212	if (scrollbar_mapping (state))	4140	if (scrollbar_mapping (state))
4213	{	4141	{
4214	resize_all_windows (0, 0, 0);	4142	resize_all_windows (0, 0, 0);
…		…
4233	#if 0	4161	#if 0
4234	case 1001:	4162	case 1001:
4235	break; /* X11 mouse highlighting */	4163	break; /* X11 mouse highlighting */
4236	#endif	4164	#endif
4237	case 1010: /* scroll to bottom on TTY output inhibit */	4165	case 1010: /* scroll to bottom on TTY output inhibit */
4238	if (!state)	4166	set_option (Opt_scrollTtyOutput, !state);
4239	SET_OPTION (Opt_scrollTtyOutput);
4240	else
4241	CLR_OPTION (Opt_scrollTtyOutput);
4242	break;	4167	break;
4243	case 1011: /* scroll to bottom on key press */	4168	case 1011: /* scroll to bottom on key press */
4244	if (state)	4169	set_option (Opt_scrollTtyKeypress, state);
4245	SET_OPTION (Opt_scrollTtyKeypress);
4246	else
4247	CLR_OPTION (Opt_scrollTtyKeypress);
4248	break;	4170	break;
4249	case 1047: /* secondary screen w/ clearing last */	4171	case 1047: /* secondary screen w/ clearing last */
4250	if (OPTION (Opt_secondaryScreen))	4172	if (OPTION (Opt_secondaryScreen))
4251	if (current_screen != PRIMARY)	4173	if (current_screen != PRIMARY)
4252	scr_erase_screen (2);	4174	scr_erase_screen (2);
…		…
4462	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4384	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463		4385
4464	void	4386	void
4465	rxvt_term::tt_write (const char *data, unsigned int len)	4387	rxvt_term::tt_write (const char *data, unsigned int len)
4466	{	4388	{
4467	if (pty.pty < 0)	4389	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468	return;	4390	return;
4469		4391
		4392	if (pty->pty < 0)
		4393	return;
		4394
4470	if (v_buflen == 0)	4395	if (v_buflen == 0)
4471	{	4396	{
4472	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4397	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473		4398
4474	if ((unsigned int)written == len)	4399	if ((unsigned int)written == len)
4475	return;	4400	return;
4476		4401
4477	data += written;	4402	data += written;
…		…
4486	pty_ev.set (EVENT_READ | EVENT_WRITE);	4411	pty_ev.set (EVENT_READ | EVENT_WRITE);
4487	}	4412	}
4488		4413
4489	void rxvt_term::pty_write ()	4414	void rxvt_term::pty_write ()
4490	{	4415	{
4491	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4416	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492		4417
4493	if (written > 0)	4418	if (written > 0)
4494	{	4419	{
4495	v_buflen -= written;	4420	v_buflen -= written;
4496		4421

Diff Legend

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