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

Diff Legend

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