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.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 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	{
…		…
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
…		…
1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105	}	1175	}
1106	}	1176	}
1107	#endif	1177	#endif
1108		1178
1109	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1110	static struct event_handler	1180	static struct event_handler
1111	{	1181	{
1112	check_watcher cw_yield;	1182	check_watcher yield_ev;
1113		1183
1114	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1115	{	1185	{
1116	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
1117	w.stop ();	1194	w.stop ();
1118	}	1195	}
1119		1196
1120	event_handler ()	1197	event_handler ()
1121	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1122	{	1199	{
1123	}	1200	}
1124	} event_handler;	1201	} event_handler;
1125	#endif	1202	#endif
1126		1203
…		…
1137		1214
1138	memmove (cmdbuf_base, cmdbuf_ptr, n);	1215	memmove (cmdbuf_base, cmdbuf_ptr, n);
1139	cmdbuf_ptr = cmdbuf_base;	1216	cmdbuf_ptr = cmdbuf_base;
1140	cmdbuf_endp = cmdbuf_ptr + n;	1217	cmdbuf_endp = cmdbuf_ptr + n;
1141		1218
1142	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1219	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143		1220
1144	if (r > 0)	1221	if (r > 0)
1145	{	1222	{
1146	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1147	return true;	1224	return true;
1148	}	1225	}
1149	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150	{	1227	{
1151	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1152	if (display->is_local)	1229	if (display->is_local)
1153	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1154	#endif	1231	#endif
1155	}	1232	}
1156	else	1233	else
1157	{	1234	{
1158	pty_ev.stop ();	1235	pty_ev.stop ();
1159		1236
1160	if (!OPTION (Opt_hold))	1237	if (!option (Opt_hold))
1161	destroy ();	1238	destroy ();
1162	}	1239	}
1163		1240
1164	return false;	1241	return false;
1165	}	1242	}
…		…
1180	}	1257	}
1181		1258
1182	void	1259	void
1183	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1184	{	1261	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1186	recolour_cursor ();	1263	recolour_cursor ();
1187		1264
1188	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1266	hidden_pointer = 0;
1190		1267
1191	if (OPTION (Opt_pointerBlank))	1268	if (option (Opt_pointerBlank))
1192	pointer_ev.start (NOW + pointerBlankDelay);	1269	pointer_ev.start (NOW + pointerBlankDelay);
1193	#endif	1270	#endif
1194	}	1271	}
1195		1272
1196	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1197	void	1274	void
1198	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1199	{	1276	{
1200	if (!OPTION (Opt_pointerBlank))	1277	if (!option (Opt_pointerBlank))
1201	return;	1278	return;
1202		1279
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1204	XFlush (display->display);	1281	XFlush (dpy);
1205		1282
1206	hidden_pointer = 1;	1283	hidden_pointer = 1;
1207	}	1284	}
1208		1285
1209	void	1286	void
…		…
1282	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1283	(32 + x + 1),	1360	(32 + x + 1),
1284	(32 + y + 1));	1361	(32 + y + 1));
1285	}	1362	}
1286		1363
1287	#ifdef USING_W11LIB
1288	void
1289	rxvt_W11_process_x_event (XEvent *ev)
1290	{
1291	rxvt_t *r = rxvt_get_r ();
1292
1293	x_cb (*ev);
1294	}
1295	#endif
1296
1297	/*{{{ process an X event */	1364	/*{{{ process an X event */
1298	void	1365	void
1299	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1300	{	1367	{
1301	make_current ();	1368	make_current ();
1302		1369
1303	dDisp;	1370	dLocal (Display *, dpy);
1304		1371
1305	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1375	return;
…		…
1313	unsigned int unused_mask;	1380	unsigned int unused_mask;
1314		1381
1315	switch (ev.type)	1382	switch (ev.type)
1316	{	1383	{
1317	case KeyPress:	1384	case KeyPress:
1318	#if ISO_14755	1385	key_press (ev.xkey);
1319	if (!(iso14755buf & ISO_14755_52))
1320	#endif
1321	lookup_key (ev.xkey);
1322
1323	break;	1386	break;
1324		1387
1325	case KeyRelease:	1388	case KeyRelease:
1326	{	1389	key_release (ev.xkey);
1327	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328	KeySym keysym;
1329
1330	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331	#endif
1332
1333	#if ENABLE_FRILLS || ISO_14755
1334	// ISO 14755 support
1335	if (iso14755buf)
1336	if (iso14755buf & ISO_14755_52)
1337	{
1338	# if ENABLE_OVERLAY
1339	scr_overlay_off ();
1340	# endif
1341	# if ISO_14755
1342	// iso14755 part 5.2 handling: release time
1343	// first: controls
1344	if ((ev.xkey.state & ControlMask)
1345	&& ((keysym >= 0x40 && keysym <= 0x5f)
1346	|| (keysym >= 0x61 && keysym <= 0x7f)))
1347	{
1348	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349	commit_iso14755 ();
1350	goto skip_switch;
1351	}
1352
1353	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354	if (i[0] == keysym)
1355	{
1356	iso14755buf = ISO_14755_51 | i[1];
1357	commit_iso14755 ();
1358	goto skip_switch;
1359	}
1360
1361	scr_bell ();
1362	# endif
1363	iso14755buf = 0;
1364	break;
1365	}
1366	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367	{
1368	# if ENABLE_OVERLAY
1369	scr_overlay_off ();
1370	# endif
1371	if (iso14755buf & ISO_14755_51)
1372	commit_iso14755 ();
1373	#if ISO_14755
1374	else if (iso14755buf & ISO_14755_STARTED)
1375	{
1376	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380	}
1381	# endif
1382	else
1383	iso14755buf = 0;
1384	}
1385	#endif
1386
1387	if (ev.xany.window == vt
1388	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389	break;
1390
1391	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392	if (!(ev.xkey.state & ControlMask))
1393	slip_wheel_ev.stop ();
1394	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395	mouse_slip_wheel_speed = 0;
1396	#endif
1397	break;	1390	break;
1398	}
1399		1391
1400	case ButtonPress:	1392	case ButtonPress:
1401	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1402	break;	1394	break;
1403		1395
…		…
1405	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1406	break;	1398	break;
1407		1399
1408	case ClientMessage:	1400	case ClientMessage:
1409	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	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	{
1412	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)))
1413	destroy ();	1411	destroy ();
		1412	}
1414	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1415	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])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1418	&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	}
1419	#endif	1429	#endif
1420	}	1430	}
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	}
1429	#endif
1430	#ifdef OFFIX_DND
1431	/* OffiX Dnd (drag 'n' drop) protocol */
1432	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433	&& (ev.xclient.data.l[0] == DndFile
1434	|| ev.xclient.data.l[0] == DndDir
1435	|| ev.xclient.data.l[0] == DndLink))
1436	{
1437	/* Get Dnd data */
1438	Atom ActualType;
1439	int ActualFormat;
1440	unsigned char *data;
1441	unsigned long Size, RemainingBytes;
1442
1443	XGetWindowProperty (disp, display->root,
1444	xa[XA_DNDSELECTION],
1445	0L, 1000000L,
1446	False, AnyPropertyType,
1447	&ActualType, &ActualFormat,
1448	&Size, &RemainingBytes,
1449	&data);
1450	set_string_property (XA_CUT_BUFFER0, data);
1451	XFree (data);
1452	selection_paste (display->root, XA_CUT_BUFFER0, true);
1453	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454	}
1455	#endif /* OFFIX_DND */
1456	break;	1431	break;
1457		1432
1458	case MappingNotify:	1433	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1435	break;
…		…
1483	break;	1458	break;
1484	}	1459	}
1485	break;	1460	break;
1486		1461
1487	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior
		1464	&& ev.xfocus.detail != NotifyPointer
		1465	&& ev.xfocus.mode != NotifyGrab)
1488	focus_in ();	1466	focus_in ();
1489	break;	1467	break;
1490		1468
1491	case FocusOut:	1469	case FocusOut:
		1470	if (ev.xfocus.detail != NotifyInferior
		1471	&& ev.xfocus.detail != NotifyPointer
		1472	&& ev.xfocus.mode != NotifyGrab)
1492	focus_out ();	1473	focus_out ();
1493	break;	1474	break;
1494		1475
1495	case ConfigureNotify:	1476	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1477	if (ev.xconfigure.window == parent[0])
1497	{	1478	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1479	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1480	;
1500		1481
1501	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1482	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502	{	1483	{
1503	seen_resize = 1;	1484	seen_resize = 1;
1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1485	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505	}	1486	}
1506		1487
1507	#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
1508	if (OPTION (Opt_transparent))	1491	if (option (Opt_transparent))
1509	check_our_parents ();	1492	check_our_parents ();
1510	#endif	1493	#endif
1511	}	1494	}
1512	break;	1495	break;
1513		1496
1514	case PropertyNotify:	1497	case PropertyNotify:
		1498	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1499	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516	&& ev.xproperty.state == PropertyNewValue)	1500	&& ev.xproperty.state == PropertyNewValue)
1517	selection_property (ev.xproperty.window, ev.xproperty.atom);	1501	selection_property (ev.xproperty.window, ev.xproperty.atom);
1518		1502
1519	break;	1503	break;
1520		1504
1521	case SelectionClear:	1505	case SelectionClear:
1522	selection_clear ();	1506	selection_clear ();
…		…
1558	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1559	{	1543	{
1560	do	1544	do
1561	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1562	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
1563	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1564		1548
1565	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566		1550
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, False);
1570		1554
1571	want_refresh = 1;	1555	want_refresh = 1;
1572	}	1556	}
1573	else	1557	else
1574	{	1558	{
1575	XEvent unused_event;	1559	XEvent unused_event;
1576		1560
1577	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1561	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1578	;	1562	;
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1580	;	1564	;
1581		1565
1582	if (isScrollbarWindow (ev.xany.window))	1566	if (isScrollbarWindow (ev.xany.window))
1583	{	1567	{
1584	scrollBar.setIdle ();	1568	scrollBar.setIdle ();
1585	scrollbar_show (0);	1569	scrollbar_show (0);
1586	}	1570	}
1587		1571
1588	#ifdef TRANSPARENT	1572	#ifdef TRANSPARENT
1589	if (am_transparent && ev.xany.window == parent[0])	1573	if (am_transparent && ev.xany.window == parent[0])
1590	XClearWindow (disp, ev.xany.window);	1574	XClearWindow (dpy, ev.xany.window);
1591	#endif	1575	#endif
1592	}	1576	}
1593	break;	1577	break;
1594		1578
1595	case MotionNotify:	1579	case MotionNotify:
…		…
1605	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1589	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1590	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607	; // nop	1591	; // nop
1608	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1592	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1609	{	1593	{
1610	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1594	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1611	;	1595	;
1612		1596
1613	XQueryPointer (disp, vt,	1597	XQueryPointer (dpy, vt,
1614	&unused_root, &unused_child,	1598	&unused_root, &unused_child,
1615	&unused_root_x, &unused_root_y,	1599	&unused_root_x, &unused_root_y,
1616	&ev.xbutton.x, &ev.xbutton.y,	1600	&ev.xbutton.x, &ev.xbutton.y,
1617	&ev.xbutton.state);	1601	&ev.xbutton.state);
1618	#ifdef MOUSE_THRESHOLD	1602	#ifdef MOUSE_THRESHOLD
…		…
1682	#endif	1666	#endif
1683	}	1667	}
1684	}	1668	}
1685	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1669	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686	{	1670	{
1687	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1671	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1688	MotionNotify, &ev))	1672	MotionNotify, &ev))
1689	;	1673	;
1690		1674
1691	XQueryPointer (disp, scrollBar.win,	1675	XQueryPointer (dpy, scrollBar.win,
1692	&unused_root, &unused_child,	1676	&unused_root, &unused_child,
1693	&unused_root_x, &unused_root_y,	1677	&unused_root_x, &unused_root_y,
1694	&ev.xbutton.x, &ev.xbutton.y,	1678	&ev.xbutton.x, &ev.xbutton.y,
1695	&unused_mask);	1679	&unused_mask);
1696	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1680	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1700	scrollbar_show (1);	1684	scrollbar_show (1);
1701	}	1685	}
1702	break;	1686	break;
1703	}	1687	}
1704		1688
1705	skip_switch: ;
1706
1707	#if defined(CURSOR_BLINK)	1689	#if defined(CURSOR_BLINK)
1708	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1709	{	1691	{
1710	if (hidden_cursor)	1692	if (hidden_cursor)
1711	{	1693	{
1712	hidden_cursor = 0;	1694	hidden_cursor = 0;
1713	want_refresh = 1;	1695	want_refresh = 1;
1714	}	1696	}
1715		1697
1716	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717	}	1699	}
1718	#endif	1700	#endif
1719		1701
1720	#if defined(POINTER_BLANK)	1702	#if defined(POINTER_BLANK)
1721	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1722	{	1704	{
1723	if (ev.type == MotionNotify	1705	if (ev.type == MotionNotify
1724	|| ev.type == ButtonPress	1706	|| ev.type == ButtonPress
1725	|| ev.type == ButtonRelease)	1707	|| ev.type == ButtonRelease)
1726	if (hidden_pointer)	1708	if (hidden_pointer)
…		…
1738	if (!focus)	1720	if (!focus)
1739	{	1721	{
1740	focus = 1;	1722	focus = 1;
1741	want_refresh = 1;	1723	want_refresh = 1;
1742		1724
1743	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1725	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744		1726
1745	#if USE_XIM	1727	#if USE_XIM
1746	if (Input_Context != NULL)	1728	if (Input_Context != NULL)
1747	{	1729	{
1748	IMSetStatusPosition ();	1730	IMSetPosition ();
1749	XSetICFocus (Input_Context);	1731	XSetICFocus (Input_Context);
1750	}	1732	}
1751	#endif	1733	#endif
1752	#if CURSOR_BLINK	1734	#if CURSOR_BLINK
1753	if (OPTION (Opt_cursorBlink))	1735	if (option (Opt_cursorBlink))
1754	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755	#endif	1737	#endif
1756	#if OFF_FOCUS_FADING	1738	#if OFF_FOCUS_FADING
1757	if (rs[Rs_fade])	1739	if (rs[Rs_fade])
1758	{	1740	{
1759	pix_colors = pix_colors_focused;	1741	pix_colors = pix_colors_focused;
1760	scr_recolour ();	1742	scr_recolour ();
		1743	}
		1744	#endif
		1745	#if ENABLE_FRILLS
		1746	if (option (Opt_urgentOnBell))
		1747	{
		1748	XWMHints *h;
		1749
		1750	h = XGetWMHints(dpy, parent[0]);
		1751	if (h != NULL)
		1752	{
		1753	h->flags &= ~XUrgencyHint;
		1754	XSetWMHints(dpy, parent[0], h);
		1755	}
1761	}	1756	}
1762	#endif	1757	#endif
1763	}	1758	}
1764	}	1759	}
1765		1760
…		…
1785	#if USE_XIM	1780	#if USE_XIM
1786	if (Input_Context != NULL)	1781	if (Input_Context != NULL)
1787	XUnsetICFocus (Input_Context);	1782	XUnsetICFocus (Input_Context);
1788	#endif	1783	#endif
1789	#if CURSOR_BLINK	1784	#if CURSOR_BLINK
1790	if (OPTION (Opt_cursorBlink))	1785	if (option (Opt_cursorBlink))
1791	cursor_blink_ev.stop ();	1786	cursor_blink_ev.stop ();
1792	hidden_cursor = 0;	1787	hidden_cursor = 0;
1793	#endif	1788	#endif
1794	#if OFF_FOCUS_FADING	1789	#if OFF_FOCUS_FADING
1795	if (rs[Rs_fade])	1790	if (rs[Rs_fade])
…		…
1799	}	1794	}
1800	#endif	1795	#endif
1801	}	1796	}
1802	}	1797	}
1803		1798
1804	#if TRANSPARENT	1799	void
		1800	rxvt_term::update_fade_color (unsigned int idx)
		1801	{
		1802	#if OFF_FOCUS_FADING
		1803	if (rs[Rs_fade])
		1804	{
		1805	rgba c;
		1806	pix_colors [Color_fade].get (c);
		1807	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1808	}
		1809	#endif
		1810	}
		1811
		1812	#if TRANSPARENT || ENABLE_PERL
1805	void	1813	void
1806	rxvt_term::rootwin_cb (XEvent &ev)	1814	rxvt_term::rootwin_cb (XEvent &ev)
1807	{	1815	{
1808	make_current ();	1816	make_current ();
1809		1817
		1818	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1819	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1820	return;
		1821
		1822	# if TRANSPARENT
1810	switch (ev.type)	1823	switch (ev.type)
1811	{	1824	{
1812	case PropertyNotify:	1825	case PropertyNotify:
1813	/*	1826	/*
1814	* if user used some Esetroot compatible prog to set the root bg,	1827	* if user used some Esetroot compatible prog to set the root bg,
…		…
1818	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1831	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1819	return;	1832	return;
1820		1833
1821	/* FALLTHROUGH */	1834	/* FALLTHROUGH */
1822	case ReparentNotify:	1835	case ReparentNotify:
1823	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1836	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1824	want_refresh = want_full_refresh = 1;	1837	want_refresh = want_full_refresh = 1;
1825	break;	1838	break;
1826	}	1839	}
		1840	# endif
1827	}	1841	}
1828	#endif	1842	#endif
1829		1843
1830	void	1844	void
1831	rxvt_term::button_press (XButtonEvent &ev)	1845	rxvt_term::button_press (XButtonEvent &ev)
…		…
1840	/*	1854	/*
1841	* VT window processing of button press	1855	* VT window processing of button press
1842	*/	1856	*/
1843	if (ev.window == vt)	1857	if (ev.window == vt)
1844	{	1858	{
		1859	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1860	return;
		1861
1845	#if ISO_14755	1862	#if ISO_14755
1846	// 5.4	1863	// 5.4
1847	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1864	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848	{	1865	{
1849	iso14755_54 (ev.x, ev.y);	1866	iso14755_54 (ev.x, ev.y);
…		…
1891	else	1908	else
1892	{	1909	{
1893	if (ev.button != MEvent.button)	1910	if (ev.button != MEvent.button)
1894	MEvent.clicks = 0;	1911	MEvent.clicks = 0;
1895		1912
1896	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897	switch (ev.button)	1913	switch (ev.button)
1898	{	1914	{
1899	case Button1:	1915	case Button1:
1900	/* allow meta + click to select rectangular areas */	1916	/* allow meta + click to select rectangular areas */
1901	/* should be done in screen.C */	1917	/* should be done in screen.C */
1902	#if ENABLE_FRILLS	1918	#if ENABLE_FRILLS
1903	selection.rect = !!(ev.state & ModMetaMask);	1919	selection.rect = !!(ev.state & ModMetaMask);
1904	#else	1920	#else
1905	selection.rect = false;	1921	selection.rect = false;
1906	#endif	1922	#endif
1907		1923
1908	/* allow shift+left click to extend selection */	1924	/* allow shift+left click to extend selection */
1909	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910	{	1926	{
1911	if (MEvent.button == Button1 && clickintime)	1927	if (MEvent.button == Button1 && clickintime)
1912	selection_rotate (ev.x, ev.y);	1928	selection_rotate (ev.x, ev.y);
1913	else	1929	else
1914	selection_extend (ev.x, ev.y, 1);	1930	selection_extend (ev.x, ev.y, 1);
1915	}	1931	}
1916	else	1932	else
1917	{	1933	{
1918	if (MEvent.button == Button1 && clickintime)	1934	if (MEvent.button == Button1 && clickintime)
1919	MEvent.clicks++;	1935	MEvent.clicks++;
1920	else	1936	else
1921	MEvent.clicks = 1;	1937	MEvent.clicks = 1;
1922		1938
1923	selection_click (MEvent.clicks, ev.x, ev.y);	1939	selection_click (MEvent.clicks, ev.x, ev.y);
1924	}	1940	}
1925		1941
1926	MEvent.button = Button1;	1942	MEvent.button = Button1;
1927	break;	1943	break;
1928		1944
1929	case Button3:	1945	case Button3:
1930	if (MEvent.button == Button3 && clickintime)	1946	if (MEvent.button == Button3 && clickintime)
1931	selection_rotate (ev.x, ev.y);	1947	selection_rotate (ev.x, ev.y);
1932	else	1948	else
1933	selection_extend (ev.x, ev.y, 1);	1949	selection_extend (ev.x, ev.y, 1);
1934		1950
1935	MEvent.button = Button3;	1951	MEvent.button = Button3;
1936	break;	1952	break;
1937	}	1953	}
1938	}	1954	}
1939		1955
1940	MEvent.time = ev.time;	1956	MEvent.time = ev.time;
1941	return;	1957	return;
1942	}	1958	}
1943		1959
…		…
2106	sel_scroll_ev.stop();	2122	sel_scroll_ev.stop();
2107	#endif	2123	#endif
2108		2124
2109	if (ev.window == vt)	2125	if (ev.window == vt)
2110	{	2126	{
		2127	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2128	return;
		2129
2111	#if ISO_14755	2130	#if ISO_14755
2112	// 5.4	2131	// 5.4
2113	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2132	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114	return;	2133	return;
2115	#endif	2134	#endif
		2135
2116	if (reportmode)	2136	if (reportmode)
2117	{	2137	{
2118	/* mouse report from vt window */	2138	/* mouse report from vt window */
2119	/* don't report release of wheel "buttons" */	2139	/* don't report release of wheel "buttons" */
2120	if (ev.button >= 4)	2140	if (ev.button >= 4)
…		…
2144	if (priv_modes & PrivMode_mouse_report	2164	if (priv_modes & PrivMode_mouse_report
2145	&& bypass_keystate	2165	&& bypass_keystate
2146	&& ev.button == Button1 && MEvent.clicks <= 1)	2166	&& ev.button == Button1 && MEvent.clicks <= 1)
2147	selection_extend (ev.x, ev.y, 0);	2167	selection_extend (ev.x, ev.y, 0);
2148		2168
2149	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150	return;
2151
2152	switch (ev.button)	2169	switch (ev.button)
2153	{	2170	{
2154	case Button1:	2171	case Button1:
2155	case Button3:	2172	case Button3:
2156	selection_make (ev.time);	2173	selection_make (ev.time);
2157	break;	2174	break;
		2175
2158	case Button2:	2176	case Button2:
2159	selection_request (ev.time, ev.x, ev.y);	2177	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2178	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160	break;	2179	break;
		2180
2161	#ifdef MOUSE_WHEEL	2181	#ifdef MOUSE_WHEEL
2162	case Button4:	2182	case Button4:
2163	case Button5:	2183	case Button5:
2164	{	2184	{
2165	int i;	2185	int i;
…		…
2167		2187
2168	v = ev.button == Button4 ? UP : DN;	2188	v = ev.button == Button4 ? UP : DN;
2169		2189
2170	if (ev.state & ShiftMask)	2190	if (ev.state & ShiftMask)
2171	i = 1;	2191	i = 1;
2172	else if (OPTION (Opt_mouseWheelScrollPage))	2192	else if (option (Opt_mouseWheelScrollPage))
2173	i = nrow - 1;	2193	i = nrow - 1;
2174	else	2194	else
2175	i = 5;	2195	i = 5;
2176		2196
2177	# ifdef MOUSE_SLIP_WHEELING	2197	# ifdef MOUSE_SLIP_WHEELING
…		…
2205	#if TINTING	2225	#if TINTING
2206	/* taken from aterm-0.4.2 */	2226	/* taken from aterm-0.4.2 */
2207		2227
2208	typedef uint32_t RUINT32T;	2228	typedef uint32_t RUINT32T;
2209		2229
2210	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2230	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2211	{	2231	{
2212	int sh_r, sh_g, sh_b;	2232	int sh_r, sh_g, sh_b;
2213	RUINT32T mask_r, mask_g, mask_b;	2233	RUINT32T mask_r, mask_g, mask_b;
2214	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2234	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2235	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2236	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217	int i;	2237	int i;
2218		2238
2219	Visual *visual = display->visual;	2239	Visual *visual = term->visual;
2220		2240
2221	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2241	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222		2242
2223	/* for convenience */	2243	/* for convenience */
2224	mask_r = visual->red_mask;	2244	mask_r = visual->red_mask;
…		…
2445	Atom atype;	2465	Atom atype;
2446	unsigned char *prop = NULL;	2466	unsigned char *prop = NULL;
2447	Window root, oldp, *list;	2467	Window root, oldp, *list;
2448	Pixmap rootpixmap = None;	2468	Pixmap rootpixmap = None;
2449	XWindowAttributes wattr, wrootattr;	2469	XWindowAttributes wattr, wrootattr;
2450	dDisp;
2451		2470
2452	pchanged = 0;	2471	pchanged = 0;
2453		2472
2454	if (!OPTION (Opt_transparent))	2473	if (!option (Opt_transparent))
2455	return pchanged; /* Don't try any more */	2474	return pchanged; /* Don't try any more */
2456		2475
2457	XGetWindowAttributes (disp, display->root, &wrootattr);	2476	XGetWindowAttributes (dpy, display->root, &wrootattr);
2458	rootdepth = wrootattr.depth;	2477	rootdepth = wrootattr.depth;
2459		2478
2460	XGetWindowAttributes (disp, parent[0], &wattr);	2479	XGetWindowAttributes (dpy, parent[0], &wattr);
2461		2480
2462	if (rootdepth != wattr.depth)	2481	if (rootdepth != wattr.depth)
2463	{	2482	{
2464	if (am_transparent)	2483	if (am_transparent)
2465	{	2484	{
2466	pchanged = 1;	2485	pchanged = 1;
2467	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2486	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468	am_transparent = am_pixmap_trans = 0;	2487	am_transparent = am_pixmap_trans = 0;
2469	}	2488	}
2470		2489
2471	return pchanged; /* Don't try any more */	2490	return pchanged; /* Don't try any more */
2472	}	2491	}
2473		2492
2474	/* Get all X ops out of the queue so that our information is up-to-date. */	2493	/* Get all X ops out of the queue so that our information is up-to-date. */
2475	XSync (disp, False);	2494	XSync (dpy, False);
2476		2495
2477	/*	2496	/*
2478	* Make the frame window set by the window manager have	2497	* Make the frame window set by the window manager have
2479	* the root background. Some window managers put multiple nested frame	2498	* the root background. Some window managers put multiple nested frame
2480	* windows for each client, so we have to take care about that.	2499	* windows for each client, so we have to take care about that.
2481	*/	2500	*/
2482	i = (xa[XA_XROOTPMAP_ID]	2501	i = (xa[XA_XROOTPMAP_ID]
2483	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2502	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2503	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485	&nitems, &bytes_after, &prop) == Success);	2504	&nitems, &bytes_after, &prop) == Success);
2486		2505
2487	if (!i || prop == NULL)	2506	if (!i || prop == NULL)
2488	i = (xa[XA_ESETROOT_PMAP_ID]	2507	i = (xa[XA_ESETROOT_PMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2508	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2509	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2510	&nitems, &bytes_after, &prop) == Success);
2492		2511
2493	if (!i || prop == NULL	2512	if (!i || prop == NULL
2494	#if TINTING	2513	#if TINTING
2495	|| !rs[Rs_color + Color_tint]	2514	|| !ISSET_PIXCOLOR (Color_tint)
2496	#endif	2515	#endif
2497	)	2516	)
2498	have_pixmap = 0;	2517	have_pixmap = 0;
2499	else	2518	else
2500	{	2519	{
…		…
2513	Window cr;	2532	Window cr;
2514	XImage *image;	2533	XImage *image;
2515	GC gc;	2534	GC gc;
2516	XGCValues gcvalue;	2535	XGCValues gcvalue;
2517		2536
2518	XTranslateCoordinates (disp, parent[0], display->root,	2537	XTranslateCoordinates (dpy, parent[0], display->root,
2519	0, 0, &sx, &sy, &cr);	2538	0, 0, &sx, &sy, &cr);
2520	nw = (unsigned int)szHint.width;	2539	nw = (unsigned int)szHint.width;
2521	nh = (unsigned int)szHint.height;	2540	nh = (unsigned int)szHint.height;
2522	nx = ny = 0;	2541	nx = ny = 0;
2523		2542
…		…
2536	}	2555	}
2537		2556
2538	min_it (nw, (unsigned int) (wrootattr.width - sx));	2557	min_it (nw, (unsigned int) (wrootattr.width - sx));
2539	min_it (nh, (unsigned int) (wrootattr.height - sy));	2558	min_it (nh, (unsigned int) (wrootattr.height - sy));
2540		2559
2541	XSync (disp, False);	2560	XSync (dpy, False);
2542	allowedxerror = -1;	2561	allowedxerror = -1;
2543	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2562	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544		2563
2545	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2564	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2546	/* XXX: may need a delay here? */	2565	/* XXX: may need a delay here? */
2547	allowedxerror = 0;	2566	allowedxerror = 0;
2548		2567
…		…
2551	if (am_transparent && am_pixmap_trans)	2570	if (am_transparent && am_pixmap_trans)
2552	{	2571	{
2553	pchanged = 1;	2572	pchanged = 1;
2554	if (pixmap != None)	2573	if (pixmap != None)
2555	{	2574	{
2556	XFreePixmap (disp, pixmap);	2575	XFreePixmap (dpy, pixmap);
2557	pixmap = None;	2576	pixmap = None;
2558	}	2577	}
2559	}	2578	}
2560		2579
2561	am_pixmap_trans = 0;	2580	am_pixmap_trans = 0;
2562	}	2581	}
2563	else	2582	else
2564	{	2583	{
2565	if (pixmap != None)	2584	if (pixmap != None)
2566	XFreePixmap (disp, pixmap);	2585	XFreePixmap (dpy, pixmap);
2567		2586
2568	#if TINTING	2587	#if TINTING
2569	if (ISSET_PIXCOLOR (Color_tint))	2588	if (ISSET_PIXCOLOR (Color_tint))
2570	{	2589	{
2571	unsigned short rm, gm, bm;
2572	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2590	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573		2591
		2592	rgba c;
2574	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2593	pix_colors_focused [Color_tint].get (c);
2575		2594
2576	ShadeXImage (display, image, shade, rm, gm, bm);	2595	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577	}	2596	}
2578	#endif	2597	#endif
2579		2598
2580	pixmap = XCreatePixmap (disp, vt,	2599	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581	szHint.width, szHint.height, image->depth);
2582	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2600	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2583	XPutImage (disp, pixmap, gc, image, 0, 0,	2601	XPutImage (dpy, pixmap, gc, image, 0, 0,
2584	nx, ny, image->width, image->height);	2602	nx, ny, image->width, image->height);
2585	XFreeGC (disp, gc);	2603	XFreeGC (dpy, gc);
2586	XDestroyImage (image);	2604	XDestroyImage (image);
2587	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2605	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2588	XClearWindow (disp, parent[0]);	2606	XClearWindow (dpy, parent[0]);
2589		2607
2590	if (!am_transparent || !am_pixmap_trans)	2608	if (!am_transparent || !am_pixmap_trans)
2591	pchanged = 1;	2609	pchanged = 1;
2592		2610
2593	am_transparent = am_pixmap_trans = 1;	2611	am_transparent = am_pixmap_trans = 1;
2594	}	2612	}
2595	}	2613	}
2596		2614
2597	if (am_pixmap_trans)	2615	if (am_pixmap_trans)
2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2616	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2599	else	2617	else
2600	{	2618	{
2601	unsigned int n;	2619	unsigned int n;
2602	/*	2620	/*
2603	* InheritPixmap transparency	2621	* InheritPixmap transparency
2604	*/	2622	*/
2605	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2623	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606	{	2624	{
2607	oldp = parent[i];	2625	oldp = parent[i];
2608	XQueryTree (disp, parent[i - 1], &root,	2626	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2609	&parent[i], &list, &n);
2610	XFree (list);	2627	XFree (list);
2611		2628
2612	if (parent[i] == display->root)	2629	if (parent[i] == display->root)
2613	{	2630	{
2614	if (oldp != None)	2631	if (oldp != None)
…		…
2622	}	2639	}
2623		2640
2624	n = 0;	2641	n = 0;
2625		2642
2626	if (pchanged)	2643	if (pchanged)
2627	{
2628	for (; n < (unsigned int)i; n++)	2644	for (; n < (unsigned int)i; n++)
2629	{	2645	{
2630	XGetWindowAttributes (disp, parent[n], &wattr);	2646	XGetWindowAttributes (dpy, parent[n], &wattr);
		2647
2631	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2648	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632	{	2649	{
2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2650	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634	break;	2651	break;
2635	}	2652	}
2636	}	2653	}
2637	}
2638		2654
2639	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2655	if (n > (sizeof (parent) / sizeof (parent[0])))
2640	{	2656	{
2641	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2657	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2642	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2658	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2643	am_transparent = 0;	2659	am_transparent = 0;
2644	/* XXX: also turn off Opt_transparent? */	2660	/* XXX: also turn off Opt_transparent? */
2645	}	2661	}
2646	else	2662	else
2647	{	2663	{
2648	#if WAIT_FOR_WM
2649	/* wait (an arbitrary period) for the WM to do its thing
2650	* needed for fvwm2.2.2 (and before?) */
2651	sleep (1);
2652	#endif
2653	for (n = 0; n < (unsigned int)i; n++)	2664	for (n = 0; n < (unsigned int)i; n++)
2654	{	2665	{
2655	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2666	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2656	XClearWindow (disp, parent[n]);	2667	XClearWindow (dpy, parent[n]);
2657	}	2668	}
2658		2669
2659	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2670	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2660	am_transparent = 1;	2671	am_transparent = 1;
2661	}	2672	}
2662		2673
2663	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2674	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664	parent[i] = None;	2675	parent[i] = None;
2665	}	2676	}
2666		2677
2667	if (scrollBar.win)	2678	if (scrollBar.win)
2668	{	2679	{
2669	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2680	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2670	scrollBar.setIdle ();	2681	scrollBar.setIdle ();
2671	scrollbar_show (0);	2682	scrollbar_show (0);
2672	}	2683	}
2673		2684
2674	if (am_transparent)	2685	if (am_transparent)
…		…
2737	if (ch == C0_LF)	2748	if (ch == C0_LF)
2738	nlines++;	2749	nlines++;
2739		2750
2740	refresh_count++;	2751	refresh_count++;
2741		2752
2742	if (!OPTION (Opt_jumpScroll)	2753	if (!option (Opt_jumpScroll)
2743	|| (refresh_count >= refresh_limit * (nrow - 1)))	2754	|| (refresh_count >= refresh_limit * (nrow - 1)))
2744	{	2755	{
2745	refreshnow = true;	2756	refreshnow = true;
2746	refresh_count = 0;	2757	refresh_count = 0;
2747	ch = NOCHAR;	2758	ch = NOCHAR;
…		…
2787	* the number of pages between refreshes is refresh_limit, which	2798	* the number of pages between refreshes is refresh_limit, which
2788	* is incremented here because we must be doing flat-out scrolling.	2799	* is incremented here because we must be doing flat-out scrolling.
2789	*/	2800	*/
2790	if (refreshnow)	2801	if (refreshnow)
2791	{	2802	{
2792	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2803	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2793	refresh_limit++;	2804	refresh_limit++;
2794	else	2805	else
2795	{	2806	{
2796	flag = true;	2807	flag = true;
		2808	//TODO: due to popular request, implement "skipscroll" option here
2797	scr_refresh ();	2809	scr_refresh ();
2798	want_refresh = 1;	2810	want_refresh = 1;
2799	}	2811	}
2800	}	2812	}
2801		2813
…		…
2820	return flag;	2832	return flag;
2821	}	2833	}
2822		2834
2823	// read the next character	2835	// read the next character
2824	wchar_t	2836	wchar_t
2825	rxvt_term::next_char ()	2837	rxvt_term::next_char () NOTHROW
2826	{	2838	{
2827	while (cmdbuf_ptr < cmdbuf_endp)	2839	while (cmdbuf_ptr < cmdbuf_endp)
2828	{	2840	{
2829	// assume 7-bit to be ascii ALWAYS	2841	// assume 7-bit to be ascii ALWAYS
2830	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2842	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2851	return NOCHAR;	2863	return NOCHAR;
2852	}	2864	}
2853		2865
2854	// read the next octet	2866	// read the next octet
2855	uint32_t	2867	uint32_t
2856	rxvt_term::next_octet ()	2868	rxvt_term::next_octet () NOTHROW
2857	{	2869	{
2858	return cmdbuf_ptr < cmdbuf_endp	2870	return cmdbuf_ptr < cmdbuf_endp
2859	? (unsigned char)*cmdbuf_ptr++	2871	? (unsigned char)*cmdbuf_ptr++
2860	: NOCHAR;	2872	: NOCHAR;
2861	}	2873	}
		2874
		2875	static class out_of_input out_of_input;
2862		2876
2863	/* rxvt_cmd_getc () - Return next input character */	2877	/* rxvt_cmd_getc () - Return next input character */
2864	/*	2878	/*
2865	* Return the next input character after first passing any keyboard input	2879	* Return the next input character after first passing any keyboard input
2866	* to the command.	2880	* to the command.
2867	*/	2881	*/
2868	wchar_t	2882	wchar_t
2869	rxvt_term::cmd_getc ()	2883	rxvt_term::cmd_getc () THROW ((class out_of_input))
2870	{	2884	{
2871	wchar_t c = next_char ();	2885	wchar_t c = next_char ();
2872		2886
2873	if (c == NOCHAR)	2887	if (c == NOCHAR)
2874	throw out_of_input;	2888	throw out_of_input;
2875		2889
2876	return c;	2890	return c;
2877	}	2891	}
2878		2892
2879	uint32_t	2893	uint32_t
2880	rxvt_term::cmd_get8 ()	2894	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881	{	2895	{
2882	uint32_t c = next_octet ();	2896	uint32_t c = next_octet ();
2883		2897
2884	if (c == NOCHAR)	2898	if (c == NOCHAR)
2885	throw out_of_input;	2899	throw out_of_input;
…		…
3123	scr_charset_set (2, (unsigned int)cmd_getc ());	3137	scr_charset_set (2, (unsigned int)cmd_getc ());
3124	break;	3138	break;
3125	case '+':	3139	case '+':
3126	scr_charset_set (3, (unsigned int)cmd_getc ());	3140	scr_charset_set (3, (unsigned int)cmd_getc ());
3127	break;	3141	break;
3128	#if ENABLE_FRILLS	3142	#if !ENABLE_MINIMAL
3129	case '6':	3143	case '6':
3130	scr_backindex ();	3144	scr_backindex ();
3131	break;	3145	break;
3132	#endif	3146	#endif
3133	case '7':	3147	case '7':
3134	scr_cursor (SAVE);	3148	scr_cursor (SAVE);
3135	break;	3149	break;
3136	case '8':	3150	case '8':
3137	scr_cursor (RESTORE);	3151	scr_cursor (RESTORE);
3138	break;	3152	break;
3139	#if ENABLE_FRILLS	3153	#if !ENABLE_MINIMAL
3140	case '9':	3154	case '9':
3141	scr_forwardindex ();	3155	scr_forwardindex ();
3142	break;	3156	break;
3143	#endif	3157	#endif
3144	case '=':	3158	case '=':
…		…
3306	ndef = get_byte_array_bit (csi_defaults, i);	3320	ndef = get_byte_array_bit (csi_defaults, i);
3307	for (p = 0; p < nargs; p++)	3321	for (p = 0; p < nargs; p++)
3308	if (arg[p] == -1)	3322	if (arg[p] == -1)
3309	arg[p] = ndef;	3323	arg[p] = ndef;
3310		3324
3311	#ifdef DEBUG_CMD
3312	fprintf (stderr, "CSI ");
3313	for (p = 0; p < nargs; p++)
3314	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315	fprintf (stderr, "%c\n", ch);
3316	#endif
3317
3318	/*	3325	/*
3319	* private mode handling	3326	* private mode handling
3320	*/	3327	*/
3321	if (priv)	3328	if (priv)
3322	{	3329	{
3323	switch (priv)	3330	switch (priv)
3324	{	3331	{
3325	case '>':	3332	case '>':
3326	if (ch == CSI_DA) /* secondary device attributes */	3333	if (ch == CSI_DA) /* secondary device attributes */
3327	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3334	{
		3335	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3336	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3337	//
		3338	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3339	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3340	// that we do not support xterm mouse reporting (should be 95 when we do).
		3341	//
		3342	tt_printf ("\033[>%d;94;0c", 'U');
		3343	}
3328	break;	3344	break;
3329	case '?':	3345	case '?':
3330	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3346	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331	process_terminal_mode (ch, priv, nargs, arg);	3347	process_terminal_mode (ch, priv, nargs, arg);
3332	break;	3348	break;
…		…
3458	break;	3474	break;
3459	case 6: /* CPR requested */	3475	case 6: /* CPR requested */
3460	scr_report_position ();	3476	scr_report_position ();
3461	break;	3477	break;
3462	case 7: /* unofficial extension */	3478	case 7: /* unofficial extension */
3463	if (OPTION (Opt_insecure))	3479	if (option (Opt_insecure))
3464	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3480	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3465	break;	3481	break;
3466	case 8: /* unofficial extension */	3482	case 8: /* unofficial extension */
3467	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3483	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3468	break;	3484	break;
…		…
3535	break;	3551	break;
3536	case CSI_75:	3552	case CSI_75:
3537	scr_cursor (RESTORE);	3553	scr_cursor (RESTORE);
3538	break;	3554	break;
3539		3555
3540	#if ENABLE_FRILLS	3556	#if !ENABLE_MINIMAL
3541	case CSI_74:	3557	case CSI_74:
3542	process_window_ops (arg, nargs);	3558	process_window_ops (arg, nargs);
3543	break;	3559	break;
3544	#endif	3560	#endif
3545		3561
…		…
3552	break;	3568	break;
3553	}	3569	}
3554	}	3570	}
3555	/*}}} */	3571	/*}}} */
3556		3572
3557	#if ENABLE_FRILLS	3573	#if !ENABLE_MINIMAL
3558	/* ARGSUSED */	3574	/* ARGSUSED */
3559	void	3575	void
3560	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3576	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561	{	3577	{
3562	int x, y;	3578	int x, y;
3563	XWindowAttributes wattr;	3579	XWindowAttributes wattr;
3564	Window wdummy;	3580	Window wdummy;
3565	dDisp;	3581
		3582	dLocal (Display *, dpy);
3566		3583
3567	if (nargs == 0)	3584	if (nargs == 0)
3568	return;	3585	return;
3569		3586
3570	switch (args[0])	3587	switch (args[0])
3571	{	3588	{
3572	/*	3589	/*
3573	* commands	3590	* commands
3574	*/	3591	*/
3575	case 1: /* deiconify window */	3592	case 1: /* deiconify window */
3576	XMapWindow (disp, parent[0]);	3593	XMapWindow (dpy, parent[0]);
3577	break;	3594	break;
3578	case 2: /* iconify window */	3595	case 2: /* iconify window */
3579	XIconifyWindow (disp, parent[0], display->screen);	3596	XIconifyWindow (dpy, parent[0], display->screen);
3580	break;	3597	break;
3581	case 3: /* set position (pixels) */	3598	case 3: /* set position (pixels) */
3582	XMoveWindow (disp, parent[0], args[1], args[2]);	3599	XMoveWindow (dpy, parent[0], args[1], args[2]);
3583	break;	3600	break;
3584	case 4: /* set size (pixels) */	3601	case 4: /* set size (pixels) */
3585	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3602	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586	break;	3603	break;
3587	case 5: /* raise window */	3604	case 5: /* raise window */
3588	XRaiseWindow (disp, parent[0]);	3605	XRaiseWindow (dpy, parent[0]);
3589	break;	3606	break;
3590	case 6: /* lower window */	3607	case 6: /* lower window */
3591	XLowerWindow (disp, parent[0]);	3608	XLowerWindow (dpy, parent[0]);
3592	break;	3609	break;
3593	case 7: /* refresh window */	3610	case 7: /* refresh window */
3594	scr_touch (true);	3611	scr_touch (true);
3595	break;	3612	break;
3596	case 8: /* set size (chars) */	3613	case 8: /* set size (chars) */
…		…
3603	if (args[0] >= 24) /* set height (chars) */	3620	if (args[0] >= 24) /* set height (chars) */
3604	set_widthheight ((unsigned int)width,	3621	set_widthheight ((unsigned int)width,
3605	(unsigned int) (args[1] * fheight));	3622	(unsigned int) (args[1] * fheight));
3606	break;	3623	break;
3607		3624
3608
3609	/*	3625	/*
3610	* reports - some output format copied from XTerm	3626	* reports - some output format copied from XTerm
3611	*/	3627	*/
3612	case 11: /* report window state */	3628	case 11: /* report window state */
3613	XGetWindowAttributes (disp, parent[0], &wattr);	3629	XGetWindowAttributes (dpy, parent[0], &wattr);
3614	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3630	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615	break;	3631	break;
3616	case 13: /* report window position */	3632	case 13: /* report window position */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3633	XGetWindowAttributes (dpy, parent[0], &wattr);
3618	XTranslateCoordinates (disp, parent[0], wattr.root,	3634	XTranslateCoordinates (dpy, parent[0], wattr.root,
3619	-wattr.border_width, -wattr.border_width,	3635	-wattr.border_width, -wattr.border_width,
3620	&x, &y, &wdummy);	3636	&x, &y, &wdummy);
3621	tt_printf ("\033[3;%d;%dt", x, y);	3637	tt_printf ("\033[3;%d;%dt", x, y);
3622	break;	3638	break;
3623	case 14: /* report window size (pixels) */	3639	case 14: /* report window size (pixels) */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3640	XGetWindowAttributes (dpy, parent[0], &wattr);
3625	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3641	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626	break;	3642	break;
3627	case 18: /* report text area size (chars) */	3643	case 18: /* report text area size (chars) */
3628	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3644	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629	break;	3645	break;
…		…
3631	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3647	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632	break;	3648	break;
3633	case 20: /* report icon label */	3649	case 20: /* report icon label */
3634	{	3650	{
3635	char *s;	3651	char *s;
3636	XGetIconName (disp, parent[0], &s);	3652	XGetIconName (dpy, parent[0], &s);
3637	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3653	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638	XFree (s);	3654	XFree (s);
3639	}	3655	}
3640	break;	3656	break;
3641	case 21: /* report window title */	3657	case 21: /* report window title */
3642	{	3658	{
3643	char *s;	3659	char *s;
3644	XFetchName (disp, parent[0], &s);	3660	XFetchName (dpy, parent[0], &s);
3645	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3661	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646	XFree (s);	3662	XFree (s);
3647	}	3663	}
3648	break;	3664	break;
3649	}	3665	}
3650	}	3666	}
…		…
3677	seen_esc = true;	3693	seen_esc = true;
3678	continue;	3694	continue;
3679	}	3695	}
3680	else if (ch == C0_BEL || ch == CHAR_ST)	3696	else if (ch == C0_BEL || ch == CHAR_ST)
3681	break;	3697	break;
		3698	else if (ch == C0_SYN)
		3699	ch = cmd_get8 ();
3682	else if (ch < 0x20)	3700	else if (ch < 0x20)
3683	return NULL; /* other control character - exit */	3701	return NULL; /* other control character - exit */
3684		3702
3685	seen_esc = false;	3703	seen_esc = false;
3686		3704
3687	if (n >= STRING_MAX - 1)	3705	if (n >= STRING_MAX - 1)
3688	// stop at some sane length	3706	// stop at some sane length
3689	return NULL;	3707	return NULL;
3690		3708
3691	if (ch == C0_SYN)
3692	string[n++] = cmd_get8 ();
3693	else
3694	string[n++] = ch;	3709	string[n++] = ch;
3695	}	3710	}
3696		3711
3697	string[n++] = '\0';	3712	string[n++] = '\0';
3698		3713
3699	ends_how = (ch == 0x5c ? C0_ESC : ch);	3714	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3750	void	3765	void
3751	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3766	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752	{	3767	{
3753	if (str[0] == '?' && !str[1])	3768	if (str[0] == '?' && !str[1])
3754	{	3769	{
3755	unsigned short r, g, b;	3770	rgba c;
3756	pix_colors_focused[color].get (display, r, g, b);	3771	pix_colors_focused[color].get (c);
		3772
		3773	#if XFT
		3774	if (c.a != rgba::MAX_CC)
		3775	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3776	else
		3777	#endif
3757	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3778	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758	}	3779	}
3759	else	3780	else
3760	set_window_color (color, str);	3781	set_window_color (color, str);
3761	}	3782	}
3762		3783
…		…
3764	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3785	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765	*/	3786	*/
3766	void	3787	void
3767	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3788	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768	{	3789	{
3769	int changed = 0;
3770	int color;	3790	int color;
3771	char *buf, *name;	3791	char *buf, *name;
3772	bool query = str[0] == '?' && !str[1];	3792	bool query = str[0] == '?' && !str[1];
3773	int saveop = op;	3793	int saveop = op;
3774	dDisp;	3794
		3795	dLocal (Display *, dpy);
3775		3796
3776	assert (str != NULL);	3797	assert (str != NULL);
		3798
		3799	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3800	return;
		3801
3777	switch (op)	3802	switch (op)
3778	{	3803	{
3779	case XTerm_name:	3804	case XTerm_name:
3780	set_title (str);	3805	set_title (str);
3781	/* FALLTHROUGH */	3806	/* FALLTHROUGH */
…		…
3795	unsigned long bytes_after;	3820	unsigned long bytes_after;
3796	unsigned char *value = 0;	3821	unsigned char *value = 0;
3797	const char *str = "";	3822	const char *str = "";
3798		3823
3799	if (prop	3824	if (prop
3800	&& XGetWindowProperty (disp, parent[0],	3825	&& XGetWindowProperty (dpy, parent[0],
3801	prop, 0, 1<<16, 0, AnyPropertyType,	3826	prop, 0, 1<<16, 0, AnyPropertyType,
3802	&actual_type, &actual_format,	3827	&actual_type, &actual_format,
3803	&nitems, &bytes_after, &value) == Success	3828	&nitems, &bytes_after, &value) == Success
3804	&& actual_type != None	3829	&& actual_type != None
3805	&& actual_format == 8)	3830	&& actual_format == 8)
3806	str = (const char *)(value);	3831	str = (const char *)(value);
3807		3832
3808	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3833	tt_printf ("\033]%d;%s%c", op, str, resp);
3809		3834
3810	XFree (value);	3835	XFree (value);
3811	}	3836	}
3812	else	3837	else
3813	{	3838	{
…		…
3817	{	3842	{
3818	*eq = 0;	3843	*eq = 0;
3819	set_utf8_property (display->atom (str), eq + 1);	3844	set_utf8_property (display->atom (str), eq + 1);
3820	}	3845	}
3821	else	3846	else
3822	XDeleteProperty (disp, parent[0],	3847	XDeleteProperty (dpy, parent[0],
3823	display->atom (str));	3848	display->atom (str));
3824	}	3849	}
3825	break;	3850	break;
3826		3851
3827	case XTerm_Color:	3852	case XTerm_Color:
…		…
3837	break;	3862	break;
3838		3863
3839	if ((buf = strchr (name, ';')) != NULL)	3864	if ((buf = strchr (name, ';')) != NULL)
3840	*buf++ = '\0';	3865	*buf++ = '\0';
3841		3866
3842	if (name[0] == '?' && !name[1])	3867	process_color_seq (op, color, name, resp);
3843	{
3844	unsigned short r, g, b;
3845	pix_colors_focused[color].get (display, r, g, b);
3846	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847	}
3848	else
3849	set_window_color (color, name);
3850	}	3868	}
3851	break;	3869	break;
3852	case XTerm_Color00:	3870	case XTerm_Color00:
3853	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3871	process_color_seq (op, Color_fg, str, resp);
3854	break;	3872	break;
3855	case XTerm_Color01:	3873	case XTerm_Color01:
3856	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3874	process_color_seq (op, Color_bg, str, resp);
3857	break;	3875	break;
3858	#ifndef NO_CURSORCOLOR	3876	#ifndef NO_CURSORCOLOR
3859	case XTerm_Color_cursor:	3877	case XTerm_Color_cursor:
3860	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3878	process_color_seq (op, Color_cursor, str, resp);
3861	break;	3879	break;
3862	#endif	3880	#endif
3863	case XTerm_Color_pointer_fg:	3881	case XTerm_Color_pointer_fg:
3864	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3882	process_color_seq (op, Color_pointer_fg, str, resp);
3865	break;	3883	break;
3866	case XTerm_Color_pointer_bg:	3884	case XTerm_Color_pointer_bg:
3867	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3885	process_color_seq (op, Color_pointer_bg, str, resp);
3868	break;	3886	break;
3869	#ifndef NO_BOLD_UNDERLINE_REVERSE	3887	#ifndef NO_BOLD_UNDERLINE_REVERSE
3870	case XTerm_Color_RV:	3888	case XTerm_Color_RV:
3871	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3889	process_color_seq (op, Color_RV, str, resp);
3872	break;	3890	break;
3873	case Rxvt_Color_BD:	3891	case Rxvt_Color_BD:
3874	case URxvt_Color_BD:	3892	case URxvt_Color_BD:
3875	process_color_seq (op, Color_BD, str, resp);	3893	process_color_seq (op, Color_BD, str, resp);
3876	break;	3894	break;
3877	case Rxvt_Color_UL:	3895	case Rxvt_Color_UL:
3878	case URxvt_Color_UL:	3896	case URxvt_Color_UL:
3879	process_color_seq (op, Color_UL, str, resp);	3897	process_color_seq (op, Color_UL, str, resp);
3880	break;	3898	break;
3881	case URxvt_Color_IT:	3899	case URxvt_Color_IT:
3882	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3900	process_color_seq (op, Color_IT, str, resp);
3883	break;	3901	break;
3884	#endif	3902	#endif
3885	#if TRANSPARENT && TINTING	3903	#if TRANSPARENT && TINTING
3886	case URxvt_Color_tint:	3904	case URxvt_Color_tint:
3887	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3905	process_color_seq (op, Color_tint, str, resp);
		3906
3888	check_our_parents ();	3907	check_our_parents ();
		3908
3889	if (am_transparent)	3909	if (am_transparent)
3890	want_full_refresh = want_refresh = 1;	3910	want_full_refresh = want_refresh = 1;
		3911
3891	break;	3912	break;
3892	#endif	3913	#endif
3893		3914
3894	case Rxvt_Pixmap:	3915	case Rxvt_Pixmap:
		3916	{
3895	if (*str != ';')	3917	if (*str != ';')
3896	{	3918	{
3897	#if XPM_BACKGROUND	3919	#if XPM_BACKGROUND
3898	scale_pixmap (""); /* reset to default scaling */	3920	scale_pixmap (""); /* reset to default scaling */
3899	set_bgPixmap (str); /* change pixmap */	3921	set_bgPixmap (str); /* change pixmap */
3900	scr_touch (true);	3922	scr_touch (true);
3901	#endif	3923	#endif
3902	}	3924	}
3903		3925
		3926	int changed = 0;
		3927
3904	while ((str = strchr (str, ';')) != NULL)	3928	while ((str = strchr (str, ';')) != NULL)
3905	{	3929	{
3906	str++;	3930	str++;
3907	#if XPM_BACKGROUND	3931	#if XPM_BACKGROUND
3908	changed += scale_pixmap (str);	3932	changed += scale_pixmap (str);
3909	#endif	3933	#endif
3910	}	3934	}
3911		3935
3912	if (changed)	3936	if (changed)
3913	{	3937	{
3914	#ifdef XPM_BACKGROUND	3938	#ifdef XPM_BACKGROUND
3915	resize_pixmap ();	3939	resize_pixmap ();
3916	scr_touch (true);	3940	scr_touch (true);
3917	#endif	3941	#endif
3918	}	3942	}
		3943	}
3919	break;	3944	break;
3920		3945
3921	case Rxvt_restoreFG:	3946	case Rxvt_restoreFG:
3922	set_window_color (Color_fg, str);	3947	set_window_color (Color_fg, str);
3923	break;	3948	break;
…		…
3949	case URxvt_italicFont:	3974	case URxvt_italicFont:
3950	case URxvt_boldItalicFont:	3975	case URxvt_boldItalicFont:
3951	#endif	3976	#endif
3952	if (query)	3977	if (query)
3953	tt_printf ("\33]%d;%-.250s%c", saveop,	3978	tt_printf ("\33]%d;%-.250s%c", saveop,
3954	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3979	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955	? fontset[op - URxvt_font]->fontdesc : "",	3980	? fontset[op - URxvt_font]->fontdesc : "",
3956	resp);	3981	resp);
3957	else	3982	else
3958	{	3983	{
3959	const char *&res = rs[Rs_font + (op - URxvt_font)];	3984	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3962	allocated.push_back ((void *)res);	3987	allocated.push_back ((void *)res);
3963	set_fonts ();	3988	set_fonts ();
3964	}	3989	}
3965	break;	3990	break;
3966		3991
3967	#if ENABLE_FRILLS	3992	case URxvt_version:
		3993	if (query)
		3994	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3995	op,
		3996	rs[Rs_name], VERSION[0], VERSION[2],
		3997	resp);
		3998	break;
		3999
		4000	#if !ENABLE_MINIMAL
3968	case URxvt_locale:	4001	case URxvt_locale:
3969	if (query)	4002	if (query)
3970	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	4003	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3971	else	4004	else
3972	{	4005	{
3973	set_locale (str);	4006	set_locale (str);
3974	pty.set_utf8_mode (enc_utf8);	4007	pty->set_utf8_mode (enc_utf8);
3975	init_xlocale ();	4008	init_xlocale ();
3976	}	4009	}
3977	break;	4010	break;
3978		4011
3979	case URxvt_view_up:	4012	case URxvt_view_up:
…		…
3990	break;	4023	break;
3991	#endif	4024	#endif
3992		4025
3993	#if ENABLE_PERL	4026	#if ENABLE_PERL
3994	case URxvt_perl:	4027	case URxvt_perl:
3995	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4028	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3996	; // no responses yet	4029	; // no responses yet
3997	break;	4030	break;
3998	#endif	4031	#endif
3999	}	4032	}
4000	}	4033	}
…		…
4032	return state;	4065	return state;
4033	}	4066	}
4034		4067
4035	/* we're not using priv _yet_ */	4068	/* we're not using priv _yet_ */
4036	void	4069	void
4037	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4070	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038	{	4071	{
4039	unsigned int i, j;	4072	unsigned int i, j;
4040	int state;	4073	int state;
4041		4074
4042	static const struct	4075	static const struct
…		…
4116	scr_touch (true);	4149	scr_touch (true);
4117	break;	4150	break;
4118	#endif	4151	#endif
4119	case 1048: /* alternative cursor save */	4152	case 1048: /* alternative cursor save */
4120	case 1049:	4153	case 1049:
4121	if (OPTION (Opt_secondaryScreen))	4154	if (option (Opt_secondaryScreen))
4122	if (mode == 0)	4155	if (mode == 0)
4123	scr_cursor (RESTORE);	4156	scr_cursor (RESTORE);
4124	else if (mode == 1)	4157	else if (mode == 1)
4125	scr_cursor (SAVE);	4158	scr_cursor (SAVE);
4126	break;	4159	break;
…		…
4191	break;	4224	break;
4192	case 1011: /* scroll to bottom on key press */	4225	case 1011: /* scroll to bottom on key press */
4193	set_option (Opt_scrollTtyKeypress, state);	4226	set_option (Opt_scrollTtyKeypress, state);
4194	break;	4227	break;
4195	case 1047: /* secondary screen w/ clearing last */	4228	case 1047: /* secondary screen w/ clearing last */
4196	if (OPTION (Opt_secondaryScreen))	4229	if (option (Opt_secondaryScreen))
4197	if (current_screen != PRIMARY)	4230	if (current_screen != PRIMARY)
4198	scr_erase_screen (2);	4231	scr_erase_screen (2);
4199	scr_change_screen (state);	4232	scr_change_screen (state);
4200	break;	4233	break;
4201	case 1049: /* secondary screen w/ clearing first */	4234	case 1049: /* secondary screen w/ clearing first */
4202	scr_change_screen (state);	4235	scr_change_screen (state);
4203	if (OPTION (Opt_secondaryScreen))	4236	if (option (Opt_secondaryScreen))
4204	if (current_screen != PRIMARY)	4237	if (current_screen != PRIMARY)
4205	scr_erase_screen (2);	4238	scr_erase_screen (2);
4206	break;	4239	break;
4207	default:	4240	default:
4208	break;	4241	break;
…		…
4336	scr_color (Color_bg, Color_bg);	4369	scr_color (Color_bg, Color_bg);
4337	break;	4370	break;
4338		4371
4339	//case 50: // not variable spacing	4372	//case 50: // not variable spacing
4340		4373
4341	#if ENABLE_FRILLS	4374	#if !ENABLE_MINIMAL
4342	case 90:	4375	case 90:
4343	case 91: /* set bright fg color */	4376	case 91: /* set bright fg color */
4344	case 92:	4377	case 92:
4345	case 93:	4378	case 93:
4346	case 94:	4379	case 94:
…		…
4411	rxvt_term::tt_write (const char *data, unsigned int len)	4444	rxvt_term::tt_write (const char *data, unsigned int len)
4412	{	4445	{
4413	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4446	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414	return;	4447	return;
4415		4448
4416	if (pty.pty < 0)	4449	if (pty->pty < 0)
4417	return;	4450	return;
4418		4451
4419	if (v_buflen == 0)	4452	if (v_buflen == 0)
4420	{	4453	{
4421	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4454	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422		4455
4423	if ((unsigned int)written == len)	4456	if ((unsigned int)written == len)
4424	return;	4457	return;
4425		4458
4426	data += written;	4459	data += written;
…		…
4435	pty_ev.set (EVENT_READ | EVENT_WRITE);	4468	pty_ev.set (EVENT_READ | EVENT_WRITE);
4436	}	4469	}
4437		4470
4438	void rxvt_term::pty_write ()	4471	void rxvt_term::pty_write ()
4439	{	4472	{
4440	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4473	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441		4474
4442	if (written > 0)	4475	if (written > 0)
4443	{	4476	{
4444	v_buflen -= written;	4477	v_buflen -= written;
4445		4478

Diff Legend

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