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

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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC vs. Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC