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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.312 by root, Sat Mar 4 22:05:05 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>
		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
64		63
65	/----------------------------------------------------------------------/	64	/----------------------------------------------------------------------/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		67
…		…
299		298
300	return -1;	299	return -1;
301	}	300	}
302	#endif	301	#endif
303		302
304	/{{{ Convert the keypress event into a string /
305	void	303	void
306	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
307	{	305	{
308	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
309	unsigned int newlen;	307	unsigned int newlen;
310	KeySym keysym;	308	KeySym keysym;
311	int valid_keysym;	309	int valid_keysym;
312	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
313		316
314	/*	317	/*
315	* 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
316	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
317	*	320	*
…		…
908	tt_write (&ch, 1);	911	tt_write (&ch, 1);
909	}	912	}
910		913
911	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
912	}	915	}
913	/}}} /	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	}
914		993
915	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
916	unsigned int	995	unsigned int
917	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
918	{	997	{
…		…
1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096	}	1175	}
1097	}	1176	}
1098	#endif	1177	#endif
1099		1178
1100	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1101	static struct event_handler	1180	static struct event_handler
1102	{	1181	{
1103	check_watcher cw_yield;	1182	check_watcher yield_ev;
1104		1183
1105	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1106	{	1185	{
1107	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
1108	w.stop ();	1194	w.stop ();
1109	}	1195	}
1110		1196
1111	event_handler ()	1197	event_handler ()
1112	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1113	{	1199	{
1114	}	1200	}
1115	} event_handler;	1201	} event_handler;
1116	#endif	1202	#endif
1117		1203
…		…
1137	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1138	return true;	1224	return true;
1139	}	1225	}
1140	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1141	{	1227	{
1142	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1143	if (display->is_local)	1229	if (display->is_local)
1144	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1145	#endif	1231	#endif
1146	}	1232	}
1147	else	1233	else
1148	{	1234	{
1149	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1171	}	1257	}
1172		1258
1173	void	1259	void
1174	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1175	{	1261	{
1176	XDefineCursor (xdisp, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1177	recolour_cursor ();	1263	recolour_cursor ();
1178		1264
1179	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1180	hidden_pointer = 0;	1266	hidden_pointer = 0;
1181		1267
…		…
1189	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1190	{	1276	{
1191	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1192	return;	1278	return;
1193		1279
1194	XDefineCursor (xdisp, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1195	XFlush (xdisp);	1281	XFlush (dpy);
1196		1282
1197	hidden_pointer = 1;	1283	hidden_pointer = 1;
1198	}	1284	}
1199		1285
1200	void	1286	void
…		…
1279	void	1365	void
1280	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1281	{	1367	{
1282	make_current ();	1368	make_current ();
1283		1369
1284	dLocal (Display *, xdisp);	1370	dLocal (Display *, dpy);
1285		1371
1286	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1287	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289	return;	1375	return;
…		…
1294	unsigned int unused_mask;	1380	unsigned int unused_mask;
1295		1381
1296	switch (ev.type)	1382	switch (ev.type)
1297	{	1383	{
1298	case KeyPress:	1384	case KeyPress:
1299	#if ISO_14755	1385	key_press (ev.xkey);
1300	if (!(iso14755buf & ISO_14755_52))
1301	#endif
1302	lookup_key (ev.xkey);
1303
1304	break;	1386	break;
1305		1387
1306	case KeyRelease:	1388	case KeyRelease:
1307	{	1389	key_release (ev.xkey);
1308	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1309	KeySym keysym;
1310
1311	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312	#endif
1313
1314	#if ENABLE_FRILLS \|\| ISO_14755
1315	// ISO 14755 support
1316	if (iso14755buf)
1317	if (iso14755buf & ISO_14755_52)
1318	{
1319	# if ENABLE_OVERLAY
1320	scr_overlay_off ();
1321	# endif
1322	# if ISO_14755
1323	// iso14755 part 5.2 handling: release time
1324	// first: controls
1325	if ((ev.xkey.state & ControlMask)
1326	&& ((keysym >= 0x40 && keysym <= 0x5f)
1327	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1328	{
1329	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1330	commit_iso14755 ();
1331	goto skip_switch;
1332	}
1333
1334	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335	if (i[0] == keysym)
1336	{
1337	iso14755buf = ISO_14755_51 \| i[1];
1338	commit_iso14755 ();
1339	goto skip_switch;
1340	}
1341
1342	scr_bell ();
1343	# endif
1344	iso14755buf = 0;
1345	break;
1346	}
1347	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1348	{
1349	# if ENABLE_OVERLAY
1350	scr_overlay_off ();
1351	# endif
1352	if (iso14755buf & ISO_14755_51)
1353	commit_iso14755 ();
1354	#if ISO_14755
1355	else if (iso14755buf & ISO_14755_STARTED)
1356	{
1357	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361	}
1362	# endif
1363	else
1364	iso14755buf = 0;
1365	}
1366	#endif
1367
1368	if (ev.xany.window == vt
1369	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370	break;
1371
1372	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373	if (!(ev.xkey.state & ControlMask))
1374	slip_wheel_ev.stop ();
1375	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1376	mouse_slip_wheel_speed = 0;
1377	#endif
1378	break;	1390	break;
1379	}
1380		1391
1381	case ButtonPress:	1392	case ButtonPress:
1382	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1383	break;	1394	break;
1384		1395
…		…
1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400	destroy ();	1411	destroy ();
1401	}	1412	}
1402	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1403	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])
1404	XSendEvent (xdisp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1405	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1406	&ev);	1417	&ev);
1407	#endif	1418	#endif
1408	}	1419	}
1409	}	1420	}
…		…
1457	break;	1468	break;
1458		1469
1459	case ConfigureNotify:	1470	case ConfigureNotify:
1460	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1461	{	1472	{
1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463	;	1474	;
1464		1475
1465	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1466	{	1477	{
1467	seen_resize = 1;	1478	seen_resize = 1;
…		…
1525	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1526	{	1537	{
1527	do	1538	do
1528	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1529	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531		1542
1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533		1544
1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1535	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1536	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1537		1548
1538	want_refresh = 1;	1549	want_refresh = 1;
1539	}	1550	}
1540	else	1551	else
1541	{	1552	{
1542	XEvent unused_event;	1553	XEvent unused_event;
1543		1554
1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545	;	1556	;
1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547	;	1558	;
1548		1559
1549	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1550	{	1561	{
1551	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1552	scrollbar_show (0);	1563	scrollbar_show (0);
1553	}	1564	}
1554		1565
1555	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1556	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1557	XClearWindow (xdisp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1558	#endif	1569	#endif
1559	}	1570	}
1560	break;	1571	break;
1561		1572
1562	case MotionNotify:	1573	case MotionNotify:
…		…
1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574	; // nop	1585	; // nop
1575	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1576	{	1587	{
1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578	;	1589	;
1579		1590
1580	XQueryPointer (xdisp, vt,	1591	XQueryPointer (dpy, vt,
1581	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1582	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1583	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1584	&ev.xbutton.state);	1595	&ev.xbutton.state);
1585	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1649	#endif	1660	#endif
1650	}	1661	}
1651	}	1662	}
1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1653	{	1664	{
1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655	MotionNotify, &ev))	1666	MotionNotify, &ev))
1656	;	1667	;
1657		1668
1658	XQueryPointer (xdisp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1659	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1660	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1661	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1662	&unused_mask);	1673	&unused_mask);
1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1667	scrollbar_show (1);	1678	scrollbar_show (1);
1668	}	1679	}
1669	break;	1680	break;
1670	}	1681	}
1671		1682
1672	skip_switch: ;
1673
1674	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1675	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676	{	1685	{
1677	if (hidden_cursor)	1686	if (hidden_cursor)
1678	{	1687	{
…		…
1705	if (!focus)	1714	if (!focus)
1706	{	1715	{
1707	focus = 1;	1716	focus = 1;
1708	want_refresh = 1;	1717	want_refresh = 1;
1709		1718
1710	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711		1720
1712	#if USE_XIM	1721	#if USE_XIM
1713	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1714	{	1723	{
1715	IMSetStatusPosition ();	1724	IMSetPosition ();
1716	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1717	}	1726	}
1718	#endif	1727	#endif
1719	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1720	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
…		…
2424	pchanged = 0;	2433	pchanged = 0;
2425		2434
2426	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2427	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2428		2437
2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2430	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2431		2440
2432	XGetWindowAttributes (xdisp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2433		2442
2434	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2435	{	2444	{
2436	if (am_transparent)	2445	if (am_transparent)
2437	{	2446	{
2438	pchanged = 1;	2447	pchanged = 1;
2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2440	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2441	}	2450	}
2442		2451
2443	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2444	}	2453	}
2445		2454
2446	/* 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. */
2447	XSync (xdisp, False);	2456	XSync (dpy, False);
2448		2457
2449	/*	2458	/*
2450	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2451	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2452	* 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.
2453	*/	2462	*/
2454	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2458		2467
2459	if (!i \|\| prop == NULL)	2468	if (!i \|\| prop == NULL)
2460	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2464		2473
2465	if (!i \|\| prop == NULL	2474	if (!i \|\| prop == NULL
2466	#if TINTING	2475	#if TINTING
2467	\|\| !rs[Rs_color + Color_tint]	2476	\|\| !ISSET_PIXCOLOR (Color_tint)
2468	#endif	2477	#endif
2469	)	2478	)
2470	have_pixmap = 0;	2479	have_pixmap = 0;
2471	else	2480	else
2472	{	2481	{
…		…
2485	Window cr;	2494	Window cr;
2486	XImage *image;	2495	XImage *image;
2487	GC gc;	2496	GC gc;
2488	XGCValues gcvalue;	2497	XGCValues gcvalue;
2489		2498
2490	XTranslateCoordinates (xdisp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2491	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2492	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2493	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2494	nx = ny = 0;	2503	nx = ny = 0;
2495		2504
…		…
2508	}	2517	}
2509		2518
2510	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2511	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2512		2521
2513	XSync (xdisp, False);	2522	XSync (dpy, False);
2514	allowedxerror = -1;	2523	allowedxerror = -1;
2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516		2525
2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2518	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2519	allowedxerror = 0;	2528	allowedxerror = 0;
2520		2529
…		…
2523	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2524	{	2533	{
2525	pchanged = 1;	2534	pchanged = 1;
2526	if (pixmap != None)	2535	if (pixmap != None)
2527	{	2536	{
2528	XFreePixmap (xdisp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2529	pixmap = None;	2538	pixmap = None;
2530	}	2539	}
2531	}	2540	}
2532		2541
2533	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2534	}	2543	}
2535	else	2544	else
2536	{	2545	{
2537	if (pixmap != None)	2546	if (pixmap != None)
2538	XFreePixmap (xdisp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2539		2548
2540	#if TINTING	2549	#if TINTING
2541	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2542	{	2551	{
2543	rxvt_rgba c;
2544	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545		2553
		2554	rgba c;
2546	pix_colors_focused[Color_tint].get (this, c);	2555	pix_colors_focused [Color_tint].get (c);
2547		2556
2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549	}	2558	}
2550	#endif	2559	#endif
2551		2560
2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2555	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2556	XFreeGC (xdisp, gc);	2565	XFreeGC (dpy, gc);
2557	XDestroyImage (image);	2566	XDestroyImage (image);
2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2559	XClearWindow (xdisp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2560		2569
2561	if (!am_transparent \|\| !am_pixmap_trans)	2570	if (!am_transparent \|\| !am_pixmap_trans)
2562	pchanged = 1;	2571	pchanged = 1;
2563		2572
2564	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2565	}	2574	}
2566	}	2575	}
2567		2576
2568	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2570	else	2579	else
2571	{	2580	{
2572	unsigned int n;	2581	unsigned int n;
2573	/*	2582	/*
2574	* InheritPixmap transparency	2583	* InheritPixmap transparency
2575	*/	2584	*/
2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577	{	2586	{
2578	oldp = parent[i];	2587	oldp = parent[i];
2579	XQueryTree (xdisp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2580	&parent[i], &list, &n);
2581	XFree (list);	2589	XFree (list);
2582		2590
2583	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2584	{	2592	{
2585	if (oldp != None)	2593	if (oldp != None)
…		…
2593	}	2601	}
2594		2602
2595	n = 0;	2603	n = 0;
2596		2604
2597	if (pchanged)	2605	if (pchanged)
2598	{
2599	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2600	{	2607	{
2601	XGetWindowAttributes (xdisp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2602	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2603	{	2611	{
2604	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605	break;	2613	break;
2606	}	2614	}
2607	}	2615	}
2608	}
2609		2616
2610	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2611	{	2618	{
2612	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2613	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2614	am_transparent = 0;	2621	am_transparent = 0;
2615	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2616	}	2623	}
2617	else	2624	else
2618	{	2625	{
2619	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2620	{	2627	{
2621	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2622	XClearWindow (xdisp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2623	}	2630	}
2624		2631
2625	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2626	am_transparent = 1;	2633	am_transparent = 1;
2627	}	2634	}
2628		2635
2629	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630	parent[i] = None;	2637	parent[i] = None;
2631	}	2638	}
2632		2639
2633	if (scrollBar.win)	2640	if (scrollBar.win)
2634	{	2641	{
2635	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2636	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2637	scrollbar_show (0);	2644	scrollbar_show (0);
2638	}	2645	}
2639		2646
2640	if (am_transparent)	2647	if (am_transparent)
…		…
2758	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759	refresh_limit++;	2766	refresh_limit++;
2760	else	2767	else
2761	{	2768	{
2762	flag = true;	2769	flag = true;
		2770	//TODO: due to popular request, implement "skipscroll" option here
2763	scr_refresh ();	2771	scr_refresh ();
2764	want_refresh = 1;	2772	want_refresh = 1;
2765	}	2773	}
2766	}	2774	}
2767		2775
…		…
3091	scr_charset_set (2, (unsigned int)cmd_getc ());	3099	scr_charset_set (2, (unsigned int)cmd_getc ());
3092	break;	3100	break;
3093	case '+':	3101	case '+':
3094	scr_charset_set (3, (unsigned int)cmd_getc ());	3102	scr_charset_set (3, (unsigned int)cmd_getc ());
3095	break;	3103	break;
3096	#if ENABLE_FRILLS	3104	#if !ENABLE_MINIMAL
3097	case '6':	3105	case '6':
3098	scr_backindex ();	3106	scr_backindex ();
3099	break;	3107	break;
3100	#endif	3108	#endif
3101	case '7':	3109	case '7':
3102	scr_cursor (SAVE);	3110	scr_cursor (SAVE);
3103	break;	3111	break;
3104	case '8':	3112	case '8':
3105	scr_cursor (RESTORE);	3113	scr_cursor (RESTORE);
3106	break;	3114	break;
3107	#if ENABLE_FRILLS	3115	#if !ENABLE_MINIMAL
3108	case '9':	3116	case '9':
3109	scr_forwardindex ();	3117	scr_forwardindex ();
3110	break;	3118	break;
3111	#endif	3119	#endif
3112	case '=':	3120	case '=':
…		…
3505	break;	3513	break;
3506	case CSI_75:	3514	case CSI_75:
3507	scr_cursor (RESTORE);	3515	scr_cursor (RESTORE);
3508	break;	3516	break;
3509		3517
3510	#if ENABLE_FRILLS	3518	#if !ENABLE_MINIMAL
3511	case CSI_74:	3519	case CSI_74:
3512	process_window_ops (arg, nargs);	3520	process_window_ops (arg, nargs);
3513	break;	3521	break;
3514	#endif	3522	#endif
3515		3523
…		…
3522	break;	3530	break;
3523	}	3531	}
3524	}	3532	}
3525	/}}} /	3533	/}}} /
3526		3534
3527	#if ENABLE_FRILLS	3535	#if !ENABLE_MINIMAL
3528	/* ARGSUSED */	3536	/* ARGSUSED */
3529	void	3537	void
3530	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3538	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3531	{	3539	{
3532	int x, y;	3540	int x, y;
3533	XWindowAttributes wattr;	3541	XWindowAttributes wattr;
3534	Window wdummy;	3542	Window wdummy;
3535		3543
3536	dLocal (Display *, xdisp);	3544	dLocal (Display *, dpy);
3537		3545
3538	if (nargs == 0)	3546	if (nargs == 0)
3539	return;	3547	return;
3540		3548
3541	switch (args[0])	3549	switch (args[0])
3542	{	3550	{
3543	/*	3551	/*
3544	* commands	3552	* commands
3545	*/	3553	*/
3546	case 1: /* deiconify window */	3554	case 1: /* deiconify window */
3547	XMapWindow (xdisp, parent[0]);	3555	XMapWindow (dpy, parent[0]);
3548	break;	3556	break;
3549	case 2: /* iconify window */	3557	case 2: /* iconify window */
3550	XIconifyWindow (xdisp, parent[0], display->screen);	3558	XIconifyWindow (dpy, parent[0], display->screen);
3551	break;	3559	break;
3552	case 3: /* set position (pixels) */	3560	case 3: /* set position (pixels) */
3553	XMoveWindow (xdisp, parent[0], args[1], args[2]);	3561	XMoveWindow (dpy, parent[0], args[1], args[2]);
3554	break;	3562	break;
3555	case 4: /* set size (pixels) */	3563	case 4: /* set size (pixels) */
3556	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3564	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557	break;	3565	break;
3558	case 5: /* raise window */	3566	case 5: /* raise window */
3559	XRaiseWindow (xdisp, parent[0]);	3567	XRaiseWindow (dpy, parent[0]);
3560	break;	3568	break;
3561	case 6: /* lower window */	3569	case 6: /* lower window */
3562	XLowerWindow (xdisp, parent[0]);	3570	XLowerWindow (dpy, parent[0]);
3563	break;	3571	break;
3564	case 7: /* refresh window */	3572	case 7: /* refresh window */
3565	scr_touch (true);	3573	scr_touch (true);
3566	break;	3574	break;
3567	case 8: /* set size (chars) */	3575	case 8: /* set size (chars) */
…		…
3574	if (args[0] >= 24) /* set height (chars) */	3582	if (args[0] >= 24) /* set height (chars) */
3575	set_widthheight ((unsigned int)width,	3583	set_widthheight ((unsigned int)width,
3576	(unsigned int) (args[1] * fheight));	3584	(unsigned int) (args[1] * fheight));
3577	break;	3585	break;
3578		3586
3579
3580	/*	3587	/*
3581	* reports - some output format copied from XTerm	3588	* reports - some output format copied from XTerm
3582	*/	3589	*/
3583	case 11: /* report window state */	3590	case 11: /* report window state */
3584	XGetWindowAttributes (xdisp, parent[0], &wattr);	3591	XGetWindowAttributes (dpy, parent[0], &wattr);
3585	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3592	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586	break;	3593	break;
3587	case 13: /* report window position */	3594	case 13: /* report window position */
3588	XGetWindowAttributes (xdisp, parent[0], &wattr);	3595	XGetWindowAttributes (dpy, parent[0], &wattr);
3589	XTranslateCoordinates (xdisp, parent[0], wattr.root,	3596	XTranslateCoordinates (dpy, parent[0], wattr.root,
3590	-wattr.border_width, -wattr.border_width,	3597	-wattr.border_width, -wattr.border_width,
3591	&x, &y, &wdummy);	3598	&x, &y, &wdummy);
3592	tt_printf ("\033[3;%d;%dt", x, y);	3599	tt_printf ("\033[3;%d;%dt", x, y);
3593	break;	3600	break;
3594	case 14: /* report window size (pixels) */	3601	case 14: /* report window size (pixels) */
3595	XGetWindowAttributes (xdisp, parent[0], &wattr);	3602	XGetWindowAttributes (dpy, parent[0], &wattr);
3596	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3603	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597	break;	3604	break;
3598	case 18: /* report text area size (chars) */	3605	case 18: /* report text area size (chars) */
3599	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3606	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600	break;	3607	break;
…		…
3602	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3609	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603	break;	3610	break;
3604	case 20: /* report icon label */	3611	case 20: /* report icon label */
3605	{	3612	{
3606	char *s;	3613	char *s;
3607	XGetIconName (xdisp, parent[0], &s);	3614	XGetIconName (dpy, parent[0], &s);
3608	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3615	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609	XFree (s);	3616	XFree (s);
3610	}	3617	}
3611	break;	3618	break;
3612	case 21: /* report window title */	3619	case 21: /* report window title */
3613	{	3620	{
3614	char *s;	3621	char *s;
3615	XFetchName (xdisp, parent[0], &s);	3622	XFetchName (dpy, parent[0], &s);
3616	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3623	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617	XFree (s);	3624	XFree (s);
3618	}	3625	}
3619	break;	3626	break;
3620	}	3627	}
…		…
3721	void	3728	void
3722	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3729	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723	{	3730	{
3724	if (str[0] == '?' && !str[1])	3731	if (str[0] == '?' && !str[1])
3725	{	3732	{
3726	rxvt_rgba c;	3733	rgba c;
3727	pix_colors_focused[color].get (this, c);	3734	pix_colors_focused[color].get (c);
3728		3735
3729	#if XFT	3736	#if XFT
3730	if (c.a != rxvt_rgba::MAX_CC)	3737	if (c.a != rgba::MAX_CC)
3731	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);	3738	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732	else	3739	else
3733	#endif	3740	#endif
3734	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);	3741	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735	}	3742	}
…		…
3746	int color;	3753	int color;
3747	char buf, name;	3754	char buf, name;
3748	bool query = str[0] == '?' && !str[1];	3755	bool query = str[0] == '?' && !str[1];
3749	int saveop = op;	3756	int saveop = op;
3750		3757
3751	dLocal (Display *, xdisp);	3758	dLocal (Display *, dpy);
3752		3759
3753	assert (str != NULL);	3760	assert (str != NULL);
		3761
		3762	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3763	return;
		3764
3754	switch (op)	3765	switch (op)
3755	{	3766	{
3756	case XTerm_name:	3767	case XTerm_name:
3757	set_title (str);	3768	set_title (str);
3758	/* FALLTHROUGH */	3769	/* FALLTHROUGH */
…		…
3772	unsigned long bytes_after;	3783	unsigned long bytes_after;
3773	unsigned char *value = 0;	3784	unsigned char *value = 0;
3774	const char *str = "";	3785	const char *str = "";
3775		3786
3776	if (prop	3787	if (prop
3777	&& XGetWindowProperty (xdisp, parent[0],	3788	&& XGetWindowProperty (dpy, parent[0],
3778	prop, 0, 1<<16, 0, AnyPropertyType,	3789	prop, 0, 1<<16, 0, AnyPropertyType,
3779	&actual_type, &actual_format,	3790	&actual_type, &actual_format,
3780	&nitems, &bytes_after, &value) == Success	3791	&nitems, &bytes_after, &value) == Success
3781	&& actual_type != None	3792	&& actual_type != None
3782	&& actual_format == 8)	3793	&& actual_format == 8)
…		…
3794	{	3805	{
3795	*eq = 0;	3806	*eq = 0;
3796	set_utf8_property (display->atom (str), eq + 1);	3807	set_utf8_property (display->atom (str), eq + 1);
3797	}	3808	}
3798	else	3809	else
3799	XDeleteProperty (xdisp, parent[0],	3810	XDeleteProperty (dpy, parent[0],
3800	display->atom (str));	3811	display->atom (str));
3801	}	3812	}
3802	break;	3813	break;
3803		3814
3804	case XTerm_Color:	3815	case XTerm_Color:
…		…
3853	break;	3864	break;
3854	#endif	3865	#endif
3855	#if TRANSPARENT && TINTING	3866	#if TRANSPARENT && TINTING
3856	case URxvt_Color_tint:	3867	case URxvt_Color_tint:
3857	process_color_seq (op, Color_tint, str, resp);	3868	process_color_seq (op, Color_tint, str, resp);
		3869
3858	check_our_parents ();	3870	check_our_parents ();
		3871
3859	if (am_transparent)	3872	if (am_transparent)
3860	want_full_refresh = want_refresh = 1;	3873	want_full_refresh = want_refresh = 1;
		3874
3861	break;	3875	break;
3862	#endif	3876	#endif
3863		3877
3864	case Rxvt_Pixmap:	3878	case Rxvt_Pixmap:
3865	{	3879	{
…		…
3944	op,	3958	op,
3945	rs[Rs_name], VERSION[0], VERSION[2],	3959	rs[Rs_name], VERSION[0], VERSION[2],
3946	resp);	3960	resp);
3947	break;	3961	break;
3948		3962
3949	#if ENABLE_FRILLS	3963	#if !ENABLE_MINIMAL
3950	case URxvt_locale:	3964	case URxvt_locale:
3951	if (query)	3965	if (query)
3952	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);	3966	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3953	else	3967	else
3954	{	3968	{
…		…
3972	break;	3986	break;
3973	#endif	3987	#endif
3974		3988
3975	#if ENABLE_PERL	3989	#if ENABLE_PERL
3976	case URxvt_perl:	3990	case URxvt_perl:
3977	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	3991	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978	; // no responses yet	3992	; // no responses yet
3979	break;	3993	break;
3980	#endif	3994	#endif
3981	}	3995	}
3982	}	3996	}
…		…
4318	scr_color (Color_bg, Color_bg);	4332	scr_color (Color_bg, Color_bg);
4319	break;	4333	break;
4320		4334
4321	//case 50: // not variable spacing	4335	//case 50: // not variable spacing
4322		4336
4323	#if ENABLE_FRILLS	4337	#if !ENABLE_MINIMAL
4324	case 90:	4338	case 90:
4325	case 91: /* set bright fg color */	4339	case 91: /* set bright fg color */
4326	case 92:	4340	case 92:
4327	case 93:	4341	case 93:
4328	case 94:	4342	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC vs. Revision 1.312 by root, Sat Mar 4 22:05:05 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.312 by root, Sat Mar 4 22:05:05 2006 UTC