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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 2007 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*----------------------------------------------------------------------*
2	* File: command.C	2	* File: command.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
…		…
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
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
		63
65	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#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		67
72	#if ENABLE_FRILLS || ISO_14755	68	#if ENABLE_FRILLS || ISO_14755
73		69
74	#define ISO_14755_STARTED 0x80000000UL	70	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	71	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	226	# if !UNICODE3
231	if (ch >= 0x10000)	227	if (ch >= 0x10000)
232	ch = 0xfffd;	228	ch = 0xfffd;
233	# endif	229	# endif
234	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
236	}	234	}
237		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
238	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
240		243
241	free (fname);	244	free (fname);
242		245
…		…
295		298
296	return -1;	299	return -1;
297	}	300	}
298	#endif	301	#endif
299		302
300	/*{{{ Convert the keypress event into a string */
301	void	303	void
302	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
303	{	305	{
304	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
305	unsigned int newlen;	307	unsigned int newlen;
306	KeySym keysym;	308	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
464	{	468	{
465	switch (keysym)	469	switch (keysym)
466	{	470	{
467	/* normal XTerm key bindings */	471	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	472	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	473	selection_request (ev.time);
470	return;	474	return;
471	#if TODO	475	#if TODO
472	/* rxvt extras */	476	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	477	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	478	change_font (FONT_UP);
…		…
873	return;	877	return;
874		878
875	if (len <= 0)	879	if (len <= 0)
876	return; /* not mapped */	880	return; /* not mapped */
877		881
878	if (OPTION (Opt_scrollTtyKeypress))	882	if (option (Opt_scrollTtyKeypress))
879	if (view_start)	883	if (view_start)
880	{	884	{
881	view_start = 0;	885	view_start = 0;
882	want_refresh = 1;	886	want_refresh = 1;
883	}	887	}
…		…
905	{	909	{
906	const char ch = C0_ESC;	910	const char ch = C0_ESC;
907	tt_write (&ch, 1);	911	tt_write (&ch, 1);
908	}	912	}
909		913
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);	914	tt_write (kbuf, (unsigned int)len);
921	}	915	}
922	/*}}} */	916
		917	void
		918	rxvt_term::key_release (XKeyEvent &ev)
		919	{
		920	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
		921	KeySym keysym;
		922
		923	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		924	#endif
		925
		926	#if ENABLE_FRILLS || ISO_14755
		927	// ISO 14755 support
		928	if (iso14755buf)
		929	if (iso14755buf & ISO_14755_52)
		930	{
		931	# if ENABLE_OVERLAY
		932	scr_overlay_off ();
		933	# endif
		934	# if ISO_14755
		935	// iso14755 part 5.2 handling: release time
		936	// first: controls
		937	if ((ev.state & ControlMask)
		938	&& ((keysym >= 0x40 && keysym <= 0x5f)
		939	|| (keysym >= 0x61 && keysym <= 0x7f)))
		940	{
		941	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
		942	commit_iso14755 ();
		943
		944	return;
		945	}
		946
		947	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		948	if (i[0] == keysym)
		949	{
		950	iso14755buf = ISO_14755_51 | i[1];
		951	commit_iso14755 ();
		952
		953	return;
		954	}
		955
		956	scr_bell ();
		957	# endif
		958	iso14755buf = 0;
		959
		960	return;
		961	}
		962	else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
		963	{
		964	# if ENABLE_OVERLAY
		965	scr_overlay_off ();
		966	# endif
		967	if (iso14755buf & ISO_14755_51)
		968	commit_iso14755 ();
		969	#if ISO_14755
		970	else if (iso14755buf & ISO_14755_STARTED)
		971	{
		972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		973
		974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		976	}
		977	# endif
		978	else
		979	iso14755buf = 0;
		980	}
		981	#endif
		982
		983	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		984	return;
		985
		986	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		987	if (!(ev.state & ControlMask))
		988	slip_wheel_ev.stop ();
		989	else if (keysym == XK_Control_L || keysym == XK_Control_R)
		990	mouse_slip_wheel_speed = 0;
		991	#endif
		992	}
923		993
924	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
925	unsigned int	995	unsigned int
926	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
927	{	997	{
…		…
1006	while (l->is_longer () && row < end_row);	1076	while (l->is_longer () && row < end_row);
1007	}	1077	}
1008	while (row < end_row);	1078	while (row < end_row);
1009	}	1079	}
1010		1080
1011	scr_refresh (refresh_type);	1081	scr_refresh ();
1012	scrollbar_show (1);	1082	scrollbar_show (1);
1013	#ifdef USE_XIM	1083	#ifdef USE_XIM
1014	IMSendSpot ();	1084	IMSendSpot ();
1015	#endif	1085	#endif
1016	}	1086	}
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1114	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1115	{
1046	hidden_cursor = !hidden_cursor;	1116	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1117	want_refresh = 1;
1048		1118
1049	w.start (w.at + BLINK_INTERVAL);	1119	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1120	}
1051	#endif	1121	#endif
1052		1122
1053	#ifdef TEXT_BLINK	1123	#ifdef TEXT_BLINK
1054	void	1124	void
…		…
1068	rxvt_term::cont_scroll_cb (time_watcher &w)	1138	rxvt_term::cont_scroll_cb (time_watcher &w)
1069	{	1139	{
1070	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1140	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071	scr_page (scrollbar_isUp() ? UP : DN, 1))	1141	scr_page (scrollbar_isUp() ? UP : DN, 1))
1072	{	1142	{
1073	refresh_type |= SMOOTH_REFRESH;
1074	want_refresh = 1;	1143	want_refresh = 1;
1075	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1144	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076	}	1145	}
1077	}	1146	}
1078	#endif	1147	#endif
…		…
1082	rxvt_term::sel_scroll_cb (time_watcher &w)	1151	rxvt_term::sel_scroll_cb (time_watcher &w)
1083	{	1152	{
1084	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1153	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085	{	1154	{
1086	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1155	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087	refresh_type |= SMOOTH_REFRESH;
1088	want_refresh = 1;	1156	want_refresh = 1;
1089	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1157	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090	}	1158	}
1091	}	1159	}
1092	#endif	1160	#endif
…		…
1100	: scr_page (UP, mouse_slip_wheel_speed))	1168	: scr_page (UP, mouse_slip_wheel_speed))
1101	{	1169	{
1102	if (view_start == top_row || view_start == 0)	1170	if (view_start == top_row || view_start == 0)
1103	mouse_slip_wheel_speed = 0;	1171	mouse_slip_wheel_speed = 0;
1104		1172
1105	refresh_type |= SMOOTH_REFRESH;
1106	want_refresh = 1;	1173	want_refresh = 1;
1107	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108	}	1175	}
1109	}	1176	}
1110	#endif	1177	#endif
1111		1178
1112	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1113	static struct event_handler	1180	static struct event_handler
1114	{	1181	{
1115	check_watcher cw_yield;	1182	check_watcher yield_ev;
1116		1183
1117	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1118	{	1185	{
1119	sched_yield ();	1186	// this should really be sched_yield(), but the linux guys thought
		1187	// that giving a process calling sched_yield () less cpu time than
		1188	// ones with high nice levels is a useful thing to do. It surely is is
		1189	// allowed by the sus... as is returning ENOSYS.
		1190
		1191	struct timespec ts = { 0, 0 };
		1192	nanosleep (&ts, 0);
		1193
1120	w.stop ();	1194	w.stop ();
1121	}	1195	}
1122		1196
1123	event_handler ()	1197	event_handler ()
1124	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1125	{	1199	{
1126	}	1200	}
1127	} event_handler;	1201	} event_handler;
1128	#endif	1202	#endif
1129		1203
…		…
1140		1214
1141	memmove (cmdbuf_base, cmdbuf_ptr, n);	1215	memmove (cmdbuf_base, cmdbuf_ptr, n);
1142	cmdbuf_ptr = cmdbuf_base;	1216	cmdbuf_ptr = cmdbuf_base;
1143	cmdbuf_endp = cmdbuf_ptr + n;	1217	cmdbuf_endp = cmdbuf_ptr + n;
1144		1218
1145	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1219	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146		1220
1147	if (r > 0)	1221	if (r > 0)
1148	{	1222	{
1149	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1150	return true;	1224	return true;
1151	}	1225	}
1152	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153	{	1227	{
1154	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1155	if (display->is_local)	1229	if (display->is_local)
1156	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1157	#endif	1231	#endif
1158	}	1232	}
1159	else	1233	else
1160	{	1234	{
1161	pty_ev.stop ();	1235	pty_ev.stop ();
1162		1236
1163	if (!OPTION (Opt_hold))	1237	if (!option (Opt_hold))
1164	destroy ();	1238	destroy ();
1165	}	1239	}
1166		1240
1167	return false;	1241	return false;
1168	}	1242	}
…		…
1183	}	1257	}
1184		1258
1185	void	1259	void
1186	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1187	{	1261	{
1188	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1189	recolour_cursor ();	1263	recolour_cursor ();
1190		1264
1191	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1192	hidden_pointer = 0;	1266	hidden_pointer = 0;
1193		1267
1194	if (OPTION (Opt_pointerBlank))	1268	if (option (Opt_pointerBlank))
1195	pointer_ev.start (NOW + pointerBlankDelay);	1269	pointer_ev.start (NOW + pointerBlankDelay);
1196	#endif	1270	#endif
1197	}	1271	}
1198		1272
1199	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1200	void	1274	void
1201	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1202	{	1276	{
1203	if (!OPTION (Opt_pointerBlank))	1277	if (!option (Opt_pointerBlank))
1204	return;	1278	return;
1205		1279
1206	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1207	XFlush (display->display);	1281	XFlush (dpy);
1208		1282
1209	hidden_pointer = 1;	1283	hidden_pointer = 1;
1210	}	1284	}
1211		1285
1212	void	1286	void
…		…
1285	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1286	(32 + x + 1),	1360	(32 + x + 1),
1287	(32 + y + 1));	1361	(32 + y + 1));
1288	}	1362	}
1289		1363
1290	#ifdef USING_W11LIB
1291	void
1292	rxvt_W11_process_x_event (XEvent *ev)
1293	{
1294	rxvt_t *r = rxvt_get_r ();
1295
1296	x_cb (*ev);
1297	}
1298	#endif
1299
1300	/*{{{ process an X event */	1364	/*{{{ process an X event */
1301	void	1365	void
1302	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1303	{	1367	{
1304	make_current ();	1368	make_current ();
1305		1369
1306	dDisp;	1370	dLocal (Display *, dpy);
1307		1371
1308	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1309	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1310	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311	return;	1375	return;
…		…
1316	unsigned int unused_mask;	1380	unsigned int unused_mask;
1317		1381
1318	switch (ev.type)	1382	switch (ev.type)
1319	{	1383	{
1320	case KeyPress:	1384	case KeyPress:
1321	#if ISO_14755	1385	key_press (ev.xkey);
1322	if (!(iso14755buf & ISO_14755_52))
1323	#endif
1324	lookup_key (ev.xkey);
1325
1326	break;	1386	break;
1327		1387
1328	case KeyRelease:	1388	case KeyRelease:
1329	{	1389	key_release (ev.xkey);
1330	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1331	KeySym keysym;
1332
1333	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1334	#endif
1335
1336	#if ENABLE_FRILLS || ISO_14755
1337	// ISO 14755 support
1338	if (iso14755buf)
1339	if (iso14755buf & ISO_14755_52)
1340	{
1341	# if ENABLE_OVERLAY
1342	scr_overlay_off ();
1343	# endif
1344	# if ISO_14755
1345	// iso14755 part 5.2 handling: release time
1346	// first: controls
1347	if ((ev.xkey.state & ControlMask)
1348	&& ((keysym >= 0x40 && keysym <= 0x5f)
1349	|| (keysym >= 0x61 && keysym <= 0x7f)))
1350	{
1351	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1352	commit_iso14755 ();
1353	goto skip_switch;
1354	}
1355
1356	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1357	if (i[0] == keysym)
1358	{
1359	iso14755buf = ISO_14755_51 | i[1];
1360	commit_iso14755 ();
1361	goto skip_switch;
1362	}
1363
1364	scr_bell ();
1365	# endif
1366	iso14755buf = 0;
1367	break;
1368	}
1369	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1370	{
1371	# if ENABLE_OVERLAY
1372	scr_overlay_off ();
1373	# endif
1374	if (iso14755buf & ISO_14755_51)
1375	commit_iso14755 ();
1376	#if ISO_14755
1377	else if (iso14755buf & ISO_14755_STARTED)
1378	{
1379	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1380
1381	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1382	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1383	}
1384	# endif
1385	else
1386	iso14755buf = 0;
1387	}
1388	#endif
1389
1390	if (ev.xany.window == vt
1391	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392	break;
1393
1394	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1395	if (!(ev.xkey.state & ControlMask))
1396	slip_wheel_ev.stop ();
1397	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1398	mouse_slip_wheel_speed = 0;
1399	#endif
1400	break;	1390	break;
1401	}
1402		1391
1403	case ButtonPress:	1392	case ButtonPress:
1404	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1405	break;	1394	break;
1406		1395
…		…
1408	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1409	break;	1398	break;
1410		1399
1411	case ClientMessage:	1400	case ClientMessage:
1412	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1413	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414	{	1403	{
		1404	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1405	{
		1406	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1407	{
1415	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1408	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1409	{
		1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1411	destroy ();
		1412	}
1417	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1418	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1414	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1419	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1420	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1421	&ev);	1417	&ev);
		1418	#endif
		1419	}
		1420	}
		1421	#if ENABLE_XEMBED
		1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1423	{
		1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1425	focus_in ();
		1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1427	focus_out ();
		1428	}
1422	#endif	1429	#endif
1423	}	1430	}
1424	#if ENABLE_XEMBED
1425	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426	{
1427	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428	focus_in ();
1429	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430	focus_out ();
1431	}
1432	#endif
1433	#ifdef OFFIX_DND
1434	/* OffiX Dnd (drag 'n' drop) protocol */
1435	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1436	&& (ev.xclient.data.l[0] == DndFile
1437	|| ev.xclient.data.l[0] == DndDir
1438	|| ev.xclient.data.l[0] == DndLink))
1439	{
1440	/* Get Dnd data */
1441	Atom ActualType;
1442	int ActualFormat;
1443	unsigned char *data;
1444	unsigned long Size, RemainingBytes;
1445
1446	XGetWindowProperty (disp, display->root,
1447	xa[XA_DNDSELECTION],
1448	0L, 1000000L,
1449	False, AnyPropertyType,
1450	&ActualType, &ActualFormat,
1451	&Size, &RemainingBytes,
1452	&data);
1453	set_string_property (XA_CUT_BUFFER0, data);
1454	XFree (data);
1455	selection_paste (display->root, XA_CUT_BUFFER0, true);
1456	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1457	}
1458	#endif /* OFFIX_DND */
1459	break;	1431	break;
1460		1432
1461	case MappingNotify:	1433	case MappingNotify:
1462	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1463	break;	1435	break;
…		…
1486	break;	1458	break;
1487	}	1459	}
1488	break;	1460	break;
1489		1461
1490	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior
		1464	&& ev.xfocus.detail != NotifyPointer
		1465	&& ev.xfocus.mode != NotifyGrab)
1491	focus_in ();	1466	focus_in ();
1492	break;	1467	break;
1493		1468
1494	case FocusOut:	1469	case FocusOut:
		1470	if (ev.xfocus.detail != NotifyInferior
		1471	&& ev.xfocus.detail != NotifyPointer
		1472	&& ev.xfocus.mode != NotifyGrab)
1495	focus_out ();	1473	focus_out ();
1496	break;	1474	break;
1497		1475
1498	case ConfigureNotify:	1476	case ConfigureNotify:
1499	if (ev.xconfigure.window == parent[0])	1477	if (ev.xconfigure.window == parent[0])
1500	{	1478	{
1501	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1479	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1502	;	1480	;
1503		1481
1504	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1482	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1505	{	1483	{
1506	seen_resize = 1;	1484	seen_resize = 1;
1507	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1485	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508	}	1486	}
1509		1487
1510	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1488	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1489
		1490	#ifdef TRANSPARENT
1511	if (OPTION (Opt_transparent))	1491	if (option (Opt_transparent))
1512	check_our_parents ();	1492	check_our_parents ();
1513	#endif	1493	#endif
1514	}	1494	}
1515	break;	1495	break;
1516		1496
1517	case PropertyNotify:	1497	case PropertyNotify:
		1498	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1499	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519	&& ev.xproperty.state == PropertyNewValue)	1500	&& ev.xproperty.state == PropertyNewValue)
