ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.145 by root, Mon Aug 16 12:04:57 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
		57	#include <csignal>
54		58
55	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
56		60
57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58		62
…		…
113	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
114	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
115	XK_Print, 0x2399,	119	XK_Print, 0x2399,
116		120
117	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,
118	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
119	0,	131	0,
120	};	132	};
121		133
122	void	134	void
123	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
…		…
133	{	145	{
134	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
135		147
136	if (t != NOCHAR || !x)	148	if (t != NOCHAR || !x)
137	{	149	{
138	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]);	150	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
		151	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
139	iso14755buf = ISO_14755_54;	152	iso14755buf = ISO_14755_54;
140	break;	153	break;
141	}	154	}
142		155
143	x--;	156	x--;
…		…
146	}	159	}
147	#endif	160	#endif
148		161
149	#if ENABLE_OVERLAY	162	#if ENABLE_OVERLAY
150	void	163	void
151	rxvt_term::iso14755_51 (wchar_t ch)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
152	{	165	{
		166	rxvt_fontset *fs = FONTSET (r);
		167	rxvt_font *f = (*fs)[fs->find_font (ch)];
153	wchar_t *chr, *alloc;	168	wchar_t *chr, *alloc, ch2;
154	int len;	169	int len;
155		170
156	#if ENABLE_COMBINING	171	#if ENABLE_COMBINING
157	if (IS_COMPOSE (ch))	172	if (IS_COMPOSE (ch))
158	{	173	{
…		…
161	rxvt_composite.expand (ch, chr);	176	rxvt_composite.expand (ch, chr);
162	}	177	}
163	else	178	else
164	#endif	179	#endif
165	{	180	{
		181	ch2 = ch;
		182
166	alloc = 0;	183	alloc = 0;
167	chr = &ch;	184	chr = &ch2;
168	len = 1;	185	len = 1;
169	}	186	}
170		187
171	scr_overlay_new (0, -1, 8 + 5, len);	188	int width = strlen (f->name);
		189
		190	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
		191
		192	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172		193
173	for (int y = 0; y < len; y++)	194	for (int y = 0; y < len; y++)
174	{	195	{
175	char buf[9];	196	char buf[9];
176		197
…		…
181	scr_overlay_set (9, y, '=');	202	scr_overlay_set (9, y, '=');
182	#if !UNICODE3	203	#if !UNICODE3
183	if (ch >= 0x10000)	204	if (ch >= 0x10000)
184	ch = 0xfffd;	205	ch = 0xfffd;
185	#endif	206	#endif
186	scr_overlay_set (11, y, ch);	207	scr_overlay_set (11, y, ch, r);
187	scr_overlay_set (12, y, NOCHAR);	208	scr_overlay_set (12, y, NOCHAR, r);
188	}	209	}
		210
		211	scr_overlay_set (0, len, f->name);
189		212
190	#if ENABLE_COMBINING	213	#if ENABLE_COMBINING
191	if (alloc)	214	if (alloc)
192	delete [] alloc;	215	delete [] alloc;
193	#endif	216	#endif
…		…
261	* 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
262	* escape sequence to toggle the Keypad.	285	* escape sequence to toggle the Keypad.
263	*	286	*
264	* Always permit `shift' to override the current setting	287	* Always permit `shift' to override the current setting
265	*/	288	*/
266	shft = (ev.state & ShiftMask);	289	shft = ev.state & ShiftMask;
267	ctrl = (ev.state & ControlMask);	290	ctrl = ev.state & ControlMask;
268	meta = (ev.state & ModMetaMask);	291	meta = ev.state & ModMetaMask;
269		292
270	if (numlock_state || (ev.state & ModNumLockMask))	293	if (numlock_state || (ev.state & ModNumLockMask))
271	{	294	{
272	numlock_state = (ev.state & ModNumLockMask);	295	numlock_state = (ev.state & ModNumLockMask);
273	PrivMode ((!numlock_state), PrivMode_aplKP);	296	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
293		316
294	// the XOpenIM manpage lies about hardcoding the locale	317	// the XOpenIM manpage lies about hardcoding the locale
295	// at the point of XOpenIM, so temporarily switch locales	318	// at the point of XOpenIM, so temporarily switch locales
296	if (rs[Rs_imLocale])	319	if (rs[Rs_imLocale])
297	SET_LOCALE (rs[Rs_imLocale]);	320	SET_LOCALE (rs[Rs_imLocale]);
		321
298	// assume wchar_t == unicode or better	322	// assume wchar_t == unicode or better
299	len = XwcLookupString (Input_Context, &ev, wkbuf,	323	len = XwcLookupString (Input_Context, &ev, wkbuf,
300	KBUFSZ, &keysym, &status_return);	324	KBUFSZ, &keysym, &status_return);
		325
301	if (rs[Rs_imLocale])	326	if (rs[Rs_imLocale])
302	SET_LOCALE (locale);	327	SET_LOCALE (locale);
303		328
304	if (status_return == XLookupChars	329	if (status_return == XLookupChars
305	|| status_return == XLookupBoth)	330	|| status_return == XLookupBoth)
…		…
332	valid_keysym = keysym != NoSymbol;	357	valid_keysym = keysym != NoSymbol;
333	}	358	}
334		359
335	if (valid_keysym)	360	if (valid_keysym)
336	{	361	{
		362	#ifdef KEYSYM_RESOURCE
		363	if (keyboard->dispatch (this, keysym, ev.state))
		364	return;
		365	#endif
		366
337	if (TermWin.saveLines)	367	if (TermWin.saveLines)
338	{	368	{
339	#ifdef UNSHIFTED_SCROLLKEYS	369	#ifdef UNSHIFTED_SCROLLKEYS
340	if (!ctrl && !meta)	370	if (!ctrl && !meta)
341	#else	371	#else
…		…
406	{	436	{
407	/* normal XTerm key bindings */	437	/* normal XTerm key bindings */
408	case XK_Insert: /* Shift+Insert = paste mouse selection */	438	case XK_Insert: /* Shift+Insert = paste mouse selection */
409	selection_request (ev.time, 0, 0);	439	selection_request (ev.time, 0, 0);
410	return;	440	return;
411	#if TODO // TODO	441	#if TODO
412	/* rxvt extras */	442	/* rxvt extras */
413	case XK_KP_Add: /* Shift+KP_Add = bigger font */	443	case XK_KP_Add: /* Shift+KP_Add = bigger font */
414	change_font (FONT_UP);	444	change_font (FONT_UP);
415	return;	445	return;
416	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	446	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
475	}	505	}
476	#endif	506	#endif
477		507
478	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	508	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479	{	509	{
480	#ifdef KEYSYM_RESOURCE
481	if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482	{
483	unsigned int l;
484	const unsigned char *kbuf0;
485
486	kbuf0 = (Keysym_map[keysym & 0xFF]);
487	l = (unsigned int)*kbuf0++;
488
489	/* escape prefix */
490	if (meta
491	# ifdef META8_OPTION
492	&& meta_char == C0_ESC
493	# endif
494	)
495	{
496	const unsigned char ch = C0_ESC;
497	tt_write (&ch, 1);
498	}
499
500	tt_write (kbuf0, l);
501	return;
502	}
503	else
504	#endif
505	{	510	{
506	newlen = 1;	511	newlen = 1;
507	switch (keysym)	512	switch (keysym)
508	{	513	{
509	#ifndef NO_BACKSPACE_KEY	514	#ifndef NO_BACKSPACE_KEY
…		…
517	else	522	else
518	strcpy (kbuf, key_backspace);	523	strcpy (kbuf, key_backspace);
519	break;	524	break;
520	#endif	525	#endif
521	#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
522	case XK_Delete:	537	case XK_Delete:
523	strcpy (kbuf, key_delete);	538	strcpy (kbuf, key_delete);
524	break;	539	break;
525	#endif	540	#endif
526	case XK_Tab:	541	case XK_Tab:
…		…
629	#ifdef XK_KP_Begin	644	#ifdef XK_KP_Begin
630	case XK_KP_Begin:	645	case XK_KP_Begin:
631	strcpy (kbuf, "\033Ou");	646	strcpy (kbuf, "\033Ou");
632	break;	647	break;
633		648
634	case XK_KP_Insert:
635	strcpy (kbuf, "\033Op");
636	break;
637
638	case XK_KP_Delete:
639	strcpy (kbuf, "\033On");
640	break;
641	#endif	649	#endif
642	case XK_KP_F1: /* "\033OP" */	650	case XK_KP_F1: /* "\033OP" */
643	case XK_KP_F2: /* "\033OQ" */	651	case XK_KP_F2: /* "\033OQ" */
644	case XK_KP_F3: /* "\033OR" */	652	case XK_KP_F3: /* "\033OR" */
645	case XK_KP_F4: /* "\033OS" */	653	case XK_KP_F4: /* "\033OS" */
…		…
677	break;	685	break;
678		686
679	case XK_Find:	687	case XK_Find:
680	strcpy (kbuf, "\033[1~");	688	strcpy (kbuf, "\033[1~");
681	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
682	case XK_Insert:	701	case XK_Insert:
683	strcpy (kbuf, "\033[2~");	702	strcpy (kbuf, "\033[2~");
684	break;	703	break;
685	#ifdef DXK_Remove /* support for DEC remove like key */	704	#ifdef DXK_Remove /* support for DEC remove like key */
686	case DXK_Remove:	705	case DXK_Remove:
…		…
776	#undef FKEY	795	#undef FKEY
777	default:	796	default:
778	newlen = 0;	797	newlen = 0;
779	break;	798	break;
780	}	799	}
		800
781	if (newlen)	801	if (newlen)
782	len = strlen (kbuf);	802	len = strlen (kbuf);
783	}	803	}
784		804
785	/*	805	/*
…		…
793	}	813	}
794	else if (ctrl && keysym == XK_minus)	814	else if (ctrl && keysym == XK_minus)
795	{	815	{
796	len = 1;	816	len = 1;
797	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;
798	}	823	}
799	else	824	else
800	{	825	{
801	#ifdef META8_OPTION	826	#ifdef META8_OPTION
802	/* set 8-bit on */	827	/* set 8-bit on */
…		…
861	#endif /* DEBUG_CMD */	886	#endif /* DEBUG_CMD */
862	tt_write (kbuf, (unsigned int)len);	887	tt_write (kbuf, (unsigned int)len);
863	}	888	}
864	/*}}} */	889	/*}}} */
865		890
866	#if (MENUBAR_MAX)	891	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
867	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	892	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868	/* attempt to `write' count to the input buffer */	893	/* attempt to `write' count to the input buffer */
869	unsigned int	894	unsigned int
870	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	895	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
871	{	896	{
…		…
894		919
895	cmd_parse ();	920	cmd_parse ();
896		921
897	return 0;	922	return 0;
898	}	923	}
899	#endif /* MENUBAR_MAX */	924	#endif
900		925
901	void	926	void
902	rxvt_term::flush ()	927	rxvt_term::flush ()
903	{	928	{
		929	flush_ev.stop ();
		930
904	#ifdef TRANSPARENT	931	#ifdef TRANSPARENT
905	if (want_full_refresh)	932	if (want_full_refresh)
906	{	933	{
907	want_full_refresh = 0;	934	want_full_refresh = 0;
908	scr_clear ();	935	scr_clear ();
…		…
918	IMSendSpot ();	945	IMSendSpot ();
919	#endif	946	#endif
920	}	947	}
921		948
922	display->flush ();	949	display->flush ();
923
924	flush_ev.stop ();
925	}	950	}
926		951
927	void	952	void
928	rxvt_term::check_cb (check_watcher &w)	953	rxvt_term::check_cb (check_watcher &w)
929	{	954	{
…		…
1005	{	1030	{
1006	if (mouse_slip_wheel_speed == 0	1031	if (mouse_slip_wheel_speed == 0
1007	|| 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)
1008	: scr_page (UP, mouse_slip_wheel_speed))	1033	: scr_page (UP, mouse_slip_wheel_speed))
1009	{	1034	{
		1035	if (TermWin.view_start == TermWin.nscrolled ||
		1036	TermWin.view_start == 0)
		1037	mouse_slip_wheel_speed = 0;
		1038
1010	refresh_type |= SMOOTH_REFRESH;	1039	refresh_type |= SMOOTH_REFRESH;
1011	want_refresh = 1;	1040	want_refresh = 1;
1012	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1041	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013	}	1042	}
1014	}	1043	}
…		…
1046	rxvt_term::pty_cb (io_watcher &w, short revents)	1075	rxvt_term::pty_cb (io_watcher &w, short revents)
1047	{	1076	{
1048	SET_R (this);	1077	SET_R (this);
1049	SET_LOCALE (locale);	1078	SET_LOCALE (locale);
1050		1079
1051	if (revents & EVENT_WRITE)
1052	tt_write (0, 0);
1053	else if (revents & EVENT_READ)	1080	if (revents & EVENT_READ)
1054	// loop, but don't allow a single term to monopolize us	1081	// loop, but don't allow a single term to monopolize us
1055	while (pty_fill ())	1082	while (pty_fill ())
1056	if (cmd_parse ())	1083	if (cmd_parse ())
1057	break;	1084	break;
		1085
		1086	if (revents & EVENT_WRITE)
		1087	pty_write ();
1058	}	1088	}
1059		1089
1060	void	1090	void
1061	rxvt_term::pointer_unblank ()	1091	rxvt_term::pointer_unblank ()
1062	{	1092	{
…		…
1076	rxvt_term::pointer_blank ()	1106	rxvt_term::pointer_blank ()
1077	{	1107	{
1078	if (! (options & Opt_pointerBlank))	1108	if (! (options & Opt_pointerBlank))
1079	return;	1109	return;
1080		1110
1081	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1111	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1082	XFlush (display->display);	1112	XFlush (display->display);
1083		1113
1084	hidden_pointer = 1;	1114	hidden_pointer = 1;
1085	}	1115	}
1086		1116
…		…
1137	+ ((MEvent.state & ModMetaMask) ? 8 : 0)	1167	+ ((MEvent.state & ModMetaMask) ? 8 : 0)
1138	+ ((MEvent.state & ControlMask) ? 16 : 0);	1168	+ ((MEvent.state & ControlMask) ? 16 : 0);
1139	#ifdef MOUSE_REPORT_DOUBLECLICK	1169	#ifdef MOUSE_REPORT_DOUBLECLICK
1140	key_state += ((MEvent.clicks > 1) ? 32 : 0);	1170	key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141	#endif	1171	#endif
1142
1143	}	1172	}
1144		1173
1145	#ifdef DEBUG_MOUSEREPORT	1174	#if DEBUG_MOUSEREPORT
1146	fprintf (stderr, "Mouse [");	1175	fprintf (stderr, "Mouse [");
1147	if (key_state & 16)	1176	if (key_state & 16)
1148	fputc ('C', stderr);	1177	fputc ('C', stderr);
1149	if (key_state & 4)	1178	if (key_state & 4)
1150	fputc ('S', stderr);	1179	fputc ('S', stderr);
…		…
1154	fputc ('2', stderr);	1183	fputc ('2', stderr);
1155	fprintf (stderr, "]: <%d>, %d/%d\n",	1184	fprintf (stderr, "]: <%d>, %d/%d\n",
1156	button_number,	1185	button_number,
1157	x + 1,	1186	x + 1,
1158	y + 1);	1187	y + 1);
1159	#else	1188	#endif
		1189
1160	tt_printf ("\033[M%c%c%c",	1190	tt_printf ("\033[M%c%c%c",
1161	(32 + button_number + key_state),	1191	(32 + button_number + key_state),
1162	(32 + x + 1),	1192	(32 + x + 1),
1163	(32 + y + 1));	1193	(32 + y + 1));
1164	#endif
1165	}	1194	}
1166		1195
1167	#ifdef USING_W11LIB	1196	#ifdef USING_W11LIB
1168	void	1197	void
1169	rxvt_W11_process_x_event (XEvent *ev)	1198	rxvt_W11_process_x_event (XEvent *ev)
…		…
1176		1205
1177	/*{{{ process an X event */	1206	/*{{{ process an X event */
1178	void	1207	void
1179	rxvt_term::x_cb (XEvent &ev)	1208	rxvt_term::x_cb (XEvent &ev)
1180	{	1209	{
		1210	dDisp;
		1211
1181	SET_R (this);	1212	SET_R (this);
1182	SET_LOCALE (locale);	1213	SET_LOCALE (locale);
1183		1214
1184	#if defined(CURSOR_BLINK)	1215	#if defined(CURSOR_BLINK)
1185	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1216	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1206	if (ev.type == KeyPress && hidden_pointer == 0)	1237	if (ev.type == KeyPress && hidden_pointer == 0)
1207	pointer_blank ();	1238	pointer_blank ();
1208	}	1239	}
1209	#endif	1240	#endif
1210		1241
1211	#ifdef USE_XIM
1212	if (XFilterEvent (&ev, None))
1213	return;
1214	#endif
1215
1216	Window unused_root, unused_child;	1242	Window unused_root, unused_child;
1217	int unused_root_x, unused_root_y;	1243	int unused_root_x, unused_root_y;
1218	unsigned int unused_mask;	1244	unsigned int unused_mask;
1219		1245
1220	switch (ev.type)	1246	switch (ev.type)
1221	{	1247	{
1222	case KeyPress:	1248	case KeyPress:
1223	#if ISO_14755	1249	#if ISO_14755
…		…
1227		1253
1228	break;	1254	break;
1229		1255
1230	case KeyRelease:	1256	case KeyRelease:
1231	{	1257	{
1232	#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)	1258	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1233	KeySym ks;	1259	KeySym ks;
1234		1260
1235	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1261	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236	#endif	1262	#endif
1237		1263
…		…
1306	button_release (ev.xbutton);	1332	button_release (ev.xbutton);
1307	break;	1333	break;
1308		1334
1309	case ClientMessage:	1335	case ClientMessage:
1310	if (ev.xclient.format == 32	1336	if (ev.xclient.format == 32
		1337	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1338	{
1311	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1339	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1312	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
1313	#ifdef OFFIX_DND	1357	#ifdef OFFIX_DND
1314	/* OffiX Dnd (drag 'n' drop) protocol */	1358	/* OffiX Dnd (drag 'n' drop) protocol */
1315	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1359	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316	&& (ev.xclient.data.l[0] == DndFile	1360	&& (ev.xclient.data.l[0] == DndFile
1317	|| ev.xclient.data.l[0] == DndDir	1361	|| ev.xclient.data.l[0] == DndDir
1318	|| ev.xclient.data.l[0] == DndLink))	1362	|| ev.xclient.data.l[0] == DndLink))
1319	{	1363	{
1320	/* Get Dnd data */	1364	/* Get Dnd data */
1321	Atom ActualType;	1365	Atom ActualType;
1322	int ActualFormat;	1366	int ActualFormat;
1323	unsigned char *data;	1367	unsigned char *data;
1324	unsigned long Size, RemainingBytes;	1368	unsigned long Size, RemainingBytes;
1325		1369
1326	XGetWindowProperty (display->display, display->root,	1370	XGetWindowProperty (disp, display->root,
1327	xa[XA_DNDSELECTION],	1371	xa[XA_DNDSELECTION],
1328	0L, 1000000L,	1372	0L, 1000000L,
1329	False, AnyPropertyType,	1373	False, AnyPropertyType,
1330	&ActualType, &ActualFormat,	1374	&ActualType, &ActualFormat,
1331	&Size, &RemainingBytes,	1375	&Size, &RemainingBytes,
1332	&data);	1376	&data);
1333	XChangeProperty (display->display, display->root,	1377	set_string_property (XA_CUT_BUFFER0, data);
1334	XA_CUT_BUFFER0, XA_STRING,
1335	8, PropModeReplace,
1336	data, strlen (data));
1337	XFree (data);	1378	XFree (data);
1338	selection_paste (display->root, XA_CUT_BUFFER0, True);	1379	selection_paste (display->root, XA_CUT_BUFFER0, true);
1339	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1380	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340	}	1381	}
1341	#endif /* OFFIX_DND */	1382	#endif /* OFFIX_DND */
1342	break;	1383	break;
1343		1384
1344	case MappingNotify:	1385	case MappingNotify:
…		…
1369	break;	1410	break;
1370	}	1411	}
1371	break;	1412	break;
1372		1413
1373	case FocusIn:	1414	case FocusIn:
1374	if (!TermWin.focus)	1415	focus_in ();
1375	{
1376	TermWin.focus = 1;
1377	want_refresh = 1;
1378	#ifdef USE_XIM
1379	if (Input_Context != NULL)
1380	{
1381	IMSetStatusPosition ();
1382	XSetICFocus (Input_Context);
1383	}
1384	#endif
1385	#ifdef CURSOR_BLINK
1386	if (options & Opt_cursorBlink)
1387	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388	#endif
1389	#ifdef OFF_FOCUS_FADING
1390	if (rs[Rs_fade])
1391	{
1392	pix_colors = pix_colors_focused;
1393	set_colorfgbg ();
1394	scr_clear ();
1395	scr_touch (true);
1396	}
1397	#endif
1398
1399	}
1400	break;	1416	break;
1401		1417
1402	case FocusOut:	1418	case FocusOut:
1403	if (TermWin.focus)	1419	focus_out ();
1404	{
1405	TermWin.focus = 0;
1406	want_refresh = 1;
1407	#ifdef USE_XIM
1408	if (Input_Context != NULL)
1409	XUnsetICFocus (Input_Context);
1410	#endif
1411	#ifdef CURSOR_BLINK
1412	if (options & Opt_cursorBlink)
1413	cursor_blink_ev.stop ();
1414	hidden_cursor = 0;
1415	#endif
1416	#ifdef OFF_FOCUS_FADING
1417	if (rs[Rs_fade])
1418	{
1419	pix_colors = pix_colors_unfocused;
1420	set_colorfgbg ();
1421	scr_clear ();
1422	scr_touch (true);
1423	}
1424	#endif
1425
1426	}
1427	break;	1420	break;
1428		1421
1429	case ConfigureNotify:	1422	case ConfigureNotify:
1430	if (ev.xconfigure.window == TermWin.parent[0])	1423	if (ev.xconfigure.window == TermWin.parent[0])
1431	{	1424	{
…		…
1435	{ /* Wrap lots of configures into one */	1428	{ /* Wrap lots of configures into one */
1436	width = ev.xconfigure.width;	1429	width = ev.xconfigure.width;
1437	height = ev.xconfigure.height;	1430	height = ev.xconfigure.height;
1438	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1431	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439	}	1432	}
1440	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1433	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1441		1434
1442	if (szHint.width != width || szHint.height != height)	1435	if (szHint.width != width || szHint.height != height)
		1436	{
		1437	seen_resize = 1;
1443	resize_all_windows (width, height, 1);	1438	resize_all_windows (width, height, 1);
		1439	}
1444		1440
1445	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1441	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446	if (options & Opt_transparent)	1442	if (options & Opt_transparent)
1447	{
1448	check_our_parents ();	1443	check_our_parents ();
1449	if (am_transparent)
1450	want_refresh = want_full_refresh = 1;
1451	}
1452	#endif	1444	#endif
1453	}	1445	}
1454	break;	1446	break;
1455		1447
1456	case PropertyNotify:	1448	case PropertyNotify:
…		…
1464	selection_clear ();	1456	selection_clear ();
1465	break;	1457	break;
1466		1458
1467	case SelectionNotify:	1459	case SelectionNotify:
1468	if (selection_wait == Sel_normal)	1460	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor,	1461	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470	ev.xselection.property, True);
1471	break;	1462	break;
1472		1463
1473	case SelectionRequest:	1464	case SelectionRequest:
1474	selection_send (ev.xselectionrequest);	1465	selection_send (ev.xselectionrequest);
1475	break;	1466	break;
…		…
1499	if (ev.xany.window == TermWin.vt)	1490	if (ev.xany.window == TermWin.vt)
1500	{	1491	{
1501	do	1492	do
1502	scr_expose (ev.xexpose.x, ev.xexpose.y,	1493	scr_expose (ev.xexpose.x, ev.xexpose.y,
1503	ev.xexpose.width, ev.xexpose.height, False);	1494	ev.xexpose.width, ev.xexpose.height, False);
1504	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1495	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1505		1496
1506	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1497	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507		1498
1508	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1499	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1509	scr_expose (ev.xexpose.x, ev.xexpose.y,	1500	scr_expose (ev.xexpose.x, ev.xexpose.y,
1510	ev.xexpose.width, ev.xexpose.height, False);	1501	ev.xexpose.width, ev.xexpose.height, False);
1511		1502
1512	scr_refresh (refresh_type);	1503	scr_refresh (refresh_type);
1513	}	1504	}
1514	else	1505	else
1515	{	1506	{
1516	XEvent unused_event;	1507	XEvent unused_event;
1517		1508
1518	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1509	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519	;	1510	;
1520	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1511	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521	;	1512	;
1522		1513
1523	if (isScrollbarWindow (ev.xany.window))	1514	if (isScrollbarWindow (ev.xany.window))
1524	{	1515	{
1525	scrollBar.setIdle ();	1516	scrollBar.setIdle ();
…		…
1530	menubar_expose ();	1521	menubar_expose ();
1531	#endif	1522	#endif
1532		1523
1533	#ifdef TRANSPARENT	1524	#ifdef TRANSPARENT
1534	if (am_transparent && ev.xany.window == TermWin.parent[0])	1525	if (am_transparent && ev.xany.window == TermWin.parent[0])
1535	XClearWindow (display->display, ev.xany.window);	1526	XClearWindow (disp, ev.xany.window);
1536	#endif	1527	#endif
1537	}	1528	}
1538	break;	1529	break;
1539		1530
1540	case MotionNotify:	1531	case MotionNotify:
…		…
1547	{	1538	{
1548	menubar_control (ev.xbutton);	1539	menubar_control (ev.xbutton);
1549	break;	1540	break;
1550	}	1541	}
1551	#endif	1542	#endif
1552	if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))	1543	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553	break;	1544	break;
1554		1545
1555	if (ev.xany.window == TermWin.vt)	1546	if (ev.xany.window == TermWin.vt)
1556	{	1547	{
1557	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1548	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558	{	1549	{
1559	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1550	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1560	;	1551	;
1561		1552
1562	XQueryPointer (display->display, TermWin.vt,	1553	XQueryPointer (disp, TermWin.vt,
1563	&unused_root, &unused_child,	1554	&unused_root, &unused_child,
1564	&unused_root_x, &unused_root_y,	1555	&unused_root_x, &unused_root_y,
1565	& (ev.xbutton.x), & (ev.xbutton.y),	1556	&ev.xbutton.x, &ev.xbutton.y,
1566	&unused_mask);	1557	&ev.xbutton.state);
1567	#ifdef MOUSE_THRESHOLD	1558	#ifdef MOUSE_THRESHOLD
1568	/* deal with a `jumpy' mouse */	1559	/* deal with a `jumpy' mouse */
1569	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)	1560	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570	{	1561	{
1571	#endif	1562	#endif
…		…
1576	iso14755_54 (ev.xbutton.x, ev.xbutton.y);	1567	iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577	break;	1568	break;
1578	}	1569	}
1579	#endif	1570	#endif
1580	selection_extend (ev.xbutton.x, ev.xbutton.y,	1571	selection_extend (ev.xbutton.x, ev.xbutton.y,
1581	(ev.xbutton.state & Button3Mask) ? 2 : 0);	1572	ev.xbutton.state & Button3Mask ? 2 : 0);
		1573
1582	#ifdef SELECTION_SCROLLING	1574	#ifdef SELECTION_SCROLLING
1583	if (ev.xbutton.y < TermWin.int_bwidth	1575	if (ev.xbutton.y < TermWin.int_bwidth
1584	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1576	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1585	{	1577	{
1586	int dist;	1578	int dist;
…		…
1597	selection_save_x = ev.xbutton.x;	1589	selection_save_x = ev.xbutton.x;
1598	selection_save_y = ev.xbutton.y;	1590	selection_save_y = ev.xbutton.y;
1599	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1591	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600		1592
1601	/* calc number of lines to scroll */	1593	/* calc number of lines to scroll */
1602	if (ev.xbutton.y<TermWin.int_bwidth)	1594	if (ev.xbutton.y < TermWin.int_bwidth)
1603	{	1595	{
1604	scroll_selection_dir = UP;	1596	scroll_selection_dir = UP;
1605	dist = TermWin.int_bwidth - ev.xbutton.y;	1597	dist = TermWin.int_bwidth - ev.xbutton.y;
1606	}	1598	}
1607	else	1599	else
…		…
1630	#endif	1622	#endif
1631	}	1623	}
1632	}	1624	}
1633	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1625	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634	{	1626	{
1635	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1627	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636	MotionNotify, &ev)) ;	1628	MotionNotify, &ev))
		1629	;
		1630
1637	XQueryPointer (display->display, scrollBar.win,	1631	XQueryPointer (disp, scrollBar.win,
1638	&unused_root, &unused_child,	1632	&unused_root, &unused_child,
1639	&unused_root_x, &unused_root_y,	1633	&unused_root_x, &unused_root_y,
1640	& (ev.xbutton.x), & (ev.xbutton.y),	1634	&ev.xbutton.x, &ev.xbutton.y,
1641	&unused_mask);	1635	&unused_mask);
1642	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1636	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643	scrollbar_size ());	1637	scrollbar_size ());
1644	scr_refresh (refresh_type);	1638	scr_refresh (refresh_type);
1645	refresh_limit = 0;	1639	refresh_limit = 0;
…		…
1647	}	1641	}
1648	break;	1642	break;
1649	}	1643	}
1650	}	1644	}
1651		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
1652	#if TRANSPARENT	1707	#if TRANSPARENT
1653	void	1708	void
1654	rxvt_term::rootwin_cb (XEvent &ev)	1709	rxvt_term::rootwin_cb (XEvent &ev)
1655	{	1710	{
1656	SET_R (this);	1711	SET_R (this);
…		…
1661	case PropertyNotify:	1716	case PropertyNotify:
1662	/*	1717	/*
1663	* 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,
1664	* 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.
1665	*/	1720	*/
1666	if (xa[XA_XROOTPMAPID] == 0)
1667	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669	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])
1670	return;	1723	return;
1671		1724
1672	/* FALLTHROUGH */	1725	/* FALLTHROUGH */
1673	case ReparentNotify:	1726	case ReparentNotify:
1674	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1727	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1700	return;	1753	return;
1701	}	1754	}
1702	#endif	1755	#endif
1703		1756
1704	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;	1757	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
		1758
1705	if (reportmode)	1759	if (reportmode)
1706	{	1760	{
1707	/* mouse report from vt window */	1761	/* mouse report from vt window */
1708	/* save the xbutton state (for ButtonRelease) */	1762	/* save the xbutton state (for ButtonRelease) */
1709	MEvent.state = ev.state;	1763	MEvent.state = ev.state;
…		…
1738	}	1792	}
1739	else	1793	else
1740	{	1794	{
1741	if (ev.button != MEvent.button)	1795	if (ev.button != MEvent.button)
1742	MEvent.clicks = 0;	1796	MEvent.clicks = 0;
		1797
1743	switch (ev.button)	1798	switch (ev.button)
1744	{	1799	{
1745	case Button1:	1800	case Button1:
		1801	/* allow meta + click to select rectangular areas */
		1802	/* should be done in screen.C */
		1803	#if ENABLE_FRILLS
		1804	selection.rect = !!(ev.state & ModMetaMask);
		1805	#else
		1806	selection.rect = false;
		1807	#endif
		1808
1746	/* allow shift+left click to extend selection */	1809	/* allow shift+left click to extend selection */
1747	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1810	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1748	{	1811	{
1749	if (MEvent.button == Button1 && clickintime)	1812	if (MEvent.button == Button1 && clickintime)
1750	selection_rotate (ev.x, ev.y);	1813	selection_rotate (ev.x, ev.y);
…		…
2072	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2135	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2136	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2137	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075	int i;	2138	int i;
2076		2139
2077	Visual* visual = display->visual;	2140	Visual *visual = display->visual;
2078		2141
2079	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2142	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080		2143
2081	/* for convenience */	2144	/* for convenience */
2082	mask_r = visual->red_mask;	2145	mask_r = visual->red_mask;
…		…
2303	Atom atype;	2366	Atom atype;
2304	unsigned char *prop = NULL;	2367	unsigned char *prop = NULL;
2305	Window root, oldp, *list;	2368	Window root, oldp, *list;
2306	Pixmap rootpixmap = None;	2369	Pixmap rootpixmap = None;
2307	XWindowAttributes wattr, wrootattr;	2370	XWindowAttributes wattr, wrootattr;
		2371	dDisp;
2308		2372
2309	pchanged = 0;	2373	pchanged = 0;
2310		2374
2311	if (!(options & Opt_transparent))	2375	if (!(options & Opt_transparent))
2312	return pchanged; /* Don't try any more */	2376	return pchanged; /* Don't try any more */
2313		2377
2314	XGetWindowAttributes (display->display, display->root, &wrootattr);	2378	XGetWindowAttributes (disp, display->root, &wrootattr);
2315	rootdepth = wrootattr.depth;	2379	rootdepth = wrootattr.depth;
2316		2380
2317	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2381	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2318		2382
2319	if (rootdepth != wattr.depth)	2383	if (rootdepth != wattr.depth)
2320	{	2384	{
2321	if (am_transparent)	2385	if (am_transparent)
2322	{	2386	{
2323	pchanged = 1;	2387	pchanged = 1;
2324	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2388	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2325	am_transparent = am_pixmap_trans = 0;	2389	am_transparent = am_pixmap_trans = 0;
2326	}	2390	}
2327		2391
2328	return pchanged; /* Don't try any more */	2392	return pchanged; /* Don't try any more */
2329	}	2393	}
2330		2394
2331	/* 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. */
2332	XSync (display->display, False);	2396	XSync (disp, False);
2333		2397
2334	/*	2398	/*
2335	* Make the frame window set by the window manager have	2399	* Make the frame window set by the window manager have
2336	* the root background. Some window managers put multiple nested frame	2400	* the root background. Some window managers put multiple nested frame
2337	* 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.
2338	*/	2402	*/
2339	i = (xa[XA_XROOTPMAPID]	2403	i = (xa[XA_XROOTPMAP_ID]
2340	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2404	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2405	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342	&nitems, &bytes_after, &prop) == Success);	2406	&nitems, &bytes_after, &prop) == Success);
2343		2407
2344	if (!i || prop == NULL)	2408	if (!i || prop == NULL)
2345	i = (xa[XA_XSETROOTID]	2409	i = (xa[XA_ESETROOT_PMAP_ID]
2346	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2410	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2411	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348	&nitems, &bytes_after, &prop) == Success);	2412	&nitems, &bytes_after, &prop) == Success);
2349		2413
2350	if (!i || prop == NULL	2414	if (!i || prop == NULL
2351	#if TINTING	2415	#if TINTING
…		…
2370	Window cr;	2434	Window cr;
2371	XImage *image;	2435	XImage *image;
2372	GC gc;	2436	GC gc;
2373	XGCValues gcvalue;	2437	XGCValues gcvalue;
2374		2438
2375	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2439	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2376	0, 0, &sx, &sy, &cr);	2440	0, 0, &sx, &sy, &cr);
2377	nw = (unsigned int)szHint.width;	2441	nw = (unsigned int)szHint.width;
2378	nh = (unsigned int)szHint.height;	2442	nh = (unsigned int)szHint.height;
2379	nx = ny = 0;	2443	nx = ny = 0;
2380		2444
…		…
2392	sy = 0;	2456	sy = 0;
2393	}	2457	}
2394		2458
2395	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2459	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2396	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2460	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2461
		2462	XSync (disp, False);
2397	allowedxerror = -1;	2463	allowedxerror = -1;
2398	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2464	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399		2465
2400	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2466	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2401	/* XXX: may need a delay here? */	2467	/* XXX: may need a delay here? */
2402	allowedxerror = 0;	2468	allowedxerror = 0;
2403		2469
…		…
2406	if (am_transparent && am_pixmap_trans)	2472	if (am_transparent && am_pixmap_trans)
2407	{	2473	{
2408	pchanged = 1;	2474	pchanged = 1;
2409	if (TermWin.pixmap != None)	2475	if (TermWin.pixmap != None)
2410	{	2476	{
2411	XFreePixmap (display->display, TermWin.pixmap);	2477	XFreePixmap (disp, TermWin.pixmap);
2412	TermWin.pixmap = None;	2478	TermWin.pixmap = None;
2413	}	2479	}
2414	}	2480	}
2415		2481
2416	am_pixmap_trans = 0;	2482	am_pixmap_trans = 0;
2417	}	2483	}
2418	else	2484	else
2419	{	2485	{
2420	if (TermWin.pixmap != None)	2486	if (TermWin.pixmap != None)
2421	XFreePixmap (display->display, TermWin.pixmap);	2487	XFreePixmap (disp, TermWin.pixmap);
2422		2488
2423	#if TINTING	2489	#if TINTING
2424	if (ISSET_PIXCOLOR (Color_tint))	2490	if (ISSET_PIXCOLOR (Color_tint))
2425	{	2491	{
2426	unsigned short rm, gm, bm;	2492	unsigned short rm, gm, bm;
…		…
2430		2496
2431	ShadeXImage (display, image, shade, rm, gm, bm);	2497	ShadeXImage (display, image, shade, rm, gm, bm);
2432	}	2498	}
2433	#endif	2499	#endif
2434		2500
2435	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2501	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2436	szHint.width, szHint.height, image->depth);	2502	szHint.width, szHint.height, image->depth);
2437	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2503	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2438	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2504	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2439	nx, ny, image->width, image->height);	2505	nx, ny, image->width, image->height);
2440	XFreeGC (display->display, gc);	2506	XFreeGC (disp, gc);
2441	XDestroyImage (image);	2507	XDestroyImage (image);
2442	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2508	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2443	XClearWindow (display->display, TermWin.parent[0]);	2509	XClearWindow (disp, TermWin.parent[0]);
2444		2510
2445	if (!am_transparent || !am_pixmap_trans)	2511	if (!am_transparent || !am_pixmap_trans)
2446	pchanged = 1;	2512	pchanged = 1;
2447		2513
2448	am_transparent = am_pixmap_trans = 1;	2514	am_transparent = am_pixmap_trans = 1;
2449	}	2515	}
2450	}	2516	}
2451		2517
2452	if (!am_pixmap_trans)	2518	if (am_pixmap_trans)
		2519	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2520	else
2453	{	2521	{
2454	unsigned int n;	2522	unsigned int n;
2455	/*	2523	/*
2456	* InheritPixmap transparency	2524	* InheritPixmap transparency
2457	*/	2525	*/
2458	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2526	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2459	{	2527	{
2460	oldp = TermWin.parent[i];	2528	oldp = TermWin.parent[i];
2461	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2529	XQueryTree (disp, TermWin.parent[i - 1], &root,
2462	&TermWin.parent[i], &list, &n);	2530	&TermWin.parent[i], &list, &n);
2463	XFree (list);	2531	XFree (list);
2464		2532
2465	if (TermWin.parent[i] == display->root)	2533	if (TermWin.parent[i] == display->root)
2466	{	2534	{
…		…
2478		2546
2479	if (pchanged)	2547	if (pchanged)
2480	{	2548	{
2481	for (; n < (unsigned int)i; n++)	2549	for (; n < (unsigned int)i; n++)
2482	{	2550	{
2483	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2551	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2484	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2552	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485	{	2553	{
2486	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2554	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2487	break;	2555	break;
2488	}	2556	}
2489	}	2557	}
2490	}	2558	}
2491		2559
2492	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2560	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2493	{	2561	{
2494	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2562	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2495	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2563	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2496	am_transparent = 0;	2564	am_transparent = 0;
2497	/* XXX: also turn off Opt_transparent? */	2565	/* XXX: also turn off Opt_transparent? */
2498	}	2566	}
2499	else	2567	else
2500	{	2568	{
…		…
2503	* needed for fvwm2.2.2 (and before?) */	2571	* needed for fvwm2.2.2 (and before?) */
2504	sleep (1);	2572	sleep (1);
2505	#endif	2573	#endif
2506	for (n = 0; n < (unsigned int)i; n++)	2574	for (n = 0; n < (unsigned int)i; n++)
2507	{	2575	{
2508	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2576	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2509	XClearWindow (display->display, TermWin.parent[n]);	2577	XClearWindow (disp, TermWin.parent[n]);
2510	}	2578	}
2511		2579
2512	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2580	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2513	am_transparent = 1;	2581	am_transparent = 1;
2514	}	2582	}
2515		2583
2516	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2584	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2517	TermWin.parent[i] = None;	2585	TermWin.parent[i] = None;
2518	}	2586	}
2519		2587
2520	// this is experimental
2521	if (scrollBar.win)	2588	if (scrollBar.win)
2522	{	2589	{
2523	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2590	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524	XClearWindow (display->display, scrollBar.win);
2525	scrollBar.setIdle ();	2591	scrollBar.setIdle ();
2526	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 ();
2527	}	2600	}
2528		2601
2529	return pchanged;	2602	return pchanged;
2530	}	2603	}
2531	#endif	2604	#endif
…		…
2557	seen_input = 1;	2630	seen_input = 1;
2558	// many badly-written programs (e.g. jed) contain a race condition:	2631	// many badly-written programs (e.g. jed) contain a race condition:
2559	// they first read the screensize and then install a SIGWINCH handler.	2632	// they first read the screensize and then install a SIGWINCH handler.
2560	// some window managers resize the window early, and these programs	2633	// some window managers resize the window early, and these programs
2561	// then sometimes get the size wrong.	2634	// then sometimes get the size wrong.
		2635	// unfortunately other programs are even more buggy and dislike
		2636	// being sent SIGWINCH, so only do it when we were in fact being
		2637	// resized.
		2638	if (seen_resize && cmd_pid)
2562	kill (-cmd_pid, SIGWINCH);	2639	kill (-cmd_pid, SIGWINCH);
2563	}	2640	}
2564		2641
2565	/* Read a text string from the input buffer */	2642	/* Read a text string from the input buffer */
2566	unicode_t buf[UBUFSIZ];	2643	unicode_t buf[UBUFSIZ];
2567	bool refreshnow = false;	2644	bool refreshnow = false;
…		…
2679	if (len == (size_t)-1)	2756	if (len == (size_t)-1)
2680	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
2681		2758
2682	// assume wchar == unicode	2759	// assume wchar == unicode
2683	cmdbuf_ptr += len;	2760	cmdbuf_ptr += len;
2684	return wc;	2761	return wc & UNICODE_MASK;
2685	}	2762	}
2686		2763
2687	return NOCHAR;	2764	return NOCHAR;
2688	}	2765	}
2689		2766
…		…
3152	{	3229	{
3153	switch (priv)	3230	switch (priv)
3154	{	3231	{
3155	case '>':	3232	case '>':
3156	if (ch == CSI_DA) /* secondary device attributes */	3233	if (ch == CSI_DA) /* secondary device attributes */
3157	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3234	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158	break;	3235	break;
3159	case '?':	3236	case '?':
3160	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3237	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161	process_terminal_mode (ch, priv, nargs, arg);	3238	process_terminal_mode (ch, priv, nargs, arg);
3162	break;	3239	break;
…		…
3391	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3468	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392	{	3469	{
3393	int x, y;	3470	int x, y;
3394	XWindowAttributes wattr;	3471	XWindowAttributes wattr;
3395	Window wdummy;	3472	Window wdummy;
		3473	dDisp;
3396		3474
3397	if (nargs == 0)	3475	if (nargs == 0)
3398	return;	3476	return;
3399		3477
3400	switch (args[0])	3478	switch (args[0])
3401	{	3479	{
3402	/*	3480	/*
3403	* commands	3481	* commands
3404	*/	3482	*/
3405	case 1: /* deiconify window */	3483	case 1: /* deiconify window */
3406	XMapWindow (display->display, TermWin.parent[0]);	3484	XMapWindow (disp, TermWin.parent[0]);
3407	break;	3485	break;
3408	case 2: /* iconify window */	3486	case 2: /* iconify window */
3409	XIconifyWindow (display->display, TermWin.parent[0],	3487	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3410	DefaultScreen (display->display));
3411	break;	3488	break;
3412	case 3: /* set position (pixels) */	3489	case 3: /* set position (pixels) */
3413	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3490	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3414	break;	3491	break;
3415	case 4: /* set size (pixels) */	3492	case 4: /* set size (pixels) */
3416	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3493	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417	break;	3494	break;
3418	case 5: /* raise window */	3495	case 5: /* raise window */
3419	XRaiseWindow (display->display, TermWin.parent[0]);	3496	XRaiseWindow (disp, TermWin.parent[0]);
3420	break;	3497	break;
3421	case 6: /* lower window */	3498	case 6: /* lower window */
3422	XLowerWindow (display->display, TermWin.parent[0]);	3499	XLowerWindow (disp, TermWin.parent[0]);
3423	break;	3500	break;
3424	case 7: /* refresh window */	3501	case 7: /* refresh window */
3425	scr_touch (true);	3502	scr_touch (true);
3426	break;	3503	break;
3427	case 8: /* set size (chars) */	3504	case 8: /* set size (chars) */
…		…
3439		3516
3440	/*	3517	/*
3441	* reports - some output format copied from XTerm	3518	* reports - some output format copied from XTerm
3442	*/	3519	*/
3443	case 11: /* report window state */	3520	case 11: /* report window state */
3444	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3521	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3445	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3522	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446	break;	3523	break;
3447	case 13: /* report window position */	3524	case 13: /* report window position */
3448	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3525	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3449	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3526	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3450	-wattr.border_width, -wattr.border_width,	3527	-wattr.border_width, -wattr.border_width,
3451	&x, &y, &wdummy);	3528	&x, &y, &wdummy);
3452	tt_printf ("\033[3;%d;%dt", x, y);	3529	tt_printf ("\033[3;%d;%dt", x, y);
3453	break;	3530	break;
3454	case 14: /* report window size (pixels) */	3531	case 14: /* report window size (pixels) */
3455	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3532	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3456	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3533	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457	break;	3534	break;
3458	case 18: /* report text area size (chars) */	3535	case 18: /* report text area size (chars) */
3459	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3536	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3460	break;	3537	break;
…		…
3462	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3539	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3463	break;	3540	break;
3464	case 20: /* report icon label */	3541	case 20: /* report icon label */
3465	{	3542	{
3466	char *s;	3543	char *s;
3467	XGetIconName (display->display, TermWin.parent[0], &s);	3544	XGetIconName (disp, TermWin.parent[0], &s);
3468	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 */
3469	XFree (s);	3546	XFree (s);
3470	}	3547	}
3471	break;	3548	break;
3472	case 21: /* report window title */	3549	case 21: /* report window title */
3473	{	3550	{
3474	char *s;	3551	char *s;
3475	XFetchName (display->display, TermWin.parent[0], &s);	3552	XFetchName (disp, TermWin.parent[0], &s);
3476	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 */
3477	XFree (s);	3554	XFree (s);
3478	}	3555	}
3479	break;	3556	break;
3480	}	3557	}
…		…
3487	* ends_how is terminator used. returned input must be free()'d	3564	* ends_how is terminator used. returned input must be free()'d
3488	*/	3565	*/
3489	unsigned char *	3566	unsigned char *
3490	rxvt_term::get_to_st (unicode_t &ends_how)	3567	rxvt_term::get_to_st (unicode_t &ends_how)
3491	{	3568	{
3492	unicode_t prev = 0, ch;	3569	unicode_t ch;
		3570	bool seen_esc = false;
3493	unsigned int n = 0;	3571	unsigned int n = 0;
3494	unsigned char *s;
3495	unsigned char string[STRING_MAX];	3572	wchar_t string[STRING_MAX];
3496		3573
3497	while ((ch = cmd_getc ()) != NOCHAR)	3574	while ((ch = cmd_getc ()) != NOCHAR)
3498	{	3575	{
3499	if (prev == C0_ESC)	3576	if (seen_esc)
3500	{	3577	{
3501	if (ch == 0x5c) /* 7bit ST */	3578	if (ch == 0x5c) /* 7bit ST */
3502	break;	3579	break;
3503	else	3580	else
3504	return NULL;	3581	return NULL;
3505	}	3582	}
		3583	else if (ch == C0_ESC)
		3584	{
		3585	seen_esc = true;
		3586	continue;
		3587	}
3506	else if (ch == C0_BEL || ch == CHAR_ST)	3588	else if (ch == C0_BEL || ch == CHAR_ST)
3507	break;	3589	break;
3508	else if (ch < 0x20)	3590	else if (ch < 0x20)
3509	return NULL; /* other control character - exit */	3591	return NULL; /* other control character - exit */
3510		3592
3511	if (n >= sizeof (string) - 1)	3593	seen_esc = false;
		3594
		3595	if (n >= STRING_MAX - 1)
3512	// stop at some sane length	3596	// stop at some sane length
3513	return NULL;	3597	return NULL;
3514		3598
3515	if (ch == C0_SYN)	3599	if (ch == C0_SYN)
3516	{
3517	string[n++] = cmd_get8 ();	3600	string[n++] = cmd_get8 ();
3518	prev = 0;
3519	}
3520	else	3601	else
3521	string[n++] = prev = ch;	3602	string[n++] = ch;
3522	}	3603	}
3523		3604
3524	string[n++] = '\0';	3605	string[n++] = '\0';
3525		3606
3526	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527	return NULL;
3528
3529	ends_how = (ch == 0x5c ? C0_ESC : ch);	3607	ends_how = (ch == 0x5c ? C0_ESC : ch);
3530	strncpy (s, string, n);	3608
3531	return s;	3609	return (unsigned char *)rxvt_wcstombs (string);
3532	}	3610	}
3533		3611
3534	/*----------------------------------------------------------------------*/	3612	/*----------------------------------------------------------------------*/
3535	/*	3613	/*
3536	* 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)'
…		…
3590	set_window_color (color, str);	3668	set_window_color (color, str);
3591	}	3669	}
3592		3670
3593	/*	3671	/*
3594	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3672	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595	* 0 = change iconName/title
3596	* 1 = change iconName
3597	* 2 = change title
3598	* 4 = change color
3599	* 10 = change fg color
3600	* 11 = change bg color
3601	* 12 = change text color
3602	* 13 = change mouse foreground color
3603	* 17 = change highlight character colour
3604	* 18 = change bold character color
3605	* 19 = change underlined character color
3606	* 46 = change logfile (not implemented)
3607	* 50 = change font
3608	*
3609	* rxvt extensions:
3610	* 20 = bg pixmap
3611	* 39 = change default fg color
3612	* 49 = change default bg color
3613	* 55 = dump scrollback buffer and all of screen
3614	* 701 = change locale
3615	* 702 = find font
3616	* 703 = menu
3617	*/	3673	*/
3618	void	3674	void
3619	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)
3620	{	3676	{
3621	int changed = 0;	3677	int changed = 0;
3622	int color;	3678	int color;
3623	char *buf, *name;	3679	char *buf, *name;
3624	bool query = str[0] == '?' && !str[1];	3680	bool query = str[0] == '?' && !str[1];
		3681	int saveop = op;
		3682	dDisp;
3625		3683
3626	assert (str != NULL);	3684	assert (str != NULL);
3627	switch (op)	3685	switch (op)
3628	{	3686	{
3629	case XTerm_name:	3687	case XTerm_name:
…		…
3636	set_title (str);	3694	set_title (str);
3637	break;	3695	break;
3638	case XTerm_property:	3696	case XTerm_property:
3639	if (str[0] == '?')	3697	if (str[0] == '?')
3640	{	3698	{
3641	Atom prop = XInternAtom (display->display, str + 1, True);	3699	Atom prop = display->atom (str + 1);
3642	Atom actual_type;	3700	Atom actual_type;
3643	int actual_format;	3701	int actual_format;
3644	unsigned long nitems;	3702	unsigned long nitems;
3645	unsigned long bytes_after;	3703	unsigned long bytes_after;
3646	unsigned char *value = 0;	3704	unsigned char *value = 0;
3647	const char *str = "";	3705	const char *str = "";
3648		3706
3649	if (prop	3707	if (prop
3650	&& XGetWindowProperty (display->display, TermWin.parent[0],	3708	&& XGetWindowProperty (disp, TermWin.parent[0],
3651	prop, 0, 1<<16, 0, AnyPropertyType,	3709	prop, 0, 1<<16, 0, AnyPropertyType,
3652	&actual_type, &actual_format,	3710	&actual_type, &actual_format,
3653	&nitems, &bytes_after, &value) == Success	3711	&nitems, &bytes_after, &value) == Success
3654	&& actual_type != None	3712	&& actual_type != None
3655	&& actual_format == 8)	3713	&& actual_format == 8)
…		…
3664	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3722	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665		3723
3666	if (eq)	3724	if (eq)
3667	{	3725	{
3668	*eq = 0;	3726	*eq = 0;
3669	XChangeProperty (display->display, TermWin.parent[0],	3727	set_utf8_property (display->atom (str), eq + 1);
3670	display->atom (str), XA_STRING, 8,
3671	PropModeReplace, (unsigned char *)eq + 1,
3672	strlen (eq + 1));
3673	}	3728	}
3674	else	3729	else
3675	XDeleteProperty (display->display, TermWin.parent[0],	3730	XDeleteProperty (disp, TermWin.parent[0],
3676	display->atom (str));	3731	display->atom (str));
3677	}	3732	}
3678	break;	3733	break;
3679		3734
3680	case XTerm_Color:	3735	case XTerm_Color:
…		…
3727	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3782	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728	break;	3783	break;
3729	case XTerm_Color_RV:	3784	case XTerm_Color_RV:
3730	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3785	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3731	break;	3786	break;
		3787	case URxvt_Color_IT:
		3788	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3789	break;
		3790	#endif
		3791	#if TRANSPARENT && TINTING
		3792	case URxvt_Color_tint:
		3793	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
		3794	check_our_parents ();
		3795	if (am_transparent)
		3796	want_full_refresh = want_refresh = 1;
		3797	break;
3732	#endif	3798	#endif
3733		3799
3734	case XTerm_Pixmap:	3800	case XTerm_Pixmap:
3735	if (*str != ';')	3801	if (*str != ';')
3736	{	3802	{
…		…
3744	{	3810	{
3745	str++;	3811	str++;
3746	#if XPM_BACKGROUND	3812	#if XPM_BACKGROUND
3747	changed += scale_pixmap (str);	3813	changed += scale_pixmap (str);
3748	#endif	3814	#endif
3749
3750	}	3815	}
		3816
3751	if (changed)	3817	if (changed)
3752	{	3818	{
3753	#ifdef XPM_BACKGROUND	3819	#ifdef XPM_BACKGROUND
3754	resize_pixmap ();	3820	resize_pixmap ();
3755	#endif	3821	#endif
…		…
3766		3832
3767	case XTerm_logfile:	3833	case XTerm_logfile:
3768	// TODO, when secure mode?	3834	// TODO, when secure mode?
3769	break;	3835	break;
3770		3836
3771	case XTerm_font:
3772	if (query)
3773	tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774	(options & Opt_insecure) && TermWin.fontset->fontdesc
3775	? TermWin.fontset->fontdesc : "",
3776	resp);
3777	else
3778	change_font (str);
3779	break;
3780
3781	#if ENABLE_FRILLS
3782	case XTerm_locale:
3783	if (query)
3784	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785	else
3786	{
3787	set_locale (str);
3788	# ifdef USE_XIM
3789	im_cb ();
3790	# endif
3791	}
3792	break;
3793
3794	case XTerm_findfont:
3795	{
3796	int fid = TermWin.fontset->find_font (atoi (str));
3797	tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798	fid,
3799	(options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800	resp);
3801	}
3802	break;
3803	#endif
3804
3805	#ifdef MENUBAR	3837	#ifdef MENUBAR
3806	case XTerm_Menu:	3838	case URxvt_Menu:
3807	if (options & Opt_insecure)	3839	if (options & Opt_insecure)
3808	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3840	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809	break;	3841	break;
3810	#endif	3842	#endif
3811	#if 0	3843	#if 0
…		…
3816	{	3848	{
3817	scr_dump (fd);	3849	scr_dump (fd);
3818	close (fd);	3850	close (fd);
3819	}	3851	}
3820	}	3852	}
		3853	break;
		3854	#endif
		3855	case XTerm_font:
		3856	op = URxvt_font;
		3857	case URxvt_font:
		3858	#if ENABLE_STYLES
		3859	case URxvt_boldFont:
		3860	case URxvt_italicFont:
		3861	case URxvt_boldItalicFont:
		3862	#endif
		3863	if (query)
		3864	tt_printf ("\33]%d;%-.250s%c", saveop,
		3865	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
		3866	? TermWin.fontset[op - URxvt_font]->fontdesc : "",
		3867	resp);
		3868	else
		3869	{
		3870	const char *&res = rs[Rs_font + (op - URxvt_font)];
		3871
		3872	res = strdup (str);
		3873	allocated.push_back ((void *)res);
		3874	set_fonts ();
		3875	}
		3876	break;
		3877
		3878	#if ENABLE_FRILLS
		3879	case URxvt_locale:
		3880	if (query)
		3881	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
		3882	else
		3883	{
		3884	set_locale (str);
		3885	pty.set_utf8_mode (enc_utf8);
		3886	init_xlocale ();
		3887	}
		3888	break;
		3889
		3890	case URxvt_view_up:
		3891	case URxvt_view_down:
		3892	int lines = atoi (str);
		3893
		3894	if (lines)
		3895	scr_page (op == URxvt_view_up ? UP : DN, lines);
		3896	else
		3897	{
		3898	scr_erase_savelines ();
		3899	}
		3900
3821	break;	3901	break;
3822	#endif	3902	#endif
3823	}	3903	}
3824	}	3904	}
3825	/*----------------------------------------------------------------------*/	3905	/*----------------------------------------------------------------------*/
…		…
3935		4015
3936	/* extra handling for values with state unkept */	4016	/* extra handling for values with state unkept */
3937	switch (arg[i])	4017	switch (arg[i])
3938	{	4018	{
3939	case 1048: /* alternative cursor save */	4019	case 1048: /* alternative cursor save */
		4020	case 1049:
3940	if (options & Opt_secondaryScreen)	4021	if (options & Opt_secondaryScreen)
3941	if (mode == 0)	4022	if (mode == 0)
3942	scr_cursor (RESTORE);	4023	scr_cursor (RESTORE);
3943	else if (mode == 1)	4024	else if (mode == 1)
3944	scr_cursor (SAVE);	4025	scr_cursor (SAVE);
…		…
4069	rendset = 0, rendstyle = ~RS_None;	4150	rendset = 0, rendstyle = ~RS_None;
4070	break;	4151	break;
4071	case 1:	4152	case 1:
4072	rendset = 1, rendstyle = RS_Bold;	4153	rendset = 1, rendstyle = RS_Bold;
4073	break;	4154	break;
4074	//case 2: // faint or second colour	4155	//case 2: // low intensity
4075	//case 3: // italic	4156	case 3:
		4157	rendset = 1, rendstyle = RS_Italic;
		4158	break;
4076	case 4:	4159	case 4:
4077	rendset = 1, rendstyle = RS_Uline;	4160	rendset = 1, rendstyle = RS_Uline;
4078	break;	4161	break;
4079	case 5: // slowly blinking	4162	case 5: // slowly blinking
4080	case 6: // rapidly blinking	4163	case 6: // rapidly blinking
…		…
4092	//case 11: // scoansi acs on, first alt font	4175	//case 11: // scoansi acs on, first alt font
4093	//case 12: // scoansi acs on, |0x80, second alt font	4176	//case 12: // scoansi acs on, |0x80, second alt font
4094	//...	4177	//...
4095	//case 19: // ninth alt font	4178	//case 19: // ninth alt font
4096	//case 20: // gothic	4179	//case 20: // gothic
4097	case 21: // disable bold, faint	4180	case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098	rendset = 0, rendstyle = RS_Bold;	4181	rendset = 0, rendstyle = RS_Bold;
4099	break;	4182	break;
4100	case 22:	4183	case 22: // normal intensity
4101	rendset = 0, rendstyle = RS_Bold;	4184	rendset = 0, rendstyle = RS_Bold;
4102	break;	4185	break;
4103	//case 23: disable italic	4186	case 23: // disable italic
		4187	rendset = 0, rendstyle = RS_Italic;
		4188	break;
4104	case 24:	4189	case 24:
4105	rendset = 0, rendstyle = RS_Uline;	4190	rendset = 0, rendstyle = RS_Uline;
4106	break;	4191	break;
4107	case 25:	4192	case 25:
4108	rendset = 0, rendstyle = RS_Blink;	4193	rendset = 0, rendstyle = RS_Blink;
4109	break;	4194	break;
4110	case 26:	4195	case 26: // variable spacing (iso 8613)
4111	rendset = 0, rendstyle = RS_Blink;	4196	rendset = 0, rendstyle = RS_Blink;
4112	break;	4197	break;
4113	case 27:	4198	case 27:
4114	rendset = 0, rendstyle = RS_RVid;	4199	rendset = 0, rendstyle = RS_RVid;
4115	break;	4200	break;
…		…
4133	case 35:	4218	case 35:
4134	case 36:	4219	case 36:
4135	case 37:	4220	case 37:
4136	scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);	4221	scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137	break;	4222	break;
4138	#ifdef TTY_256COLOR	4223	case 38: // set fg color, ISO 8613-6
4139	case 38:
4140	if (nargs > i + 2 && arg[i + 1] == 5)	4224	if (nargs > i + 2 && arg[i + 1] == 5)
4141	{	4225	{
4142	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);	4226	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143	i += 2;	4227	i += 2;
4144	}	4228	}
4145	break;	4229	break;
4146	#endif
4147	case 39: /* default fg */	4230	case 39: /* default fg */
4148	scr_color (Color_fg, Color_fg);	4231	scr_color (Color_fg, Color_fg);
4149	break;	4232	break;
4150		4233
4151	case 40:	4234	case 40:
…		…
4156	case 45:	4239	case 45:
4157	case 46:	4240	case 46:
4158	case 47:	4241	case 47:
4159	scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);	4242	scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160	break;	4243	break;
4161	#ifdef TTY_256COLOR	4244	case 48: // set bg color, ISO 8613-6
4162	case 48:
4163	if (nargs > i + 2 && arg[i + 1] == 5)	4245	if (nargs > i + 2 && arg[i + 1] == 5)
4164	{	4246	{
4165	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);	4247	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166	i += 2;	4248	i += 2;
4167	}	4249	}
4168	break;	4250	break;
4169	#endif
4170	case 49: /* default bg */	4251	case 49: /* default bg */
4171	scr_color (Color_bg, Color_bg);	4252	scr_color (Color_bg, Color_bg);
4172	break;	4253	break;
		4254
		4255	//case 50: // not variable spacing
4173		4256
4174	#ifndef NO_BRIGHTCOLOR	4257	#ifndef NO_BRIGHTCOLOR
4175	case 90:	4258	case 90:
4176	case 91: /* set bright fg color */	4259	case 91: /* set bright fg color */
4177	case 92:	4260	case 92:
4178	case 93:	4261	case 93:
4179	case 94:	4262	case 94:
4180	case 95:	4263	case 95:
4181	case 96:	4264	case 96:
4182	case 97:	4265	case 97:
4183	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),	4266	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184	Color_fg);
4185	break;	4267	break;
4186	case 100:	4268	case 100:
4187	case 101: /* set bright bg color */	4269	case 101: /* set bright bg color */
4188	case 102:	4270	case 102:
4189	case 103:	4271	case 103:
4190	case 104:	4272	case 104:
4191	case 105:	4273	case 105:
4192	case 106:	4274	case 106:
4193	case 107:	4275	case 107:
4194	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),	4276	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195	Color_bg);
4196	break;	4277	break;
4197	#endif	4278	#endif
4198		4279
4199	}	4280	}
4200	}	4281	}
…		…
4239		4320
4240	/* ---------------------------------------------------------------------- */	4321	/* ---------------------------------------------------------------------- */
4241	/* 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,
4242	* or generated by us in response to a query ESC sequence.	4323	* or generated by us in response to a query ESC sequence.
4243	*/	4324	*/
		4325	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4326
