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.276 by root, Fri Jan 20 11:02:46 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>
		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
64		63
65	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		67
…		…
227	# if !UNICODE3	226	# if !UNICODE3
228	if (ch >= 0x10000)	227	if (ch >= 0x10000)
229	ch = 0xfffd;	228	ch = 0xfffd;
230	# endif	229	# endif
231	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
232	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
233	}	234	}
234		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	// }
235	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
236	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
237		243
238	free (fname);	244	free (fname);
239		245
…		…
292		298
293	return -1;	299	return -1;
294	}	300	}
295	#endif	301	#endif
296		302
297	/*{{{ Convert the keypress event into a string */
298	void	303	void
299	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
300	{	305	{
301	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
302	unsigned int newlen;	307	unsigned int newlen;
303	KeySym keysym;	308	KeySym keysym;
304	#ifdef DEBUG_CMD
305	static int debug_key = 1; /* accessible by a debugger only */
306	#endif
307	int valid_keysym;	309	int valid_keysym;
308	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
309		316
310	/*	317	/*
311	* 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
312	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
313	*	320	*
…		…
870	return;	877	return;
871		878
872	if (len <= 0)	879	if (len <= 0)
873	return; /* not mapped */	880	return; /* not mapped */
874		881
875	if (OPTION (Opt_scrollTtyKeypress))	882	if (option (Opt_scrollTtyKeypress))
876	if (view_start)	883	if (view_start)
877	{	884	{
878	view_start = 0;	885	view_start = 0;
879	want_refresh = 1;	886	want_refresh = 1;
880	}	887	}
…		…
902	{	909	{
903	const char ch = C0_ESC;	910	const char ch = C0_ESC;
904	tt_write (&ch, 1);	911	tt_write (&ch, 1);
905	}	912	}
906		913
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
918	}	915	}
919	/*}}} */	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	}
920		993
921	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
922	unsigned int	995	unsigned int
923	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
924	{	997	{
…		…
1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102	}	1175	}
1103	}	1176	}
1104	#endif	1177	#endif
1105		1178
1106	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1107	static struct event_handler	1180	static struct event_handler
1108	{	1181	{
1109	check_watcher cw_yield;	1182	check_watcher yield_ev;
1110		1183
1111	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1112	{	1185	{
1113	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
1114	w.stop ();	1194	w.stop ();
1115	}	1195	}
1116		1196
1117	event_handler ()	1197	event_handler ()
1118	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1119	{	1199	{
1120	}	1200	}
1121	} event_handler;	1201	} event_handler;
1122	#endif	1202	#endif
1123		1203
…		…
1143	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1144	return true;	1224	return true;
1145	}	1225	}
1146	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147	{	1227	{
1148	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1149	if (display->is_local)	1229	if (display->is_local)
1150	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1151	#endif	1231	#endif
1152	}	1232	}
1153	else	1233	else
1154	{	1234	{
1155	pty_ev.stop ();	1235	pty_ev.stop ();
1156		1236
1157	if (!OPTION (Opt_hold))	1237	if (!option (Opt_hold))
1158	destroy ();	1238	destroy ();
1159	}	1239	}
1160		1240
1161	return false;	1241	return false;
1162	}	1242	}
…		…
1177	}	1257	}
1178		1258
1179	void	1259	void
1180	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1181	{	1261	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1183	recolour_cursor ();	1263	recolour_cursor ();
1184		1264
1185	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1266	hidden_pointer = 0;
1187		1267
1188	if (OPTION (Opt_pointerBlank))	1268	if (option (Opt_pointerBlank))
1189	pointer_ev.start (NOW + pointerBlankDelay);	1269	pointer_ev.start (NOW + pointerBlankDelay);
1190	#endif	1270	#endif
1191	}	1271	}
1192		1272
1193	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1194	void	1274	void
1195	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1196	{	1276	{
1197	if (!OPTION (Opt_pointerBlank))	1277	if (!option (Opt_pointerBlank))
1198	return;	1278	return;
1199		1279
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1201	XFlush (display->display);	1281	XFlush (dpy);
1202		1282
1203	hidden_pointer = 1;	1283	hidden_pointer = 1;
1204	}	1284	}
1205		1285
1206	void	1286	void
…		…
1279	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1280	(32 + x + 1),	1360	(32 + x + 1),
1281	(32 + y + 1));	1361	(32 + y + 1));
1282	}	1362	}
1283		1363
1284	#ifdef USING_W11LIB
1285	void
1286	rxvt_W11_process_x_event (XEvent *ev)
1287	{
1288	rxvt_t *r = rxvt_get_r ();
1289
1290	x_cb (*ev);
1291	}
1292	#endif
1293
1294	/*{{{ process an X event */	1364	/*{{{ process an X event */
1295	void	1365	void
1296	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1297	{	1367	{
1298	make_current ();	1368	make_current ();
1299		1369
1300	dDisp;	1370	dLocal (Display *, dpy);
1301		1371
1302	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1375	return;
…		…
1310	unsigned int unused_mask;	1380	unsigned int unused_mask;
1311		1381
1312	switch (ev.type)	1382	switch (ev.type)
1313	{	1383	{
1314	case KeyPress:	1384	case KeyPress:
1315	#if ISO_14755	1385	key_press (ev.xkey);
1316	if (!(iso14755buf & ISO_14755_52))
1317	#endif
1318	lookup_key (ev.xkey);
1319
1320	break;	1386	break;
1321		1387
1322	case KeyRelease:	1388	case KeyRelease:
1323	{	1389	key_release (ev.xkey);
1324	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325	KeySym keysym;
1326
1327	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328	#endif
1329
1330	#if ENABLE_FRILLS || ISO_14755
1331	// ISO 14755 support
1332	if (iso14755buf)
1333	if (iso14755buf & ISO_14755_52)
1334	{
1335	# if ENABLE_OVERLAY
1336	scr_overlay_off ();
1337	# endif
1338	# if ISO_14755
1339	// iso14755 part 5.2 handling: release time
1340	// first: controls
1341	if ((ev.xkey.state & ControlMask)
1342	&& ((keysym >= 0x40 && keysym <= 0x5f)
1343	|| (keysym >= 0x61 && keysym <= 0x7f)))
1344	{
1345	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346	commit_iso14755 ();
1347	goto skip_switch;
1348	}
1349
1350	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351	if (i[0] == keysym)
1352	{
1353	iso14755buf = ISO_14755_51 | i[1];
1354	commit_iso14755 ();
1355	goto skip_switch;
1356	}
1357
1358	scr_bell ();
1359	# endif
1360	iso14755buf = 0;
1361	break;
1362	}
1363	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364	{
1365	# if ENABLE_OVERLAY
1366	scr_overlay_off ();
1367	# endif
1368	if (iso14755buf & ISO_14755_51)
1369	commit_iso14755 ();
1370	#if ISO_14755
1371	else if (iso14755buf & ISO_14755_STARTED)
1372	{
1373	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377	}
1378	# endif
1379	else
1380	iso14755buf = 0;
1381	}
1382	#endif
1383
1384	if (ev.xany.window == vt
1385	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386	break;
1387
1388	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389	if (!(ev.xkey.state & ControlMask))
1390	slip_wheel_ev.stop ();
1391	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392	mouse_slip_wheel_speed = 0;
1393	#endif
1394	break;	1390	break;
1395	}
1396		1391
1397	case ButtonPress:	1392	case ButtonPress:
1398	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1399	break;	1394	break;
1400		1395
1401	case ButtonRelease:	1396	case ButtonRelease:
1402	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1403	break;	1398	break;
1404		1399
1405	case ClientMessage:	1400	case ClientMessage:
1406	if (ev.xclient.format == 32)	1401	if (ev.xclient.format == 32
		1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1407	{	1403	{
1408	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1404	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409	{	1405	{
1410	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1406	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1411	{	1407	{
		1408	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1409	{
1412	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))	1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413	destroy ();	1411	destroy ();
		1412	}
		1413	#if ENABLE_EWMH
		1414	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1415	XSendEvent (dpy, ev.xclient.window = display->root,
		1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1417	&ev);
		1418	#endif
1414	}	1419	}
1415	#if ENABLE_EWMH
1416	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1417	XSendEvent (disp, ev.xclient.window = display->root,
1418	False, SubstructureRedirectMask | SubstructureNotifyMask,
1419	&ev);
1420	#endif
1421	}	1420	}
1422	#if ENABLE_XEMBED	1421	#if ENABLE_XEMBED
1423	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])	1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424	{	1423	{
1425	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)	1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
…		…
1459	break;	1458	break;
1460	}	1459	}
1461	break;	1460	break;
1462		1461
1463	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior
		1464	&& ev.xfocus.detail != NotifyPointer
		1465	&& ev.xfocus.mode != NotifyGrab)
1464	focus_in ();	1466	focus_in ();
1465	break;	1467	break;
1466		1468
1467	case FocusOut:	1469	case FocusOut:
		1470	if (ev.xfocus.detail != NotifyInferior
		1471	&& ev.xfocus.detail != NotifyPointer
		1472	&& ev.xfocus.mode != NotifyGrab)
1468	focus_out ();	1473	focus_out ();
1469	break;	1474	break;
1470		1475
1471	case ConfigureNotify:	1476	case ConfigureNotify:
1472	if (ev.xconfigure.window == parent[0])	1477	if (ev.xconfigure.window == parent[0])
1473	{	1478	{
1474	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1479	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1475	;	1480	;
1476		1481
1477	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1482	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1478	{	1483	{
1479	seen_resize = 1;	1484	seen_resize = 1;
1480	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1485	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1481	}	1486	}
1482		1487
1483	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1488	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484		1489
1485	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1490	#ifdef TRANSPARENT
1486	if (OPTION (Opt_transparent))	1491	if (option (Opt_transparent))
1487	check_our_parents ();	1492	check_our_parents ();
1488	#endif	1493	#endif
1489	}	1494	}
1490	break;	1495	break;
1491		1496
1492	case PropertyNotify:	1497	case PropertyNotify:
		1498	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1499	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494	&& ev.xproperty.state == PropertyNewValue)	1500	&& ev.xproperty.state == PropertyNewValue)
1495	selection_property (ev.xproperty.window, ev.xproperty.atom);	1501	selection_property (ev.xproperty.window, ev.xproperty.atom);
1496		1502
1497	break;	1503	break;
1498		1504
1499	case SelectionClear:	1505	case SelectionClear:
1500	selection_clear ();	1506	selection_clear ();
…		…
1536	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1537	{	1543	{
1538	do	1544	do
1539	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1540	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
1541	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542		1548
1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544		1550
1545	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1546	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1547	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, False);
1548		1554
1549	want_refresh = 1;	1555	want_refresh = 1;
1550	}	1556	}
1551	else	1557	else
1552	{	1558	{
1553	XEvent unused_event;	1559	XEvent unused_event;
1554		1560
1555	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1561	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556	;	1562	;
1557	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558	;	1564	;
1559		1565
1560	if (isScrollbarWindow (ev.xany.window))	1566	if (isScrollbarWindow (ev.xany.window))
1561	{	1567	{
1562	scrollBar.setIdle ();	1568	scrollBar.setIdle ();
1563	scrollbar_show (0);	1569	scrollbar_show (0);
1564	}	1570	}
1565		1571
1566	#ifdef TRANSPARENT	1572	#ifdef TRANSPARENT
1567	if (am_transparent && ev.xany.window == parent[0])	1573	if (am_transparent && ev.xany.window == parent[0])
1568	XClearWindow (disp, ev.xany.window);	1574	XClearWindow (dpy, ev.xany.window);
1569	#endif	1575	#endif
1570	}	1576	}
1571	break;	1577	break;
1572		1578
1573	case MotionNotify:	1579	case MotionNotify:
…		…
1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1589	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1590	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585	; // nop	1591	; // nop
1586	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1592	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1587	{	1593	{
1588	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1594	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1589	;	1595	;
1590		1596
1591	XQueryPointer (disp, vt,	1597	XQueryPointer (dpy, vt,
1592	&unused_root, &unused_child,	1598	&unused_root, &unused_child,
1593	&unused_root_x, &unused_root_y,	1599	&unused_root_x, &unused_root_y,
1594	&ev.xbutton.x, &ev.xbutton.y,	1600	&ev.xbutton.x, &ev.xbutton.y,
1595	&ev.xbutton.state);	1601	&ev.xbutton.state);
1596	#ifdef MOUSE_THRESHOLD	1602	#ifdef MOUSE_THRESHOLD
…		…
1660	#endif	1666	#endif
1661	}	1667	}
1662	}	1668	}
1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1669	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1664	{	1670	{
1665	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1671	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666	MotionNotify, &ev))	1672	MotionNotify, &ev))
1667	;	1673	;
1668		1674
1669	XQueryPointer (disp, scrollBar.win,	1675	XQueryPointer (dpy, scrollBar.win,
1670	&unused_root, &unused_child,	1676	&unused_root, &unused_child,
1671	&unused_root_x, &unused_root_y,	1677	&unused_root_x, &unused_root_y,
1672	&ev.xbutton.x, &ev.xbutton.y,	1678	&ev.xbutton.x, &ev.xbutton.y,
1673	&unused_mask);	1679	&unused_mask);
1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1680	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1678	scrollbar_show (1);	1684	scrollbar_show (1);
1679	}	1685	}
1680	break;	1686	break;
1681	}	1687	}
1682		1688
1683	skip_switch: ;
1684
1685	#if defined(CURSOR_BLINK)	1689	#if defined(CURSOR_BLINK)
1686	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687	{	1691	{
1688	if (hidden_cursor)	1692	if (hidden_cursor)
1689	{	1693	{
1690	hidden_cursor = 0;	1694	hidden_cursor = 0;
1691	want_refresh = 1;	1695	want_refresh = 1;
…		…
1694	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695	}	1699	}
1696	#endif	1700	#endif
1697		1701
1698	#if defined(POINTER_BLANK)	1702	#if defined(POINTER_BLANK)
1699	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700	{	1704	{
1701	if (ev.type == MotionNotify	1705	if (ev.type == MotionNotify
1702	|| ev.type == ButtonPress	1706	|| ev.type == ButtonPress
1703	|| ev.type == ButtonRelease)	1707	|| ev.type == ButtonRelease)
1704	if (hidden_pointer)	1708	if (hidden_pointer)
…		…
1716	if (!focus)	1720	if (!focus)
1717	{	1721	{
1718	focus = 1;	1722	focus = 1;
1719	want_refresh = 1;	1723	want_refresh = 1;
1720		1724
1721	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1725	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722		1726
1723	#if USE_XIM	1727	#if USE_XIM
1724	if (Input_Context != NULL)	1728	if (Input_Context != NULL)
1725	{	1729	{
1726	IMSetStatusPosition ();	1730	IMSetPosition ();
1727	XSetICFocus (Input_Context);	1731	XSetICFocus (Input_Context);
1728	}	1732	}
1729	#endif	1733	#endif
1730	#if CURSOR_BLINK	1734	#if CURSOR_BLINK
1731	if (OPTION (Opt_cursorBlink))	1735	if (option (Opt_cursorBlink))
1732	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	#endif	1737	#endif
1734	#if OFF_FOCUS_FADING	1738	#if OFF_FOCUS_FADING
1735	if (rs[Rs_fade])	1739	if (rs[Rs_fade])
1736	{	1740	{
1737	pix_colors = pix_colors_focused;	1741	pix_colors = pix_colors_focused;
1738	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	}
1739	}	1756	}
1740	#endif	1757	#endif
1741	}	1758	}
1742	}	1759	}
1743		1760
…		…
1763	#if USE_XIM	1780	#if USE_XIM
1764	if (Input_Context != NULL)	1781	if (Input_Context != NULL)
1765	XUnsetICFocus (Input_Context);	1782	XUnsetICFocus (Input_Context);
1766	#endif	1783	#endif
1767	#if CURSOR_BLINK	1784	#if CURSOR_BLINK
1768	if (OPTION (Opt_cursorBlink))	1785	if (option (Opt_cursorBlink))
1769	cursor_blink_ev.stop ();	1786	cursor_blink_ev.stop ();
1770	hidden_cursor = 0;	1787	hidden_cursor = 0;
1771	#endif	1788	#endif
1772	#if OFF_FOCUS_FADING	1789	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1790	if (rs[Rs_fade])
…		…
1777	}	1794	}
1778	#endif	1795	#endif
1779	}	1796	}
1780	}	1797	}
1781		1798
1782	#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
1783	void	1813	void
1784	rxvt_term::rootwin_cb (XEvent &ev)	1814	rxvt_term::rootwin_cb (XEvent &ev)
1785	{	1815	{
1786	make_current ();	1816	make_current ();
1787		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
1788	switch (ev.type)	1823	switch (ev.type)
1789	{	1824	{
1790	case PropertyNotify:	1825	case PropertyNotify:
1791	/*	1826	/*
1792	* 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,
…		…
1796	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1831	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1797	return;	1832	return;
1798		1833
1799	/* FALLTHROUGH */	1834	/* FALLTHROUGH */
1800	case ReparentNotify:	1835	case ReparentNotify:
1801	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1836	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1802	want_refresh = want_full_refresh = 1;	1837	want_refresh = want_full_refresh = 1;
1803	break;	1838	break;
1804	}	1839	}
		1840	# endif
1805	}	1841	}
1806	#endif	1842	#endif
1807		1843
1808	void	1844	void
1809	rxvt_term::button_press (XButtonEvent &ev)	1845	rxvt_term::button_press (XButtonEvent &ev)
…		…
1818	/*	1854	/*
1819	* VT window processing of button press	1855	* VT window processing of button press
1820	*/	1856	*/
1821	if (ev.window == vt)	1857	if (ev.window == vt)
1822	{	1858	{
		1859	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1860	return;
		1861
1823	#if ISO_14755	1862	#if ISO_14755
1824	// 5.4	1863	// 5.4
1825	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1864	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1826	{	1865	{
1827	iso14755_54 (ev.x, ev.y);	1866	iso14755_54 (ev.x, ev.y);
…		…
1869	else	1908	else
1870	{	1909	{
1871	if (ev.button != MEvent.button)	1910	if (ev.button != MEvent.button)
1872	MEvent.clicks = 0;	1911	MEvent.clicks = 0;
1873		1912
1874	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875	switch (ev.button)	1913	switch (ev.button)
1876	{	1914	{
1877	case Button1:	1915	case Button1:
1878	/* allow meta + click to select rectangular areas */	1916	/* allow meta + click to select rectangular areas */
1879	/* should be done in screen.C */	1917	/* should be done in screen.C */
1880	#if ENABLE_FRILLS	1918	#if ENABLE_FRILLS
1881	selection.rect = !!(ev.state & ModMetaMask);	1919	selection.rect = !!(ev.state & ModMetaMask);
1882	#else	1920	#else
1883	selection.rect = false;	1921	selection.rect = false;
1884	#endif	1922	#endif
1885		1923
1886	/* allow shift+left click to extend selection */	1924	/* allow shift+left click to extend selection */
1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1888	{	1926	{
1889	if (MEvent.button == Button1 && clickintime)	1927	if (MEvent.button == Button1 && clickintime)
1890	selection_rotate (ev.x, ev.y);	1928	selection_rotate (ev.x, ev.y);
1891	else	1929	else
1892	selection_extend (ev.x, ev.y, 1);	1930	selection_extend (ev.x, ev.y, 1);
1893	}	1931	}
1894	else	1932	else
1895	{	1933	{
1896	if (MEvent.button == Button1 && clickintime)	1934	if (MEvent.button == Button1 && clickintime)
1897	MEvent.clicks++;	1935	MEvent.clicks++;
1898	else	1936	else
1899	MEvent.clicks = 1;	1937	MEvent.clicks = 1;
1900		1938
1901	selection_click (MEvent.clicks, ev.x, ev.y);	1939	selection_click (MEvent.clicks, ev.x, ev.y);
1902	}	1940	}
1903		1941
1904	MEvent.button = Button1;	1942	MEvent.button = Button1;
1905	break;	1943	break;
1906		1944
1907	case Button3:	1945	case Button3:
1908	if (MEvent.button == Button3 && clickintime)	1946	if (MEvent.button == Button3 && clickintime)
1909	selection_rotate (ev.x, ev.y);	1947	selection_rotate (ev.x, ev.y);
1910	else	1948	else
1911	selection_extend (ev.x, ev.y, 1);	1949	selection_extend (ev.x, ev.y, 1);
1912		1950
1913	MEvent.button = Button3;	1951	MEvent.button = Button3;
1914	break;	1952	break;
1915	}	1953	}
1916	}	1954	}
1917		1955
1918	MEvent.time = ev.time;	1956	MEvent.time = ev.time;
1919	return;	1957	return;
1920	}	1958	}
1921		1959
…		…
2084	sel_scroll_ev.stop();	2122	sel_scroll_ev.stop();
2085	#endif	2123	#endif
2086		2124
2087	if (ev.window == vt)	2125	if (ev.window == vt)
2088	{	2126	{
		2127	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2128	return;
		2129
2089	#if ISO_14755	2130	#if ISO_14755
2090	// 5.4	2131	// 5.4
2091	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2132	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2092	return;	2133	return;
2093	#endif	2134	#endif
		2135
2094	if (reportmode)	2136	if (reportmode)
2095	{	2137	{
2096	/* mouse report from vt window */	2138	/* mouse report from vt window */
2097	/* don't report release of wheel "buttons" */	2139	/* don't report release of wheel "buttons" */
2098	if (ev.button >= 4)	2140	if (ev.button >= 4)
…		…
2122	if (priv_modes & PrivMode_mouse_report	2164	if (priv_modes & PrivMode_mouse_report
2123	&& bypass_keystate	2165	&& bypass_keystate
2124	&& ev.button == Button1 && MEvent.clicks <= 1)	2166	&& ev.button == Button1 && MEvent.clicks <= 1)
2125	selection_extend (ev.x, ev.y, 0);	2167	selection_extend (ev.x, ev.y, 0);
2126		2168
2127	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128	return;
2129
2130	switch (ev.button)	2169	switch (ev.button)
2131	{	2170	{
2132	case Button1:	2171	case Button1:
2133	case Button3:	2172	case Button3:
2134	selection_make (ev.time);	2173	selection_make (ev.time);
2135	break;	2174	break;
2136		2175
2137	case Button2:	2176	case Button2:
2138	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2177	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);	2178	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2140	break;	2179	break;
2141		2180
2142	#ifdef MOUSE_WHEEL	2181	#ifdef MOUSE_WHEEL
2143	case Button4:	2182	case Button4:
2144	case Button5:	2183	case Button5:
…		…
2148		2187
2149	v = ev.button == Button4 ? UP : DN;	2188	v = ev.button == Button4 ? UP : DN;
2150		2189
2151	if (ev.state & ShiftMask)	2190	if (ev.state & ShiftMask)
2152	i = 1;	2191	i = 1;
2153	else if (OPTION (Opt_mouseWheelScrollPage))	2192	else if (option (Opt_mouseWheelScrollPage))
2154	i = nrow - 1;	2193	i = nrow - 1;
2155	else	2194	else
2156	i = 5;	2195	i = 5;
2157		2196
2158	# ifdef MOUSE_SLIP_WHEELING	2197	# ifdef MOUSE_SLIP_WHEELING
…		…
2186	#if TINTING	2225	#if TINTING
2187	/* taken from aterm-0.4.2 */	2226	/* taken from aterm-0.4.2 */
2188		2227
2189	typedef uint32_t RUINT32T;	2228	typedef uint32_t RUINT32T;
2190		2229
2191	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)
2192	{	2231	{
2193	int sh_r, sh_g, sh_b;	2232	int sh_r, sh_g, sh_b;
2194	RUINT32T mask_r, mask_g, mask_b;	2233	RUINT32T mask_r, mask_g, mask_b;
2195	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2234	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2235	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2236	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198	int i;	2237	int i;
2199		2238
2200	Visual *visual = display->visual;	2239	Visual *visual = term->visual;
2201		2240
2202	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2241	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203		2242
2204	/* for convenience */	2243	/* for convenience */
2205	mask_r = visual->red_mask;	2244	mask_r = visual->red_mask;
…		…
2426	Atom atype;	2465	Atom atype;
2427	unsigned char *prop = NULL;	2466	unsigned char *prop = NULL;
2428	Window root, oldp, *list;	2467	Window root, oldp, *list;
2429	Pixmap rootpixmap = None;	2468	Pixmap rootpixmap = None;
2430	XWindowAttributes wattr, wrootattr;	2469	XWindowAttributes wattr, wrootattr;
2431	dDisp;
2432		2470
2433	pchanged = 0;	2471	pchanged = 0;
2434		2472
2435	if (!OPTION (Opt_transparent))	2473	if (!option (Opt_transparent))
2436	return pchanged; /* Don't try any more */	2474	return pchanged; /* Don't try any more */
2437		2475
2438	XGetWindowAttributes (disp, display->root, &wrootattr);	2476	XGetWindowAttributes (dpy, display->root, &wrootattr);
2439	rootdepth = wrootattr.depth;	2477	rootdepth = wrootattr.depth;
2440		2478
2441	XGetWindowAttributes (disp, parent[0], &wattr);	2479	XGetWindowAttributes (dpy, parent[0], &wattr);
2442		2480
2443	if (rootdepth != wattr.depth)	2481	if (rootdepth != wattr.depth)
2444	{	2482	{
2445	if (am_transparent)	2483	if (am_transparent)
2446	{	2484	{
2447	pchanged = 1;	2485	pchanged = 1;
2448	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2486	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449	am_transparent = am_pixmap_trans = 0;	2487	am_transparent = am_pixmap_trans = 0;
2450	}	2488	}
2451		2489
2452	return pchanged; /* Don't try any more */	2490	return pchanged; /* Don't try any more */
2453	}	2491	}
2454		2492
2455	/* 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. */
2456	XSync (disp, False);	2494	XSync (dpy, False);
2457		2495
2458	/*	2496	/*
2459	* Make the frame window set by the window manager have	2497	* Make the frame window set by the window manager have
2460	* the root background. Some window managers put multiple nested frame	2498	* the root background. Some window managers put multiple nested frame
2461	* 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.
2462	*/	2500	*/
2463	i = (xa[XA_XROOTPMAP_ID]	2501	i = (xa[XA_XROOTPMAP_ID]
2464	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2502	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2503	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466	&nitems, &bytes_after, &prop) == Success);	2504	&nitems, &bytes_after, &prop) == Success);
2467		2505
2468	if (!i || prop == NULL)	2506	if (!i || prop == NULL)
2469	i = (xa[XA_ESETROOT_PMAP_ID]	2507	i = (xa[XA_ESETROOT_PMAP_ID]
2470	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2508	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2509	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472	&nitems, &bytes_after, &prop) == Success);	2510	&nitems, &bytes_after, &prop) == Success);
2473		2511
2474	if (!i || prop == NULL	2512	if (!i || prop == NULL
2475	#if TINTING	2513	#if TINTING
2476	|| !rs[Rs_color + Color_tint]	2514	|| !ISSET_PIXCOLOR (Color_tint)
2477	#endif	2515	#endif
2478	)	2516	)
2479	have_pixmap = 0;	2517	have_pixmap = 0;
2480	else	2518	else
2481	{	2519	{
…		…
2494	Window cr;	2532	Window cr;
2495	XImage *image;	2533	XImage *image;
2496	GC gc;	2534	GC gc;
2497	XGCValues gcvalue;	2535	XGCValues gcvalue;
2498		2536
2499	XTranslateCoordinates (disp, parent[0], display->root,	2537	XTranslateCoordinates (dpy, parent[0], display->root,
2500	0, 0, &sx, &sy, &cr);	2538	0, 0, &sx, &sy, &cr);
2501	nw = (unsigned int)szHint.width;	2539	nw = (unsigned int)szHint.width;
2502	nh = (unsigned int)szHint.height;	2540	nh = (unsigned int)szHint.height;
2503	nx = ny = 0;	2541	nx = ny = 0;
2504		2542
…		…
2517	}	2555	}
2518		2556
2519	min_it (nw, (unsigned int) (wrootattr.width - sx));	2557	min_it (nw, (unsigned int) (wrootattr.width - sx));
2520	min_it (nh, (unsigned int) (wrootattr.height - sy));	2558	min_it (nh, (unsigned int) (wrootattr.height - sy));
2521		2559
2522	XSync (disp, False);	2560	XSync (dpy, False);
2523	allowedxerror = -1;	2561	allowedxerror = -1;
2524	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2562	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525		2563
2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2564	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2527	/* XXX: may need a delay here? */	2565	/* XXX: may need a delay here? */
2528	allowedxerror = 0;	2566	allowedxerror = 0;
2529		2567
…		…
2532	if (am_transparent && am_pixmap_trans)	2570	if (am_transparent && am_pixmap_trans)
2533	{	2571	{
2534	pchanged = 1;	2572	pchanged = 1;
2535	if (pixmap != None)	2573	if (pixmap != None)
2536	{	2574	{
2537	XFreePixmap (disp, pixmap);	2575	XFreePixmap (dpy, pixmap);
2538	pixmap = None;	2576	pixmap = None;
2539	}	2577	}
2540	}	2578	}
2541		2579
2542	am_pixmap_trans = 0;	2580	am_pixmap_trans = 0;
2543	}	2581	}
2544	else	2582	else
2545	{	2583	{
2546	if (pixmap != None)	2584	if (pixmap != None)
2547	XFreePixmap (disp, pixmap);	2585	XFreePixmap (dpy, pixmap);
2548		2586
2549	#if TINTING	2587	#if TINTING
2550	if (ISSET_PIXCOLOR (Color_tint))	2588	if (ISSET_PIXCOLOR (Color_tint))
2551	{	2589	{
2552	unsigned short rm, gm, bm;
2553	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2590	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554		2591
		2592	rgba c;
2555	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2593	pix_colors_focused [Color_tint].get (c);
2556		2594
2557	ShadeXImage (display, image, shade, rm, gm, bm);	2595	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558	}	2596	}
2559	#endif	2597	#endif
2560		2598
2561	pixmap = XCreatePixmap (disp, vt,	2599	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562	szHint.width, szHint.height, image->depth);
2563	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2600	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2564	XPutImage (disp, pixmap, gc, image, 0, 0,	2601	XPutImage (dpy, pixmap, gc, image, 0, 0,
2565	nx, ny, image->width, image->height);	2602	nx, ny, image->width, image->height);
2566	XFreeGC (disp, gc);	2603	XFreeGC (dpy, gc);
2567	XDestroyImage (image);	2604	XDestroyImage (image);
2568	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2605	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2569	XClearWindow (disp, parent[0]);	2606	XClearWindow (dpy, parent[0]);
2570		2607
2571	if (!am_transparent || !am_pixmap_trans)	2608	if (!am_transparent || !am_pixmap_trans)
2572	pchanged = 1;	2609	pchanged = 1;
2573		2610
2574	am_transparent = am_pixmap_trans = 1;	2611	am_transparent = am_pixmap_trans = 1;
2575	}	2612	}
2576	}	2613	}
2577		2614
2578	if (am_pixmap_trans)	2615	if (am_pixmap_trans)
2579	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2616	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2580	else	2617	else
2581	{	2618	{
2582	unsigned int n;	2619	unsigned int n;
2583	/*	2620	/*
2584	* InheritPixmap transparency	2621	* InheritPixmap transparency
2585	*/	2622	*/
2586	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2623	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587	{	2624	{
2588	oldp = parent[i];	2625	oldp = parent[i];
2589	XQueryTree (disp, parent[i - 1], &root,	2626	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2590	&parent[i], &list, &n);
2591	XFree (list);	2627	XFree (list);
2592		2628
2593	if (parent[i] == display->root)	2629	if (parent[i] == display->root)
2594	{	2630	{
2595	if (oldp != None)	2631	if (oldp != None)
…		…
2603	}	2639	}
2604		2640
2605	n = 0;	2641	n = 0;
2606		2642
2607	if (pchanged)	2643	if (pchanged)
2608	{
2609	for (; n < (unsigned int)i; n++)	2644	for (; n < (unsigned int)i; n++)
2610	{	2645	{
2611	XGetWindowAttributes (disp, parent[n], &wattr);	2646	XGetWindowAttributes (dpy, parent[n], &wattr);
		2647
2612	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2648	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2613	{	2649	{
2614	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2650	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615	break;	2651	break;
2616	}	2652	}
2617	}	2653	}
2618	}
2619		2654
2620	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2655	if (n > (sizeof (parent) / sizeof (parent[0])))
2621	{	2656	{
2622	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2657	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2623	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2658	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2624	am_transparent = 0;	2659	am_transparent = 0;
2625	/* XXX: also turn off Opt_transparent? */	2660	/* XXX: also turn off Opt_transparent? */
2626	}	2661	}
2627	else	2662	else
2628	{	2663	{
2629	#if WAIT_FOR_WM
2630	/* wait (an arbitrary period) for the WM to do its thing
2631	* needed for fvwm2.2.2 (and before?) */
2632	sleep (1);
2633	#endif
2634	for (n = 0; n < (unsigned int)i; n++)	2664	for (n = 0; n < (unsigned int)i; n++)
2635	{	2665	{
2636	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2666	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2637	XClearWindow (disp, parent[n]);	2667	XClearWindow (dpy, parent[n]);
2638	}	2668	}
2639		2669
2640	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2670	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2641	am_transparent = 1;	2671	am_transparent = 1;
2642	}	2672	}
2643		2673
2644	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2674	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645	parent[i] = None;	2675	parent[i] = None;
2646	}	2676	}
2647		2677
2648	if (scrollBar.win)	2678	if (scrollBar.win)
2649	{	2679	{
2650	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2680	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2651	scrollBar.setIdle ();	2681	scrollBar.setIdle ();
2652	scrollbar_show (0);	2682	scrollbar_show (0);
2653	}	2683	}
2654		2684
2655	if (am_transparent)	2685	if (am_transparent)
…		…
2718	if (ch == C0_LF)	2748	if (ch == C0_LF)
2719	nlines++;	2749	nlines++;
2720		2750
2721	refresh_count++;	2751	refresh_count++;
2722		2752
2723	if (!OPTION (Opt_jumpScroll)	2753	if (!option (Opt_jumpScroll)
2724	|| (refresh_count >= refresh_limit * (nrow - 1)))	2754	|| (refresh_count >= refresh_limit * (nrow - 1)))
2725	{	2755	{
2726	refreshnow = true;	2756	refreshnow = true;
2727	refresh_count = 0;	2757	refresh_count = 0;
2728	ch = NOCHAR;	2758	ch = NOCHAR;
…		…
2768	* the number of pages between refreshes is refresh_limit, which	2798	* the number of pages between refreshes is refresh_limit, which
2769	* is incremented here because we must be doing flat-out scrolling.	2799	* is incremented here because we must be doing flat-out scrolling.
2770	*/	2800	*/
2771	if (refreshnow)	2801	if (refreshnow)
2772	{	2802	{
2773	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2803	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774	refresh_limit++;	2804	refresh_limit++;
2775	else	2805	else
2776	{	2806	{
2777	flag = true;	2807	flag = true;
		2808	//TODO: due to popular request, implement "skipscroll" option here
2778	scr_refresh ();	2809	scr_refresh ();
2779	want_refresh = 1;	2810	want_refresh = 1;
2780	}	2811	}
2781	}	2812	}
2782		2813
…		…
3106	scr_charset_set (2, (unsigned int)cmd_getc ());	3137	scr_charset_set (2, (unsigned int)cmd_getc ());
3107	break;	3138	break;
3108	case '+':	3139	case '+':
3109	scr_charset_set (3, (unsigned int)cmd_getc ());	3140	scr_charset_set (3, (unsigned int)cmd_getc ());
3110	break;	3141	break;
3111	#if ENABLE_FRILLS	3142	#if !ENABLE_MINIMAL
3112	case '6':	3143	case '6':
3113	scr_backindex ();	3144	scr_backindex ();
3114	break;	3145	break;
3115	#endif	3146	#endif
3116	case '7':	3147	case '7':
3117	scr_cursor (SAVE);	3148	scr_cursor (SAVE);
3118	break;	3149	break;
3119	case '8':	3150	case '8':
3120	scr_cursor (RESTORE);	3151	scr_cursor (RESTORE);
3121	break;	3152	break;
3122	#if ENABLE_FRILLS	3153	#if !ENABLE_MINIMAL
3123	case '9':	3154	case '9':
3124	scr_forwardindex ();	3155	scr_forwardindex ();
3125	break;	3156	break;
3126	#endif	3157	#endif
3127	case '=':	3158	case '=':
…		…
3289	ndef = get_byte_array_bit (csi_defaults, i);	3320	ndef = get_byte_array_bit (csi_defaults, i);
3290	for (p = 0; p < nargs; p++)	3321	for (p = 0; p < nargs; p++)
3291	if (arg[p] == -1)	3322	if (arg[p] == -1)
3292	arg[p] = ndef;	3323	arg[p] = ndef;
3293		3324
3294	#ifdef DEBUG_CMD
3295	fprintf (stderr, "CSI ");
3296	for (p = 0; p < nargs; p++)
3297	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298	fprintf (stderr, "%c\n", ch);
3299	#endif
3300
3301	/*	3325	/*
3302	* private mode handling	3326	* private mode handling
3303	*/	3327	*/
3304	if (priv)	3328	if (priv)
3305	{	3329	{
3306	switch (priv)	3330	switch (priv)
3307	{	3331	{
3308	case '>':	3332	case '>':
3309	if (ch == CSI_DA) /* secondary device attributes */	3333	if (ch == CSI_DA) /* secondary device attributes */
3310	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	}
3311	break;	3344	break;
3312	case '?':	3345	case '?':
3313	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3346	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314	process_terminal_mode (ch, priv, nargs, arg);	3347	process_terminal_mode (ch, priv, nargs, arg);
3315	break;	3348	break;
…		…
3441	break;	3474	break;
3442	case 6: /* CPR requested */	3475	case 6: /* CPR requested */
3443	scr_report_position ();	3476	scr_report_position ();
3444	break;	3477	break;
3445	case 7: /* unofficial extension */	3478	case 7: /* unofficial extension */
3446	if (OPTION (Opt_insecure))	3479	if (option (Opt_insecure))
3447	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3480	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448	break;	3481	break;
3449	case 8: /* unofficial extension */	3482	case 8: /* unofficial extension */
3450	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3483	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451	break;	3484	break;
…		…
3518	break;	3551	break;
3519	case CSI_75:	3552	case CSI_75:
3520	scr_cursor (RESTORE);	3553	scr_cursor (RESTORE);
3521	break;	3554	break;
3522		3555
3523	#if ENABLE_FRILLS	3556	#if !ENABLE_MINIMAL
3524	case CSI_74:	3557	case CSI_74:
3525	process_window_ops (arg, nargs);	3558	process_window_ops (arg, nargs);
3526	break;	3559	break;
3527	#endif	3560	#endif
3528		3561
…		…
3535	break;	3568	break;
3536	}	3569	}
3537	}	3570	}
3538	/*}}} */	3571	/*}}} */
3539		3572
3540	#if ENABLE_FRILLS	3573	#if !ENABLE_MINIMAL
3541	/* ARGSUSED */	3574	/* ARGSUSED */
3542	void	3575	void
3543	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3576	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544	{	3577	{
3545	int x, y;	3578	int x, y;
3546	XWindowAttributes wattr;	3579	XWindowAttributes wattr;
3547	Window wdummy;	3580	Window wdummy;
3548	dDisp;	3581
		3582	dLocal (Display *, dpy);
3549		3583
3550	if (nargs == 0)	3584	if (nargs == 0)
3551	return;	3585	return;
3552		3586
3553	switch (args[0])	3587	switch (args[0])
3554	{	3588	{
3555	/*	3589	/*
3556	* commands	3590	* commands
3557	*/	3591	*/
3558	case 1: /* deiconify window */	3592	case 1: /* deiconify window */
3559	XMapWindow (disp, parent[0]);	3593	XMapWindow (dpy, parent[0]);
3560	break;	3594	break;
3561	case 2: /* iconify window */	3595	case 2: /* iconify window */
3562	XIconifyWindow (disp, parent[0], display->screen);	3596	XIconifyWindow (dpy, parent[0], display->screen);
3563	break;	3597	break;
3564	case 3: /* set position (pixels) */	3598	case 3: /* set position (pixels) */
3565	XMoveWindow (disp, parent[0], args[1], args[2]);	3599	XMoveWindow (dpy, parent[0], args[1], args[2]);
3566	break;	3600	break;
3567	case 4: /* set size (pixels) */	3601	case 4: /* set size (pixels) */
3568	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3602	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569	break;	3603	break;
3570	case 5: /* raise window */	3604	case 5: /* raise window */
3571	XRaiseWindow (disp, parent[0]);	3605	XRaiseWindow (dpy, parent[0]);
3572	break;	3606	break;
3573	case 6: /* lower window */	3607	case 6: /* lower window */
3574	XLowerWindow (disp, parent[0]);	3608	XLowerWindow (dpy, parent[0]);
3575	break;	3609	break;
3576	case 7: /* refresh window */	3610	case 7: /* refresh window */
3577	scr_touch (true);	3611	scr_touch (true);
3578	break;	3612	break;
3579	case 8: /* set size (chars) */	3613	case 8: /* set size (chars) */
…		…
3586	if (args[0] >= 24) /* set height (chars) */	3620	if (args[0] >= 24) /* set height (chars) */
3587	set_widthheight ((unsigned int)width,	3621	set_widthheight ((unsigned int)width,
3588	(unsigned int) (args[1] * fheight));	3622	(unsigned int) (args[1] * fheight));
3589	break;	3623	break;
3590		3624
3591
3592	/*	3625	/*
3593	* reports - some output format copied from XTerm	3626	* reports - some output format copied from XTerm
3594	*/	3627	*/
3595	case 11: /* report window state */	3628	case 11: /* report window state */
3596	XGetWindowAttributes (disp, parent[0], &wattr);	3629	XGetWindowAttributes (dpy, parent[0], &wattr);
3597	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3630	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598	break;	3631	break;
3599	case 13: /* report window position */	3632	case 13: /* report window position */
3600	XGetWindowAttributes (disp, parent[0], &wattr);	3633	XGetWindowAttributes (dpy, parent[0], &wattr);
3601	XTranslateCoordinates (disp, parent[0], wattr.root,	3634	XTranslateCoordinates (dpy, parent[0], wattr.root,
3602	-wattr.border_width, -wattr.border_width,	3635	-wattr.border_width, -wattr.border_width,
3603	&x, &y, &wdummy);	3636	&x, &y, &wdummy);
3604	tt_printf ("\033[3;%d;%dt", x, y);	3637	tt_printf ("\033[3;%d;%dt", x, y);
3605	break;	3638	break;
3606	case 14: /* report window size (pixels) */	3639	case 14: /* report window size (pixels) */
3607	XGetWindowAttributes (disp, parent[0], &wattr);	3640	XGetWindowAttributes (dpy, parent[0], &wattr);
3608	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3641	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609	break;	3642	break;
3610	case 18: /* report text area size (chars) */	3643	case 18: /* report text area size (chars) */
3611	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3644	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612	break;	3645	break;
…		…
3614	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3647	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615	break;	3648	break;
3616	case 20: /* report icon label */	3649	case 20: /* report icon label */
3617	{	3650	{
3618	char *s;	3651	char *s;
3619	XGetIconName (disp, parent[0], &s);	3652	XGetIconName (dpy, parent[0], &s);
3620	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 */
3621	XFree (s);	3654	XFree (s);
3622	}	3655	}
3623	break;	3656	break;
3624	case 21: /* report window title */	3657	case 21: /* report window title */
3625	{	3658	{
3626	char *s;	3659	char *s;
3627	XFetchName (disp, parent[0], &s);	3660	XFetchName (dpy, parent[0], &s);
3628	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 */
3629	XFree (s);	3662	XFree (s);
3630	}	3663	}
3631	break;	3664	break;
3632	}	3665	}
3633	}	3666	}
…		…
3660	seen_esc = true;	3693	seen_esc = true;
3661	continue;	3694	continue;
3662	}	3695	}
3663	else if (ch == C0_BEL || ch == CHAR_ST)	3696	else if (ch == C0_BEL || ch == CHAR_ST)
3664	break;	3697	break;
		3698	else if (ch == C0_SYN)
		3699	ch = cmd_get8 ();
3665	else if (ch < 0x20)	3700	else if (ch < 0x20)
3666	return NULL; /* other control character - exit */	3701	return NULL; /* other control character - exit */
3667		3702
3668	seen_esc = false;	3703	seen_esc = false;
3669		3704
3670	if (n >= STRING_MAX - 1)	3705	if (n >= STRING_MAX - 1)
3671	// stop at some sane length	3706	// stop at some sane length
3672	return NULL;	3707	return NULL;
3673		3708
3674	if (ch == C0_SYN)
3675	string[n++] = cmd_get8 ();
3676	else
3677	string[n++] = ch;	3709	string[n++] = ch;
3678	}	3710	}
3679		3711
3680	string[n++] = '\0';	3712	string[n++] = '\0';
3681		3713
3682	ends_how = (ch == 0x5c ? C0_ESC : ch);	3714	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3733	void	3765	void
3734	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)
3735	{	3767	{
3736	if (str[0] == '?' && !str[1])	3768	if (str[0] == '?' && !str[1])
3737	{	3769	{
3738	unsigned short r, g, b;	3770	rgba c;
3739	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
3740	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);
3741	}	3779	}
3742	else	3780	else
3743	set_window_color (color, str);	3781	set_window_color (color, str);
3744	}	3782	}
3745		3783
…		…
3751	{	3789	{
3752	int color;	3790	int color;
3753	char *buf, *name;	3791	char *buf, *name;
3754	bool query = str[0] == '?' && !str[1];	3792	bool query = str[0] == '?' && !str[1];
3755	int saveop = op;	3793	int saveop = op;
3756	dDisp;	3794
		3795	dLocal (Display *, dpy);
3757		3796
3758	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
3759	switch (op)	3802	switch (op)
3760	{	3803	{
3761	case XTerm_name:	3804	case XTerm_name:
3762	set_title (str);	3805	set_title (str);
3763	/* FALLTHROUGH */	3806	/* FALLTHROUGH */
…		…
3777	unsigned long bytes_after;	3820	unsigned long bytes_after;
3778	unsigned char *value = 0;	3821	unsigned char *value = 0;
3779	const char *str = "";	3822	const char *str = "";
3780		3823
3781	if (prop	3824	if (prop
3782	&& XGetWindowProperty (disp, parent[0],	3825	&& XGetWindowProperty (dpy, parent[0],
3783	prop, 0, 1<<16, 0, AnyPropertyType,	3826	prop, 0, 1<<16, 0, AnyPropertyType,
3784	&actual_type, &actual_format,	3827	&actual_type, &actual_format,
3785	&nitems, &bytes_after, &value) == Success	3828	&nitems, &bytes_after, &value) == Success
3786	&& actual_type != None	3829	&& actual_type != None
3787	&& actual_format == 8)	3830	&& actual_format == 8)
3788	str = (const char *)(value);	3831	str = (const char *)(value);
3789		3832
3790	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3833	tt_printf ("\033]%d;%s%c", op, str, resp);
3791		3834
3792	XFree (value);	3835	XFree (value);
3793	}	3836	}
3794	else	3837	else
3795	{	3838	{
…		…
3799	{	3842	{
3800	*eq = 0;	3843	*eq = 0;
3801	set_utf8_property (display->atom (str), eq + 1);	3844	set_utf8_property (display->atom (str), eq + 1);
3802	}	3845	}
3803	else	3846	else
3804	XDeleteProperty (disp, parent[0],	3847	XDeleteProperty (dpy, parent[0],
3805	display->atom (str));	3848	display->atom (str));
3806	}	3849	}
3807	break;	3850	break;
3808		3851
3809	case XTerm_Color:	3852	case XTerm_Color:
…		…
3819	break;	3862	break;
3820		3863
3821	if ((buf = strchr (name, ';')) != NULL)	3864	if ((buf = strchr (name, ';')) != NULL)
3822	*buf++ = '\0';	3865	*buf++ = '\0';
3823		3866
3824	if (name[0] == '?' && !name[1])	3867	process_color_seq (op, color, name, resp);
3825	{
3826	unsigned short r, g, b;
3827	pix_colors_focused[color].get (display, r, g, b);
3828	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829	}
3830	else
3831	set_window_color (color, name);
3832	}	3868	}
3833	break;	3869	break;
3834	case XTerm_Color00:	3870	case XTerm_Color00:
3835	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3871	process_color_seq (op, Color_fg, str, resp);
3836	break;	3872	break;
3837	case XTerm_Color01:	3873	case XTerm_Color01:
3838	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3874	process_color_seq (op, Color_bg, str, resp);
3839	break;	3875	break;
3840	#ifndef NO_CURSORCOLOR	3876	#ifndef NO_CURSORCOLOR
3841	case XTerm_Color_cursor:	3877	case XTerm_Color_cursor:
3842	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3878	process_color_seq (op, Color_cursor, str, resp);
3843	break;	3879	break;
3844	#endif	3880	#endif
3845	case XTerm_Color_pointer_fg:	3881	case XTerm_Color_pointer_fg:
3846	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3882	process_color_seq (op, Color_pointer_fg, str, resp);
3847	break;	3883	break;
3848	case XTerm_Color_pointer_bg:	3884	case XTerm_Color_pointer_bg:
3849	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3885	process_color_seq (op, Color_pointer_bg, str, resp);
3850	break;	3886	break;
3851	#ifndef NO_BOLD_UNDERLINE_REVERSE	3887	#ifndef NO_BOLD_UNDERLINE_REVERSE
3852	case XTerm_Color_RV:	3888	case XTerm_Color_RV:
3853	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3889	process_color_seq (op, Color_RV, str, resp);
3854	break;	3890	break;
3855	case Rxvt_Color_BD:	3891	case Rxvt_Color_BD:
3856	case URxvt_Color_BD:	3892	case URxvt_Color_BD:
3857	process_color_seq (op, Color_BD, str, resp);	3893	process_color_seq (op, Color_BD, str, resp);
3858	break;	3894	break;
3859	case Rxvt_Color_UL:	3895	case Rxvt_Color_UL:
3860	case URxvt_Color_UL:	3896	case URxvt_Color_UL:
3861	process_color_seq (op, Color_UL, str, resp);	3897	process_color_seq (op, Color_UL, str, resp);
3862	break;	3898	break;
3863	case URxvt_Color_IT:	3899	case URxvt_Color_IT:
3864	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3900	process_color_seq (op, Color_IT, str, resp);
3865	break;	3901	break;
3866	#endif	3902	#endif
3867	#if TRANSPARENT && TINTING	3903	#if TRANSPARENT && TINTING
3868	case URxvt_Color_tint:	3904	case URxvt_Color_tint:
3869	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3905	process_color_seq (op, Color_tint, str, resp);
		3906
3870	check_our_parents ();	3907	check_our_parents ();
		3908
3871	if (am_transparent)	3909	if (am_transparent)
3872	want_full_refresh = want_refresh = 1;	3910	want_full_refresh = want_refresh = 1;
		3911
3873	break;	3912	break;
3874	#endif	3913	#endif
3875		3914
3876	case Rxvt_Pixmap:	3915	case Rxvt_Pixmap:
3877	{	3916	{
…		…
3935	case URxvt_italicFont:	3974	case URxvt_italicFont:
3936	case URxvt_boldItalicFont:	3975	case URxvt_boldItalicFont:
3937	#endif	3976	#endif
3938	if (query)	3977	if (query)
3939	tt_printf ("\33]%d;%-.250s%c", saveop,	3978	tt_printf ("\33]%d;%-.250s%c", saveop,
3940	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3979	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941	? fontset[op - URxvt_font]->fontdesc : "",	3980	? fontset[op - URxvt_font]->fontdesc : "",
3942	resp);	3981	resp);
3943	else	3982	else
3944	{	3983	{
3945	const char *&res = rs[Rs_font + (op - URxvt_font)];	3984	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3948	allocated.push_back ((void *)res);	3987	allocated.push_back ((void *)res);
3949	set_fonts ();	3988	set_fonts ();
3950	}	3989	}
3951	break;	3990	break;
3952		3991
3953	#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
3954	case URxvt_locale:	4001	case URxvt_locale:
3955	if (query)	4002	if (query)
3956	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);
3957	else	4004	else
3958	{	4005	{
3959	set_locale (str);	4006	set_locale (str);
3960	pty->set_utf8_mode (enc_utf8);	4007	pty->set_utf8_mode (enc_utf8);
3961	init_xlocale ();	4008	init_xlocale ();
…		…
3976	break;	4023	break;
3977	#endif	4024	#endif
3978		4025
3979	#if ENABLE_PERL	4026	#if ENABLE_PERL
3980	case URxvt_perl:	4027	case URxvt_perl:
3981	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)))
3982	; // no responses yet	4029	; // no responses yet
3983	break;	4030	break;
3984	#endif	4031	#endif
3985	}	4032	}
3986	}	4033	}
…		…
4102	scr_touch (true);	4149	scr_touch (true);
4103	break;	4150	break;
4104	#endif	4151	#endif
4105	case 1048: /* alternative cursor save */	4152	case 1048: /* alternative cursor save */
4106	case 1049:	4153	case 1049:
4107	if (OPTION (Opt_secondaryScreen))	4154	if (option (Opt_secondaryScreen))
4108	if (mode == 0)	4155	if (mode == 0)
4109	scr_cursor (RESTORE);	4156	scr_cursor (RESTORE);
4110	else if (mode == 1)	4157	else if (mode == 1)
4111	scr_cursor (SAVE);	4158	scr_cursor (SAVE);
4112	break;	4159	break;
…		…
4177	break;	4224	break;
4178	case 1011: /* scroll to bottom on key press */	4225	case 1011: /* scroll to bottom on key press */
4179	set_option (Opt_scrollTtyKeypress, state);	4226	set_option (Opt_scrollTtyKeypress, state);
4180	break;	4227	break;
4181	case 1047: /* secondary screen w/ clearing last */	4228	case 1047: /* secondary screen w/ clearing last */
4182	if (OPTION (Opt_secondaryScreen))	4229	if (option (Opt_secondaryScreen))
4183	if (current_screen != PRIMARY)	4230	if (current_screen != PRIMARY)
4184	scr_erase_screen (2);	4231	scr_erase_screen (2);
4185	scr_change_screen (state);	4232	scr_change_screen (state);
4186	break;	4233	break;
4187	case 1049: /* secondary screen w/ clearing first */	4234	case 1049: /* secondary screen w/ clearing first */
4188	scr_change_screen (state);	4235	scr_change_screen (state);
4189	if (OPTION (Opt_secondaryScreen))	4236	if (option (Opt_secondaryScreen))
4190	if (current_screen != PRIMARY)	4237	if (current_screen != PRIMARY)
4191	scr_erase_screen (2);	4238	scr_erase_screen (2);
4192	break;	4239	break;
4193	default:	4240	default:
4194	break;	4241	break;
…		…
4322	scr_color (Color_bg, Color_bg);	4369	scr_color (Color_bg, Color_bg);
4323	break;	4370	break;
4324		4371
4325	//case 50: // not variable spacing	4372	//case 50: // not variable spacing
4326		4373
4327	#if ENABLE_FRILLS	4374	#if !ENABLE_MINIMAL
4328	case 90:	4375	case 90:
4329	case 91: /* set bright fg color */	4376	case 91: /* set bright fg color */
4330	case 92:	4377	case 92:
4331	case 93:	4378	case 93:
4332	case 94:	4379	case 94:

Diff Legend

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