1520	selection_property (ev.xproperty.window, ev.xproperty.atom);	1501	selection_property (ev.xproperty.window, ev.xproperty.atom);
1521		1502
1522	break;	1503	break;
1523		1504
1524	case SelectionClear:	1505	case SelectionClear:
1525	selection_clear ();	1506	selection_clear ();
…		…
1561	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1562	{	1543	{
1563	do	1544	do
1564	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1565	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
1566	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1567		1548
1568	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1569		1550
1570	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1571	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1572	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, False);
1573		1554
1574	want_refresh = 1;	1555	want_refresh = 1;
1575	}	1556	}
1576	else	1557	else
1577	{	1558	{
1578	XEvent unused_event;	1559	XEvent unused_event;
1579		1560
1580	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1561	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1581	;	1562	;
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1583	;	1564	;
1584		1565
1585	if (isScrollbarWindow (ev.xany.window))	1566	if (isScrollbarWindow (ev.xany.window))
1586	{	1567	{
1587	scrollBar.setIdle ();	1568	scrollBar.setIdle ();
1588	scrollbar_show (0);	1569	scrollbar_show (0);
1589	}	1570	}
1590		1571
1591	#ifdef TRANSPARENT	1572	#ifdef TRANSPARENT
1592	if (am_transparent && ev.xany.window == parent[0])	1573	if (am_transparent && ev.xany.window == parent[0])
1593	XClearWindow (disp, ev.xany.window);	1574	XClearWindow (dpy, ev.xany.window);
1594	#endif	1575	#endif
1595	}	1576	}
1596	break;	1577	break;
1597		1578
1598	case MotionNotify:	1579	case MotionNotify:
…		…
1608	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1589	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1590	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610	; // nop	1591	; // nop
1611	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1592	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1612	{	1593	{
1613	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1594	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1614	;	1595	;
1615		1596
1616	XQueryPointer (disp, vt,	1597	XQueryPointer (dpy, vt,
1617	&unused_root, &unused_child,	1598	&unused_root, &unused_child,
1618	&unused_root_x, &unused_root_y,	1599	&unused_root_x, &unused_root_y,
1619	&ev.xbutton.x, &ev.xbutton.y,	1600	&ev.xbutton.x, &ev.xbutton.y,
1620	&ev.xbutton.state);	1601	&ev.xbutton.state);
1621	#ifdef MOUSE_THRESHOLD	1602	#ifdef MOUSE_THRESHOLD
…		…
1685	#endif	1666	#endif
1686	}	1667	}
1687	}	1668	}
1688	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1669	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1689	{	1670	{
1690	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1671	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1691	MotionNotify, &ev))	1672	MotionNotify, &ev))
1692	;	1673	;
1693		1674
1694	XQueryPointer (disp, scrollBar.win,	1675	XQueryPointer (dpy, scrollBar.win,
1695	&unused_root, &unused_child,	1676	&unused_root, &unused_child,
1696	&unused_root_x, &unused_root_y,	1677	&unused_root_x, &unused_root_y,
1697	&ev.xbutton.x, &ev.xbutton.y,	1678	&ev.xbutton.x, &ev.xbutton.y,
1698	&unused_mask);	1679	&unused_mask);
1699	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1680	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1703	scrollbar_show (1);	1684	scrollbar_show (1);
1704	}	1685	}
1705	break;	1686	break;
1706	}	1687	}
1707		1688
1708	skip_switch: ;
1709
1710	#if defined(CURSOR_BLINK)	1689	#if defined(CURSOR_BLINK)
1711	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1712	{	1691	{
1713	if (hidden_cursor)	1692	if (hidden_cursor)
1714	{	1693	{
1715	hidden_cursor = 0;	1694	hidden_cursor = 0;
1716	want_refresh = 1;	1695	want_refresh = 1;
1717	}	1696	}
1718		1697
1719	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720	}	1699	}
1721	#endif	1700	#endif
1722		1701
1723	#if defined(POINTER_BLANK)	1702	#if defined(POINTER_BLANK)
1724	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1725	{	1704	{
1726	if (ev.type == MotionNotify	1705	if (ev.type == MotionNotify
1727	|| ev.type == ButtonPress	1706	|| ev.type == ButtonPress
1728	|| ev.type == ButtonRelease)	1707	|| ev.type == ButtonRelease)
1729	if (hidden_pointer)	1708	if (hidden_pointer)
…		…
1741	if (!focus)	1720	if (!focus)
1742	{	1721	{
1743	focus = 1;	1722	focus = 1;
1744	want_refresh = 1;	1723	want_refresh = 1;
1745		1724
1746	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1725	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747		1726
1748	#if USE_XIM	1727	#if USE_XIM
1749	if (Input_Context != NULL)	1728	if (Input_Context != NULL)
1750	{	1729	{
1751	IMSetStatusPosition ();	1730	IMSetPosition ();
1752	XSetICFocus (Input_Context);	1731	XSetICFocus (Input_Context);
1753	}	1732	}
1754	#endif	1733	#endif
1755	#if CURSOR_BLINK	1734	#if CURSOR_BLINK
1756	if (OPTION (Opt_cursorBlink))	1735	if (option (Opt_cursorBlink))
1757	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758	#endif	1737	#endif
1759	#if OFF_FOCUS_FADING	1738	#if OFF_FOCUS_FADING
1760	if (rs[Rs_fade])	1739	if (rs[Rs_fade])
1761	{	1740	{
1762	pix_colors = pix_colors_focused;	1741	pix_colors = pix_colors_focused;
…		…
1788	#if USE_XIM	1767	#if USE_XIM
1789	if (Input_Context != NULL)	1768	if (Input_Context != NULL)
1790	XUnsetICFocus (Input_Context);	1769	XUnsetICFocus (Input_Context);
1791	#endif	1770	#endif
1792	#if CURSOR_BLINK	1771	#if CURSOR_BLINK
1793	if (OPTION (Opt_cursorBlink))	1772	if (option (Opt_cursorBlink))
1794	cursor_blink_ev.stop ();	1773	cursor_blink_ev.stop ();
1795	hidden_cursor = 0;	1774	hidden_cursor = 0;
1796	#endif	1775	#endif
1797	#if OFF_FOCUS_FADING	1776	#if OFF_FOCUS_FADING
1798	if (rs[Rs_fade])	1777	if (rs[Rs_fade])
…		…
1802	}	1781	}
1803	#endif	1782	#endif
1804	}	1783	}
1805	}	1784	}
1806		1785
1807	#if TRANSPARENT	1786	void
		1787	rxvt_term::update_fade_color (unsigned int idx)
		1788	{
		1789	#if OFF_FOCUS_FADING
		1790	if (rs[Rs_fade])
		1791	{
		1792	rgba c;
		1793	pix_colors [Color_fade].get (c);
		1794	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1795	}
		1796	#endif
		1797	}
		1798
		1799	#if TRANSPARENT || ENABLE_PERL
1808	void	1800	void
1809	rxvt_term::rootwin_cb (XEvent &ev)	1801	rxvt_term::rootwin_cb (XEvent &ev)
1810	{	1802	{
1811	make_current ();	1803	make_current ();
1812		1804
		1805	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1806	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1807	return;
		1808
		1809	# if TRANSPARENT
1813	switch (ev.type)	1810	switch (ev.type)
1814	{	1811	{
1815	case PropertyNotify:	1812	case PropertyNotify:
1816	/*	1813	/*
1817	* if user used some Esetroot compatible prog to set the root bg,	1814	* if user used some Esetroot compatible prog to set the root bg,
…		…
1821	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1818	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1822	return;	1819	return;
1823		1820
1824	/* FALLTHROUGH */	1821	/* FALLTHROUGH */
1825	case ReparentNotify:	1822	case ReparentNotify:
1826	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1823	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1827	want_refresh = want_full_refresh = 1;	1824	want_refresh = want_full_refresh = 1;
1828	break;	1825	break;
1829	}	1826	}
		1827	# endif
1830	}	1828	}
1831	#endif	1829	#endif
1832		1830
1833	void	1831	void
1834	rxvt_term::button_press (XButtonEvent &ev)	1832	rxvt_term::button_press (XButtonEvent &ev)
…		…
1843	/*	1841	/*
1844	* VT window processing of button press	1842	* VT window processing of button press
1845	*/	1843	*/
1846	if (ev.window == vt)	1844	if (ev.window == vt)
1847	{	1845	{
		1846	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1847	return;
		1848
1848	#if ISO_14755	1849	#if ISO_14755
1849	// 5.4	1850	// 5.4
1850	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1851	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1851	{	1852	{
1852	iso14755_54 (ev.x, ev.y);	1853	iso14755_54 (ev.x, ev.y);
…		…
1894	else	1895	else
1895	{	1896	{
1896	if (ev.button != MEvent.button)	1897	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1898	MEvent.clicks = 0;
1898		1899
1899	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1900	switch (ev.button)
1901	{	1901	{
1902	case Button1:	1902	case Button1:
1903	/* allow meta + click to select rectangular areas */	1903	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1904	/* should be done in screen.C */
1905	#if ENABLE_FRILLS	1905	#if ENABLE_FRILLS
1906	selection.rect = !!(ev.state & ModMetaMask);	1906	selection.rect = !!(ev.state & ModMetaMask);
1907	#else	1907	#else
1908	selection.rect = false;	1908	selection.rect = false;
1909	#endif	1909	#endif
1910		1910
1911	/* allow shift+left click to extend selection */	1911	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1912	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1913	{
1914	if (MEvent.button == Button1 && clickintime)	1914	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1915	selection_rotate (ev.x, ev.y);
1916	else	1916	else
1917	selection_extend (ev.x, ev.y, 1);	1917	selection_extend (ev.x, ev.y, 1);
1918	}	1918	}
1919	else	1919	else
1920	{	1920	{
1921	if (MEvent.button == Button1 && clickintime)	1921	if (MEvent.button == Button1 && clickintime)
1922	MEvent.clicks++;	1922	MEvent.clicks++;
1923	else	1923	else
1924	MEvent.clicks = 1;	1924	MEvent.clicks = 1;
1925		1925
1926	selection_click (MEvent.clicks, ev.x, ev.y);	1926	selection_click (MEvent.clicks, ev.x, ev.y);
1927	}	1927	}
1928		1928
1929	MEvent.button = Button1;	1929	MEvent.button = Button1;
1930	break;	1930	break;
1931		1931
1932	case Button3:	1932	case Button3:
1933	if (MEvent.button == Button3 && clickintime)	1933	if (MEvent.button == Button3 && clickintime)
1934	selection_rotate (ev.x, ev.y);	1934	selection_rotate (ev.x, ev.y);
1935	else	1935	else
1936	selection_extend (ev.x, ev.y, 1);	1936	selection_extend (ev.x, ev.y, 1);
1937		1937
1938	MEvent.button = Button3;	1938	MEvent.button = Button3;
1939	break;	1939	break;
1940	}	1940	}
1941	}	1941	}
1942		1942
1943	MEvent.time = ev.time;	1943	MEvent.time = ev.time;
1944	return;	1944	return;
1945	}	1945	}
1946		1946
…		…
2100		2100
2101	if (scrollbar_isUpDn ())	2101	if (scrollbar_isUpDn ())
2102	{	2102	{
2103	scrollBar.setIdle ();	2103	scrollBar.setIdle ();
2104	scrollbar_show (0);	2104	scrollbar_show (0);
2105	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106	refresh_type &= ~SMOOTH_REFRESH;
2107	#endif
2108	}	2105	}
2109		2106
2110	#ifdef SELECTION_SCROLLING	2107	#ifdef SELECTION_SCROLLING
2111	if (sel_scroll_ev.active)	2108	if (sel_scroll_ev.active)
2112	sel_scroll_ev.stop();	2109	sel_scroll_ev.stop();
2113	#endif	2110	#endif
2114		2111
2115	if (ev.window == vt)	2112	if (ev.window == vt)
2116	{	2113	{
		2114	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2115	return;
		2116
2117	#if ISO_14755	2117	#if ISO_14755
2118	// 5.4	2118	// 5.4
2119	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2119	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2120	return;	2120	return;
2121	#endif	2121	#endif
		2122
2122	if (reportmode)	2123	if (reportmode)
2123	{	2124	{
2124	/* mouse report from vt window */	2125	/* mouse report from vt window */
2125	/* don't report release of wheel "buttons" */	2126	/* don't report release of wheel "buttons" */
2126	if (ev.button >= 4)	2127	if (ev.button >= 4)
…		…
2150	if (priv_modes & PrivMode_mouse_report	2151	if (priv_modes & PrivMode_mouse_report
2151	&& bypass_keystate	2152	&& bypass_keystate
2152	&& ev.button == Button1 && MEvent.clicks <= 1)	2153	&& ev.button == Button1 && MEvent.clicks <= 1)
2153	selection_extend (ev.x, ev.y, 0);	2154	selection_extend (ev.x, ev.y, 0);
2154		2155
2155	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156	return;
2157
2158	switch (ev.button)	2156	switch (ev.button)
2159	{	2157	{
2160	case Button1:	2158	case Button1:
2161	case Button3:	2159	case Button3:
2162	selection_make (ev.time);	2160	selection_make (ev.time);
2163	break;	2161	break;
		2162
2164	case Button2:	2163	case Button2:
2165	selection_request (ev.time, ev.x, ev.y);	2164	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2165	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2166	break;	2166	break;
		2167
2167	#ifdef MOUSE_WHEEL	2168	#ifdef MOUSE_WHEEL
2168	case Button4:	2169	case Button4:
2169	case Button5:	2170	case Button5:
2170	{	2171	{
2171	int i;	2172	int i;
…		…
2173		2174
2174	v = ev.button == Button4 ? UP : DN;	2175	v = ev.button == Button4 ? UP : DN;
2175		2176
2176	if (ev.state & ShiftMask)	2177	if (ev.state & ShiftMask)
2177	i = 1;	2178	i = 1;
2178	else if (OPTION (Opt_mouseWheelScrollPage))	2179	else if (option (Opt_mouseWheelScrollPage))
2179	i = nrow - 1;	2180	i = nrow - 1;
2180	else	2181	else
2181	i = 5;	2182	i = 5;
2182		2183
2183	# ifdef MOUSE_SLIP_WHEELING	2184	# ifdef MOUSE_SLIP_WHEELING
…		…
2211	#if TINTING	2212	#if TINTING
2212	/* taken from aterm-0.4.2 */	2213	/* taken from aterm-0.4.2 */
2213		2214
2214	typedef uint32_t RUINT32T;	2215	typedef uint32_t RUINT32T;
2215		2216
2216	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2217	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2217	{	2218	{
2218	int sh_r, sh_g, sh_b;	2219	int sh_r, sh_g, sh_b;
2219	RUINT32T mask_r, mask_g, mask_b;	2220	RUINT32T mask_r, mask_g, mask_b;
2220	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2221	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2221	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2222	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2222	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2223	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2223	int i;	2224	int i;
2224		2225
2225	Visual *visual = display->visual;	2226	Visual *visual = term->visual;
2226		2227
2227	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2228	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2228		2229
2229	/* for convenience */	2230	/* for convenience */
2230	mask_r = visual->red_mask;	2231	mask_r = visual->red_mask;
…		…
2451	Atom atype;	2452	Atom atype;
2452	unsigned char *prop = NULL;	2453	unsigned char *prop = NULL;
2453	Window root, oldp, *list;	2454	Window root, oldp, *list;
2454	Pixmap rootpixmap = None;	2455	Pixmap rootpixmap = None;
2455	XWindowAttributes wattr, wrootattr;	2456	XWindowAttributes wattr, wrootattr;
2456	dDisp;
2457		2457
2458	pchanged = 0;	2458	pchanged = 0;
2459		2459
2460	if (!OPTION (Opt_transparent))	2460	if (!option (Opt_transparent))
2461	return pchanged; /* Don't try any more */	2461	return pchanged; /* Don't try any more */
2462		2462
2463	XGetWindowAttributes (disp, display->root, &wrootattr);	2463	XGetWindowAttributes (dpy, display->root, &wrootattr);
2464	rootdepth = wrootattr.depth;	2464	rootdepth = wrootattr.depth;
2465		2465
2466	XGetWindowAttributes (disp, parent[0], &wattr);	2466	XGetWindowAttributes (dpy, parent[0], &wattr);
2467		2467
2468	if (rootdepth != wattr.depth)	2468	if (rootdepth != wattr.depth)
2469	{	2469	{
2470	if (am_transparent)	2470	if (am_transparent)
2471	{	2471	{
2472	pchanged = 1;	2472	pchanged = 1;
2473	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2473	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2474	am_transparent = am_pixmap_trans = 0;	2474	am_transparent = am_pixmap_trans = 0;
2475	}	2475	}
2476		2476
2477	return pchanged; /* Don't try any more */	2477	return pchanged; /* Don't try any more */
2478	}	2478	}
2479		2479
2480	/* Get all X ops out of the queue so that our information is up-to-date. */	2480	/* Get all X ops out of the queue so that our information is up-to-date. */
2481	XSync (disp, False);	2481	XSync (dpy, False);
2482		2482
2483	/*	2483	/*
2484	* Make the frame window set by the window manager have	2484	* Make the frame window set by the window manager have
2485	* the root background. Some window managers put multiple nested frame	2485	* the root background. Some window managers put multiple nested frame
2486	* windows for each client, so we have to take care about that.	2486	* windows for each client, so we have to take care about that.
2487	*/	2487	*/
2488	i = (xa[XA_XROOTPMAP_ID]	2488	i = (xa[XA_XROOTPMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2489	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2491	&nitems, &bytes_after, &prop) == Success);
2492		2492
2493	if (!i || prop == NULL)	2493	if (!i || prop == NULL)
2494	i = (xa[XA_ESETROOT_PMAP_ID]	2494	i = (xa[XA_ESETROOT_PMAP_ID]
2495	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2495	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2496	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2496	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497	&nitems, &bytes_after, &prop) == Success);	2497	&nitems, &bytes_after, &prop) == Success);
2498		2498
2499	if (!i || prop == NULL	2499	if (!i || prop == NULL
2500	#if TINTING	2500	#if TINTING
2501	|| !rs[Rs_color + Color_tint]	2501	|| !ISSET_PIXCOLOR (Color_tint)
2502	#endif	2502	#endif
2503	)	2503	)
2504	have_pixmap = 0;	2504	have_pixmap = 0;
2505	else	2505	else
2506	{	2506	{
…		…
2519	Window cr;	2519	Window cr;
2520	XImage *image;	2520	XImage *image;
2521	GC gc;	2521	GC gc;
2522	XGCValues gcvalue;	2522	XGCValues gcvalue;
2523		2523
2524	XTranslateCoordinates (disp, parent[0], display->root,	2524	XTranslateCoordinates (dpy, parent[0], display->root,
2525	0, 0, &sx, &sy, &cr);	2525	0, 0, &sx, &sy, &cr);
2526	nw = (unsigned int)szHint.width;	2526	nw = (unsigned int)szHint.width;
2527	nh = (unsigned int)szHint.height;	2527	nh = (unsigned int)szHint.height;
2528	nx = ny = 0;	2528	nx = ny = 0;
2529		2529
…		…
2542	}	2542	}
2543		2543
2544	min_it (nw, (unsigned int) (wrootattr.width - sx));	2544	min_it (nw, (unsigned int) (wrootattr.width - sx));
2545	min_it (nh, (unsigned int) (wrootattr.height - sy));	2545	min_it (nh, (unsigned int) (wrootattr.height - sy));
2546		2546
2547	XSync (disp, False);	2547	XSync (dpy, False);
2548	allowedxerror = -1;	2548	allowedxerror = -1;
2549	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2549	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550		2550
2551	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2551	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2552	/* XXX: may need a delay here? */	2552	/* XXX: may need a delay here? */
2553	allowedxerror = 0;	2553	allowedxerror = 0;
2554		2554
…		…
2557	if (am_transparent && am_pixmap_trans)	2557	if (am_transparent && am_pixmap_trans)
2558	{	2558	{
2559	pchanged = 1;	2559	pchanged = 1;
2560	if (pixmap != None)	2560	if (pixmap != None)
2561	{	2561	{
2562	XFreePixmap (disp, pixmap);	2562	XFreePixmap (dpy, pixmap);
2563	pixmap = None;	2563	pixmap = None;
2564	}	2564	}
2565	}	2565	}
2566		2566
2567	am_pixmap_trans = 0;	2567	am_pixmap_trans = 0;
2568	}	2568	}
2569	else	2569	else
2570	{	2570	{
2571	if (pixmap != None)	2571	if (pixmap != None)
2572	XFreePixmap (disp, pixmap);	2572	XFreePixmap (dpy, pixmap);
2573		2573
2574	#if TINTING	2574	#if TINTING
2575	if (ISSET_PIXCOLOR (Color_tint))	2575	if (ISSET_PIXCOLOR (Color_tint))
2576	{	2576	{
2577	unsigned short rm, gm, bm;
2578	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2577	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2579		2578
		2579	rgba c;
2580	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2580	pix_colors_focused [Color_tint].get (c);
2581		2581
2582	ShadeXImage (display, image, shade, rm, gm, bm);	2582	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2583	}	2583	}
2584	#endif	2584	#endif
2585		2585
2586	pixmap = XCreatePixmap (disp, vt,	2586	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2587	szHint.width, szHint.height, image->depth);
2588	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2587	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2589	XPutImage (disp, pixmap, gc, image, 0, 0,	2588	XPutImage (dpy, pixmap, gc, image, 0, 0,
2590	nx, ny, image->width, image->height);	2589	nx, ny, image->width, image->height);
2591	XFreeGC (disp, gc);	2590	XFreeGC (dpy, gc);
2592	XDestroyImage (image);	2591	XDestroyImage (image);
2593	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2592	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2594	XClearWindow (disp, parent[0]);	2593	XClearWindow (dpy, parent[0]);
2595		2594
2596	if (!am_transparent || !am_pixmap_trans)	2595	if (!am_transparent || !am_pixmap_trans)
2597	pchanged = 1;	2596	pchanged = 1;
2598		2597
2599	am_transparent = am_pixmap_trans = 1;	2598	am_transparent = am_pixmap_trans = 1;
2600	}	2599	}
2601	}	2600	}
2602		2601
2603	if (am_pixmap_trans)	2602	if (am_pixmap_trans)
2604	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2603	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2605	else	2604	else
2606	{	2605	{
2607	unsigned int n;	2606	unsigned int n;
2608	/*	2607	/*
2609	* InheritPixmap transparency	2608	* InheritPixmap transparency
2610	*/	2609	*/
2611	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2610	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2612	{	2611	{
2613	oldp = parent[i];	2612	oldp = parent[i];
2614	XQueryTree (disp, parent[i - 1], &root,	2613	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2615	&parent[i], &list, &n);
2616	XFree (list);	2614	XFree (list);
2617		2615
2618	if (parent[i] == display->root)	2616	if (parent[i] == display->root)
2619	{	2617	{
2620	if (oldp != None)	2618	if (oldp != None)
…		…
2628	}	2626	}
2629		2627
2630	n = 0;	2628	n = 0;
2631		2629
2632	if (pchanged)	2630	if (pchanged)
2633	{
2634	for (; n < (unsigned int)i; n++)	2631	for (; n < (unsigned int)i; n++)
2635	{	2632	{
2636	XGetWindowAttributes (disp, parent[n], &wattr);	2633	XGetWindowAttributes (dpy, parent[n], &wattr);
		2634
2637	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2635	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2638	{	2636	{
2639	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2637	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2640	break;	2638	break;
2641	}	2639	}
2642	}	2640	}
2643	}
2644		2641
2645	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2642	if (n > (sizeof (parent) / sizeof (parent[0])))
2646	{	2643	{
2647	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2644	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2648	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2645	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2649	am_transparent = 0;	2646	am_transparent = 0;
2650	/* XXX: also turn off Opt_transparent? */	2647	/* XXX: also turn off Opt_transparent? */
2651	}	2648	}
2652	else	2649	else
2653	{	2650	{
2654	#if WAIT_FOR_WM
2655	/* wait (an arbitrary period) for the WM to do its thing
2656	* needed for fvwm2.2.2 (and before?) */
2657	sleep (1);
2658	#endif
2659	for (n = 0; n < (unsigned int)i; n++)	2651	for (n = 0; n < (unsigned int)i; n++)
2660	{	2652	{
2661	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2653	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2662	XClearWindow (disp, parent[n]);	2654	XClearWindow (dpy, parent[n]);
2663	}	2655	}
2664		2656
2665	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2657	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2666	am_transparent = 1;	2658	am_transparent = 1;
2667	}	2659	}
2668		2660
2669	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2661	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2670	parent[i] = None;	2662	parent[i] = None;
2671	}	2663	}
2672		2664
2673	if (scrollBar.win)	2665	if (scrollBar.win)
2674	{	2666	{
2675	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2667	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2676	scrollBar.setIdle ();	2668	scrollBar.setIdle ();
2677	scrollbar_show (0);	2669	scrollbar_show (0);
2678	}	2670	}
2679		2671
2680	if (am_transparent)	2672	if (am_transparent)
…		…
2743	if (ch == C0_LF)	2735	if (ch == C0_LF)
2744	nlines++;	2736	nlines++;
2745		2737
2746	refresh_count++;	2738	refresh_count++;
2747		2739
2748	if (!OPTION (Opt_jumpScroll)	2740	if (!option (Opt_jumpScroll)
2749	|| (refresh_count >= refresh_limit * (nrow - 1)))	2741	|| (refresh_count >= refresh_limit * (nrow - 1)))
2750	{	2742	{
2751	refreshnow = true;	2743	refreshnow = true;
2752	refresh_count = 0;	2744	refresh_count = 0;
2753	ch = NOCHAR;	2745	ch = NOCHAR;
…		…
2793	* the number of pages between refreshes is refresh_limit, which	2785	* the number of pages between refreshes is refresh_limit, which
2794	* is incremented here because we must be doing flat-out scrolling.	2786	* is incremented here because we must be doing flat-out scrolling.
2795	*/	2787	*/
2796	if (refreshnow)	2788	if (refreshnow)
2797	{	2789	{
2798	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2790	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799	refresh_limit++;	2791	refresh_limit++;
2800	else	2792	else
2801	{	2793	{
2802	flag = true;	2794	flag = true;
		2795	//TODO: due to popular request, implement "skipscroll" option here
2803	scr_refresh (refresh_type);	2796	scr_refresh ();
2804	want_refresh = 1;	2797	want_refresh = 1;
2805	}	2798	}
2806	}	2799	}
2807		2800
2808	}	2801	}
…		…
2826	return flag;	2819	return flag;
2827	}	2820	}
2828		2821
2829	// read the next character	2822	// read the next character
2830	wchar_t	2823	wchar_t
2831	rxvt_term::next_char ()	2824	rxvt_term::next_char () NOTHROW
2832	{	2825	{
2833	while (cmdbuf_ptr < cmdbuf_endp)	2826	while (cmdbuf_ptr < cmdbuf_endp)
2834	{	2827	{
2835	// assume 7-bit to be ascii ALWAYS	2828	// assume 7-bit to be ascii ALWAYS
2836	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2829	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2857	return NOCHAR;	2850	return NOCHAR;
2858	}	2851	}
2859		2852
2860	// read the next octet	2853	// read the next octet
2861	uint32_t	2854	uint32_t
2862	rxvt_term::next_octet ()	2855	rxvt_term::next_octet () NOTHROW
2863	{	2856	{
2864	return cmdbuf_ptr < cmdbuf_endp	2857	return cmdbuf_ptr < cmdbuf_endp
2865	? (unsigned char)*cmdbuf_ptr++	2858	? (unsigned char)*cmdbuf_ptr++
2866	: NOCHAR;	2859	: NOCHAR;
2867	}	2860	}
		2861
		2862	static class out_of_input out_of_input;
2868		2863
2869	/* rxvt_cmd_getc () - Return next input character */	2864	/* rxvt_cmd_getc () - Return next input character */
2870	/*	2865	/*
2871	* Return the next input character after first passing any keyboard input	2866	* Return the next input character after first passing any keyboard input
2872	* to the command.	2867	* to the command.
2873	*/	2868	*/
2874	wchar_t	2869	wchar_t
2875	rxvt_term::cmd_getc ()	2870	rxvt_term::cmd_getc () THROW ((class out_of_input))
2876	{	2871	{
2877	wchar_t c = next_char ();	2872	wchar_t c = next_char ();
2878		2873
2879	if (c == NOCHAR)	2874	if (c == NOCHAR)
2880	throw out_of_input;	2875	throw out_of_input;
2881		2876
2882	return c;	2877	return c;
2883	}	2878	}
2884		2879
2885	uint32_t	2880	uint32_t
2886	rxvt_term::cmd_get8 ()	2881	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887	{	2882	{
2888	uint32_t c = next_octet ();	2883	uint32_t c = next_octet ();
2889		2884
2890	if (c == NOCHAR)	2885	if (c == NOCHAR)
2891	throw out_of_input;	2886	throw out_of_input;
…		…
3129	scr_charset_set (2, (unsigned int)cmd_getc ());	3124	scr_charset_set (2, (unsigned int)cmd_getc ());
3130	break;	3125	break;
3131	case '+':	3126	case '+':
3132	scr_charset_set (3, (unsigned int)cmd_getc ());	3127	scr_charset_set (3, (unsigned int)cmd_getc ());
3133	break;	3128	break;
3134	#if ENABLE_FRILLS	3129	#if !ENABLE_MINIMAL
3135	case '6':	3130	case '6':
3136	scr_backindex ();	3131	scr_backindex ();
3137	break;	3132	break;
3138	#endif	3133	#endif
3139	case '7':	3134	case '7':
3140	scr_cursor (SAVE);	3135	scr_cursor (SAVE);
3141	break;	3136	break;
3142	case '8':	3137	case '8':
3143	scr_cursor (RESTORE);	3138	scr_cursor (RESTORE);
3144	break;	3139	break;
3145	#if ENABLE_FRILLS	3140	#if !ENABLE_MINIMAL
3146	case '9':	3141	case '9':
3147	scr_forwardindex ();	3142	scr_forwardindex ();
3148	break;	3143	break;
3149	#endif	3144	#endif
3150	case '=':	3145	case '=':
…		…
3312	ndef = get_byte_array_bit (csi_defaults, i);	3307	ndef = get_byte_array_bit (csi_defaults, i);
3313	for (p = 0; p < nargs; p++)	3308	for (p = 0; p < nargs; p++)
3314	if (arg[p] == -1)	3309	if (arg[p] == -1)
3315	arg[p] = ndef;	3310	arg[p] = ndef;
3316		3311
3317	#ifdef DEBUG_CMD
3318	fprintf (stderr, "CSI ");
3319	for (p = 0; p < nargs; p++)
3320	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3321	fprintf (stderr, "%c\n", ch);
3322	#endif
3323
3324	/*	3312	/*
3325	* private mode handling	3313	* private mode handling
3326	*/	3314	*/
3327	if (priv)	3315	if (priv)
3328	{	3316	{
3329	switch (priv)	3317	switch (priv)
3330	{	3318	{
3331	case '>':	3319	case '>':
3332	if (ch == CSI_DA) /* secondary device attributes */	3320	if (ch == CSI_DA) /* secondary device attributes */
3333	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3321	{
		3322	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3323	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3324	//
		3325	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3326	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3327	// that we do not support xterm mouse reporting (should be 95 when we do).
		3328	//
		3329	tt_printf ("\033[>%d;94;0c", 'U');
		3330	}
3334	break;	3331	break;
3335	case '?':	3332	case '?':
3336	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3333	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3337	process_terminal_mode (ch, priv, nargs, arg);	3334	process_terminal_mode (ch, priv, nargs, arg);
3338	break;	3335	break;
…		…
3464	break;	3461	break;
3465	case 6: /* CPR requested */	3462	case 6: /* CPR requested */
3466	scr_report_position ();	3463	scr_report_position ();
3467	break;	3464	break;
3468	case 7: /* unofficial extension */	3465	case 7: /* unofficial extension */
3469	if (OPTION (Opt_insecure))	3466	if (option (Opt_insecure))
3470	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3467	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3471	break;	3468	break;
3472	case 8: /* unofficial extension */	3469	case 8: /* unofficial extension */
3473	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3470	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3474	break;	3471	break;
…		…
3541	break;	3538	break;
3542	case CSI_75:	3539	case CSI_75:
3543	scr_cursor (RESTORE);	3540	scr_cursor (RESTORE);
3544	break;	3541	break;
3545		3542
3546	#if ENABLE_FRILLS	3543	#if !ENABLE_MINIMAL
3547	case CSI_74:	3544	case CSI_74:
3548	process_window_ops (arg, nargs);	3545	process_window_ops (arg, nargs);
3549	break;	3546	break;
3550	#endif	3547	#endif
3551		3548
…		…
3558	break;	3555	break;
3559	}	3556	}
3560	}	3557	}
3561	/*}}} */	3558	/*}}} */
3562		3559
3563	#if ENABLE_FRILLS	3560	#if !ENABLE_MINIMAL
3564	/* ARGSUSED */	3561	/* ARGSUSED */
3565	void	3562	void
3566	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3563	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3567	{	3564	{
3568	int x, y;	3565	int x, y;
3569	XWindowAttributes wattr;	3566	XWindowAttributes wattr;
3570	Window wdummy;	3567	Window wdummy;
3571	dDisp;	3568
		3569	dLocal (Display *, dpy);
3572		3570
3573	if (nargs == 0)	3571	if (nargs == 0)
3574	return;	3572	return;
3575		3573
3576	switch (args[0])	3574	switch (args[0])
3577	{	3575	{
3578	/*	3576	/*
3579	* commands	3577	* commands
3580	*/	3578	*/
3581	case 1: /* deiconify window */	3579	case 1: /* deiconify window */
3582	XMapWindow (disp, parent[0]);	3580	XMapWindow (dpy, parent[0]);
3583	break;	3581	break;
3584	case 2: /* iconify window */	3582	case 2: /* iconify window */
3585	XIconifyWindow (disp, parent[0], display->screen);	3583	XIconifyWindow (dpy, parent[0], display->screen);
3586	break;	3584	break;
3587	case 3: /* set position (pixels) */	3585	case 3: /* set position (pixels) */
3588	XMoveWindow (disp, parent[0], args[1], args[2]);	3586	XMoveWindow (dpy, parent[0], args[1], args[2]);
3589	break;	3587	break;
3590	case 4: /* set size (pixels) */	3588	case 4: /* set size (pixels) */
3591	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3589	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3592	break;	3590	break;
3593	case 5: /* raise window */	3591	case 5: /* raise window */
3594	XRaiseWindow (disp, parent[0]);	3592	XRaiseWindow (dpy, parent[0]);
3595	break;	3593	break;
3596	case 6: /* lower window */	3594	case 6: /* lower window */
3597	XLowerWindow (disp, parent[0]);	3595	XLowerWindow (dpy, parent[0]);
3598	break;	3596	break;
3599	case 7: /* refresh window */	3597	case 7: /* refresh window */
3600	scr_touch (true);	3598	scr_touch (true);
3601	break;	3599	break;
3602	case 8: /* set size (chars) */	3600	case 8: /* set size (chars) */
…		…
3609	if (args[0] >= 24) /* set height (chars) */	3607	if (args[0] >= 24) /* set height (chars) */
3610	set_widthheight ((unsigned int)width,	3608	set_widthheight ((unsigned int)width,
3611	(unsigned int) (args[1] * fheight));	3609	(unsigned int) (args[1] * fheight));
3612	break;	3610	break;
3613		3611
3614
3615	/*	3612	/*
3616	* reports - some output format copied from XTerm	3613	* reports - some output format copied from XTerm
3617	*/	3614	*/
3618	case 11: /* report window state */	3615	case 11: /* report window state */
3619	XGetWindowAttributes (disp, parent[0], &wattr);	3616	XGetWindowAttributes (dpy, parent[0], &wattr);
3620	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3617	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3621	break;	3618	break;
3622	case 13: /* report window position */	3619	case 13: /* report window position */
3623	XGetWindowAttributes (disp, parent[0], &wattr);	3620	XGetWindowAttributes (dpy, parent[0], &wattr);
3624	XTranslateCoordinates (disp, parent[0], wattr.root,	3621	XTranslateCoordinates (dpy, parent[0], wattr.root,
3625	-wattr.border_width, -wattr.border_width,	3622	-wattr.border_width, -wattr.border_width,
3626	&x, &y, &wdummy);	3623	&x, &y, &wdummy);
3627	tt_printf ("\033[3;%d;%dt", x, y);	3624	tt_printf ("\033[3;%d;%dt", x, y);
3628	break;	3625	break;
3629	case 14: /* report window size (pixels) */	3626	case 14: /* report window size (pixels) */
3630	XGetWindowAttributes (disp, parent[0], &wattr);	3627	XGetWindowAttributes (dpy, parent[0], &wattr);
3631	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3628	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3632	break;	3629	break;
3633	case 18: /* report text area size (chars) */	3630	case 18: /* report text area size (chars) */
3634	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3631	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3635	break;	3632	break;
…		…
3637	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3634	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3638	break;	3635	break;
3639	case 20: /* report icon label */	3636	case 20: /* report icon label */
3640	{	3637	{
3641	char *s;	3638	char *s;
3642	XGetIconName (disp, parent[0], &s);	3639	XGetIconName (dpy, parent[0], &s);
3643	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3640	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3644	XFree (s);	3641	XFree (s);
3645	}	3642	}
3646	break;	3643	break;
3647	case 21: /* report window title */	3644	case 21: /* report window title */
3648	{	3645	{
3649	char *s;	3646	char *s;
3650	XFetchName (disp, parent[0], &s);	3647	XFetchName (dpy, parent[0], &s);
3651	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3648	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3652	XFree (s);	3649	XFree (s);
3653	}	3650	}
3654	break;	3651	break;
3655	}	3652	}
3656	}	3653	}
…		…
3683	seen_esc = true;	3680	seen_esc = true;
3684	continue;	3681	continue;
3685	}	3682	}
3686	else if (ch == C0_BEL || ch == CHAR_ST)	3683	else if (ch == C0_BEL || ch == CHAR_ST)
3687	break;	3684	break;
		3685	else if (ch == C0_SYN)
		3686	ch = cmd_get8 ();
3688	else if (ch < 0x20)	3687	else if (ch < 0x20)
3689	return NULL; /* other control character - exit */	3688	return NULL; /* other control character - exit */
3690		3689
3691	seen_esc = false;	3690	seen_esc = false;
3692		3691
3693	if (n >= STRING_MAX - 1)	3692	if (n >= STRING_MAX - 1)
3694	// stop at some sane length	3693	// stop at some sane length
3695	return NULL;	3694	return NULL;
3696		3695
3697	if (ch == C0_SYN)
3698	string[n++] = cmd_get8 ();
3699	else
3700	string[n++] = ch;	3696	string[n++] = ch;
3701	}	3697	}
3702		3698
3703	string[n++] = '\0';	3699	string[n++] = '\0';
3704		3700
3705	ends_how = (ch == 0x5c ? C0_ESC : ch);	3701	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3756	void	3752	void
3757	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3753	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3758	{	3754	{
3759	if (str[0] == '?' && !str[1])	3755	if (str[0] == '?' && !str[1])
3760	{	3756	{
3761	unsigned short r, g, b;	3757	rgba c;
3762	pix_colors_focused[color].get (display, r, g, b);	3758	pix_colors_focused[color].get (c);
		3759
		3760	#if XFT
		3761	if (c.a != rgba::MAX_CC)
		3762	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3763	else
		3764	#endif
3763	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3765	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764	}	3766	}
3765	else	3767	else
3766	set_window_color (color, str);	3768	set_window_color (color, str);
3767	}	3769	}
3768		3770
…		…
3770	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3772	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771	*/	3773	*/
3772	void	3774	void
3773	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3775	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774	{	3776	{
3775	int changed = 0;
3776	int color;	3777	int color;
3777	char *buf, *name;	3778	char *buf, *name;
3778	bool query = str[0] == '?' && !str[1];	3779	bool query = str[0] == '?' && !str[1];
3779	int saveop = op;	3780	int saveop = op;
3780	dDisp;	3781
		3782	dLocal (Display *, dpy);
3781		3783
3782	assert (str != NULL);	3784	assert (str != NULL);
		3785
		3786	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3787	return;
		3788
3783	switch (op)	3789	switch (op)
3784	{	3790	{
3785	case XTerm_name:	3791	case XTerm_name:
3786	set_title (str);	3792	set_title (str);
3787	/* FALLTHROUGH */	3793	/* FALLTHROUGH */
…		…
3801	unsigned long bytes_after;	3807	unsigned long bytes_after;
3802	unsigned char *value = 0;	3808	unsigned char *value = 0;
3803	const char *str = "";	3809	const char *str = "";
3804		3810
3805	if (prop	3811	if (prop
3806	&& XGetWindowProperty (disp, parent[0],	3812	&& XGetWindowProperty (dpy, parent[0],
3807	prop, 0, 1<<16, 0, AnyPropertyType,	3813	prop, 0, 1<<16, 0, AnyPropertyType,
3808	&actual_type, &actual_format,	3814	&actual_type, &actual_format,
3809	&nitems, &bytes_after, &value) == Success	3815	&nitems, &bytes_after, &value) == Success
3810	&& actual_type != None	3816	&& actual_type != None
3811	&& actual_format == 8)	3817	&& actual_format == 8)
3812	str = (const char *)(value);	3818	str = (const char *)(value);
3813		3819
3814	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3820	tt_printf ("\033]%d;%s%c", op, str, resp);
3815		3821
3816	XFree (value);	3822	XFree (value);
3817	}	3823	}
3818	else	3824	else
3819	{	3825	{
…		…
3823	{	3829	{
3824	*eq = 0;	3830	*eq = 0;
3825	set_utf8_property (display->atom (str), eq + 1);	3831	set_utf8_property (display->atom (str), eq + 1);
3826	}	3832	}
3827	else	3833	else
3828	XDeleteProperty (disp, parent[0],	3834	XDeleteProperty (dpy, parent[0],
3829	display->atom (str));	3835	display->atom (str));
3830	}	3836	}
3831	break;	3837	break;
3832		3838
3833	case XTerm_Color:	3839	case XTerm_Color:
…		…
3843	break;	3849	break;
3844		3850
3845	if ((buf = strchr (name, ';')) != NULL)	3851	if ((buf = strchr (name, ';')) != NULL)
3846	*buf++ = '\0';	3852	*buf++ = '\0';
3847		3853
3848	if (name[0] == '?' && !name[1])	3854	process_color_seq (op, color, name, resp);
3849	{
3850	unsigned short r, g, b;
3851	pix_colors_focused[color].get (display, r, g, b);
3852	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853	}
3854	else
3855	set_window_color (color, name);
3856	}	3855	}
3857	break;	3856	break;
3858	case XTerm_Color00:	3857	case XTerm_Color00:
3859	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3858	process_color_seq (op, Color_fg, str, resp);
3860	break;	3859	break;
3861	case XTerm_Color01:	3860	case XTerm_Color01:
3862	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3861	process_color_seq (op, Color_bg, str, resp);
3863	break;	3862	break;
3864	#ifndef NO_CURSORCOLOR	3863	#ifndef NO_CURSORCOLOR
3865	case XTerm_Color_cursor:	3864	case XTerm_Color_cursor:
3866	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3865	process_color_seq (op, Color_cursor, str, resp);
3867	break;	3866	break;
3868	#endif	3867	#endif
3869	case XTerm_Color_pointer_fg:	3868	case XTerm_Color_pointer_fg:
3870	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3869	process_color_seq (op, Color_pointer_fg, str, resp);
3871	break;	3870	break;
3872	case XTerm_Color_pointer_bg:	3871	case XTerm_Color_pointer_bg:
3873	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3872	process_color_seq (op, Color_pointer_bg, str, resp);
3874	break;	3873	break;
3875	#ifndef NO_BOLD_UNDERLINE_REVERSE	3874	#ifndef NO_BOLD_UNDERLINE_REVERSE
3876	case XTerm_Color_RV:	3875	case XTerm_Color_RV:
3877	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3876	process_color_seq (op, Color_RV, str, resp);
3878	break;	3877	break;
3879	case Rxvt_Color_BD:	3878	case Rxvt_Color_BD:
3880	case URxvt_Color_BD:	3879	case URxvt_Color_BD:
3881	process_color_seq (op, Color_BD, str, resp);	3880	process_color_seq (op, Color_BD, str, resp);
3882	break;	3881	break;
3883	case Rxvt_Color_UL:	3882	case Rxvt_Color_UL:
3884	case URxvt_Color_UL:	3883	case URxvt_Color_UL:
3885	process_color_seq (op, Color_UL, str, resp);	3884	process_color_seq (op, Color_UL, str, resp);
3886	break;	3885	break;
3887	case URxvt_Color_IT:	3886	case URxvt_Color_IT:
3888	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3887	process_color_seq (op, Color_IT, str, resp);
3889	break;	3888	break;
3890	#endif	3889	#endif
3891	#if TRANSPARENT && TINTING	3890	#if TRANSPARENT && TINTING
3892	case URxvt_Color_tint:	3891	case URxvt_Color_tint:
3893	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3892	process_color_seq (op, Color_tint, str, resp);
		3893
3894	check_our_parents ();	3894	check_our_parents ();
		3895
3895	if (am_transparent)	3896	if (am_transparent)
3896	want_full_refresh = want_refresh = 1;	3897	want_full_refresh = want_refresh = 1;
		3898
3897	break;	3899	break;
3898	#endif	3900	#endif
3899		3901
3900	case Rxvt_Pixmap:	3902	case Rxvt_Pixmap:
		3903	{
3901	if (*str != ';')	3904	if (*str != ';')
3902	{	3905	{
3903	#if XPM_BACKGROUND	3906	#if XPM_BACKGROUND
3904	scale_pixmap (""); /* reset to default scaling */	3907	scale_pixmap (""); /* reset to default scaling */
3905	set_bgPixmap (str); /* change pixmap */	3908	set_bgPixmap (str); /* change pixmap */
3906	scr_touch (true);	3909	scr_touch (true);
3907	#endif	3910	#endif
3908	}	3911	}
3909		3912
		3913	int changed = 0;
		3914
3910	while ((str = strchr (str, ';')) != NULL)	3915	while ((str = strchr (str, ';')) != NULL)
3911	{	3916	{
3912	str++;	3917	str++;
3913	#if XPM_BACKGROUND	3918	#if XPM_BACKGROUND
3914	changed += scale_pixmap (str);	3919	changed += scale_pixmap (str);
3915	#endif	3920	#endif
3916	}	3921	}
3917		3922
3918	if (changed)	3923	if (changed)
3919	{	3924	{
3920	#ifdef XPM_BACKGROUND	3925	#ifdef XPM_BACKGROUND
3921	resize_pixmap ();	3926	resize_pixmap ();
3922	scr_touch (true);	3927	scr_touch (true);
3923	#endif	3928	#endif
3924	}	3929	}
		3930	}
3925	break;	3931	break;
3926		3932
3927	case Rxvt_restoreFG:	3933	case Rxvt_restoreFG:
3928	set_window_color (Color_fg, str);	3934	set_window_color (Color_fg, str);
3929	break;	3935	break;
…		…
3955	case URxvt_italicFont:	3961	case URxvt_italicFont:
3956	case URxvt_boldItalicFont:	3962	case URxvt_boldItalicFont:
3957	#endif	3963	#endif
3958	if (query)	3964	if (query)
3959	tt_printf ("\33]%d;%-.250s%c", saveop,	3965	tt_printf ("\33]%d;%-.250s%c", saveop,
3960	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3966	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961	? fontset[op - URxvt_font]->fontdesc : "",	3967	? fontset[op - URxvt_font]->fontdesc : "",
3962	resp);	3968	resp);
3963	else	3969	else
3964	{	3970	{
3965	const char *&res = rs[Rs_font + (op - URxvt_font)];	3971	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3968	allocated.push_back ((void *)res);	3974	allocated.push_back ((void *)res);
3969	set_fonts ();	3975	set_fonts ();
3970	}	3976	}
3971	break;	3977	break;
3972		3978
3973	#if ENABLE_FRILLS	3979	case URxvt_version:
		3980	if (query)
		3981	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3982	op,
		3983	rs[Rs_name], VERSION[0], VERSION[2],
		3984	resp);
		3985	break;
		3986
		3987	#if !ENABLE_MINIMAL
3974	case URxvt_locale:	3988	case URxvt_locale:
3975	if (query)	3989	if (query)
3976	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3990	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3977	else	3991	else
3978	{	3992	{
3979	set_locale (str);	3993	set_locale (str);
3980	pty.set_utf8_mode (enc_utf8);	3994	pty->set_utf8_mode (enc_utf8);
3981	init_xlocale ();	3995	init_xlocale ();
3982	}	3996	}
3983	break;	3997	break;
3984		3998
3985	case URxvt_view_up:	3999	case URxvt_view_up:
…		…
3996	break;	4010	break;
3997	#endif	4011	#endif
3998		4012
3999	#if ENABLE_PERL	4013	#if ENABLE_PERL
4000	case URxvt_perl:	4014	case URxvt_perl:
4001	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4015	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4002	; // no responses yet	4016	; // no responses yet
4003	break;	4017	break;
4004	#endif	4018	#endif
4005	}	4019	}
4006	}	4020	}
…		…
4038	return state;	4052	return state;
4039	}	4053	}
4040		4054
4041	/* we're not using priv _yet_ */	4055	/* we're not using priv _yet_ */
4042	void	4056	void
4043	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4057	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044	{	4058	{
4045	unsigned int i, j;	4059	unsigned int i, j;
4046	int state;	4060	int state;
4047		4061
4048	static const struct	4062	static const struct
…		…
4122	scr_touch (true);	4136	scr_touch (true);
4123	break;	4137	break;
4124	#endif	4138	#endif
4125	case 1048: /* alternative cursor save */	4139	case 1048: /* alternative cursor save */
4126	case 1049:	4140	case 1049:
4127	if (OPTION (Opt_secondaryScreen))	4141	if (option (Opt_secondaryScreen))
4128	if (mode == 0)	4142	if (mode == 0)
4129	scr_cursor (RESTORE);	4143	scr_cursor (RESTORE);
4130	else if (mode == 1)	4144	else if (mode == 1)
4131	scr_cursor (SAVE);	4145	scr_cursor (SAVE);
4132	break;	4146	break;
…		…
4197	break;	4211	break;
4198	case 1011: /* scroll to bottom on key press */	4212	case 1011: /* scroll to bottom on key press */
4199	set_option (Opt_scrollTtyKeypress, state);	4213	set_option (Opt_scrollTtyKeypress, state);
4200	break;	4214	break;
4201	case 1047: /* secondary screen w/ clearing last */	4215	case 1047: /* secondary screen w/ clearing last */
4202	if (OPTION (Opt_secondaryScreen))	4216	if (option (Opt_secondaryScreen))
4203	if (current_screen != PRIMARY)	4217	if (current_screen != PRIMARY)
4204	scr_erase_screen (2);	4218	scr_erase_screen (2);
4205	scr_change_screen (state);	4219	scr_change_screen (state);
4206	break;	4220	break;
4207	case 1049: /* secondary screen w/ clearing first */	4221	case 1049: /* secondary screen w/ clearing first */
4208	scr_change_screen (state);	4222	scr_change_screen (state);
4209	if (OPTION (Opt_secondaryScreen))	4223	if (option (Opt_secondaryScreen))
4210	if (current_screen != PRIMARY)	4224	if (current_screen != PRIMARY)
4211	scr_erase_screen (2);	4225	scr_erase_screen (2);
4212	break;	4226	break;
4213	default:	4227	default:
4214	break;	4228	break;
…		…
4342	scr_color (Color_bg, Color_bg);	4356	scr_color (Color_bg, Color_bg);
4343	break;	4357	break;
4344		4358
4345	//case 50: // not variable spacing	4359	//case 50: // not variable spacing
4346		4360
4347	#if ENABLE_FRILLS	4361	#if !ENABLE_MINIMAL
4348	case 90:	4362	case 90:
4349	case 91: /* set bright fg color */	4363	case 91: /* set bright fg color */
4350	case 92:	4364	case 92:
4351	case 93:	4365	case 93:
4352	case 94:	4366	case 94:
…		…
4417	rxvt_term::tt_write (const char *data, unsigned int len)	4431	rxvt_term::tt_write (const char *data, unsigned int len)
4418	{	4432	{
4419	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4433	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420	return;	4434	return;
4421		4435
4422	if (pty.pty < 0)	4436	if (pty->pty < 0)
4423	return;	4437	return;
4424		4438
4425	if (v_buflen == 0)	4439	if (v_buflen == 0)
4426	{	4440	{
4427	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4441	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428		4442
4429	if ((unsigned int)written == len)	4443	if ((unsigned int)written == len)
4430	return;	4444	return;
4431		4445
4432	data += written;	4446	data += written;
…		…
4441	pty_ev.set (EVENT_READ | EVENT_WRITE);	4455	pty_ev.set (EVENT_READ | EVENT_WRITE);
4442	}	4456	}
4443		4457
4444	void rxvt_term::pty_write ()	4458	void rxvt_term::pty_write ()
4445	{	4459	{
4446	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4460	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447		4461
4448	if (written > 0)	4462	if (written > 0)
4449	{	4463	{
4450	v_buflen -= written;	4464	v_buflen -= written;
4451		4465

Diff Legend

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