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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.272 by root, Thu Jan 19 16:22:12 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>
64		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
		63
65	/----------------------------------------------------------------------/	64	/----------------------------------------------------------------------/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		67
72	#if ENABLE_FRILLS \|\| ISO_14755	68	#if ENABLE_FRILLS \|\| ISO_14755
73		69
74	#define ISO_14755_STARTED 0x80000000UL	70	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	71	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	226	# if !UNICODE3
231	if (ch >= 0x10000)	227	if (ch >= 0x10000)
232	ch = 0xfffd;	228	ch = 0xfffd;
233	# endif	229	# endif
234	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
236	}	234	}
237		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	// }
238	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
240		243
241	free (fname);	244	free (fname);
242		245
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	305	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	306	{
304	int ctrl, meta, shft, len;	307	int ctrl, meta, shft, len;
305	unsigned int newlen;	308	unsigned int newlen;
306	KeySym keysym;	309	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	310	int valid_keysym;
311	char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
312		312
313	/*	313	/*
314	* 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
…		…
905	{	905	{
906	const char ch = C0_ESC;	906	const char ch = C0_ESC;
907	tt_write (&ch, 1);	907	tt_write (&ch, 1);
908	}	908	}
909		909
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	910	tt_write (kbuf, (unsigned int)len);
921	}	911	}
922	/}}} /	912	/}}} /
923		913
924	#if defined (KEYSYM_RESOURCE)	914	#if defined (KEYSYM_RESOURCE)
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1034	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1035	{
1046	hidden_cursor = !hidden_cursor;	1036	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1037	want_refresh = 1;
1048		1038
1049	w.start (w.at + BLINK_INTERVAL);	1039	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1040	}
1051	#endif	1041	#endif
1052		1042
1053	#ifdef TEXT_BLINK	1043	#ifdef TEXT_BLINK
1054	void	1044	void
…		…
1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105	}	1095	}
1106	}	1096	}
1107	#endif	1097	#endif
1108		1098
1109	#if HAVE_SCHED_YIELD	1099	#if LINUX_YIELD_HACK
1110	static struct event_handler	1100	static struct event_handler
1111	{	1101	{
1112	check_watcher cw_yield;	1102	check_watcher yield_ev;
1113		1103
1114	void yield (check_watcher &w)	1104	void yield_cb (check_watcher &w)
1115	{	1105	{
1116	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
1117	w.stop ();	1113	w.stop ();
1118	}	1114	}
1119		1115
1120	event_handler ()	1116	event_handler ()
1121	: cw_yield (this, &event_handler::yield)	1117	: yield_ev (this, &event_handler::yield_cb)
1122	{	1118	{
1123	}	1119	}
1124	} event_handler;	1120	} event_handler;
1125	#endif	1121	#endif
1126		1122
…		…
1146	cmdbuf_endp += r;	1142	cmdbuf_endp += r;
1147	return true;	1143	return true;
1148	}	1144	}
1149	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1145	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1150	{	1146	{
1151	#if HAVE_SCHED_YIELD	1147	#if LINUX_YIELD_HACK
1152	if (display->is_local)	1148	if (display->is_local)
1153	event_handler.cw_yield.start ();	1149	event_handler.yield_ev.start ();
1154	#endif	1150	#endif
1155	}	1151	}
1156	else	1152	else
1157	{	1153	{
1158	pty_ev.stop ();	1154	pty_ev.stop ();
…		…
1180	}	1176	}
1181		1177
1182	void	1178	void
1183	rxvt_term::pointer_unblank ()	1179	rxvt_term::pointer_unblank ()
1184	{	1180	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1181	XDefineCursor (xdisp, vt, TermWin_cursor);
1186	recolour_cursor ();	1182	recolour_cursor ();
1187		1183
1188	#ifdef POINTER_BLANK	1184	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1185	hidden_pointer = 0;
1190		1186
…		…
1198	rxvt_term::pointer_blank ()	1194	rxvt_term::pointer_blank ()
1199	{	1195	{
1200	if (!OPTION (Opt_pointerBlank))	1196	if (!OPTION (Opt_pointerBlank))
1201	return;	1197	return;
1202		1198
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1199	XDefineCursor (xdisp, vt, display->blank_cursor);
1204	XFlush (display->display);	1200	XFlush (xdisp);
1205		1201
1206	hidden_pointer = 1;	1202	hidden_pointer = 1;
1207	}	1203	}
1208		1204
1209	void	1205	void
…		…
1282	(32 + button_number + key_state),	1278	(32 + button_number + key_state),
1283	(32 + x + 1),	1279	(32 + x + 1),
1284	(32 + y + 1));	1280	(32 + y + 1));
1285	}	1281	}
1286		1282
1287	#ifdef USING_W11LIB
1288	void
1289	rxvt_W11_process_x_event (XEvent *ev)
1290	{
1291	rxvt_t *r = rxvt_get_r ();
1292
1293	x_cb (*ev);
1294	}
1295	#endif
1296
1297	/{{{ process an X event /	1283	/{{{ process an X event /
1298	void	1284	void
1299	rxvt_term::x_cb (XEvent &ev)	1285	rxvt_term::x_cb (XEvent &ev)
1300	{	1286	{
1301	make_current ();	1287	make_current ();
1302		1288
1303	dDisp;	1289	dLocal (Display *, xdisp);
1304		1290
1305	if (ev.xany.window == vt	1291	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1292	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1293	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1294	return;
…		…
1405	button_release (ev.xbutton);	1391	button_release (ev.xbutton);
1406	break;	1392	break;
1407		1393
1408	case ClientMessage:	1394	case ClientMessage:
1409	if (ev.xclient.format == 32	1395	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1396	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	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	{
1412	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)))
1413	destroy ();	1405	destroy ();
		1406	}
1414	#if ENABLE_EWMH	1407	#if ENABLE_EWMH
1415	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])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1409	XSendEvent (xdisp, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1410	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1418	&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	}
1419	#endif	1423	#endif
1420	}	1424	}
1421	#if ENABLE_XEMBED
1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423	{
1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425	focus_in ();
1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427	focus_out ();
1428	}
1429	#endif
1430	#ifdef OFFIX_DND
1431	/* OffiX Dnd (drag 'n' drop) protocol */
1432	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433	&& (ev.xclient.data.l[0] == DndFile
1434	\|\| ev.xclient.data.l[0] == DndDir
1435	\|\| ev.xclient.data.l[0] == DndLink))
1436	{
1437	/* Get Dnd data */
1438	Atom ActualType;
1439	int ActualFormat;
1440	unsigned char *data;
1441	unsigned long Size, RemainingBytes;
1442
1443	XGetWindowProperty (disp, display->root,
1444	xa[XA_DNDSELECTION],
1445	0L, 1000000L,
1446	False, AnyPropertyType,
1447	&ActualType, &ActualFormat,
1448	&Size, &RemainingBytes,
1449	&data);
1450	set_string_property (XA_CUT_BUFFER0, data);
1451	XFree (data);
1452	selection_paste (display->root, XA_CUT_BUFFER0, true);
1453	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454	}
1455	#endif /* OFFIX_DND */
1456	break;	1425	break;
1457		1426
1458	case MappingNotify:	1427	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1428	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1429	break;
…		…
1493	break;	1462	break;
1494		1463
1495	case ConfigureNotify:	1464	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent[0])
1497	{	1466	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1468	;
1500		1469
1501	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1470	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1502	{	1471	{
1503	seen_resize = 1;	1472	seen_resize = 1;
…		…
1512	#endif	1481	#endif
1513	}	1482	}
1514	break;	1483	break;
1515		1484
1516	case PropertyNotify:	1485	case PropertyNotify:
		1486	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1487	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518	&& ev.xproperty.state == PropertyNewValue)	1488	&& ev.xproperty.state == PropertyNewValue)
1519	selection_property (ev.xproperty.window, ev.xproperty.atom);	1489	selection_property (ev.xproperty.window, ev.xproperty.atom);
1520		1490
1521	break;	1491	break;
1522		1492
1523	case SelectionClear:	1493	case SelectionClear:
1524	selection_clear ();	1494	selection_clear ();
…		…
1560	if (ev.xany.window == vt)	1530	if (ev.xany.window == vt)
1561	{	1531	{
1562	do	1532	do
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1533	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1534	ev.xexpose.width, ev.xexpose.height, False);
1565	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1535	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1566		1536
1567	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568		1538
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1539	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1540	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1541	ev.xexpose.width, ev.xexpose.height, False);
1572		1542
1573	want_refresh = 1;	1543	want_refresh = 1;
1574	}	1544	}
1575	else	1545	else
1576	{	1546	{
1577	XEvent unused_event;	1547	XEvent unused_event;
1578		1548
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1549	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1580	;	1550	;
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1551	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1582	;	1552	;
1583		1553
1584	if (isScrollbarWindow (ev.xany.window))	1554	if (isScrollbarWindow (ev.xany.window))
1585	{	1555	{
1586	scrollBar.setIdle ();	1556	scrollBar.setIdle ();
1587	scrollbar_show (0);	1557	scrollbar_show (0);
1588	}	1558	}
1589		1559
1590	#ifdef TRANSPARENT	1560	#ifdef TRANSPARENT
1591	if (am_transparent && ev.xany.window == parent[0])	1561	if (am_transparent && ev.xany.window == parent[0])
1592	XClearWindow (disp, ev.xany.window);	1562	XClearWindow (xdisp, ev.xany.window);
1593	#endif	1563	#endif
1594	}	1564	}
1595	break;	1565	break;
1596		1566
1597	case MotionNotify:	1567	case MotionNotify:
…		…
1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1577	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1578	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609	; // nop	1579	; // nop
1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1580	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1611	{	1581	{
1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1582	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1613	;	1583	;
1614		1584
1615	XQueryPointer (disp, vt,	1585	XQueryPointer (xdisp, vt,
1616	&unused_root, &unused_child,	1586	&unused_root, &unused_child,
1617	&unused_root_x, &unused_root_y,	1587	&unused_root_x, &unused_root_y,
1618	&ev.xbutton.x, &ev.xbutton.y,	1588	&ev.xbutton.x, &ev.xbutton.y,
1619	&ev.xbutton.state);	1589	&ev.xbutton.state);
1620	#ifdef MOUSE_THRESHOLD	1590	#ifdef MOUSE_THRESHOLD
…		…
1684	#endif	1654	#endif
1685	}	1655	}
1686	}	1656	}
1687	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1657	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688	{	1658	{
1689	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1659	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1690	MotionNotify, &ev))	1660	MotionNotify, &ev))
1691	;	1661	;
1692		1662
1693	XQueryPointer (disp, scrollBar.win,	1663	XQueryPointer (xdisp, scrollBar.win,
1694	&unused_root, &unused_child,	1664	&unused_root, &unused_child,
1695	&unused_root_x, &unused_root_y,	1665	&unused_root_x, &unused_root_y,
1696	&ev.xbutton.x, &ev.xbutton.y,	1666	&ev.xbutton.x, &ev.xbutton.y,
1697	&unused_mask);	1667	&unused_mask);
1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1668	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1713	{	1683	{
1714	hidden_cursor = 0;	1684	hidden_cursor = 0;
1715	want_refresh = 1;	1685	want_refresh = 1;
1716	}	1686	}
1717		1687
1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1688	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719	}	1689	}
1720	#endif	1690	#endif
1721		1691
1722	#if defined(POINTER_BLANK)	1692	#if defined(POINTER_BLANK)
1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1693	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1751	XSetICFocus (Input_Context);	1721	XSetICFocus (Input_Context);
1752	}	1722	}
1753	#endif	1723	#endif
1754	#if CURSOR_BLINK	1724	#if CURSOR_BLINK
1755	if (OPTION (Opt_cursorBlink))	1725	if (OPTION (Opt_cursorBlink))
1756	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1726	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757	#endif	1727	#endif
1758	#if OFF_FOCUS_FADING	1728	#if OFF_FOCUS_FADING
1759	if (rs[Rs_fade])	1729	if (rs[Rs_fade])
1760	{	1730	{
1761	pix_colors = pix_colors_focused;	1731	pix_colors = pix_colors_focused;
…		…
1842	/*	1812	/*
1843	* VT window processing of button press	1813	* VT window processing of button press
1844	*/	1814	*/
1845	if (ev.window == vt)	1815	if (ev.window == vt)
1846	{	1816	{
		1817	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1818	return;
		1819
1847	#if ISO_14755	1820	#if ISO_14755
1848	// 5.4	1821	// 5.4
1849	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1822	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1850	{	1823	{
1851	iso14755_54 (ev.x, ev.y);	1824	iso14755_54 (ev.x, ev.y);
…		…
1893	else	1866	else
1894	{	1867	{
1895	if (ev.button != MEvent.button)	1868	if (ev.button != MEvent.button)
1896	MEvent.clicks = 0;	1869	MEvent.clicks = 0;
1897		1870
1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899	switch (ev.button)	1871	switch (ev.button)
1900	{	1872	{
1901	case Button1:	1873	case Button1:
1902	/* allow meta + click to select rectangular areas */	1874	/* allow meta + click to select rectangular areas */
1903	/* should be done in screen.C */	1875	/* should be done in screen.C */
1904	#if ENABLE_FRILLS	1876	#if ENABLE_FRILLS
1905	selection.rect = !!(ev.state & ModMetaMask);	1877	selection.rect = !!(ev.state & ModMetaMask);
1906	#else	1878	#else
1907	selection.rect = false;	1879	selection.rect = false;
1908	#endif	1880	#endif
1909		1881
1910	/* allow shift+left click to extend selection */	1882	/* allow shift+left click to extend selection */
1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1883	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912	{	1884	{
1913	if (MEvent.button == Button1 && clickintime)	1885	if (MEvent.button == Button1 && clickintime)
1914	selection_rotate (ev.x, ev.y);	1886	selection_rotate (ev.x, ev.y);
1915	else	1887	else
1916	selection_extend (ev.x, ev.y, 1);	1888	selection_extend (ev.x, ev.y, 1);
1917	}	1889	}
1918	else	1890	else
1919	{	1891	{
1920	if (MEvent.button == Button1 && clickintime)	1892	if (MEvent.button == Button1 && clickintime)
1921	MEvent.clicks++;	1893	MEvent.clicks++;
1922	else	1894	else
1923	MEvent.clicks = 1;	1895	MEvent.clicks = 1;
1924		1896
1925	selection_click (MEvent.clicks, ev.x, ev.y);	1897	selection_click (MEvent.clicks, ev.x, ev.y);
1926	}	1898	}
1927		1899
1928	MEvent.button = Button1;	1900	MEvent.button = Button1;
1929	break;	1901	break;
1930		1902
1931	case Button3:	1903	case Button3:
1932	if (MEvent.button == Button3 && clickintime)	1904	if (MEvent.button == Button3 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1905	selection_rotate (ev.x, ev.y);
1934	else	1906	else
1935	selection_extend (ev.x, ev.y, 1);	1907	selection_extend (ev.x, ev.y, 1);
1936		1908
1937	MEvent.button = Button3;	1909	MEvent.button = Button3;
1938	break;	1910	break;
1939	}	1911	}
1940	}	1912	}
1941		1913
1942	MEvent.time = ev.time;	1914	MEvent.time = ev.time;
1943	return;	1915	return;
1944	}	1916	}
1945		1917
…		…
2108	sel_scroll_ev.stop();	2080	sel_scroll_ev.stop();
2109	#endif	2081	#endif
2110		2082
2111	if (ev.window == vt)	2083	if (ev.window == vt)
2112	{	2084	{
		2085	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2086	return;
		2087
2113	#if ISO_14755	2088	#if ISO_14755
2114	// 5.4	2089	// 5.4
2115	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2090	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2116	return;	2091	return;
2117	#endif	2092	#endif
		2093
2118	if (reportmode)	2094	if (reportmode)
2119	{	2095	{
2120	/* mouse report from vt window */	2096	/* mouse report from vt window */
2121	/* don't report release of wheel "buttons" */	2097	/* don't report release of wheel "buttons" */
2122	if (ev.button >= 4)	2098	if (ev.button >= 4)
…		…
2146	if (priv_modes & PrivMode_mouse_report	2122	if (priv_modes & PrivMode_mouse_report
2147	&& bypass_keystate	2123	&& bypass_keystate
2148	&& ev.button == Button1 && MEvent.clicks <= 1)	2124	&& ev.button == Button1 && MEvent.clicks <= 1)
2149	selection_extend (ev.x, ev.y, 0);	2125	selection_extend (ev.x, ev.y, 0);
2150		2126
2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152	return;
2153
2154	switch (ev.button)	2127	switch (ev.button)
2155	{	2128	{
2156	case Button1:	2129	case Button1:
2157	case Button3:	2130	case Button3:
2158	selection_make (ev.time);	2131	selection_make (ev.time);
2159	break;	2132	break;
2160		2133
2161	case Button2:	2134	case Button2:
2162	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?
2163	&& IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2136	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2164	selection_request (ev.time);
2165
2166	break;	2137	break;
2167		2138
2168	#ifdef MOUSE_WHEEL	2139	#ifdef MOUSE_WHEEL
2169	case Button4:	2140	case Button4:
2170	case Button5:	2141	case Button5:
…		…
2212	#if TINTING	2183	#if TINTING
2213	/* taken from aterm-0.4.2 */	2184	/* taken from aterm-0.4.2 */
2214		2185
2215	typedef uint32_t RUINT32T;	2186	typedef uint32_t RUINT32T;
2216		2187
2217	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)
2218	{	2189	{
2219	int sh_r, sh_g, sh_b;	2190	int sh_r, sh_g, sh_b;
2220	RUINT32T mask_r, mask_g, mask_b;	2191	RUINT32T mask_r, mask_g, mask_b;
2221	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2192	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2222	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2193	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2194	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224	int i;	2195	int i;
2225		2196
2226	Visual *visual = display->visual;	2197	Visual *visual = term->visual;
2227		2198
2228	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2199	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2229		2200
2230	/* for convenience */	2201	/* for convenience */
2231	mask_r = visual->red_mask;	2202	mask_r = visual->red_mask;
…		…
2452	Atom atype;	2423	Atom atype;
2453	unsigned char *prop = NULL;	2424	unsigned char *prop = NULL;
2454	Window root, oldp, *list;	2425	Window root, oldp, *list;
2455	Pixmap rootpixmap = None;	2426	Pixmap rootpixmap = None;
2456	XWindowAttributes wattr, wrootattr;	2427	XWindowAttributes wattr, wrootattr;
2457	dDisp;
2458		2428
2459	pchanged = 0;	2429	pchanged = 0;
2460		2430
2461	if (!OPTION (Opt_transparent))	2431	if (!OPTION (Opt_transparent))
2462	return pchanged; /* Don't try any more */	2432	return pchanged; /* Don't try any more */
2463		2433
2464	XGetWindowAttributes (disp, display->root, &wrootattr);	2434	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2465	rootdepth = wrootattr.depth;	2435	rootdepth = wrootattr.depth;
2466		2436
2467	XGetWindowAttributes (disp, parent[0], &wattr);	2437	XGetWindowAttributes (xdisp, parent[0], &wattr);
2468		2438
2469	if (rootdepth != wattr.depth)	2439	if (rootdepth != wattr.depth)
2470	{	2440	{
2471	if (am_transparent)	2441	if (am_transparent)
2472	{	2442	{
2473	pchanged = 1;	2443	pchanged = 1;
2474	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2444	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2475	am_transparent = am_pixmap_trans = 0;	2445	am_transparent = am_pixmap_trans = 0;
2476	}	2446	}
2477		2447
2478	return pchanged; /* Don't try any more */	2448	return pchanged; /* Don't try any more */
2479	}	2449	}
2480		2450
2481	/* 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. */
2482	XSync (disp, False);	2452	XSync (xdisp, False);
2483		2453
2484	/*	2454	/*
2485	* Make the frame window set by the window manager have	2455	* Make the frame window set by the window manager have
2486	* the root background. Some window managers put multiple nested frame	2456	* the root background. Some window managers put multiple nested frame
2487	* 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.
2488	*/	2458	*/
2489	i = (xa[XA_XROOTPMAP_ID]	2459	i = (xa[XA_XROOTPMAP_ID]
2490	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2460	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2491	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2461	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492	&nitems, &bytes_after, &prop) == Success);	2462	&nitems, &bytes_after, &prop) == Success);
2493		2463
2494	if (!i \|\| prop == NULL)	2464	if (!i \|\| prop == NULL)
2495	i = (xa[XA_ESETROOT_PMAP_ID]	2465	i = (xa[XA_ESETROOT_PMAP_ID]
2496	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2466	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498	&nitems, &bytes_after, &prop) == Success);	2468	&nitems, &bytes_after, &prop) == Success);
2499		2469
2500	if (!i \|\| prop == NULL	2470	if (!i \|\| prop == NULL
2501	#if TINTING	2471	#if TINTING
2502	\|\| !rs[Rs_color + Color_tint]	2472	\|\| !ISSET_PIXCOLOR (Color_tint)
2503	#endif	2473	#endif
2504	)	2474	)
2505	have_pixmap = 0;	2475	have_pixmap = 0;
2506	else	2476	else
2507	{	2477	{
…		…
2520	Window cr;	2490	Window cr;
2521	XImage *image;	2491	XImage *image;
2522	GC gc;	2492	GC gc;
2523	XGCValues gcvalue;	2493	XGCValues gcvalue;
2524		2494
2525	XTranslateCoordinates (disp, parent[0], display->root,	2495	XTranslateCoordinates (xdisp, parent[0], display->root,
2526	0, 0, &sx, &sy, &cr);	2496	0, 0, &sx, &sy, &cr);
2527	nw = (unsigned int)szHint.width;	2497	nw = (unsigned int)szHint.width;
2528	nh = (unsigned int)szHint.height;	2498	nh = (unsigned int)szHint.height;
2529	nx = ny = 0;	2499	nx = ny = 0;
2530		2500
…		…
2543	}	2513	}
2544		2514
2545	min_it (nw, (unsigned int) (wrootattr.width - sx));	2515	min_it (nw, (unsigned int) (wrootattr.width - sx));
2546	min_it (nh, (unsigned int) (wrootattr.height - sy));	2516	min_it (nh, (unsigned int) (wrootattr.height - sy));
2547		2517
2548	XSync (disp, False);	2518	XSync (xdisp, False);
2549	allowedxerror = -1;	2519	allowedxerror = -1;
2550	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2520	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551		2521
2552	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2522	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2553	/* XXX: may need a delay here? */	2523	/* XXX: may need a delay here? */
2554	allowedxerror = 0;	2524	allowedxerror = 0;
2555		2525
…		…
2558	if (am_transparent && am_pixmap_trans)	2528	if (am_transparent && am_pixmap_trans)
2559	{	2529	{
2560	pchanged = 1;	2530	pchanged = 1;
2561	if (pixmap != None)	2531	if (pixmap != None)
2562	{	2532	{
2563	XFreePixmap (disp, pixmap);	2533	XFreePixmap (xdisp, pixmap);
2564	pixmap = None;	2534	pixmap = None;
2565	}	2535	}
2566	}	2536	}
2567		2537
2568	am_pixmap_trans = 0;	2538	am_pixmap_trans = 0;
2569	}	2539	}
2570	else	2540	else
2571	{	2541	{
2572	if (pixmap != None)	2542	if (pixmap != None)
2573	XFreePixmap (disp, pixmap);	2543	XFreePixmap (xdisp, pixmap);
2574		2544
2575	#if TINTING	2545	#if TINTING
2576	if (ISSET_PIXCOLOR (Color_tint))	2546	if (ISSET_PIXCOLOR (Color_tint))
2577	{	2547	{
2578	unsigned short rm, gm, bm;
2579	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580		2549
		2550	rgba c;
2581	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2551	pix_colors_focused [Color_tint].get (c);
2582		2552
2583	ShadeXImage (display, image, shade, rm, gm, bm);	2553	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2584	}	2554	}
2585	#endif	2555	#endif
2586		2556
2587	pixmap = XCreatePixmap (disp, vt,	2557	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2588	szHint.width, szHint.height, image->depth);
2589	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2558	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2590	XPutImage (disp, pixmap, gc, image, 0, 0,	2559	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2591	nx, ny, image->width, image->height);	2560	nx, ny, image->width, image->height);
2592	XFreeGC (disp, gc);	2561	XFreeGC (xdisp, gc);
2593	XDestroyImage (image);	2562	XDestroyImage (image);
2594	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2563	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2595	XClearWindow (disp, parent[0]);	2564	XClearWindow (xdisp, parent[0]);
2596		2565
2597	if (!am_transparent \|\| !am_pixmap_trans)	2566	if (!am_transparent \|\| !am_pixmap_trans)
2598	pchanged = 1;	2567	pchanged = 1;
2599		2568
2600	am_transparent = am_pixmap_trans = 1;	2569	am_transparent = am_pixmap_trans = 1;
2601	}	2570	}
2602	}	2571	}
2603		2572
2604	if (am_pixmap_trans)	2573	if (am_pixmap_trans)
2605	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2574	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2606	else	2575	else
2607	{	2576	{
2608	unsigned int n;	2577	unsigned int n;
2609	/*	2578	/*
2610	* InheritPixmap transparency	2579	* InheritPixmap transparency
2611	*/	2580	*/
2612	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613	{	2582	{
2614	oldp = parent[i];	2583	oldp = parent[i];
2615	XQueryTree (disp, parent[i - 1], &root,	2584	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2616	&parent[i], &list, &n);
2617	XFree (list);	2585	XFree (list);
2618		2586
2619	if (parent[i] == display->root)	2587	if (parent[i] == display->root)
2620	{	2588	{
2621	if (oldp != None)	2589	if (oldp != None)
…		…
2629	}	2597	}
2630		2598
2631	n = 0;	2599	n = 0;
2632		2600
2633	if (pchanged)	2601	if (pchanged)
2634	{
2635	for (; n < (unsigned int)i; n++)	2602	for (; n < (unsigned int)i; n++)
2636	{	2603	{
2637	XGetWindowAttributes (disp, parent[n], &wattr);	2604	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2605
2638	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2606	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2639	{	2607	{
2640	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2608	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641	break;	2609	break;
2642	}	2610	}
2643	}	2611	}
2644	}
2645		2612
2646	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2613	if (n > (sizeof (parent) / sizeof (parent[0])))
2647	{	2614	{
2648	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2615	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2649	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2616	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2650	am_transparent = 0;	2617	am_transparent = 0;
2651	/* XXX: also turn off Opt_transparent? */	2618	/* XXX: also turn off Opt_transparent? */
2652	}	2619	}
2653	else	2620	else
2654	{	2621	{
2655	#if WAIT_FOR_WM
2656	/* wait (an arbitrary period) for the WM to do its thing
2657	* needed for fvwm2.2.2 (and before?) */
2658	sleep (1);
2659	#endif
2660	for (n = 0; n < (unsigned int)i; n++)	2622	for (n = 0; n < (unsigned int)i; n++)
2661	{	2623	{
2662	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2624	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2663	XClearWindow (disp, parent[n]);	2625	XClearWindow (xdisp, parent[n]);
2664	}	2626	}
2665		2627
2666	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2667	am_transparent = 1;	2629	am_transparent = 1;
2668	}	2630	}
2669		2631
2670	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2632	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671	parent[i] = None;	2633	parent[i] = None;
2672	}	2634	}
2673		2635
2674	if (scrollBar.win)	2636	if (scrollBar.win)
2675	{	2637	{
2676	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2638	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2677	scrollBar.setIdle ();	2639	scrollBar.setIdle ();
2678	scrollbar_show (0);	2640	scrollbar_show (0);
2679	}	2641	}
2680		2642
2681	if (am_transparent)	2643	if (am_transparent)
…		…
2827	return flag;	2789	return flag;
2828	}	2790	}
2829		2791
2830	// read the next character	2792	// read the next character
2831	wchar_t	2793	wchar_t
2832	rxvt_term::next_char ()	2794	rxvt_term::next_char () NOTHROW
2833	{	2795	{
2834	while (cmdbuf_ptr < cmdbuf_endp)	2796	while (cmdbuf_ptr < cmdbuf_endp)
2835	{	2797	{
2836	// assume 7-bit to be ascii ALWAYS	2798	// assume 7-bit to be ascii ALWAYS
2837	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2799	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2858	return NOCHAR;	2820	return NOCHAR;
2859	}	2821	}
2860		2822
2861	// read the next octet	2823	// read the next octet
2862	uint32_t	2824	uint32_t
2863	rxvt_term::next_octet ()	2825	rxvt_term::next_octet () NOTHROW
2864	{	2826	{
2865	return cmdbuf_ptr < cmdbuf_endp	2827	return cmdbuf_ptr < cmdbuf_endp
2866	? (unsigned char)*cmdbuf_ptr++	2828	? (unsigned char)*cmdbuf_ptr++
2867	: NOCHAR;	2829	: NOCHAR;
2868	}	2830	}
		2831
		2832	static class out_of_input out_of_input;
2869		2833
2870	/* rxvt_cmd_getc () - Return next input character */	2834	/* rxvt_cmd_getc () - Return next input character */
2871	/*	2835	/*
2872	* Return the next input character after first passing any keyboard input	2836	* Return the next input character after first passing any keyboard input
2873	* to the command.	2837	* to the command.
2874	*/	2838	*/
2875	wchar_t	2839	wchar_t
2876	rxvt_term::cmd_getc ()	2840	rxvt_term::cmd_getc () THROW ((class out_of_input))
2877	{	2841	{
2878	wchar_t c = next_char ();	2842	wchar_t c = next_char ();
2879		2843
2880	if (c == NOCHAR)	2844	if (c == NOCHAR)
2881	throw out_of_input;	2845	throw out_of_input;
2882		2846
2883	return c;	2847	return c;
2884	}	2848	}
2885		2849
2886	uint32_t	2850	uint32_t
2887	rxvt_term::cmd_get8 ()	2851	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888	{	2852	{
2889	uint32_t c = next_octet ();	2853	uint32_t c = next_octet ();
2890		2854
2891	if (c == NOCHAR)	2855	if (c == NOCHAR)
2892	throw out_of_input;	2856	throw out_of_input;
…		…
3130	scr_charset_set (2, (unsigned int)cmd_getc ());	3094	scr_charset_set (2, (unsigned int)cmd_getc ());
3131	break;	3095	break;
3132	case '+':	3096	case '+':
3133	scr_charset_set (3, (unsigned int)cmd_getc ());	3097	scr_charset_set (3, (unsigned int)cmd_getc ());
3134	break;	3098	break;
3135	#if ENABLE_FRILLS	3099	#if !ENABLE_MINIMAL
3136	case '6':	3100	case '6':
3137	scr_backindex ();	3101	scr_backindex ();
3138	break;	3102	break;
3139	#endif	3103	#endif
3140	case '7':	3104	case '7':
3141	scr_cursor (SAVE);	3105	scr_cursor (SAVE);
3142	break;	3106	break;
3143	case '8':	3107	case '8':
3144	scr_cursor (RESTORE);	3108	scr_cursor (RESTORE);
3145	break;	3109	break;
3146	#if ENABLE_FRILLS	3110	#if !ENABLE_MINIMAL
3147	case '9':	3111	case '9':
3148	scr_forwardindex ();	3112	scr_forwardindex ();
3149	break;	3113	break;
3150	#endif	3114	#endif
3151	case '=':	3115	case '=':
…		…
3313	ndef = get_byte_array_bit (csi_defaults, i);	3277	ndef = get_byte_array_bit (csi_defaults, i);
3314	for (p = 0; p < nargs; p++)	3278	for (p = 0; p < nargs; p++)
3315	if (arg[p] == -1)	3279	if (arg[p] == -1)
3316	arg[p] = ndef;	3280	arg[p] = ndef;
3317		3281
3318	#ifdef DEBUG_CMD
3319	fprintf (stderr, "CSI ");
3320	for (p = 0; p < nargs; p++)
3321	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322	fprintf (stderr, "%c\n", ch);
3323	#endif
3324
3325	/*	3282	/*
3326	* private mode handling	3283	* private mode handling
3327	*/	3284	*/
3328	if (priv)	3285	if (priv)
3329	{	3286	{
3330	switch (priv)	3287	switch (priv)
3331	{	3288	{
3332	case '>':	3289	case '>':
3333	if (ch == CSI_DA) /* secondary device attributes */	3290	if (ch == CSI_DA) /* secondary device attributes */
3334	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	}
3335	break;	3301	break;
3336	case '?':	3302	case '?':
3337	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3303	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3338	process_terminal_mode (ch, priv, nargs, arg);	3304	process_terminal_mode (ch, priv, nargs, arg);
3339	break;	3305	break;
…		…
3542	break;	3508	break;
3543	case CSI_75:	3509	case CSI_75:
3544	scr_cursor (RESTORE);	3510	scr_cursor (RESTORE);
3545	break;	3511	break;
3546		3512
3547	#if ENABLE_FRILLS	3513	#if !ENABLE_MINIMAL
3548	case CSI_74:	3514	case CSI_74:
3549	process_window_ops (arg, nargs);	3515	process_window_ops (arg, nargs);
3550	break;	3516	break;
3551	#endif	3517	#endif
3552		3518
…		…
3559	break;	3525	break;
3560	}	3526	}
3561	}	3527	}
3562	/}}} /	3528	/}}} /
3563		3529
3564	#if ENABLE_FRILLS	3530	#if !ENABLE_MINIMAL
3565	/* ARGSUSED */	3531	/* ARGSUSED */
3566	void	3532	void
3567	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3533	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568	{	3534	{
3569	int x, y;	3535	int x, y;
3570	XWindowAttributes wattr;	3536	XWindowAttributes wattr;
3571	Window wdummy;	3537	Window wdummy;
3572	dDisp;	3538
		3539	dLocal (Display *, xdisp);
3573		3540
3574	if (nargs == 0)	3541	if (nargs == 0)
3575	return;	3542	return;
3576		3543
3577	switch (args[0])	3544	switch (args[0])
3578	{	3545	{
3579	/*	3546	/*
3580	* commands	3547	* commands
3581	*/	3548	*/
3582	case 1: /* deiconify window */	3549	case 1: /* deiconify window */
3583	XMapWindow (disp, parent[0]);	3550	XMapWindow (xdisp, parent[0]);
3584	break;	3551	break;
3585	case 2: /* iconify window */	3552	case 2: /* iconify window */
3586	XIconifyWindow (disp, parent[0], display->screen);	3553	XIconifyWindow (xdisp, parent[0], display->screen);
3587	break;	3554	break;
3588	case 3: /* set position (pixels) */	3555	case 3: /* set position (pixels) */
3589	XMoveWindow (disp, parent[0], args[1], args[2]);	3556	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3590	break;	3557	break;
3591	case 4: /* set size (pixels) */	3558	case 4: /* set size (pixels) */
3592	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3559	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593	break;	3560	break;
3594	case 5: /* raise window */	3561	case 5: /* raise window */
3595	XRaiseWindow (disp, parent[0]);	3562	XRaiseWindow (xdisp, parent[0]);
3596	break;	3563	break;
3597	case 6: /* lower window */	3564	case 6: /* lower window */
3598	XLowerWindow (disp, parent[0]);	3565	XLowerWindow (xdisp, parent[0]);
3599	break;	3566	break;
3600	case 7: /* refresh window */	3567	case 7: /* refresh window */
3601	scr_touch (true);	3568	scr_touch (true);
3602	break;	3569	break;
3603	case 8: /* set size (chars) */	3570	case 8: /* set size (chars) */
…		…
3610	if (args[0] >= 24) /* set height (chars) */	3577	if (args[0] >= 24) /* set height (chars) */
3611	set_widthheight ((unsigned int)width,	3578	set_widthheight ((unsigned int)width,
3612	(unsigned int) (args[1] * fheight));	3579	(unsigned int) (args[1] * fheight));
3613	break;	3580	break;
3614		3581
3615
3616	/*	3582	/*
3617	* reports - some output format copied from XTerm	3583	* reports - some output format copied from XTerm
3618	*/	3584	*/
3619	case 11: /* report window state */	3585	case 11: /* report window state */
3620	XGetWindowAttributes (disp, parent[0], &wattr);	3586	XGetWindowAttributes (xdisp, parent[0], &wattr);
3621	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3587	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622	break;	3588	break;
3623	case 13: /* report window position */	3589	case 13: /* report window position */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (xdisp, parent[0], &wattr);
3625	XTranslateCoordinates (disp, parent[0], wattr.root,	3591	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3626	-wattr.border_width, -wattr.border_width,	3592	-wattr.border_width, -wattr.border_width,
3627	&x, &y, &wdummy);	3593	&x, &y, &wdummy);
3628	tt_printf ("\033[3;%d;%dt", x, y);	3594	tt_printf ("\033[3;%d;%dt", x, y);
3629	break;	3595	break;
3630	case 14: /* report window size (pixels) */	3596	case 14: /* report window size (pixels) */
3631	XGetWindowAttributes (disp, parent[0], &wattr);	3597	XGetWindowAttributes (xdisp, parent[0], &wattr);
3632	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3598	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633	break;	3599	break;
3634	case 18: /* report text area size (chars) */	3600	case 18: /* report text area size (chars) */
3635	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3601	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636	break;	3602	break;
…		…
3638	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3604	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639	break;	3605	break;
3640	case 20: /* report icon label */	3606	case 20: /* report icon label */
3641	{	3607	{
3642	char *s;	3608	char *s;
3643	XGetIconName (disp, parent[0], &s);	3609	XGetIconName (xdisp, parent[0], &s);
3644	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 */
3645	XFree (s);	3611	XFree (s);
3646	}	3612	}
3647	break;	3613	break;
3648	case 21: /* report window title */	3614	case 21: /* report window title */
3649	{	3615	{
3650	char *s;	3616	char *s;
3651	XFetchName (disp, parent[0], &s);	3617	XFetchName (xdisp, parent[0], &s);
3652	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 */
3653	XFree (s);	3619	XFree (s);
3654	}	3620	}
3655	break;	3621	break;
3656	}	3622	}
…		…
3757	void	3723	void
3758	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)
3759	{	3725	{
3760	if (str[0] == '?' && !str[1])	3726	if (str[0] == '?' && !str[1])
3761	{	3727	{
3762	unsigned short r, g, b;	3728	rgba c;
3763	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
3764	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);
3765	}	3737	}
3766	else	3738	else
3767	set_window_color (color, str);	3739	set_window_color (color, str);
3768	}	3740	}
3769		3741
…		…
3775	{	3747	{
3776	int color;	3748	int color;
3777	char buf, name;	3749	char buf, name;
3778	bool query = str[0] == '?' && !str[1];	3750	bool query = str[0] == '?' && !str[1];
3779	int saveop = op;	3751	int saveop = op;
3780	dDisp;	3752
		3753	dLocal (Display *, xdisp);
3781		3754
3782	assert (str != NULL);	3755	assert (str != NULL);
3783	switch (op)	3756	switch (op)
3784	{	3757	{
3785	case XTerm_name:	3758	case XTerm_name:
…		…
3801	unsigned long bytes_after;	3774	unsigned long bytes_after;
3802	unsigned char *value = 0;	3775	unsigned char *value = 0;
3803	const char *str = "";	3776	const char *str = "";
3804		3777
3805	if (prop	3778	if (prop
3806	&& XGetWindowProperty (disp, parent[0],	3779	&& XGetWindowProperty (xdisp, parent[0],
3807	prop, 0, 1<<16, 0, AnyPropertyType,	3780	prop, 0, 1<<16, 0, AnyPropertyType,
3808	&actual_type, &actual_format,	3781	&actual_type, &actual_format,
3809	&nitems, &bytes_after, &value) == Success	3782	&nitems, &bytes_after, &value) == Success
3810	&& actual_type != None	3783	&& actual_type != None
3811	&& actual_format == 8)	3784	&& actual_format == 8)
3812	str = (const char *)(value);	3785	str = (const char *)(value);
3813		3786
3814	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3787	tt_printf ("\033]%d;%s%c", op, str, resp);
3815		3788
3816	XFree (value);	3789	XFree (value);
3817	}	3790	}
3818	else	3791	else
3819	{	3792	{
…		…
3823	{	3796	{
3824	*eq = 0;	3797	*eq = 0;
3825	set_utf8_property (display->atom (str), eq + 1);	3798	set_utf8_property (display->atom (str), eq + 1);
3826	}	3799	}
3827	else	3800	else
3828	XDeleteProperty (disp, parent[0],	3801	XDeleteProperty (xdisp, parent[0],
3829	display->atom (str));	3802	display->atom (str));
3830	}	3803	}
3831	break;	3804	break;
3832		3805
3833	case XTerm_Color:	3806	case XTerm_Color:
…		…
3843	break;	3816	break;
3844		3817
3845	if ((buf = strchr (name, ';')) != NULL)	3818	if ((buf = strchr (name, ';')) != NULL)
3846	*buf++ = '\0';	3819	*buf++ = '\0';
3847		3820
3848	if (name[0] == '?' && !name[1])	3821	process_color_seq (op, color, name, resp);
3849	{
3850	unsigned short r, g, b;
3851	pix_colors_focused[color].get (display, r, g, b);
3852	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853	}
3854	else
3855	set_window_color (color, name);
3856	}	3822	}
3857	break;	3823	break;
3858	case XTerm_Color00:	3824	case XTerm_Color00:
3859	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3825	process_color_seq (op, Color_fg, str, resp);
3860	break;	3826	break;
3861	case XTerm_Color01:	3827	case XTerm_Color01:
3862	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3828	process_color_seq (op, Color_bg, str, resp);
3863	break;	3829	break;
3864	#ifndef NO_CURSORCOLOR	3830	#ifndef NO_CURSORCOLOR
3865	case XTerm_Color_cursor:	3831	case XTerm_Color_cursor:
3866	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3832	process_color_seq (op, Color_cursor, str, resp);
3867	break;	3833	break;
3868	#endif	3834	#endif
3869	case XTerm_Color_pointer_fg:	3835	case XTerm_Color_pointer_fg:
3870	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3836	process_color_seq (op, Color_pointer_fg, str, resp);
3871	break;	3837	break;
3872	case XTerm_Color_pointer_bg:	3838	case XTerm_Color_pointer_bg:
3873	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3839	process_color_seq (op, Color_pointer_bg, str, resp);
3874	break;	3840	break;
3875	#ifndef NO_BOLD_UNDERLINE_REVERSE	3841	#ifndef NO_BOLD_UNDERLINE_REVERSE
3876	case XTerm_Color_RV:	3842	case XTerm_Color_RV:
3877	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3843	process_color_seq (op, Color_RV, str, resp);
3878	break;	3844	break;
3879	case Rxvt_Color_BD:	3845	case Rxvt_Color_BD:
3880	case URxvt_Color_BD:	3846	case URxvt_Color_BD:
3881	process_color_seq (op, Color_BD, str, resp);	3847	process_color_seq (op, Color_BD, str, resp);
3882	break;	3848	break;
3883	case Rxvt_Color_UL:	3849	case Rxvt_Color_UL:
3884	case URxvt_Color_UL:	3850	case URxvt_Color_UL:
3885	process_color_seq (op, Color_UL, str, resp);	3851	process_color_seq (op, Color_UL, str, resp);
3886	break;	3852	break;
3887	case URxvt_Color_IT:	3853	case URxvt_Color_IT:
3888	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3854	process_color_seq (op, Color_IT, str, resp);
3889	break;	3855	break;
3890	#endif	3856	#endif
3891	#if TRANSPARENT && TINTING	3857	#if TRANSPARENT && TINTING
3892	case URxvt_Color_tint:	3858	case URxvt_Color_tint:
3893	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3859	process_color_seq (op, Color_tint, str, resp);
		3860
3894	check_our_parents ();	3861	check_our_parents ();
		3862
3895	if (am_transparent)	3863	if (am_transparent)
3896	want_full_refresh = want_refresh = 1;	3864	want_full_refresh = want_refresh = 1;
		3865
3897	break;	3866	break;
3898	#endif	3867	#endif
3899		3868
3900	case Rxvt_Pixmap:	3869	case Rxvt_Pixmap:
3901	{	3870	{
…		…
3972	allocated.push_back ((void *)res);	3941	allocated.push_back ((void *)res);
3973	set_fonts ();	3942	set_fonts ();
3974	}	3943	}
3975	break;	3944	break;
3976		3945
3977	#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
3978	case URxvt_locale:	3955	case URxvt_locale:
3979	if (query)	3956	if (query)
3980	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);
3981	else	3958	else
3982	{	3959	{
3983	set_locale (str);	3960	set_locale (str);
3984	pty->set_utf8_mode (enc_utf8);	3961	pty->set_utf8_mode (enc_utf8);
3985	init_xlocale ();	3962	init_xlocale ();
…		…
4042	return state;	4019	return state;
4043	}	4020	}
4044		4021
4045	/* we're not using priv _yet_ */	4022	/* we're not using priv _yet_ */
4046	void	4023	void
4047	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4024	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048	{	4025	{
4049	unsigned int i, j;	4026	unsigned int i, j;
4050	int state;	4027	int state;
4051		4028
4052	static const struct	4029	static const struct
…		…
4346	scr_color (Color_bg, Color_bg);	4323	scr_color (Color_bg, Color_bg);
4347	break;	4324	break;
4348		4325
4349	//case 50: // not variable spacing	4326	//case 50: // not variable spacing
4350		4327
4351	#if ENABLE_FRILLS	4328	#if !ENABLE_MINIMAL
4352	case 90:	4329	case 90:
4353	case 91: /* set bright fg color */	4330	case 91: /* set bright fg color */
4354	case 92:	4331	case 92:
4355	case 93:	4332	case 93:
4356	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.272 by root, Thu Jan 19 16:22:12 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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC