[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.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, 0, 0);	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
…		…
1137		1134
1138	memmove (cmdbuf_base, cmdbuf_ptr, n);	1135	memmove (cmdbuf_base, cmdbuf_ptr, n);
1139	cmdbuf_ptr = cmdbuf_base;	1136	cmdbuf_ptr = cmdbuf_base;
1140	cmdbuf_endp = cmdbuf_ptr + n;	1137	cmdbuf_endp = cmdbuf_ptr + n;
1141		1138
1142	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1139	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143		1140
1144	if (r > 0)	1141	if (r > 0)
1145	{	1142	{
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;
1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505	}	1475	}
1506		1476
		1477	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1478
1507	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1479	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508	if (OPTION (Opt_transparent))	1480	if (OPTION (Opt_transparent))
1509	check_our_parents ();	1481	check_our_parents ();
1510	#endif	1482	#endif
1511	}	1483	}
1512	break;	1484	break;
1513		1485
1514	case PropertyNotify:	1486	case PropertyNotify:
		1487	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1488	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516	&& ev.xproperty.state == PropertyNewValue)	1489	&& ev.xproperty.state == PropertyNewValue)
1517	selection_property (ev.xproperty.window, ev.xproperty.atom);	1490	selection_property (ev.xproperty.window, ev.xproperty.atom);
1518		1491
1519	break;	1492	break;
1520		1493
1521	case SelectionClear:	1494	case SelectionClear:
1522	selection_clear ();	1495	selection_clear ();
…		…
1558	if (ev.xany.window == vt)	1531	if (ev.xany.window == vt)
1559	{	1532	{
1560	do	1533	do
1561	scr_expose (ev.xexpose.x, ev.xexpose.y,	1534	scr_expose (ev.xexpose.x, ev.xexpose.y,
1562	ev.xexpose.width, ev.xexpose.height, False);	1535	ev.xexpose.width, ev.xexpose.height, False);
1563	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1536	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1564		1537
1565	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1538	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566		1539
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1540	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
1570		1543
1571	want_refresh = 1;	1544	want_refresh = 1;
1572	}	1545	}
1573	else	1546	else
1574	{	1547	{
1575	XEvent unused_event;	1548	XEvent unused_event;
1576		1549
1577	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1550	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1578	;	1551	;
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1552	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1580	;	1553	;
1581		1554
1582	if (isScrollbarWindow (ev.xany.window))	1555	if (isScrollbarWindow (ev.xany.window))
1583	{	1556	{
1584	scrollBar.setIdle ();	1557	scrollBar.setIdle ();
1585	scrollbar_show (0);	1558	scrollbar_show (0);
1586	}	1559	}
1587		1560
1588	#ifdef TRANSPARENT	1561	#ifdef TRANSPARENT
1589	if (am_transparent && ev.xany.window == parent[0])	1562	if (am_transparent && ev.xany.window == parent[0])
1590	XClearWindow (disp, ev.xany.window);	1563	XClearWindow (xdisp, ev.xany.window);
1591	#endif	1564	#endif
1592	}	1565	}
1593	break;	1566	break;
1594		1567
1595	case MotionNotify:	1568	case MotionNotify:
…		…
1605	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1578	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1579	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607	; // nop	1580	; // nop
1608	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1581	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1609	{	1582	{
1610	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1583	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1611	;	1584	;
1612		1585
1613	XQueryPointer (disp, vt,	1586	XQueryPointer (xdisp, vt,
1614	&unused_root, &unused_child,	1587	&unused_root, &unused_child,
1615	&unused_root_x, &unused_root_y,	1588	&unused_root_x, &unused_root_y,
1616	&ev.xbutton.x, &ev.xbutton.y,	1589	&ev.xbutton.x, &ev.xbutton.y,
1617	&ev.xbutton.state);	1590	&ev.xbutton.state);
1618	#ifdef MOUSE_THRESHOLD	1591	#ifdef MOUSE_THRESHOLD
…		…
1682	#endif	1655	#endif
1683	}	1656	}
1684	}	1657	}
1685	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1658	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686	{	1659	{
1687	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1660	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1688	MotionNotify, &ev))	1661	MotionNotify, &ev))
1689	;	1662	;
1690		1663
1691	XQueryPointer (disp, scrollBar.win,	1664	XQueryPointer (xdisp, scrollBar.win,
1692	&unused_root, &unused_child,	1665	&unused_root, &unused_child,
1693	&unused_root_x, &unused_root_y,	1666	&unused_root_x, &unused_root_y,
1694	&ev.xbutton.x, &ev.xbutton.y,	1667	&ev.xbutton.x, &ev.xbutton.y,
1695	&unused_mask);	1668	&unused_mask);
1696	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1669	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1711	{	1684	{
1712	hidden_cursor = 0;	1685	hidden_cursor = 0;
1713	want_refresh = 1;	1686	want_refresh = 1;
1714	}	1687	}
1715		1688
1716	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1689	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717	}	1690	}
1718	#endif	1691	#endif
1719		1692
1720	#if defined(POINTER_BLANK)	1693	#if defined(POINTER_BLANK)
1721	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1694	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1749	XSetICFocus (Input_Context);	1722	XSetICFocus (Input_Context);
1750	}	1723	}
1751	#endif	1724	#endif
1752	#if CURSOR_BLINK	1725	#if CURSOR_BLINK
1753	if (OPTION (Opt_cursorBlink))	1726	if (OPTION (Opt_cursorBlink))
1754	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1727	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755	#endif	1728	#endif
1756	#if OFF_FOCUS_FADING	1729	#if OFF_FOCUS_FADING
1757	if (rs[Rs_fade])	1730	if (rs[Rs_fade])
1758	{	1731	{
1759	pix_colors = pix_colors_focused;	1732	pix_colors = pix_colors_focused;
…		…
1840	/*	1813	/*
1841	* VT window processing of button press	1814	* VT window processing of button press
1842	*/	1815	*/
1843	if (ev.window == vt)	1816	if (ev.window == vt)
1844	{	1817	{
		1818	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1819	return;
		1820
1845	#if ISO_14755	1821	#if ISO_14755
1846	// 5.4	1822	// 5.4
1847	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1823	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1848	{	1824	{
1849	iso14755_54 (ev.x, ev.y);	1825	iso14755_54 (ev.x, ev.y);
…		…
1891	else	1867	else
1892	{	1868	{
1893	if (ev.button != MEvent.button)	1869	if (ev.button != MEvent.button)
1894	MEvent.clicks = 0;	1870	MEvent.clicks = 0;
1895		1871
1896	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897	switch (ev.button)	1872	switch (ev.button)
1898	{	1873	{
1899	case Button1:	1874	case Button1:
1900	/* allow meta + click to select rectangular areas */	1875	/* allow meta + click to select rectangular areas */
1901	/* should be done in screen.C */	1876	/* should be done in screen.C */
1902	#if ENABLE_FRILLS	1877	#if ENABLE_FRILLS
1903	selection.rect = !!(ev.state & ModMetaMask);	1878	selection.rect = !!(ev.state & ModMetaMask);
1904	#else	1879	#else
1905	selection.rect = false;	1880	selection.rect = false;
1906	#endif	1881	#endif
1907		1882
1908	/* allow shift+left click to extend selection */	1883	/* allow shift+left click to extend selection */
1909	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1884	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910	{	1885	{
1911	if (MEvent.button == Button1 && clickintime)	1886	if (MEvent.button == Button1 && clickintime)
1912	selection_rotate (ev.x, ev.y);	1887	selection_rotate (ev.x, ev.y);
1913	else	1888	else
1914	selection_extend (ev.x, ev.y, 1);	1889	selection_extend (ev.x, ev.y, 1);
1915	}	1890	}
1916	else	1891	else
1917	{	1892	{
1918	if (MEvent.button == Button1 && clickintime)	1893	if (MEvent.button == Button1 && clickintime)
1919	MEvent.clicks++;	1894	MEvent.clicks++;
1920	else	1895	else
1921	MEvent.clicks = 1;	1896	MEvent.clicks = 1;
1922		1897
1923	selection_click (MEvent.clicks, ev.x, ev.y);	1898	selection_click (MEvent.clicks, ev.x, ev.y);
1924	}	1899	}
1925		1900
1926	MEvent.button = Button1;	1901	MEvent.button = Button1;
1927	break;	1902	break;
1928		1903
1929	case Button3:	1904	case Button3:
1930	if (MEvent.button == Button3 && clickintime)	1905	if (MEvent.button == Button3 && clickintime)
1931	selection_rotate (ev.x, ev.y);	1906	selection_rotate (ev.x, ev.y);
1932	else	1907	else
1933	selection_extend (ev.x, ev.y, 1);	1908	selection_extend (ev.x, ev.y, 1);
1934		1909
1935	MEvent.button = Button3;	1910	MEvent.button = Button3;
1936	break;	1911	break;
1937	}	1912	}
1938	}	1913	}
1939		1914
1940	MEvent.time = ev.time;	1915	MEvent.time = ev.time;
1941	return;	1916	return;
1942	}	1917	}
1943		1918
…		…
2106	sel_scroll_ev.stop();	2081	sel_scroll_ev.stop();
2107	#endif	2082	#endif
2108		2083
2109	if (ev.window == vt)	2084	if (ev.window == vt)
2110	{	2085	{
		2086	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2087	return;
		2088
2111	#if ISO_14755	2089	#if ISO_14755
2112	// 5.4	2090	// 5.4
2113	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2091	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2114	return;	2092	return;
2115	#endif	2093	#endif
		2094
2116	if (reportmode)	2095	if (reportmode)
2117	{	2096	{
2118	/* mouse report from vt window */	2097	/* mouse report from vt window */
2119	/* don't report release of wheel "buttons" */	2098	/* don't report release of wheel "buttons" */
2120	if (ev.button >= 4)	2099	if (ev.button >= 4)
…		…
2144	if (priv_modes & PrivMode_mouse_report	2123	if (priv_modes & PrivMode_mouse_report
2145	&& bypass_keystate	2124	&& bypass_keystate
2146	&& ev.button == Button1 && MEvent.clicks <= 1)	2125	&& ev.button == Button1 && MEvent.clicks <= 1)
2147	selection_extend (ev.x, ev.y, 0);	2126	selection_extend (ev.x, ev.y, 0);
2148		2127
2149	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150	return;
2151
2152	switch (ev.button)	2128	switch (ev.button)
2153	{	2129	{
2154	case Button1:	2130	case Button1:
2155	case Button3:	2131	case Button3:
2156	selection_make (ev.time);	2132	selection_make (ev.time);
2157	break;	2133	break;
		2134
2158	case Button2:	2135	case Button2:
2159	selection_request (ev.time, ev.x, ev.y);	2136	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2137	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2160	break;	2138	break;
		2139
2161	#ifdef MOUSE_WHEEL	2140	#ifdef MOUSE_WHEEL
2162	case Button4:	2141	case Button4:
2163	case Button5:	2142	case Button5:
2164	{	2143	{
2165	int i;	2144	int i;
…		…
2205	#if TINTING	2184	#if TINTING
2206	/* taken from aterm-0.4.2 */	2185	/* taken from aterm-0.4.2 */
2207		2186
2208	typedef uint32_t RUINT32T;	2187	typedef uint32_t RUINT32T;
2209		2188
2210	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)
2211	{	2190	{
2212	int sh_r, sh_g, sh_b;	2191	int sh_r, sh_g, sh_b;
2213	RUINT32T mask_r, mask_g, mask_b;	2192	RUINT32T mask_r, mask_g, mask_b;
2214	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2193	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2215	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2194	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2195	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217	int i;	2196	int i;
2218		2197
2219	Visual *visual = display->visual;	2198	Visual *visual = term->visual;
2220		2199
2221	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2200	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2222		2201
2223	/* for convenience */	2202	/* for convenience */
2224	mask_r = visual->red_mask;	2203	mask_r = visual->red_mask;
…		…
2445	Atom atype;	2424	Atom atype;
2446	unsigned char *prop = NULL;	2425	unsigned char *prop = NULL;
2447	Window root, oldp, *list;	2426	Window root, oldp, *list;
2448	Pixmap rootpixmap = None;	2427	Pixmap rootpixmap = None;
2449	XWindowAttributes wattr, wrootattr;	2428	XWindowAttributes wattr, wrootattr;
2450	dDisp;
2451		2429
2452	pchanged = 0;	2430	pchanged = 0;
2453		2431
2454	if (!OPTION (Opt_transparent))	2432	if (!OPTION (Opt_transparent))
2455	return pchanged; /* Don't try any more */	2433	return pchanged; /* Don't try any more */
2456		2434
2457	XGetWindowAttributes (disp, display->root, &wrootattr);	2435	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2458	rootdepth = wrootattr.depth;	2436	rootdepth = wrootattr.depth;
2459		2437
2460	XGetWindowAttributes (disp, parent[0], &wattr);	2438	XGetWindowAttributes (xdisp, parent[0], &wattr);
2461		2439
2462	if (rootdepth != wattr.depth)	2440	if (rootdepth != wattr.depth)
2463	{	2441	{
2464	if (am_transparent)	2442	if (am_transparent)
2465	{	2443	{
2466	pchanged = 1;	2444	pchanged = 1;
2467	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2445	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2468	am_transparent = am_pixmap_trans = 0;	2446	am_transparent = am_pixmap_trans = 0;
2469	}	2447	}
2470		2448
2471	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2472	}	2450	}
2473		2451
2474	/* 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. */
2475	XSync (disp, False);	2453	XSync (xdisp, False);
2476		2454
2477	/*	2455	/*
2478	* Make the frame window set by the window manager have	2456	* Make the frame window set by the window manager have
2479	* the root background. Some window managers put multiple nested frame	2457	* the root background. Some window managers put multiple nested frame
2480	* 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.
2481	*/	2459	*/
2482	i = (xa[XA_XROOTPMAP_ID]	2460	i = (xa[XA_XROOTPMAP_ID]
2483	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2486		2464
2487	if (!i \|\| prop == NULL)	2465	if (!i \|\| prop == NULL)
2488	i = (xa[XA_ESETROOT_PMAP_ID]	2466	i = (xa[XA_ESETROOT_PMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2467	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2469	&nitems, &bytes_after, &prop) == Success);
2492		2470
2493	if (!i \|\| prop == NULL	2471	if (!i \|\| prop == NULL
2494	#if TINTING	2472	#if TINTING
2495	\|\| !rs[Rs_color + Color_tint]	2473	\|\| !ISSET_PIXCOLOR (Color_tint)
2496	#endif	2474	#endif
2497	)	2475	)
2498	have_pixmap = 0;	2476	have_pixmap = 0;
2499	else	2477	else
2500	{	2478	{
…		…
2513	Window cr;	2491	Window cr;
2514	XImage *image;	2492	XImage *image;
2515	GC gc;	2493	GC gc;
2516	XGCValues gcvalue;	2494	XGCValues gcvalue;
2517		2495
2518	XTranslateCoordinates (disp, parent[0], display->root,	2496	XTranslateCoordinates (xdisp, parent[0], display->root,
2519	0, 0, &sx, &sy, &cr);	2497	0, 0, &sx, &sy, &cr);
2520	nw = (unsigned int)szHint.width;	2498	nw = (unsigned int)szHint.width;
2521	nh = (unsigned int)szHint.height;	2499	nh = (unsigned int)szHint.height;
2522	nx = ny = 0;	2500	nx = ny = 0;
2523		2501
…		…
2536	}	2514	}
2537		2515
2538	min_it (nw, (unsigned int) (wrootattr.width - sx));	2516	min_it (nw, (unsigned int) (wrootattr.width - sx));
2539	min_it (nh, (unsigned int) (wrootattr.height - sy));	2517	min_it (nh, (unsigned int) (wrootattr.height - sy));
2540		2518
2541	XSync (disp, False);	2519	XSync (xdisp, False);
2542	allowedxerror = -1;	2520	allowedxerror = -1;
2543	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2521	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544		2522
2545	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2523	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2546	/* XXX: may need a delay here? */	2524	/* XXX: may need a delay here? */
2547	allowedxerror = 0;	2525	allowedxerror = 0;
2548		2526
…		…
2551	if (am_transparent && am_pixmap_trans)	2529	if (am_transparent && am_pixmap_trans)
2552	{	2530	{
2553	pchanged = 1;	2531	pchanged = 1;
2554	if (pixmap != None)	2532	if (pixmap != None)
2555	{	2533	{
2556	XFreePixmap (disp, pixmap);	2534	XFreePixmap (xdisp, pixmap);
2557	pixmap = None;	2535	pixmap = None;
2558	}	2536	}
2559	}	2537	}
2560		2538
2561	am_pixmap_trans = 0;	2539	am_pixmap_trans = 0;
2562	}	2540	}
2563	else	2541	else
2564	{	2542	{
2565	if (pixmap != None)	2543	if (pixmap != None)
2566	XFreePixmap (disp, pixmap);	2544	XFreePixmap (xdisp, pixmap);
2567		2545
2568	#if TINTING	2546	#if TINTING
2569	if (ISSET_PIXCOLOR (Color_tint))	2547	if (ISSET_PIXCOLOR (Color_tint))
2570	{	2548	{
2571	unsigned short rm, gm, bm;
2572	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2549	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573		2550
		2551	rgba c;
2574	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2552	pix_colors_focused [Color_tint].get (c);
2575		2553
2576	ShadeXImage (display, image, shade, rm, gm, bm);	2554	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577	}	2555	}
2578	#endif	2556	#endif
2579		2557
2580	pixmap = XCreatePixmap (disp, vt,	2558	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2581	szHint.width, szHint.height, image->depth);
2582	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2559	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2583	XPutImage (disp, pixmap, gc, image, 0, 0,	2560	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2584	nx, ny, image->width, image->height);	2561	nx, ny, image->width, image->height);
2585	XFreeGC (disp, gc);	2562	XFreeGC (xdisp, gc);
2586	XDestroyImage (image);	2563	XDestroyImage (image);
2587	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2564	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2588	XClearWindow (disp, parent[0]);	2565	XClearWindow (xdisp, parent[0]);
2589		2566
2590	if (!am_transparent \|\| !am_pixmap_trans)	2567	if (!am_transparent \|\| !am_pixmap_trans)
2591	pchanged = 1;	2568	pchanged = 1;
2592		2569
2593	am_transparent = am_pixmap_trans = 1;	2570	am_transparent = am_pixmap_trans = 1;
2594	}	2571	}
2595	}	2572	}
2596		2573
2597	if (am_pixmap_trans)	2574	if (am_pixmap_trans)
2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2575	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2599	else	2576	else
2600	{	2577	{
2601	unsigned int n;	2578	unsigned int n;
2602	/*	2579	/*
2603	* InheritPixmap transparency	2580	* InheritPixmap transparency
2604	*/	2581	*/
2605	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2582	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606	{	2583	{
2607	oldp = parent[i];	2584	oldp = parent[i];
2608	XQueryTree (disp, parent[i - 1], &root,	2585	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2609	&parent[i], &list, &n);
2610	XFree (list);	2586	XFree (list);
2611		2587
2612	if (parent[i] == display->root)	2588	if (parent[i] == display->root)
2613	{	2589	{
2614	if (oldp != None)	2590	if (oldp != None)
…		…
2622	}	2598	}
2623		2599
2624	n = 0;	2600	n = 0;
2625		2601
2626	if (pchanged)	2602	if (pchanged)
2627	{
2628	for (; n < (unsigned int)i; n++)	2603	for (; n < (unsigned int)i; n++)
2629	{	2604	{
2630	XGetWindowAttributes (disp, parent[n], &wattr);	2605	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2606
2631	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2632	{	2608	{
2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634	break;	2610	break;
2635	}	2611	}
2636	}	2612	}
2637	}
2638		2613
2639	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2614	if (n > (sizeof (parent) / sizeof (parent[0])))
2640	{	2615	{
2641	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2616	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2642	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2617	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2643	am_transparent = 0;	2618	am_transparent = 0;
2644	/* XXX: also turn off Opt_transparent? */	2619	/* XXX: also turn off Opt_transparent? */
2645	}	2620	}
2646	else	2621	else
2647	{	2622	{
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++)	2623	for (n = 0; n < (unsigned int)i; n++)
2654	{	2624	{
2655	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2656	XClearWindow (disp, parent[n]);	2626	XClearWindow (xdisp, parent[n]);
2657	}	2627	}
2658		2628
2659	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2629	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2660	am_transparent = 1;	2630	am_transparent = 1;
2661	}	2631	}
2662		2632
2663	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2633	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664	parent[i] = None;	2634	parent[i] = None;
2665	}	2635	}
2666		2636
2667	if (scrollBar.win)	2637	if (scrollBar.win)
2668	{	2638	{
2669	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2639	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2670	scrollBar.setIdle ();	2640	scrollBar.setIdle ();
2671	scrollbar_show (0);	2641	scrollbar_show (0);
2672	}	2642	}
2673		2643
2674	if (am_transparent)	2644	if (am_transparent)
…		…
2820	return flag;	2790	return flag;
2821	}	2791	}
2822		2792
2823	// read the next character	2793	// read the next character
2824	wchar_t	2794	wchar_t
2825	rxvt_term::next_char ()	2795	rxvt_term::next_char () NOTHROW
2826	{	2796	{
2827	while (cmdbuf_ptr < cmdbuf_endp)	2797	while (cmdbuf_ptr < cmdbuf_endp)
2828	{	2798	{
2829	// assume 7-bit to be ascii ALWAYS	2799	// assume 7-bit to be ascii ALWAYS
2830	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2800	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2851	return NOCHAR;	2821	return NOCHAR;
2852	}	2822	}
2853		2823
2854	// read the next octet	2824	// read the next octet
2855	uint32_t	2825	uint32_t
2856	rxvt_term::next_octet ()	2826	rxvt_term::next_octet () NOTHROW
2857	{	2827	{
2858	return cmdbuf_ptr < cmdbuf_endp	2828	return cmdbuf_ptr < cmdbuf_endp
2859	? (unsigned char)*cmdbuf_ptr++	2829	? (unsigned char)*cmdbuf_ptr++
2860	: NOCHAR;	2830	: NOCHAR;
2861	}	2831	}
		2832
		2833	static class out_of_input out_of_input;
2862		2834
2863	/* rxvt_cmd_getc () - Return next input character */	2835	/* rxvt_cmd_getc () - Return next input character */
2864	/*	2836	/*
2865	* Return the next input character after first passing any keyboard input	2837	* Return the next input character after first passing any keyboard input
2866	* to the command.	2838	* to the command.
2867	*/	2839	*/
2868	wchar_t	2840	wchar_t
2869	rxvt_term::cmd_getc ()	2841	rxvt_term::cmd_getc () THROW ((class out_of_input))
2870	{	2842	{
2871	wchar_t c = next_char ();	2843	wchar_t c = next_char ();
2872		2844
2873	if (c == NOCHAR)	2845	if (c == NOCHAR)
2874	throw out_of_input;	2846	throw out_of_input;
2875		2847
2876	return c;	2848	return c;
2877	}	2849	}
2878		2850
2879	uint32_t	2851	uint32_t
2880	rxvt_term::cmd_get8 ()	2852	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881	{	2853	{
2882	uint32_t c = next_octet ();	2854	uint32_t c = next_octet ();
2883		2855
2884	if (c == NOCHAR)	2856	if (c == NOCHAR)
2885	throw out_of_input;	2857	throw out_of_input;
…		…
3123	scr_charset_set (2, (unsigned int)cmd_getc ());	3095	scr_charset_set (2, (unsigned int)cmd_getc ());
3124	break;	3096	break;
3125	case '+':	3097	case '+':
3126	scr_charset_set (3, (unsigned int)cmd_getc ());	3098	scr_charset_set (3, (unsigned int)cmd_getc ());
3127	break;	3099	break;
3128	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3129	case '6':	3101	case '6':
3130	scr_backindex ();	3102	scr_backindex ();
3131	break;	3103	break;
3132	#endif	3104	#endif
3133	case '7':	3105	case '7':
3134	scr_cursor (SAVE);	3106	scr_cursor (SAVE);
3135	break;	3107	break;
3136	case '8':	3108	case '8':
3137	scr_cursor (RESTORE);	3109	scr_cursor (RESTORE);
3138	break;	3110	break;
3139	#if ENABLE_FRILLS	3111	#if !ENABLE_MINIMAL
3140	case '9':	3112	case '9':
3141	scr_forwardindex ();	3113	scr_forwardindex ();
3142	break;	3114	break;
3143	#endif	3115	#endif
3144	case '=':	3116	case '=':
…		…
3306	ndef = get_byte_array_bit (csi_defaults, i);	3278	ndef = get_byte_array_bit (csi_defaults, i);
3307	for (p = 0; p < nargs; p++)	3279	for (p = 0; p < nargs; p++)
3308	if (arg[p] == -1)	3280	if (arg[p] == -1)
3309	arg[p] = ndef;	3281	arg[p] = ndef;
3310		3282
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	/*	3283	/*
3319	* private mode handling	3284	* private mode handling
3320	*/	3285	*/
3321	if (priv)	3286	if (priv)
3322	{	3287	{
3323	switch (priv)	3288	switch (priv)
3324	{	3289	{
3325	case '>':	3290	case '>':
3326	if (ch == CSI_DA) /* secondary device attributes */	3291	if (ch == CSI_DA) /* secondary device attributes */
3327	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	}
3328	break;	3302	break;
3329	case '?':	3303	case '?':
3330	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3304	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3331	process_terminal_mode (ch, priv, nargs, arg);	3305	process_terminal_mode (ch, priv, nargs, arg);
3332	break;	3306	break;
…		…
3535	break;	3509	break;
3536	case CSI_75:	3510	case CSI_75:
3537	scr_cursor (RESTORE);	3511	scr_cursor (RESTORE);
3538	break;	3512	break;
3539		3513
3540	#if ENABLE_FRILLS	3514	#if !ENABLE_MINIMAL
3541	case CSI_74:	3515	case CSI_74:
3542	process_window_ops (arg, nargs);	3516	process_window_ops (arg, nargs);
3543	break;	3517	break;
3544	#endif	3518	#endif
3545		3519
…		…
3552	break;	3526	break;
3553	}	3527	}
3554	}	3528	}
3555	/}}} /	3529	/}}} /
3556		3530
3557	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3558	/* ARGSUSED */	3532	/* ARGSUSED */
3559	void	3533	void
3560	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3534	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561	{	3535	{
3562	int x, y;	3536	int x, y;
3563	XWindowAttributes wattr;	3537	XWindowAttributes wattr;
3564	Window wdummy;	3538	Window wdummy;
3565	dDisp;	3539
		3540	dLocal (Display *, xdisp);
3566		3541
3567	if (nargs == 0)	3542	if (nargs == 0)
3568	return;	3543	return;
3569		3544
3570	switch (args[0])	3545	switch (args[0])
3571	{	3546	{
3572	/*	3547	/*
3573	* commands	3548	* commands
3574	*/	3549	*/
3575	case 1: /* deiconify window */	3550	case 1: /* deiconify window */
3576	XMapWindow (disp, parent[0]);	3551	XMapWindow (xdisp, parent[0]);
3577	break;	3552	break;
3578	case 2: /* iconify window */	3553	case 2: /* iconify window */
3579	XIconifyWindow (disp, parent[0], display->screen);	3554	XIconifyWindow (xdisp, parent[0], display->screen);
3580	break;	3555	break;
3581	case 3: /* set position (pixels) */	3556	case 3: /* set position (pixels) */
3582	XMoveWindow (disp, parent[0], args[1], args[2]);	3557	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3583	break;	3558	break;
3584	case 4: /* set size (pixels) */	3559	case 4: /* set size (pixels) */
3585	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586	break;	3561	break;
3587	case 5: /* raise window */	3562	case 5: /* raise window */
3588	XRaiseWindow (disp, parent[0]);	3563	XRaiseWindow (xdisp, parent[0]);
3589	break;	3564	break;
3590	case 6: /* lower window */	3565	case 6: /* lower window */
3591	XLowerWindow (disp, parent[0]);	3566	XLowerWindow (xdisp, parent[0]);
3592	break;	3567	break;
3593	case 7: /* refresh window */	3568	case 7: /* refresh window */
3594	scr_touch (true);	3569	scr_touch (true);
3595	break;	3570	break;
3596	case 8: /* set size (chars) */	3571	case 8: /* set size (chars) */
…		…
3603	if (args[0] >= 24) /* set height (chars) */	3578	if (args[0] >= 24) /* set height (chars) */
3604	set_widthheight ((unsigned int)width,	3579	set_widthheight ((unsigned int)width,
3605	(unsigned int) (args[1] * fheight));	3580	(unsigned int) (args[1] * fheight));
3606	break;	3581	break;
3607		3582
3608
3609	/*	3583	/*
3610	* reports - some output format copied from XTerm	3584	* reports - some output format copied from XTerm
3611	*/	3585	*/
3612	case 11: /* report window state */	3586	case 11: /* report window state */
3613	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (xdisp, parent[0], &wattr);
3614	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3588	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615	break;	3589	break;
3616	case 13: /* report window position */	3590	case 13: /* report window position */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (xdisp, parent[0], &wattr);
3618	XTranslateCoordinates (disp, parent[0], wattr.root,	3592	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3619	-wattr.border_width, -wattr.border_width,	3593	-wattr.border_width, -wattr.border_width,
3620	&x, &y, &wdummy);	3594	&x, &y, &wdummy);
3621	tt_printf ("\033[3;%d;%dt", x, y);	3595	tt_printf ("\033[3;%d;%dt", x, y);
3622	break;	3596	break;
3623	case 14: /* report window size (pixels) */	3597	case 14: /* report window size (pixels) */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3598	XGetWindowAttributes (xdisp, parent[0], &wattr);
3625	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3599	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626	break;	3600	break;
3627	case 18: /* report text area size (chars) */	3601	case 18: /* report text area size (chars) */
3628	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629	break;	3603	break;
…		…
3631	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632	break;	3606	break;
3633	case 20: /* report icon label */	3607	case 20: /* report icon label */
3634	{	3608	{
3635	char *s;	3609	char *s;
3636	XGetIconName (disp, parent[0], &s);	3610	XGetIconName (xdisp, parent[0], &s);
3637	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 */
3638	XFree (s);	3612	XFree (s);
3639	}	3613	}
3640	break;	3614	break;
3641	case 21: /* report window title */	3615	case 21: /* report window title */
3642	{	3616	{
3643	char *s;	3617	char *s;
3644	XFetchName (disp, parent[0], &s);	3618	XFetchName (xdisp, parent[0], &s);
3645	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 */
3646	XFree (s);	3620	XFree (s);
3647	}	3621	}
3648	break;	3622	break;
3649	}	3623	}
…		…
3750	void	3724	void
3751	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)
3752	{	3726	{
3753	if (str[0] == '?' && !str[1])	3727	if (str[0] == '?' && !str[1])
3754	{	3728	{
3755	unsigned short r, g, b;	3729	rgba c;
3756	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
3757	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);
3758	}	3738	}
3759	else	3739	else
3760	set_window_color (color, str);	3740	set_window_color (color, str);
3761	}	3741	}
3762		3742
…		…
3764	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3744	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3765	*/	3745	*/
3766	void	3746	void
3767	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3747	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768	{	3748	{
3769	int changed = 0;
3770	int color;	3749	int color;
3771	char buf, name;	3750	char buf, name;
3772	bool query = str[0] == '?' && !str[1];	3751	bool query = str[0] == '?' && !str[1];
3773	int saveop = op;	3752	int saveop = op;
3774	dDisp;	3753
		3754	dLocal (Display *, xdisp);
3775		3755
3776	assert (str != NULL);	3756	assert (str != NULL);
3777	switch (op)	3757	switch (op)
3778	{	3758	{
3779	case XTerm_name:	3759	case XTerm_name:
…		…
3795	unsigned long bytes_after;	3775	unsigned long bytes_after;
3796	unsigned char *value = 0;	3776	unsigned char *value = 0;
3797	const char *str = "";	3777	const char *str = "";
3798		3778
3799	if (prop	3779	if (prop
3800	&& XGetWindowProperty (disp, parent[0],	3780	&& XGetWindowProperty (xdisp, parent[0],
3801	prop, 0, 1<<16, 0, AnyPropertyType,	3781	prop, 0, 1<<16, 0, AnyPropertyType,
3802	&actual_type, &actual_format,	3782	&actual_type, &actual_format,
3803	&nitems, &bytes_after, &value) == Success	3783	&nitems, &bytes_after, &value) == Success
3804	&& actual_type != None	3784	&& actual_type != None
3805	&& actual_format == 8)	3785	&& actual_format == 8)
3806	str = (const char *)(value);	3786	str = (const char *)(value);
3807		3787
3808	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3788	tt_printf ("\033]%d;%s%c", op, str, resp);
3809		3789
3810	XFree (value);	3790	XFree (value);
3811	}	3791	}
3812	else	3792	else
3813	{	3793	{
…		…
3817	{	3797	{
3818	*eq = 0;	3798	*eq = 0;
3819	set_utf8_property (display->atom (str), eq + 1);	3799	set_utf8_property (display->atom (str), eq + 1);
3820	}	3800	}
3821	else	3801	else
3822	XDeleteProperty (disp, parent[0],	3802	XDeleteProperty (xdisp, parent[0],
3823	display->atom (str));	3803	display->atom (str));
3824	}	3804	}
3825	break;	3805	break;
3826		3806
3827	case XTerm_Color:	3807	case XTerm_Color:
…		…
3837	break;	3817	break;
3838		3818
3839	if ((buf = strchr (name, ';')) != NULL)	3819	if ((buf = strchr (name, ';')) != NULL)
3840	*buf++ = '\0';	3820	*buf++ = '\0';
3841		3821
3842	if (name[0] == '?' && !name[1])	3822	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	}	3823	}
3851	break;	3824	break;
3852	case XTerm_Color00:	3825	case XTerm_Color00:
3853	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3826	process_color_seq (op, Color_fg, str, resp);
3854	break;	3827	break;
3855	case XTerm_Color01:	3828	case XTerm_Color01:
3856	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3829	process_color_seq (op, Color_bg, str, resp);
3857	break;	3830	break;
3858	#ifndef NO_CURSORCOLOR	3831	#ifndef NO_CURSORCOLOR
3859	case XTerm_Color_cursor:	3832	case XTerm_Color_cursor:
3860	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3833	process_color_seq (op, Color_cursor, str, resp);
3861	break;	3834	break;
3862	#endif	3835	#endif
3863	case XTerm_Color_pointer_fg:	3836	case XTerm_Color_pointer_fg:
3864	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3837	process_color_seq (op, Color_pointer_fg, str, resp);
3865	break;	3838	break;
3866	case XTerm_Color_pointer_bg:	3839	case XTerm_Color_pointer_bg:
3867	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3840	process_color_seq (op, Color_pointer_bg, str, resp);
3868	break;	3841	break;
3869	#ifndef NO_BOLD_UNDERLINE_REVERSE	3842	#ifndef NO_BOLD_UNDERLINE_REVERSE
3870	case XTerm_Color_RV:	3843	case XTerm_Color_RV:
3871	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3844	process_color_seq (op, Color_RV, str, resp);
3872	break;	3845	break;
3873	case Rxvt_Color_BD:	3846	case Rxvt_Color_BD:
3874	case URxvt_Color_BD:	3847	case URxvt_Color_BD:
3875	process_color_seq (op, Color_BD, str, resp);	3848	process_color_seq (op, Color_BD, str, resp);
3876	break;	3849	break;
3877	case Rxvt_Color_UL:	3850	case Rxvt_Color_UL:
3878	case URxvt_Color_UL:	3851	case URxvt_Color_UL:
3879	process_color_seq (op, Color_UL, str, resp);	3852	process_color_seq (op, Color_UL, str, resp);
3880	break;	3853	break;
3881	case URxvt_Color_IT:	3854	case URxvt_Color_IT:
3882	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3855	process_color_seq (op, Color_IT, str, resp);
3883	break;	3856	break;
3884	#endif	3857	#endif
3885	#if TRANSPARENT && TINTING	3858	#if TRANSPARENT && TINTING
3886	case URxvt_Color_tint:	3859	case URxvt_Color_tint:
3887	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3860	process_color_seq (op, Color_tint, str, resp);
		3861
3888	check_our_parents ();	3862	check_our_parents ();
		3863
3889	if (am_transparent)	3864	if (am_transparent)
3890	want_full_refresh = want_refresh = 1;	3865	want_full_refresh = want_refresh = 1;
		3866
3891	break;	3867	break;
3892	#endif	3868	#endif
3893		3869
3894	case Rxvt_Pixmap:	3870	case Rxvt_Pixmap:
		3871	{
3895	if (*str != ';')	3872	if (*str != ';')
3896	{	3873	{
3897	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3898	scale_pixmap (""); /* reset to default scaling */	3875	scale_pixmap (""); /* reset to default scaling */
3899	set_bgPixmap (str); /* change pixmap */	3876	set_bgPixmap (str); /* change pixmap */
3900	scr_touch (true);	3877	scr_touch (true);
3901	#endif	3878	#endif
3902	}	3879	}
3903		3880
		3881	int changed = 0;
		3882
3904	while ((str = strchr (str, ';')) != NULL)	3883	while ((str = strchr (str, ';')) != NULL)
3905	{	3884	{
3906	str++;	3885	str++;
3907	#if XPM_BACKGROUND	3886	#if XPM_BACKGROUND
3908	changed += scale_pixmap (str);	3887	changed += scale_pixmap (str);
3909	#endif	3888	#endif
3910	}	3889	}
3911		3890
3912	if (changed)	3891	if (changed)
3913	{	3892	{
3914	#ifdef XPM_BACKGROUND	3893	#ifdef XPM_BACKGROUND
3915	resize_pixmap ();	3894	resize_pixmap ();
3916	scr_touch (true);	3895	scr_touch (true);
3917	#endif	3896	#endif
3918	}	3897	}
		3898	}
3919	break;	3899	break;
3920		3900
3921	case Rxvt_restoreFG:	3901	case Rxvt_restoreFG:
3922	set_window_color (Color_fg, str);	3902	set_window_color (Color_fg, str);
3923	break;	3903	break;
…		…
3962	allocated.push_back ((void *)res);	3942	allocated.push_back ((void *)res);
3963	set_fonts ();	3943	set_fonts ();
3964	}	3944	}
3965	break;	3945	break;
3966		3946
3967	#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
3968	case URxvt_locale:	3956	case URxvt_locale:
3969	if (query)	3957	if (query)
3970	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);
3971	else	3959	else
3972	{	3960	{
3973	set_locale (str);	3961	set_locale (str);
3974	pty.set_utf8_mode (enc_utf8);	3962	pty->set_utf8_mode (enc_utf8);
3975	init_xlocale ();	3963	init_xlocale ();
3976	}	3964	}
3977	break;	3965	break;
3978		3966
3979	case URxvt_view_up:	3967	case URxvt_view_up:
…		…
4032	return state;	4020	return state;
4033	}	4021	}
4034		4022
4035	/* we're not using priv _yet_ */	4023	/* we're not using priv _yet_ */
4036	void	4024	void
4037	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)
4038	{	4026	{
4039	unsigned int i, j;	4027	unsigned int i, j;
4040	int state;	4028	int state;
4041		4029
4042	static const struct	4030	static const struct
…		…
4336	scr_color (Color_bg, Color_bg);	4324	scr_color (Color_bg, Color_bg);
4337	break;	4325	break;
4338		4326
4339	//case 50: // not variable spacing	4327	//case 50: // not variable spacing
4340		4328
4341	#if ENABLE_FRILLS	4329	#if !ENABLE_MINIMAL
4342	case 90:	4330	case 90:
4343	case 91: /* set bright fg color */	4331	case 91: /* set bright fg color */
4344	case 92:	4332	case 92:
4345	case 93:	4333	case 93:
4346	case 94:	4334	case 94:
…		…
4411	rxvt_term::tt_write (const char *data, unsigned int len)	4399	rxvt_term::tt_write (const char *data, unsigned int len)
4412	{	4400	{
4413	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4401	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414	return;	4402	return;
4415		4403
4416	if (pty.pty < 0)	4404	if (pty->pty < 0)
4417	return;	4405	return;
4418		4406
4419	if (v_buflen == 0)	4407	if (v_buflen == 0)
4420	{	4408	{
4421	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4409	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422		4410
4423	if ((unsigned int)written == len)	4411	if ((unsigned int)written == len)
4424	return;	4412	return;
4425		4413
4426	data += written;	4414	data += written;
…		…
4435	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4423	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4436	}	4424	}
4437		4425
4438	void rxvt_term::pty_write ()	4426	void rxvt_term::pty_write ()
4439	{	4427	{
4440	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4428	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441		4429
4442	if (written > 0)	4430	if (written > 0)
4443	{	4431	{
4444	v_buflen -= written;	4432	v_buflen -= written;
4445		4433

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.304 by root, Tue Jan 31 22:01:25 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.304 by root, Tue Jan 31 22:01:25 2006 UTC