[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.313 by root, Wed Jul 5 22:46:14 2006 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);
…		…
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
…		…
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 ();
…		…
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
…		…
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;
…		…
1493	break;	1468	break;
1494		1469
1495	case ConfigureNotify:	1470	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1497	{	1472	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1474	;
1500		1475
1501	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1502	{	1477	{
1503	seen_resize = 1;	1478	seen_resize = 1;
…		…
1512	#endif	1487	#endif
1513	}	1488	}
1514	break;	1489	break;
1515		1490
1516	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1519	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1520		1496
1521	break;	1497	break;
1522		1498
1523	case SelectionClear:	1499	case SelectionClear:
1524	selection_clear ();	1500	selection_clear ();
…		…
1560	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1561	{	1537	{
1562	do	1538	do
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1565	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566		1542
1567	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568		1544
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1572		1548
1573	want_refresh = 1;	1549	want_refresh = 1;
1574	}	1550	}
1575	else	1551	else
1576	{	1552	{
1577	XEvent unused_event;	1553	XEvent unused_event;
1578		1554
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580	;	1556	;
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582	;	1558	;
1583		1559
1584	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1585	{	1561	{
1586	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1587	scrollbar_show (0);	1563	scrollbar_show (0);
1588	}	1564	}
1589		1565
1590	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1591	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1592	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1593	#endif	1569	#endif
1594	}	1570	}
1595	break;	1571	break;
1596		1572
1597	case MotionNotify:	1573	case MotionNotify:
…		…
1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609	; // nop	1585	; // nop
1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1611	{	1587	{
1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613	;	1589	;
1614		1590
1615	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1616	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1617	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1618	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1619	&ev.xbutton.state);	1595	&ev.xbutton.state);
1620	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1684	#endif	1660	#endif
1685	}	1661	}
1686	}	1662	}
1687	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688	{	1664	{
1689	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690	MotionNotify, &ev))	1666	MotionNotify, &ev))
1691	;	1667	;
1692		1668
1693	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1694	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1695	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1696	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1697	&unused_mask);	1673	&unused_mask);
1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1702	scrollbar_show (1);	1678	scrollbar_show (1);
1703	}	1679	}
1704	break;	1680	break;
1705	}	1681	}
1706		1682
1707	skip_switch: ;
1708
1709	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1710	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711	{	1685	{
1712	if (hidden_cursor)	1686	if (hidden_cursor)
1713	{	1687	{
1714	hidden_cursor = 0;	1688	hidden_cursor = 0;
1715	want_refresh = 1;	1689	want_refresh = 1;
1716	}	1690	}
1717		1691
1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719	}	1693	}
1720	#endif	1694	#endif
1721		1695
1722	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1740	if (!focus)	1714	if (!focus)
1741	{	1715	{
1742	focus = 1;	1716	focus = 1;
1743	want_refresh = 1;	1717	want_refresh = 1;
1744		1718
1745	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746		1720
1747	#if USE_XIM	1721	#if USE_XIM
1748	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1749	{	1723	{
1750	IMSetStatusPosition ();	1724	IMSetPosition ();
1751	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1752	}	1726	}
1753	#endif	1727	#endif
1754	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1755	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1756	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757	#endif	1731	#endif
1758	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1759	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1760	{	1734	{
1761	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1799	pix_colors = pix_colors_unfocused;	1773	pix_colors = pix_colors_unfocused;
1800	scr_recolour ();	1774	scr_recolour ();
1801	}	1775	}
1802	#endif	1776	#endif
1803	}	1777	}
		1778	}
		1779
		1780	void
		1781	rxvt_term::update_fade_color (unsigned int idx)
		1782	{
		1783	#if OFF_FOCUS_FADING
		1784	if (rs[Rs_fade])
		1785	{
		1786	rgba c;
		1787	pix_colors [Color_fade].get (c);
		1788	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1789	}
		1790	#endif
1804	}	1791	}
1805		1792
1806	#if TRANSPARENT	1793	#if TRANSPARENT
1807	void	1794	void
1808	rxvt_term::rootwin_cb (XEvent &ev)	1795	rxvt_term::rootwin_cb (XEvent &ev)
…		…
1842	/*	1829	/*
1843	* VT window processing of button press	1830	* VT window processing of button press
1844	*/	1831	*/
1845	if (ev.window == vt)	1832	if (ev.window == vt)
1846	{	1833	{
		1834	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1835	return;
		1836
1847	#if ISO_14755	1837	#if ISO_14755
1848	// 5.4	1838	// 5.4
1849	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1839	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1850	{	1840	{
1851	iso14755_54 (ev.x, ev.y);	1841	iso14755_54 (ev.x, ev.y);
…		…
1893	else	1883	else
1894	{	1884	{
1895	if (ev.button != MEvent.button)	1885	if (ev.button != MEvent.button)
1896	MEvent.clicks = 0;	1886	MEvent.clicks = 0;
1897		1887
1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899	switch (ev.button)	1888	switch (ev.button)
1900	{	1889	{
1901	case Button1:	1890	case Button1:
1902	/* allow meta + click to select rectangular areas */	1891	/* allow meta + click to select rectangular areas */
1903	/* should be done in screen.C */	1892	/* should be done in screen.C */
1904	#if ENABLE_FRILLS	1893	#if ENABLE_FRILLS
1905	selection.rect = !!(ev.state & ModMetaMask);	1894	selection.rect = !!(ev.state & ModMetaMask);
1906	#else	1895	#else
1907	selection.rect = false;	1896	selection.rect = false;
1908	#endif	1897	#endif
1909		1898
1910	/* allow shift+left click to extend selection */	1899	/* allow shift+left click to extend selection */
1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1900	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912	{	1901	{
1913	if (MEvent.button == Button1 && clickintime)	1902	if (MEvent.button == Button1 && clickintime)
1914	selection_rotate (ev.x, ev.y);	1903	selection_rotate (ev.x, ev.y);
1915	else	1904	else
1916	selection_extend (ev.x, ev.y, 1);	1905	selection_extend (ev.x, ev.y, 1);
1917	}	1906	}
1918	else	1907	else
1919	{	1908	{
1920	if (MEvent.button == Button1 && clickintime)	1909	if (MEvent.button == Button1 && clickintime)
1921	MEvent.clicks++;	1910	MEvent.clicks++;
1922	else	1911	else
1923	MEvent.clicks = 1;	1912	MEvent.clicks = 1;
1924		1913
1925	selection_click (MEvent.clicks, ev.x, ev.y);	1914	selection_click (MEvent.clicks, ev.x, ev.y);
1926	}	1915	}
1927		1916
1928	MEvent.button = Button1;	1917	MEvent.button = Button1;
1929	break;	1918	break;
1930		1919
1931	case Button3:	1920	case Button3:
1932	if (MEvent.button == Button3 && clickintime)	1921	if (MEvent.button == Button3 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1922	selection_rotate (ev.x, ev.y);
1934	else	1923	else
1935	selection_extend (ev.x, ev.y, 1);	1924	selection_extend (ev.x, ev.y, 1);
1936		1925
1937	MEvent.button = Button3;	1926	MEvent.button = Button3;
1938	break;	1927	break;
1939	}	1928	}
1940	}	1929	}
1941		1930
1942	MEvent.time = ev.time;	1931	MEvent.time = ev.time;
1943	return;	1932	return;
1944	}	1933	}
1945		1934
…		…
2108	sel_scroll_ev.stop();	2097	sel_scroll_ev.stop();
2109	#endif	2098	#endif
2110		2099
2111	if (ev.window == vt)	2100	if (ev.window == vt)
2112	{	2101	{
		2102	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2103	return;
		2104
2113	#if ISO_14755	2105	#if ISO_14755
2114	// 5.4	2106	// 5.4
2115	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2107	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2116	return;	2108	return;
2117	#endif	2109	#endif
		2110
2118	if (reportmode)	2111	if (reportmode)
2119	{	2112	{
2120	/* mouse report from vt window */	2113	/* mouse report from vt window */
2121	/* don't report release of wheel "buttons" */	2114	/* don't report release of wheel "buttons" */
2122	if (ev.button >= 4)	2115	if (ev.button >= 4)
…		…
2146	if (priv_modes & PrivMode_mouse_report	2139	if (priv_modes & PrivMode_mouse_report
2147	&& bypass_keystate	2140	&& bypass_keystate
2148	&& ev.button == Button1 && MEvent.clicks <= 1)	2141	&& ev.button == Button1 && MEvent.clicks <= 1)
2149	selection_extend (ev.x, ev.y, 0);	2142	selection_extend (ev.x, ev.y, 0);
2150		2143
2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152	return;
2153
2154	switch (ev.button)	2144	switch (ev.button)
2155	{	2145	{
2156	case Button1:	2146	case Button1:
2157	case Button3:	2147	case Button3:
2158	selection_make (ev.time);	2148	selection_make (ev.time);
2159	break;	2149	break;
		2150
2160	case Button2:	2151	case Button2:
2161	selection_request (ev.time, ev.x, ev.y);	2152	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2162	break;	2154	break;
		2155
2163	#ifdef MOUSE_WHEEL	2156	#ifdef MOUSE_WHEEL
2164	case Button4:	2157	case Button4:
2165	case Button5:	2158	case Button5:
2166	{	2159	{
2167	int i;	2160	int i;
…		…
2207	#if TINTING	2200	#if TINTING
2208	/* taken from aterm-0.4.2 */	2201	/* taken from aterm-0.4.2 */
2209		2202
2210	typedef uint32_t RUINT32T;	2203	typedef uint32_t RUINT32T;
2211		2204
2212	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2205	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2213	{	2206	{
2214	int sh_r, sh_g, sh_b;	2207	int sh_r, sh_g, sh_b;
2215	RUINT32T mask_r, mask_g, mask_b;	2208	RUINT32T mask_r, mask_g, mask_b;
2216	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2209	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2217	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2210	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2211	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219	int i;	2212	int i;
2220		2213
2221	Visual *visual = display->visual;	2214	Visual *visual = term->visual;
2222		2215
2223	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2216	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2224		2217
2225	/* for convenience */	2218	/* for convenience */
2226	mask_r = visual->red_mask;	2219	mask_r = visual->red_mask;
…		…
2447	Atom atype;	2440	Atom atype;
2448	unsigned char *prop = NULL;	2441	unsigned char *prop = NULL;
2449	Window root, oldp, *list;	2442	Window root, oldp, *list;
2450	Pixmap rootpixmap = None;	2443	Pixmap rootpixmap = None;
2451	XWindowAttributes wattr, wrootattr;	2444	XWindowAttributes wattr, wrootattr;
2452	dDisp;
2453		2445
2454	pchanged = 0;	2446	pchanged = 0;
2455		2447
2456	if (!OPTION (Opt_transparent))	2448	if (!OPTION (Opt_transparent))
2457	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2458		2450
2459	XGetWindowAttributes (disp, display->root, &wrootattr);	2451	XGetWindowAttributes (dpy, display->root, &wrootattr);
2460	rootdepth = wrootattr.depth;	2452	rootdepth = wrootattr.depth;
2461		2453
2462	XGetWindowAttributes (disp, parent[0], &wattr);	2454	XGetWindowAttributes (dpy, parent[0], &wattr);
2463		2455
2464	if (rootdepth != wattr.depth)	2456	if (rootdepth != wattr.depth)
2465	{	2457	{
2466	if (am_transparent)	2458	if (am_transparent)
2467	{	2459	{
2468	pchanged = 1;	2460	pchanged = 1;
2469	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2461	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470	am_transparent = am_pixmap_trans = 0;	2462	am_transparent = am_pixmap_trans = 0;
2471	}	2463	}
2472		2464
2473	return pchanged; /* Don't try any more */	2465	return pchanged; /* Don't try any more */
2474	}	2466	}
2475		2467
2476	/* Get all X ops out of the queue so that our information is up-to-date. */	2468	/* Get all X ops out of the queue so that our information is up-to-date. */
2477	XSync (disp, False);	2469	XSync (dpy, False);
2478		2470
2479	/*	2471	/*
2480	* Make the frame window set by the window manager have	2472	* Make the frame window set by the window manager have
2481	* the root background. Some window managers put multiple nested frame	2473	* the root background. Some window managers put multiple nested frame
2482	* windows for each client, so we have to take care about that.	2474	* windows for each client, so we have to take care about that.
2483	*/	2475	*/
2484	i = (xa[XA_XROOTPMAP_ID]	2476	i = (xa[XA_XROOTPMAP_ID]
2485	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2477	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2478	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487	&nitems, &bytes_after, &prop) == Success);	2479	&nitems, &bytes_after, &prop) == Success);
2488		2480
2489	if (!i \|\| prop == NULL)	2481	if (!i \|\| prop == NULL)
2490	i = (xa[XA_ESETROOT_PMAP_ID]	2482	i = (xa[XA_ESETROOT_PMAP_ID]
2491	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2483	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493	&nitems, &bytes_after, &prop) == Success);	2485	&nitems, &bytes_after, &prop) == Success);
2494		2486
2495	if (!i \|\| prop == NULL	2487	if (!i \|\| prop == NULL
2496	#if TINTING	2488	#if TINTING
2497	\|\| !rs[Rs_color + Color_tint]	2489	\|\| !ISSET_PIXCOLOR (Color_tint)
2498	#endif	2490	#endif
2499	)	2491	)
2500	have_pixmap = 0;	2492	have_pixmap = 0;
2501	else	2493	else
2502	{	2494	{
…		…
2515	Window cr;	2507	Window cr;
2516	XImage *image;	2508	XImage *image;
2517	GC gc;	2509	GC gc;
2518	XGCValues gcvalue;	2510	XGCValues gcvalue;
2519		2511
2520	XTranslateCoordinates (disp, parent[0], display->root,	2512	XTranslateCoordinates (dpy, parent[0], display->root,
2521	0, 0, &sx, &sy, &cr);	2513	0, 0, &sx, &sy, &cr);
2522	nw = (unsigned int)szHint.width;	2514	nw = (unsigned int)szHint.width;
2523	nh = (unsigned int)szHint.height;	2515	nh = (unsigned int)szHint.height;
2524	nx = ny = 0;	2516	nx = ny = 0;
2525		2517
…		…
2538	}	2530	}
2539		2531
2540	min_it (nw, (unsigned int) (wrootattr.width - sx));	2532	min_it (nw, (unsigned int) (wrootattr.width - sx));
2541	min_it (nh, (unsigned int) (wrootattr.height - sy));	2533	min_it (nh, (unsigned int) (wrootattr.height - sy));
2542		2534
2543	XSync (disp, False);	2535	XSync (dpy, False);
2544	allowedxerror = -1;	2536	allowedxerror = -1;
2545	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2537	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546		2538
2547	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2539	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2548	/* XXX: may need a delay here? */	2540	/* XXX: may need a delay here? */
2549	allowedxerror = 0;	2541	allowedxerror = 0;
2550		2542
…		…
2553	if (am_transparent && am_pixmap_trans)	2545	if (am_transparent && am_pixmap_trans)
2554	{	2546	{
2555	pchanged = 1;	2547	pchanged = 1;
2556	if (pixmap != None)	2548	if (pixmap != None)
2557	{	2549	{
2558	XFreePixmap (disp, pixmap);	2550	XFreePixmap (dpy, pixmap);
2559	pixmap = None;	2551	pixmap = None;
2560	}	2552	}
2561	}	2553	}
2562		2554
2563	am_pixmap_trans = 0;	2555	am_pixmap_trans = 0;
2564	}	2556	}
2565	else	2557	else
2566	{	2558	{
2567	if (pixmap != None)	2559	if (pixmap != None)
2568	XFreePixmap (disp, pixmap);	2560	XFreePixmap (dpy, pixmap);
2569		2561
2570	#if TINTING	2562	#if TINTING
2571	if (ISSET_PIXCOLOR (Color_tint))	2563	if (ISSET_PIXCOLOR (Color_tint))
2572	{	2564	{
2573	unsigned short rm, gm, bm;
2574	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2565	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575		2566
		2567	rgba c;
2576	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2568	pix_colors_focused [Color_tint].get (c);
2577		2569
2578	ShadeXImage (display, image, shade, rm, gm, bm);	2570	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579	}	2571	}
2580	#endif	2572	#endif
2581		2573
2582	pixmap = XCreatePixmap (disp, vt,	2574	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583	szHint.width, szHint.height, image->depth);
2584	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2575	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2585	XPutImage (disp, pixmap, gc, image, 0, 0,	2576	XPutImage (dpy, pixmap, gc, image, 0, 0,
2586	nx, ny, image->width, image->height);	2577	nx, ny, image->width, image->height);
2587	XFreeGC (disp, gc);	2578	XFreeGC (dpy, gc);
2588	XDestroyImage (image);	2579	XDestroyImage (image);
2589	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2580	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2590	XClearWindow (disp, parent[0]);	2581	XClearWindow (dpy, parent[0]);
2591		2582
2592	if (!am_transparent \|\| !am_pixmap_trans)	2583	if (!am_transparent \|\| !am_pixmap_trans)
2593	pchanged = 1;	2584	pchanged = 1;
2594		2585
2595	am_transparent = am_pixmap_trans = 1;	2586	am_transparent = am_pixmap_trans = 1;
2596	}	2587	}
2597	}	2588	}
2598		2589
2599	if (am_pixmap_trans)	2590	if (am_pixmap_trans)
2600	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2591	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2601	else	2592	else
2602	{	2593	{
2603	unsigned int n;	2594	unsigned int n;
2604	/*	2595	/*
2605	* InheritPixmap transparency	2596	* InheritPixmap transparency
2606	*/	2597	*/
2607	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2598	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608	{	2599	{
2609	oldp = parent[i];	2600	oldp = parent[i];
2610	XQueryTree (disp, parent[i - 1], &root,	2601	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2611	&parent[i], &list, &n);
2612	XFree (list);	2602	XFree (list);
2613		2603
2614	if (parent[i] == display->root)	2604	if (parent[i] == display->root)
2615	{	2605	{
2616	if (oldp != None)	2606	if (oldp != None)
…		…
2624	}	2614	}
2625		2615
2626	n = 0;	2616	n = 0;
2627		2617
2628	if (pchanged)	2618	if (pchanged)
2629	{
2630	for (; n < (unsigned int)i; n++)	2619	for (; n < (unsigned int)i; n++)
2631	{	2620	{
2632	XGetWindowAttributes (disp, parent[n], &wattr);	2621	XGetWindowAttributes (dpy, parent[n], &wattr);
		2622
2633	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2623	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2634	{	2624	{
2635	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2625	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636	break;	2626	break;
2637	}	2627	}
2638	}	2628	}
2639	}
2640		2629
2641	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2630	if (n > (sizeof (parent) / sizeof (parent[0])))
2642	{	2631	{
2643	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2632	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2644	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2633	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2645	am_transparent = 0;	2634	am_transparent = 0;
2646	/* XXX: also turn off Opt_transparent? */	2635	/* XXX: also turn off Opt_transparent? */
2647	}	2636	}
2648	else	2637	else
2649	{	2638	{
2650	#if WAIT_FOR_WM
2651	/* wait (an arbitrary period) for the WM to do its thing
2652	* needed for fvwm2.2.2 (and before?) */
2653	sleep (1);
2654	#endif
2655	for (n = 0; n < (unsigned int)i; n++)	2639	for (n = 0; n < (unsigned int)i; n++)
2656	{	2640	{
2657	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2641	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2658	XClearWindow (disp, parent[n]);	2642	XClearWindow (dpy, parent[n]);
2659	}	2643	}
2660		2644
2661	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2645	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2662	am_transparent = 1;	2646	am_transparent = 1;
2663	}	2647	}
2664		2648
2665	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2649	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666	parent[i] = None;	2650	parent[i] = None;
2667	}	2651	}
2668		2652
2669	if (scrollBar.win)	2653	if (scrollBar.win)
2670	{	2654	{
2671	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2655	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2672	scrollBar.setIdle ();	2656	scrollBar.setIdle ();
2673	scrollbar_show (0);	2657	scrollbar_show (0);
2674	}	2658	}
2675		2659
2676	if (am_transparent)	2660	if (am_transparent)
…		…
2794	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2778	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795	refresh_limit++;	2779	refresh_limit++;
2796	else	2780	else
2797	{	2781	{
2798	flag = true;	2782	flag = true;
		2783	//TODO: due to popular request, implement "skipscroll" option here
2799	scr_refresh ();	2784	scr_refresh ();
2800	want_refresh = 1;	2785	want_refresh = 1;
2801	}	2786	}
2802	}	2787	}
2803		2788
…		…
2822	return flag;	2807	return flag;
2823	}	2808	}
2824		2809
2825	// read the next character	2810	// read the next character
2826	wchar_t	2811	wchar_t
2827	rxvt_term::next_char ()	2812	rxvt_term::next_char () NOTHROW
2828	{	2813	{
2829	while (cmdbuf_ptr < cmdbuf_endp)	2814	while (cmdbuf_ptr < cmdbuf_endp)
2830	{	2815	{
2831	// assume 7-bit to be ascii ALWAYS	2816	// assume 7-bit to be ascii ALWAYS
2832	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2817	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2853	return NOCHAR;	2838	return NOCHAR;
2854	}	2839	}
2855		2840
2856	// read the next octet	2841	// read the next octet
2857	uint32_t	2842	uint32_t
2858	rxvt_term::next_octet ()	2843	rxvt_term::next_octet () NOTHROW
2859	{	2844	{
2860	return cmdbuf_ptr < cmdbuf_endp	2845	return cmdbuf_ptr < cmdbuf_endp
2861	? (unsigned char)*cmdbuf_ptr++	2846	? (unsigned char)*cmdbuf_ptr++
2862	: NOCHAR;	2847	: NOCHAR;
2863	}	2848	}
		2849
		2850	static class out_of_input out_of_input;
2864		2851
2865	/* rxvt_cmd_getc () - Return next input character */	2852	/* rxvt_cmd_getc () - Return next input character */
2866	/*	2853	/*
2867	* Return the next input character after first passing any keyboard input	2854	* Return the next input character after first passing any keyboard input
2868	* to the command.	2855	* to the command.
2869	*/	2856	*/
2870	wchar_t	2857	wchar_t
2871	rxvt_term::cmd_getc ()	2858	rxvt_term::cmd_getc () THROW ((class out_of_input))
2872	{	2859	{
2873	wchar_t c = next_char ();	2860	wchar_t c = next_char ();
2874		2861
2875	if (c == NOCHAR)	2862	if (c == NOCHAR)
2876	throw out_of_input;	2863	throw out_of_input;
2877		2864
2878	return c;	2865	return c;
2879	}	2866	}
2880		2867
2881	uint32_t	2868	uint32_t
2882	rxvt_term::cmd_get8 ()	2869	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883	{	2870	{
2884	uint32_t c = next_octet ();	2871	uint32_t c = next_octet ();
2885		2872
2886	if (c == NOCHAR)	2873	if (c == NOCHAR)
2887	throw out_of_input;	2874	throw out_of_input;
…		…
3125	scr_charset_set (2, (unsigned int)cmd_getc ());	3112	scr_charset_set (2, (unsigned int)cmd_getc ());
3126	break;	3113	break;
3127	case '+':	3114	case '+':
3128	scr_charset_set (3, (unsigned int)cmd_getc ());	3115	scr_charset_set (3, (unsigned int)cmd_getc ());
3129	break;	3116	break;
3130	#if ENABLE_FRILLS	3117	#if !ENABLE_MINIMAL
3131	case '6':	3118	case '6':
3132	scr_backindex ();	3119	scr_backindex ();
3133	break;	3120	break;
3134	#endif	3121	#endif
3135	case '7':	3122	case '7':
3136	scr_cursor (SAVE);	3123	scr_cursor (SAVE);
3137	break;	3124	break;
3138	case '8':	3125	case '8':
3139	scr_cursor (RESTORE);	3126	scr_cursor (RESTORE);
3140	break;	3127	break;
3141	#if ENABLE_FRILLS	3128	#if !ENABLE_MINIMAL
3142	case '9':	3129	case '9':
3143	scr_forwardindex ();	3130	scr_forwardindex ();
3144	break;	3131	break;
3145	#endif	3132	#endif
3146	case '=':	3133	case '=':
…		…
3308	ndef = get_byte_array_bit (csi_defaults, i);	3295	ndef = get_byte_array_bit (csi_defaults, i);
3309	for (p = 0; p < nargs; p++)	3296	for (p = 0; p < nargs; p++)
3310	if (arg[p] == -1)	3297	if (arg[p] == -1)
3311	arg[p] = ndef;	3298	arg[p] = ndef;
3312		3299
3313	#ifdef DEBUG_CMD
3314	fprintf (stderr, "CSI ");
3315	for (p = 0; p < nargs; p++)
3316	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317	fprintf (stderr, "%c\n", ch);
3318	#endif
3319
3320	/*	3300	/*
3321	* private mode handling	3301	* private mode handling
3322	*/	3302	*/
3323	if (priv)	3303	if (priv)
3324	{	3304	{
3325	switch (priv)	3305	switch (priv)
3326	{	3306	{
3327	case '>':	3307	case '>':
3328	if (ch == CSI_DA) /* secondary device attributes */	3308	if (ch == CSI_DA) /* secondary device attributes */
3329	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3309	{
		3310	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3311	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3312	//
		3313	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3314	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3315	// that we do not support xterm mouse reporting (should be 95 when we do).
		3316	//
		3317	tt_printf ("\033[>%d;94;0c", 'U');
		3318	}
3330	break;	3319	break;
3331	case '?':	3320	case '?':
3332	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3321	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3333	process_terminal_mode (ch, priv, nargs, arg);	3322	process_terminal_mode (ch, priv, nargs, arg);
3334	break;	3323	break;
…		…
3537	break;	3526	break;
3538	case CSI_75:	3527	case CSI_75:
3539	scr_cursor (RESTORE);	3528	scr_cursor (RESTORE);
3540	break;	3529	break;
3541		3530
3542	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3543	case CSI_74:	3532	case CSI_74:
3544	process_window_ops (arg, nargs);	3533	process_window_ops (arg, nargs);
3545	break;	3534	break;
3546	#endif	3535	#endif
3547		3536
…		…
3554	break;	3543	break;
3555	}	3544	}
3556	}	3545	}
3557	/}}} /	3546	/}}} /
3558		3547
3559	#if ENABLE_FRILLS	3548	#if !ENABLE_MINIMAL
3560	/* ARGSUSED */	3549	/* ARGSUSED */
3561	void	3550	void
3562	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3551	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563	{	3552	{
3564	int x, y;	3553	int x, y;
3565	XWindowAttributes wattr;	3554	XWindowAttributes wattr;
3566	Window wdummy;	3555	Window wdummy;
3567	dDisp;	3556
		3557	dLocal (Display *, dpy);
3568		3558
3569	if (nargs == 0)	3559	if (nargs == 0)
3570	return;	3560	return;
3571		3561
3572	switch (args[0])	3562	switch (args[0])
3573	{	3563	{
3574	/*	3564	/*
3575	* commands	3565	* commands
3576	*/	3566	*/
3577	case 1: /* deiconify window */	3567	case 1: /* deiconify window */
3578	XMapWindow (disp, parent[0]);	3568	XMapWindow (dpy, parent[0]);
3579	break;	3569	break;
3580	case 2: /* iconify window */	3570	case 2: /* iconify window */
3581	XIconifyWindow (disp, parent[0], display->screen);	3571	XIconifyWindow (dpy, parent[0], display->screen);
3582	break;	3572	break;
3583	case 3: /* set position (pixels) */	3573	case 3: /* set position (pixels) */
3584	XMoveWindow (disp, parent[0], args[1], args[2]);	3574	XMoveWindow (dpy, parent[0], args[1], args[2]);
3585	break;	3575	break;
3586	case 4: /* set size (pixels) */	3576	case 4: /* set size (pixels) */
3587	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3577	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588	break;	3578	break;
3589	case 5: /* raise window */	3579	case 5: /* raise window */
3590	XRaiseWindow (disp, parent[0]);	3580	XRaiseWindow (dpy, parent[0]);
3591	break;	3581	break;
3592	case 6: /* lower window */	3582	case 6: /* lower window */
3593	XLowerWindow (disp, parent[0]);	3583	XLowerWindow (dpy, parent[0]);
3594	break;	3584	break;
3595	case 7: /* refresh window */	3585	case 7: /* refresh window */
3596	scr_touch (true);	3586	scr_touch (true);
3597	break;	3587	break;
3598	case 8: /* set size (chars) */	3588	case 8: /* set size (chars) */
…		…
3605	if (args[0] >= 24) /* set height (chars) */	3595	if (args[0] >= 24) /* set height (chars) */
3606	set_widthheight ((unsigned int)width,	3596	set_widthheight ((unsigned int)width,
3607	(unsigned int) (args[1] * fheight));	3597	(unsigned int) (args[1] * fheight));
3608	break;	3598	break;
3609		3599
3610
3611	/*	3600	/*
3612	* reports - some output format copied from XTerm	3601	* reports - some output format copied from XTerm
3613	*/	3602	*/
3614	case 11: /* report window state */	3603	case 11: /* report window state */
3615	XGetWindowAttributes (disp, parent[0], &wattr);	3604	XGetWindowAttributes (dpy, parent[0], &wattr);
3616	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3605	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617	break;	3606	break;
3618	case 13: /* report window position */	3607	case 13: /* report window position */
3619	XGetWindowAttributes (disp, parent[0], &wattr);	3608	XGetWindowAttributes (dpy, parent[0], &wattr);
3620	XTranslateCoordinates (disp, parent[0], wattr.root,	3609	XTranslateCoordinates (dpy, parent[0], wattr.root,
3621	-wattr.border_width, -wattr.border_width,	3610	-wattr.border_width, -wattr.border_width,
3622	&x, &y, &wdummy);	3611	&x, &y, &wdummy);
3623	tt_printf ("\033[3;%d;%dt", x, y);	3612	tt_printf ("\033[3;%d;%dt", x, y);
3624	break;	3613	break;
3625	case 14: /* report window size (pixels) */	3614	case 14: /* report window size (pixels) */
3626	XGetWindowAttributes (disp, parent[0], &wattr);	3615	XGetWindowAttributes (dpy, parent[0], &wattr);
3627	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3616	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628	break;	3617	break;
3629	case 18: /* report text area size (chars) */	3618	case 18: /* report text area size (chars) */
3630	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3619	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631	break;	3620	break;
…		…
3633	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3622	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634	break;	3623	break;
3635	case 20: /* report icon label */	3624	case 20: /* report icon label */
3636	{	3625	{
3637	char *s;	3626	char *s;
3638	XGetIconName (disp, parent[0], &s);	3627	XGetIconName (dpy, parent[0], &s);
3639	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3628	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3640	XFree (s);	3629	XFree (s);
3641	}	3630	}
3642	break;	3631	break;
3643	case 21: /* report window title */	3632	case 21: /* report window title */
3644	{	3633	{
3645	char *s;	3634	char *s;
3646	XFetchName (disp, parent[0], &s);	3635	XFetchName (dpy, parent[0], &s);
3647	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3636	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648	XFree (s);	3637	XFree (s);
3649	}	3638	}
3650	break;	3639	break;
3651	}	3640	}
…		…
3752	void	3741	void
3753	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3742	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3754	{	3743	{
3755	if (str[0] == '?' && !str[1])	3744	if (str[0] == '?' && !str[1])
3756	{	3745	{
3757	unsigned short r, g, b;	3746	rgba c;
3758	pix_colors_focused[color].get (display, r, g, b);	3747	pix_colors_focused[color].get (c);
		3748
		3749	#if XFT
		3750	if (c.a != rgba::MAX_CC)
		3751	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3752	else
		3753	#endif
3759	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3754	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3760	}	3755	}
3761	else	3756	else
3762	set_window_color (color, str);	3757	set_window_color (color, str);
3763	}	3758	}
3764		3759
…		…
3766	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3761	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3767	*/	3762	*/
3768	void	3763	void
3769	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3764	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3770	{	3765	{
3771	int changed = 0;
3772	int color;	3766	int color;
3773	char buf, name;	3767	char buf, name;
3774	bool query = str[0] == '?' && !str[1];	3768	bool query = str[0] == '?' && !str[1];
3775	int saveop = op;	3769	int saveop = op;
3776	dDisp;	3770
		3771	dLocal (Display *, dpy);
3777		3772
3778	assert (str != NULL);	3773	assert (str != NULL);
		3774
		3775	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3776	return;
		3777
3779	switch (op)	3778	switch (op)
3780	{	3779	{
3781	case XTerm_name:	3780	case XTerm_name:
3782	set_title (str);	3781	set_title (str);
3783	/* FALLTHROUGH */	3782	/* FALLTHROUGH */
…		…
3797	unsigned long bytes_after;	3796	unsigned long bytes_after;
3798	unsigned char *value = 0;	3797	unsigned char *value = 0;
3799	const char *str = "";	3798	const char *str = "";
3800		3799
3801	if (prop	3800	if (prop
3802	&& XGetWindowProperty (disp, parent[0],	3801	&& XGetWindowProperty (dpy, parent[0],
3803	prop, 0, 1<<16, 0, AnyPropertyType,	3802	prop, 0, 1<<16, 0, AnyPropertyType,
3804	&actual_type, &actual_format,	3803	&actual_type, &actual_format,
3805	&nitems, &bytes_after, &value) == Success	3804	&nitems, &bytes_after, &value) == Success
3806	&& actual_type != None	3805	&& actual_type != None
3807	&& actual_format == 8)	3806	&& actual_format == 8)
3808	str = (const char *)(value);	3807	str = (const char *)(value);
3809		3808
3810	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3809	tt_printf ("\033]%d;%s%c", op, str, resp);
3811		3810
3812	XFree (value);	3811	XFree (value);
3813	}	3812	}
3814	else	3813	else
3815	{	3814	{
…		…
3819	{	3818	{
3820	*eq = 0;	3819	*eq = 0;
3821	set_utf8_property (display->atom (str), eq + 1);	3820	set_utf8_property (display->atom (str), eq + 1);
3822	}	3821	}
3823	else	3822	else
3824	XDeleteProperty (disp, parent[0],	3823	XDeleteProperty (dpy, parent[0],
3825	display->atom (str));	3824	display->atom (str));
3826	}	3825	}
3827	break;	3826	break;
3828		3827
3829	case XTerm_Color:	3828	case XTerm_Color:
…		…
3839	break;	3838	break;
3840		3839
3841	if ((buf = strchr (name, ';')) != NULL)	3840	if ((buf = strchr (name, ';')) != NULL)
3842	*buf++ = '\0';	3841	*buf++ = '\0';
3843		3842
3844	if (name[0] == '?' && !name[1])	3843	process_color_seq (op, color, name, resp);
3845	{
3846	unsigned short r, g, b;
3847	pix_colors_focused[color].get (display, r, g, b);
3848	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3849	}
3850	else
3851	set_window_color (color, name);
3852	}	3844	}
3853	break;	3845	break;
3854	case XTerm_Color00:	3846	case XTerm_Color00:
3855	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3847	process_color_seq (op, Color_fg, str, resp);
3856	break;	3848	break;
3857	case XTerm_Color01:	3849	case XTerm_Color01:
3858	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3850	process_color_seq (op, Color_bg, str, resp);
3859	break;	3851	break;
3860	#ifndef NO_CURSORCOLOR	3852	#ifndef NO_CURSORCOLOR
3861	case XTerm_Color_cursor:	3853	case XTerm_Color_cursor:
3862	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3854	process_color_seq (op, Color_cursor, str, resp);
3863	break;	3855	break;
3864	#endif	3856	#endif
3865	case XTerm_Color_pointer_fg:	3857	case XTerm_Color_pointer_fg:
3866	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3858	process_color_seq (op, Color_pointer_fg, str, resp);
3867	break;	3859	break;
3868	case XTerm_Color_pointer_bg:	3860	case XTerm_Color_pointer_bg:
3869	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3861	process_color_seq (op, Color_pointer_bg, str, resp);
3870	break;	3862	break;
3871	#ifndef NO_BOLD_UNDERLINE_REVERSE	3863	#ifndef NO_BOLD_UNDERLINE_REVERSE
3872	case XTerm_Color_RV:	3864	case XTerm_Color_RV:
3873	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3865	process_color_seq (op, Color_RV, str, resp);
3874	break;	3866	break;
3875	case Rxvt_Color_BD:	3867	case Rxvt_Color_BD:
3876	case URxvt_Color_BD:	3868	case URxvt_Color_BD:
3877	process_color_seq (op, Color_BD, str, resp);	3869	process_color_seq (op, Color_BD, str, resp);
3878	break;	3870	break;
3879	case Rxvt_Color_UL:	3871	case Rxvt_Color_UL:
3880	case URxvt_Color_UL:	3872	case URxvt_Color_UL:
3881	process_color_seq (op, Color_UL, str, resp);	3873	process_color_seq (op, Color_UL, str, resp);
3882	break;	3874	break;
3883	case URxvt_Color_IT:	3875	case URxvt_Color_IT:
3884	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3876	process_color_seq (op, Color_IT, str, resp);
3885	break;	3877	break;
3886	#endif	3878	#endif
3887	#if TRANSPARENT && TINTING	3879	#if TRANSPARENT && TINTING
3888	case URxvt_Color_tint:	3880	case URxvt_Color_tint:
3889	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3881	process_color_seq (op, Color_tint, str, resp);
		3882
3890	check_our_parents ();	3883	check_our_parents ();
		3884
3891	if (am_transparent)	3885	if (am_transparent)
3892	want_full_refresh = want_refresh = 1;	3886	want_full_refresh = want_refresh = 1;
		3887
3893	break;	3888	break;
3894	#endif	3889	#endif
3895		3890
3896	case Rxvt_Pixmap:	3891	case Rxvt_Pixmap:
		3892	{
3897	if (*str != ';')	3893	if (*str != ';')
3898	{	3894	{
3899	#if XPM_BACKGROUND	3895	#if XPM_BACKGROUND
3900	scale_pixmap (""); /* reset to default scaling */	3896	scale_pixmap (""); /* reset to default scaling */
3901	set_bgPixmap (str); /* change pixmap */	3897	set_bgPixmap (str); /* change pixmap */
3902	scr_touch (true);	3898	scr_touch (true);
3903	#endif	3899	#endif
3904	}	3900	}
3905		3901
		3902	int changed = 0;
		3903
3906	while ((str = strchr (str, ';')) != NULL)	3904	while ((str = strchr (str, ';')) != NULL)
3907	{	3905	{
3908	str++;	3906	str++;
3909	#if XPM_BACKGROUND	3907	#if XPM_BACKGROUND
3910	changed += scale_pixmap (str);	3908	changed += scale_pixmap (str);
3911	#endif	3909	#endif
3912	}	3910	}
3913		3911
3914	if (changed)	3912	if (changed)
3915	{	3913	{
3916	#ifdef XPM_BACKGROUND	3914	#ifdef XPM_BACKGROUND
3917	resize_pixmap ();	3915	resize_pixmap ();
3918	scr_touch (true);	3916	scr_touch (true);
3919	#endif	3917	#endif
3920	}	3918	}
		3919	}
3921	break;	3920	break;
3922		3921
3923	case Rxvt_restoreFG:	3922	case Rxvt_restoreFG:
3924	set_window_color (Color_fg, str);	3923	set_window_color (Color_fg, str);
3925	break;	3924	break;
…		…
3964	allocated.push_back ((void *)res);	3963	allocated.push_back ((void *)res);
3965	set_fonts ();	3964	set_fonts ();
3966	}	3965	}
3967	break;	3966	break;
3968		3967
3969	#if ENABLE_FRILLS	3968	case URxvt_version:
		3969	if (query)
		3970	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3971	op,
		3972	rs[Rs_name], VERSION[0], VERSION[2],
		3973	resp);
		3974	break;
		3975
		3976	#if !ENABLE_MINIMAL
3970	case URxvt_locale:	3977	case URxvt_locale:
3971	if (query)	3978	if (query)
3972	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3979	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3973	else	3980	else
3974	{	3981	{
3975	set_locale (str);	3982	set_locale (str);
3976	pty->set_utf8_mode (enc_utf8);	3983	pty->set_utf8_mode (enc_utf8);
3977	init_xlocale ();	3984	init_xlocale ();
…		…
3992	break;	3999	break;
3993	#endif	4000	#endif
3994		4001
3995	#if ENABLE_PERL	4002	#if ENABLE_PERL
3996	case URxvt_perl:	4003	case URxvt_perl:
3997	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4004	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3998	; // no responses yet	4005	; // no responses yet
3999	break;	4006	break;
4000	#endif	4007	#endif
4001	}	4008	}
4002	}	4009	}
…		…
4034	return state;	4041	return state;
4035	}	4042	}
4036		4043
4037	/* we're not using priv _yet_ */	4044	/* we're not using priv _yet_ */
4038	void	4045	void
4039	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4046	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4040	{	4047	{
4041	unsigned int i, j;	4048	unsigned int i, j;
4042	int state;	4049	int state;
4043		4050
4044	static const struct	4051	static const struct
…		…
4338	scr_color (Color_bg, Color_bg);	4345	scr_color (Color_bg, Color_bg);
4339	break;	4346	break;
4340		4347
4341	//case 50: // not variable spacing	4348	//case 50: // not variable spacing
4342		4349
4343	#if ENABLE_FRILLS	4350	#if !ENABLE_MINIMAL
4344	case 90:	4351	case 90:
4345	case 91: /* set bright fg color */	4352	case 91: /* set bright fg color */
4346	case 92:	4353	case 92:
4347	case 93:	4354	case 93:
4348	case 94:	4355	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.270 by root, Wed Jan 18 10:31:37 2006 UTC vs. Revision 1.313 by root, Wed Jul 5 22:46:14 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.313 by root, Wed Jul 5 22:46:14 2006 UTC