4244	void	4327	void
4245	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4328	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4246	{	4329	{
4247	enum { 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));
4248		4333
4249	if (len)	4334	if ((unsigned int)written == len)
		4335	return;
		4336
		4337	data += written;
		4338	len -= written;
4250	{	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
4251	if (v_buflen == 0)	4357	if (v_buflen == 0)
4252	{	4358	{
4253	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255	if ((unsigned int)written == len)
4256	return;
4257
4258	data += written;
4259	len -= written;
4260	}
4261
4262
4263	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265	memcpy (v_buffer + v_buflen, data, len);
4266	v_buflen += len;
4267	}
4268
4269	for (;;)
4270	{
4271	int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273	if (written > 0)
4274	{
4275	v_buflen -= written;
4276
4277	if (v_buflen == 0)
4278	{
4279	free (v_buffer);	4359	free (v_buffer);
4280	v_buffer = 0;	4360	v_buffer = 0;
4281	v_buflen = 0;	4361	v_buflen = 0;
4282		4362
4283	pty_ev.set (EVENT_READ);	4363	pty_ev.set (EVENT_READ);
4284	return;
4285	}
4286
4287	memmove (v_buffer, v_buffer + written, v_buflen);
4288	}
4289	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290	// original code just ignores this...
4291	destroy ();
4292	else
4293	{
4294	pty_ev.set (EVENT_READ | EVENT_WRITE);
4295	return;	4364	return;
4296	}	4365	}
		4366
		4367	memmove (v_buffer, v_buffer + written, v_buflen);
4297	}	4368	}
		4369	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4370	// original code just ignores this...
		4371	destroy ();
4298	}	4372	}
4299		4373
4300	/*----------------------- end-of-file (C source) -----------------------*/	4374	/*----------------------- end-of-file (C source) -----------------------*/
4301		4375

Diff Legend

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