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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.276 by root, Fri Jan 20 11:02:46 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;
…		…
1401	case ButtonRelease:	1391	case ButtonRelease:
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
		1397	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1407	{	1398	{
1408	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1399	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409	{	1400	{
1410	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1401	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1411	{	1402	{
		1403	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1404	{
1412	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))	1405	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413	destroy ();	1406	destroy ();
		1407	}
		1408	#if ENABLE_EWMH
		1409	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1410	XSendEvent (xdisp, ev.xclient.window = display->root,
		1411	False, SubstructureRedirectMask \| SubstructureNotifyMask,
		1412	&ev);
		1413	#endif
1414	}	1414	}
1415	#if ENABLE_EWMH
1416	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1417	XSendEvent (disp, ev.xclient.window = display->root,
1418	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1419	&ev);
1420	#endif
1421	}	1415	}
1422	#if ENABLE_XEMBED	1416	#if ENABLE_XEMBED
1423	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])	1417	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424	{	1418	{
1425	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)	1419	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
…		…
1469	break;	1463	break;
1470		1464
1471	case ConfigureNotify:	1465	case ConfigureNotify:
1472	if (ev.xconfigure.window == parent[0])	1466	if (ev.xconfigure.window == parent[0])
1473	{	1467	{
1474	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1468	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1475	;	1469	;
1476		1470
1477	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1471	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1478	{	1472	{
1479	seen_resize = 1;	1473	seen_resize = 1;
…		…
1488	#endif	1482	#endif
1489	}	1483	}
1490	break;	1484	break;
1491		1485
1492	case PropertyNotify:	1486	case PropertyNotify:
		1487	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1488	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494	&& ev.xproperty.state == PropertyNewValue)	1489	&& ev.xproperty.state == PropertyNewValue)
1495	selection_property (ev.xproperty.window, ev.xproperty.atom);	1490	selection_property (ev.xproperty.window, ev.xproperty.atom);
1496		1491
1497	break;	1492	break;
1498		1493
1499	case SelectionClear:	1494	case SelectionClear:
1500	selection_clear ();	1495	selection_clear ();
…		…
1536	if (ev.xany.window == vt)	1531	if (ev.xany.window == vt)
1537	{	1532	{
1538	do	1533	do
1539	scr_expose (ev.xexpose.x, ev.xexpose.y,	1534	scr_expose (ev.xexpose.x, ev.xexpose.y,
1540	ev.xexpose.width, ev.xexpose.height, False);	1535	ev.xexpose.width, ev.xexpose.height, False);
1541	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1536	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1542		1537
1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1538	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544		1539
1545	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1540	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1546	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1547	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
1548		1543
1549	want_refresh = 1;	1544	want_refresh = 1;
1550	}	1545	}
1551	else	1546	else
1552	{	1547	{
1553	XEvent unused_event;	1548	XEvent unused_event;
1554		1549
1555	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1550	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1556	;	1551	;
1557	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1552	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1558	;	1553	;
1559		1554
1560	if (isScrollbarWindow (ev.xany.window))	1555	if (isScrollbarWindow (ev.xany.window))
1561	{	1556	{
1562	scrollBar.setIdle ();	1557	scrollBar.setIdle ();
1563	scrollbar_show (0);	1558	scrollbar_show (0);
1564	}	1559	}
1565		1560
1566	#ifdef TRANSPARENT	1561	#ifdef TRANSPARENT
1567	if (am_transparent && ev.xany.window == parent[0])	1562	if (am_transparent && ev.xany.window == parent[0])
1568	XClearWindow (disp, ev.xany.window);	1563	XClearWindow (xdisp, ev.xany.window);
1569	#endif	1564	#endif
1570	}	1565	}
1571	break;	1566	break;
1572		1567
1573	case MotionNotify:	1568	case MotionNotify:
…		…
1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1578	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1579	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585	; // nop	1580	; // nop
1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1581	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1587	{	1582	{
1588	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1583	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1589	;	1584	;
1590		1585
1591	XQueryPointer (disp, vt,	1586	XQueryPointer (xdisp, vt,
1592	&unused_root, &unused_child,	1587	&unused_root, &unused_child,
1593	&unused_root_x, &unused_root_y,	1588	&unused_root_x, &unused_root_y,
1594	&ev.xbutton.x, &ev.xbutton.y,	1589	&ev.xbutton.x, &ev.xbutton.y,
1595	&ev.xbutton.state);	1590	&ev.xbutton.state);
1596	#ifdef MOUSE_THRESHOLD	1591	#ifdef MOUSE_THRESHOLD
…		…
1660	#endif	1655	#endif
1661	}	1656	}
1662	}	1657	}
1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1658	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1664	{	1659	{
1665	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1660	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1666	MotionNotify, &ev))	1661	MotionNotify, &ev))
1667	;	1662	;
1668		1663
1669	XQueryPointer (disp, scrollBar.win,	1664	XQueryPointer (xdisp, scrollBar.win,
1670	&unused_root, &unused_child,	1665	&unused_root, &unused_child,
1671	&unused_root_x, &unused_root_y,	1666	&unused_root_x, &unused_root_y,
1672	&ev.xbutton.x, &ev.xbutton.y,	1667	&ev.xbutton.x, &ev.xbutton.y,
1673	&unused_mask);	1668	&unused_mask);
1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1669	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1818	/*	1813	/*
1819	* VT window processing of button press	1814	* VT window processing of button press
1820	*/	1815	*/
1821	if (ev.window == vt)	1816	if (ev.window == vt)
1822	{	1817	{
		1818	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1819	return;
		1820
1823	#if ISO_14755	1821	#if ISO_14755
1824	// 5.4	1822	// 5.4
1825	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1823	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1826	{	1824	{
1827	iso14755_54 (ev.x, ev.y);	1825	iso14755_54 (ev.x, ev.y);
…		…
1869	else	1867	else
1870	{	1868	{
1871	if (ev.button != MEvent.button)	1869	if (ev.button != MEvent.button)
1872	MEvent.clicks = 0;	1870	MEvent.clicks = 0;
1873		1871
1874	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875	switch (ev.button)	1872	switch (ev.button)
1876	{	1873	{
1877	case Button1:	1874	case Button1:
1878	/* allow meta + click to select rectangular areas */	1875	/* allow meta + click to select rectangular areas */
1879	/* should be done in screen.C */	1876	/* should be done in screen.C */
1880	#if ENABLE_FRILLS	1877	#if ENABLE_FRILLS
1881	selection.rect = !!(ev.state & ModMetaMask);	1878	selection.rect = !!(ev.state & ModMetaMask);
1882	#else	1879	#else
1883	selection.rect = false;	1880	selection.rect = false;
1884	#endif	1881	#endif
1885		1882
1886	/* allow shift+left click to extend selection */	1883	/* allow shift+left click to extend selection */
1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1884	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1888	{	1885	{
1889	if (MEvent.button == Button1 && clickintime)	1886	if (MEvent.button == Button1 && clickintime)
1890	selection_rotate (ev.x, ev.y);	1887	selection_rotate (ev.x, ev.y);
1891	else	1888	else
1892	selection_extend (ev.x, ev.y, 1);	1889	selection_extend (ev.x, ev.y, 1);
1893	}	1890	}
1894	else	1891	else
1895	{	1892	{
1896	if (MEvent.button == Button1 && clickintime)	1893	if (MEvent.button == Button1 && clickintime)
1897	MEvent.clicks++;	1894	MEvent.clicks++;
1898	else	1895	else
1899	MEvent.clicks = 1;	1896	MEvent.clicks = 1;
1900		1897
1901	selection_click (MEvent.clicks, ev.x, ev.y);	1898	selection_click (MEvent.clicks, ev.x, ev.y);
1902	}	1899	}
1903		1900
1904	MEvent.button = Button1;	1901	MEvent.button = Button1;
1905	break;	1902	break;
1906		1903
1907	case Button3:	1904	case Button3:
1908	if (MEvent.button == Button3 && clickintime)	1905	if (MEvent.button == Button3 && clickintime)
1909	selection_rotate (ev.x, ev.y);	1906	selection_rotate (ev.x, ev.y);
1910	else	1907	else
1911	selection_extend (ev.x, ev.y, 1);	1908	selection_extend (ev.x, ev.y, 1);
1912		1909
1913	MEvent.button = Button3;	1910	MEvent.button = Button3;
1914	break;	1911	break;
1915	}	1912	}
1916	}	1913	}
1917		1914
1918	MEvent.time = ev.time;	1915	MEvent.time = ev.time;
1919	return;	1916	return;
1920	}	1917	}
1921		1918
…		…
2084	sel_scroll_ev.stop();	2081	sel_scroll_ev.stop();
2085	#endif	2082	#endif
2086		2083
2087	if (ev.window == vt)	2084	if (ev.window == vt)
2088	{	2085	{
		2086	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2087	return;
		2088
2089	#if ISO_14755	2089	#if ISO_14755
2090	// 5.4	2090	// 5.4
2091	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2091	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2092	return;	2092	return;
2093	#endif	2093	#endif
		2094
2094	if (reportmode)	2095	if (reportmode)
2095	{	2096	{
2096	/* mouse report from vt window */	2097	/* mouse report from vt window */
2097	/* don't report release of wheel "buttons" */	2098	/* don't report release of wheel "buttons" */
2098	if (ev.button >= 4)	2099	if (ev.button >= 4)
…		…
2122	if (priv_modes & PrivMode_mouse_report	2123	if (priv_modes & PrivMode_mouse_report
2123	&& bypass_keystate	2124	&& bypass_keystate
2124	&& ev.button == Button1 && MEvent.clicks <= 1)	2125	&& ev.button == Button1 && MEvent.clicks <= 1)
2125	selection_extend (ev.x, ev.y, 0);	2126	selection_extend (ev.x, ev.y, 0);
2126		2127
2127	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128	return;
2129
2130	switch (ev.button)	2128	switch (ev.button)
2131	{	2129	{
2132	case Button1:	2130	case Button1:
2133	case Button3:	2131	case Button3:
2134	selection_make (ev.time);	2132	selection_make (ev.time);
2135	break;	2133	break;
2136		2134
2137	case Button2:	2135	case Button2:
2138	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?
2139	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);	2137	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2140	break;	2138	break;
2141		2139
2142	#ifdef MOUSE_WHEEL	2140	#ifdef MOUSE_WHEEL
2143	case Button4:	2141	case Button4:
2144	case Button5:	2142	case Button5:
…		…
2186	#if TINTING	2184	#if TINTING
2187	/* taken from aterm-0.4.2 */	2185	/* taken from aterm-0.4.2 */
2188		2186
2189	typedef uint32_t RUINT32T;	2187	typedef uint32_t RUINT32T;
2190		2188
2191	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)
2192	{	2190	{
2193	int sh_r, sh_g, sh_b;	2191	int sh_r, sh_g, sh_b;
2194	RUINT32T mask_r, mask_g, mask_b;	2192	RUINT32T mask_r, mask_g, mask_b;
2195	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2193	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2196	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2194	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2195	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198	int i;	2196	int i;
2199		2197
2200	Visual *visual = display->visual;	2198	Visual *visual = term->visual;
2201		2199
2202	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2200	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2203		2201
2204	/* for convenience */	2202	/* for convenience */
2205	mask_r = visual->red_mask;	2203	mask_r = visual->red_mask;
…		…
2426	Atom atype;	2424	Atom atype;
2427	unsigned char *prop = NULL;	2425	unsigned char *prop = NULL;
2428	Window root, oldp, *list;	2426	Window root, oldp, *list;
2429	Pixmap rootpixmap = None;	2427	Pixmap rootpixmap = None;
2430	XWindowAttributes wattr, wrootattr;	2428	XWindowAttributes wattr, wrootattr;
2431	dDisp;
2432		2429
2433	pchanged = 0;	2430	pchanged = 0;
2434		2431
2435	if (!OPTION (Opt_transparent))	2432	if (!OPTION (Opt_transparent))
2436	return pchanged; /* Don't try any more */	2433	return pchanged; /* Don't try any more */
2437		2434
2438	XGetWindowAttributes (disp, display->root, &wrootattr);	2435	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2439	rootdepth = wrootattr.depth;	2436	rootdepth = wrootattr.depth;
2440		2437
2441	XGetWindowAttributes (disp, parent[0], &wattr);	2438	XGetWindowAttributes (xdisp, parent[0], &wattr);
2442		2439
2443	if (rootdepth != wattr.depth)	2440	if (rootdepth != wattr.depth)
2444	{	2441	{
2445	if (am_transparent)	2442	if (am_transparent)
2446	{	2443	{
2447	pchanged = 1;	2444	pchanged = 1;
2448	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2445	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2449	am_transparent = am_pixmap_trans = 0;	2446	am_transparent = am_pixmap_trans = 0;
2450	}	2447	}
2451		2448
2452	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2453	}	2450	}
2454		2451
2455	/* 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. */
2456	XSync (disp, False);	2453	XSync (xdisp, False);
2457		2454
2458	/*	2455	/*
2459	* Make the frame window set by the window manager have	2456	* Make the frame window set by the window manager have
2460	* the root background. Some window managers put multiple nested frame	2457	* the root background. Some window managers put multiple nested frame
2461	* 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.
2462	*/	2459	*/
2463	i = (xa[XA_XROOTPMAP_ID]	2460	i = (xa[XA_XROOTPMAP_ID]
2464	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2467		2464
2468	if (!i \|\| prop == NULL)	2465	if (!i \|\| prop == NULL)
2469	i = (xa[XA_ESETROOT_PMAP_ID]	2466	i = (xa[XA_ESETROOT_PMAP_ID]
2470	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2467	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472	&nitems, &bytes_after, &prop) == Success);	2469	&nitems, &bytes_after, &prop) == Success);
2473		2470
2474	if (!i \|\| prop == NULL	2471	if (!i \|\| prop == NULL
2475	#if TINTING	2472	#if TINTING
2476	\|\| !rs[Rs_color + Color_tint]	2473	\|\| !ISSET_PIXCOLOR (Color_tint)
2477	#endif	2474	#endif
2478	)	2475	)
2479	have_pixmap = 0;	2476	have_pixmap = 0;
2480	else	2477	else
2481	{	2478	{
…		…
2494	Window cr;	2491	Window cr;
2495	XImage *image;	2492	XImage *image;
2496	GC gc;	2493	GC gc;
2497	XGCValues gcvalue;	2494	XGCValues gcvalue;
2498		2495
2499	XTranslateCoordinates (disp, parent[0], display->root,	2496	XTranslateCoordinates (xdisp, parent[0], display->root,
2500	0, 0, &sx, &sy, &cr);	2497	0, 0, &sx, &sy, &cr);
2501	nw = (unsigned int)szHint.width;	2498	nw = (unsigned int)szHint.width;
2502	nh = (unsigned int)szHint.height;	2499	nh = (unsigned int)szHint.height;
2503	nx = ny = 0;	2500	nx = ny = 0;
2504		2501
…		…
2517	}	2514	}
2518		2515
2519	min_it (nw, (unsigned int) (wrootattr.width - sx));	2516	min_it (nw, (unsigned int) (wrootattr.width - sx));
2520	min_it (nh, (unsigned int) (wrootattr.height - sy));	2517	min_it (nh, (unsigned int) (wrootattr.height - sy));
2521		2518
2522	XSync (disp, False);	2519	XSync (xdisp, False);
2523	allowedxerror = -1;	2520	allowedxerror = -1;
2524	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2521	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525		2522
2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2523	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2527	/* XXX: may need a delay here? */	2524	/* XXX: may need a delay here? */
2528	allowedxerror = 0;	2525	allowedxerror = 0;
2529		2526
…		…
2532	if (am_transparent && am_pixmap_trans)	2529	if (am_transparent && am_pixmap_trans)
2533	{	2530	{
2534	pchanged = 1;	2531	pchanged = 1;
2535	if (pixmap != None)	2532	if (pixmap != None)
2536	{	2533	{
2537	XFreePixmap (disp, pixmap);	2534	XFreePixmap (xdisp, pixmap);
2538	pixmap = None;	2535	pixmap = None;
2539	}	2536	}
2540	}	2537	}
2541		2538
2542	am_pixmap_trans = 0;	2539	am_pixmap_trans = 0;
2543	}	2540	}
2544	else	2541	else
2545	{	2542	{
2546	if (pixmap != None)	2543	if (pixmap != None)
2547	XFreePixmap (disp, pixmap);	2544	XFreePixmap (xdisp, pixmap);
2548		2545
2549	#if TINTING	2546	#if TINTING
2550	if (ISSET_PIXCOLOR (Color_tint))	2547	if (ISSET_PIXCOLOR (Color_tint))
2551	{	2548	{
2552	unsigned short rm, gm, bm;
2553	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2549	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554		2550
		2551	rgba c;
2555	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2552	pix_colors_focused [Color_tint].get (c);
2556		2553
2557	ShadeXImage (display, image, shade, rm, gm, bm);	2554	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558	}	2555	}
2559	#endif	2556	#endif
2560		2557
2561	pixmap = XCreatePixmap (disp, vt,	2558	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2562	szHint.width, szHint.height, image->depth);
2563	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2559	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2564	XPutImage (disp, pixmap, gc, image, 0, 0,	2560	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2565	nx, ny, image->width, image->height);	2561	nx, ny, image->width, image->height);
2566	XFreeGC (disp, gc);	2562	XFreeGC (xdisp, gc);
2567	XDestroyImage (image);	2563	XDestroyImage (image);
2568	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2564	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2569	XClearWindow (disp, parent[0]);	2565	XClearWindow (xdisp, parent[0]);
2570		2566
2571	if (!am_transparent \|\| !am_pixmap_trans)	2567	if (!am_transparent \|\| !am_pixmap_trans)
2572	pchanged = 1;	2568	pchanged = 1;
2573		2569
2574	am_transparent = am_pixmap_trans = 1;	2570	am_transparent = am_pixmap_trans = 1;
2575	}	2571	}
2576	}	2572	}
2577		2573
2578	if (am_pixmap_trans)	2574	if (am_pixmap_trans)
2579	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2575	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2580	else	2576	else
2581	{	2577	{
2582	unsigned int n;	2578	unsigned int n;
2583	/*	2579	/*
2584	* InheritPixmap transparency	2580	* InheritPixmap transparency
2585	*/	2581	*/
2586	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2582	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587	{	2583	{
2588	oldp = parent[i];	2584	oldp = parent[i];
2589	XQueryTree (disp, parent[i - 1], &root,	2585	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2590	&parent[i], &list, &n);
2591	XFree (list);	2586	XFree (list);
2592		2587
2593	if (parent[i] == display->root)	2588	if (parent[i] == display->root)
2594	{	2589	{
2595	if (oldp != None)	2590	if (oldp != None)
…		…
2603	}	2598	}
2604		2599
2605	n = 0;	2600	n = 0;
2606		2601
2607	if (pchanged)	2602	if (pchanged)
2608	{
2609	for (; n < (unsigned int)i; n++)	2603	for (; n < (unsigned int)i; n++)
2610	{	2604	{
2611	XGetWindowAttributes (disp, parent[n], &wattr);	2605	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2606
2612	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2613	{	2608	{
2614	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615	break;	2610	break;
2616	}	2611	}
2617	}	2612	}
2618	}
2619		2613
2620	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2614	if (n > (sizeof (parent) / sizeof (parent[0])))
2621	{	2615	{
2622	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2616	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2623	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2617	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2624	am_transparent = 0;	2618	am_transparent = 0;
2625	/* XXX: also turn off Opt_transparent? */	2619	/* XXX: also turn off Opt_transparent? */
2626	}	2620	}
2627	else	2621	else
2628	{	2622	{
2629	#if WAIT_FOR_WM
2630	/* wait (an arbitrary period) for the WM to do its thing
2631	* needed for fvwm2.2.2 (and before?) */
2632	sleep (1);
2633	#endif
2634	for (n = 0; n < (unsigned int)i; n++)	2623	for (n = 0; n < (unsigned int)i; n++)
2635	{	2624	{
2636	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2637	XClearWindow (disp, parent[n]);	2626	XClearWindow (xdisp, parent[n]);
2638	}	2627	}
2639		2628
2640	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2629	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2641	am_transparent = 1;	2630	am_transparent = 1;
2642	}	2631	}
2643		2632
2644	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2633	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645	parent[i] = None;	2634	parent[i] = None;
2646	}	2635	}
2647		2636
2648	if (scrollBar.win)	2637	if (scrollBar.win)
2649	{	2638	{
2650	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2639	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2651	scrollBar.setIdle ();	2640	scrollBar.setIdle ();
2652	scrollbar_show (0);	2641	scrollbar_show (0);
2653	}	2642	}
2654		2643
2655	if (am_transparent)	2644	if (am_transparent)
…		…
3106	scr_charset_set (2, (unsigned int)cmd_getc ());	3095	scr_charset_set (2, (unsigned int)cmd_getc ());
3107	break;	3096	break;
3108	case '+':	3097	case '+':
3109	scr_charset_set (3, (unsigned int)cmd_getc ());	3098	scr_charset_set (3, (unsigned int)cmd_getc ());
3110	break;	3099	break;
3111	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3112	case '6':	3101	case '6':
3113	scr_backindex ();	3102	scr_backindex ();
3114	break;	3103	break;
3115	#endif	3104	#endif
3116	case '7':	3105	case '7':
3117	scr_cursor (SAVE);	3106	scr_cursor (SAVE);
3118	break;	3107	break;
3119	case '8':	3108	case '8':
3120	scr_cursor (RESTORE);	3109	scr_cursor (RESTORE);
3121	break;	3110	break;
3122	#if ENABLE_FRILLS	3111	#if !ENABLE_MINIMAL
3123	case '9':	3112	case '9':
3124	scr_forwardindex ();	3113	scr_forwardindex ();
3125	break;	3114	break;
3126	#endif	3115	#endif
3127	case '=':	3116	case '=':
…		…
3289	ndef = get_byte_array_bit (csi_defaults, i);	3278	ndef = get_byte_array_bit (csi_defaults, i);
3290	for (p = 0; p < nargs; p++)	3279	for (p = 0; p < nargs; p++)
3291	if (arg[p] == -1)	3280	if (arg[p] == -1)
3292	arg[p] = ndef;	3281	arg[p] = ndef;
3293		3282
3294	#ifdef DEBUG_CMD
3295	fprintf (stderr, "CSI ");
3296	for (p = 0; p < nargs; p++)
3297	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298	fprintf (stderr, "%c\n", ch);
3299	#endif
3300
3301	/*	3283	/*
3302	* private mode handling	3284	* private mode handling
3303	*/	3285	*/
3304	if (priv)	3286	if (priv)
3305	{	3287	{
3306	switch (priv)	3288	switch (priv)
3307	{	3289	{
3308	case '>':	3290	case '>':
3309	if (ch == CSI_DA) /* secondary device attributes */	3291	if (ch == CSI_DA) /* secondary device attributes */
3310	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	}
3311	break;	3302	break;
3312	case '?':	3303	case '?':
3313	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3304	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3314	process_terminal_mode (ch, priv, nargs, arg);	3305	process_terminal_mode (ch, priv, nargs, arg);
3315	break;	3306	break;
…		…
3518	break;	3509	break;
3519	case CSI_75:	3510	case CSI_75:
3520	scr_cursor (RESTORE);	3511	scr_cursor (RESTORE);
3521	break;	3512	break;
3522		3513
3523	#if ENABLE_FRILLS	3514	#if !ENABLE_MINIMAL
3524	case CSI_74:	3515	case CSI_74:
3525	process_window_ops (arg, nargs);	3516	process_window_ops (arg, nargs);
3526	break;	3517	break;
3527	#endif	3518	#endif
3528		3519
…		…
3535	break;	3526	break;
3536	}	3527	}
3537	}	3528	}
3538	/}}} /	3529	/}}} /
3539		3530
3540	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3541	/* ARGSUSED */	3532	/* ARGSUSED */
3542	void	3533	void
3543	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3534	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544	{	3535	{
3545	int x, y;	3536	int x, y;
3546	XWindowAttributes wattr;	3537	XWindowAttributes wattr;
3547	Window wdummy;	3538	Window wdummy;
3548	dDisp;	3539
		3540	dLocal (Display *, xdisp);
3549		3541
3550	if (nargs == 0)	3542	if (nargs == 0)
3551	return;	3543	return;
3552		3544
3553	switch (args[0])	3545	switch (args[0])
3554	{	3546	{
3555	/*	3547	/*
3556	* commands	3548	* commands
3557	*/	3549	*/
3558	case 1: /* deiconify window */	3550	case 1: /* deiconify window */
3559	XMapWindow (disp, parent[0]);	3551	XMapWindow (xdisp, parent[0]);
3560	break;	3552	break;
3561	case 2: /* iconify window */	3553	case 2: /* iconify window */
3562	XIconifyWindow (disp, parent[0], display->screen);	3554	XIconifyWindow (xdisp, parent[0], display->screen);
3563	break;	3555	break;
3564	case 3: /* set position (pixels) */	3556	case 3: /* set position (pixels) */
3565	XMoveWindow (disp, parent[0], args[1], args[2]);	3557	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3566	break;	3558	break;
3567	case 4: /* set size (pixels) */	3559	case 4: /* set size (pixels) */
3568	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569	break;	3561	break;
3570	case 5: /* raise window */	3562	case 5: /* raise window */
3571	XRaiseWindow (disp, parent[0]);	3563	XRaiseWindow (xdisp, parent[0]);
3572	break;	3564	break;
3573	case 6: /* lower window */	3565	case 6: /* lower window */
3574	XLowerWindow (disp, parent[0]);	3566	XLowerWindow (xdisp, parent[0]);
3575	break;	3567	break;
3576	case 7: /* refresh window */	3568	case 7: /* refresh window */
3577	scr_touch (true);	3569	scr_touch (true);
3578	break;	3570	break;
3579	case 8: /* set size (chars) */	3571	case 8: /* set size (chars) */
…		…
3586	if (args[0] >= 24) /* set height (chars) */	3578	if (args[0] >= 24) /* set height (chars) */
3587	set_widthheight ((unsigned int)width,	3579	set_widthheight ((unsigned int)width,
3588	(unsigned int) (args[1] * fheight));	3580	(unsigned int) (args[1] * fheight));
3589	break;	3581	break;
3590		3582
3591
3592	/*	3583	/*
3593	* reports - some output format copied from XTerm	3584	* reports - some output format copied from XTerm
3594	*/	3585	*/
3595	case 11: /* report window state */	3586	case 11: /* report window state */
3596	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (xdisp, parent[0], &wattr);
3597	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3588	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598	break;	3589	break;
3599	case 13: /* report window position */	3590	case 13: /* report window position */
3600	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (xdisp, parent[0], &wattr);
3601	XTranslateCoordinates (disp, parent[0], wattr.root,	3592	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3602	-wattr.border_width, -wattr.border_width,	3593	-wattr.border_width, -wattr.border_width,
3603	&x, &y, &wdummy);	3594	&x, &y, &wdummy);
3604	tt_printf ("\033[3;%d;%dt", x, y);	3595	tt_printf ("\033[3;%d;%dt", x, y);
3605	break;	3596	break;
3606	case 14: /* report window size (pixels) */	3597	case 14: /* report window size (pixels) */
3607	XGetWindowAttributes (disp, parent[0], &wattr);	3598	XGetWindowAttributes (xdisp, parent[0], &wattr);
3608	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3599	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609	break;	3600	break;
3610	case 18: /* report text area size (chars) */	3601	case 18: /* report text area size (chars) */
3611	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612	break;	3603	break;
…		…
3614	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615	break;	3606	break;
3616	case 20: /* report icon label */	3607	case 20: /* report icon label */
3617	{	3608	{
3618	char *s;	3609	char *s;
3619	XGetIconName (disp, parent[0], &s);	3610	XGetIconName (xdisp, parent[0], &s);
3620	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 */
3621	XFree (s);	3612	XFree (s);
3622	}	3613	}
3623	break;	3614	break;
3624	case 21: /* report window title */	3615	case 21: /* report window title */
3625	{	3616	{
3626	char *s;	3617	char *s;
3627	XFetchName (disp, parent[0], &s);	3618	XFetchName (xdisp, parent[0], &s);
3628	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 */
3629	XFree (s);	3620	XFree (s);
3630	}	3621	}
3631	break;	3622	break;
3632	}	3623	}
…		…
3733	void	3724	void
3734	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)
3735	{	3726	{
3736	if (str[0] == '?' && !str[1])	3727	if (str[0] == '?' && !str[1])
3737	{	3728	{
3738	unsigned short r, g, b;	3729	rgba c;
3739	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
3740	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);
3741	}	3738	}
3742	else	3739	else
3743	set_window_color (color, str);	3740	set_window_color (color, str);
3744	}	3741	}
3745		3742
…		…
3751	{	3748	{
3752	int color;	3749	int color;
3753	char buf, name;	3750	char buf, name;
3754	bool query = str[0] == '?' && !str[1];	3751	bool query = str[0] == '?' && !str[1];
3755	int saveop = op;	3752	int saveop = op;
3756	dDisp;	3753
		3754	dLocal (Display *, xdisp);
3757		3755
3758	assert (str != NULL);	3756	assert (str != NULL);
3759	switch (op)	3757	switch (op)
3760	{	3758	{
3761	case XTerm_name:	3759	case XTerm_name:
…		…
3777	unsigned long bytes_after;	3775	unsigned long bytes_after;
3778	unsigned char *value = 0;	3776	unsigned char *value = 0;
3779	const char *str = "";	3777	const char *str = "";
3780		3778
3781	if (prop	3779	if (prop
3782	&& XGetWindowProperty (disp, parent[0],	3780	&& XGetWindowProperty (xdisp, parent[0],
3783	prop, 0, 1<<16, 0, AnyPropertyType,	3781	prop, 0, 1<<16, 0, AnyPropertyType,
3784	&actual_type, &actual_format,	3782	&actual_type, &actual_format,
3785	&nitems, &bytes_after, &value) == Success	3783	&nitems, &bytes_after, &value) == Success
3786	&& actual_type != None	3784	&& actual_type != None
3787	&& actual_format == 8)	3785	&& actual_format == 8)
3788	str = (const char *)(value);	3786	str = (const char *)(value);
3789		3787
3790	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3788	tt_printf ("\033]%d;%s%c", op, str, resp);
3791		3789
3792	XFree (value);	3790	XFree (value);
3793	}	3791	}
3794	else	3792	else
3795	{	3793	{
…		…
3799	{	3797	{
3800	*eq = 0;	3798	*eq = 0;
3801	set_utf8_property (display->atom (str), eq + 1);	3799	set_utf8_property (display->atom (str), eq + 1);
3802	}	3800	}
3803	else	3801	else
3804	XDeleteProperty (disp, parent[0],	3802	XDeleteProperty (xdisp, parent[0],
3805	display->atom (str));	3803	display->atom (str));
3806	}	3804	}
3807	break;	3805	break;
3808		3806
3809	case XTerm_Color:	3807	case XTerm_Color:
…		…
3819	break;	3817	break;
3820		3818
3821	if ((buf = strchr (name, ';')) != NULL)	3819	if ((buf = strchr (name, ';')) != NULL)
3822	*buf++ = '\0';	3820	*buf++ = '\0';
3823		3821
3824	if (name[0] == '?' && !name[1])	3822	process_color_seq (op, color, name, resp);
3825	{
3826	unsigned short r, g, b;
3827	pix_colors_focused[color].get (display, r, g, b);
3828	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829	}
3830	else
3831	set_window_color (color, name);
3832	}	3823	}
3833	break;	3824	break;
3834	case XTerm_Color00:	3825	case XTerm_Color00:
3835	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3826	process_color_seq (op, Color_fg, str, resp);
3836	break;	3827	break;
3837	case XTerm_Color01:	3828	case XTerm_Color01:
3838	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3829	process_color_seq (op, Color_bg, str, resp);
3839	break;	3830	break;
3840	#ifndef NO_CURSORCOLOR	3831	#ifndef NO_CURSORCOLOR
3841	case XTerm_Color_cursor:	3832	case XTerm_Color_cursor:
3842	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3833	process_color_seq (op, Color_cursor, str, resp);
3843	break;	3834	break;
3844	#endif	3835	#endif
3845	case XTerm_Color_pointer_fg:	3836	case XTerm_Color_pointer_fg:
3846	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3837	process_color_seq (op, Color_pointer_fg, str, resp);
3847	break;	3838	break;
3848	case XTerm_Color_pointer_bg:	3839	case XTerm_Color_pointer_bg:
3849	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3840	process_color_seq (op, Color_pointer_bg, str, resp);
3850	break;	3841	break;
3851	#ifndef NO_BOLD_UNDERLINE_REVERSE	3842	#ifndef NO_BOLD_UNDERLINE_REVERSE
3852	case XTerm_Color_RV:	3843	case XTerm_Color_RV:
3853	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3844	process_color_seq (op, Color_RV, str, resp);
3854	break;	3845	break;
3855	case Rxvt_Color_BD:	3846	case Rxvt_Color_BD:
3856	case URxvt_Color_BD:	3847	case URxvt_Color_BD:
3857	process_color_seq (op, Color_BD, str, resp);	3848	process_color_seq (op, Color_BD, str, resp);
3858	break;	3849	break;
3859	case Rxvt_Color_UL:	3850	case Rxvt_Color_UL:
3860	case URxvt_Color_UL:	3851	case URxvt_Color_UL:
3861	process_color_seq (op, Color_UL, str, resp);	3852	process_color_seq (op, Color_UL, str, resp);
3862	break;	3853	break;
3863	case URxvt_Color_IT:	3854	case URxvt_Color_IT:
3864	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3855	process_color_seq (op, Color_IT, str, resp);
3865	break;	3856	break;
3866	#endif	3857	#endif
3867	#if TRANSPARENT && TINTING	3858	#if TRANSPARENT && TINTING
3868	case URxvt_Color_tint:	3859	case URxvt_Color_tint:
3869	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3860	process_color_seq (op, Color_tint, str, resp);
		3861
