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.190 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.222 by root, Sat Dec 31 19:35:56 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.
…		…
52		52
53	#ifdef KEYSYM_RESOURCE	53	#ifdef KEYSYM_RESOURCE
54	# include "keyboard.h"	54	# include "keyboard.h"
55	#endif	55	#endif
56		56
57	#include <cwchar>
58	#include <csignal>	57	#include <csignal>
59		58
60	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
61		60
62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
118	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
119	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
120	XK_Print, 0x2399,	119	XK_Print, 0x2399,
121		120
122	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,
123	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
124	0,	131	0,
125	};	132	};
126		133
127	void	134	void
128	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
129	{	136	{
130	x = Pixel2Col (x);	137	x = Pixel2Col (x);
131	y = Pixel2Row (y);	138	y = Pixel2Row (y);
132		139
133	if (x < 0 || x >= TermWin.ncol	140	if (!IN_RANGE_EXC (x, 0, ncol)
134	|| y < 0 || y >= TermWin.nrow)	141	|| !IN_RANGE_EXC (y, 0, nrow))
135	return;	142	return;
136		143
137	for (;;)	144	for (;;)
138	{	145	{
139	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	const line_t &l = ROW(y - view_start);
		147
		148	text_t t = l.t[x];
140		149
141	if (t != NOCHAR || !x)	150	if (t != NOCHAR || !x)
142	{	151	{
143	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	iso14755_51 (l.t[x], l.r[x], x, y);
144	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145	iso14755buf = ISO_14755_54;	153	iso14755buf = ISO_14755_54;
146	break;	154	break;
147	}	155	}
148		156
149	x--;	157	x--;
150	}	158	}
151
152	}	159	}
153	#endif
154		160
155	#if ENABLE_OVERLAY
156	void	161	void
157	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	162	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158	{	163	{
159	rxvt_fontset *fs = FONTSET (r);	164	rxvt_fontset *fs = FONTSET (r);
160	rxvt_font *f = (*fs)[fs->find_font (ch)];	165	rxvt_font *f = (*fs)[fs->find_font (ch)];
161	wchar_t *chr, *alloc, ch2;	166	wchar_t *chr, *alloc, ch2, *fname;
162	int len;	167	int len;
163		168
		169	fname = rxvt_utf8towcs (f->name);
		170
164	#if ENABLE_COMBINING	171	# if ENABLE_COMBINING
165	if (IS_COMPOSE (ch))	172	if (IS_COMPOSE (ch))
166	{	173	{
167	len = rxvt_composite.expand (ch, 0);	174	len = rxvt_composite.expand (ch, 0);
168	alloc = chr = new wchar_t[len];	175	alloc = chr = new wchar_t[len];
169	rxvt_composite.expand (ch, chr);	176	rxvt_composite.expand (ch, chr);
170	}	177	}
171	else	178	else
172	#endif	179	# endif
173	{	180	{
174	ch2 = ch;	181	ch2 = ch;
175		182
176	alloc = 0;	183	alloc = 0;
177	chr = &ch2;	184	chr = &ch2;
178	len = 1;	185	len = 1;
179	}	186	}
180		187
181	int width = strlen (f->name);	188	char attr[80]; // plenty
182		189
183	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	190	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		191	(int)r,
		192	fgcolor_of (r), bgcolor_of (r),
		193	r & RS_Bold ? " bold" : "",
		194	r & RS_Italic ? " italic" : "",
		195	r & RS_Blink ? " blink" : "",
		196	r & RS_RVid ? " rvid" : "",
		197	r & RS_Uline ? " uline" : "",
		198	r & RS_Careful ? " careful" : "");
		199
		200	int width = wcswidth (fname, wcslen (fname));
		201
		202	max_it (width, 8+5); // for char + hey
		203	max_it (width, strlen (attr));
		204
		205	if (y >= 0)
		206	{
		207	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		208	x = 0;
		209	}
		210
		211	scr_overlay_new (x, y, width, len + 2);
184		212
185	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	213	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186		214
187	for (int y = 0; y < len; y++)	215	for (int y = 0; y < len; y++)
188	{	216	{
…		…
191	ch = *chr++;	219	ch = *chr++;
192		220
193	sprintf (buf, "%8x", ch);	221	sprintf (buf, "%8x", ch);
194	scr_overlay_set (0, y, buf);	222	scr_overlay_set (0, y, buf);
195	scr_overlay_set (9, y, '=');	223	scr_overlay_set (9, y, '=');
196	#if !UNICODE3	224	# if !UNICODE3
197	if (ch >= 0x10000)	225	if (ch >= 0x10000)
198	ch = 0xfffd;	226	ch = 0xfffd;
199	#endif	227	# endif
200	scr_overlay_set (11, y, ch, r);	228	scr_overlay_set (11, y, ch, r);
201	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
202	}	230	}
203		231
		232	scr_overlay_set (0, len , attr);
204	scr_overlay_set (0, len, f->name);	233	scr_overlay_set (0, len + 1, fname);
205		234
		235	free (fname);
		236
206	#if ENABLE_COMBINING	237	# if ENABLE_COMBINING
207	if (alloc)	238	if (alloc)
208	delete [] alloc;	239	delete [] alloc;
209	#endif	240	# endif
210	}	241	}
211	#endif	242	#endif
212		243
213	void	244	void
214	rxvt_term::commit_iso14755 ()	245	rxvt_term::commit_iso14755 ()
…		…
277	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278	* escape sequence to toggle the Keypad.	309	* escape sequence to toggle the Keypad.
279	*	310	*
280	* Always permit `shift' to override the current setting	311	* Always permit `shift' to override the current setting
281	*/	312	*/
282	shft = (ev.state & ShiftMask);	313	shft = ev.state & ShiftMask;
283	ctrl = (ev.state & ControlMask);	314	ctrl = ev.state & ControlMask;
284	meta = (ev.state & ModMetaMask);	315	meta = ev.state & ModMetaMask;
285		316
286	if (numlock_state || (ev.state & ModNumLockMask))	317	if (numlock_state || (ev.state & ModNumLockMask))
287	{	318	{
288	numlock_state = (ev.state & ModNumLockMask);	319	numlock_state = (ev.state & ModNumLockMask);
289	PrivMode ((!numlock_state), PrivMode_aplKP);	320	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
309		340
310	// the XOpenIM manpage lies about hardcoding the locale	341	// the XOpenIM manpage lies about hardcoding the locale
311	// at the point of XOpenIM, so temporarily switch locales	342	// at the point of XOpenIM, so temporarily switch locales
312	if (rs[Rs_imLocale])	343	if (rs[Rs_imLocale])
313	SET_LOCALE (rs[Rs_imLocale]);	344	SET_LOCALE (rs[Rs_imLocale]);
		345
314	// assume wchar_t == unicode or better	346	// assume wchar_t == unicode or better
315	len = XwcLookupString (Input_Context, &ev, wkbuf,	347	len = XwcLookupString (Input_Context, &ev, wkbuf,
316	KBUFSZ, &keysym, &status_return);	348	KBUFSZ, &keysym, &status_return);
		349
317	if (rs[Rs_imLocale])	350	if (rs[Rs_imLocale])
318	SET_LOCALE (locale);	351	SET_LOCALE (locale);
319		352
320	if (status_return == XLookupChars	353	if (status_return == XLookupChars
321	|| status_return == XLookupBoth)	354	|| status_return == XLookupBoth)
…		…
353	#ifdef KEYSYM_RESOURCE	386	#ifdef KEYSYM_RESOURCE
354	if (keyboard->dispatch (this, keysym, ev.state))	387	if (keyboard->dispatch (this, keysym, ev.state))
355	return;	388	return;
356	#endif	389	#endif
357		390
358	if (TermWin.saveLines)	391	if (saveLines)
359	{	392	{
360	#ifdef UNSHIFTED_SCROLLKEYS	393	#ifdef UNSHIFTED_SCROLLKEYS
361	if (!ctrl && !meta)	394	if (!ctrl && !meta)
362	#else	395	#else
363	if (IS_SCROLL_MOD)	396	if (IS_SCROLL_MOD)
364	#endif	397	#endif
365	{	398	{
366	int lnsppg;	399	int lnsppg;
367		400
368	#ifdef PAGING_CONTEXT_LINES	401	#ifdef PAGING_CONTEXT_LINES
369	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	402	lnsppg = nrow - PAGING_CONTEXT_LINES;
370	#else	403	#else
371	lnsppg = TermWin.nrow * 4 / 5;	404	lnsppg = nrow * 4 / 5;
372	#endif	405	#endif
373	if (keysym == XK_Prior)	406	if (keysym == XK_Prior)
374	{	407	{
375	scr_page (UP, lnsppg);	408	scr_page (UP, lnsppg);
376	return;	409	return;
…		…
513	else	546	else
514	strcpy (kbuf, key_backspace);	547	strcpy (kbuf, key_backspace);
515	break;	548	break;
516	#endif	549	#endif
517	#ifndef NO_DELETE_KEY	550	#ifndef NO_DELETE_KEY
		551	# ifdef XK_KP_Prior
		552	case XK_KP_Delete:
		553	/* allow shift to override */
		554	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		555	{
		556	strcpy (kbuf, "\033On");
		557	break;
		558	}
		559	/* FALLTHROUGH */
		560	# endif
518	case XK_Delete:	561	case XK_Delete:
519	strcpy (kbuf, key_delete);	562	strcpy (kbuf, key_delete);
520	break;	563	break;
521	#endif	564	#endif
522	case XK_Tab:	565	case XK_Tab:
…		…
625	#ifdef XK_KP_Begin	668	#ifdef XK_KP_Begin
626	case XK_KP_Begin:	669	case XK_KP_Begin:
627	strcpy (kbuf, "\033Ou");	670	strcpy (kbuf, "\033Ou");
628	break;	671	break;
629		672
630	case XK_KP_Insert:
631	strcpy (kbuf, "\033Op");
632	break;
633
634	case XK_KP_Delete:
635	strcpy (kbuf, "\033On");
636	break;
637	#endif	673	#endif
638	case XK_KP_F1: /* "\033OP" */	674	case XK_KP_F1: /* "\033OP" */
639	case XK_KP_F2: /* "\033OQ" */	675	case XK_KP_F2: /* "\033OQ" */
640	case XK_KP_F3: /* "\033OR" */	676	case XK_KP_F3: /* "\033OR" */
641	case XK_KP_F4: /* "\033OS" */	677	case XK_KP_F4: /* "\033OS" */
…		…
673	break;	709	break;
674		710
675	case XK_Find:	711	case XK_Find:
676	strcpy (kbuf, "\033[1~");	712	strcpy (kbuf, "\033[1~");
677	break;	713	break;
		714
		715	#ifdef XK_KP_End
		716	case XK_KP_Insert:
		717	/* allow shift to override */
		718	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		719	{
		720	strcpy (kbuf, "\033Op");
		721	break;
		722	}
		723	/* FALLTHROUGH */
		724	#endif
678	case XK_Insert:	725	case XK_Insert:
679	strcpy (kbuf, "\033[2~");	726	strcpy (kbuf, "\033[2~");
680	break;	727	break;
681	#ifdef DXK_Remove /* support for DEC remove like key */	728	#ifdef DXK_Remove /* support for DEC remove like key */
682	case DXK_Remove:	729	case DXK_Remove:
…		…
817	}	864	}
818		865
819	if (len <= 0)	866	if (len <= 0)
820	return; /* not mapped */	867	return; /* not mapped */
821		868
822	if (options & Opt_scrollTtyKeypress)	869	if (OPTION (Opt_scrollTtyKeypress))
823	if (TermWin.view_start)	870	if (view_start)
824	{	871	{
825	TermWin.view_start = 0;	872	view_start = 0;
826	want_refresh = 1;	873	want_refresh = 1;
827	}	874	}
828		875
829	/*	876	/*
830	* these modifications only affect the static keybuffer	877	* these modifications only affect the static keybuffer
…		…
1007	{	1054	{
1008	if (mouse_slip_wheel_speed == 0	1055	if (mouse_slip_wheel_speed == 0
1009	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1056	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010	: scr_page (UP, mouse_slip_wheel_speed))	1057	: scr_page (UP, mouse_slip_wheel_speed))
1011	{	1058	{
1012	if (TermWin.view_start == TermWin.nscrolled ||	1059	if (view_start == nsaved ||
1013	TermWin.view_start == 0)	1060	view_start == 0)
1014	mouse_slip_wheel_speed = 0;	1061	mouse_slip_wheel_speed = 0;
1015		1062
1016	refresh_type |= SMOOTH_REFRESH;	1063	refresh_type |= SMOOTH_REFRESH;
1017	want_refresh = 1;	1064	want_refresh = 1;
1018	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1040	if (n > 0)	1087	if (n > 0)
1041	{	1088	{
1042	cmdbuf_endp += n;	1089	cmdbuf_endp += n;
1043	return true;	1090	return true;
1044	}	1091	}
1045	else if (n < 0 && errno != EAGAIN)	1092	else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
		1093	{
		1094	pty_ev.stop ();
		1095
		1096	if (!OPTION (Opt_hold))
1046	destroy ();	1097	destroy ();
		1098	}
1047		1099
1048	return false;	1100	return false;
1049	}	1101	}
1050		1102
1051	void	1103	void
…		…
1065	}	1117	}
1066		1118
1067	void	1119	void
1068	rxvt_term::pointer_unblank ()	1120	rxvt_term::pointer_unblank ()
1069	{	1121	{
1070	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1122	XDefineCursor (display->display, vt, TermWin_cursor);
1071	recolour_cursor ();	1123	recolour_cursor ();
1072		1124
1073	#ifdef POINTER_BLANK	1125	#ifdef POINTER_BLANK
1074	hidden_pointer = 0;	1126	hidden_pointer = 0;
1075		1127
1076	if (options & Opt_pointerBlank)	1128	if (OPTION (Opt_pointerBlank))
1077	pointer_ev.start (NOW + pointerBlankDelay);	1129	pointer_ev.start (NOW + pointerBlankDelay);
1078	#endif	1130	#endif
1079	}	1131	}
1080		1132
1081	#ifdef POINTER_BLANK	1133	#ifdef POINTER_BLANK
1082	void	1134	void
1083	rxvt_term::pointer_blank ()	1135	rxvt_term::pointer_blank ()
1084	{	1136	{
1085	if (! (options & Opt_pointerBlank))	1137	if (! OPTION (Opt_pointerBlank))
1086	return;	1138	return;
1087		1139
1088	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);	1140	XDefineCursor (display->display, vt, display->blank_cursor);
1089	XFlush (display->display);	1141	XFlush (display->display);
1090		1142
1091	hidden_pointer = 1;	1143	hidden_pointer = 1;
1092	}	1144	}
1093		1145
…		…
1182		1234
1183	/*{{{ process an X event */	1235	/*{{{ process an X event */
1184	void	1236	void
1185	rxvt_term::x_cb (XEvent &ev)	1237	rxvt_term::x_cb (XEvent &ev)
1186	{	1238	{
		1239	dDisp;
		1240
1187	SET_R (this);	1241	SET_R (this);
1188	SET_LOCALE (locale);	1242	SET_LOCALE (locale);
1189		1243
1190	#if defined(CURSOR_BLINK)	1244	#if defined(CURSOR_BLINK)
1191	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1245	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1192	{	1246	{
1193	if (hidden_cursor)	1247	if (hidden_cursor)
1194	{	1248	{
1195	hidden_cursor = 0;	1249	hidden_cursor = 0;
1196	want_refresh = 1;	1250	want_refresh = 1;
…		…
1199	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1253	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1200	}	1254	}
1201	#endif	1255	#endif
1202		1256
1203	#if defined(POINTER_BLANK)	1257	#if defined(POINTER_BLANK)
1204	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1258	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1205	{	1259	{
1206	if (ev.type == MotionNotify	1260	if (ev.type == MotionNotify
1207	|| ev.type == ButtonPress	1261	|| ev.type == ButtonPress
1208	|| ev.type == ButtonRelease)	1262	|| ev.type == ButtonRelease)
1209	if (hidden_pointer)	1263	if (hidden_pointer)
…		…
1307	button_release (ev.xbutton);	1361	button_release (ev.xbutton);
1308	break;	1362	break;
1309		1363
1310	case ClientMessage:	1364	case ClientMessage:
1311	if (ev.xclient.format == 32	1365	if (ev.xclient.format == 32
		1366	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1367	{
1312	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1368	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313	destroy ();	1369	destroy ();
		1370	#if ENABLE_EWMH
		1371	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1372	XSendEvent (disp, ev.xclient.window = display->root,
		1373	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1374	&ev);
		1375	#endif
		1376	}
		1377	#if ENABLE_XEMBED
		1378	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1379	{
		1380	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1381	focus_in ();
		1382	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1383	focus_out ();
		1384	}
		1385	#endif
1314	#ifdef OFFIX_DND	1386	#ifdef OFFIX_DND
1315	/* OffiX Dnd (drag 'n' drop) protocol */	1387	/* OffiX Dnd (drag 'n' drop) protocol */
1316	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1388	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317	&& (ev.xclient.data.l[0] == DndFile	1389	&& (ev.xclient.data.l[0] == DndFile
1318	|| ev.xclient.data.l[0] == DndDir	1390	|| ev.xclient.data.l[0] == DndDir
1319	|| ev.xclient.data.l[0] == DndLink))	1391	|| ev.xclient.data.l[0] == DndLink))
1320	{	1392	{
1321	/* Get Dnd data */	1393	/* Get Dnd data */
1322	Atom ActualType;	1394	Atom ActualType;
1323	int ActualFormat;	1395	int ActualFormat;
1324	unsigned char *data;	1396	unsigned char *data;
1325	unsigned long Size, RemainingBytes;	1397	unsigned long Size, RemainingBytes;
1326		1398
1327	XGetWindowProperty (display->display, display->root,	1399	XGetWindowProperty (disp, display->root,
1328	xa[XA_DNDSELECTION],	1400	xa[XA_DNDSELECTION],
1329	0L, 1000000L,	1401	0L, 1000000L,
1330	False, AnyPropertyType,	1402	False, AnyPropertyType,
1331	&ActualType, &ActualFormat,	1403	&ActualType, &ActualFormat,
1332	&Size, &RemainingBytes,	1404	&Size, &RemainingBytes,
1333	&data);	1405	&data);
1334	set_string_property (XA_CUT_BUFFER0, data);	1406	set_string_property (XA_CUT_BUFFER0, data);
1335	XFree (data);	1407	XFree (data);
1336	selection_paste (display->root, XA_CUT_BUFFER0, true);	1408	selection_paste (display->root, XA_CUT_BUFFER0, true);
1337	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1409	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338	}	1410	}
1339	#endif /* OFFIX_DND */	1411	#endif /* OFFIX_DND */
1340	break;	1412	break;
1341		1413
1342	case MappingNotify:	1414	case MappingNotify:
…		…
1367	break;	1439	break;
1368	}	1440	}
1369	break;	1441	break;
1370		1442
1371	case FocusIn:	1443	case FocusIn:
1372	if (!TermWin.focus)	1444	focus_in ();
		1445	break;
		1446
		1447	case FocusOut:
		1448	focus_out ();
		1449	break;
		1450
		1451	case ConfigureNotify:
		1452	if (ev.xconfigure.window == parent[0])
1373	{	1453	{
1374	TermWin.focus = 1;
1375	want_refresh = 1;
1376	#ifdef USE_XIM
1377	if (Input_Context != NULL)
1378	{
1379	IMSetStatusPosition ();
1380	XSetICFocus (Input_Context);
1381	}
1382	#endif
1383	#ifdef CURSOR_BLINK
1384	if (options & Opt_cursorBlink)
1385	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386	#endif
1387	#ifdef OFF_FOCUS_FADING
1388	if (rs[Rs_fade])
1389	{
1390	pix_colors = pix_colors_focused;
1391	scr_recolour ();
1392	}
1393	#endif
1394
1395	}
1396	break;
1397
1398	case FocusOut:
1399	if (TermWin.focus)
1400	{
1401	TermWin.focus = 0;
1402	want_refresh = 1;
1403
1404	#if ENABLE_FRILLS || ISO_14755
1405	iso14755buf = 0;
1406	#endif
1407	#if ENABLE_OVERLAY
1408	scr_overlay_off ();
1409	#endif
1410	#ifdef USE_XIM
1411	if (Input_Context != NULL)
1412	XUnsetICFocus (Input_Context);
1413	#endif
1414	#ifdef CURSOR_BLINK
1415	if (options & Opt_cursorBlink)
1416	cursor_blink_ev.stop ();
1417	hidden_cursor = 0;
1418	#endif
1419	#ifdef OFF_FOCUS_FADING
1420	if (rs[Rs_fade])
1421	{
1422	pix_colors = pix_colors_unfocused;
1423	scr_recolour ();
1424	}
1425	#endif
1426	}
1427	break;
1428
1429	case ConfigureNotify:
1430	if (ev.xconfigure.window == TermWin.parent[0])
1431	{
1432	int height, width;
1433
1434	do
1435	{ /* Wrap lots of configures into one */
1436	width = ev.xconfigure.width;
1437	height = ev.xconfigure.height;
1438	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439	}
1440	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1454	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1455	;
1441		1456
1442	if (szHint.width != width || szHint.height != height)	1457	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443	{	1458	{
1444	seen_resize = 1;	1459	seen_resize = 1;
1445	resize_all_windows (width, height, 1);	1460	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446	}	1461	}
1447		1462
1448	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1463	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449	if (options & Opt_transparent)	1464	if (OPTION (Opt_transparent))
1450	check_our_parents ();	1465	check_our_parents ();
1451	#endif	1466	#endif
1452	}	1467	}
1453	break;	1468	break;
1454		1469
…		…
1471	case SelectionRequest:	1486	case SelectionRequest:
1472	selection_send (ev.xselectionrequest);	1487	selection_send (ev.xselectionrequest);
1473	break;	1488	break;
1474		1489
1475	case UnmapNotify:	1490	case UnmapNotify:
1476	TermWin.mapped = 0;	1491	mapped = 0;
1477	#ifdef TEXT_BLINK	1492	#ifdef TEXT_BLINK
1478	text_blink_ev.stop ();	1493	text_blink_ev.stop ();
1479	#endif	1494	#endif
1480	break;	1495	break;
1481		1496
1482	case MapNotify:	1497	case MapNotify:
1483	TermWin.mapped = 1;	1498	mapped = 1;
1484	#ifdef TEXT_BLINK	1499	#ifdef TEXT_BLINK
1485	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1500	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486	#endif	1501	#endif
1487	break;	1502	break;
1488		1503
…		…
1492	break;	1507	break;
1493	#endif /* TRANSPARENT */	1508	#endif /* TRANSPARENT */
1494		1509
1495	case GraphicsExpose:	1510	case GraphicsExpose:
1496	case Expose:	1511	case Expose:
1497	if (ev.xany.window == TermWin.vt)	1512	if (ev.xany.window == vt)
1498	{	1513	{
1499	do	1514	do
1500	scr_expose (ev.xexpose.x, ev.xexpose.y,	1515	scr_expose (ev.xexpose.x, ev.xexpose.y,
1501	ev.xexpose.width, ev.xexpose.height, False);	1516	ev.xexpose.width, ev.xexpose.height, False);
1502	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1517	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503		1518
1504	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1519	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505		1520
1506	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1521	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507	scr_expose (ev.xexpose.x, ev.xexpose.y,	1522	scr_expose (ev.xexpose.x, ev.xexpose.y,
1508	ev.xexpose.width, ev.xexpose.height, False);	1523	ev.xexpose.width, ev.xexpose.height, False);
1509		1524
1510	scr_refresh (refresh_type);	1525	scr_refresh (refresh_type);
1511	}	1526	}
1512	else	1527	else
1513	{	1528	{
1514	XEvent unused_event;	1529	XEvent unused_event;
1515		1530
1516	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1531	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517	;	1532	;
1518	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1533	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519	;	1534	;
1520		1535
1521	if (isScrollbarWindow (ev.xany.window))	1536	if (isScrollbarWindow (ev.xany.window))
1522	{	1537	{
1523	scrollBar.setIdle ();	1538	scrollBar.setIdle ();
…		…
1527	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1542	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528	menubar_expose ();	1543	menubar_expose ();
1529	#endif	1544	#endif
1530		1545
1531	#ifdef TRANSPARENT	1546	#ifdef TRANSPARENT
1532	if (am_transparent && ev.xany.window == TermWin.parent[0])	1547	if (am_transparent && ev.xany.window == parent[0])
1533	XClearWindow (display->display, ev.xany.window);	1548	XClearWindow (disp, ev.xany.window);
1534	#endif	1549	#endif
1535	}	1550	}
1536	break;	1551	break;
1537		1552
1538	case MotionNotify:	1553	case MotionNotify:
…		…
1548	}	1563	}
1549	#endif	1564	#endif
1550	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1565	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551	break;	1566	break;
1552		1567
1553	if (ev.xany.window == TermWin.vt)	1568	if (ev.xany.window == vt)
1554	{	1569	{
1555	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1570	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556	{	1571	{
1557	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1572	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558	;	1573	;
1559		1574
1560	XQueryPointer (display->display, TermWin.vt,	1575	XQueryPointer (disp, vt,
1561	&unused_root, &unused_child,	1576	&unused_root, &unused_child,
1562	&unused_root_x, &unused_root_y,	1577	&unused_root_x, &unused_root_y,
1563	&ev.xbutton.x, &ev.xbutton.y,	1578	&ev.xbutton.x, &ev.xbutton.y,
1564	&ev.xbutton.state);	1579	&ev.xbutton.state);
1565	#ifdef MOUSE_THRESHOLD	1580	#ifdef MOUSE_THRESHOLD
…		…
1577	#endif	1592	#endif
1578	selection_extend (ev.xbutton.x, ev.xbutton.y,	1593	selection_extend (ev.xbutton.x, ev.xbutton.y,
1579	ev.xbutton.state & Button3Mask ? 2 : 0);	1594	ev.xbutton.state & Button3Mask ? 2 : 0);
1580		1595
1581	#ifdef SELECTION_SCROLLING	1596	#ifdef SELECTION_SCROLLING
1582	if (ev.xbutton.y < TermWin.int_bwidth	1597	if (ev.xbutton.y < int_bwidth
1583	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1598	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1584	{	1599	{
1585	int dist;	1600	int dist;
1586		1601
1587	/* don't clobber the current delay if we are	1602	/* don't clobber the current delay if we are
1588	* already in the middle of scrolling.	1603	* already in the middle of scrolling.
…		…
1596	selection_save_x = ev.xbutton.x;	1611	selection_save_x = ev.xbutton.x;
1597	selection_save_y = ev.xbutton.y;	1612	selection_save_y = ev.xbutton.y;
1598	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1613	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599		1614
1600	/* calc number of lines to scroll */	1615	/* calc number of lines to scroll */
1601	if (ev.xbutton.y < TermWin.int_bwidth)	1616	if (ev.xbutton.y < int_bwidth)
1602	{	1617	{
1603	scroll_selection_dir = UP;	1618	scroll_selection_dir = UP;
1604	dist = TermWin.int_bwidth - ev.xbutton.y;	1619	dist = int_bwidth - ev.xbutton.y;
1605	}	1620	}
1606	else	1621	else
1607	{	1622	{
1608	scroll_selection_dir = DN;	1623	scroll_selection_dir = DN;
1609	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1624	dist = ev.xbutton.y - (int_bwidth + height);
1610	}	1625	}
1611		1626
1612	scroll_selection_lines = Pixel2Height (dist)	1627	scroll_selection_lines = Pixel2Height (dist)
1613	/ SELECTION_SCROLL_LINE_SPEEDUP	1628	/ SELECTION_SCROLL_LINE_SPEEDUP
1614	+ 1;	1629	+ 1;
1615	MIN_IT (scroll_selection_lines,	1630	min_it (scroll_selection_lines,
1616	SELECTION_SCROLL_MAX_LINES);	1631	SELECTION_SCROLL_MAX_LINES);
1617	}	1632	}
1618	else	1633	else
1619	{	1634	{
1620	/* we are within the text window, so we	1635	/* we are within the text window, so we
…		…
1629	#endif	1644	#endif
1630	}	1645	}
1631	}	1646	}
1632	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1647	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633	{	1648	{
1634	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1649	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635	MotionNotify, &ev))	1650	MotionNotify, &ev))
1636	;	1651	;
1637		1652
1638	XQueryPointer (display->display, scrollBar.win,	1653	XQueryPointer (disp, scrollBar.win,
1639	&unused_root, &unused_child,	1654	&unused_root, &unused_child,
1640	&unused_root_x, &unused_root_y,	1655	&unused_root_x, &unused_root_y,
1641	&ev.xbutton.x, &ev.xbutton.y,	1656	&ev.xbutton.x, &ev.xbutton.y,
1642	&unused_mask);	1657	&unused_mask);
1643	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1648	}	1663	}
1649	break;	1664	break;
1650	}	1665	}
1651	}	1666	}
1652		1667
		1668	void
		1669	rxvt_term::focus_in ()
		1670	{
		1671	if (!focus)
		1672	{
		1673	focus = 1;
		1674	want_refresh = 1;
		1675	#if USE_XIM
		1676	if (Input_Context != NULL)
		1677	{
		1678	IMSetStatusPosition ();
		1679	XSetICFocus (Input_Context);
		1680	}
		1681	#endif
		1682	#if CURSOR_BLINK
		1683	if (OPTION (Opt_cursorBlink))
		1684	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1685	#endif
		1686	#if OFF_FOCUS_FADING
		1687	if (rs[Rs_fade])
		1688	{
		1689	pix_colors = pix_colors_focused;
		1690	scr_recolour ();
		1691	}
		1692	#endif
		1693	}
		1694	}
		1695
		1696	void
		1697	rxvt_term::focus_out ()
		1698	{
		1699	if (focus)
		1700	{
		1701	focus = 0;
		1702	want_refresh = 1;
		1703
		1704	#if ENABLE_FRILLS || ISO_14755
		1705	iso14755buf = 0;
		1706	#endif
		1707	#if ENABLE_OVERLAY
		1708	scr_overlay_off ();
		1709	#endif
		1710	#if USE_XIM
		1711	if (Input_Context != NULL)
		1712	XUnsetICFocus (Input_Context);
		1713	#endif
		1714	#if CURSOR_BLINK
		1715	if (OPTION (Opt_cursorBlink))
		1716	cursor_blink_ev.stop ();
		1717	hidden_cursor = 0;
		1718	#endif
		1719	#if OFF_FOCUS_FADING
		1720	if (rs[Rs_fade])
		1721	{
		1722	pix_colors = pix_colors_unfocused;
		1723	scr_recolour ();
		1724	}
		1725	#endif
		1726	}
		1727	}
		1728
1653	#if TRANSPARENT	1729	#if TRANSPARENT
1654	void	1730	void
1655	rxvt_term::rootwin_cb (XEvent &ev)	1731	rxvt_term::rootwin_cb (XEvent &ev)
1656	{	1732	{
1657	SET_R (this);	1733	SET_R (this);
…		…
1668	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1744	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669	return;	1745	return;
1670		1746
1671	/* FALLTHROUGH */	1747	/* FALLTHROUGH */
1672	case ReparentNotify:	1748	case ReparentNotify:
1673	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1749	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1674	want_refresh = want_full_refresh = 1;	1750	want_refresh = want_full_refresh = 1;
1675	break;	1751	break;
1676	}	1752	}
1677	}	1753	}
1678	#endif	1754	#endif
…		…
1687	reportmode = !! (priv_modes & PrivMode_mouse_report);	1763	reportmode = !! (priv_modes & PrivMode_mouse_report);
1688		1764
1689	/*	1765	/*
1690	* VT window processing of button press	1766	* VT window processing of button press
1691	*/	1767	*/
1692	if (ev.window == TermWin.vt)	1768	if (ev.window == vt)
1693	{	1769	{
1694	#if ISO_14755	1770	#if ISO_14755
1695	// 5.4	1771	// 5.4
1696	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1772	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697	{	1773	{
…		…
1902	case Button3:	1978	case Button3:
1903	if (scrollBar.style != R_SB_XTERM)	1979	if (scrollBar.style != R_SB_XTERM)
1904	{	1980	{
1905	if (scrollbar_above_slider (ev.y))	1981	if (scrollbar_above_slider (ev.y))
1906	# ifdef RXVT_SCROLL_FULL	1982	# ifdef RXVT_SCROLL_FULL
1907	scr_page (UP, TermWin.nrow - 1);	1983	scr_page (UP, nrow - 1);
1908	# else	1984	# else
1909	scr_page (UP, TermWin.nrow / 4);	1985	scr_page (UP, nrow / 4);
1910	# endif	1986	# endif
1911	else if (scrollbar_below_slider (ev.y))	1987	else if (scrollbar_below_slider (ev.y))
1912	# ifdef RXVT_SCROLL_FULL	1988	# ifdef RXVT_SCROLL_FULL
1913	scr_page (DN, TermWin.nrow - 1);	1989	scr_page (DN, nrow - 1);
1914	# else	1990	# else
1915	scr_page (DN, TermWin.nrow / 4);	1991	scr_page (DN, nrow / 4);
1916	# endif	1992	# endif
1917	else	1993	else
1918	scrollBar.setMotion ();	1994	scrollBar.setMotion ();
1919	}	1995	}
1920	else	1996	else
1921	{	1997	{
1922	scr_page ((ev.button == Button1 ? DN : UP),	1998	scr_page ((ev.button == Button1 ? DN : UP),
1923	(TermWin.nrow	1999	(nrow
1924	* scrollbar_position (ev.y)	2000	* scrollbar_position (ev.y)
1925	/ scrollbar_size ()));	2001	/ scrollbar_size ()));
1926	}	2002	}
1927		2003
1928	break;	2004	break;
…		…
1960	#ifdef SELECTION_SCROLLING	2036	#ifdef SELECTION_SCROLLING
1961	if (sel_scroll_ev.active)	2037	if (sel_scroll_ev.active)
1962	sel_scroll_ev.stop();	2038	sel_scroll_ev.stop();
1963	#endif	2039	#endif
1964		2040
1965	if (ev.window == TermWin.vt)	2041	if (ev.window == vt)
1966	{	2042	{
1967	#if ISO_14755	2043	#if ISO_14755
1968	// 5.4	2044	// 5.4
1969	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2045	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970	return;	2046	return;
…		…
2020		2096
2021	v = ev.button == Button4 ? UP : DN;	2097	v = ev.button == Button4 ? UP : DN;
2022		2098
2023	if (ev.state & ShiftMask)	2099	if (ev.state & ShiftMask)
2024	i = 1;	2100	i = 1;
2025	else if (options & Opt_mouseWheelScrollPage)	2101	else if (OPTION (Opt_mouseWheelScrollPage))
2026	i = TermWin.nrow - 1;	2102	i = nrow - 1;
2027	else	2103	else
2028	i = 5;	2104	i = 5;
2029		2105
2030	# ifdef MOUSE_SLIP_WHEELING	2106	# ifdef MOUSE_SLIP_WHEELING
2031	if (ev.state & ControlMask)	2107	if (ev.state & ControlMask)
2032	{	2108	{
2033	mouse_slip_wheel_speed += v ? -1 : 1;	2109	mouse_slip_wheel_speed += v ? -1 : 1;
2034	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2110	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2035	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2111	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036		2112
2037	if (slip_wheel_ev.at < NOW)	2113	if (slip_wheel_ev.at < NOW)
2038	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2114	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039		2115
2040	slip_wheel_ev.start ();	2116	slip_wheel_ev.start ();
…		…
2081	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2157	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2158	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2159	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084	int i;	2160	int i;
2085		2161
2086	Visual* visual = display->visual;	2162	Visual *visual = display->visual;
2087		2163
2088	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2164	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089		2165
2090	/* for convenience */	2166	/* for convenience */
2091	mask_r = visual->red_mask;	2167	mask_r = visual->red_mask;
…		…
2312	Atom atype;	2388	Atom atype;
2313	unsigned char *prop = NULL;	2389	unsigned char *prop = NULL;
2314	Window root, oldp, *list;	2390	Window root, oldp, *list;
2315	Pixmap rootpixmap = None;	2391	Pixmap rootpixmap = None;
2316	XWindowAttributes wattr, wrootattr;	2392	XWindowAttributes wattr, wrootattr;
		2393	dDisp;
2317		2394
2318	pchanged = 0;	2395	pchanged = 0;
2319		2396
2320	if (!(options & Opt_transparent))	2397	if (!OPTION (Opt_transparent))
2321	return pchanged; /* Don't try any more */	2398	return pchanged; /* Don't try any more */
2322		2399
2323	XGetWindowAttributes (display->display, display->root, &wrootattr);	2400	XGetWindowAttributes (disp, display->root, &wrootattr);
2324	rootdepth = wrootattr.depth;	2401	rootdepth = wrootattr.depth;
2325		2402
2326	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2403	XGetWindowAttributes (disp, parent[0], &wattr);
2327		2404
2328	if (rootdepth != wattr.depth)	2405	if (rootdepth != wattr.depth)
2329	{	2406	{
2330	if (am_transparent)	2407	if (am_transparent)
2331	{	2408	{
2332	pchanged = 1;	2409	pchanged = 1;
2333	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2410	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334	am_transparent = am_pixmap_trans = 0;	2411	am_transparent = am_pixmap_trans = 0;
2335	}	2412	}
2336		2413
2337	return pchanged; /* Don't try any more */	2414	return pchanged; /* Don't try any more */
2338	}	2415	}
2339		2416
2340	/* Get all X ops out of the queue so that our information is up-to-date. */	2417	/* Get all X ops out of the queue so that our information is up-to-date. */
2341	XSync (display->display, False);	2418	XSync (disp, False);
2342		2419
2343	/*	2420	/*
2344	* Make the frame window set by the window manager have	2421	* Make the frame window set by the window manager have
2345	* the root background. Some window managers put multiple nested frame	2422	* the root background. Some window managers put multiple nested frame
2346	* windows for each client, so we have to take care about that.	2423	* windows for each client, so we have to take care about that.
2347	*/	2424	*/
2348	i = (xa[XA_XROOTPMAP_ID]	2425	i = (xa[XA_XROOTPMAP_ID]
2349	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2426	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2427	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351	&nitems, &bytes_after, &prop) == Success);	2428	&nitems, &bytes_after, &prop) == Success);
2352		2429
2353	if (!i || prop == NULL)	2430	if (!i || prop == NULL)
2354	i = (xa[XA_ESETROOT_PMAP_ID]	2431	i = (xa[XA_ESETROOT_PMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2432	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2358		2435
2359	if (!i || prop == NULL	2436	if (!i || prop == NULL
2360	#if TINTING	2437	#if TINTING
…		…
2379	Window cr;	2456	Window cr;
2380	XImage *image;	2457	XImage *image;
2381	GC gc;	2458	GC gc;
2382	XGCValues gcvalue;	2459	XGCValues gcvalue;
2383		2460
2384	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2461	XTranslateCoordinates (disp, parent[0], display->root,
2385	0, 0, &sx, &sy, &cr);	2462	0, 0, &sx, &sy, &cr);
2386	nw = (unsigned int)szHint.width;	2463	nw = (unsigned int)szHint.width;
2387	nh = (unsigned int)szHint.height;	2464	nh = (unsigned int)szHint.height;
2388	nx = ny = 0;	2465	nx = ny = 0;
2389		2466
…		…
2399	nh += sy;	2476	nh += sy;
2400	ny = -sy;	2477	ny = -sy;
2401	sy = 0;	2478	sy = 0;
2402	}	2479	}
2403		2480
2404	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2481	min_it (nw, (unsigned int) (wrootattr.width - sx));
2405	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2482	min_it (nh, (unsigned int) (wrootattr.height - sy));
2406		2483
2407	XSync (display->display, False);	2484	XSync (disp, False);
2408	allowedxerror = -1;	2485	allowedxerror = -1;
2409	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2486	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410		2487
2411	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2488	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2412	/* XXX: may need a delay here? */	2489	/* XXX: may need a delay here? */
2413	allowedxerror = 0;	2490	allowedxerror = 0;
2414		2491
2415	if (image == NULL)	2492	if (image == NULL)
2416	{	2493	{
2417	if (am_transparent && am_pixmap_trans)	2494	if (am_transparent && am_pixmap_trans)
2418	{	2495	{
2419	pchanged = 1;	2496	pchanged = 1;
2420	if (TermWin.pixmap != None)	2497	if (pixmap != None)
2421	{	2498	{
2422	XFreePixmap (display->display, TermWin.pixmap);	2499	XFreePixmap (disp, pixmap);
2423	TermWin.pixmap = None;	2500	pixmap = None;
2424	}	2501	}
2425	}	2502	}
2426		2503
2427	am_pixmap_trans = 0;	2504	am_pixmap_trans = 0;
2428	}	2505	}
2429	else	2506	else
2430	{	2507	{
2431	if (TermWin.pixmap != None)	2508	if (pixmap != None)
2432	XFreePixmap (display->display, TermWin.pixmap);	2509	XFreePixmap (disp, pixmap);
2433		2510
2434	#if TINTING	2511	#if TINTING
2435	if (ISSET_PIXCOLOR (Color_tint))	2512	if (ISSET_PIXCOLOR (Color_tint))
2436	{	2513	{
2437	unsigned short rm, gm, bm;	2514	unsigned short rm, gm, bm;
…		…
2441		2518
2442	ShadeXImage (display, image, shade, rm, gm, bm);	2519	ShadeXImage (display, image, shade, rm, gm, bm);
2443	}	2520	}
2444	#endif	2521	#endif
2445		2522
2446	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2523	pixmap = XCreatePixmap (disp, vt,
2447	szHint.width, szHint.height, image->depth);	2524	szHint.width, szHint.height, image->depth);
2448	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2525	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2526	XPutImage (disp, pixmap, gc, image, 0, 0,
2450	nx, ny, image->width, image->height);	2527	nx, ny, image->width, image->height);
2451	XFreeGC (display->display, gc);	2528	XFreeGC (disp, gc);
2452	XDestroyImage (image);	2529	XDestroyImage (image);
2453	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2530	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454	XClearWindow (display->display, TermWin.parent[0]);	2531	XClearWindow (disp, parent[0]);
2455		2532
2456	if (!am_transparent || !am_pixmap_trans)	2533	if (!am_transparent || !am_pixmap_trans)
2457	pchanged = 1;	2534	pchanged = 1;
2458		2535
2459	am_transparent = am_pixmap_trans = 1;	2536	am_transparent = am_pixmap_trans = 1;
2460	}	2537	}
2461	}	2538	}
2462		2539
2463	if (am_pixmap_trans)	2540	if (am_pixmap_trans)
2464	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2541	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465	else	2542	else
2466	{	2543	{
2467	unsigned int n;	2544	unsigned int n;
2468	/*	2545	/*
2469	* InheritPixmap transparency	2546	* InheritPixmap transparency
2470	*/	2547	*/
2471	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2548	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472	{	2549	{
2473	oldp = TermWin.parent[i];	2550	oldp = parent[i];
2474	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2551	XQueryTree (disp, parent[i - 1], &root,
2475	&TermWin.parent[i], &list, &n);	2552	&parent[i], &list, &n);
2476	XFree (list);	2553	XFree (list);
2477		2554
2478	if (TermWin.parent[i] == display->root)	2555	if (parent[i] == display->root)
2479	{	2556	{
2480	if (oldp != None)	2557	if (oldp != None)
2481	pchanged = 1;	2558	pchanged = 1;
2482		2559
2483	break;	2560	break;
2484	}	2561	}
2485		2562
2486	if (oldp != TermWin.parent[i])	2563	if (oldp != parent[i])
2487	pchanged = 1;	2564	pchanged = 1;
2488	}	2565	}
2489		2566
2490	n = 0;	2567	n = 0;
2491		2568
2492	if (pchanged)	2569	if (pchanged)
2493	{	2570	{
2494	for (; n < (unsigned int)i; n++)	2571	for (; n < (unsigned int)i; n++)
2495	{	2572	{
2496	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2573	XGetWindowAttributes (disp, parent[n], &wattr);
2497	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2574	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498	{	2575	{
2499	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2576	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500	break;	2577	break;
2501	}	2578	}
2502	}	2579	}
2503	}	2580	}
2504		2581
2505	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2582	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506	{	2583	{
2507	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2584	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2585	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509	am_transparent = 0;	2586	am_transparent = 0;
2510	/* XXX: also turn off Opt_transparent? */	2587	/* XXX: also turn off Opt_transparent? */
2511	}	2588	}
2512	else	2589	else
2513	{	2590	{
…		…
2516	* needed for fvwm2.2.2 (and before?) */	2593	* needed for fvwm2.2.2 (and before?) */
2517	sleep (1);	2594	sleep (1);
2518	#endif	2595	#endif
2519	for (n = 0; n < (unsigned int)i; n++)	2596	for (n = 0; n < (unsigned int)i; n++)
2520	{	2597	{
2521	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2598	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522	XClearWindow (display->display, TermWin.parent[n]);	2599	XClearWindow (disp, parent[n]);
2523	}	2600	}
2524		2601
2525	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2602	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526	am_transparent = 1;	2603	am_transparent = 1;
2527	}	2604	}
2528		2605
2529	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2606	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530	TermWin.parent[i] = None;	2607	parent[i] = None;
2531	}	2608	}
2532		2609
2533	if (scrollBar.win)	2610	if (scrollBar.win)
2534	{	2611	{
2535	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2612	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536	scrollBar.setIdle ();	2613	scrollBar.setIdle ();
2537	scrollbar_show (0);	2614	scrollbar_show (0);
2538	}	2615	}
2539		2616
2540	if (am_transparent)	2617	if (am_transparent)
…		…
2578	// some window managers resize the window early, and these programs	2655	// some window managers resize the window early, and these programs
2579	// then sometimes get the size wrong.	2656	// then sometimes get the size wrong.
2580	// unfortunately other programs are even more buggy and dislike	2657	// unfortunately other programs are even more buggy and dislike
2581	// being sent SIGWINCH, so only do it when we were in fact being	2658	// being sent SIGWINCH, so only do it when we were in fact being
2582	// resized.	2659	// resized.
2583	if (seen_resize)	2660	if (seen_resize && cmd_pid)
2584	kill (-cmd_pid, SIGWINCH);	2661	kill (-cmd_pid, SIGWINCH);
2585	}	2662	}
2586		2663
2587	/* Read a text string from the input buffer */	2664	/* Read a text string from the input buffer */
2588	unicode_t buf[UBUFSIZ];	2665	unicode_t buf[UBUFSIZ];
2589	bool refreshnow = false;	2666	bool refreshnow = false;
2590	int nlines = 0;	2667	int nlines = 0;
2591	unicode_t *str = buf;	2668	unicode_t *str = buf;
		2669	unicode_t *eol = str + min (ncol, UBUFSIZ);
2592		2670
2593	for (;;)	2671	for (;;)
2594	{	2672	{
2595	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2673	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596	break;	2674	break;
2597		2675
2598	*str++ = ch;	2676	*str++ = ch;
2599		2677
2600	if (ch == C0_LF)	2678	if (ch == C0_LF || str >= eol)
2601	{	2679	{
		2680	if (ch == C0_LF)
2602	nlines++;	2681	nlines++;
		2682
2603	refresh_count++;	2683	refresh_count++;
2604		2684
2605	if (!(options & Opt_jumpScroll)	2685	if (!OPTION (Opt_jumpScroll)
2606	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2686	|| (refresh_count >= refresh_limit * (nrow - 1)))
2607	{	2687	{
2608	refreshnow = true;	2688	refreshnow = true;
2609	ch = NOCHAR;	2689	ch = NOCHAR;
2610	break;	2690	break;
2611	}	2691	}
2612		2692
2613	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2693	// scr_add_lines only works for nlines <= nrow - 1.
2614	if (nlines >= TermWin.nrow - 1)	2694	if (nlines >= nrow - 1)
2615	{	2695	{
2616	scr_add_lines (buf, nlines, str - buf);	2696	scr_add_lines (buf, nlines, str - buf);
2617	nlines = 0;	2697	nlines = 0;
2618	str = buf;	2698	str = buf;
		2699	eol = str + min (ncol, UBUFSIZ);
2619	}	2700	}
2620	}
2621		2701
2622	if (str >= buf + UBUFSIZ)	2702	if (str >= eol)
2623	{	2703	{
		2704	if (eol >= buf + UBUFSIZ)
		2705	{
2624	ch = NOCHAR;	2706	ch = NOCHAR;
2625	break;	2707	break;
		2708	}
		2709	else
		2710	eol = min (eol + ncol, buf + UBUFSIZ);
		2711	}
		2712
2626	}	2713	}
2627		2714
2628	seq_begin = cmdbuf_ptr;	2715	seq_begin = cmdbuf_ptr;
2629	ch = next_char ();	2716	ch = next_char ();
2630	}	2717	}
…		…
2637	* the number of pages between refreshes is refresh_limit, which	2724	* the number of pages between refreshes is refresh_limit, which
2638	* is incremented here because we must be doing flat-out scrolling.	2725	* is incremented here because we must be doing flat-out scrolling.
2639	*/	2726	*/
2640	if (refreshnow)	2727	if (refreshnow)
2641	{	2728	{
2642	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2729	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643	refresh_limit++;	2730	refresh_limit++;
2644	else	2731	else
2645	{	2732	{
2646	flag = true;	2733	flag = true;
2647	scr_refresh (refresh_type);	2734	scr_refresh (refresh_type);
…		…
3174	{	3261	{
3175	switch (priv)	3262	switch (priv)
3176	{	3263	{
3177	case '>':	3264	case '>':
3178	if (ch == CSI_DA) /* secondary device attributes */	3265	if (ch == CSI_DA) /* secondary device attributes */
3179	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3266	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180	break;	3267	break;
3181	case '?':	3268	case '?':
3182	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3269	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183	process_terminal_mode (ch, priv, nargs, arg);	3270	process_terminal_mode (ch, priv, nargs, arg);
3184	break;	3271	break;
…		…
3289		3376
3290	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3377	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291	arg[0] = -arg[0];	3378	arg[0] = -arg[0];
3292	/* FALLTHROUGH */	3379	/* FALLTHROUGH */
3293	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3380	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3381	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295	break;	3382	break;
3296		3383
3297	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3384	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298	tt_write ((const unsigned char *)VT100_ANS,	3385	tt_write ((const unsigned char *)VT100_ANS,
3299	(unsigned int) (sizeof (VT100_ANS) - 1));	3386	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3311	break;	3398	break;
3312	case 6: /* CPR requested */	3399	case 6: /* CPR requested */
3313	scr_report_position ();	3400	scr_report_position ();
3314	break;	3401	break;
3315	case 7: /* unofficial extension */	3402	case 7: /* unofficial extension */
3316	if (options & Opt_insecure)	3403	if (OPTION (Opt_insecure))
3317	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3404	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318	break;	3405	break;
3319	case 8: /* unofficial extension */	3406	case 8: /* unofficial extension */
3320	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3407	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321	break;	3408	break;
…		…
3413	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3500	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414	{	3501	{
3415	int x, y;	3502	int x, y;
3416	XWindowAttributes wattr;	3503	XWindowAttributes wattr;
3417	Window wdummy;	3504	Window wdummy;
		3505	dDisp;
3418		3506
3419	if (nargs == 0)	3507	if (nargs == 0)
3420	return;	3508	return;
3421		3509
3422	switch (args[0])	3510	switch (args[0])
3423	{	3511	{
3424	/*	3512	/*
3425	* commands	3513	* commands
3426	*/	3514	*/
3427	case 1: /* deiconify window */	3515	case 1: /* deiconify window */
3428	XMapWindow (display->display, TermWin.parent[0]);	3516	XMapWindow (disp, parent[0]);
3429	break;	3517	break;
3430	case 2: /* iconify window */	3518	case 2: /* iconify window */
3431	XIconifyWindow (display->display, TermWin.parent[0],	3519	XIconifyWindow (disp, parent[0], display->screen);
3432	DefaultScreen (display->display));
3433	break;	3520	break;
3434	case 3: /* set position (pixels) */	3521	case 3: /* set position (pixels) */
3435	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3522	XMoveWindow (disp, parent[0], args[1], args[2]);
3436	break;	3523	break;
3437	case 4: /* set size (pixels) */	3524	case 4: /* set size (pixels) */
3438	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3525	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439	break;	3526	break;
3440	case 5: /* raise window */	3527	case 5: /* raise window */
3441	XRaiseWindow (display->display, TermWin.parent[0]);	3528	XRaiseWindow (disp, parent[0]);
3442	break;	3529	break;
3443	case 6: /* lower window */	3530	case 6: /* lower window */
3444	XLowerWindow (display->display, TermWin.parent[0]);	3531	XLowerWindow (disp, parent[0]);
3445	break;	3532	break;
3446	case 7: /* refresh window */	3533	case 7: /* refresh window */
3447	scr_touch (true);	3534	scr_touch (true);
3448	break;	3535	break;
3449	case 8: /* set size (chars) */	3536	case 8: /* set size (chars) */
3450	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3537	set_widthheight ((unsigned int) (args[2] * fwidth),
3451	(unsigned int) (args[1] * TermWin.fheight));	3538	(unsigned int) (args[1] * fheight));
3452	break;	3539	break;
3453		3540
3454	//case 9: NYI, TODO, restore maximized window or maximize window	3541	//case 9: NYI, TODO, restore maximized window or maximize window
3455	default:	3542	default:
3456	if (args[0] >= 24) /* set height (chars) */	3543	if (args[0] >= 24) /* set height (chars) */
3457	set_widthheight ((unsigned int)TermWin.width,	3544	set_widthheight ((unsigned int)width,
3458	(unsigned int) (args[1] * TermWin.fheight));	3545	(unsigned int) (args[1] * fheight));
3459	break;	3546	break;
3460		3547
3461		3548
3462	/*	3549	/*
3463	* reports - some output format copied from XTerm	3550	* reports - some output format copied from XTerm
3464	*/	3551	*/
3465	case 11: /* report window state */	3552	case 11: /* report window state */
3466	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3553	XGetWindowAttributes (disp, parent[0], &wattr);
3467	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3554	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468	break;	3555	break;
3469	case 13: /* report window position */	3556	case 13: /* report window position */
3470	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3557	XGetWindowAttributes (disp, parent[0], &wattr);
3471	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3558	XTranslateCoordinates (disp, parent[0], wattr.root,
3472	-wattr.border_width, -wattr.border_width,	3559	-wattr.border_width, -wattr.border_width,
3473	&x, &y, &wdummy);	3560	&x, &y, &wdummy);
3474	tt_printf ("\033[3;%d;%dt", x, y);	3561	tt_printf ("\033[3;%d;%dt", x, y);
3475	break;	3562	break;
3476	case 14: /* report window size (pixels) */	3563	case 14: /* report window size (pixels) */
3477	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3564	XGetWindowAttributes (disp, parent[0], &wattr);
3478	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3565	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479	break;	3566	break;
3480	case 18: /* report text area size (chars) */	3567	case 18: /* report text area size (chars) */
3481	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3568	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482	break;	3569	break;
3483	case 19: /* report window size (chars) */	3570	case 19: /* report window size (chars) */
3484	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3571	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485	break;	3572	break;
3486	case 20: /* report icon label */	3573	case 20: /* report icon label */
3487	{	3574	{
3488	char *s;	3575	char *s;
3489	XGetIconName (display->display, TermWin.parent[0], &s);	3576	XGetIconName (disp, parent[0], &s);
3490	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3577	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491	XFree (s);	3578	XFree (s);
3492	}	3579	}
3493	break;	3580	break;
3494	case 21: /* report window title */	3581	case 21: /* report window title */
3495	{	3582	{
3496	char *s;	3583	char *s;
3497	XFetchName (display->display, TermWin.parent[0], &s);	3584	XFetchName (disp, parent[0], &s);
3498	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3585	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499	XFree (s);	3586	XFree (s);
3500	}	3587	}
3501	break;	3588	break;
3502	}	3589	}
3503	}	3590	}
…		…
3535	else if (ch < 0x20)	3622	else if (ch < 0x20)
3536	return NULL; /* other control character - exit */	3623	return NULL; /* other control character - exit */
3537		3624
3538	seen_esc = false;	3625	seen_esc = false;
3539		3626
3540	if (n >= sizeof (string) - 1)	3627	if (n >= STRING_MAX - 1)
3541	// stop at some sane length	3628	// stop at some sane length
3542	return NULL;	3629	return NULL;
3543		3630
3544	if (ch == C0_SYN)	3631	if (ch == C0_SYN)
3545	string[n++] = cmd_get8 ();	3632	string[n++] = cmd_get8 ();
…		…
3613	set_window_color (color, str);	3700	set_window_color (color, str);
3614	}	3701	}
3615		3702
3616	/*	3703	/*
3617	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3704	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618	* 0 = change iconName/title
3619	* 1 = change iconName
3620	* 2 = change title
3621	* 4 = change color
3622	* 10 = change fg color
3623	* 11 = change bg color
3624	* 12 = change text color
3625	* 13 = change mouse foreground color
3626	* 17 = change highlight character colour
3627	* 18 = change bold character color
3628	* 19 = change underlined character color
3629	* 46 = change logfile (not implemented)
3630	* 50 = change font
3631	*
3632	* rxvt extensions:
3633	* 20 = bg pixmap
3634	* 39 = change default fg color
3635	* 49 = change default bg color
3636	* 55 = dump scrollback buffer and all of screen
3637	* 701 = change locale
3638	* 702 = find font
3639	* 703 = menu
3640	*/	3705	*/
3641	void	3706	void
3642	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3707	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3643	{	3708	{
3644	int changed = 0;	3709	int changed = 0;
3645	int color;	3710	int color;
3646	char *buf, *name;	3711	char *buf, *name;
3647	bool query = str[0] == '?' && !str[1];	3712	bool query = str[0] == '?' && !str[1];
3648	int saveop = op;	3713	int saveop = op;
		3714	dDisp;
3649		3715
3650	assert (str != NULL);	3716	assert (str != NULL);
3651	switch (op)	3717	switch (op)
3652	{	3718	{
3653	case XTerm_name:	3719	case XTerm_name:
…		…
3669	unsigned long bytes_after;	3735	unsigned long bytes_after;
3670	unsigned char *value = 0;	3736	unsigned char *value = 0;
3671	const char *str = "";	3737	const char *str = "";
3672		3738
3673	if (prop	3739	if (prop
3674	&& XGetWindowProperty (display->display, TermWin.parent[0],	3740	&& XGetWindowProperty (disp, parent[0],
3675	prop, 0, 1<<16, 0, AnyPropertyType,	3741	prop, 0, 1<<16, 0, AnyPropertyType,
3676	&actual_type, &actual_format,	3742	&actual_type, &actual_format,
3677	&nitems, &bytes_after, &value) == Success	3743	&nitems, &bytes_after, &value) == Success
3678	&& actual_type != None	3744	&& actual_type != None
3679	&& actual_format == 8)	3745	&& actual_format == 8)
…		…
3691	{	3757	{
3692	*eq = 0;	3758	*eq = 0;
3693	set_utf8_property (display->atom (str), eq + 1);	3759	set_utf8_property (display->atom (str), eq + 1);
3694	}	3760	}
3695	else	3761	else
3696	XDeleteProperty (display->display, TermWin.parent[0],	3762	XDeleteProperty (disp, parent[0],
3697	display->atom (str));	3763	display->atom (str));
3698	}	3764	}
3699	break;	3765	break;
3700		3766
3701	case XTerm_Color:	3767	case XTerm_Color:
…		…
3742	break;	3808	break;
3743	#ifndef NO_BOLD_UNDERLINE_REVERSE	3809	#ifndef NO_BOLD_UNDERLINE_REVERSE
3744	case XTerm_Color_BD:	3810	case XTerm_Color_BD:
3745	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3811	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746	break;	3812	break;
3747	case XTerm_Color_IT:
3748	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749	break;
3750	case XTerm_Color_UL:	3813	case XTerm_Color_UL:
3751	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3814	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752	break;	3815	break;
3753	case XTerm_Color_RV:	3816	case XTerm_Color_RV:
3754	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3817	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755	break;	3818	break;
		3819	case URxvt_Color_IT:
		3820	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3821	break;
3756	#endif	3822	#endif
3757	#if TRANSPARENT && TINTING	3823	#if TRANSPARENT && TINTING
3758	case XTerm_Color_tint:	3824	case URxvt_Color_tint:
3759	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3825	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760	check_our_parents ();	3826	check_our_parents ();
3761	if (am_transparent)	3827	if (am_transparent)
3762	want_full_refresh = want_refresh = 1;	3828	want_full_refresh = want_refresh = 1;
3763	break;	3829	break;
3764	#endif	3830	#endif
…		…
3776	{	3842	{
3777	str++;	3843	str++;
3778	#if XPM_BACKGROUND	3844	#if XPM_BACKGROUND
3779	changed += scale_pixmap (str);	3845	changed += scale_pixmap (str);
3780	#endif	3846	#endif
3781
3782	}	3847	}
		3848
3783	if (changed)	3849	if (changed)
3784	{	3850	{
3785	#ifdef XPM_BACKGROUND	3851	#ifdef XPM_BACKGROUND
3786	resize_pixmap ();	3852	resize_pixmap ();
3787	#endif	3853	#endif
…		…
3798		3864
3799	case XTerm_logfile:	3865	case XTerm_logfile:
3800	// TODO, when secure mode?	3866	// TODO, when secure mode?
3801	break;	3867	break;
3802		3868
		3869	#ifdef MENUBAR
		3870	case URxvt_Menu:
		3871	if (OPTION (Opt_insecure))
		3872	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3873	break;
		3874	#endif
		3875	#if 0
		3876	case XTerm_dumpscreen: /* no error notices */
		3877	{
		3878	int fd;
		3879	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3880	{
		3881	scr_dump (fd);
		3882	close (fd);
		3883	}
		3884	}
		3885	break;
		3886	#endif
3803	case XTerm_font:	3887	case XTerm_font:
3804	op = URxvt_font;	3888	op = URxvt_font;
3805	case URxvt_font:	3889	case URxvt_font:
3806	#if ENABLE_STYLES	3890	#if ENABLE_STYLES
3807	case URxvt_boldFont:	3891	case URxvt_boldFont:
3808	case URxvt_italicFont:	3892	case URxvt_italicFont:
3809	case URxvt_boldItalicFont:	3893	case URxvt_boldItalicFont:
3810	#endif	3894	#endif
3811	if (query)	3895	if (query)
3812	tt_printf ("\33]%d;%-.250s%c", saveop,	3896	tt_printf ("\33]%d;%-.250s%c", saveop,
3813	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3897	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3898	? fontset[op - URxvt_font]->fontdesc : "",
3815	resp);	3899	resp);
3816	else	3900	else
3817	{	3901	{
3818	const char *&res = rs[Rs_font + (op - URxvt_font)];	3902	const char *&res = rs[Rs_font + (op - URxvt_font)];
3819		3903
…		…
3822	set_fonts ();	3906	set_fonts ();
3823	}	3907	}
3824	break;	3908	break;
3825		3909
3826	#if ENABLE_FRILLS	3910	#if ENABLE_FRILLS
3827	case XTerm_locale:	3911	case URxvt_locale:
3828	if (query)	3912	if (query)
3829	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3913	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3830	else	3914	else
3831	{	3915	{
3832	set_locale (str);	3916	set_locale (str);
3833	pty.set_utf8_mode (enc_utf8);	3917	pty.set_utf8_mode (enc_utf8);
3834	# ifdef USE_XIM
3835	im_cb ();	3918	init_xlocale ();
3836	# endif
3837	}	3919	}
3838	break;	3920	break;
3839	#endif
3840		3921
3841	#ifdef MENUBAR	3922	case URxvt_view_up:
3842	case XTerm_Menu:	3923	case URxvt_view_down:
3843	if (options & Opt_insecure)	3924	int lines = atoi (str);
3844	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3925
3845	break;	3926	if (lines)
3846	#endif	3927	scr_page (op == URxvt_view_up ? UP : DN, lines);
3847	#if 0
3848	case XTerm_dumpscreen: /* no error notices */
3849	{	3928	else
3850	int fd;
3851	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852	{	3929	{
3853	scr_dump (fd);	3930	scr_erase_savelines ();
3854	close (fd);
3855	}	3931	}
3856	}	3932
3857	break;	3933	break;
3858	#endif	3934	#endif
3859	}	3935	}
3860	}	3936	}
3861	/*----------------------------------------------------------------------*/	3937	/*----------------------------------------------------------------------*/
…		…
3970	}	4046	}
3971		4047
3972	/* extra handling for values with state unkept */	4048	/* extra handling for values with state unkept */
3973	switch (arg[i])	4049	switch (arg[i])
3974	{	4050	{
		4051	#if ENABLE_STYLES
		4052	case 1021:
		4053	if (mode)
		4054	SET_OPTION (Opt_intensityStyles);
		4055	else
		4056	CLR_OPTION (Opt_intensityStyles);
		4057
		4058	want_refresh = 1;
		4059	want_full_refresh = 1;
		4060	break;
		4061	#endif
3975	case 1048: /* alternative cursor save */	4062	case 1048: /* alternative cursor save */
3976	case 1049:	4063	case 1049:
3977	if (options & Opt_secondaryScreen)	4064	if (OPTION (Opt_secondaryScreen))
3978	if (mode == 0)	4065	if (mode == 0)
3979	scr_cursor (RESTORE);	4066	scr_cursor (RESTORE);
3980	else if (mode == 1)	4067	else if (mode == 1)
3981	scr_cursor (SAVE);	4068	scr_cursor (SAVE);
3982	break;	4069	break;
…		…
3994	*/	4081	*/
3995	PrivMode (1, PrivMode_vt52);	4082	PrivMode (1, PrivMode_vt52);
3996	break;	4083	break;
3997	case 3: /* 80/132 */	4084	case 3: /* 80/132 */
3998	if (priv_modes & PrivMode_132OK)	4085	if (priv_modes & PrivMode_132OK)
3999	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4086	set_widthheight (((state ? 132 : 80) * fwidth), height);
4000	break;	4087	break;
4001	case 4: /* smooth scrolling */	4088	case 4: /* smooth scrolling */
4002	if (state)	4089	if (!state)
4003	options &= ~Opt_jumpScroll;	4090	SET_OPTION (Opt_jumpScroll);
4004	else	4091	else
4005	options |= Opt_jumpScroll;	4092	CLR_OPTION (Opt_jumpScroll);
4006	break;	4093	break;
4007	case 5: /* reverse video */	4094	case 5: /* reverse video */
4008	scr_rvideo_mode (state);	4095	scr_rvideo_mode (state);
4009	break;	4096	break;
4010	case 6: /* relative/absolute origins */	4097	case 6: /* relative/absolute origins */
…		…
4051	#if 0	4138	#if 0
4052	case 1001:	4139	case 1001:
4053	break; /* X11 mouse highlighting */	4140	break; /* X11 mouse highlighting */
4054	#endif	4141	#endif
4055	case 1010: /* scroll to bottom on TTY output inhibit */	4142	case 1010: /* scroll to bottom on TTY output inhibit */
4056	if (state)	4143	if (!state)
4057	options &= ~Opt_scrollTtyOutput;	4144	SET_OPTION (Opt_scrollTtyOutput);
4058	else	4145	else
4059	options |= Opt_scrollTtyOutput;	4146	CLR_OPTION (Opt_scrollTtyOutput);
4060	break;	4147	break;
4061	case 1011: /* scroll to bottom on key press */	4148	case 1011: /* scroll to bottom on key press */
4062	if (state)	4149	if (state)
4063	options |= Opt_scrollTtyKeypress;	4150	SET_OPTION (Opt_scrollTtyKeypress);
4064	else	4151	else
4065	options &= ~Opt_scrollTtyKeypress;	4152	CLR_OPTION (Opt_scrollTtyKeypress);
4066	break;	4153	break;
4067	case 1047: /* secondary screen w/ clearing last */	4154	case 1047: /* secondary screen w/ clearing last */
4068	if (options & Opt_secondaryScreen)	4155	if (OPTION (Opt_secondaryScreen))
4069	if (current_screen != PRIMARY)	4156	if (current_screen != PRIMARY)
4070	scr_erase_screen (2);	4157	scr_erase_screen (2);
4071	scr_change_screen (state);	4158	scr_change_screen (state);
4072	break;	4159	break;
4073	case 1049: /* secondary screen w/ clearing first */	4160	case 1049: /* secondary screen w/ clearing first */
4074	scr_change_screen (state);	4161	scr_change_screen (state);
4075	if (options & Opt_secondaryScreen)	4162	if (OPTION (Opt_secondaryScreen))
4076	if (current_screen != PRIMARY)	4163	if (current_screen != PRIMARY)
4077	scr_erase_screen (2);	4164	scr_erase_screen (2);
4078	break;	4165	break;
4079	default:	4166	default:
4080	break;	4167	break;
…		…
4230	case 106:	4317	case 106:
4231	case 107:	4318	case 107:
4232	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4319	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233	break;	4320	break;
4234	#endif	4321	#endif
4235
4236	}	4322	}
4237	}	4323	}
4238	}	4324	}
4239	/*}}} */	4325	/*}}} */
4240		4326
…		…
4321	}	4407	}
4322		4408
4323	memmove (v_buffer, v_buffer + written, v_buflen);	4409	memmove (v_buffer, v_buffer + written, v_buflen);
4324	}	4410	}
4325	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4411	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326	// original code just ignores this...	4412	pty_ev.set (EVENT_READ);
4327	destroy ();
4328	}	4413	}
4329		4414
4330	/*----------------------- end-of-file (C source) -----------------------*/	4415	/*----------------------- end-of-file (C source) -----------------------*/
4331		4416

Diff Legend

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