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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs. Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC