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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 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
65	/----------------------------------------------------------------------/	60	/----------------------------------------------------------------------/
66		61
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#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		63
72	#if ENABLE_FRILLS \|\| ISO_14755	64	#if ENABLE_FRILLS \|\| ISO_14755
73		65
74	#define ISO_14755_STARTED 0x80000000UL	66	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	67	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	222	# if !UNICODE3
231	if (ch >= 0x10000)	223	if (ch >= 0x10000)
232	ch = 0xfffd;	224	ch = 0xfffd;
233	# endif	225	# endif
234	scr_overlay_set (11, y, ch, r);	226	scr_overlay_set (11, y, ch, r);
		227
		228	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
236	}	230	}
237		231
		232	// {
		233	// char buf[4+4+3+1];
		234	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		235	// scr_overlay_set (0, 0, buf);
		236	// }
238	scr_overlay_set (0, len , attr);	237	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	238	scr_overlay_set (0, len + 1, fname);
240		239
241	free (fname);	240	free (fname);
242		241
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	301	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	302	{
304	int ctrl, meta, shft, len;	303	int ctrl, meta, shft, len;
305	unsigned int newlen;	304	unsigned int newlen;
306	KeySym keysym;	305	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	306	int valid_keysym;
311	char kbuf[KBUFSZ];	307	char kbuf[KBUFSZ];
312		308
313	/*	309	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	310	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
464	{	460	{
465	switch (keysym)	461	switch (keysym)
466	{	462	{
467	/* normal XTerm key bindings */	463	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	464	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	465	selection_request (ev.time);
470	return;	466	return;
471	#if TODO	467	#if TODO
472	/* rxvt extras */	468	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	469	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	470	change_font (FONT_UP);
…		…
905	{	901	{
906	const char ch = C0_ESC;	902	const char ch = C0_ESC;
907	tt_write (&ch, 1);	903	tt_write (&ch, 1);
908	}	904	}
909		905
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);	906	tt_write (kbuf, (unsigned int)len);
921	}	907	}
922	/}}} /	908	/}}} /
923		909
924	#if defined (KEYSYM_RESOURCE)	910	#if defined (KEYSYM_RESOURCE)
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1030	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1031	{
1046	hidden_cursor = !hidden_cursor;	1032	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1033	want_refresh = 1;
1048		1034
1049	w.start (w.at + BLINK_INTERVAL);	1035	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1036	}
1051	#endif	1037	#endif
1052		1038
1053	#ifdef TEXT_BLINK	1039	#ifdef TEXT_BLINK
1054	void	1040	void
…		…
1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105	}	1091	}
1106	}	1092	}
1107	#endif	1093	#endif
1108		1094
1109	#if HAVE_SCHED_YIELD	1095	#if LINUX_YIELD_HACK
1110	static struct event_handler	1096	static struct event_handler
1111	{	1097	{
1112	check_watcher cw_yield;	1098	check_watcher yield_ev;
1113		1099
1114	void yield (check_watcher &w)	1100	void yield_cb (check_watcher &w)
1115	{	1101	{
1116	sched_yield ();	1102	usleep (0);
1117	w.stop ();	1103	w.stop ();
1118	}	1104	}
1119		1105
1120	event_handler ()	1106	event_handler ()
1121	: cw_yield (this, &event_handler::yield)	1107	: yield_ev (this, &event_handler::yield_cb)
1122	{	1108	{
1123	}	1109	}
1124	} event_handler;	1110	} event_handler;
1125	#endif	1111	#endif
1126		1112
…		…
1137		1123
1138	memmove (cmdbuf_base, cmdbuf_ptr, n);	1124	memmove (cmdbuf_base, cmdbuf_ptr, n);
1139	cmdbuf_ptr = cmdbuf_base;	1125	cmdbuf_ptr = cmdbuf_base;
1140	cmdbuf_endp = cmdbuf_ptr + n;	1126	cmdbuf_endp = cmdbuf_ptr + n;
1141		1127
1142	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1128	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143		1129
1144	if (r > 0)	1130	if (r > 0)
1145	{	1131	{
1146	cmdbuf_endp += r;	1132	cmdbuf_endp += r;
1147	return true;	1133	return true;
1148	}	1134	}
1149	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1135	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1150	{	1136	{
1151	#if HAVE_SCHED_YIELD	1137	#if LINUX_YIELD_HACK
1152	if (display->is_local)	1138	if (display->is_local)
1153	event_handler.cw_yield.start ();	1139	event_handler.yield_ev.start ();
1154	#endif	1140	#endif
1155	}	1141	}
1156	else	1142	else
1157	{	1143	{
1158	pty_ev.stop ();	1144	pty_ev.stop ();
…		…
1180	}	1166	}
1181		1167
1182	void	1168	void
1183	rxvt_term::pointer_unblank ()	1169	rxvt_term::pointer_unblank ()
1184	{	1170	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1171	XDefineCursor (xdisp, vt, TermWin_cursor);
1186	recolour_cursor ();	1172	recolour_cursor ();
1187		1173
1188	#ifdef POINTER_BLANK	1174	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1175	hidden_pointer = 0;
1190		1176
…		…
1198	rxvt_term::pointer_blank ()	1184	rxvt_term::pointer_blank ()
1199	{	1185	{
1200	if (!OPTION (Opt_pointerBlank))	1186	if (!OPTION (Opt_pointerBlank))
1201	return;	1187	return;
1202		1188
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1189	XDefineCursor (xdisp, vt, display->blank_cursor);
1204	XFlush (display->display);	1190	XFlush (xdisp);
1205		1191
1206	hidden_pointer = 1;	1192	hidden_pointer = 1;
1207	}	1193	}
1208		1194
1209	void	1195	void
…		…
1282	(32 + button_number + key_state),	1268	(32 + button_number + key_state),
1283	(32 + x + 1),	1269	(32 + x + 1),
1284	(32 + y + 1));	1270	(32 + y + 1));
1285	}	1271	}
1286		1272
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 /	1273	/{{{ process an X event /
1298	void	1274	void
1299	rxvt_term::x_cb (XEvent &ev)	1275	rxvt_term::x_cb (XEvent &ev)
1300	{	1276	{
1301	make_current ();	1277	make_current ();
1302		1278
1303	dDisp;	1279	dLocal (Display *, xdisp);
1304		1280
1305	if (ev.xany.window == vt	1281	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1282	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1283	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1284	return;
…		…
1405	button_release (ev.xbutton);	1381	button_release (ev.xbutton);
1406	break;	1382	break;
1407		1383
1408	case ClientMessage:	1384	case ClientMessage:
1409	if (ev.xclient.format == 32	1385	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1386	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	1387	{
		1388	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1389	{
		1390	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1391	{
1412	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1392	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1393	{
		1394	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413	destroy ();	1395	destroy ();
		1396	}
1414	#if ENABLE_EWMH	1397	#if ENABLE_EWMH
1415	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1398	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1399	XSendEvent (xdisp, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1400	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1418	&ev);	1401	&ev);
		1402	#endif
		1403	}
		1404	}
		1405	#if ENABLE_XEMBED
		1406	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1407	{
		1408	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1409	focus_in ();
		1410	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1411	focus_out ();
		1412	}
1419	#endif	1413	#endif
1420	}	1414	}
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;	1415	break;
1457		1416
1458	case MappingNotify:	1417	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1418	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1419	break;
…		…
1493	break;	1452	break;
1494		1453
1495	case ConfigureNotify:	1454	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1455	if (ev.xconfigure.window == parent[0])
1497	{	1456	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1457	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1458	;
1500		1459
1501	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1460	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1502	{	1461	{
1503	seen_resize = 1;	1462	seen_resize = 1;
1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1463	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505	}	1464	}
1506		1465
		1466	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1467
1507	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1468	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508	if (OPTION (Opt_transparent))	1469	if (OPTION (Opt_transparent))
1509	check_our_parents ();	1470	check_our_parents ();
1510	#endif	1471	#endif
1511	}	1472	}
1512	break;	1473	break;
1513		1474
1514	case PropertyNotify:	1475	case PropertyNotify:
		1476	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1477	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516	&& ev.xproperty.state == PropertyNewValue)	1478	&& ev.xproperty.state == PropertyNewValue)
1517	selection_property (ev.xproperty.window, ev.xproperty.atom);	1479	selection_property (ev.xproperty.window, ev.xproperty.atom);
1518		1480
1519	break;	1481	break;
1520		1482
1521	case SelectionClear:	1483	case SelectionClear:
1522	selection_clear ();	1484	selection_clear ();
…		…
1558	if (ev.xany.window == vt)	1520	if (ev.xany.window == vt)
1559	{	1521	{
1560	do	1522	do
1561	scr_expose (ev.xexpose.x, ev.xexpose.y,	1523	scr_expose (ev.xexpose.x, ev.xexpose.y,
1562	ev.xexpose.width, ev.xexpose.height, False);	1524	ev.xexpose.width, ev.xexpose.height, False);
1563	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1525	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1564		1526
1565	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1527	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566		1528
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1529	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1530	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1531	ev.xexpose.width, ev.xexpose.height, False);
1570		1532
1571	want_refresh = 1;	1533	want_refresh = 1;
1572	}	1534	}
1573	else	1535	else
1574	{	1536	{
1575	XEvent unused_event;	1537	XEvent unused_event;
1576		1538
1577	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1578	;	1540	;
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1541	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1580	;	1542	;
1581		1543
1582	if (isScrollbarWindow (ev.xany.window))	1544	if (isScrollbarWindow (ev.xany.window))
1583	{	1545	{
1584	scrollBar.setIdle ();	1546	scrollBar.setIdle ();
1585	scrollbar_show (0);	1547	scrollbar_show (0);
1586	}	1548	}
1587		1549
1588	#ifdef TRANSPARENT	1550	#ifdef TRANSPARENT
1589	if (am_transparent && ev.xany.window == parent[0])	1551	if (am_transparent && ev.xany.window == parent[0])
1590	XClearWindow (disp, ev.xany.window);	1552	XClearWindow (xdisp, ev.xany.window);
1591	#endif	1553	#endif
1592	}	1554	}
1593	break;	1555	break;
1594		1556
1595	case MotionNotify:	1557	case MotionNotify:
…		…
1605	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1567	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1568	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607	; // nop	1569	; // nop
1608	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1570	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1609	{	1571	{
1610	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1572	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1611	;	1573	;
1612		1574
1613	XQueryPointer (disp, vt,	1575	XQueryPointer (xdisp, vt,
1614	&unused_root, &unused_child,	1576	&unused_root, &unused_child,
1615	&unused_root_x, &unused_root_y,	1577	&unused_root_x, &unused_root_y,
1616	&ev.xbutton.x, &ev.xbutton.y,	1578	&ev.xbutton.x, &ev.xbutton.y,
1617	&ev.xbutton.state);	1579	&ev.xbutton.state);
1618	#ifdef MOUSE_THRESHOLD	1580	#ifdef MOUSE_THRESHOLD
…		…
1682	#endif	1644	#endif
1683	}	1645	}
1684	}	1646	}
1685	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1647	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686	{	1648	{
1687	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1649	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1688	MotionNotify, &ev))	1650	MotionNotify, &ev))
1689	;	1651	;
1690		1652
1691	XQueryPointer (disp, scrollBar.win,	1653	XQueryPointer (xdisp, scrollBar.win,
1692	&unused_root, &unused_child,	1654	&unused_root, &unused_child,
1693	&unused_root_x, &unused_root_y,	1655	&unused_root_x, &unused_root_y,
1694	&ev.xbutton.x, &ev.xbutton.y,	1656	&ev.xbutton.x, &ev.xbutton.y,
1695	&unused_mask);	1657	&unused_mask);
1696	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1711	{	1673	{
1712	hidden_cursor = 0;	1674	hidden_cursor = 0;
1713	want_refresh = 1;	1675	want_refresh = 1;
1714	}	1676	}
1715		1677
1716	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1678	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717	}	1679	}
1718	#endif	1680	#endif
1719		1681
1720	#if defined(POINTER_BLANK)	1682	#if defined(POINTER_BLANK)
1721	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1683	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1749	XSetICFocus (Input_Context);	1711	XSetICFocus (Input_Context);
1750	}	1712	}
1751	#endif	1713	#endif
1752	#if CURSOR_BLINK	1714	#if CURSOR_BLINK
1753	if (OPTION (Opt_cursorBlink))	1715	if (OPTION (Opt_cursorBlink))
1754	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1716	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755	#endif	1717	#endif
1756	#if OFF_FOCUS_FADING	1718	#if OFF_FOCUS_FADING
1757	if (rs[Rs_fade])	1719	if (rs[Rs_fade])
1758	{	1720	{
1759	pix_colors = pix_colors_focused;	1721	pix_colors = pix_colors_focused;
…		…
1840	/*	1802	/*
1841	* VT window processing of button press	1803	* VT window processing of button press
1842	*/	1804	*/
1843	if (ev.window == vt)	1805	if (ev.window == vt)
1844	{	1806	{
		1807	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1808	return;
		1809
1845	#if ISO_14755	1810	#if ISO_14755
1846	// 5.4	1811	// 5.4
1847	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1812	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1848	{	1813	{
1849	iso14755_54 (ev.x, ev.y);	1814	iso14755_54 (ev.x, ev.y);
…		…
1891	else	1856	else
1892	{	1857	{
1893	if (ev.button != MEvent.button)	1858	if (ev.button != MEvent.button)
1894	MEvent.clicks = 0;	1859	MEvent.clicks = 0;
1895		1860
1896	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897	switch (ev.button)	1861	switch (ev.button)
1898	{	1862	{
1899	case Button1:	1863	case Button1:
1900	/* allow meta + click to select rectangular areas */	1864	/* allow meta + click to select rectangular areas */
1901	/* should be done in screen.C */	1865	/* should be done in screen.C */
1902	#if ENABLE_FRILLS	1866	#if ENABLE_FRILLS
1903	selection.rect = !!(ev.state & ModMetaMask);	1867	selection.rect = !!(ev.state & ModMetaMask);
1904	#else	1868	#else
1905	selection.rect = false;	1869	selection.rect = false;
1906	#endif	1870	#endif
1907		1871
1908	/* allow shift+left click to extend selection */	1872	/* allow shift+left click to extend selection */
1909	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1873	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910	{	1874	{
1911	if (MEvent.button == Button1 && clickintime)	1875	if (MEvent.button == Button1 && clickintime)
1912	selection_rotate (ev.x, ev.y);	1876	selection_rotate (ev.x, ev.y);
1913	else	1877	else
1914	selection_extend (ev.x, ev.y, 1);	1878	selection_extend (ev.x, ev.y, 1);
1915	}	1879	}
1916	else	1880	else
1917	{	1881	{
1918	if (MEvent.button == Button1 && clickintime)	1882	if (MEvent.button == Button1 && clickintime)
1919	MEvent.clicks++;	1883	MEvent.clicks++;
1920	else	1884	else
1921	MEvent.clicks = 1;	1885	MEvent.clicks = 1;
1922		1886
1923	selection_click (MEvent.clicks, ev.x, ev.y);	1887	selection_click (MEvent.clicks, ev.x, ev.y);
1924	}	1888	}
1925		1889
1926	MEvent.button = Button1;	1890	MEvent.button = Button1;
1927	break;	1891	break;
1928		1892
1929	case Button3:	1893	case Button3:
1930	if (MEvent.button == Button3 && clickintime)	1894	if (MEvent.button == Button3 && clickintime)
1931	selection_rotate (ev.x, ev.y);	1895	selection_rotate (ev.x, ev.y);
1932	else	1896	else
1933	selection_extend (ev.x, ev.y, 1);	1897	selection_extend (ev.x, ev.y, 1);
1934		1898
1935	MEvent.button = Button3;	1899	MEvent.button = Button3;
1936	break;	1900	break;
1937	}	1901	}
1938	}	1902	}
1939		1903
1940	MEvent.time = ev.time;	1904	MEvent.time = ev.time;
1941	return;	1905	return;
1942	}	1906	}
1943		1907
…		…
2106	sel_scroll_ev.stop();	2070	sel_scroll_ev.stop();
2107	#endif	2071	#endif
2108		2072
2109	if (ev.window == vt)	2073	if (ev.window == vt)
2110	{	2074	{
		2075	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2076	return;
		2077
2111	#if ISO_14755	2078	#if ISO_14755
2112	// 5.4	2079	// 5.4
2113	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2080	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2114	return;	2081	return;
2115	#endif	2082	#endif
		2083
2116	if (reportmode)	2084	if (reportmode)
2117	{	2085	{
2118	/* mouse report from vt window */	2086	/* mouse report from vt window */
2119	/* don't report release of wheel "buttons" */	2087	/* don't report release of wheel "buttons" */
2120	if (ev.button >= 4)	2088	if (ev.button >= 4)
…		…
2144	if (priv_modes & PrivMode_mouse_report	2112	if (priv_modes & PrivMode_mouse_report
2145	&& bypass_keystate	2113	&& bypass_keystate
2146	&& ev.button == Button1 && MEvent.clicks <= 1)	2114	&& ev.button == Button1 && MEvent.clicks <= 1)
2147	selection_extend (ev.x, ev.y, 0);	2115	selection_extend (ev.x, ev.y, 0);
2148		2116
2149	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150	return;
2151
2152	switch (ev.button)	2117	switch (ev.button)
2153	{	2118	{
2154	case Button1:	2119	case Button1:
2155	case Button3:	2120	case Button3:
2156	selection_make (ev.time);	2121	selection_make (ev.time);
2157	break;	2122	break;
		2123
2158	case Button2:	2124	case Button2:
2159	selection_request (ev.time, ev.x, ev.y);	2125	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2126	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2160	break;	2127	break;
		2128
2161	#ifdef MOUSE_WHEEL	2129	#ifdef MOUSE_WHEEL
2162	case Button4:	2130	case Button4:
2163	case Button5:	2131	case Button5:
2164	{	2132	{
2165	int i;	2133	int i;
…		…
2205	#if TINTING	2173	#if TINTING
2206	/* taken from aterm-0.4.2 */	2174	/* taken from aterm-0.4.2 */
2207		2175
2208	typedef uint32_t RUINT32T;	2176	typedef uint32_t RUINT32T;
2209		2177
2210	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2178	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2211	{	2179	{
2212	int sh_r, sh_g, sh_b;	2180	int sh_r, sh_g, sh_b;
2213	RUINT32T mask_r, mask_g, mask_b;	2181	RUINT32T mask_r, mask_g, mask_b;
2214	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2182	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2215	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2183	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2184	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217	int i;	2185	int i;
2218		2186
2219	Visual *visual = display->visual;	2187	Visual *visual = term->visual;
2220		2188
2221	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2189	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2222		2190
2223	/* for convenience */	2191	/* for convenience */
2224	mask_r = visual->red_mask;	2192	mask_r = visual->red_mask;
…		…
2445	Atom atype;	2413	Atom atype;
2446	unsigned char *prop = NULL;	2414	unsigned char *prop = NULL;
2447	Window root, oldp, *list;	2415	Window root, oldp, *list;
2448	Pixmap rootpixmap = None;	2416	Pixmap rootpixmap = None;
2449	XWindowAttributes wattr, wrootattr;	2417	XWindowAttributes wattr, wrootattr;
2450	dDisp;
2451		2418
2452	pchanged = 0;	2419	pchanged = 0;
2453		2420
2454	if (!OPTION (Opt_transparent))	2421	if (!OPTION (Opt_transparent))
2455	return pchanged; /* Don't try any more */	2422	return pchanged; /* Don't try any more */
2456		2423
2457	XGetWindowAttributes (disp, display->root, &wrootattr);	2424	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2458	rootdepth = wrootattr.depth;	2425	rootdepth = wrootattr.depth;
2459		2426
2460	XGetWindowAttributes (disp, parent[0], &wattr);	2427	XGetWindowAttributes (xdisp, parent[0], &wattr);
2461		2428
2462	if (rootdepth != wattr.depth)	2429	if (rootdepth != wattr.depth)
2463	{	2430	{
2464	if (am_transparent)	2431	if (am_transparent)
2465	{	2432	{
2466	pchanged = 1;	2433	pchanged = 1;
2467	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2434	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2468	am_transparent = am_pixmap_trans = 0;	2435	am_transparent = am_pixmap_trans = 0;
2469	}	2436	}
2470		2437
2471	return pchanged; /* Don't try any more */	2438	return pchanged; /* Don't try any more */
2472	}	2439	}
2473		2440
2474	/* Get all X ops out of the queue so that our information is up-to-date. */	2441	/* Get all X ops out of the queue so that our information is up-to-date. */
2475	XSync (disp, False);	2442	XSync (xdisp, False);
2476		2443
2477	/*	2444	/*
2478	* Make the frame window set by the window manager have	2445	* Make the frame window set by the window manager have
2479	* the root background. Some window managers put multiple nested frame	2446	* the root background. Some window managers put multiple nested frame
2480	* windows for each client, so we have to take care about that.	2447	* windows for each client, so we have to take care about that.
2481	*/	2448	*/
2482	i = (xa[XA_XROOTPMAP_ID]	2449	i = (xa[XA_XROOTPMAP_ID]
2483	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2450	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2451	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485	&nitems, &bytes_after, &prop) == Success);	2452	&nitems, &bytes_after, &prop) == Success);
2486		2453
2487	if (!i \|\| prop == NULL)	2454	if (!i \|\| prop == NULL)
2488	i = (xa[XA_ESETROOT_PMAP_ID]	2455	i = (xa[XA_ESETROOT_PMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2456	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2457	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2458	&nitems, &bytes_after, &prop) == Success);
2492		2459
2493	if (!i \|\| prop == NULL	2460	if (!i \|\| prop == NULL
2494	#if TINTING	2461	#if TINTING
2495	\|\| !rs[Rs_color + Color_tint]	2462	\|\| !ISSET_PIXCOLOR (Color_tint)
2496	#endif	2463	#endif
2497	)	2464	)
2498	have_pixmap = 0;	2465	have_pixmap = 0;
2499	else	2466	else
2500	{	2467	{
…		…
2513	Window cr;	2480	Window cr;
2514	XImage *image;	2481	XImage *image;
2515	GC gc;	2482	GC gc;
2516	XGCValues gcvalue;	2483	XGCValues gcvalue;
2517		2484
2518	XTranslateCoordinates (disp, parent[0], display->root,	2485	XTranslateCoordinates (xdisp, parent[0], display->root,
2519	0, 0, &sx, &sy, &cr);	2486	0, 0, &sx, &sy, &cr);
2520	nw = (unsigned int)szHint.width;	2487	nw = (unsigned int)szHint.width;
2521	nh = (unsigned int)szHint.height;	2488	nh = (unsigned int)szHint.height;
2522	nx = ny = 0;	2489	nx = ny = 0;
2523		2490
…		…
2536	}	2503	}
2537		2504
2538	min_it (nw, (unsigned int) (wrootattr.width - sx));	2505	min_it (nw, (unsigned int) (wrootattr.width - sx));
2539	min_it (nh, (unsigned int) (wrootattr.height - sy));	2506	min_it (nh, (unsigned int) (wrootattr.height - sy));
2540		2507
2541	XSync (disp, False);	2508	XSync (xdisp, False);
2542	allowedxerror = -1;	2509	allowedxerror = -1;
2543	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2510	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544		2511
2545	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2512	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2546	/* XXX: may need a delay here? */	2513	/* XXX: may need a delay here? */
2547	allowedxerror = 0;	2514	allowedxerror = 0;
2548		2515
…		…
2551	if (am_transparent && am_pixmap_trans)	2518	if (am_transparent && am_pixmap_trans)
2552	{	2519	{
2553	pchanged = 1;	2520	pchanged = 1;
2554	if (pixmap != None)	2521	if (pixmap != None)
2555	{	2522	{
2556	XFreePixmap (disp, pixmap);	2523	XFreePixmap (xdisp, pixmap);
2557	pixmap = None;	2524	pixmap = None;
2558	}	2525	}
2559	}	2526	}
2560		2527
2561	am_pixmap_trans = 0;	2528	am_pixmap_trans = 0;
2562	}	2529	}
2563	else	2530	else
2564	{	2531	{
2565	if (pixmap != None)	2532	if (pixmap != None)
2566	XFreePixmap (disp, pixmap);	2533	XFreePixmap (xdisp, pixmap);
2567		2534
2568	#if TINTING	2535	#if TINTING
2569	if (ISSET_PIXCOLOR (Color_tint))	2536	if (ISSET_PIXCOLOR (Color_tint))
2570	{	2537	{
2571	unsigned short rm, gm, bm;
2572	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2538	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573		2539
		2540	rgba c;
2574	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2541	pix_colors_focused [Color_tint].get (c);
2575		2542
2576	ShadeXImage (display, image, shade, rm, gm, bm);	2543	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577	}	2544	}
2578	#endif	2545	#endif
2579		2546
2580	pixmap = XCreatePixmap (disp, vt,	2547	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2581	szHint.width, szHint.height, image->depth);
2582	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2548	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2583	XPutImage (disp, pixmap, gc, image, 0, 0,	2549	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2584	nx, ny, image->width, image->height);	2550	nx, ny, image->width, image->height);
2585	XFreeGC (disp, gc);	2551	XFreeGC (xdisp, gc);
2586	XDestroyImage (image);	2552	XDestroyImage (image);
2587	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2553	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2588	XClearWindow (disp, parent[0]);	2554	XClearWindow (xdisp, parent[0]);
2589		2555
2590	if (!am_transparent \|\| !am_pixmap_trans)	2556	if (!am_transparent \|\| !am_pixmap_trans)
2591	pchanged = 1;	2557	pchanged = 1;
2592		2558
2593	am_transparent = am_pixmap_trans = 1;	2559	am_transparent = am_pixmap_trans = 1;
2594	}	2560	}
2595	}	2561	}
2596		2562
2597	if (am_pixmap_trans)	2563	if (am_pixmap_trans)
2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2564	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2599	else	2565	else
2600	{	2566	{
2601	unsigned int n;	2567	unsigned int n;
2602	/*	2568	/*
2603	* InheritPixmap transparency	2569	* InheritPixmap transparency
2604	*/	2570	*/
2605	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2571	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606	{	2572	{
2607	oldp = parent[i];	2573	oldp = parent[i];
2608	XQueryTree (disp, parent[i - 1], &root,	2574	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2609	&parent[i], &list, &n);
2610	XFree (list);	2575	XFree (list);
2611		2576
2612	if (parent[i] == display->root)	2577	if (parent[i] == display->root)
2613	{	2578	{
2614	if (oldp != None)	2579	if (oldp != None)
…		…
2622	}	2587	}
2623		2588
2624	n = 0;	2589	n = 0;
2625		2590
2626	if (pchanged)	2591	if (pchanged)
2627	{
2628	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2629	{	2593	{
2630	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2595
2631	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2596	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2632	{	2597	{
2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2598	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634	break;	2599	break;
2635	}	2600	}
2636	}	2601	}
2637	}
2638		2602
2639	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (sizeof (parent) / sizeof (parent[0])))
2640	{	2604	{
2641	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2642	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2643	am_transparent = 0;	2607	am_transparent = 0;
2644	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2645	}	2609	}
2646	else	2610	else
2647	{	2611	{
2648	#if WAIT_FOR_WM
2649	/* wait (an arbitrary period) for the WM to do its thing
2650	* needed for fvwm2.2.2 (and before?) */
2651	sleep (1);
2652	#endif
2653	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2654	{	2613	{
2655	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2656	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2657	}	2616	}
2658		2617
2659	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2660	am_transparent = 1;	2619	am_transparent = 1;
2661	}	2620	}
2662		2621
2663	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664	parent[i] = None;	2623	parent[i] = None;
2665	}	2624	}
2666		2625
2667	if (scrollBar.win)	2626	if (scrollBar.win)
2668	{	2627	{
2669	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2670	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2671	scrollbar_show (0);	2630	scrollbar_show (0);
2672	}	2631	}
2673		2632
2674	if (am_transparent)	2633	if (am_transparent)
…		…
2820	return flag;	2779	return flag;
2821	}	2780	}
2822		2781
2823	// read the next character	2782	// read the next character
2824	wchar_t	2783	wchar_t
2825	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2826	{	2785	{
2827	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2828	{	2787	{
2829	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2830	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2851	return NOCHAR;	2810	return NOCHAR;
2852	}	2811	}
2853		2812
2854	// read the next octet	2813	// read the next octet
2855	uint32_t	2814	uint32_t
2856	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2857	{	2816	{
2858	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2859	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2860	: NOCHAR;	2819	: NOCHAR;
2861	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2862		2823
2863	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2864	/*	2825	/*
2865	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2866	* to the command.	2827	* to the command.
2867	*/	2828	*/
2868	wchar_t	2829	wchar_t
2869	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2870	{	2831	{
2871	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2872		2833
2873	if (c == NOCHAR)	2834	if (c == NOCHAR)
2874	throw out_of_input;	2835	throw out_of_input;
2875		2836
2876	return c;	2837	return c;
2877	}	2838	}
2878		2839
2879	uint32_t	2840	uint32_t
2880	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881	{	2842	{
2882	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2883		2844
2884	if (c == NOCHAR)	2845	if (c == NOCHAR)
2885	throw out_of_input;	2846	throw out_of_input;
…		…
3123	scr_charset_set (2, (unsigned int)cmd_getc ());	3084	scr_charset_set (2, (unsigned int)cmd_getc ());
3124	break;	3085	break;
3125	case '+':	3086	case '+':
3126	scr_charset_set (3, (unsigned int)cmd_getc ());	3087	scr_charset_set (3, (unsigned int)cmd_getc ());
3127	break;	3088	break;
3128	#if ENABLE_FRILLS	3089	#if !ENABLE_MINIMAL
3129	case '6':	3090	case '6':
3130	scr_backindex ();	3091	scr_backindex ();
3131	break;	3092	break;
3132	#endif	3093	#endif
3133	case '7':	3094	case '7':
3134	scr_cursor (SAVE);	3095	scr_cursor (SAVE);
3135	break;	3096	break;
3136	case '8':	3097	case '8':
3137	scr_cursor (RESTORE);	3098	scr_cursor (RESTORE);
3138	break;	3099	break;
3139	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3140	case '9':	3101	case '9':
3141	scr_forwardindex ();	3102	scr_forwardindex ();
3142	break;	3103	break;
3143	#endif	3104	#endif
3144	case '=':	3105	case '=':
…		…
3306	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3307	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3308	if (arg[p] == -1)	3269	if (arg[p] == -1)
3309	arg[p] = ndef;	3270	arg[p] = ndef;
3310		3271
3311	#ifdef DEBUG_CMD
3312	fprintf (stderr, "CSI ");
3313	for (p = 0; p < nargs; p++)
3314	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315	fprintf (stderr, "%c\n", ch);
3316	#endif
3317
3318	/*	3272	/*
3319	* private mode handling	3273	* private mode handling
3320	*/	3274	*/
3321	if (priv)	3275	if (priv)
3322	{	3276	{
3323	switch (priv)	3277	switch (priv)
3324	{	3278	{
3325	case '>':	3279	case '>':
3326	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3327	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3328	break;	3291	break;
3329	case '?':	3292	case '?':
3330	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3331	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3332	break;	3295	break;
…		…
3535	break;	3498	break;
3536	case CSI_75:	3499	case CSI_75:
3537	scr_cursor (RESTORE);	3500	scr_cursor (RESTORE);
3538	break;	3501	break;
3539		3502
3540	#if ENABLE_FRILLS	3503	#if !ENABLE_MINIMAL
3541	case CSI_74:	3504	case CSI_74:
3542	process_window_ops (arg, nargs);	3505	process_window_ops (arg, nargs);
3543	break;	3506	break;
3544	#endif	3507	#endif
3545		3508
…		…
3552	break;	3515	break;
3553	}	3516	}
3554	}	3517	}
3555	/}}} /	3518	/}}} /
3556		3519
3557	#if ENABLE_FRILLS	3520	#if !ENABLE_MINIMAL
3558	/* ARGSUSED */	3521	/* ARGSUSED */
3559	void	3522	void
3560	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561	{	3524	{
3562	int x, y;	3525	int x, y;
3563	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3564	Window wdummy;	3527	Window wdummy;
3565	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3566		3530
3567	if (nargs == 0)	3531	if (nargs == 0)
3568	return;	3532	return;
3569		3533
3570	switch (args[0])	3534	switch (args[0])
3571	{	3535	{
3572	/*	3536	/*
3573	* commands	3537	* commands
3574	*/	3538	*/
3575	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3576	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3577	break;	3541	break;
3578	case 2: /* iconify window */	3542	case 2: /* iconify window */
3579	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3580	break;	3544	break;
3581	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3582	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3583	break;	3547	break;
3584	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3585	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586	break;	3550	break;
3587	case 5: /* raise window */	3551	case 5: /* raise window */
3588	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3589	break;	3553	break;
3590	case 6: /* lower window */	3554	case 6: /* lower window */
3591	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3592	break;	3556	break;
3593	case 7: /* refresh window */	3557	case 7: /* refresh window */
3594	scr_touch (true);	3558	scr_touch (true);
3595	break;	3559	break;
3596	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3603	if (args[0] >= 24) /* set height (chars) */	3567	if (args[0] >= 24) /* set height (chars) */
3604	set_widthheight ((unsigned int)width,	3568	set_widthheight ((unsigned int)width,
3605	(unsigned int) (args[1] * fheight));	3569	(unsigned int) (args[1] * fheight));
3606	break;	3570	break;
3607		3571
3608
3609	/*	3572	/*
3610	* reports - some output format copied from XTerm	3573	* reports - some output format copied from XTerm
3611	*/	3574	*/
3612	case 11: /* report window state */	3575	case 11: /* report window state */
3613	XGetWindowAttributes (disp, parent[0], &wattr);	3576	XGetWindowAttributes (xdisp, parent[0], &wattr);
3614	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3577	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615	break;	3578	break;
3616	case 13: /* report window position */	3579	case 13: /* report window position */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3580	XGetWindowAttributes (xdisp, parent[0], &wattr);
3618	XTranslateCoordinates (disp, parent[0], wattr.root,	3581	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3619	-wattr.border_width, -wattr.border_width,	3582	-wattr.border_width, -wattr.border_width,
3620	&x, &y, &wdummy);	3583	&x, &y, &wdummy);
3621	tt_printf ("\033[3;%d;%dt", x, y);	3584	tt_printf ("\033[3;%d;%dt", x, y);
3622	break;	3585	break;
3623	case 14: /* report window size (pixels) */	3586	case 14: /* report window size (pixels) */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (xdisp, parent[0], &wattr);
3625	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3588	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626	break;	3589	break;
3627	case 18: /* report text area size (chars) */	3590	case 18: /* report text area size (chars) */
3628	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3591	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629	break;	3592	break;
…		…
3631	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3594	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632	break;	3595	break;
3633	case 20: /* report icon label */	3596	case 20: /* report icon label */
3634	{	3597	{
3635	char *s;	3598	char *s;
3636	XGetIconName (disp, parent[0], &s);	3599	XGetIconName (xdisp, parent[0], &s);
3637	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3600	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638	XFree (s);	3601	XFree (s);
3639	}	3602	}
3640	break;	3603	break;
3641	case 21: /* report window title */	3604	case 21: /* report window title */
3642	{	3605	{
3643	char *s;	3606	char *s;
3644	XFetchName (disp, parent[0], &s);	3607	XFetchName (xdisp, parent[0], &s);
3645	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3608	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646	XFree (s);	3609	XFree (s);
3647	}	3610	}
3648	break;	3611	break;
3649	}	3612	}
…		…
3750	void	3713	void
3751	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3714	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752	{	3715	{
3753	if (str[0] == '?' && !str[1])	3716	if (str[0] == '?' && !str[1])
3754	{	3717	{
3755	unsigned short r, g, b;	3718	rgba c;
3756	pix_colors_focused[color].get (display, r, g, b);	3719	pix_colors_focused[color].get (c);
		3720
		3721	#if XFT
		3722	if (c.a != rgba::MAX_CC)
		3723	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3724	else
		3725	#endif
3757	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3726	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758	}	3727	}
3759	else	3728	else
3760	set_window_color (color, str);	3729	set_window_color (color, str);
3761	}	3730	}
3762		3731
…		…
3764	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3733	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3765	*/	3734	*/
3766	void	3735	void
3767	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3736	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768	{	3737	{
3769	int changed = 0;
3770	int color;	3738	int color;
3771	char buf, name;	3739	char buf, name;
3772	bool query = str[0] == '?' && !str[1];	3740	bool query = str[0] == '?' && !str[1];
3773	int saveop = op;	3741	int saveop = op;
3774	dDisp;	3742
		3743	dLocal (Display *, xdisp);
3775		3744
3776	assert (str != NULL);	3745	assert (str != NULL);
3777	switch (op)	3746	switch (op)
3778	{	3747	{
3779	case XTerm_name:	3748	case XTerm_name:
…		…
3795	unsigned long bytes_after;	3764	unsigned long bytes_after;
3796	unsigned char *value = 0;	3765	unsigned char *value = 0;
3797	const char *str = "";	3766	const char *str = "";
3798		3767
3799	if (prop	3768	if (prop
3800	&& XGetWindowProperty (disp, parent[0],	3769	&& XGetWindowProperty (xdisp, parent[0],
3801	prop, 0, 1<<16, 0, AnyPropertyType,	3770	prop, 0, 1<<16, 0, AnyPropertyType,
3802	&actual_type, &actual_format,	3771	&actual_type, &actual_format,
3803	&nitems, &bytes_after, &value) == Success	3772	&nitems, &bytes_after, &value) == Success
3804	&& actual_type != None	3773	&& actual_type != None
3805	&& actual_format == 8)	3774	&& actual_format == 8)
3806	str = (const char *)(value);	3775	str = (const char *)(value);
3807		3776
3808	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3777	tt_printf ("\033]%d;%s%c", op, str, resp);
3809		3778
3810	XFree (value);	3779	XFree (value);
3811	}	3780	}
3812	else	3781	else
3813	{	3782	{
…		…
3817	{	3786	{
3818	*eq = 0;	3787	*eq = 0;
3819	set_utf8_property (display->atom (str), eq + 1);	3788	set_utf8_property (display->atom (str), eq + 1);
3820	}	3789	}
3821	else	3790	else
3822	XDeleteProperty (disp, parent[0],	3791	XDeleteProperty (xdisp, parent[0],
3823	display->atom (str));	3792	display->atom (str));
3824	}	3793	}
3825	break;	3794	break;
3826		3795
3827	case XTerm_Color:	3796	case XTerm_Color:
…		…
3837	break;	3806	break;
3838		3807
3839	if ((buf = strchr (name, ';')) != NULL)	3808	if ((buf = strchr (name, ';')) != NULL)
3840	*buf++ = '\0';	3809	*buf++ = '\0';
3841		3810
3842	if (name[0] == '?' && !name[1])	3811	process_color_seq (op, color, name, resp);
3843	{
3844	unsigned short r, g, b;
3845	pix_colors_focused[color].get (display, r, g, b);
3846	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847	}
3848	else
3849	set_window_color (color, name);
3850	}	3812	}
3851	break;	3813	break;
3852	case XTerm_Color00:	3814	case XTerm_Color00:
3853	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3815	process_color_seq (op, Color_fg, str, resp);
3854	break;	3816	break;
3855	case XTerm_Color01:	3817	case XTerm_Color01:
3856	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3818	process_color_seq (op, Color_bg, str, resp);
3857	break;	3819	break;
3858	#ifndef NO_CURSORCOLOR	3820	#ifndef NO_CURSORCOLOR
3859	case XTerm_Color_cursor:	3821	case XTerm_Color_cursor:
3860	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3822	process_color_seq (op, Color_cursor, str, resp);
3861	break;	3823	break;
3862	#endif	3824	#endif
3863	case XTerm_Color_pointer_fg:	3825	case XTerm_Color_pointer_fg:
3864	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3826	process_color_seq (op, Color_pointer_fg, str, resp);
3865	break;	3827	break;
3866	case XTerm_Color_pointer_bg:	3828	case XTerm_Color_pointer_bg:
3867	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3829	process_color_seq (op, Color_pointer_bg, str, resp);
3868	break;	3830	break;
3869	#ifndef NO_BOLD_UNDERLINE_REVERSE	3831	#ifndef NO_BOLD_UNDERLINE_REVERSE
3870	case XTerm_Color_RV:	3832	case XTerm_Color_RV:
3871	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3833	process_color_seq (op, Color_RV, str, resp);
3872	break;	3834	break;
3873	case Rxvt_Color_BD:	3835	case Rxvt_Color_BD:
3874	case URxvt_Color_BD:	3836	case URxvt_Color_BD:
3875	process_color_seq (op, Color_BD, str, resp);	3837	process_color_seq (op, Color_BD, str, resp);
3876	break;	3838	break;
3877	case Rxvt_Color_UL:	3839	case Rxvt_Color_UL:
3878	case URxvt_Color_UL:	3840	case URxvt_Color_UL:
3879	process_color_seq (op, Color_UL, str, resp);	3841	process_color_seq (op, Color_UL, str, resp);
3880	break;	3842	break;
3881	case URxvt_Color_IT:	3843	case URxvt_Color_IT:
3882	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3844	process_color_seq (op, Color_IT, str, resp);
3883	break;	3845	break;
3884	#endif	3846	#endif
3885	#if TRANSPARENT && TINTING	3847	#if TRANSPARENT && TINTING
3886	case URxvt_Color_tint:	3848	case URxvt_Color_tint:
3887	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3849	process_color_seq (op, Color_tint, str, resp);
		3850
3888	check_our_parents ();	3851	check_our_parents ();
		3852
3889	if (am_transparent)	3853	if (am_transparent)
3890	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
		3855
3891	break;	3856	break;
3892	#endif	3857	#endif
3893		3858
3894	case Rxvt_Pixmap:	3859	case Rxvt_Pixmap:
		3860	{
3895	if (*str != ';')	3861	if (*str != ';')
3896	{	3862	{
3897	#if XPM_BACKGROUND	3863	#if XPM_BACKGROUND
3898	scale_pixmap (""); /* reset to default scaling */	3864	scale_pixmap (""); /* reset to default scaling */
3899	set_bgPixmap (str); /* change pixmap */	3865	set_bgPixmap (str); /* change pixmap */
3900	scr_touch (true);	3866	scr_touch (true);
3901	#endif	3867	#endif
3902	}	3868	}
3903		3869
		3870	int changed = 0;
		3871
3904	while ((str = strchr (str, ';')) != NULL)	3872	while ((str = strchr (str, ';')) != NULL)
3905	{	3873	{
3906	str++;	3874	str++;
3907	#if XPM_BACKGROUND	3875	#if XPM_BACKGROUND
3908	changed += scale_pixmap (str);	3876	changed += scale_pixmap (str);
3909	#endif	3877	#endif
3910	}	3878	}
3911		3879
3912	if (changed)	3880	if (changed)
3913	{	3881	{
3914	#ifdef XPM_BACKGROUND	3882	#ifdef XPM_BACKGROUND
3915	resize_pixmap ();	3883	resize_pixmap ();
3916	scr_touch (true);	3884	scr_touch (true);
3917	#endif	3885	#endif
3918	}	3886	}
		3887	}
3919	break;	3888	break;
3920		3889
3921	case Rxvt_restoreFG:	3890	case Rxvt_restoreFG:
3922	set_window_color (Color_fg, str);	3891	set_window_color (Color_fg, str);
3923	break;	3892	break;
…		…
3962	allocated.push_back ((void *)res);	3931	allocated.push_back ((void *)res);
3963	set_fonts ();	3932	set_fonts ();
3964	}	3933	}
3965	break;	3934	break;
3966		3935
3967	#if ENABLE_FRILLS	3936	case URxvt_version:
		3937	if (query)
		3938	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3939	op,
		3940	rs[Rs_name], VERSION[0], VERSION[2],
		3941	resp);
		3942	break;
		3943
		3944	#if !ENABLE_MINIMAL
3968	case URxvt_locale:	3945	case URxvt_locale:
3969	if (query)	3946	if (query)
3970	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3947	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3971	else	3948	else
3972	{	3949	{
3973	set_locale (str);	3950	set_locale (str);
3974	pty.set_utf8_mode (enc_utf8);	3951	pty->set_utf8_mode (enc_utf8);
3975	init_xlocale ();	3952	init_xlocale ();
3976	}	3953	}
3977	break;	3954	break;
3978		3955
3979	case URxvt_view_up:	3956	case URxvt_view_up:
…		…
4032	return state;	4009	return state;
4033	}	4010	}
4034		4011
4035	/* we're not using priv _yet_ */	4012	/* we're not using priv _yet_ */
4036	void	4013	void
4037	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4014	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038	{	4015	{
4039	unsigned int i, j;	4016	unsigned int i, j;
4040	int state;	4017	int state;
4041		4018
4042	static const struct	4019	static const struct
…		…
4336	scr_color (Color_bg, Color_bg);	4313	scr_color (Color_bg, Color_bg);
4337	break;	4314	break;
4338		4315
4339	//case 50: // not variable spacing	4316	//case 50: // not variable spacing
4340		4317
4341	#if ENABLE_FRILLS	4318	#if !ENABLE_MINIMAL
4342	case 90:	4319	case 90:
4343	case 91: /* set bright fg color */	4320	case 91: /* set bright fg color */
4344	case 92:	4321	case 92:
4345	case 93:	4322	case 93:
4346	case 94:	4323	case 94:
…		…
4411	rxvt_term::tt_write (const char *data, unsigned int len)	4388	rxvt_term::tt_write (const char *data, unsigned int len)
4412	{	4389	{
4413	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4390	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414	return;	4391	return;
4415		4392
4416	if (pty.pty < 0)	4393	if (pty->pty < 0)
4417	return;	4394	return;
4418		4395
4419	if (v_buflen == 0)	4396	if (v_buflen == 0)
4420	{	4397	{
4421	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4398	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422		4399
4423	if ((unsigned int)written == len)	4400	if ((unsigned int)written == len)
4424	return;	4401	return;
4425		4402
4426	data += written;	4403	data += written;
…		…
4435	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4412	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4436	}	4413	}
4437		4414
4438	void rxvt_term::pty_write ()	4415	void rxvt_term::pty_write ()
4439	{	4416	{
4440	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4417	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441		4418
4442	if (written > 0)	4419	if (written > 0)
4443	{	4420	{
4444	v_buflen -= written;	4421	v_buflen -= written;
4445		4422

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC vs. Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC