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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.284 by root, Wed Jan 25 02:42:06 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
…		…
227	# if !UNICODE3	226	# if !UNICODE3
228	if (ch >= 0x10000)	227	if (ch >= 0x10000)
229	ch = 0xfffd;	228	ch = 0xfffd;
230	# endif	229	# endif
231	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
232	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
233	}	234	}
234		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
235	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
236	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
237		243
238	free (fname);	244	free (fname);
239		245
…		…
292		298
293	return -1;	299	return -1;
294	}	300	}
295	#endif	301	#endif
296		302
297	/{{{ Convert the keypress event into a string /
298	void	303	void
299	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
300	{	305	{
301	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
302	unsigned int newlen;	307	unsigned int newlen;
303	KeySym keysym;	308	KeySym keysym;
304	int valid_keysym;	309	int valid_keysym;
305	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
306		316
307	/*	317	/*
308	* 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
309	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
310	*	320	*
…		…
901	tt_write (&ch, 1);	911	tt_write (&ch, 1);
902	}	912	}
903		913
904	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
905	}	915	}
906	/}}} /	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	}
907		993
908	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
909	unsigned int	995	unsigned int
910	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
911	{	997	{
…		…
1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089	}	1175	}
1090	}	1176	}
1091	#endif	1177	#endif
1092		1178
1093	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1094	static struct event_handler	1180	static struct event_handler
1095	{	1181	{
1096	check_watcher cw_yield;	1182	check_watcher yield_ev;
1097		1183
1098	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1099	{	1185	{
1100	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
1101	w.stop ();	1194	w.stop ();
1102	}	1195	}
1103		1196
1104	event_handler ()	1197	event_handler ()
1105	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1106	{	1199	{
1107	}	1200	}
1108	} event_handler;	1201	} event_handler;
1109	#endif	1202	#endif
1110		1203
…		…
1130	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1131	return true;	1224	return true;
1132	}	1225	}
1133	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1134	{	1227	{
1135	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1136	if (display->is_local)	1229	if (display->is_local)
1137	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1138	#endif	1231	#endif
1139	}	1232	}
1140	else	1233	else
1141	{	1234	{
1142	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1164	}	1257	}
1165		1258
1166	void	1259	void
1167	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1168	{	1261	{
1169	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1170	recolour_cursor ();	1263	recolour_cursor ();
1171		1264
1172	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1173	hidden_pointer = 0;	1266	hidden_pointer = 0;
1174		1267
…		…
1182	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1183	{	1276	{
1184	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1185	return;	1278	return;
1186		1279
1187	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1188	XFlush (display->display);	1281	XFlush (dpy);
1189		1282
1190	hidden_pointer = 1;	1283	hidden_pointer = 1;
1191	}	1284	}
1192		1285
1193	void	1286	void
…		…
1272	void	1365	void
1273	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1274	{	1367	{
1275	make_current ();	1368	make_current ();
1276		1369
1277	dDisp;	1370	dLocal (Display *, dpy);
1278		1371
1279	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1280	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282	return;	1375	return;
…		…
1287	unsigned int unused_mask;	1380	unsigned int unused_mask;
1288		1381
1289	switch (ev.type)	1382	switch (ev.type)
1290	{	1383	{
1291	case KeyPress:	1384	case KeyPress:
1292	#if ISO_14755	1385	key_press (ev.xkey);
1293	if (!(iso14755buf & ISO_14755_52))
1294	#endif
1295	lookup_key (ev.xkey);
1296
1297	break;	1386	break;
1298		1387
1299	case KeyRelease:	1388	case KeyRelease:
1300	{	1389	key_release (ev.xkey);
1301	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1302	KeySym keysym;
1303
1304	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305	#endif
1306
1307	#if ENABLE_FRILLS \|\| ISO_14755
1308	// ISO 14755 support
1309	if (iso14755buf)
1310	if (iso14755buf & ISO_14755_52)
1311	{
1312	# if ENABLE_OVERLAY
1313	scr_overlay_off ();
1314	# endif
1315	# if ISO_14755
1316	// iso14755 part 5.2 handling: release time
1317	// first: controls
1318	if ((ev.xkey.state & ControlMask)
1319	&& ((keysym >= 0x40 && keysym <= 0x5f)
1320	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1321	{
1322	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1323	commit_iso14755 ();
1324	goto skip_switch;
1325	}
1326
1327	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328	if (i[0] == keysym)
1329	{
1330	iso14755buf = ISO_14755_51 \| i[1];
1331	commit_iso14755 ();
1332	goto skip_switch;
1333	}
1334
1335	scr_bell ();
1336	# endif
1337	iso14755buf = 0;
1338	break;
1339	}
1340	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1341	{
1342	# if ENABLE_OVERLAY
1343	scr_overlay_off ();
1344	# endif
1345	if (iso14755buf & ISO_14755_51)
1346	commit_iso14755 ();
1347	#if ISO_14755
1348	else if (iso14755buf & ISO_14755_STARTED)
1349	{
1350	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354	}
1355	# endif
1356	else
1357	iso14755buf = 0;
1358	}
1359	#endif
1360
1361	if (ev.xany.window == vt
1362	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363	break;
1364
1365	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366	if (!(ev.xkey.state & ControlMask))
1367	slip_wheel_ev.stop ();
1368	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1369	mouse_slip_wheel_speed = 0;
1370	#endif
1371	break;	1390	break;
1372	}
1373		1391
1374	case ButtonPress:	1392	case ButtonPress:
1375	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1376	break;	1394	break;
1377		1395
…		…
1392	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)))
1393	destroy ();	1411	destroy ();
1394	}	1412	}
1395	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1396	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])
1397	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1399	&ev);	1417	&ev);
1400	#endif	1418	#endif
1401	}	1419	}
1402	}	1420	}
…		…
1450	break;	1468	break;
1451		1469
1452	case ConfigureNotify:	1470	case ConfigureNotify:
1453	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1454	{	1472	{
1455	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456	;	1474	;
1457		1475
1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1459	{	1477	{
1460	seen_resize = 1;	1478	seen_resize = 1;
…		…
1518	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1519	{	1537	{
1520	do	1538	do
1521	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1522	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1523	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524		1542
1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526		1544
1527	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1529	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1530		1548
1531	want_refresh = 1;	1549	want_refresh = 1;
1532	}	1550	}
1533	else	1551	else
1534	{	1552	{
1535	XEvent unused_event;	1553	XEvent unused_event;
1536		1554
1537	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538	;	1556	;
1539	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540	;	1558	;
1541		1559
1542	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1543	{	1561	{
1544	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1545	scrollbar_show (0);	1563	scrollbar_show (0);
1546	}	1564	}
1547		1565
1548	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1549	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1550	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1551	#endif	1569	#endif
1552	}	1570	}
1553	break;	1571	break;
1554		1572
1555	case MotionNotify:	1573	case MotionNotify:
…		…
1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567	; // nop	1585	; // nop
1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1569	{	1587	{
1570	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571	;	1589	;
1572		1590
1573	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1574	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1575	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1576	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1577	&ev.xbutton.state);	1595	&ev.xbutton.state);
1578	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1642	#endif	1660	#endif
1643	}	1661	}
1644	}	1662	}
1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646	{	1664	{
1647	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648	MotionNotify, &ev))	1666	MotionNotify, &ev))
1649	;	1667	;
1650		1668
1651	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1652	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1653	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1654	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1655	&unused_mask);	1673	&unused_mask);
1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1660	scrollbar_show (1);	1678	scrollbar_show (1);
1661	}	1679	}
1662	break;	1680	break;
1663	}	1681	}
1664		1682
1665	skip_switch: ;
1666
1667	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1668	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669	{	1685	{
1670	if (hidden_cursor)	1686	if (hidden_cursor)
1671	{	1687	{
…		…
1698	if (!focus)	1714	if (!focus)
1699	{	1715	{
1700	focus = 1;	1716	focus = 1;
1701	want_refresh = 1;	1717	want_refresh = 1;
1702		1718
1703	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704		1720
1705	#if USE_XIM	1721	#if USE_XIM
1706	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1707	{	1723	{
1708	IMSetStatusPosition ();	1724	IMSetPosition ();
1709	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1710	}	1726	}
1711	#endif	1727	#endif
1712	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1713	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
…		…
2171	#if TINTING	2187	#if TINTING
2172	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2173		2189
2174	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2175		2191
2176	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)
2177	{	2193	{
2178	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2179	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2196	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183	int i;	2199	int i;
2184		2200
2185	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2186		2202
2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2188		2204
2189	/* for convenience */	2205	/* for convenience */
2190	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2411	Atom atype;	2427	Atom atype;
2412	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2413	Window root, oldp, *list;	2429	Window root, oldp, *list;
2414	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2415	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2416	dDisp;
2417		2432
2418	pchanged = 0;	2433	pchanged = 0;
2419		2434
2420	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2421	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2422		2437
2423	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2424	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2425		2440
2426	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2427		2442
2428	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2429	{	2444	{
2430	if (am_transparent)	2445	if (am_transparent)
2431	{	2446	{
2432	pchanged = 1;	2447	pchanged = 1;
2433	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2434	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2435	}	2450	}
2436		2451
2437	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2438	}	2453	}
2439		2454
2440	/* 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. */
2441	XSync (disp, False);	2456	XSync (dpy, False);
2442		2457
2443	/*	2458	/*
2444	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2445	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2446	* 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.
2447	*/	2462	*/
2448	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2449	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2450	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2451	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2452		2467
2453	if (!i \|\| prop == NULL)	2468	if (!i \|\| prop == NULL)
2454	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2455	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2458		2473
2459	if (!i \|\| prop == NULL	2474	if (!i \|\| prop == NULL
2460	#if TINTING	2475	#if TINTING
2461	\|\| !rs[Rs_color + Color_tint]	2476	\|\| !ISSET_PIXCOLOR (Color_tint)
2462	#endif	2477	#endif
2463	)	2478	)
2464	have_pixmap = 0;	2479	have_pixmap = 0;
2465	else	2480	else
2466	{	2481	{
…		…
2479	Window cr;	2494	Window cr;
2480	XImage *image;	2495	XImage *image;
2481	GC gc;	2496	GC gc;
2482	XGCValues gcvalue;	2497	XGCValues gcvalue;
2483		2498
2484	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2485	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2486	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2487	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2488	nx = ny = 0;	2503	nx = ny = 0;
2489		2504
…		…
2502	}	2517	}
2503		2518
2504	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2505	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2506		2521
2507	XSync (disp, False);	2522	XSync (dpy, False);
2508	allowedxerror = -1;	2523	allowedxerror = -1;
2509	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2510		2525
2511	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2512	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2513	allowedxerror = 0;	2528	allowedxerror = 0;
2514		2529
…		…
2517	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2518	{	2533	{
2519	pchanged = 1;	2534	pchanged = 1;
2520	if (pixmap != None)	2535	if (pixmap != None)
2521	{	2536	{
2522	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2523	pixmap = None;	2538	pixmap = None;
2524	}	2539	}
2525	}	2540	}
2526		2541
2527	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2528	}	2543	}
2529	else	2544	else
2530	{	2545	{
2531	if (pixmap != None)	2546	if (pixmap != None)
2532	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2533		2548
2534	#if TINTING	2549	#if TINTING
2535	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2536	{	2551	{
2537	unsigned short rm, gm, bm;
2538	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539		2553
		2554	rgba c;
2540	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2541		2556
2542	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2543	}	2558	}
2544	#endif	2559	#endif
2545		2560
2546	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2547	szHint.width, szHint.height, image->depth);
2548	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2549	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2550	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2551	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2552	XDestroyImage (image);	2566	XDestroyImage (image);
2553	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2554	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2555		2569
2556	if (!am_transparent \|\| !am_pixmap_trans)	2570	if (!am_transparent \|\| !am_pixmap_trans)
2557	pchanged = 1;	2571	pchanged = 1;
2558		2572
2559	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2560	}	2574	}
2561	}	2575	}
2562		2576
2563	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2564	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2565	else	2579	else
2566	{	2580	{
2567	unsigned int n;	2581	unsigned int n;
2568	/*	2582	/*
2569	* InheritPixmap transparency	2583	* InheritPixmap transparency
2570	*/	2584	*/
2571	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572	{	2586	{
2573	oldp = parent[i];	2587	oldp = parent[i];
2574	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2575	&parent[i], &list, &n);
2576	XFree (list);	2589	XFree (list);
2577		2590
2578	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2579	{	2592	{
2580	if (oldp != None)	2593	if (oldp != None)
…		…
2588	}	2601	}
2589		2602
2590	n = 0;	2603	n = 0;
2591		2604
2592	if (pchanged)	2605	if (pchanged)
2593	{
2594	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2595	{	2607	{
2596	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2597	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2598	{	2611	{
2599	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2600	break;	2613	break;
2601	}	2614	}
2602	}	2615	}
2603	}
2604		2616
2605	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2606	{	2618	{
2607	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2608	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2609	am_transparent = 0;	2621	am_transparent = 0;
2610	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2611	}	2623	}
2612	else	2624	else
2613	{	2625	{
2614	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2615	{	2627	{
2616	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2617	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2618	}	2630	}
2619		2631
2620	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2621	am_transparent = 1;	2633	am_transparent = 1;
2622	}	2634	}
2623		2635
2624	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2625	parent[i] = None;	2637	parent[i] = None;
2626	}	2638	}
2627		2639
2628	if (scrollBar.win)	2640	if (scrollBar.win)
2629	{	2641	{
2630	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2631	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2632	scrollbar_show (0);	2644	scrollbar_show (0);
2633	}	2645	}
2634		2646
2635	if (am_transparent)	2647	if (am_transparent)
…		…
2753	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2754	refresh_limit++;	2766	refresh_limit++;
2755	else	2767	else
2756	{	2768	{
2757	flag = true;	2769	flag = true;
		2770	//TODO: due to popular request, implement "skipscroll" option here
2758	scr_refresh ();	2771	scr_refresh ();
2759	want_refresh = 1;	2772	want_refresh = 1;
2760	}	2773	}
2761	}	2774	}
2762		2775
…		…
3086	scr_charset_set (2, (unsigned int)cmd_getc ());	3099	scr_charset_set (2, (unsigned int)cmd_getc ());
3087	break;	3100	break;
3088	case '+':	3101	case '+':
3089	scr_charset_set (3, (unsigned int)cmd_getc ());	3102	scr_charset_set (3, (unsigned int)cmd_getc ());
3090	break;	3103	break;
3091	#if ENABLE_FRILLS	3104	#if !ENABLE_MINIMAL
3092	case '6':	3105	case '6':
3093	scr_backindex ();	3106	scr_backindex ();
3094	break;	3107	break;
3095	#endif	3108	#endif
3096	case '7':	3109	case '7':
3097	scr_cursor (SAVE);	3110	scr_cursor (SAVE);
3098	break;	3111	break;
3099	case '8':	3112	case '8':
3100	scr_cursor (RESTORE);	3113	scr_cursor (RESTORE);
3101	break;	3114	break;
3102	#if ENABLE_FRILLS	3115	#if !ENABLE_MINIMAL
3103	case '9':	3116	case '9':
3104	scr_forwardindex ();	3117	scr_forwardindex ();
3105	break;	3118	break;
3106	#endif	3119	#endif
3107	case '=':	3120	case '=':
…		…
3280	{	3293	{
3281	case '>':	3294	case '>':
3282	if (ch == CSI_DA) /* secondary device attributes */	3295	if (ch == CSI_DA) /* secondary device attributes */
3283	{	3296	{
3284	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	3297	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3285	// 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.	3298	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3286	//	3299	//
3287	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	3300	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3288	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	3301	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3289	// that we do not support xterm mouse reporting (should be 95 when we do).	3302	// that we do not support xterm mouse reporting (should be 95 when we do).
3290	//	3303	//
3291	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);	3304	tt_printf ("\033[>%d;94;0c", 'U');
3292	}	3305	}
3293	break;	3306	break;
3294	case '?':	3307	case '?':
3295	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3308	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3296	process_terminal_mode (ch, priv, nargs, arg);	3309	process_terminal_mode (ch, priv, nargs, arg);
…		…
3500	break;	3513	break;
3501	case CSI_75:	3514	case CSI_75:
3502	scr_cursor (RESTORE);	3515	scr_cursor (RESTORE);
3503	break;	3516	break;
3504		3517
3505	#if ENABLE_FRILLS	3518	#if !ENABLE_MINIMAL
3506	case CSI_74:	3519	case CSI_74:
3507	process_window_ops (arg, nargs);	3520	process_window_ops (arg, nargs);
3508	break;	3521	break;
3509	#endif	3522	#endif
3510		3523
…		…
3517	break;	3530	break;
3518	}	3531	}
3519	}	3532	}
3520	/}}} /	3533	/}}} /
3521		3534
3522	#if ENABLE_FRILLS	3535	#if !ENABLE_MINIMAL
3523	/* ARGSUSED */	3536	/* ARGSUSED */
3524	void	3537	void
3525	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3538	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3526	{	3539	{
3527	int x, y;	3540	int x, y;
3528	XWindowAttributes wattr;	3541	XWindowAttributes wattr;
3529	Window wdummy;	3542	Window wdummy;
3530	dDisp;	3543
		3544	dLocal (Display *, dpy);
3531		3545
3532	if (nargs == 0)	3546	if (nargs == 0)
3533	return;	3547	return;
3534		3548
3535	switch (args[0])	3549	switch (args[0])
3536	{	3550	{
3537	/*	3551	/*
3538	* commands	3552	* commands
3539	*/	3553	*/
3540	case 1: /* deiconify window */	3554	case 1: /* deiconify window */
3541	XMapWindow (disp, parent[0]);	3555	XMapWindow (dpy, parent[0]);
3542	break;	3556	break;
3543	case 2: /* iconify window */	3557	case 2: /* iconify window */
3544	XIconifyWindow (disp, parent[0], display->screen);	3558	XIconifyWindow (dpy, parent[0], display->screen);
3545	break;	3559	break;
3546	case 3: /* set position (pixels) */	3560	case 3: /* set position (pixels) */
3547	XMoveWindow (disp, parent[0], args[1], args[2]);	3561	XMoveWindow (dpy, parent[0], args[1], args[2]);
3548	break;	3562	break;
3549	case 4: /* set size (pixels) */	3563	case 4: /* set size (pixels) */
3550	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3564	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3551	break;	3565	break;
3552	case 5: /* raise window */	3566	case 5: /* raise window */
3553	XRaiseWindow (disp, parent[0]);	3567	XRaiseWindow (dpy, parent[0]);
3554	break;	3568	break;
3555	case 6: /* lower window */	3569	case 6: /* lower window */
3556	XLowerWindow (disp, parent[0]);	3570	XLowerWindow (dpy, parent[0]);
3557	break;	3571	break;
3558	case 7: /* refresh window */	3572	case 7: /* refresh window */
3559	scr_touch (true);	3573	scr_touch (true);
3560	break;	3574	break;
3561	case 8: /* set size (chars) */	3575	case 8: /* set size (chars) */
…		…
3568	if (args[0] >= 24) /* set height (chars) */	3582	if (args[0] >= 24) /* set height (chars) */
3569	set_widthheight ((unsigned int)width,	3583	set_widthheight ((unsigned int)width,
3570	(unsigned int) (args[1] * fheight));	3584	(unsigned int) (args[1] * fheight));
3571	break;	3585	break;
3572		3586
3573
3574	/*	3587	/*
3575	* reports - some output format copied from XTerm	3588	* reports - some output format copied from XTerm
3576	*/	3589	*/
3577	case 11: /* report window state */	3590	case 11: /* report window state */
3578	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (dpy, parent[0], &wattr);
3579	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3592	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3580	break;	3593	break;
3581	case 13: /* report window position */	3594	case 13: /* report window position */
3582	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (dpy, parent[0], &wattr);
3583	XTranslateCoordinates (disp, parent[0], wattr.root,	3596	XTranslateCoordinates (dpy, parent[0], wattr.root,
3584	-wattr.border_width, -wattr.border_width,	3597	-wattr.border_width, -wattr.border_width,
3585	&x, &y, &wdummy);	3598	&x, &y, &wdummy);
3586	tt_printf ("\033[3;%d;%dt", x, y);	3599	tt_printf ("\033[3;%d;%dt", x, y);
3587	break;	3600	break;
3588	case 14: /* report window size (pixels) */	3601	case 14: /* report window size (pixels) */
3589	XGetWindowAttributes (disp, parent[0], &wattr);	3602	XGetWindowAttributes (dpy, parent[0], &wattr);
3590	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3603	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3591	break;	3604	break;
3592	case 18: /* report text area size (chars) */	3605	case 18: /* report text area size (chars) */
3593	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3606	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3594	break;	3607	break;
…		…
3596	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3609	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3597	break;	3610	break;
3598	case 20: /* report icon label */	3611	case 20: /* report icon label */
3599	{	3612	{
3600	char *s;	3613	char *s;
3601	XGetIconName (disp, parent[0], &s);	3614	XGetIconName (dpy, parent[0], &s);
3602	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 */
3603	XFree (s);	3616	XFree (s);
3604	}	3617	}
3605	break;	3618	break;
3606	case 21: /* report window title */	3619	case 21: /* report window title */
3607	{	3620	{
3608	char *s;	3621	char *s;
3609	XFetchName (disp, parent[0], &s);	3622	XFetchName (dpy, parent[0], &s);
3610	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 */
3611	XFree (s);	3624	XFree (s);
3612	}	3625	}
3613	break;	3626	break;
3614	}	3627	}
…		…
3715	void	3728	void
3716	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)
3717	{	3730	{
3718	if (str[0] == '?' && !str[1])	3731	if (str[0] == '?' && !str[1])
3719	{	3732	{
3720	unsigned short r, g, b;	3733	rgba c;
3721	pix_colors_focused[color].get (display, r, g, b);	3734	pix_colors_focused[color].get (c);
		3735
		3736	#if XFT
		3737	if (c.a != rgba::MAX_CC)
		3738	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3739	else
		3740	#endif
3722	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3741	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3723	}	3742	}
3724	else	3743	else
3725	set_window_color (color, str);	3744	set_window_color (color, str);
3726	}	3745	}
3727		3746
…		…
3733	{	3752	{
3734	int color;	3753	int color;
3735	char buf, name;	3754	char buf, name;
3736	bool query = str[0] == '?' && !str[1];	3755	bool query = str[0] == '?' && !str[1];
3737	int saveop = op;	3756	int saveop = op;
3738	dDisp;	3757
		3758	dLocal (Display *, dpy);
3739		3759
3740	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
3741	switch (op)	3765	switch (op)
3742	{	3766	{
3743	case XTerm_name:	3767	case XTerm_name:
3744	set_title (str);	3768	set_title (str);
3745	/* FALLTHROUGH */	3769	/* FALLTHROUGH */
…		…
3759	unsigned long bytes_after;	3783	unsigned long bytes_after;
3760	unsigned char *value = 0;	3784	unsigned char *value = 0;
3761	const char *str = "";	3785	const char *str = "";
3762		3786
3763	if (prop	3787	if (prop
3764	&& XGetWindowProperty (disp, parent[0],	3788	&& XGetWindowProperty (dpy, parent[0],
3765	prop, 0, 1<<16, 0, AnyPropertyType,	3789	prop, 0, 1<<16, 0, AnyPropertyType,
3766	&actual_type, &actual_format,	3790	&actual_type, &actual_format,
3767	&nitems, &bytes_after, &value) == Success	3791	&nitems, &bytes_after, &value) == Success
3768	&& actual_type != None	3792	&& actual_type != None
3769	&& actual_format == 8)	3793	&& actual_format == 8)
3770	str = (const char *)(value);	3794	str = (const char *)(value);
3771		3795
3772	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3796	tt_printf ("\033]%d;%s%c", op, str, resp);
3773		3797
3774	XFree (value);	3798	XFree (value);
3775	}	3799	}
3776	else	3800	else
3777	{	3801	{
…		…
3781	{	3805	{
3782	*eq = 0;	3806	*eq = 0;
3783	set_utf8_property (display->atom (str), eq + 1);	3807	set_utf8_property (display->atom (str), eq + 1);
3784	}	3808	}
3785	else	3809	else
3786	XDeleteProperty (disp, parent[0],	3810	XDeleteProperty (dpy, parent[0],
3787	display->atom (str));	3811	display->atom (str));
3788	}	3812	}
3789	break;	3813	break;
3790		3814
3791	case XTerm_Color:	3815	case XTerm_Color:
…		…
3801	break;	3825	break;
3802		3826
3803	if ((buf = strchr (name, ';')) != NULL)	3827	if ((buf = strchr (name, ';')) != NULL)
3804	*buf++ = '\0';	3828	*buf++ = '\0';
3805		3829
3806	if (name[0] == '?' && !name[1])	3830	process_color_seq (op, color, name, resp);
3807	{
3808	unsigned short r, g, b;
3809	pix_colors_focused[color].get (display, r, g, b);
3810	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811	}
3812	else
3813	set_window_color (color, name);
3814	}	3831	}
3815	break;	3832	break;
3816	case XTerm_Color00:	3833	case XTerm_Color00:
3817	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3834	process_color_seq (op, Color_fg, str, resp);
3818	break;	3835	break;
3819	case XTerm_Color01:	3836	case XTerm_Color01:
3820	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3837	process_color_seq (op, Color_bg, str, resp);
3821	break;	3838	break;
3822	#ifndef NO_CURSORCOLOR	3839	#ifndef NO_CURSORCOLOR
3823	case XTerm_Color_cursor:	3840	case XTerm_Color_cursor:
3824	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3841	process_color_seq (op, Color_cursor, str, resp);
3825	break;	3842	break;
3826	#endif	3843	#endif
3827	case XTerm_Color_pointer_fg:	3844	case XTerm_Color_pointer_fg:
3828	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3845	process_color_seq (op, Color_pointer_fg, str, resp);
3829	break;	3846	break;
3830	case XTerm_Color_pointer_bg:	3847	case XTerm_Color_pointer_bg:
3831	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3848	process_color_seq (op, Color_pointer_bg, str, resp);
3832	break;	3849	break;
3833	#ifndef NO_BOLD_UNDERLINE_REVERSE	3850	#ifndef NO_BOLD_UNDERLINE_REVERSE
3834	case XTerm_Color_RV:	3851	case XTerm_Color_RV:
3835	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3852	process_color_seq (op, Color_RV, str, resp);
3836	break;	3853	break;
3837	case Rxvt_Color_BD:	3854	case Rxvt_Color_BD:
3838	case URxvt_Color_BD:	3855	case URxvt_Color_BD:
3839	process_color_seq (op, Color_BD, str, resp);	3856	process_color_seq (op, Color_BD, str, resp);
3840	break;	3857	break;
3841	case Rxvt_Color_UL:	3858	case Rxvt_Color_UL:
3842	case URxvt_Color_UL:	3859	case URxvt_Color_UL:
3843	process_color_seq (op, Color_UL, str, resp);	3860	process_color_seq (op, Color_UL, str, resp);
3844	break;	3861	break;
3845	case URxvt_Color_IT:	3862	case URxvt_Color_IT:
3846	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3863	process_color_seq (op, Color_IT, str, resp);
3847	break;	3864	break;
3848	#endif	3865	#endif
3849	#if TRANSPARENT && TINTING	3866	#if TRANSPARENT && TINTING
3850	case URxvt_Color_tint:	3867	case URxvt_Color_tint:
3851	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3868	process_color_seq (op, Color_tint, str, resp);
		3869
3852	check_our_parents ();	3870	check_our_parents ();
		3871
3853	if (am_transparent)	3872	if (am_transparent)
3854	want_full_refresh = want_refresh = 1;	3873	want_full_refresh = want_refresh = 1;
		3874
3855	break;	3875	break;
3856	#endif	3876	#endif
3857		3877
3858	case Rxvt_Pixmap:	3878	case Rxvt_Pixmap:
3859	{	3879	{
…		…
3930	allocated.push_back ((void *)res);	3950	allocated.push_back ((void *)res);
3931	set_fonts ();	3951	set_fonts ();
3932	}	3952	}
3933	break;	3953	break;
3934		3954
3935	#if ENABLE_FRILLS	3955	case URxvt_version:
		3956	if (query)
		3957	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3958	op,
		3959	rs[Rs_name], VERSION[0], VERSION[2],
		3960	resp);
		3961	break;
		3962
		3963	#if !ENABLE_MINIMAL
3936	case URxvt_locale:	3964	case URxvt_locale:
3937	if (query)	3965	if (query)
3938	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3966	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3939	else	3967	else
3940	{	3968	{
3941	set_locale (str);	3969	set_locale (str);
3942	pty->set_utf8_mode (enc_utf8);	3970	pty->set_utf8_mode (enc_utf8);
3943	init_xlocale ();	3971	init_xlocale ();
…		…
3958	break;	3986	break;
3959	#endif	3987	#endif
3960		3988
3961	#if ENABLE_PERL	3989	#if ENABLE_PERL
3962	case URxvt_perl:	3990	case URxvt_perl:
3963	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)))
3964	; // no responses yet	3992	; // no responses yet
3965	break;	3993	break;
3966	#endif	3994	#endif
3967	}	3995	}
3968	}	3996	}
…		…
4304	scr_color (Color_bg, Color_bg);	4332	scr_color (Color_bg, Color_bg);
4305	break;	4333	break;
4306		4334
4307	//case 50: // not variable spacing	4335	//case 50: // not variable spacing
4308		4336
4309	#if ENABLE_FRILLS	4337	#if !ENABLE_MINIMAL
4310	case 90:	4338	case 90:
4311	case 91: /* set bright fg color */	4339	case 91: /* set bright fg color */
4312	case 92:	4340	case 92:
4313	case 93:	4341	case 93:
4314	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.284 by root, Wed Jan 25 02:42:06 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.284 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.312 by root, Sat Mar 4 22:05:05 2006 UTC