3870	check_our_parents ();	3862	check_our_parents ();
		3863
3871	if (am_transparent)	3864	if (am_transparent)
3872	want_full_refresh = want_refresh = 1;	3865	want_full_refresh = want_refresh = 1;
		3866
3873	break;	3867	break;
3874	#endif	3868	#endif
3875		3869
3876	case Rxvt_Pixmap:	3870	case Rxvt_Pixmap:
3877	{	3871	{
…		…
3948	allocated.push_back ((void *)res);	3942	allocated.push_back ((void *)res);
3949	set_fonts ();	3943	set_fonts ();
3950	}	3944	}
3951	break;	3945	break;
3952		3946
3953	#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
3954	case URxvt_locale:	3956	case URxvt_locale:
3955	if (query)	3957	if (query)
3956	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);
3957	else	3959	else
3958	{	3960	{
3959	set_locale (str);	3961	set_locale (str);
3960	pty->set_utf8_mode (enc_utf8);	3962	pty->set_utf8_mode (enc_utf8);
3961	init_xlocale ();	3963	init_xlocale ();
…		…
4322	scr_color (Color_bg, Color_bg);	4324	scr_color (Color_bg, Color_bg);
4323	break;	4325	break;
4324		4326
4325	//case 50: // not variable spacing	4327	//case 50: // not variable spacing
4326		4328
4327	#if ENABLE_FRILLS	4329	#if !ENABLE_MINIMAL
4328	case 90:	4330	case 90:
4329	case 91: /* set bright fg color */	4331	case 91: /* set bright fg color */
4330	case 92:	4332	case 92:
4331	case 93:	4333	case 93:
4332	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.276 by root, Fri Jan 20 11:02:46 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.276 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC