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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.176 by root, Mon Dec 13 01:29:03 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)
…		…
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	set_string_property (XA_CUT_BUFFER0, data);	1377	set_string_property (XA_CUT_BUFFER0, data);
1340	XFree (data);	1378	XFree (data);
1341	selection_paste (display->root, XA_CUT_BUFFER0, true);	1379	selection_paste (display->root, XA_CUT_BUFFER0, true);
1342	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1380	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343	}	1381	}
1344	#endif /* OFFIX_DND */	1382	#endif /* OFFIX_DND */
1345	break;	1383	break;
1346		1384
1347	case MappingNotify:	1385	case MappingNotify:
…		…
1372	break;	1410	break;
1373	}	1411	}
1374	break;	1412	break;
1375		1413
1376	case FocusIn:	1414	case FocusIn:
1377	if (!TermWin.focus)	1415	focus_in ();
1378	{
1379	TermWin.focus = 1;
1380	want_refresh = 1;
1381	#ifdef USE_XIM
1382	if (Input_Context != NULL)
1383	{
1384	IMSetStatusPosition ();
1385	XSetICFocus (Input_Context);
1386	}
1387	#endif
1388	#ifdef CURSOR_BLINK
1389	if (options & Opt_cursorBlink)
1390	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391	#endif
1392	#ifdef OFF_FOCUS_FADING
1393	if (rs[Rs_fade])
1394	{
1395	pix_colors = pix_colors_focused;
1396	scr_recolour ();
1397	}
1398	#endif
1399
1400	}
1401	break;	1416	break;
1402		1417
1403	case FocusOut:	1418	case FocusOut:
1404	if (TermWin.focus)	1419	focus_out ();
1405	{
1406	TermWin.focus = 0;
1407	want_refresh = 1;
1408
1409	#if ENABLE_FRILLS \|\| ISO_14755
1410	iso14755buf = 0;
1411	#endif
1412	#if ENABLE_OVERLAY
1413	scr_overlay_off ();
1414	#endif
1415	#ifdef USE_XIM
1416	if (Input_Context != NULL)
1417	XUnsetICFocus (Input_Context);
1418	#endif
1419	#ifdef CURSOR_BLINK
1420	if (options & Opt_cursorBlink)
1421	cursor_blink_ev.stop ();
1422	hidden_cursor = 0;
1423	#endif
1424	#ifdef OFF_FOCUS_FADING
1425	if (rs[Rs_fade])
1426	{
1427	pix_colors = pix_colors_unfocused;
1428	scr_recolour ();
1429	}
1430	#endif
1431	}
1432	break;	1420	break;
1433		1421
1434	case ConfigureNotify:	1422	case ConfigureNotify:
1435	if (ev.xconfigure.window == TermWin.parent[0])	1423	if (ev.xconfigure.window == TermWin.parent[0])
1436	{	1424	{
…		…
1440	{ /* Wrap lots of configures into one */	1428	{ /* Wrap lots of configures into one */
1441	width = ev.xconfigure.width;	1429	width = ev.xconfigure.width;
1442	height = ev.xconfigure.height;	1430	height = ev.xconfigure.height;
1443	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1431	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444	}	1432	}
1445	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1433	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1446		1434
1447	if (szHint.width != width \|\| szHint.height != height)	1435	if (szHint.width != width \|\| szHint.height != height)
1448	{	1436	{
1449	seen_resize = 1;	1437	seen_resize = 1;
1450	resize_all_windows (width, height, 1);	1438	resize_all_windows (width, height, 1);
…		…
1502	if (ev.xany.window == TermWin.vt)	1490	if (ev.xany.window == TermWin.vt)
1503	{	1491	{
1504	do	1492	do
1505	scr_expose (ev.xexpose.x, ev.xexpose.y,	1493	scr_expose (ev.xexpose.x, ev.xexpose.y,
1506	ev.xexpose.width, ev.xexpose.height, False);	1494	ev.xexpose.width, ev.xexpose.height, False);
1507	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1495	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1508		1496
1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1497	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510		1498
1511	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1499	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1512	scr_expose (ev.xexpose.x, ev.xexpose.y,	1500	scr_expose (ev.xexpose.x, ev.xexpose.y,
1513	ev.xexpose.width, ev.xexpose.height, False);	1501	ev.xexpose.width, ev.xexpose.height, False);
1514		1502
1515	scr_refresh (refresh_type);	1503	scr_refresh (refresh_type);
1516	}	1504	}
1517	else	1505	else
1518	{	1506	{
1519	XEvent unused_event;	1507	XEvent unused_event;
1520		1508
1521	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1509	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1522	;	1510	;
1523	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1511	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1524	;	1512	;
1525		1513
1526	if (isScrollbarWindow (ev.xany.window))	1514	if (isScrollbarWindow (ev.xany.window))
1527	{	1515	{
1528	scrollBar.setIdle ();	1516	scrollBar.setIdle ();
…		…
1533	menubar_expose ();	1521	menubar_expose ();
1534	#endif	1522	#endif
1535		1523
1536	#ifdef TRANSPARENT	1524	#ifdef TRANSPARENT
1537	if (am_transparent && ev.xany.window == TermWin.parent[0])	1525	if (am_transparent && ev.xany.window == TermWin.parent[0])
1538	XClearWindow (display->display, ev.xany.window);	1526	XClearWindow (disp, ev.xany.window);
1539	#endif	1527	#endif
1540	}	1528	}
1541	break;	1529	break;
1542		1530
1543	case MotionNotify:	1531	case MotionNotify:
…		…
1557		1545
1558	if (ev.xany.window == TermWin.vt)	1546	if (ev.xany.window == TermWin.vt)
1559	{	1547	{
1560	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1548	if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1561	{	1549	{
1562	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1550	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1563	;	1551	;
1564		1552
1565	XQueryPointer (display->display, TermWin.vt,	1553	XQueryPointer (disp, TermWin.vt,
1566	&unused_root, &unused_child,	1554	&unused_root, &unused_child,
1567	&unused_root_x, &unused_root_y,	1555	&unused_root_x, &unused_root_y,
1568	&ev.xbutton.x, &ev.xbutton.y,	1556	&ev.xbutton.x, &ev.xbutton.y,
1569	&ev.xbutton.state);	1557	&ev.xbutton.state);
1570	#ifdef MOUSE_THRESHOLD	1558	#ifdef MOUSE_THRESHOLD
…		…
1634	#endif	1622	#endif
1635	}	1623	}
1636	}	1624	}
1637	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1625	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638	{	1626	{
1639	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1627	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1640	MotionNotify, &ev))	1628	MotionNotify, &ev))
1641	;	1629	;
1642		1630
1643	XQueryPointer (display->display, scrollBar.win,	1631	XQueryPointer (disp, scrollBar.win,
1644	&unused_root, &unused_child,	1632	&unused_root, &unused_child,
1645	&unused_root_x, &unused_root_y,	1633	&unused_root_x, &unused_root_y,
1646	&ev.xbutton.x, &ev.xbutton.y,	1634	&ev.xbutton.x, &ev.xbutton.y,
1647	&unused_mask);	1635	&unused_mask);
1648	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1636	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1653	}	1641	}
1654	break;	1642	break;
1655	}	1643	}
1656	}	1644	}
1657		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
1658	#if TRANSPARENT	1707	#if TRANSPARENT
1659	void	1708	void
1660	rxvt_term::rootwin_cb (XEvent &ev)	1709	rxvt_term::rootwin_cb (XEvent &ev)
1661	{	1710	{
1662	SET_R (this);	1711	SET_R (this);
…		…
1667	case PropertyNotify:	1716	case PropertyNotify:
1668	/*	1717	/*
1669	* 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,
1670	* 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.
1671	*/	1720	*/
1672	if (xa[XA_XROOTPMAPID] == 0)
1673	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1674
1675	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])
1676	return;	1723	return;
1677		1724
1678	/* FALLTHROUGH */	1725	/* FALLTHROUGH */
1679	case ReparentNotify:	1726	case ReparentNotify:
1680	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1727	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1752	{	1799	{
1753	case Button1:	1800	case Button1:
1754	/* allow meta + click to select rectangular areas */	1801	/* allow meta + click to select rectangular areas */
1755	/* should be done in screen.C */	1802	/* should be done in screen.C */
1756	#if ENABLE_FRILLS	1803	#if ENABLE_FRILLS
1757	selection.rect = !! (ev.state & ModMetaMask);	1804	selection.rect = !!(ev.state & ModMetaMask);
1758	#else	1805	#else
1759	selection.rect = false;	1806	selection.rect = false;
1760	#endif	1807	#endif
1761		1808
1762	/* allow shift+left click to extend selection */	1809	/* allow shift+left click to extend selection */
…		…
2088	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2135	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2089	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2136	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2137	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091	int i;	2138	int i;
2092		2139
2093	Visual* visual = display->visual;	2140	Visual *visual = display->visual;
2094		2141
2095	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2142	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2096		2143
2097	/* for convenience */	2144	/* for convenience */
2098	mask_r = visual->red_mask;	2145	mask_r = visual->red_mask;
…		…
2319	Atom atype;	2366	Atom atype;
2320	unsigned char *prop = NULL;	2367	unsigned char *prop = NULL;
2321	Window root, oldp, *list;	2368	Window root, oldp, *list;
2322	Pixmap rootpixmap = None;	2369	Pixmap rootpixmap = None;
2323	XWindowAttributes wattr, wrootattr;	2370	XWindowAttributes wattr, wrootattr;
		2371	dDisp;
2324		2372
2325	pchanged = 0;	2373	pchanged = 0;
2326		2374
2327	if (!(options & Opt_transparent))	2375	if (!(options & Opt_transparent))
2328	return pchanged; /* Don't try any more */	2376	return pchanged; /* Don't try any more */
2329		2377
2330	XGetWindowAttributes (display->display, display->root, &wrootattr);	2378	XGetWindowAttributes (disp, display->root, &wrootattr);
2331	rootdepth = wrootattr.depth;	2379	rootdepth = wrootattr.depth;
2332		2380
2333	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2381	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2334		2382
2335	if (rootdepth != wattr.depth)	2383	if (rootdepth != wattr.depth)
2336	{	2384	{
2337	if (am_transparent)	2385	if (am_transparent)
2338	{	2386	{
2339	pchanged = 1;	2387	pchanged = 1;
2340	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2388	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2341	am_transparent = am_pixmap_trans = 0;	2389	am_transparent = am_pixmap_trans = 0;
2342	}	2390	}
2343		2391
2344	return pchanged; /* Don't try any more */	2392	return pchanged; /* Don't try any more */
2345	}	2393	}
2346		2394
2347	/* 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. */
2348	XSync (display->display, False);	2396	XSync (disp, False);
2349		2397
2350	/*	2398	/*
2351	* Make the frame window set by the window manager have	2399	* Make the frame window set by the window manager have
2352	* the root background. Some window managers put multiple nested frame	2400	* the root background. Some window managers put multiple nested frame
2353	* 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.
2354	*/	2402	*/
2355	i = (xa[XA_XROOTPMAPID]	2403	i = (xa[XA_XROOTPMAP_ID]
2356	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2404	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2357	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2405	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358	&nitems, &bytes_after, &prop) == Success);	2406	&nitems, &bytes_after, &prop) == Success);
2359		2407
2360	if (!i \|\| prop == NULL)	2408	if (!i \|\| prop == NULL)
2361	i = (xa[XA_XSETROOTID]	2409	i = (xa[XA_ESETROOT_PMAP_ID]
2362	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2410	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2363	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2411	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364	&nitems, &bytes_after, &prop) == Success);	2412	&nitems, &bytes_after, &prop) == Success);
2365		2413
2366	if (!i \|\| prop == NULL	2414	if (!i \|\| prop == NULL
2367	#if TINTING	2415	#if TINTING
…		…
2386	Window cr;	2434	Window cr;
2387	XImage *image;	2435	XImage *image;
2388	GC gc;	2436	GC gc;
2389	XGCValues gcvalue;	2437	XGCValues gcvalue;
2390		2438
2391	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2439	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2392	0, 0, &sx, &sy, &cr);	2440	0, 0, &sx, &sy, &cr);
2393	nw = (unsigned int)szHint.width;	2441	nw = (unsigned int)szHint.width;
2394	nh = (unsigned int)szHint.height;	2442	nh = (unsigned int)szHint.height;
2395	nx = ny = 0;	2443	nx = ny = 0;
2396		2444
…		…
2409	}	2457	}
2410		2458
2411	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2459	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2412	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2460	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413		2461
2414	XSync (display->display, False);	2462	XSync (disp, False);
2415	allowedxerror = -1;	2463	allowedxerror = -1;
2416	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2464	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417		2465
2418	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2466	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2419	/* XXX: may need a delay here? */	2467	/* XXX: may need a delay here? */
2420	allowedxerror = 0;	2468	allowedxerror = 0;
2421		2469
…		…
2424	if (am_transparent && am_pixmap_trans)	2472	if (am_transparent && am_pixmap_trans)
2425	{	2473	{
2426	pchanged = 1;	2474	pchanged = 1;
2427	if (TermWin.pixmap != None)	2475	if (TermWin.pixmap != None)
2428	{	2476	{
2429	XFreePixmap (display->display, TermWin.pixmap);	2477	XFreePixmap (disp, TermWin.pixmap);
2430	TermWin.pixmap = None;	2478	TermWin.pixmap = None;
2431	}	2479	}
2432	}	2480	}
2433		2481
2434	am_pixmap_trans = 0;	2482	am_pixmap_trans = 0;
2435	}	2483	}
2436	else	2484	else
2437	{	2485	{
2438	if (TermWin.pixmap != None)	2486	if (TermWin.pixmap != None)
2439	XFreePixmap (display->display, TermWin.pixmap);	2487	XFreePixmap (disp, TermWin.pixmap);
2440		2488
2441	#if TINTING	2489	#if TINTING
2442	if (ISSET_PIXCOLOR (Color_tint))	2490	if (ISSET_PIXCOLOR (Color_tint))
2443	{	2491	{
2444	unsigned short rm, gm, bm;	2492	unsigned short rm, gm, bm;
…		…
2448		2496
2449	ShadeXImage (display, image, shade, rm, gm, bm);	2497	ShadeXImage (display, image, shade, rm, gm, bm);
2450	}	2498	}
2451	#endif	2499	#endif
2452		2500
2453	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2501	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2454	szHint.width, szHint.height, image->depth);	2502	szHint.width, szHint.height, image->depth);
2455	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2503	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2456	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2504	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2457	nx, ny, image->width, image->height);	2505	nx, ny, image->width, image->height);
2458	XFreeGC (display->display, gc);	2506	XFreeGC (disp, gc);
2459	XDestroyImage (image);	2507	XDestroyImage (image);
2460	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2508	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2461	XClearWindow (display->display, TermWin.parent[0]);	2509	XClearWindow (disp, TermWin.parent[0]);
2462		2510
2463	if (!am_transparent \|\| !am_pixmap_trans)	2511	if (!am_transparent \|\| !am_pixmap_trans)
2464	pchanged = 1;	2512	pchanged = 1;
2465		2513
2466	am_transparent = am_pixmap_trans = 1;	2514	am_transparent = am_pixmap_trans = 1;
2467	}	2515	}
2468	}	2516	}
2469		2517
2470	if (am_pixmap_trans)	2518	if (am_pixmap_trans)
2471	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2519	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2472	else	2520	else
2473	{	2521	{
2474	unsigned int n;	2522	unsigned int n;
2475	/*	2523	/*
2476	* InheritPixmap transparency	2524	* InheritPixmap transparency
2477	*/	2525	*/
2478	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2526	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2479	{	2527	{
2480	oldp = TermWin.parent[i];	2528	oldp = TermWin.parent[i];
2481	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2529	XQueryTree (disp, TermWin.parent[i - 1], &root,
2482	&TermWin.parent[i], &list, &n);	2530	&TermWin.parent[i], &list, &n);
2483	XFree (list);	2531	XFree (list);
2484		2532
2485	if (TermWin.parent[i] == display->root)	2533	if (TermWin.parent[i] == display->root)
2486	{	2534	{
…		…
2498		2546
2499	if (pchanged)	2547	if (pchanged)
2500	{	2548	{
2501	for (; n < (unsigned int)i; n++)	2549	for (; n < (unsigned int)i; n++)
2502	{	2550	{
2503	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2551	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2504	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2552	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2505	{	2553	{
2506	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2554	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2507	break;	2555	break;
2508	}	2556	}
2509	}	2557	}
2510	}	2558	}
2511		2559
2512	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2560	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2513	{	2561	{
2514	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2562	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2515	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2563	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2516	am_transparent = 0;	2564	am_transparent = 0;
2517	/* XXX: also turn off Opt_transparent? */	2565	/* XXX: also turn off Opt_transparent? */
2518	}	2566	}
2519	else	2567	else
2520	{	2568	{
…		…
2523	* needed for fvwm2.2.2 (and before?) */	2571	* needed for fvwm2.2.2 (and before?) */
2524	sleep (1);	2572	sleep (1);
2525	#endif	2573	#endif
2526	for (n = 0; n < (unsigned int)i; n++)	2574	for (n = 0; n < (unsigned int)i; n++)
2527	{	2575	{
2528	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2576	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2529	XClearWindow (display->display, TermWin.parent[n]);	2577	XClearWindow (disp, TermWin.parent[n]);
2530	}	2578	}
2531		2579
2532	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2580	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2533	am_transparent = 1;	2581	am_transparent = 1;
2534	}	2582	}
2535		2583
2536	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2584	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2537	TermWin.parent[i] = None;	2585	TermWin.parent[i] = None;
2538	}	2586	}
2539		2587
2540	if (scrollBar.win)	2588	if (scrollBar.win)
2541	{	2589	{
2542	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2590	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2543	scrollBar.setIdle ();	2591	scrollBar.setIdle ();
2544	scrollbar_show (0);	2592	scrollbar_show (0);
2545	}	2593	}
2546		2594
2547	if (am_transparent)	2595	if (am_transparent)
…		…
2585	// some window managers resize the window early, and these programs	2633	// some window managers resize the window early, and these programs
2586	// then sometimes get the size wrong.	2634	// then sometimes get the size wrong.
2587	// unfortunately other programs are even more buggy and dislike	2635	// unfortunately other programs are even more buggy and dislike
2588	// 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
2589	// resized.	2637	// resized.
2590	if (seen_resize)	2638	if (seen_resize && cmd_pid)
2591	kill (-cmd_pid, SIGWINCH);	2639	kill (-cmd_pid, SIGWINCH);
2592	}	2640	}
2593		2641
2594	/* Read a text string from the input buffer */	2642	/* Read a text string from the input buffer */
2595	unicode_t buf[UBUFSIZ];	2643	unicode_t buf[UBUFSIZ];
…		…
2708	if (len == (size_t)-1)	2756	if (len == (size_t)-1)
2709	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
2710		2758
2711	// assume wchar == unicode	2759	// assume wchar == unicode
2712	cmdbuf_ptr += len;	2760	cmdbuf_ptr += len;
2713	return wc;	2761	return wc & UNICODE_MASK;
2714	}	2762	}
2715		2763
2716	return NOCHAR;	2764	return NOCHAR;
2717	}	2765	}
2718		2766
…		…
3181	{	3229	{
3182	switch (priv)	3230	switch (priv)
3183	{	3231	{
3184	case '>':	3232	case '>':
3185	if (ch == CSI_DA) /* secondary device attributes */	3233	if (ch == CSI_DA) /* secondary device attributes */
3186	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3234	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3187	break;	3235	break;
3188	case '?':	3236	case '?':
3189	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3237	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3190	process_terminal_mode (ch, priv, nargs, arg);	3238	process_terminal_mode (ch, priv, nargs, arg);
3191	break;	3239	break;
…		…
3420	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3468	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421	{	3469	{
3422	int x, y;	3470	int x, y;
3423	XWindowAttributes wattr;	3471	XWindowAttributes wattr;
3424	Window wdummy;	3472	Window wdummy;
		3473	dDisp;
3425		3474
3426	if (nargs == 0)	3475	if (nargs == 0)
3427	return;	3476	return;
3428		3477
3429	switch (args[0])	3478	switch (args[0])
3430	{	3479	{
3431	/*	3480	/*
3432	* commands	3481	* commands
3433	*/	3482	*/
3434	case 1: /* deiconify window */	3483	case 1: /* deiconify window */
3435	XMapWindow (display->display, TermWin.parent[0]);	3484	XMapWindow (disp, TermWin.parent[0]);
3436	break;	3485	break;
3437	case 2: /* iconify window */	3486	case 2: /* iconify window */
3438	XIconifyWindow (display->display, TermWin.parent[0],	3487	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3439	DefaultScreen (display->display));
3440	break;	3488	break;
3441	case 3: /* set position (pixels) */	3489	case 3: /* set position (pixels) */
3442	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3490	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3443	break;	3491	break;
3444	case 4: /* set size (pixels) */	3492	case 4: /* set size (pixels) */
3445	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3493	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446	break;	3494	break;
3447	case 5: /* raise window */	3495	case 5: /* raise window */
3448	XRaiseWindow (display->display, TermWin.parent[0]);	3496	XRaiseWindow (disp, TermWin.parent[0]);
3449	break;	3497	break;
3450	case 6: /* lower window */	3498	case 6: /* lower window */
3451	XLowerWindow (display->display, TermWin.parent[0]);	3499	XLowerWindow (disp, TermWin.parent[0]);
3452	break;	3500	break;
3453	case 7: /* refresh window */	3501	case 7: /* refresh window */
3454	scr_touch (true);	3502	scr_touch (true);
3455	break;	3503	break;
3456	case 8: /* set size (chars) */	3504	case 8: /* set size (chars) */
…		…
3468		3516
3469	/*	3517	/*
3470	* reports - some output format copied from XTerm	3518	* reports - some output format copied from XTerm
3471	*/	3519	*/
3472	case 11: /* report window state */	3520	case 11: /* report window state */
3473	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3521	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3474	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3522	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475	break;	3523	break;
3476	case 13: /* report window position */	3524	case 13: /* report window position */
3477	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3525	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3478	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3526	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3479	-wattr.border_width, -wattr.border_width,	3527	-wattr.border_width, -wattr.border_width,
3480	&x, &y, &wdummy);	3528	&x, &y, &wdummy);
3481	tt_printf ("\033[3;%d;%dt", x, y);	3529	tt_printf ("\033[3;%d;%dt", x, y);
3482	break;	3530	break;
3483	case 14: /* report window size (pixels) */	3531	case 14: /* report window size (pixels) */
3484	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3532	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3485	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3533	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486	break;	3534	break;
3487	case 18: /* report text area size (chars) */	3535	case 18: /* report text area size (chars) */
3488	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3536	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3489	break;	3537	break;
…		…
3491	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3539	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3492	break;	3540	break;
3493	case 20: /* report icon label */	3541	case 20: /* report icon label */
3494	{	3542	{
3495	char *s;	3543	char *s;
3496	XGetIconName (display->display, TermWin.parent[0], &s);	3544	XGetIconName (disp, TermWin.parent[0], &s);
3497	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 */
3498	XFree (s);	3546	XFree (s);
3499	}	3547	}
3500	break;	3548	break;
3501	case 21: /* report window title */	3549	case 21: /* report window title */
3502	{	3550	{
3503	char *s;	3551	char *s;
3504	XFetchName (display->display, TermWin.parent[0], &s);	3552	XFetchName (disp, TermWin.parent[0], &s);
3505	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 */
3506	XFree (s);	3554	XFree (s);
3507	}	3555	}
3508	break;	3556	break;
3509	}	3557	}
…		…
3542	else if (ch < 0x20)	3590	else if (ch < 0x20)
3543	return NULL; /* other control character - exit */	3591	return NULL; /* other control character - exit */
3544		3592
3545	seen_esc = false;	3593	seen_esc = false;
3546		3594
3547	if (n >= sizeof (string) - 1)	3595	if (n >= STRING_MAX - 1)
3548	// stop at some sane length	3596	// stop at some sane length
3549	return NULL;	3597	return NULL;
3550		3598
3551	if (ch == C0_SYN)	3599	if (ch == C0_SYN)
3552	string[n++] = cmd_get8 ();	3600	string[n++] = cmd_get8 ();
…		…
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:
…		…
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)
…		…
3698	{	3725	{
3699	*eq = 0;	3726	*eq = 0;
3700	set_utf8_property (display->atom (str), eq + 1);	3727	set_utf8_property (display->atom (str), eq + 1);
3701	}	3728	}
3702	else	3729	else
3703	XDeleteProperty (display->display, TermWin.parent[0],	3730	XDeleteProperty (disp, TermWin.parent[0],
3704	display->atom (str));	3731	display->atom (str));
3705	}	3732	}
3706	break;	3733	break;
3707		3734
3708	case XTerm_Color:	3735	case XTerm_Color:
…		…
3749	break;	3776	break;
3750	#ifndef NO_BOLD_UNDERLINE_REVERSE	3777	#ifndef NO_BOLD_UNDERLINE_REVERSE
3751	case XTerm_Color_BD:	3778	case XTerm_Color_BD:
3752	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3779	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3753	break;	3780	break;
3754	case XTerm_Color_IT:
3755	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756	break;
3757	case XTerm_Color_UL:	3781	case XTerm_Color_UL:
3758	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3782	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3759	break;	3783	break;
3760	case XTerm_Color_RV:	3784	case XTerm_Color_RV:
3761	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3785	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762	break;	3786	break;
		3787	case URxvt_Color_IT:
		3788	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3789	break;
3763	#endif	3790	#endif
3764	#if TRANSPARENT && TINTING	3791	#if TRANSPARENT && TINTING
3765	case XTerm_Color_tint:	3792	case URxvt_Color_tint:
3766	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3793	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3767	check_our_parents ();	3794	check_our_parents ();
3768	if (am_transparent)	3795	if (am_transparent)
3769	want_full_refresh = want_refresh = 1;	3796	want_full_refresh = want_refresh = 1;
3770	break;	3797	break;
3771	#endif	3798	#endif
…		…
3783	{	3810	{
3784	str++;	3811	str++;
3785	#if XPM_BACKGROUND	3812	#if XPM_BACKGROUND
3786	changed += scale_pixmap (str);	3813	changed += scale_pixmap (str);
3787	#endif	3814	#endif
3788
3789	}	3815	}
		3816
3790	if (changed)	3817	if (changed)
3791	{	3818	{
3792	#ifdef XPM_BACKGROUND	3819	#ifdef XPM_BACKGROUND
3793	resize_pixmap ();	3820	resize_pixmap ();
3794	#endif	3821	#endif
…		…
3805		3832
3806	case XTerm_logfile:	3833	case XTerm_logfile:
3807	// TODO, when secure mode?	3834	// TODO, when secure mode?
3808	break;	3835	break;
3809		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
3810	case XTerm_font:	3855	case XTerm_font:
3811	op = URxvt_font;	3856	op = URxvt_font;
3812	case URxvt_font:	3857	case URxvt_font:
3813	#if ENABLE_STYLES	3858	#if ENABLE_STYLES
3814	case URxvt_boldFont:	3859	case URxvt_boldFont:
…		…
3829	set_fonts ();	3874	set_fonts ();
3830	}	3875	}
3831	break;	3876	break;
3832		3877
3833	#if ENABLE_FRILLS	3878	#if ENABLE_FRILLS
3834	case XTerm_locale:	3879	case URxvt_locale:
3835	if (query)	3880	if (query)
3836	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);
3837	else	3882	else
3838	{	3883	{
3839	set_locale (str);	3884	set_locale (str);
3840	# ifdef USE_XIM	3885	pty.set_utf8_mode (enc_utf8);
3841	im_cb ();	3886	init_xlocale ();
3842	# endif
3843	}	3887	}
3844	break;	3888	break;
3845	#endif
3846		3889
3847	#ifdef MENUBAR	3890	case URxvt_view_up:
3848	case XTerm_Menu:	3891	case URxvt_view_down:
3849	if (options & Opt_insecure)	3892	int lines = atoi (str);
3850	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3893
3851	break;	3894	if (lines)
3852	#endif	3895	scr_page (op == URxvt_view_up ? UP : DN, lines);
3853	#if 0
3854	case XTerm_dumpscreen: /* no error notices */
3855	{	3896	else
3856	int fd;
3857	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3858	{	3897	{
3859	scr_dump (fd);	3898	scr_erase_savelines ();
3860	close (fd);
3861	}	3899	}
3862	}	3900
3863	break;	3901	break;
3864	#endif	3902	#endif
3865	}	3903	}
3866	}	3904	}
3867	/----------------------------------------------------------------------/	3905	/----------------------------------------------------------------------/
…		…
4282		4320
4283	/* ---------------------------------------------------------------------- */	4321	/* ---------------------------------------------------------------------- */
4284	/* 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,
4285	* or generated by us in response to a query ESC sequence.	4323	* or generated by us in response to a query ESC sequence.
4286	*/	4324	*/
		4325	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4326
4287	void	4327	void
4288	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4328	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289	{	4329	{
4290	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));
4291		4333
4292	if (len)	4334	if ((unsigned int)written == len)
		4335	return;
		4336
		4337	data += written;
		4338	len -= written;
4293	{	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
4294	if (v_buflen == 0)	4357	if (v_buflen == 0)
4295	{	4358	{
4296	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298	if ((unsigned int)written == len)
4299	return;
4300
4301	data += written;
4302	len -= written;
4303	}
4304
4305
4306	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308	memcpy (v_buffer + v_buflen, data, len);
4309	v_buflen += len;
4310	}
4311
4312	for (;;)
4313	{
4314	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316	if (written > 0)
4317	{
4318	v_buflen -= written;
4319
4320	if (v_buflen == 0)
4321	{
4322	free (v_buffer);	4359	free (v_buffer);
4323	v_buffer = 0;	4360	v_buffer = 0;
4324	v_buflen = 0;	4361	v_buflen = 0;
4325		4362
4326	pty_ev.set (EVENT_READ);	4363	pty_ev.set (EVENT_READ);
4327	return;
4328	}
4329
4330	memmove (v_buffer, v_buffer + written, v_buflen);
4331	}
4332	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4333	// original code just ignores this...
4334	destroy ();
4335	else
4336	{
4337	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4338	return;	4364	return;
4339	}	4365	}
		4366
		4367	memmove (v_buffer, v_buffer + written, v_buflen);
4340	}	4368	}
		4369	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		4370	// original code just ignores this...
		4371	destroy ();
4341	}	4372	}
4342		4373
4343	/----------------------- end-of-file (C source) -----------------------/	4374	/----------------------- end-of-file (C source) -----------------------/
4344		4375

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.176 by root, Mon Dec 13 01:29:03 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.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC