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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 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>
		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
…		…
299	rxvt_term::lookup_key (XKeyEvent &ev)	305	rxvt_term::lookup_key (XKeyEvent &ev)
300	{	306	{
301	int ctrl, meta, shft, len;	307	int ctrl, meta, shft, len;
302	unsigned int newlen;	308	unsigned int newlen;
303	KeySym keysym;	309	KeySym keysym;
304	#ifdef DEBUG_CMD
305	static int debug_key = 1; /* accessible by a debugger only */
306	#endif
307	int valid_keysym;	310	int valid_keysym;
308	char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
309		312
310	/*	313	/*
311	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
902	{	905	{
903	const char ch = C0_ESC;	906	const char ch = C0_ESC;
904	tt_write (&ch, 1);	907	tt_write (&ch, 1);
905	}	908	}
906		909
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	910	tt_write (kbuf, (unsigned int)len);
918	}	911	}
919	/}}} /	912	/}}} /
920		913
921	#if defined (KEYSYM_RESOURCE)	914	#if defined (KEYSYM_RESOURCE)
…		…
1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102	}	1095	}
1103	}	1096	}
1104	#endif	1097	#endif
1105		1098
1106	#if HAVE_SCHED_YIELD	1099	#if LINUX_YIELD_HACK
1107	static struct event_handler	1100	static struct event_handler
1108	{	1101	{
1109	check_watcher cw_yield;	1102	check_watcher yield_ev;
1110		1103
1111	void yield (check_watcher &w)	1104	void yield_cb (check_watcher &w)
1112	{	1105	{
1113	sched_yield ();	1106	// this should really be sched_yield(), but the linux guys thought
		1107	// that giving a process calling sched_yield () less cpu time than
		1108	// ones with high nice levels is a useful thing to do. It surely is is
		1109	// allowed by the sus... as is returning ENOSYS.
		1110
		1111	struct timespec ts = { 0, 0 };
		1112	nanosleep (&ts, 0);
		1113
1114	w.stop ();	1114	w.stop ();
1115	}	1115	}
1116		1116
1117	event_handler ()	1117	event_handler ()
1118	: cw_yield (this, &event_handler::yield)	1118	: yield_ev (this, &event_handler::yield_cb)
1119	{	1119	{
1120	}	1120	}
1121	} event_handler;	1121	} event_handler;
1122	#endif	1122	#endif
1123		1123
…		…
1143	cmdbuf_endp += r;	1143	cmdbuf_endp += r;
1144	return true;	1144	return true;
1145	}	1145	}
1146	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1146	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1147	{	1147	{
1148	#if HAVE_SCHED_YIELD	1148	#if LINUX_YIELD_HACK
1149	if (display->is_local)	1149	if (display->is_local)
1150	event_handler.cw_yield.start ();	1150	event_handler.yield_ev.start ();
1151	#endif	1151	#endif
1152	}	1152	}
1153	else	1153	else
1154	{	1154	{
1155	pty_ev.stop ();	1155	pty_ev.stop ();
…		…
1177	}	1177	}
1178		1178
1179	void	1179	void
1180	rxvt_term::pointer_unblank ()	1180	rxvt_term::pointer_unblank ()
1181	{	1181	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1182	XDefineCursor (xdisp, vt, TermWin_cursor);
1183	recolour_cursor ();	1183	recolour_cursor ();
1184		1184
1185	#ifdef POINTER_BLANK	1185	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1186	hidden_pointer = 0;
1187		1187
…		…
1195	rxvt_term::pointer_blank ()	1195	rxvt_term::pointer_blank ()
1196	{	1196	{
1197	if (!OPTION (Opt_pointerBlank))	1197	if (!OPTION (Opt_pointerBlank))
1198	return;	1198	return;
1199		1199
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1200	XDefineCursor (xdisp, vt, display->blank_cursor);
1201	XFlush (display->display);	1201	XFlush (xdisp);
1202		1202
1203	hidden_pointer = 1;	1203	hidden_pointer = 1;
1204	}	1204	}
1205		1205
1206	void	1206	void
…		…
1279	(32 + button_number + key_state),	1279	(32 + button_number + key_state),
1280	(32 + x + 1),	1280	(32 + x + 1),
1281	(32 + y + 1));	1281	(32 + y + 1));
1282	}	1282	}
1283		1283
1284	#ifdef USING_W11LIB
1285	void
1286	rxvt_W11_process_x_event (XEvent *ev)
1287	{
1288	rxvt_t *r = rxvt_get_r ();
1289
1290	x_cb (*ev);
1291	}
1292	#endif
1293
1294	/{{{ process an X event /	1284	/{{{ process an X event /
1295	void	1285	void
1296	rxvt_term::x_cb (XEvent &ev)	1286	rxvt_term::x_cb (XEvent &ev)
1297	{	1287	{
1298	make_current ();	1288	make_current ();
1299		1289
1300	dDisp;	1290	dLocal (Display *, xdisp);
1301		1291
1302	if (ev.xany.window == vt	1292	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1293	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1294	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1295	return;
…		…
1402	button_release (ev.xbutton);	1392	button_release (ev.xbutton);
1403	break;	1393	break;
1404		1394
1405	case ClientMessage:	1395	case ClientMessage:
1406	if (ev.xclient.format == 32	1396	if (ev.xclient.format == 32
1407	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1397	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408	{	1398	{
		1399	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1400	{
		1401	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1402	{
1409	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1403	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1404	{
		1405	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1410	destroy ();	1406	destroy ();
		1407	}
1411	#if ENABLE_EWMH	1408	#if ENABLE_EWMH
1412	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1409	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413	XSendEvent (disp, ev.xclient.window = display->root,	1410	XSendEvent (xdisp, ev.xclient.window = display->root,
1414	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1411	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1415	&ev);	1412	&ev);
		1413	#endif
		1414	}
		1415	}
		1416	#if ENABLE_XEMBED
		1417	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1418	{
		1419	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1420	focus_in ();
		1421	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1422	focus_out ();
		1423	}
1416	#endif	1424	#endif
1417	}	1425	}
1418	#if ENABLE_XEMBED
1419	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420	{
1421	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422	focus_in ();
1423	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424	focus_out ();
1425	}
1426	#endif
1427	#ifdef OFFIX_DND
1428	/* OffiX Dnd (drag 'n' drop) protocol */
1429	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430	&& (ev.xclient.data.l[0] == DndFile
1431	\|\| ev.xclient.data.l[0] == DndDir
1432	\|\| ev.xclient.data.l[0] == DndLink))
1433	{
1434	/* Get Dnd data */
1435	Atom ActualType;
1436	int ActualFormat;
1437	unsigned char *data;
1438	unsigned long Size, RemainingBytes;
1439
1440	XGetWindowProperty (disp, display->root,
1441	xa[XA_DNDSELECTION],
1442	0L, 1000000L,
1443	False, AnyPropertyType,
1444	&ActualType, &ActualFormat,
1445	&Size, &RemainingBytes,
1446	&data);
1447	set_string_property (XA_CUT_BUFFER0, data);
1448	XFree (data);
1449	selection_paste (display->root, XA_CUT_BUFFER0, true);
1450	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451	}
1452	#endif /* OFFIX_DND */
1453	break;	1426	break;
1454		1427
1455	case MappingNotify:	1428	case MappingNotify:
1456	XRefreshKeyboardMapping (&ev.xmapping);	1429	XRefreshKeyboardMapping (&ev.xmapping);
1457	break;	1430	break;
…		…
1490	break;	1463	break;
1491		1464
1492	case ConfigureNotify:	1465	case ConfigureNotify:
1493	if (ev.xconfigure.window == parent[0])	1466	if (ev.xconfigure.window == parent[0])
1494	{	1467	{
1495	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1468	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1496	;	1469	;
1497		1470
1498	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1471	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1499	{	1472	{
1500	seen_resize = 1;	1473	seen_resize = 1;
…		…
1509	#endif	1482	#endif
1510	}	1483	}
1511	break;	1484	break;
1512		1485
1513	case PropertyNotify:	1486	case PropertyNotify:
		1487	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1488	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515	&& ev.xproperty.state == PropertyNewValue)	1489	&& ev.xproperty.state == PropertyNewValue)
1516	selection_property (ev.xproperty.window, ev.xproperty.atom);	1490	selection_property (ev.xproperty.window, ev.xproperty.atom);
1517		1491
1518	break;	1492	break;
1519		1493
1520	case SelectionClear:	1494	case SelectionClear:
1521	selection_clear ();	1495	selection_clear ();
…		…
1557	if (ev.xany.window == vt)	1531	if (ev.xany.window == vt)
1558	{	1532	{
1559	do	1533	do
1560	scr_expose (ev.xexpose.x, ev.xexpose.y,	1534	scr_expose (ev.xexpose.x, ev.xexpose.y,
1561	ev.xexpose.width, ev.xexpose.height, False);	1535	ev.xexpose.width, ev.xexpose.height, False);
1562	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1536	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1563		1537
1564	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1538	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565		1539
1566	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1540	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1567	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1568	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
1569		1543
1570	want_refresh = 1;	1544	want_refresh = 1;
1571	}	1545	}
1572	else	1546	else
1573	{	1547	{
1574	XEvent unused_event;	1548	XEvent unused_event;
1575		1549
1576	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1550	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1577	;	1551	;
1578	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1552	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1579	;	1553	;
1580		1554
1581	if (isScrollbarWindow (ev.xany.window))	1555	if (isScrollbarWindow (ev.xany.window))
1582	{	1556	{
1583	scrollBar.setIdle ();	1557	scrollBar.setIdle ();
1584	scrollbar_show (0);	1558	scrollbar_show (0);
1585	}	1559	}
1586		1560
1587	#ifdef TRANSPARENT	1561	#ifdef TRANSPARENT
1588	if (am_transparent && ev.xany.window == parent[0])	1562	if (am_transparent && ev.xany.window == parent[0])
1589	XClearWindow (disp, ev.xany.window);	1563	XClearWindow (xdisp, ev.xany.window);
1590	#endif	1564	#endif
1591	}	1565	}
1592	break;	1566	break;
1593		1567
1594	case MotionNotify:	1568	case MotionNotify:
…		…
1604	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1578	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1579	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606	; // nop	1580	; // nop
1607	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1581	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1608	{	1582	{
1609	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1583	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1610	;	1584	;
1611		1585
1612	XQueryPointer (disp, vt,	1586	XQueryPointer (xdisp, vt,
1613	&unused_root, &unused_child,	1587	&unused_root, &unused_child,
1614	&unused_root_x, &unused_root_y,	1588	&unused_root_x, &unused_root_y,
1615	&ev.xbutton.x, &ev.xbutton.y,	1589	&ev.xbutton.x, &ev.xbutton.y,
1616	&ev.xbutton.state);	1590	&ev.xbutton.state);
1617	#ifdef MOUSE_THRESHOLD	1591	#ifdef MOUSE_THRESHOLD
…		…
1681	#endif	1655	#endif
1682	}	1656	}
1683	}	1657	}
1684	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1658	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685	{	1659	{
1686	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1660	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1687	MotionNotify, &ev))	1661	MotionNotify, &ev))
1688	;	1662	;
1689		1663
1690	XQueryPointer (disp, scrollBar.win,	1664	XQueryPointer (xdisp, scrollBar.win,
1691	&unused_root, &unused_child,	1665	&unused_root, &unused_child,
1692	&unused_root_x, &unused_root_y,	1666	&unused_root_x, &unused_root_y,
1693	&ev.xbutton.x, &ev.xbutton.y,	1667	&ev.xbutton.x, &ev.xbutton.y,
1694	&unused_mask);	1668	&unused_mask);
1695	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1669	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1839	/*	1813	/*
1840	* VT window processing of button press	1814	* VT window processing of button press
1841	*/	1815	*/
1842	if (ev.window == vt)	1816	if (ev.window == vt)
1843	{	1817	{
		1818	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1819	return;
		1820
1844	#if ISO_14755	1821	#if ISO_14755
1845	// 5.4	1822	// 5.4
1846	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1823	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1847	{	1824	{
1848	iso14755_54 (ev.x, ev.y);	1825	iso14755_54 (ev.x, ev.y);
…		…
1890	else	1867	else
1891	{	1868	{
1892	if (ev.button != MEvent.button)	1869	if (ev.button != MEvent.button)
1893	MEvent.clicks = 0;	1870	MEvent.clicks = 0;
1894		1871
1895	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896	switch (ev.button)	1872	switch (ev.button)
1897	{	1873	{
1898	case Button1:	1874	case Button1:
1899	/* allow meta + click to select rectangular areas */	1875	/* allow meta + click to select rectangular areas */
1900	/* should be done in screen.C */	1876	/* should be done in screen.C */
1901	#if ENABLE_FRILLS	1877	#if ENABLE_FRILLS
1902	selection.rect = !!(ev.state & ModMetaMask);	1878	selection.rect = !!(ev.state & ModMetaMask);
1903	#else	1879	#else
1904	selection.rect = false;	1880	selection.rect = false;
1905	#endif	1881	#endif
1906		1882
1907	/* allow shift+left click to extend selection */	1883	/* allow shift+left click to extend selection */
1908	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1884	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909	{	1885	{
1910	if (MEvent.button == Button1 && clickintime)	1886	if (MEvent.button == Button1 && clickintime)
1911	selection_rotate (ev.x, ev.y);	1887	selection_rotate (ev.x, ev.y);
1912	else	1888	else
1913	selection_extend (ev.x, ev.y, 1);	1889	selection_extend (ev.x, ev.y, 1);
1914	}	1890	}
1915	else	1891	else
1916	{	1892	{
1917	if (MEvent.button == Button1 && clickintime)	1893	if (MEvent.button == Button1 && clickintime)
1918	MEvent.clicks++;	1894	MEvent.clicks++;
1919	else	1895	else
1920	MEvent.clicks = 1;	1896	MEvent.clicks = 1;
1921		1897
1922	selection_click (MEvent.clicks, ev.x, ev.y);	1898	selection_click (MEvent.clicks, ev.x, ev.y);
1923	}	1899	}
1924		1900
1925	MEvent.button = Button1;	1901	MEvent.button = Button1;
1926	break;	1902	break;
1927		1903
1928	case Button3:	1904	case Button3:
1929	if (MEvent.button == Button3 && clickintime)	1905	if (MEvent.button == Button3 && clickintime)
1930	selection_rotate (ev.x, ev.y);	1906	selection_rotate (ev.x, ev.y);
1931	else	1907	else
1932	selection_extend (ev.x, ev.y, 1);	1908	selection_extend (ev.x, ev.y, 1);
1933		1909
1934	MEvent.button = Button3;	1910	MEvent.button = Button3;
1935	break;	1911	break;
1936	}	1912	}
1937	}	1913	}
1938		1914
1939	MEvent.time = ev.time;	1915	MEvent.time = ev.time;
1940	return;	1916	return;
1941	}	1917	}
1942		1918
…		…
2105	sel_scroll_ev.stop();	2081	sel_scroll_ev.stop();
2106	#endif	2082	#endif
2107		2083
2108	if (ev.window == vt)	2084	if (ev.window == vt)
2109	{	2085	{
		2086	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2087	return;
		2088
2110	#if ISO_14755	2089	#if ISO_14755
2111	// 5.4	2090	// 5.4
2112	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2091	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2113	return;	2092	return;
2114	#endif	2093	#endif
		2094
2115	if (reportmode)	2095	if (reportmode)
2116	{	2096	{
2117	/* mouse report from vt window */	2097	/* mouse report from vt window */
2118	/* don't report release of wheel "buttons" */	2098	/* don't report release of wheel "buttons" */
2119	if (ev.button >= 4)	2099	if (ev.button >= 4)
…		…
2143	if (priv_modes & PrivMode_mouse_report	2123	if (priv_modes & PrivMode_mouse_report
2144	&& bypass_keystate	2124	&& bypass_keystate
2145	&& ev.button == Button1 && MEvent.clicks <= 1)	2125	&& ev.button == Button1 && MEvent.clicks <= 1)
2146	selection_extend (ev.x, ev.y, 0);	2126	selection_extend (ev.x, ev.y, 0);
2147		2127
2148	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149	return;
2150
2151	switch (ev.button)	2128	switch (ev.button)
2152	{	2129	{
2153	case Button1:	2130	case Button1:
2154	case Button3:	2131	case Button3:
2155	selection_make (ev.time);	2132	selection_make (ev.time);
2156	break;	2133	break;
2157		2134
2158	case Button2:	2135	case Button2:
2159	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2136	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);	2137	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2161	break;	2138	break;
2162		2139
2163	#ifdef MOUSE_WHEEL	2140	#ifdef MOUSE_WHEEL
2164	case Button4:	2141	case Button4:
2165	case Button5:	2142	case Button5:
…		…
2207	#if TINTING	2184	#if TINTING
2208	/* taken from aterm-0.4.2 */	2185	/* taken from aterm-0.4.2 */
2209		2186
2210	typedef uint32_t RUINT32T;	2187	typedef uint32_t RUINT32T;
2211		2188
2212	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2189	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2213	{	2190	{
2214	int sh_r, sh_g, sh_b;	2191	int sh_r, sh_g, sh_b;
2215	RUINT32T mask_r, mask_g, mask_b;	2192	RUINT32T mask_r, mask_g, mask_b;
2216	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2193	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2217	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2194	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2195	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219	int i;	2196	int i;
2220		2197
2221	Visual *visual = display->visual;	2198	Visual *visual = term->visual;
2222		2199
2223	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2200	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2224		2201
2225	/* for convenience */	2202	/* for convenience */
2226	mask_r = visual->red_mask;	2203	mask_r = visual->red_mask;
…		…
2447	Atom atype;	2424	Atom atype;
2448	unsigned char *prop = NULL;	2425	unsigned char *prop = NULL;
2449	Window root, oldp, *list;	2426	Window root, oldp, *list;
2450	Pixmap rootpixmap = None;	2427	Pixmap rootpixmap = None;
2451	XWindowAttributes wattr, wrootattr;	2428	XWindowAttributes wattr, wrootattr;
2452	dDisp;
2453		2429
2454	pchanged = 0;	2430	pchanged = 0;
2455		2431
2456	if (!OPTION (Opt_transparent))	2432	if (!OPTION (Opt_transparent))
2457	return pchanged; /* Don't try any more */	2433	return pchanged; /* Don't try any more */
2458		2434
2459	XGetWindowAttributes (disp, display->root, &wrootattr);	2435	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2460	rootdepth = wrootattr.depth;	2436	rootdepth = wrootattr.depth;
2461		2437
2462	XGetWindowAttributes (disp, parent[0], &wattr);	2438	XGetWindowAttributes (xdisp, parent[0], &wattr);
2463		2439
2464	if (rootdepth != wattr.depth)	2440	if (rootdepth != wattr.depth)
2465	{	2441	{
2466	if (am_transparent)	2442	if (am_transparent)
2467	{	2443	{
2468	pchanged = 1;	2444	pchanged = 1;
2469	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2445	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2470	am_transparent = am_pixmap_trans = 0;	2446	am_transparent = am_pixmap_trans = 0;
2471	}	2447	}
2472		2448
2473	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2474	}	2450	}
2475		2451
2476	/* Get all X ops out of the queue so that our information is up-to-date. */	2452	/* Get all X ops out of the queue so that our information is up-to-date. */
2477	XSync (disp, False);	2453	XSync (xdisp, False);
2478		2454
2479	/*	2455	/*
2480	* Make the frame window set by the window manager have	2456	* Make the frame window set by the window manager have
2481	* the root background. Some window managers put multiple nested frame	2457	* the root background. Some window managers put multiple nested frame
2482	* windows for each client, so we have to take care about that.	2458	* windows for each client, so we have to take care about that.
2483	*/	2459	*/
2484	i = (xa[XA_XROOTPMAP_ID]	2460	i = (xa[XA_XROOTPMAP_ID]
2485	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2486	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2488		2464
2489	if (!i \|\| prop == NULL)	2465	if (!i \|\| prop == NULL)
2490	i = (xa[XA_ESETROOT_PMAP_ID]	2466	i = (xa[XA_ESETROOT_PMAP_ID]
2491	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2467	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493	&nitems, &bytes_after, &prop) == Success);	2469	&nitems, &bytes_after, &prop) == Success);
2494		2470
2495	if (!i \|\| prop == NULL	2471	if (!i \|\| prop == NULL
2496	#if TINTING	2472	#if TINTING
2497	\|\| !rs[Rs_color + Color_tint]	2473	\|\| !ISSET_PIXCOLOR (Color_tint)
2498	#endif	2474	#endif
2499	)	2475	)
2500	have_pixmap = 0;	2476	have_pixmap = 0;
2501	else	2477	else
2502	{	2478	{
…		…
2515	Window cr;	2491	Window cr;
2516	XImage *image;	2492	XImage *image;
2517	GC gc;	2493	GC gc;
2518	XGCValues gcvalue;	2494	XGCValues gcvalue;
2519		2495
2520	XTranslateCoordinates (disp, parent[0], display->root,	2496	XTranslateCoordinates (xdisp, parent[0], display->root,
2521	0, 0, &sx, &sy, &cr);	2497	0, 0, &sx, &sy, &cr);
2522	nw = (unsigned int)szHint.width;	2498	nw = (unsigned int)szHint.width;
2523	nh = (unsigned int)szHint.height;	2499	nh = (unsigned int)szHint.height;
2524	nx = ny = 0;	2500	nx = ny = 0;
2525		2501
…		…
2538	}	2514	}
2539		2515
2540	min_it (nw, (unsigned int) (wrootattr.width - sx));	2516	min_it (nw, (unsigned int) (wrootattr.width - sx));
2541	min_it (nh, (unsigned int) (wrootattr.height - sy));	2517	min_it (nh, (unsigned int) (wrootattr.height - sy));
2542		2518
2543	XSync (disp, False);	2519	XSync (xdisp, False);
2544	allowedxerror = -1;	2520	allowedxerror = -1;
2545	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2521	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546		2522
2547	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2523	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2548	/* XXX: may need a delay here? */	2524	/* XXX: may need a delay here? */
2549	allowedxerror = 0;	2525	allowedxerror = 0;
2550		2526
…		…
2553	if (am_transparent && am_pixmap_trans)	2529	if (am_transparent && am_pixmap_trans)
2554	{	2530	{
2555	pchanged = 1;	2531	pchanged = 1;
2556	if (pixmap != None)	2532	if (pixmap != None)
2557	{	2533	{
2558	XFreePixmap (disp, pixmap);	2534	XFreePixmap (xdisp, pixmap);
2559	pixmap = None;	2535	pixmap = None;
2560	}	2536	}
2561	}	2537	}
2562		2538
2563	am_pixmap_trans = 0;	2539	am_pixmap_trans = 0;
2564	}	2540	}
2565	else	2541	else
2566	{	2542	{
2567	if (pixmap != None)	2543	if (pixmap != None)
2568	XFreePixmap (disp, pixmap);	2544	XFreePixmap (xdisp, pixmap);
2569		2545
2570	#if TINTING	2546	#if TINTING
2571	if (ISSET_PIXCOLOR (Color_tint))	2547	if (ISSET_PIXCOLOR (Color_tint))
2572	{	2548	{
2573	unsigned short rm, gm, bm;
2574	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2549	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575		2550
		2551	rgba c;
2576	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2552	pix_colors_focused [Color_tint].get (c);
2577		2553
2578	ShadeXImage (display, image, shade, rm, gm, bm);	2554	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579	}	2555	}
2580	#endif	2556	#endif
2581		2557
2582	pixmap = XCreatePixmap (disp, vt,	2558	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2583	szHint.width, szHint.height, image->depth);
2584	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2559	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2585	XPutImage (disp, pixmap, gc, image, 0, 0,	2560	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2586	nx, ny, image->width, image->height);	2561	nx, ny, image->width, image->height);
2587	XFreeGC (disp, gc);	2562	XFreeGC (xdisp, gc);
2588	XDestroyImage (image);	2563	XDestroyImage (image);
2589	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2564	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2590	XClearWindow (disp, parent[0]);	2565	XClearWindow (xdisp, parent[0]);
2591		2566
2592	if (!am_transparent \|\| !am_pixmap_trans)	2567	if (!am_transparent \|\| !am_pixmap_trans)
2593	pchanged = 1;	2568	pchanged = 1;
2594		2569
2595	am_transparent = am_pixmap_trans = 1;	2570	am_transparent = am_pixmap_trans = 1;
2596	}	2571	}
2597	}	2572	}
2598		2573
2599	if (am_pixmap_trans)	2574	if (am_pixmap_trans)
2600	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2575	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601	else	2576	else
2602	{	2577	{
2603	unsigned int n;	2578	unsigned int n;
2604	/*	2579	/*
2605	* InheritPixmap transparency	2580	* InheritPixmap transparency
2606	*/	2581	*/
2607	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2582	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608	{	2583	{
2609	oldp = parent[i];	2584	oldp = parent[i];
2610	XQueryTree (disp, parent[i - 1], &root,	2585	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2611	&parent[i], &list, &n);
2612	XFree (list);	2586	XFree (list);
2613		2587
2614	if (parent[i] == display->root)	2588	if (parent[i] == display->root)
2615	{	2589	{
2616	if (oldp != None)	2590	if (oldp != None)
…		…
2624	}	2598	}
2625		2599
2626	n = 0;	2600	n = 0;
2627		2601
2628	if (pchanged)	2602	if (pchanged)
2629	{
2630	for (; n < (unsigned int)i; n++)	2603	for (; n < (unsigned int)i; n++)
2631	{	2604	{
2632	XGetWindowAttributes (disp, parent[n], &wattr);	2605	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2606
2633	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2634	{	2608	{
2635	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636	break;	2610	break;
2637	}	2611	}
2638	}	2612	}
2639	}
2640		2613
2641	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2614	if (n > (sizeof (parent) / sizeof (parent[0])))
2642	{	2615	{
2643	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2616	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2644	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2617	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2645	am_transparent = 0;	2618	am_transparent = 0;
2646	/* XXX: also turn off Opt_transparent? */	2619	/* XXX: also turn off Opt_transparent? */
2647	}	2620	}
2648	else	2621	else
2649	{	2622	{
2650	#if WAIT_FOR_WM
2651	/* wait (an arbitrary period) for the WM to do its thing
2652	* needed for fvwm2.2.2 (and before?) */
2653	sleep (1);
2654	#endif
2655	for (n = 0; n < (unsigned int)i; n++)	2623	for (n = 0; n < (unsigned int)i; n++)
2656	{	2624	{
2657	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2658	XClearWindow (disp, parent[n]);	2626	XClearWindow (xdisp, parent[n]);
2659	}	2627	}
2660		2628
2661	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2629	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2662	am_transparent = 1;	2630	am_transparent = 1;
2663	}	2631	}
2664		2632
2665	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2633	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666	parent[i] = None;	2634	parent[i] = None;
2667	}	2635	}
2668		2636
2669	if (scrollBar.win)	2637	if (scrollBar.win)
2670	{	2638	{
2671	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2639	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2672	scrollBar.setIdle ();	2640	scrollBar.setIdle ();
2673	scrollbar_show (0);	2641	scrollbar_show (0);
2674	}	2642	}
2675		2643
2676	if (am_transparent)	2644	if (am_transparent)
…		…
3127	scr_charset_set (2, (unsigned int)cmd_getc ());	3095	scr_charset_set (2, (unsigned int)cmd_getc ());
3128	break;	3096	break;
3129	case '+':	3097	case '+':
3130	scr_charset_set (3, (unsigned int)cmd_getc ());	3098	scr_charset_set (3, (unsigned int)cmd_getc ());
3131	break;	3099	break;
3132	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3133	case '6':	3101	case '6':
3134	scr_backindex ();	3102	scr_backindex ();
3135	break;	3103	break;
3136	#endif	3104	#endif
3137	case '7':	3105	case '7':
3138	scr_cursor (SAVE);	3106	scr_cursor (SAVE);
3139	break;	3107	break;
3140	case '8':	3108	case '8':
3141	scr_cursor (RESTORE);	3109	scr_cursor (RESTORE);
3142	break;	3110	break;
3143	#if ENABLE_FRILLS	3111	#if !ENABLE_MINIMAL
3144	case '9':	3112	case '9':
3145	scr_forwardindex ();	3113	scr_forwardindex ();
3146	break;	3114	break;
3147	#endif	3115	#endif
3148	case '=':	3116	case '=':
…		…
3310	ndef = get_byte_array_bit (csi_defaults, i);	3278	ndef = get_byte_array_bit (csi_defaults, i);
3311	for (p = 0; p < nargs; p++)	3279	for (p = 0; p < nargs; p++)
3312	if (arg[p] == -1)	3280	if (arg[p] == -1)
3313	arg[p] = ndef;	3281	arg[p] = ndef;
3314		3282
3315	#ifdef DEBUG_CMD
3316	fprintf (stderr, "CSI ");
3317	for (p = 0; p < nargs; p++)
3318	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3319	fprintf (stderr, "%c\n", ch);
3320	#endif
3321
3322	/*	3283	/*
3323	* private mode handling	3284	* private mode handling
3324	*/	3285	*/
3325	if (priv)	3286	if (priv)
3326	{	3287	{
3327	switch (priv)	3288	switch (priv)
3328	{	3289	{
3329	case '>':	3290	case '>':
3330	if (ch == CSI_DA) /* secondary device attributes */	3291	if (ch == CSI_DA) /* secondary device attributes */
3331	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3292	{
		3293	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3294	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3295	//
		3296	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3297	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3298	// that we do not support xterm mouse reporting (should be 95 when we do).
		3299	//
		3300	tt_printf ("\033[>%d;94;0c", 'U');
		3301	}
3332	break;	3302	break;
3333	case '?':	3303	case '?':
3334	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3304	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3335	process_terminal_mode (ch, priv, nargs, arg);	3305	process_terminal_mode (ch, priv, nargs, arg);
3336	break;	3306	break;
…		…
3539	break;	3509	break;
3540	case CSI_75:	3510	case CSI_75:
3541	scr_cursor (RESTORE);	3511	scr_cursor (RESTORE);
3542	break;	3512	break;
3543		3513
3544	#if ENABLE_FRILLS	3514	#if !ENABLE_MINIMAL
3545	case CSI_74:	3515	case CSI_74:
3546	process_window_ops (arg, nargs);	3516	process_window_ops (arg, nargs);
3547	break;	3517	break;
3548	#endif	3518	#endif
3549		3519
…		…
3556	break;	3526	break;
3557	}	3527	}
3558	}	3528	}
3559	/}}} /	3529	/}}} /
3560		3530
3561	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3562	/* ARGSUSED */	3532	/* ARGSUSED */
3563	void	3533	void
3564	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3534	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3565	{	3535	{
3566	int x, y;	3536	int x, y;
3567	XWindowAttributes wattr;	3537	XWindowAttributes wattr;
3568	Window wdummy;	3538	Window wdummy;
3569	dDisp;	3539
		3540	dLocal (Display *, xdisp);
3570		3541
3571	if (nargs == 0)	3542	if (nargs == 0)
3572	return;	3543	return;
3573		3544
3574	switch (args[0])	3545	switch (args[0])
3575	{	3546	{
3576	/*	3547	/*
3577	* commands	3548	* commands
3578	*/	3549	*/
3579	case 1: /* deiconify window */	3550	case 1: /* deiconify window */
3580	XMapWindow (disp, parent[0]);	3551	XMapWindow (xdisp, parent[0]);
3581	break;	3552	break;
3582	case 2: /* iconify window */	3553	case 2: /* iconify window */
3583	XIconifyWindow (disp, parent[0], display->screen);	3554	XIconifyWindow (xdisp, parent[0], display->screen);
3584	break;	3555	break;
3585	case 3: /* set position (pixels) */	3556	case 3: /* set position (pixels) */
3586	XMoveWindow (disp, parent[0], args[1], args[2]);	3557	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3587	break;	3558	break;
3588	case 4: /* set size (pixels) */	3559	case 4: /* set size (pixels) */
3589	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3590	break;	3561	break;
3591	case 5: /* raise window */	3562	case 5: /* raise window */
3592	XRaiseWindow (disp, parent[0]);	3563	XRaiseWindow (xdisp, parent[0]);
3593	break;	3564	break;
3594	case 6: /* lower window */	3565	case 6: /* lower window */
3595	XLowerWindow (disp, parent[0]);	3566	XLowerWindow (xdisp, parent[0]);
3596	break;	3567	break;
3597	case 7: /* refresh window */	3568	case 7: /* refresh window */
3598	scr_touch (true);	3569	scr_touch (true);
3599	break;	3570	break;
3600	case 8: /* set size (chars) */	3571	case 8: /* set size (chars) */
…		…
3607	if (args[0] >= 24) /* set height (chars) */	3578	if (args[0] >= 24) /* set height (chars) */
3608	set_widthheight ((unsigned int)width,	3579	set_widthheight ((unsigned int)width,
3609	(unsigned int) (args[1] * fheight));	3580	(unsigned int) (args[1] * fheight));
3610	break;	3581	break;
3611		3582
3612
3613	/*	3583	/*
3614	* reports - some output format copied from XTerm	3584	* reports - some output format copied from XTerm
3615	*/	3585	*/
3616	case 11: /* report window state */	3586	case 11: /* report window state */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (xdisp, parent[0], &wattr);
3618	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3588	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3619	break;	3589	break;
3620	case 13: /* report window position */	3590	case 13: /* report window position */
3621	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (xdisp, parent[0], &wattr);
3622	XTranslateCoordinates (disp, parent[0], wattr.root,	3592	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3623	-wattr.border_width, -wattr.border_width,	3593	-wattr.border_width, -wattr.border_width,
3624	&x, &y, &wdummy);	3594	&x, &y, &wdummy);
3625	tt_printf ("\033[3;%d;%dt", x, y);	3595	tt_printf ("\033[3;%d;%dt", x, y);
3626	break;	3596	break;
3627	case 14: /* report window size (pixels) */	3597	case 14: /* report window size (pixels) */
3628	XGetWindowAttributes (disp, parent[0], &wattr);	3598	XGetWindowAttributes (xdisp, parent[0], &wattr);
3629	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3599	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3630	break;	3600	break;
3631	case 18: /* report text area size (chars) */	3601	case 18: /* report text area size (chars) */
3632	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3633	break;	3603	break;
…		…
3635	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3636	break;	3606	break;
3637	case 20: /* report icon label */	3607	case 20: /* report icon label */
3638	{	3608	{
3639	char *s;	3609	char *s;
3640	XGetIconName (disp, parent[0], &s);	3610	XGetIconName (xdisp, parent[0], &s);
3641	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3611	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3642	XFree (s);	3612	XFree (s);
3643	}	3613	}
3644	break;	3614	break;
3645	case 21: /* report window title */	3615	case 21: /* report window title */
3646	{	3616	{
3647	char *s;	3617	char *s;
3648	XFetchName (disp, parent[0], &s);	3618	XFetchName (xdisp, parent[0], &s);
3649	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3619	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3650	XFree (s);	3620	XFree (s);
3651	}	3621	}
3652	break;	3622	break;
3653	}	3623	}
…		…
3754	void	3724	void
3755	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3725	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3756	{	3726	{
3757	if (str[0] == '?' && !str[1])	3727	if (str[0] == '?' && !str[1])
3758	{	3728	{
3759	unsigned short r, g, b;	3729	rgba c;
3760	pix_colors_focused[color].get (display, r, g, b);	3730	pix_colors_focused[color].get (c);
		3731
		3732	#if XFT
		3733	if (c.a != rgba::MAX_CC)
		3734	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3735	else
		3736	#endif
3761	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3737	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3762	}	3738	}
3763	else	3739	else
3764	set_window_color (color, str);	3740	set_window_color (color, str);
3765	}	3741	}
3766		3742
…		…
3772	{	3748	{
3773	int color;	3749	int color;
3774	char buf, name;	3750	char buf, name;
3775	bool query = str[0] == '?' && !str[1];	3751	bool query = str[0] == '?' && !str[1];
3776	int saveop = op;	3752	int saveop = op;
3777	dDisp;	3753
		3754	dLocal (Display *, xdisp);
3778		3755
3779	assert (str != NULL);	3756	assert (str != NULL);
3780	switch (op)	3757	switch (op)
3781	{	3758	{
3782	case XTerm_name:	3759	case XTerm_name:
…		…
3798	unsigned long bytes_after;	3775	unsigned long bytes_after;
3799	unsigned char *value = 0;	3776	unsigned char *value = 0;
3800	const char *str = "";	3777	const char *str = "";
3801		3778
3802	if (prop	3779	if (prop
3803	&& XGetWindowProperty (disp, parent[0],	3780	&& XGetWindowProperty (xdisp, parent[0],
3804	prop, 0, 1<<16, 0, AnyPropertyType,	3781	prop, 0, 1<<16, 0, AnyPropertyType,
3805	&actual_type, &actual_format,	3782	&actual_type, &actual_format,
3806	&nitems, &bytes_after, &value) == Success	3783	&nitems, &bytes_after, &value) == Success
3807	&& actual_type != None	3784	&& actual_type != None
3808	&& actual_format == 8)	3785	&& actual_format == 8)
3809	str = (const char *)(value);	3786	str = (const char *)(value);
3810		3787
3811	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3788	tt_printf ("\033]%d;%s%c", op, str, resp);
3812		3789
3813	XFree (value);	3790	XFree (value);
3814	}	3791	}
3815	else	3792	else
3816	{	3793	{
…		…
3820	{	3797	{
3821	*eq = 0;	3798	*eq = 0;
3822	set_utf8_property (display->atom (str), eq + 1);	3799	set_utf8_property (display->atom (str), eq + 1);
3823	}	3800	}
3824	else	3801	else
3825	XDeleteProperty (disp, parent[0],	3802	XDeleteProperty (xdisp, parent[0],
3826	display->atom (str));	3803	display->atom (str));
3827	}	3804	}
3828	break;	3805	break;
3829		3806
3830	case XTerm_Color:	3807	case XTerm_Color:
…		…
3840	break;	3817	break;
3841		3818
3842	if ((buf = strchr (name, ';')) != NULL)	3819	if ((buf = strchr (name, ';')) != NULL)
3843	*buf++ = '\0';	3820	*buf++ = '\0';
3844		3821
3845	if (name[0] == '?' && !name[1])	3822	process_color_seq (op, color, name, resp);
3846	{
3847	unsigned short r, g, b;
3848	pix_colors_focused[color].get (display, r, g, b);
3849	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3850	}
3851	else
3852	set_window_color (color, name);
3853	}	3823	}
3854	break;	3824	break;
3855	case XTerm_Color00:	3825	case XTerm_Color00:
3856	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3826	process_color_seq (op, Color_fg, str, resp);
3857	break;	3827	break;
3858	case XTerm_Color01:	3828	case XTerm_Color01:
3859	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3829	process_color_seq (op, Color_bg, str, resp);
3860	break;	3830	break;
3861	#ifndef NO_CURSORCOLOR	3831	#ifndef NO_CURSORCOLOR
3862	case XTerm_Color_cursor:	3832	case XTerm_Color_cursor:
3863	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3833	process_color_seq (op, Color_cursor, str, resp);
3864	break;	3834	break;
3865	#endif	3835	#endif
3866	case XTerm_Color_pointer_fg:	3836	case XTerm_Color_pointer_fg:
3867	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3837	process_color_seq (op, Color_pointer_fg, str, resp);
3868	break;	3838	break;
3869	case XTerm_Color_pointer_bg:	3839	case XTerm_Color_pointer_bg:
3870	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3840	process_color_seq (op, Color_pointer_bg, str, resp);
3871	break;	3841	break;
3872	#ifndef NO_BOLD_UNDERLINE_REVERSE	3842	#ifndef NO_BOLD_UNDERLINE_REVERSE
3873	case XTerm_Color_RV:	3843	case XTerm_Color_RV:
3874	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3844	process_color_seq (op, Color_RV, str, resp);
3875	break;	3845	break;
3876	case Rxvt_Color_BD:	3846	case Rxvt_Color_BD:
3877	case URxvt_Color_BD:	3847	case URxvt_Color_BD:
3878	process_color_seq (op, Color_BD, str, resp);	3848	process_color_seq (op, Color_BD, str, resp);
3879	break;	3849	break;
3880	case Rxvt_Color_UL:	3850	case Rxvt_Color_UL:
3881	case URxvt_Color_UL:	3851	case URxvt_Color_UL:
3882	process_color_seq (op, Color_UL, str, resp);	3852	process_color_seq (op, Color_UL, str, resp);
3883	break;	3853	break;
3884	case URxvt_Color_IT:	3854	case URxvt_Color_IT:
3885	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3855	process_color_seq (op, Color_IT, str, resp);
3886	break;	3856	break;
3887	#endif	3857	#endif
3888	#if TRANSPARENT && TINTING	3858	#if TRANSPARENT && TINTING
3889	case URxvt_Color_tint:	3859	case URxvt_Color_tint:
3890	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3860	process_color_seq (op, Color_tint, str, resp);
		3861
3891	check_our_parents ();	3862	check_our_parents ();
		3863
3892	if (am_transparent)	3864	if (am_transparent)
3893	want_full_refresh = want_refresh = 1;	3865	want_full_refresh = want_refresh = 1;
		3866
3894	break;	3867	break;
3895	#endif	3868	#endif
3896		3869
3897	case Rxvt_Pixmap:	3870	case Rxvt_Pixmap:
3898	{	3871	{
…		…
3969	allocated.push_back ((void *)res);	3942	allocated.push_back ((void *)res);
3970	set_fonts ();	3943	set_fonts ();
3971	}	3944	}
3972	break;	3945	break;
3973		3946
3974	#if ENABLE_FRILLS	3947	case URxvt_version:
		3948	if (query)
		3949	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3950	op,
		3951	rs[Rs_name], VERSION[0], VERSION[2],
		3952	resp);
		3953	break;
		3954
		3955	#if !ENABLE_MINIMAL
3975	case URxvt_locale:	3956	case URxvt_locale:
3976	if (query)	3957	if (query)
3977	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3958	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3978	else	3959	else
3979	{	3960	{
3980	set_locale (str);	3961	set_locale (str);
3981	pty->set_utf8_mode (enc_utf8);	3962	pty->set_utf8_mode (enc_utf8);
3982	init_xlocale ();	3963	init_xlocale ();
…		…
4343	scr_color (Color_bg, Color_bg);	4324	scr_color (Color_bg, Color_bg);
4344	break;	4325	break;
4345		4326
4346	//case 50: // not variable spacing	4327	//case 50: // not variable spacing
4347		4328
4348	#if ENABLE_FRILLS	4329	#if !ENABLE_MINIMAL
4349	case 90:	4330	case 90:
4350	case 91: /* set bright fg color */	4331	case 91: /* set bright fg color */
4351	case 92:	4332	case 92:
4352	case 93:	4333	case 93:
4353	case 94:	4334	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC vs. Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC