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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.306 by root, Mon Feb 6 05:40:15 2006 UTC

…		…
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
…		…
1137		1214
1138	memmove (cmdbuf_base, cmdbuf_ptr, n);	1215	memmove (cmdbuf_base, cmdbuf_ptr, n);
1139	cmdbuf_ptr = cmdbuf_base;	1216	cmdbuf_ptr = cmdbuf_base;
1140	cmdbuf_endp = cmdbuf_ptr + n;	1217	cmdbuf_endp = cmdbuf_ptr + n;
1141		1218
1142	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1219	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143		1220
1144	if (r > 0)	1221	if (r > 0)
1145	{	1222	{
1146	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1147	return true;	1224	return true;
1148	}	1225	}
1149	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1150	{	1227	{
1151	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1152	if (display->is_local)	1229	if (display->is_local)
1153	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1154	#endif	1231	#endif
1155	}	1232	}
1156	else	1233	else
1157	{	1234	{
1158	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
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;
1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505	}	1480	}
1506		1481
		1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1483
1507	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508	if (OPTION (Opt_transparent))	1485	if (OPTION (Opt_transparent))
1509	check_our_parents ();	1486	check_our_parents ();
1510	#endif	1487	#endif
1511	}	1488	}
1512	break;	1489	break;
1513		1490
1514	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1517	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1518		1496
1519	break;	1497	break;
1520		1498
1521	case SelectionClear:	1499	case SelectionClear:
1522	selection_clear ();	1500	selection_clear ();
…		…
1558	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1559	{	1537	{
1560	do	1538	do
1561	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1562	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1563	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1564		1542
1565	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566		1544
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1570		1548
1571	want_refresh = 1;	1549	want_refresh = 1;
1572	}	1550	}
1573	else	1551	else
1574	{	1552	{
1575	XEvent unused_event;	1553	XEvent unused_event;
1576		1554
1577	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1578	;	1556	;
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1580	;	1558	;
1581		1559
1582	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1583	{	1561	{
1584	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1585	scrollbar_show (0);	1563	scrollbar_show (0);
1586	}	1564	}
1587		1565
1588	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1589	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1590	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1591	#endif	1569	#endif
1592	}	1570	}
1593	break;	1571	break;
1594		1572
1595	case MotionNotify:	1573	case MotionNotify:
…		…
1605	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607	; // nop	1585	; // nop
1608	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1609	{	1587	{
1610	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1611	;	1589	;
1612		1590
1613	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1614	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1615	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1616	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1617	&ev.xbutton.state);	1595	&ev.xbutton.state);
1618	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1682	#endif	1660	#endif
1683	}	1661	}
1684	}	1662	}
1685	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686	{	1664	{
1687	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1688	MotionNotify, &ev))	1666	MotionNotify, &ev))
1689	;	1667	;
1690		1668
1691	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1692	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1693	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1694	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1695	&unused_mask);	1673	&unused_mask);
1696	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1700	scrollbar_show (1);	1678	scrollbar_show (1);
1701	}	1679	}
1702	break;	1680	break;
1703	}	1681	}
1704		1682
1705	skip_switch: ;
1706
1707	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1708	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709	{	1685	{
1710	if (hidden_cursor)	1686	if (hidden_cursor)
1711	{	1687	{
1712	hidden_cursor = 0;	1688	hidden_cursor = 0;
1713	want_refresh = 1;	1689	want_refresh = 1;
1714	}	1690	}
1715		1691
1716	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717	}	1693	}
1718	#endif	1694	#endif
1719		1695
1720	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1721	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1749	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1750	}	1726	}
1751	#endif	1727	#endif
1752	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1753	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1754	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755	#endif	1731	#endif
1756	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1757	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1758	{	1734	{
1759	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1840	/*	1816	/*
1841	* VT window processing of button press	1817	* VT window processing of button press
1842	*/	1818	*/
1843	if (ev.window == vt)	1819	if (ev.window == vt)
1844	{	1820	{
		1821	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1822	return;
		1823
1845	#if ISO_14755	1824	#if ISO_14755
1846	// 5.4	1825	// 5.4
1847	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1826	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1848	{	1827	{
1849	iso14755_54 (ev.x, ev.y);	1828	iso14755_54 (ev.x, ev.y);
…		…
1891	else	1870	else
1892	{	1871	{
1893	if (ev.button != MEvent.button)	1872	if (ev.button != MEvent.button)
1894	MEvent.clicks = 0;	1873	MEvent.clicks = 0;
1895		1874
1896	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897	switch (ev.button)	1875	switch (ev.button)
1898	{	1876	{
1899	case Button1:	1877	case Button1:
1900	/* allow meta + click to select rectangular areas */	1878	/* allow meta + click to select rectangular areas */
1901	/* should be done in screen.C */	1879	/* should be done in screen.C */
1902	#if ENABLE_FRILLS	1880	#if ENABLE_FRILLS
1903	selection.rect = !!(ev.state & ModMetaMask);	1881	selection.rect = !!(ev.state & ModMetaMask);
1904	#else	1882	#else
1905	selection.rect = false;	1883	selection.rect = false;
1906	#endif	1884	#endif
1907		1885
1908	/* allow shift+left click to extend selection */	1886	/* allow shift+left click to extend selection */
1909	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910	{	1888	{
1911	if (MEvent.button == Button1 && clickintime)	1889	if (MEvent.button == Button1 && clickintime)
1912	selection_rotate (ev.x, ev.y);	1890	selection_rotate (ev.x, ev.y);
1913	else	1891	else
1914	selection_extend (ev.x, ev.y, 1);	1892	selection_extend (ev.x, ev.y, 1);
1915	}	1893	}
1916	else	1894	else
1917	{	1895	{
1918	if (MEvent.button == Button1 && clickintime)	1896	if (MEvent.button == Button1 && clickintime)
1919	MEvent.clicks++;	1897	MEvent.clicks++;
1920	else	1898	else
1921	MEvent.clicks = 1;	1899	MEvent.clicks = 1;
1922		1900
1923	selection_click (MEvent.clicks, ev.x, ev.y);	1901	selection_click (MEvent.clicks, ev.x, ev.y);
1924	}	1902	}
1925		1903
1926	MEvent.button = Button1;	1904	MEvent.button = Button1;
1927	break;	1905	break;
1928		1906
1929	case Button3:	1907	case Button3:
1930	if (MEvent.button == Button3 && clickintime)	1908	if (MEvent.button == Button3 && clickintime)
1931	selection_rotate (ev.x, ev.y);	1909	selection_rotate (ev.x, ev.y);
1932	else	1910	else
1933	selection_extend (ev.x, ev.y, 1);	1911	selection_extend (ev.x, ev.y, 1);
1934		1912
1935	MEvent.button = Button3;	1913	MEvent.button = Button3;
1936	break;	1914	break;
1937	}	1915	}
1938	}	1916	}
1939		1917
1940	MEvent.time = ev.time;	1918	MEvent.time = ev.time;
1941	return;	1919	return;
1942	}	1920	}
1943		1921
…		…
2106	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2107	#endif	2085	#endif
2108		2086
2109	if (ev.window == vt)	2087	if (ev.window == vt)
2110	{	2088	{
		2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2090	return;
		2091
2111	#if ISO_14755	2092	#if ISO_14755
2112	// 5.4	2093	// 5.4
2113	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2094	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2114	return;	2095	return;
2115	#endif	2096	#endif
		2097
2116	if (reportmode)	2098	if (reportmode)
2117	{	2099	{
2118	/* mouse report from vt window */	2100	/* mouse report from vt window */
2119	/* don't report release of wheel "buttons" */	2101	/* don't report release of wheel "buttons" */
2120	if (ev.button >= 4)	2102	if (ev.button >= 4)
…		…
2144	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2145	&& bypass_keystate	2127	&& bypass_keystate
2146	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2147	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2148		2130
2149	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150	return;
2151
2152	switch (ev.button)	2131	switch (ev.button)
2153	{	2132	{
2154	case Button1:	2133	case Button1:
2155	case Button3:	2134	case Button3:
2156	selection_make (ev.time);	2135	selection_make (ev.time);
2157	break;	2136	break;
		2137
2158	case Button2:	2138	case Button2:
2159	selection_request (ev.time, ev.x, ev.y);	2139	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2140	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2160	break;	2141	break;
		2142
2161	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2162	case Button4:	2144	case Button4:
2163	case Button5:	2145	case Button5:
2164	{	2146	{
2165	int i;	2147	int i;
…		…
2205	#if TINTING	2187	#if TINTING
2206	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2207		2189
2208	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2209		2191
2210	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2192	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2211	{	2193	{
2212	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2213	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2214	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2196	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2215	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217	int i;	2199	int i;
2218		2200
2219	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2220		2202
2221	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2222		2204
2223	/* for convenience */	2205	/* for convenience */
2224	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2445	Atom atype;	2427	Atom atype;
2446	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2447	Window root, oldp, *list;	2429	Window root, oldp, *list;
2448	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2449	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2450	dDisp;
2451		2432
2452	pchanged = 0;	2433	pchanged = 0;
2453		2434
2454	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2455	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2456		2437
2457	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2458	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2459		2440
2460	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2461		2442
2462	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2463	{	2444	{
2464	if (am_transparent)	2445	if (am_transparent)
2465	{	2446	{
2466	pchanged = 1;	2447	pchanged = 1;
2467	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2469	}	2450	}
2470		2451
2471	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2472	}	2453	}
2473		2454
2474	/* Get all X ops out of the queue so that our information is up-to-date. */	2455	/* Get all X ops out of the queue so that our information is up-to-date. */
2475	XSync (disp, False);	2456	XSync (dpy, False);
2476		2457
2477	/*	2458	/*
2478	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2479	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2480	* windows for each client, so we have to take care about that.	2461	* windows for each client, so we have to take care about that.
2481	*/	2462	*/
2482	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2483	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2486		2467
2487	if (!i \|\| prop == NULL)	2468	if (!i \|\| prop == NULL)
2488	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2492		2473
2493	if (!i \|\| prop == NULL	2474	if (!i \|\| prop == NULL
2494	#if TINTING	2475	#if TINTING
2495	\|\| !rs[Rs_color + Color_tint]	2476	\|\| !ISSET_PIXCOLOR (Color_tint)
2496	#endif	2477	#endif
2497	)	2478	)
2498	have_pixmap = 0;	2479	have_pixmap = 0;
2499	else	2480	else
2500	{	2481	{
…		…
2513	Window cr;	2494	Window cr;
2514	XImage *image;	2495	XImage *image;
2515	GC gc;	2496	GC gc;
2516	XGCValues gcvalue;	2497	XGCValues gcvalue;
2517		2498
2518	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2519	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2520	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2521	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2522	nx = ny = 0;	2503	nx = ny = 0;
2523		2504
…		…
2536	}	2517	}
2537		2518
2538	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2539	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2540		2521
2541	XSync (disp, False);	2522	XSync (dpy, False);
2542	allowedxerror = -1;	2523	allowedxerror = -1;
2543	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544		2525
2545	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2546	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2547	allowedxerror = 0;	2528	allowedxerror = 0;
2548		2529
…		…
2551	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2552	{	2533	{
2553	pchanged = 1;	2534	pchanged = 1;
2554	if (pixmap != None)	2535	if (pixmap != None)
2555	{	2536	{
2556	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2557	pixmap = None;	2538	pixmap = None;
2558	}	2539	}
2559	}	2540	}
2560		2541
2561	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2562	}	2543	}
2563	else	2544	else
2564	{	2545	{
2565	if (pixmap != None)	2546	if (pixmap != None)
2566	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2567		2548
2568	#if TINTING	2549	#if TINTING
2569	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2570	{	2551	{
2571	unsigned short rm, gm, bm;
2572	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573		2553
		2554	rgba c;
2574	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2575		2556
2576	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577	}	2558	}
2578	#endif	2559	#endif
2579		2560
2580	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581	szHint.width, szHint.height, image->depth);
2582	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2583	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2584	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2585	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2586	XDestroyImage (image);	2566	XDestroyImage (image);
2587	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2588	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2589		2569
2590	if (!am_transparent \|\| !am_pixmap_trans)	2570	if (!am_transparent \|\| !am_pixmap_trans)
2591	pchanged = 1;	2571	pchanged = 1;
2592		2572
2593	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2594	}	2574	}
2595	}	2575	}
2596		2576
2597	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2599	else	2579	else
2600	{	2580	{
2601	unsigned int n;	2581	unsigned int n;
2602	/*	2582	/*
2603	* InheritPixmap transparency	2583	* InheritPixmap transparency
2604	*/	2584	*/
2605	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606	{	2586	{
2607	oldp = parent[i];	2587	oldp = parent[i];
2608	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2609	&parent[i], &list, &n);
2610	XFree (list);	2589	XFree (list);
2611		2590
2612	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2613	{	2592	{
2614	if (oldp != None)	2593	if (oldp != None)
…		…
2622	}	2601	}
2623		2602
2624	n = 0;	2603	n = 0;
2625		2604
2626	if (pchanged)	2605	if (pchanged)
2627	{
2628	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2629	{	2607	{
2630	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2631	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2632	{	2611	{
2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634	break;	2613	break;
2635	}	2614	}
2636	}	2615	}
2637	}
2638		2616
2639	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2640	{	2618	{
2641	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2642	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2643	am_transparent = 0;	2621	am_transparent = 0;
2644	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2645	}	2623	}
2646	else	2624	else
2647	{	2625	{
2648	#if WAIT_FOR_WM
2649	/* wait (an arbitrary period) for the WM to do its thing
2650	* needed for fvwm2.2.2 (and before?) */
2651	sleep (1);
2652	#endif
2653	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2654	{	2627	{
2655	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2656	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2657	}	2630	}
2658		2631
2659	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2660	am_transparent = 1;	2633	am_transparent = 1;
2661	}	2634	}
2662		2635
2663	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664	parent[i] = None;	2637	parent[i] = None;
2665	}	2638	}
2666		2639
2667	if (scrollBar.win)	2640	if (scrollBar.win)
2668	{	2641	{
2669	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2670	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2671	scrollbar_show (0);	2644	scrollbar_show (0);
2672	}	2645	}
2673		2646
2674	if (am_transparent)	2647	if (am_transparent)
…		…
2820	return flag;	2793	return flag;
2821	}	2794	}
2822		2795
2823	// read the next character	2796	// read the next character
2824	wchar_t	2797	wchar_t
2825	rxvt_term::next_char ()	2798	rxvt_term::next_char () NOTHROW
2826	{	2799	{
2827	while (cmdbuf_ptr < cmdbuf_endp)	2800	while (cmdbuf_ptr < cmdbuf_endp)
2828	{	2801	{
2829	// assume 7-bit to be ascii ALWAYS	2802	// assume 7-bit to be ascii ALWAYS
2830	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2803	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2851	return NOCHAR;	2824	return NOCHAR;
2852	}	2825	}
2853		2826
2854	// read the next octet	2827	// read the next octet
2855	uint32_t	2828	uint32_t
2856	rxvt_term::next_octet ()	2829	rxvt_term::next_octet () NOTHROW
2857	{	2830	{
2858	return cmdbuf_ptr < cmdbuf_endp	2831	return cmdbuf_ptr < cmdbuf_endp
2859	? (unsigned char)*cmdbuf_ptr++	2832	? (unsigned char)*cmdbuf_ptr++
2860	: NOCHAR;	2833	: NOCHAR;
2861	}	2834	}
		2835
		2836	static class out_of_input out_of_input;
2862		2837
2863	/* rxvt_cmd_getc () - Return next input character */	2838	/* rxvt_cmd_getc () - Return next input character */
2864	/*	2839	/*
2865	* Return the next input character after first passing any keyboard input	2840	* Return the next input character after first passing any keyboard input
2866	* to the command.	2841	* to the command.
2867	*/	2842	*/
2868	wchar_t	2843	wchar_t
2869	rxvt_term::cmd_getc ()	2844	rxvt_term::cmd_getc () THROW ((class out_of_input))
2870	{	2845	{
2871	wchar_t c = next_char ();	2846	wchar_t c = next_char ();
2872		2847
2873	if (c == NOCHAR)	2848	if (c == NOCHAR)
2874	throw out_of_input;	2849	throw out_of_input;
2875		2850
2876	return c;	2851	return c;
2877	}	2852	}
2878		2853
2879	uint32_t	2854	uint32_t
2880	rxvt_term::cmd_get8 ()	2855	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881	{	2856	{
2882	uint32_t c = next_octet ();	2857	uint32_t c = next_octet ();
2883		2858
2884	if (c == NOCHAR)	2859	if (c == NOCHAR)
2885	throw out_of_input;	2860	throw out_of_input;
…		…
3123	scr_charset_set (2, (unsigned int)cmd_getc ());	3098	scr_charset_set (2, (unsigned int)cmd_getc ());
3124	break;	3099	break;
3125	case '+':	3100	case '+':
3126	scr_charset_set (3, (unsigned int)cmd_getc ());	3101	scr_charset_set (3, (unsigned int)cmd_getc ());
3127	break;	3102	break;
3128	#if ENABLE_FRILLS	3103	#if !ENABLE_MINIMAL
3129	case '6':	3104	case '6':
3130	scr_backindex ();	3105	scr_backindex ();
3131	break;	3106	break;
3132	#endif	3107	#endif
3133	case '7':	3108	case '7':
3134	scr_cursor (SAVE);	3109	scr_cursor (SAVE);
3135	break;	3110	break;
3136	case '8':	3111	case '8':
3137	scr_cursor (RESTORE);	3112	scr_cursor (RESTORE);
3138	break;	3113	break;
3139	#if ENABLE_FRILLS	3114	#if !ENABLE_MINIMAL
3140	case '9':	3115	case '9':
3141	scr_forwardindex ();	3116	scr_forwardindex ();
3142	break;	3117	break;
3143	#endif	3118	#endif
3144	case '=':	3119	case '=':
…		…
3306	ndef = get_byte_array_bit (csi_defaults, i);	3281	ndef = get_byte_array_bit (csi_defaults, i);
3307	for (p = 0; p < nargs; p++)	3282	for (p = 0; p < nargs; p++)
3308	if (arg[p] == -1)	3283	if (arg[p] == -1)
3309	arg[p] = ndef;	3284	arg[p] = ndef;
3310		3285
3311	#ifdef DEBUG_CMD
3312	fprintf (stderr, "CSI ");
3313	for (p = 0; p < nargs; p++)
3314	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315	fprintf (stderr, "%c\n", ch);
3316	#endif
3317
3318	/*	3286	/*
3319	* private mode handling	3287	* private mode handling
3320	*/	3288	*/
3321	if (priv)	3289	if (priv)
3322	{	3290	{
3323	switch (priv)	3291	switch (priv)
3324	{	3292	{
3325	case '>':	3293	case '>':
3326	if (ch == CSI_DA) /* secondary device attributes */	3294	if (ch == CSI_DA) /* secondary device attributes */
3327	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3295	{
		3296	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3297	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3298	//
		3299	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3300	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3301	// that we do not support xterm mouse reporting (should be 95 when we do).
		3302	//
		3303	tt_printf ("\033[>%d;94;0c", 'U');
		3304	}
3328	break;	3305	break;
3329	case '?':	3306	case '?':
3330	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3307	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3331	process_terminal_mode (ch, priv, nargs, arg);	3308	process_terminal_mode (ch, priv, nargs, arg);
3332	break;	3309	break;
…		…
3535	break;	3512	break;
3536	case CSI_75:	3513	case CSI_75:
3537	scr_cursor (RESTORE);	3514	scr_cursor (RESTORE);
3538	break;	3515	break;
3539		3516
3540	#if ENABLE_FRILLS	3517	#if !ENABLE_MINIMAL
3541	case CSI_74:	3518	case CSI_74:
3542	process_window_ops (arg, nargs);	3519	process_window_ops (arg, nargs);
3543	break;	3520	break;
3544	#endif	3521	#endif
3545		3522
…		…
3552	break;	3529	break;
3553	}	3530	}
3554	}	3531	}
3555	/}}} /	3532	/}}} /
3556		3533
3557	#if ENABLE_FRILLS	3534	#if !ENABLE_MINIMAL
3558	/* ARGSUSED */	3535	/* ARGSUSED */
3559	void	3536	void
3560	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3537	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561	{	3538	{
3562	int x, y;	3539	int x, y;
3563	XWindowAttributes wattr;	3540	XWindowAttributes wattr;
3564	Window wdummy;	3541	Window wdummy;
3565	dDisp;	3542
		3543	dLocal (Display *, dpy);
3566		3544
3567	if (nargs == 0)	3545	if (nargs == 0)
3568	return;	3546	return;
3569		3547
3570	switch (args[0])	3548	switch (args[0])
3571	{	3549	{
3572	/*	3550	/*
3573	* commands	3551	* commands
3574	*/	3552	*/
3575	case 1: /* deiconify window */	3553	case 1: /* deiconify window */
3576	XMapWindow (disp, parent[0]);	3554	XMapWindow (dpy, parent[0]);
3577	break;	3555	break;
3578	case 2: /* iconify window */	3556	case 2: /* iconify window */
3579	XIconifyWindow (disp, parent[0], display->screen);	3557	XIconifyWindow (dpy, parent[0], display->screen);
3580	break;	3558	break;
3581	case 3: /* set position (pixels) */	3559	case 3: /* set position (pixels) */
3582	XMoveWindow (disp, parent[0], args[1], args[2]);	3560	XMoveWindow (dpy, parent[0], args[1], args[2]);
3583	break;	3561	break;
3584	case 4: /* set size (pixels) */	3562	case 4: /* set size (pixels) */
3585	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3563	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586	break;	3564	break;
3587	case 5: /* raise window */	3565	case 5: /* raise window */
3588	XRaiseWindow (disp, parent[0]);	3566	XRaiseWindow (dpy, parent[0]);
3589	break;	3567	break;
3590	case 6: /* lower window */	3568	case 6: /* lower window */
3591	XLowerWindow (disp, parent[0]);	3569	XLowerWindow (dpy, parent[0]);
3592	break;	3570	break;
3593	case 7: /* refresh window */	3571	case 7: /* refresh window */
3594	scr_touch (true);	3572	scr_touch (true);
3595	break;	3573	break;
3596	case 8: /* set size (chars) */	3574	case 8: /* set size (chars) */
…		…
3603	if (args[0] >= 24) /* set height (chars) */	3581	if (args[0] >= 24) /* set height (chars) */
3604	set_widthheight ((unsigned int)width,	3582	set_widthheight ((unsigned int)width,
3605	(unsigned int) (args[1] * fheight));	3583	(unsigned int) (args[1] * fheight));
3606	break;	3584	break;
3607		3585
3608
3609	/*	3586	/*
3610	* reports - some output format copied from XTerm	3587	* reports - some output format copied from XTerm
3611	*/	3588	*/
3612	case 11: /* report window state */	3589	case 11: /* report window state */
3613	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (dpy, parent[0], &wattr);
3614	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3591	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615	break;	3592	break;
3616	case 13: /* report window position */	3593	case 13: /* report window position */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3594	XGetWindowAttributes (dpy, parent[0], &wattr);
3618	XTranslateCoordinates (disp, parent[0], wattr.root,	3595	XTranslateCoordinates (dpy, parent[0], wattr.root,
3619	-wattr.border_width, -wattr.border_width,	3596	-wattr.border_width, -wattr.border_width,
3620	&x, &y, &wdummy);	3597	&x, &y, &wdummy);
3621	tt_printf ("\033[3;%d;%dt", x, y);	3598	tt_printf ("\033[3;%d;%dt", x, y);
3622	break;	3599	break;
3623	case 14: /* report window size (pixels) */	3600	case 14: /* report window size (pixels) */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3601	XGetWindowAttributes (dpy, parent[0], &wattr);
3625	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3602	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626	break;	3603	break;
3627	case 18: /* report text area size (chars) */	3604	case 18: /* report text area size (chars) */
3628	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629	break;	3606	break;
…		…
3631	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3608	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632	break;	3609	break;
3633	case 20: /* report icon label */	3610	case 20: /* report icon label */
3634	{	3611	{
3635	char *s;	3612	char *s;
3636	XGetIconName (disp, parent[0], &s);	3613	XGetIconName (dpy, parent[0], &s);
3637	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3614	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638	XFree (s);	3615	XFree (s);
3639	}	3616	}
3640	break;	3617	break;
3641	case 21: /* report window title */	3618	case 21: /* report window title */
3642	{	3619	{
3643	char *s;	3620	char *s;
3644	XFetchName (disp, parent[0], &s);	3621	XFetchName (dpy, parent[0], &s);
3645	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3622	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646	XFree (s);	3623	XFree (s);
3647	}	3624	}
3648	break;	3625	break;
3649	}	3626	}
…		…
3750	void	3727	void
3751	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3728	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752	{	3729	{
3753	if (str[0] == '?' && !str[1])	3730	if (str[0] == '?' && !str[1])
3754	{	3731	{
3755	unsigned short r, g, b;	3732	rgba c;
3756	pix_colors_focused[color].get (display, r, g, b);	3733	pix_colors_focused[color].get (c);
		3734
		3735	#if XFT
		3736	if (c.a != rgba::MAX_CC)
		3737	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3738	else
		3739	#endif
3757	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3740	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758	}	3741	}
3759	else	3742	else
3760	set_window_color (color, str);	3743	set_window_color (color, str);
3761	}	3744	}
3762		3745
…		…
3764	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3747	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3765	*/	3748	*/
3766	void	3749	void
3767	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3750	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768	{	3751	{
3769	int changed = 0;
3770	int color;	3752	int color;
3771	char buf, name;	3753	char buf, name;
3772	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3773	int saveop = op;	3755	int saveop = op;
3774	dDisp;	3756
		3757	dLocal (Display *, dpy);
3775		3758
3776	assert (str != NULL);	3759	assert (str != NULL);
3777	switch (op)	3760	switch (op)
3778	{	3761	{
3779	case XTerm_name:	3762	case XTerm_name:
…		…
3795	unsigned long bytes_after;	3778	unsigned long bytes_after;
3796	unsigned char *value = 0;	3779	unsigned char *value = 0;
3797	const char *str = "";	3780	const char *str = "";
3798		3781
3799	if (prop	3782	if (prop
3800	&& XGetWindowProperty (disp, parent[0],	3783	&& XGetWindowProperty (dpy, parent[0],
3801	prop, 0, 1<<16, 0, AnyPropertyType,	3784	prop, 0, 1<<16, 0, AnyPropertyType,
3802	&actual_type, &actual_format,	3785	&actual_type, &actual_format,
3803	&nitems, &bytes_after, &value) == Success	3786	&nitems, &bytes_after, &value) == Success
3804	&& actual_type != None	3787	&& actual_type != None
3805	&& actual_format == 8)	3788	&& actual_format == 8)
3806	str = (const char *)(value);	3789	str = (const char *)(value);
3807		3790
3808	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3791	tt_printf ("\033]%d;%s%c", op, str, resp);
3809		3792
3810	XFree (value);	3793	XFree (value);
3811	}	3794	}
3812	else	3795	else
3813	{	3796	{
…		…
3817	{	3800	{
3818	*eq = 0;	3801	*eq = 0;
3819	set_utf8_property (display->atom (str), eq + 1);	3802	set_utf8_property (display->atom (str), eq + 1);
3820	}	3803	}
3821	else	3804	else
3822	XDeleteProperty (disp, parent[0],	3805	XDeleteProperty (dpy, parent[0],
3823	display->atom (str));	3806	display->atom (str));
3824	}	3807	}
3825	break;	3808	break;
3826		3809
3827	case XTerm_Color:	3810	case XTerm_Color:
…		…
3837	break;	3820	break;
3838		3821
3839	if ((buf = strchr (name, ';')) != NULL)	3822	if ((buf = strchr (name, ';')) != NULL)
3840	*buf++ = '\0';	3823	*buf++ = '\0';
3841		3824
3842	if (name[0] == '?' && !name[1])	3825	process_color_seq (op, color, name, resp);
3843	{
3844	unsigned short r, g, b;
3845	pix_colors_focused[color].get (display, r, g, b);
3846	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847	}
3848	else
3849	set_window_color (color, name);
3850	}	3826	}
3851	break;	3827	break;
3852	case XTerm_Color00:	3828	case XTerm_Color00:
3853	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3829	process_color_seq (op, Color_fg, str, resp);
3854	break;	3830	break;
3855	case XTerm_Color01:	3831	case XTerm_Color01:
3856	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3832	process_color_seq (op, Color_bg, str, resp);
3857	break;	3833	break;
3858	#ifndef NO_CURSORCOLOR	3834	#ifndef NO_CURSORCOLOR
3859	case XTerm_Color_cursor:	3835	case XTerm_Color_cursor:
3860	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3836	process_color_seq (op, Color_cursor, str, resp);
3861	break;	3837	break;
3862	#endif	3838	#endif
3863	case XTerm_Color_pointer_fg:	3839	case XTerm_Color_pointer_fg:
3864	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3840	process_color_seq (op, Color_pointer_fg, str, resp);
3865	break;	3841	break;
3866	case XTerm_Color_pointer_bg:	3842	case XTerm_Color_pointer_bg:
3867	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3843	process_color_seq (op, Color_pointer_bg, str, resp);
3868	break;	3844	break;
3869	#ifndef NO_BOLD_UNDERLINE_REVERSE	3845	#ifndef NO_BOLD_UNDERLINE_REVERSE
3870	case XTerm_Color_RV:	3846	case XTerm_Color_RV:
3871	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3847	process_color_seq (op, Color_RV, str, resp);
3872	break;	3848	break;
3873	case Rxvt_Color_BD:	3849	case Rxvt_Color_BD:
3874	case URxvt_Color_BD:	3850	case URxvt_Color_BD:
3875	process_color_seq (op, Color_BD, str, resp);	3851	process_color_seq (op, Color_BD, str, resp);
3876	break;	3852	break;
3877	case Rxvt_Color_UL:	3853	case Rxvt_Color_UL:
3878	case URxvt_Color_UL:	3854	case URxvt_Color_UL:
3879	process_color_seq (op, Color_UL, str, resp);	3855	process_color_seq (op, Color_UL, str, resp);
3880	break;	3856	break;
3881	case URxvt_Color_IT:	3857	case URxvt_Color_IT:
3882	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3858	process_color_seq (op, Color_IT, str, resp);
3883	break;	3859	break;
3884	#endif	3860	#endif
3885	#if TRANSPARENT && TINTING	3861	#if TRANSPARENT && TINTING
3886	case URxvt_Color_tint:	3862	case URxvt_Color_tint:
3887	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3863	process_color_seq (op, Color_tint, str, resp);
		3864
3888	check_our_parents ();	3865	check_our_parents ();
		3866
3889	if (am_transparent)	3867	if (am_transparent)
3890	want_full_refresh = want_refresh = 1;	3868	want_full_refresh = want_refresh = 1;
		3869
3891	break;	3870	break;
3892	#endif	3871	#endif
3893		3872
3894	case Rxvt_Pixmap:	3873	case Rxvt_Pixmap:
		3874	{
3895	if (*str != ';')	3875	if (*str != ';')
3896	{	3876	{
3897	#if XPM_BACKGROUND	3877	#if XPM_BACKGROUND
3898	scale_pixmap (""); /* reset to default scaling */	3878	scale_pixmap (""); /* reset to default scaling */
3899	set_bgPixmap (str); /* change pixmap */	3879	set_bgPixmap (str); /* change pixmap */
3900	scr_touch (true);	3880	scr_touch (true);
3901	#endif	3881	#endif
3902	}	3882	}
3903		3883
		3884	int changed = 0;
		3885
3904	while ((str = strchr (str, ';')) != NULL)	3886	while ((str = strchr (str, ';')) != NULL)
3905	{	3887	{
3906	str++;	3888	str++;
3907	#if XPM_BACKGROUND	3889	#if XPM_BACKGROUND
3908	changed += scale_pixmap (str);	3890	changed += scale_pixmap (str);
3909	#endif	3891	#endif
3910	}	3892	}
3911		3893
3912	if (changed)	3894	if (changed)
3913	{	3895	{
3914	#ifdef XPM_BACKGROUND	3896	#ifdef XPM_BACKGROUND
3915	resize_pixmap ();	3897	resize_pixmap ();
3916	scr_touch (true);	3898	scr_touch (true);
3917	#endif	3899	#endif
3918	}	3900	}
		3901	}
3919	break;	3902	break;
3920		3903
3921	case Rxvt_restoreFG:	3904	case Rxvt_restoreFG:
3922	set_window_color (Color_fg, str);	3905	set_window_color (Color_fg, str);
3923	break;	3906	break;
…		…
3962	allocated.push_back ((void *)res);	3945	allocated.push_back ((void *)res);
3963	set_fonts ();	3946	set_fonts ();
3964	}	3947	}
3965	break;	3948	break;
3966		3949
3967	#if ENABLE_FRILLS	3950	case URxvt_version:
		3951	if (query)
		3952	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3953	op,
		3954	rs[Rs_name], VERSION[0], VERSION[2],
		3955	resp);
		3956	break;
		3957
		3958	#if !ENABLE_MINIMAL
3968	case URxvt_locale:	3959	case URxvt_locale:
3969	if (query)	3960	if (query)
3970	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3961	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3971	else	3962	else
3972	{	3963	{
3973	set_locale (str);	3964	set_locale (str);
3974	pty.set_utf8_mode (enc_utf8);	3965	pty->set_utf8_mode (enc_utf8);
3975	init_xlocale ();	3966	init_xlocale ();
3976	}	3967	}
3977	break;	3968	break;
3978		3969
3979	case URxvt_view_up:	3970	case URxvt_view_up:
…		…
4032	return state;	4023	return state;
4033	}	4024	}
4034		4025
4035	/* we're not using priv _yet_ */	4026	/* we're not using priv _yet_ */
4036	void	4027	void
4037	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4028	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038	{	4029	{
4039	unsigned int i, j;	4030	unsigned int i, j;
4040	int state;	4031	int state;
4041		4032
4042	static const struct	4033	static const struct
…		…
4336	scr_color (Color_bg, Color_bg);	4327	scr_color (Color_bg, Color_bg);
4337	break;	4328	break;
4338		4329
4339	//case 50: // not variable spacing	4330	//case 50: // not variable spacing
4340		4331
4341	#if ENABLE_FRILLS	4332	#if !ENABLE_MINIMAL
4342	case 90:	4333	case 90:
4343	case 91: /* set bright fg color */	4334	case 91: /* set bright fg color */
4344	case 92:	4335	case 92:
4345	case 93:	4336	case 93:
4346	case 94:	4337	case 94:
…		…
4411	rxvt_term::tt_write (const char *data, unsigned int len)	4402	rxvt_term::tt_write (const char *data, unsigned int len)
4412	{	4403	{
4413	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4404	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414	return;	4405	return;
4415		4406
4416	if (pty.pty < 0)	4407	if (pty->pty < 0)
4417	return;	4408	return;
4418		4409
4419	if (v_buflen == 0)	4410	if (v_buflen == 0)
4420	{	4411	{
4421	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4412	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422		4413
4423	if ((unsigned int)written == len)	4414	if ((unsigned int)written == len)
4424	return;	4415	return;
4425		4416
4426	data += written;	4417	data += written;
…		…
4435	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4426	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4436	}	4427	}
4437		4428
4438	void rxvt_term::pty_write ()	4429	void rxvt_term::pty_write ()
4439	{	4430	{
4440	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4431	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441		4432
4442	if (written > 0)	4433	if (written > 0)
4443	{	4434	{
4444	v_buflen -= written;	4435	v_buflen -= written;
4445		4436

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC vs. Revision 1.306 by root, Mon Feb 6 05:40:15 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.306 by root, Mon Feb 6 05:40:15 2006 UTC