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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
53	#include <wchar.h>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
54	#include <signal.h>	57	#include <csignal>
55		58
56	/----------------------------------------------------------------------/	59	/----------------------------------------------------------------------/
57		60
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		62
…		…
114	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
115	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
116	XK_Print, 0x2399,	119	XK_Print, 0x2399,
117		120
118	XK_space, 0x2423,	121	XK_space, 0x2423,
		122
		123	#ifdef XK_KP_Begin
		124	XK_KP_Prior, 0x21de,
		125	XK_KP_Next, 0x21df,
		126	XK_KP_Begin, 0x2320,
		127	XK_KP_Insert, 0x2380,
		128	XK_KP_Delete, 0x2326,
119	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
120	0,	131	0,
121	};	132	};
122		133
123	void	134	void
124	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	284	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	285	* escape sequence to toggle the Keypad.
275	*	286	*
276	* Always permit `shift' to override the current setting	287	* Always permit `shift' to override the current setting
277	*/	288	*/
278	shft = (ev.state & ShiftMask);	289	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	290	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	291	meta = ev.state & ModMetaMask;
281		292
282	if (numlock_state \|\| (ev.state & ModNumLockMask))	293	if (numlock_state \|\| (ev.state & ModNumLockMask))
283	{	294	{
284	numlock_state = (ev.state & ModNumLockMask);	295	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	296	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		316
306	// the XOpenIM manpage lies about hardcoding the locale	317	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	318	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	319	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	320	SET_LOCALE (rs[Rs_imLocale]);
		321
310	// assume wchar_t == unicode or better	322	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	323	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	324	KBUFSZ, &keysym, &status_return);
		325
313	if (rs[Rs_imLocale])	326	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	327	SET_LOCALE (locale);
315		328
316	if (status_return == XLookupChars	329	if (status_return == XLookupChars
317	\|\| status_return == XLookupBoth)	330	\|\| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	357	valid_keysym = keysym != NoSymbol;
345	}	358	}
346		359
347	if (valid_keysym)	360	if (valid_keysym)
348	{	361	{
		362	#ifdef KEYSYM_RESOURCE
		363	if (keyboard->dispatch (this, keysym, ev.state))
		364	return;
		365	#endif
		366
349	if (TermWin.saveLines)	367	if (TermWin.saveLines)
350	{	368	{
351	#ifdef UNSHIFTED_SCROLLKEYS	369	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	370	if (!ctrl && !meta)
353	#else	371	#else
…		…
487	}	505	}
488	#endif	506	#endif
489		507
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	508	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	509	{
492	#ifdef KEYSYM_RESOURCE
493	if (! (shft \| ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494	{
495	unsigned int l;
496	const unsigned char *kbuf0;
497
498	kbuf0 = (Keysym_map[keysym & 0xFF]);
499	l = (unsigned int)*kbuf0++;
500
501	/* escape prefix */
502	if (meta
503	# ifdef META8_OPTION
504	&& meta_char == C0_ESC
505	# endif
506	)
507	{
508	const unsigned char ch = C0_ESC;
509	tt_write (&ch, 1);
510	}
511
512	tt_write (kbuf0, l);
513	return;
514	}
515	else
516	#endif
517	{	510	{
518	newlen = 1;	511	newlen = 1;
519	switch (keysym)	512	switch (keysym)
520	{	513	{
521	#ifndef NO_BACKSPACE_KEY	514	#ifndef NO_BACKSPACE_KEY
…		…
529	else	522	else
530	strcpy (kbuf, key_backspace);	523	strcpy (kbuf, key_backspace);
531	break;	524	break;
532	#endif	525	#endif
533	#ifndef NO_DELETE_KEY	526	#ifndef NO_DELETE_KEY
		527	# ifdef XK_KP_Prior
		528	case XK_KP_Delete:
		529	/* allow shift to override */
		530	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		531	{
		532	strcpy (kbuf, "\033On");
		533	break;
		534	}
		535	/* FALLTHROUGH */
		536	# endif
534	case XK_Delete:	537	case XK_Delete:
535	strcpy (kbuf, key_delete);	538	strcpy (kbuf, key_delete);
536	break;	539	break;
537	#endif	540	#endif
538	case XK_Tab:	541	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	644	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	645	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	646	strcpy (kbuf, "\033Ou");
644	break;	647	break;
645		648
646	case XK_KP_Insert:
647	strcpy (kbuf, "\033Op");
648	break;
649
650	case XK_KP_Delete:
651	strcpy (kbuf, "\033On");
652	break;
653	#endif	649	#endif
654	case XK_KP_F1: /* "\033OP" */	650	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	651	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	652	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	653	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	685	break;
690		686
691	case XK_Find:	687	case XK_Find:
692	strcpy (kbuf, "\033[1~");	688	strcpy (kbuf, "\033[1~");
693	break;	689	break;
		690
		691	#ifdef XK_KP_End
		692	case XK_KP_Insert:
		693	/* allow shift to override */
		694	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		695	{
		696	strcpy (kbuf, "\033Op");
		697	break;
		698	}
		699	/* FALLTHROUGH */
		700	#endif
694	case XK_Insert:	701	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	702	strcpy (kbuf, "\033[2~");
696	break;	703	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	704	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	705	case DXK_Remove:
…		…
788	#undef FKEY	795	#undef FKEY
789	default:	796	default:
790	newlen = 0;	797	newlen = 0;
791	break;	798	break;
792	}	799	}
		800
793	if (newlen)	801	if (newlen)
794	len = strlen (kbuf);	802	len = strlen (kbuf);
795	}	803	}
796		804
797	/*	805	/*
…		…
805	}	813	}
806	else if (ctrl && keysym == XK_minus)	814	else if (ctrl && keysym == XK_minus)
807	{	815	{
808	len = 1;	816	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	817	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		818	}
		819	else if (keysym == XK_ISO_Left_Tab)
		820	{
		821	strcpy (kbuf, "\033[Z");
		822	len = 3;
810	}	823	}
811	else	824	else
812	{	825	{
813	#ifdef META8_OPTION	826	#ifdef META8_OPTION
814	/* set 8-bit on */	827	/* set 8-bit on */
…		…
873	#endif /* DEBUG_CMD */	886	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	887	tt_write (kbuf, (unsigned int)len);
875	}	888	}
876	/}}} /	889	/}}} /
877		890
878	#if (MENUBAR_MAX)	891	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
879	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	892	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
880	/* attempt to `write' count to the input buffer */	893	/* attempt to `write' count to the input buffer */
881	unsigned int	894	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	895	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	896	{
…		…
906		919
907	cmd_parse ();	920	cmd_parse ();
908		921
909	return 0;	922	return 0;
910	}	923	}
911	#endif /* MENUBAR_MAX */	924	#endif
912		925
913	void	926	void
914	rxvt_term::flush ()	927	rxvt_term::flush ()
915	{	928	{
916	flush_ev.stop ();	929	flush_ev.stop ();
…		…
1017	{	1030	{
1018	if (mouse_slip_wheel_speed == 0	1031	if (mouse_slip_wheel_speed == 0
1019	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1032	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1033	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1034	{
		1035	if (TermWin.view_start == TermWin.nscrolled \|\|
		1036	TermWin.view_start == 0)
		1037	mouse_slip_wheel_speed = 0;
		1038
1022	refresh_type \|= SMOOTH_REFRESH;	1039	refresh_type \|= SMOOTH_REFRESH;
1023	want_refresh = 1;	1040	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1041	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1042	}
1026	}	1043	}
…		…
1058	rxvt_term::pty_cb (io_watcher &w, short revents)	1075	rxvt_term::pty_cb (io_watcher &w, short revents)
1059	{	1076	{
1060	SET_R (this);	1077	SET_R (this);
1061	SET_LOCALE (locale);	1078	SET_LOCALE (locale);
1062		1079
1063	if (revents & EVENT_WRITE)
1064	tt_write (0, 0);
1065	else if (revents & EVENT_READ)	1080	if (revents & EVENT_READ)
1066	// loop, but don't allow a single term to monopolize us	1081	// loop, but don't allow a single term to monopolize us
1067	while (pty_fill ())	1082	while (pty_fill ())
1068	if (cmd_parse ())	1083	if (cmd_parse ())
1069	break;	1084	break;
		1085
		1086	if (revents & EVENT_WRITE)
		1087	pty_write ();
1070	}	1088	}
1071		1089
1072	void	1090	void
1073	rxvt_term::pointer_unblank ()	1091	rxvt_term::pointer_unblank ()
1074	{	1092	{
…		…
1088	rxvt_term::pointer_blank ()	1106	rxvt_term::pointer_blank ()
1089	{	1107	{
1090	if (! (options & Opt_pointerBlank))	1108	if (! (options & Opt_pointerBlank))
1091	return;	1109	return;
1092		1110
1093	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1111	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1094	XFlush (display->display);	1112	XFlush (display->display);
1095		1113
1096	hidden_pointer = 1;	1114	hidden_pointer = 1;
1097	}	1115	}
1098		1116
…		…
1187		1205
1188	/{{{ process an X event /	1206	/{{{ process an X event /
1189	void	1207	void
1190	rxvt_term::x_cb (XEvent &ev)	1208	rxvt_term::x_cb (XEvent &ev)
1191	{	1209	{
		1210	dDisp;
		1211
1192	SET_R (this);	1212	SET_R (this);
1193	SET_LOCALE (locale);	1213	SET_LOCALE (locale);
1194		1214
1195	#if defined(CURSOR_BLINK)	1215	#if defined(CURSOR_BLINK)
1196	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1216	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1217	if (ev.type == KeyPress && hidden_pointer == 0)	1237	if (ev.type == KeyPress && hidden_pointer == 0)
1218	pointer_blank ();	1238	pointer_blank ();
1219	}	1239	}
1220	#endif	1240	#endif
1221		1241
1222	Window unused_root, unused_child;	1242	Window unused_root, unused_child;
1223	int unused_root_x, unused_root_y;	1243	int unused_root_x, unused_root_y;
1224	unsigned int unused_mask;	1244	unsigned int unused_mask;
1225		1245
1226	switch (ev.type)	1246	switch (ev.type)
1227	{	1247	{
1228	case KeyPress:	1248	case KeyPress:
1229	#if ISO_14755	1249	#if ISO_14755
…		…
1312	button_release (ev.xbutton);	1332	button_release (ev.xbutton);
1313	break;	1333	break;
1314		1334
1315	case ClientMessage:	1335	case ClientMessage:
1316	if (ev.xclient.format == 32	1336	if (ev.xclient.format == 32
		1337	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1338	{
1317	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1339	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318	destroy ();	1340	destroy ();
		1341	#if ENABLE_EWMH
		1342	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1343	XSendEvent (disp, ev.xclient.window = display->root,
		1344	False, SubstructureRedirectMask \| SubstructureNotifyMask,
		1345	&ev);
		1346	#endif
		1347	}
		1348	#if ENABLE_XEMBED
		1349	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1350	{
		1351	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1352	focus_in ();
		1353	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1354	focus_out ();
		1355	}
		1356	#endif
1319	#ifdef OFFIX_DND	1357	#ifdef OFFIX_DND
1320	/* OffiX Dnd (drag 'n' drop) protocol */	1358	/* OffiX Dnd (drag 'n' drop) protocol */
1321	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1359	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322	&& (ev.xclient.data.l[0] == DndFile	1360	&& (ev.xclient.data.l[0] == DndFile
1323	\|\| ev.xclient.data.l[0] == DndDir	1361	\|\| ev.xclient.data.l[0] == DndDir
1324	\|\| ev.xclient.data.l[0] == DndLink))	1362	\|\| ev.xclient.data.l[0] == DndLink))
1325	{	1363	{
1326	/* Get Dnd data */	1364	/* Get Dnd data */
1327	Atom ActualType;	1365	Atom ActualType;
1328	int ActualFormat;	1366	int ActualFormat;
1329	unsigned char *data;	1367	unsigned char *data;
1330	unsigned long Size, RemainingBytes;	1368	unsigned long Size, RemainingBytes;
1331		1369
1332	XGetWindowProperty (display->display, display->root,	1370	XGetWindowProperty (disp, display->root,
1333	xa[XA_DNDSELECTION],	1371	xa[XA_DNDSELECTION],
1334	0L, 1000000L,	1372	0L, 1000000L,
1335	False, AnyPropertyType,	1373	False, AnyPropertyType,
1336	&ActualType, &ActualFormat,	1374	&ActualType, &ActualFormat,
1337	&Size, &RemainingBytes,	1375	&Size, &RemainingBytes,
1338	&data);	1376	&data);
1339	XChangeProperty (display->display, display->root,	1377	set_string_property (XA_CUT_BUFFER0, data);
1340	XA_CUT_BUFFER0, XA_STRING,
1341	8, PropModeReplace,
1342	data, strlen (data));
1343	XFree (data);	1378	XFree (data);
1344	selection_paste (display->root, XA_CUT_BUFFER0, True);	1379	selection_paste (display->root, XA_CUT_BUFFER0, true);
1345	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1380	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1346	}	1381	}
1347	#endif /* OFFIX_DND */	1382	#endif /* OFFIX_DND */
1348	break;	1383	break;
1349		1384
1350	case MappingNotify:	1385	case MappingNotify:
…		…
1375	break;	1410	break;
1376	}	1411	}
1377	break;	1412	break;
1378		1413
1379	case FocusIn:	1414	case FocusIn:
1380	if (!TermWin.focus)	1415	focus_in ();
1381	{
1382	TermWin.focus = 1;
1383	want_refresh = 1;
1384	#ifdef USE_XIM
1385	if (Input_Context != NULL)
1386	{
1387	IMSetStatusPosition ();
1388	XSetICFocus (Input_Context);
1389	}
1390	#endif
1391	#ifdef CURSOR_BLINK
1392	if (options & Opt_cursorBlink)
1393	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394	#endif
1395	#ifdef OFF_FOCUS_FADING
1396	if (rs[Rs_fade])
1397	{
1398	pix_colors = pix_colors_focused;
1399	scr_recolour ();
1400	}
1401	#endif
1402
1403	}
1404	break;	1416	break;
1405		1417
1406	case FocusOut:	1418	case FocusOut:
1407	if (TermWin.focus)	1419	focus_out ();
1408	{
1409	TermWin.focus = 0;
1410	want_refresh = 1;
1411
1412	#if ENABLE_FRILLS \|\| ISO_14755
1413	iso14755buf = 0;
1414	#endif
1415	#if ENABLE_OVERLAY
1416	scr_overlay_off ();
1417	#endif
1418	#ifdef USE_XIM
1419	if (Input_Context != NULL)
1420	XUnsetICFocus (Input_Context);
1421	#endif
1422	#ifdef CURSOR_BLINK
1423	if (options & Opt_cursorBlink)
1424	cursor_blink_ev.stop ();
1425	hidden_cursor = 0;
1426	#endif
1427	#ifdef OFF_FOCUS_FADING
1428	if (rs[Rs_fade])
1429	{
1430	pix_colors = pix_colors_unfocused;
1431	scr_recolour ();
1432	}
1433	#endif
1434	}
1435	break;	1420	break;
1436		1421
1437	case ConfigureNotify:	1422	case ConfigureNotify:
1438	if (ev.xconfigure.window == TermWin.parent[0])	1423	if (ev.xconfigure.window == TermWin.parent[0])
1439	{	1424	{
…		…
1443	{ /* Wrap lots of configures into one */	1428	{ /* Wrap lots of configures into one */
1444	width = ev.xconfigure.width;	1429	width = ev.xconfigure.width;
1445	height = ev.xconfigure.height;	1430	height = ev.xconfigure.height;
1446	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1431	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447	}	1432	}
1448	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1433	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1449		1434
1450	if (szHint.width != width \|\| szHint.height != height)	1435	if (szHint.width != width \|\| szHint.height != height)
1451	{	1436	{
1452	seen_resize = 1;	1437	seen_resize = 1;
1453	resize_all_windows (width, height, 1);	1438	resize_all_windows (width, height, 1);
1454	}	1439	}
1455		1440
1456	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1441	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457	if (options & Opt_transparent)	1442	if (options & Opt_transparent)
1458	{
1459	check_our_parents ();	1443	check_our_parents ();
1460	if (am_transparent)
1461	want_refresh = want_full_refresh = 1;
1462	}
1463	#endif	1444	#endif
1464	}	1445	}
1465	break;	1446	break;
1466		1447
1467	case PropertyNotify:	1448	case PropertyNotify:
…		…
1475	selection_clear ();	1456	selection_clear ();
1476	break;	1457	break;
1477		1458
1478	case SelectionNotify:	1459	case SelectionNotify:
1479	if (selection_wait == Sel_normal)	1460	if (selection_wait == Sel_normal)
1480	selection_paste (ev.xselection.requestor,	1461	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481	ev.xselection.property, True);
1482	break;	1462	break;
1483		1463
1484	case SelectionRequest:	1464	case SelectionRequest:
1485	selection_send (ev.xselectionrequest);	1465	selection_send (ev.xselectionrequest);
1486	break;	1466	break;
…		…
1510	if (ev.xany.window == TermWin.vt)	1490	if (ev.xany.window == TermWin.vt)
1511	{	1491	{
1512	do	1492	do
1513	scr_expose (ev.xexpose.x, ev.xexpose.y,	1493	scr_expose (ev.xexpose.x, ev.xexpose.y,
1514	ev.xexpose.width, ev.xexpose.height, False);	1494	ev.xexpose.width, ev.xexpose.height, False);
1515	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1495	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1516		1496
1517	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1497	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518		1498
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1499	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1520	scr_expose (ev.xexpose.x, ev.xexpose.y,	1500	scr_expose (ev.xexpose.x, ev.xexpose.y,
1521	ev.xexpose.width, ev.xexpose.height, False);	1501	ev.xexpose.width, ev.xexpose.height, False);
1522		1502
1523	scr_refresh (refresh_type);	1503	scr_refresh (refresh_type);
1524	}	1504	}
1525	else	1505	else
1526	{	1506	{
1527	XEvent unused_event;	1507	XEvent unused_event;
1528		1508
1529	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1509	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1530	;	1510	;
1531	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1511	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1532	;	1512	;
1533		1513
1534	if (isScrollbarWindow (ev.xany.window))	1514	if (isScrollbarWindow (ev.xany.window))
1535	{	1515	{
1536	scrollBar.setIdle ();	1516	scrollBar.setIdle ();
…		…
1541	menubar_expose ();	1521	menubar_expose ();
1542	#endif	1522	#endif
1543		1523
1544	#ifdef TRANSPARENT	1524	#ifdef TRANSPARENT
1545	if (am_transparent && ev.xany.window == TermWin.parent[0])	1525	if (am_transparent && ev.xany.window == TermWin.parent[0])
1546	XClearWindow (display->display, ev.xany.window);	1526	XClearWindow (disp, ev.xany.window);
1547	#endif	1527	#endif
1548	}	1528	}
1549	break;	1529	break;
1550		1530
1551	case MotionNotify:	1531	case MotionNotify:
…		…
1565		1545
1566	if (ev.xany.window == TermWin.vt)	1546	if (ev.xany.window == TermWin.vt)
1567	{	1547	{
1568	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1548	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1569	{	1549	{
1570	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1550	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1571	;	1551	;
1572		1552
1573	XQueryPointer (display->display, TermWin.vt,	1553	XQueryPointer (disp, TermWin.vt,
1574	&unused_root, &unused_child,	1554	&unused_root, &unused_child,
1575	&unused_root_x, &unused_root_y,	1555	&unused_root_x, &unused_root_y,
1576	&ev.xbutton.x, &ev.xbutton.y,	1556	&ev.xbutton.x, &ev.xbutton.y,
1577	&ev.xbutton.state);	1557	&ev.xbutton.state);
1578	#ifdef MOUSE_THRESHOLD	1558	#ifdef MOUSE_THRESHOLD
…		…
1642	#endif	1622	#endif
1643	}	1623	}
1644	}	1624	}
1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1625	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646	{	1626	{
1647	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1627	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1648	MotionNotify, &ev))	1628	MotionNotify, &ev))
1649	;	1629	;
1650		1630
1651	XQueryPointer (display->display, scrollBar.win,	1631	XQueryPointer (disp, scrollBar.win,
1652	&unused_root, &unused_child,	1632	&unused_root, &unused_child,
1653	&unused_root_x, &unused_root_y,	1633	&unused_root_x, &unused_root_y,
1654	&ev.xbutton.x, &ev.xbutton.y,	1634	&ev.xbutton.x, &ev.xbutton.y,
1655	&unused_mask);	1635	&unused_mask);
1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1636	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1661	}	1641	}
1662	break;	1642	break;
1663	}	1643	}
1664	}	1644	}
1665		1645
		1646	void
		1647	rxvt_term::focus_in ()
		1648	{
		1649	if (!TermWin.focus)
		1650	{
		1651	TermWin.focus = 1;
		1652	want_refresh = 1;
		1653	#ifdef USE_XIM
		1654	if (Input_Context != NULL)
		1655	{
		1656	IMSetStatusPosition ();
		1657	XSetICFocus (Input_Context);
		1658	}
		1659	#endif
		1660	#ifdef CURSOR_BLINK
		1661	if (options & Opt_cursorBlink)
		1662	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1663	#endif
		1664	#ifdef OFF_FOCUS_FADING
		1665	if (rs[Rs_fade])
		1666	{
		1667	pix_colors = pix_colors_focused;
		1668	scr_recolour ();
		1669	}
		1670	#endif
		1671	}
		1672	}
		1673
		1674	void
		1675	rxvt_term::focus_out ()
		1676	{
		1677	if (TermWin.focus)
		1678	{
		1679	TermWin.focus = 0;
		1680	want_refresh = 1;
		1681
		1682	#if ENABLE_FRILLS \|\| ISO_14755
		1683	iso14755buf = 0;
		1684	#endif
		1685	#if ENABLE_OVERLAY
		1686	scr_overlay_off ();
		1687	#endif
		1688	#ifdef USE_XIM
		1689	if (Input_Context != NULL)
		1690	XUnsetICFocus (Input_Context);
		1691	#endif
		1692	#ifdef CURSOR_BLINK
		1693	if (options & Opt_cursorBlink)
		1694	cursor_blink_ev.stop ();
		1695	hidden_cursor = 0;
		1696	#endif
		1697	#ifdef OFF_FOCUS_FADING
		1698	if (rs[Rs_fade])
		1699	{
		1700	pix_colors = pix_colors_unfocused;
		1701	scr_recolour ();
		1702	}
		1703	#endif
		1704	}
		1705	}
		1706
1666	#if TRANSPARENT	1707	#if TRANSPARENT
1667	void	1708	void
1668	rxvt_term::rootwin_cb (XEvent &ev)	1709	rxvt_term::rootwin_cb (XEvent &ev)
1669	{	1710	{
1670	SET_R (this);	1711	SET_R (this);
…		…
1675	case PropertyNotify:	1716	case PropertyNotify:
1676	/*	1717	/*
1677	* if user used some Esetroot compatible prog to set the root bg,	1718	* if user used some Esetroot compatible prog to set the root bg,
1678	* use the property to determine the pixmap. We use it later on.	1719	* use the property to determine the pixmap. We use it later on.
1679	*/	1720	*/
1680	if (xa[XA_XROOTPMAPID] == 0)
1681	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1721	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1722	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684	return;	1723	return;
1685		1724
1686	/* FALLTHROUGH */	1725	/* FALLTHROUGH */
1687	case ReparentNotify:	1726	case ReparentNotify:
1688	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1727	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1760	{	1799	{
1761	case Button1:	1800	case Button1:
1762	/* allow meta + click to select rectangular areas */	1801	/* allow meta + click to select rectangular areas */
1763	/* should be done in screen.C */	1802	/* should be done in screen.C */
1764	#if ENABLE_FRILLS	1803	#if ENABLE_FRILLS
1765	selection.rect = !! (ev.state & ModMetaMask);	1804	selection.rect = !!(ev.state & ModMetaMask);
1766	#else	1805	#else
1767	selection.rect = false;	1806	selection.rect = false;
1768	#endif	1807	#endif
1769		1808
1770	/* allow shift+left click to extend selection */	1809	/* allow shift+left click to extend selection */
…		…
2096	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2135	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2097	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2136	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2137	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099	int i;	2138	int i;
2100		2139
2101	Visual* visual = display->visual;	2140	Visual *visual = display->visual;
2102		2141
2103	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2142	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2104		2143
2105	/* for convenience */	2144	/* for convenience */
2106	mask_r = visual->red_mask;	2145	mask_r = visual->red_mask;
…		…
2327	Atom atype;	2366	Atom atype;
2328	unsigned char *prop = NULL;	2367	unsigned char *prop = NULL;
2329	Window root, oldp, *list;	2368	Window root, oldp, *list;
2330	Pixmap rootpixmap = None;	2369	Pixmap rootpixmap = None;
2331	XWindowAttributes wattr, wrootattr;	2370	XWindowAttributes wattr, wrootattr;
		2371	dDisp;
2332		2372
2333	pchanged = 0;	2373	pchanged = 0;
2334		2374
2335	if (!(options & Opt_transparent))	2375	if (!(options & Opt_transparent))
2336	return pchanged; /* Don't try any more */	2376	return pchanged; /* Don't try any more */
2337		2377
2338	XGetWindowAttributes (display->display, display->root, &wrootattr);	2378	XGetWindowAttributes (disp, display->root, &wrootattr);
2339	rootdepth = wrootattr.depth;	2379	rootdepth = wrootattr.depth;
2340		2380
2341	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2381	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2342		2382
2343	if (rootdepth != wattr.depth)	2383	if (rootdepth != wattr.depth)
2344	{	2384	{
2345	if (am_transparent)	2385	if (am_transparent)
2346	{	2386	{
2347	pchanged = 1;	2387	pchanged = 1;
2348	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2388	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2349	am_transparent = am_pixmap_trans = 0;	2389	am_transparent = am_pixmap_trans = 0;
2350	}	2390	}
2351		2391
2352	return pchanged; /* Don't try any more */	2392	return pchanged; /* Don't try any more */
2353	}	2393	}
2354		2394
2355	/* Get all X ops out of the queue so that our information is up-to-date. */	2395	/* Get all X ops out of the queue so that our information is up-to-date. */
2356	XSync (display->display, False);	2396	XSync (disp, False);
2357		2397
2358	/*	2398	/*
2359	* Make the frame window set by the window manager have	2399	* Make the frame window set by the window manager have
2360	* the root background. Some window managers put multiple nested frame	2400	* the root background. Some window managers put multiple nested frame
2361	* windows for each client, so we have to take care about that.	2401	* windows for each client, so we have to take care about that.
2362	*/	2402	*/
2363	i = (xa[XA_XROOTPMAPID]	2403	i = (xa[XA_XROOTPMAP_ID]
2364	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2404	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2365	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2405	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366	&nitems, &bytes_after, &prop) == Success);	2406	&nitems, &bytes_after, &prop) == Success);
2367		2407
2368	if (!i \|\| prop == NULL)	2408	if (!i \|\| prop == NULL)
2369	i = (xa[XA_XSETROOTID]	2409	i = (xa[XA_ESETROOT_PMAP_ID]
2370	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2410	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2371	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2411	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372	&nitems, &bytes_after, &prop) == Success);	2412	&nitems, &bytes_after, &prop) == Success);
2373		2413
2374	if (!i \|\| prop == NULL	2414	if (!i \|\| prop == NULL
2375	#if TINTING	2415	#if TINTING
…		…
2394	Window cr;	2434	Window cr;
2395	XImage *image;	2435	XImage *image;
2396	GC gc;	2436	GC gc;
2397	XGCValues gcvalue;	2437	XGCValues gcvalue;
2398		2438
2399	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2439	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2400	0, 0, &sx, &sy, &cr);	2440	0, 0, &sx, &sy, &cr);
2401	nw = (unsigned int)szHint.width;	2441	nw = (unsigned int)szHint.width;
2402	nh = (unsigned int)szHint.height;	2442	nh = (unsigned int)szHint.height;
2403	nx = ny = 0;	2443	nx = ny = 0;
2404		2444
…		…
2416	sy = 0;	2456	sy = 0;
2417	}	2457	}
2418		2458
2419	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2459	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2460	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2461
		2462	XSync (disp, False);
2421	allowedxerror = -1;	2463	allowedxerror = -1;
2422	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2464	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423		2465
2424	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2466	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2425	/* XXX: may need a delay here? */	2467	/* XXX: may need a delay here? */
2426	allowedxerror = 0;	2468	allowedxerror = 0;
2427		2469
…		…
2430	if (am_transparent && am_pixmap_trans)	2472	if (am_transparent && am_pixmap_trans)
2431	{	2473	{
2432	pchanged = 1;	2474	pchanged = 1;
2433	if (TermWin.pixmap != None)	2475	if (TermWin.pixmap != None)
2434	{	2476	{
2435	XFreePixmap (display->display, TermWin.pixmap);	2477	XFreePixmap (disp, TermWin.pixmap);
2436	TermWin.pixmap = None;	2478	TermWin.pixmap = None;
2437	}	2479	}
2438	}	2480	}
2439		2481
2440	am_pixmap_trans = 0;	2482	am_pixmap_trans = 0;
2441	}	2483	}
2442	else	2484	else
2443	{	2485	{
2444	if (TermWin.pixmap != None)	2486	if (TermWin.pixmap != None)
2445	XFreePixmap (display->display, TermWin.pixmap);	2487	XFreePixmap (disp, TermWin.pixmap);
2446		2488
2447	#if TINTING	2489	#if TINTING
2448	if (ISSET_PIXCOLOR (Color_tint))	2490	if (ISSET_PIXCOLOR (Color_tint))
2449	{	2491	{
2450	unsigned short rm, gm, bm;	2492	unsigned short rm, gm, bm;
…		…
2454		2496
2455	ShadeXImage (display, image, shade, rm, gm, bm);	2497	ShadeXImage (display, image, shade, rm, gm, bm);
2456	}	2498	}
2457	#endif	2499	#endif
2458		2500
2459	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2501	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2460	szHint.width, szHint.height, image->depth);	2502	szHint.width, szHint.height, image->depth);
2461	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2503	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2462	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2504	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2463	nx, ny, image->width, image->height);	2505	nx, ny, image->width, image->height);
2464	XFreeGC (display->display, gc);	2506	XFreeGC (disp, gc);
2465	XDestroyImage (image);	2507	XDestroyImage (image);
2466	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2508	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2467	XClearWindow (display->display, TermWin.parent[0]);	2509	XClearWindow (disp, TermWin.parent[0]);
2468		2510
2469	if (!am_transparent \|\| !am_pixmap_trans)	2511	if (!am_transparent \|\| !am_pixmap_trans)
2470	pchanged = 1;	2512	pchanged = 1;
2471		2513
2472	am_transparent = am_pixmap_trans = 1;	2514	am_transparent = am_pixmap_trans = 1;
2473	}	2515	}
2474	}	2516	}
2475		2517
2476	if (!am_pixmap_trans)	2518	if (am_pixmap_trans)
		2519	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2520	else
2477	{	2521	{
2478	unsigned int n;	2522	unsigned int n;
2479	/*	2523	/*
2480	* InheritPixmap transparency	2524	* InheritPixmap transparency
2481	*/	2525	*/
2482	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2526	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2483	{	2527	{
2484	oldp = TermWin.parent[i];	2528	oldp = TermWin.parent[i];
2485	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2529	XQueryTree (disp, TermWin.parent[i - 1], &root,
2486	&TermWin.parent[i], &list, &n);	2530	&TermWin.parent[i], &list, &n);
2487	XFree (list);	2531	XFree (list);
2488		2532
2489	if (TermWin.parent[i] == display->root)	2533	if (TermWin.parent[i] == display->root)
2490	{	2534	{
…		…
2502		2546
2503	if (pchanged)	2547	if (pchanged)
2504	{	2548	{
2505	for (; n < (unsigned int)i; n++)	2549	for (; n < (unsigned int)i; n++)
2506	{	2550	{
2507	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2551	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2508	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2552	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2509	{	2553	{
2510	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2554	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2511	break;	2555	break;
2512	}	2556	}
2513	}	2557	}
2514	}	2558	}
2515		2559
2516	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2560	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2517	{	2561	{
2518	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2562	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2519	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2563	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2520	am_transparent = 0;	2564	am_transparent = 0;
2521	/* XXX: also turn off Opt_transparent? */	2565	/* XXX: also turn off Opt_transparent? */
2522	}	2566	}
2523	else	2567	else
2524	{	2568	{
…		…
2527	* needed for fvwm2.2.2 (and before?) */	2571	* needed for fvwm2.2.2 (and before?) */
2528	sleep (1);	2572	sleep (1);
2529	#endif	2573	#endif
2530	for (n = 0; n < (unsigned int)i; n++)	2574	for (n = 0; n < (unsigned int)i; n++)
2531	{	2575	{
2532	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2576	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2533	XClearWindow (display->display, TermWin.parent[n]);	2577	XClearWindow (disp, TermWin.parent[n]);
2534	}	2578	}
2535		2579
2536	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2580	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2537	am_transparent = 1;	2581	am_transparent = 1;
2538	}	2582	}
2539		2583
2540	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2584	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2541	TermWin.parent[i] = None;	2585	TermWin.parent[i] = None;
2542	}	2586	}
2543		2587
2544	if (scrollBar.win)	2588	if (scrollBar.win)
2545	{	2589	{
2546	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2590	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2547	scrollBar.setIdle ();	2591	scrollBar.setIdle ();
2548	scrollbar_show (0);	2592	scrollbar_show (0);
		2593	}
		2594
		2595	if (am_transparent)
		2596	{
		2597	want_refresh = want_full_refresh = 1;
		2598	if (am_pixmap_trans)
		2599	flush ();
2549	}	2600	}
2550		2601
2551	return pchanged;	2602	return pchanged;
2552	}	2603	}
2553	#endif	2604	#endif
…		…
2582	// some window managers resize the window early, and these programs	2633	// some window managers resize the window early, and these programs
2583	// then sometimes get the size wrong.	2634	// then sometimes get the size wrong.
2584	// unfortunately other programs are even more buggy and dislike	2635	// unfortunately other programs are even more buggy and dislike
2585	// being sent SIGWINCH, so only do it when we were in fact being	2636	// being sent SIGWINCH, so only do it when we were in fact being
2586	// resized.	2637	// resized.
2587	if (seen_resize)	2638	if (seen_resize && cmd_pid)
2588	kill (-cmd_pid, SIGWINCH);	2639	kill (-cmd_pid, SIGWINCH);
2589	}	2640	}
2590		2641
2591	/* Read a text string from the input buffer */	2642	/* Read a text string from the input buffer */
2592	unicode_t buf[UBUFSIZ];	2643	unicode_t buf[UBUFSIZ];
…		…
2705	if (len == (size_t)-1)	2756	if (len == (size_t)-1)
2706	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2757	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707		2758
2708	// assume wchar == unicode	2759	// assume wchar == unicode
2709	cmdbuf_ptr += len;	2760	cmdbuf_ptr += len;
2710	return wc;	2761	return wc & UNICODE_MASK;
2711	}	2762	}
2712		2763
2713	return NOCHAR;	2764	return NOCHAR;
2714	}	2765	}
2715		2766
…		…
3178	{	3229	{
3179	switch (priv)	3230	switch (priv)
3180	{	3231	{
3181	case '>':	3232	case '>':
3182	if (ch == CSI_DA) /* secondary device attributes */	3233	if (ch == CSI_DA) /* secondary device attributes */
3183	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3234	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3184	break;	3235	break;
3185	case '?':	3236	case '?':
3186	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3237	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3187	process_terminal_mode (ch, priv, nargs, arg);	3238	process_terminal_mode (ch, priv, nargs, arg);
3188	break;	3239	break;
…		…
3417	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3468	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418	{	3469	{
3419	int x, y;	3470	int x, y;
3420	XWindowAttributes wattr;	3471	XWindowAttributes wattr;
3421	Window wdummy;	3472	Window wdummy;
		3473	dDisp;
3422		3474
3423	if (nargs == 0)	3475	if (nargs == 0)
3424	return;	3476	return;
3425		3477
3426	switch (args[0])	3478	switch (args[0])
3427	{	3479	{
3428	/*	3480	/*
3429	* commands	3481	* commands
3430	*/	3482	*/
3431	case 1: /* deiconify window */	3483	case 1: /* deiconify window */
3432	XMapWindow (display->display, TermWin.parent[0]);	3484	XMapWindow (disp, TermWin.parent[0]);
3433	break;	3485	break;
3434	case 2: /* iconify window */	3486	case 2: /* iconify window */
3435	XIconifyWindow (display->display, TermWin.parent[0],	3487	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3436	DefaultScreen (display->display));
3437	break;	3488	break;
3438	case 3: /* set position (pixels) */	3489	case 3: /* set position (pixels) */
3439	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3490	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3440	break;	3491	break;
3441	case 4: /* set size (pixels) */	3492	case 4: /* set size (pixels) */
3442	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3493	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443	break;	3494	break;
3444	case 5: /* raise window */	3495	case 5: /* raise window */
3445	XRaiseWindow (display->display, TermWin.parent[0]);	3496	XRaiseWindow (disp, TermWin.parent[0]);
3446	break;	3497	break;
3447	case 6: /* lower window */	3498	case 6: /* lower window */
3448	XLowerWindow (display->display, TermWin.parent[0]);	3499	XLowerWindow (disp, TermWin.parent[0]);
3449	break;	3500	break;
3450	case 7: /* refresh window */	3501	case 7: /* refresh window */
3451	scr_touch (true);	3502	scr_touch (true);
3452	break;	3503	break;
3453	case 8: /* set size (chars) */	3504	case 8: /* set size (chars) */
…		…
3465		3516
3466	/*	3517	/*
3467	* reports - some output format copied from XTerm	3518	* reports - some output format copied from XTerm
3468	*/	3519	*/
3469	case 11: /* report window state */	3520	case 11: /* report window state */
3470	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3521	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3471	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3522	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472	break;	3523	break;
3473	case 13: /* report window position */	3524	case 13: /* report window position */
3474	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3525	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3475	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3526	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3476	-wattr.border_width, -wattr.border_width,	3527	-wattr.border_width, -wattr.border_width,
3477	&x, &y, &wdummy);	3528	&x, &y, &wdummy);
3478	tt_printf ("\033[3;%d;%dt", x, y);	3529	tt_printf ("\033[3;%d;%dt", x, y);
3479	break;	3530	break;
3480	case 14: /* report window size (pixels) */	3531	case 14: /* report window size (pixels) */
3481	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3532	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3482	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3533	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483	break;	3534	break;
3484	case 18: /* report text area size (chars) */	3535	case 18: /* report text area size (chars) */
3485	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3536	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3486	break;	3537	break;
…		…
3488	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3539	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3489	break;	3540	break;
3490	case 20: /* report icon label */	3541	case 20: /* report icon label */
3491	{	3542	{
3492	char *s;	3543	char *s;
3493	XGetIconName (display->display, TermWin.parent[0], &s);	3544	XGetIconName (disp, TermWin.parent[0], &s);
3494	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3545	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495	XFree (s);	3546	XFree (s);
3496	}	3547	}
3497	break;	3548	break;
3498	case 21: /* report window title */	3549	case 21: /* report window title */
3499	{	3550	{
3500	char *s;	3551	char *s;
3501	XFetchName (display->display, TermWin.parent[0], &s);	3552	XFetchName (disp, TermWin.parent[0], &s);
3502	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3553	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503	XFree (s);	3554	XFree (s);
3504	}	3555	}
3505	break;	3556	break;
3506	}	3557	}
…		…
3513	* ends_how is terminator used. returned input must be free()'d	3564	* ends_how is terminator used. returned input must be free()'d
3514	*/	3565	*/
3515	unsigned char *	3566	unsigned char *
3516	rxvt_term::get_to_st (unicode_t &ends_how)	3567	rxvt_term::get_to_st (unicode_t &ends_how)
3517	{	3568	{
3518	unicode_t seen_esc = 0, ch;	3569	unicode_t ch;
		3570	bool seen_esc = false;
3519	unsigned int n = 0;	3571	unsigned int n = 0;
3520	unsigned char *s;
3521	unsigned char string[STRING_MAX];	3572	wchar_t string[STRING_MAX];
3522		3573
3523	while ((ch = cmd_getc ()) != NOCHAR)	3574	while ((ch = cmd_getc ()) != NOCHAR)
3524	{	3575	{
3525	if (seen_esc)	3576	if (seen_esc)
3526	{	3577	{
…		…
3529	else	3580	else
3530	return NULL;	3581	return NULL;
3531	}	3582	}
3532	else if (ch == C0_ESC)	3583	else if (ch == C0_ESC)
3533	{	3584	{
3534	seen_esc = 1;	3585	seen_esc = true;
3535	continue;	3586	continue;
3536	}	3587	}
3537	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3588	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3538	break;	3589	break;
3539	else if (ch < 0x20)	3590	else if (ch < 0x20)
3540	return NULL; /* other control character - exit */	3591	return NULL; /* other control character - exit */
3541		3592
3542	seen_esc = 0;	3593	seen_esc = false;
3543		3594
3544	if (n >= sizeof (string) - 1)	3595	if (n >= STRING_MAX - 1)
3545	// stop at some sane length	3596	// stop at some sane length
3546	return NULL;	3597	return NULL;
3547		3598
3548	if (ch == C0_SYN)	3599	if (ch == C0_SYN)
3549	string[n++] = cmd_get8 ();	3600	string[n++] = cmd_get8 ();
…		…
3551	string[n++] = ch;	3602	string[n++] = ch;
3552	}	3603	}
3553		3604
3554	string[n++] = '\0';	3605	string[n++] = '\0';
3555		3606
3556	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557	return NULL;
3558
3559	ends_how = (ch == 0x5c ? C0_ESC : ch);	3607	ends_how = (ch == 0x5c ? C0_ESC : ch);
3560	strncpy (s, string, n);	3608
3561	return s;	3609	return (unsigned char *)rxvt_wcstombs (string);
3562	}	3610	}
3563		3611
3564	/----------------------------------------------------------------------/	3612	/----------------------------------------------------------------------/
3565	/*	3613	/*
3566	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3614	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
…		…
3620	set_window_color (color, str);	3668	set_window_color (color, str);
3621	}	3669	}
3622		3670
3623	/*	3671	/*
3624	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3672	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3625	* 0 = change iconName/title
3626	* 1 = change iconName
3627	* 2 = change title
3628	* 4 = change color
3629	* 10 = change fg color
3630	* 11 = change bg color
3631	* 12 = change text color
3632	* 13 = change mouse foreground color
3633	* 17 = change highlight character colour
3634	* 18 = change bold character color
3635	* 19 = change underlined character color
3636	* 46 = change logfile (not implemented)
3637	* 50 = change font
3638	*
3639	* rxvt extensions:
3640	* 20 = bg pixmap
3641	* 39 = change default fg color
3642	* 49 = change default bg color
3643	* 55 = dump scrollback buffer and all of screen
3644	* 701 = change locale
3645	* 702 = find font
3646	* 703 = menu
3647	*/	3673	*/
3648	void	3674	void
3649	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3675	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3650	{	3676	{
3651	int changed = 0;	3677	int changed = 0;
3652	int color;	3678	int color;
3653	char buf, name;	3679	char buf, name;
3654	bool query = str[0] == '?' && !str[1];	3680	bool query = str[0] == '?' && !str[1];
3655	int saveop = op;	3681	int saveop = op;
		3682	dDisp;
3656		3683
3657	assert (str != NULL);	3684	assert (str != NULL);
3658	switch (op)	3685	switch (op)
3659	{	3686	{
3660	case XTerm_name:	3687	case XTerm_name:
…		…
3667	set_title (str);	3694	set_title (str);
3668	break;	3695	break;
3669	case XTerm_property:	3696	case XTerm_property:
3670	if (str[0] == '?')	3697	if (str[0] == '?')
3671	{	3698	{
3672	Atom prop = XInternAtom (display->display, str + 1, True);	3699	Atom prop = display->atom (str + 1);
3673	Atom actual_type;	3700	Atom actual_type;
3674	int actual_format;	3701	int actual_format;
3675	unsigned long nitems;	3702	unsigned long nitems;
3676	unsigned long bytes_after;	3703	unsigned long bytes_after;
3677	unsigned char *value = 0;	3704	unsigned char *value = 0;
3678	const char *str = "";	3705	const char *str = "";
3679		3706
3680	if (prop	3707	if (prop
3681	&& XGetWindowProperty (display->display, TermWin.parent[0],	3708	&& XGetWindowProperty (disp, TermWin.parent[0],
3682	prop, 0, 1<<16, 0, AnyPropertyType,	3709	prop, 0, 1<<16, 0, AnyPropertyType,
3683	&actual_type, &actual_format,	3710	&actual_type, &actual_format,
3684	&nitems, &bytes_after, &value) == Success	3711	&nitems, &bytes_after, &value) == Success
3685	&& actual_type != None	3712	&& actual_type != None
3686	&& actual_format == 8)	3713	&& actual_format == 8)
…		…
3695	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3722	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696		3723
3697	if (eq)	3724	if (eq)
3698	{	3725	{
3699	*eq = 0;	3726	*eq = 0;
3700	XChangeProperty (display->display, TermWin.parent[0],	3727	set_utf8_property (display->atom (str), eq + 1);
3701	display->atom (str), XA_STRING, 8,
3702	PropModeReplace, (unsigned char *)eq + 1,
3703	strlen (eq + 1));
3704	}	3728	}
3705	else	3729	else
3706	XDeleteProperty (display->display, TermWin.parent[0],	3730	XDeleteProperty (disp, TermWin.parent[0],
3707	display->atom (str));	3731	display->atom (str));
3708	}	3732	}
3709	break;	3733	break;
3710		3734
3711	case XTerm_Color:	3735	case XTerm_Color:
…		…
3752	break;	3776	break;
3753	#ifndef NO_BOLD_UNDERLINE_REVERSE	3777	#ifndef NO_BOLD_UNDERLINE_REVERSE
3754	case XTerm_Color_BD:	3778	case XTerm_Color_BD:
3755	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3779	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756	break;	3780	break;
3757	case XTerm_Color_IT:
3758	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3759	break;
3760	case XTerm_Color_UL:	3781	case XTerm_Color_UL:
3761	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3782	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3762	break;	3783	break;
3763	case XTerm_Color_RV:	3784	case XTerm_Color_RV:
3764	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3785	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3765	break;	3786	break;
		3787	case URxvt_Color_IT:
		3788	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3789	break;
3766	#endif	3790	#endif
3767	#if TRANSPARENT && TINTING	3791	#if TRANSPARENT && TINTING
3768	case XTerm_Color_tint:	3792	case URxvt_Color_tint:
3769	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3793	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3770	check_our_parents ();	3794	check_our_parents ();
3771	if (am_transparent)	3795	if (am_transparent)
3772	want_full_refresh = want_refresh = 1;	3796	want_full_refresh = want_refresh = 1;
3773	break;	3797	break;
3774	#endif	3798	#endif
…		…
3786	{	3810	{
3787	str++;	3811	str++;
3788	#if XPM_BACKGROUND	3812	#if XPM_BACKGROUND
3789	changed += scale_pixmap (str);	3813	changed += scale_pixmap (str);
3790	#endif	3814	#endif
3791
3792	}	3815	}
		3816
3793	if (changed)	3817	if (changed)
3794	{	3818	{
3795	#ifdef XPM_BACKGROUND	3819	#ifdef XPM_BACKGROUND
3796	resize_pixmap ();	3820	resize_pixmap ();
3797	#endif	3821	#endif
…		…
3808		3832
3809	case XTerm_logfile:	3833	case XTerm_logfile:
3810	// TODO, when secure mode?	3834	// TODO, when secure mode?
3811	break;	3835	break;
3812		3836
		3837	#ifdef MENUBAR
		3838	case URxvt_Menu:
		3839	if (options & Opt_insecure)
		3840	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3841	break;
		3842	#endif
		3843	#if 0
		3844	case XTerm_dumpscreen: /* no error notices */
		3845	{
		3846	int fd;
		3847	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
		3848	{
		3849	scr_dump (fd);
		3850	close (fd);
		3851	}
		3852	}
		3853	break;
		3854	#endif
3813	case XTerm_font:	3855	case XTerm_font:
3814	op = URxvt_font;	3856	op = URxvt_font;
3815	case URxvt_font:	3857	case URxvt_font:
3816	#if ENABLE_STYLES	3858	#if ENABLE_STYLES
3817	case URxvt_boldFont:	3859	case URxvt_boldFont:
…		…
3832	set_fonts ();	3874	set_fonts ();
3833	}	3875	}
3834	break;	3876	break;
3835		3877
3836	#if ENABLE_FRILLS	3878	#if ENABLE_FRILLS
3837	case XTerm_locale:	3879	case URxvt_locale:
3838	if (query)	3880	if (query)
3839	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3881	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3840	else	3882	else
3841	{	3883	{
3842	set_locale (str);	3884	set_locale (str);
3843	# ifdef USE_XIM	3885	pty.set_utf8_mode (enc_utf8);
3844	im_cb ();	3886	init_xlocale ();
3845	# endif
3846	}	3887	}
3847	break;	3888	break;
3848	#endif
3849		3889
3850	#ifdef MENUBAR	3890	case URxvt_view_up:
3851	case XTerm_Menu:	3891	case URxvt_view_down:
3852	if (options & Opt_insecure)	3892	int lines = atoi (str);
3853	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3893
3854	break;	3894	if (lines)
3855	#endif	3895	scr_page (op == URxvt_view_up ? UP : DN, lines);
3856	#if 0
3857	case XTerm_dumpscreen: /* no error notices */
3858	{	3896	else
3859	int fd;
3860	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3861	{	3897	{
3862	scr_dump (fd);	3898	scr_erase_savelines ();
3863	close (fd);
3864	}	3899	}
3865	}	3900
3866	break;	3901	break;
3867	#endif	3902	#endif
3868	}	3903	}
3869	}	3904	}
3870	/----------------------------------------------------------------------/	3905	/----------------------------------------------------------------------/
…		…
4285		4320
4286	/* ---------------------------------------------------------------------- */	4321	/* ---------------------------------------------------------------------- */
4287	/* Write data to the pty as typed by the user, pasted with the mouse,	4322	/* Write data to the pty as typed by the user, pasted with the mouse,
4288	* or generated by us in response to a query ESC sequence.	4323	* or generated by us in response to a query ESC sequence.
4289	*/	4324	*/
		4325	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4326
4290	void	4327	void
4291	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4328	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292	{	4329	{
4293	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4330	if (v_buflen == 0)
		4331	{
		4332	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4294		4333
4295	if (len)	4334	if ((unsigned int)written == len)
		4335	return;
		4336
		4337	data += written;
		4338	len -= written;
4296	{	4339	}
		4340
		4341	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4342
		4343	memcpy (v_buffer + v_buflen, data, len);
		4344	v_buflen += len;
		4345
		4346	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		4347	}
		4348
		4349	void rxvt_term::pty_write ()
		4350	{
		4351	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4352
		4353	if (written > 0)
		4354	{
		4355	v_buflen -= written;
		4356
4297	if (v_buflen == 0)	4357	if (v_buflen == 0)
4298	{	4358	{
4299	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301	if ((unsigned int)written == len)
4302	return;
4303
4304	data += written;
4305	len -= written;
4306	}
4307
4308
4309	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311	memcpy (v_buffer + v_buflen, data, len);
4312	v_buflen += len;
4313	}
4314
4315	for (;;)
4316	{
4317	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319	if (written > 0)
4320	{
4321	v_buflen -= written;
4322
4323	if (v_buflen == 0)
4324	{
4325	free (v_buffer);	4359	free (v_buffer);
4326	v_buffer = 0;	4360	v_buffer = 0;
4327	v_buflen = 0;	4361	v_buflen = 0;
4328		4362
4329	pty_ev.set (EVENT_READ);	4363	pty_ev.set (EVENT_READ);
4330	return;
4331	}
4332
4333	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}
4335	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4336	// original code just ignores this...
4337	destroy ();
4338	else
4339	{
4340	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4341	return;	4364	return;
4342	}	4365	}
		4366
		4367	memmove (v_buffer, v_buffer + written, v_buflen);
4343	}	4368	}
		4369	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4370	// original code just ignores this...
		4371	destroy ();
4344	}	4372	}
4345		4373
4346	/----------------------- end-of-file (C source) -----------------------/	4374	/----------------------- end-of-file (C source) -----------------------/
4347		4375

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs. Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC