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.232 by root, Wed Jan 4 01:10:08 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.
…		…
43	* along with this program; if not, write to the Free Software	43	* along with this program; if not, write to the Free Software
44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45	*----------------------------------------------------------------------*/	45	*----------------------------------------------------------------------*/
46		46
47	/*{{{ includes: */	47	/*{{{ includes: */
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h"
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h"
		50	#include "rxvtperl.h"
50	#include "version.h"	51	#include "version.h"
51	#include "command.h"	52	#include "command.h"
52		53
		54	#if HAVE_SCHED_YIELD
		55	#undef HAVE_SCHED_YIELD // disabled for the time being
		56	//# include <sched.h>
		57	#endif
		58
53	#ifdef KEYSYM_RESOURCE	59	#ifdef KEYSYM_RESOURCE
54	# include "keyboard.h"	60	# include "keyboard.h"
55	#endif	61	#endif
56		62
57	#include <cwchar>
58	#include <csignal>	63	#include <csignal>
59		64
60	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
61		66
62	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
118	XK_Escape, 0x238b,	123	XK_Escape, 0x238b,
119	XK_Undo, 0x238c,	124	XK_Undo, 0x238c,
120	XK_Print, 0x2399,	125	XK_Print, 0x2399,
121		126
122	XK_space, 0x2423,	127	XK_space, 0x2423,
		128
		129	#ifdef XK_KP_Begin
		130	XK_KP_Prior, 0x21de,
		131	XK_KP_Next, 0x21df,
		132	XK_KP_Begin, 0x2320,
		133	XK_KP_Insert, 0x2380,
		134	XK_KP_Delete, 0x2326,
123	XK_KP_Space, 0x2422,	135	XK_KP_Space, 0x2422,
		136	#endif
124	0,	137	0,
125	};	138	};
126		139
127	void	140	void
128	rxvt_term::iso14755_54 (int x, int y)	141	rxvt_term::iso14755_54 (int x, int y)
129	{	142	{
130	x = Pixel2Col (x);	143	x = Pixel2Col (x);
131	y = Pixel2Row (y);	144	y = Pixel2Row (y);
132		145
133	if (x < 0 || x >= TermWin.ncol	146	if (!IN_RANGE_EXC (x, 0, ncol)
134	|| y < 0 || y >= TermWin.nrow)	147	|| !IN_RANGE_EXC (y, 0, nrow))
135	return;	148	return;
136		149
137	for (;;)	150	for (;;)
138	{	151	{
139	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	152	const line_t &l = ROW(y - view_start);
		153
		154	text_t t = l.t[x];
140		155
141	if (t != NOCHAR || !x)	156	if (t != NOCHAR || !x)
142	{	157	{
143	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	158	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;	159	iso14755buf = ISO_14755_54;
146	break;	160	break;
147	}	161	}
148		162
149	x--;	163	x--;
150	}	164	}
151
152	}	165	}
153	#endif
154		166
155	#if ENABLE_OVERLAY
156	void	167	void
157	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	168	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158	{	169	{
159	rxvt_fontset *fs = FONTSET (r);	170	rxvt_fontset *fs = FONTSET (r);
160	rxvt_font *f = (*fs)[fs->find_font (ch)];	171	rxvt_font *f = (*fs)[fs->find_font (ch)];
161	wchar_t *chr, *alloc, ch2;	172	wchar_t *chr, *alloc, ch2, *fname;
162	int len;	173	int len;
163		174
		175	fname = rxvt_utf8towcs (f->name);
		176
164	#if ENABLE_COMBINING	177	# if ENABLE_COMBINING
165	if (IS_COMPOSE (ch))	178	if (IS_COMPOSE (ch))
166	{	179	{
167	len = rxvt_composite.expand (ch, 0);	180	len = rxvt_composite.expand (ch, 0);
168	alloc = chr = new wchar_t[len];	181	alloc = chr = new wchar_t[len];
169	rxvt_composite.expand (ch, chr);	182	rxvt_composite.expand (ch, chr);
170	}	183	}
171	else	184	else
172	#endif	185	# endif
173	{	186	{
174	ch2 = ch;	187	ch2 = ch;
175		188
176	alloc = 0;	189	alloc = 0;
177	chr = &ch2;	190	chr = &ch2;
178	len = 1;	191	len = 1;
179	}	192	}
180		193
181	int width = strlen (f->name);	194	char attr[80]; // plenty
182		195
183	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	196	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		197	(int)r,
		198	fgcolor_of (r), bgcolor_of (r),
		199	r & RS_Bold ? " bold" : "",
		200	r & RS_Italic ? " italic" : "",
		201	r & RS_Blink ? " blink" : "",
		202	r & RS_RVid ? " rvid" : "",
		203	r & RS_Uline ? " uline" : "",
		204	r & RS_Careful ? " careful" : "");
		205
		206	int width = wcswidth (fname, wcslen (fname));
		207
		208	max_it (width, 8+5); // for char + hey
		209	max_it (width, strlen (attr));
		210
		211	if (y >= 0)
		212	{
		213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		214	x = 0;
		215	}
		216
		217	scr_overlay_new (x, y, width, len + 2);
184		218
185	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186		220
187	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
188	{	222	{
…		…
191	ch = *chr++;	225	ch = *chr++;
192		226
193	sprintf (buf, "%8x", ch);	227	sprintf (buf, "%8x", ch);
194	scr_overlay_set (0, y, buf);	228	scr_overlay_set (0, y, buf);
195	scr_overlay_set (9, y, '=');	229	scr_overlay_set (9, y, '=');
196	#if !UNICODE3	230	# if !UNICODE3
197	if (ch >= 0x10000)	231	if (ch >= 0x10000)
198	ch = 0xfffd;	232	ch = 0xfffd;
199	#endif	233	# endif
200	scr_overlay_set (11, y, ch, r);	234	scr_overlay_set (11, y, ch, r);
201	scr_overlay_set (12, y, NOCHAR, r);	235	scr_overlay_set (12, y, NOCHAR, r);
202	}	236	}
203		237
		238	scr_overlay_set (0, len , attr);
204	scr_overlay_set (0, len, f->name);	239	scr_overlay_set (0, len + 1, fname);
205		240
		241	free (fname);
		242
206	#if ENABLE_COMBINING	243	# if ENABLE_COMBINING
207	if (alloc)	244	if (alloc)
208	delete [] alloc;	245	delete [] alloc;
209	#endif	246	# endif
210	}	247	}
211	#endif	248	#endif
212		249
213	void	250	void
214	rxvt_term::commit_iso14755 ()	251	rxvt_term::commit_iso14755 ()
…		…
277	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278	* escape sequence to toggle the Keypad.	315	* escape sequence to toggle the Keypad.
279	*	316	*
280	* Always permit `shift' to override the current setting	317	* Always permit `shift' to override the current setting
281	*/	318	*/
282	shft = (ev.state & ShiftMask);	319	shft = ev.state & ShiftMask;
283	ctrl = (ev.state & ControlMask);	320	ctrl = ev.state & ControlMask;
284	meta = (ev.state & ModMetaMask);	321	meta = ev.state & ModMetaMask;
285		322
286	if (numlock_state || (ev.state & ModNumLockMask))	323	if (numlock_state || (ev.state & ModNumLockMask))
287	{	324	{
288	numlock_state = (ev.state & ModNumLockMask);	325	numlock_state = (ev.state & ModNumLockMask);
289	PrivMode ((!numlock_state), PrivMode_aplKP);	326	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
309		346
310	// the XOpenIM manpage lies about hardcoding the locale	347	// the XOpenIM manpage lies about hardcoding the locale
311	// at the point of XOpenIM, so temporarily switch locales	348	// at the point of XOpenIM, so temporarily switch locales
312	if (rs[Rs_imLocale])	349	if (rs[Rs_imLocale])
313	SET_LOCALE (rs[Rs_imLocale]);	350	SET_LOCALE (rs[Rs_imLocale]);
		351
314	// assume wchar_t == unicode or better	352	// assume wchar_t == unicode or better
315	len = XwcLookupString (Input_Context, &ev, wkbuf,	353	len = XwcLookupString (Input_Context, &ev, wkbuf,
316	KBUFSZ, &keysym, &status_return);	354	KBUFSZ, &keysym, &status_return);
		355
317	if (rs[Rs_imLocale])	356	if (rs[Rs_imLocale])
318	SET_LOCALE (locale);	357	SET_LOCALE (locale);
319		358
320	if (status_return == XLookupChars	359	if (status_return == XLookupChars
321	|| status_return == XLookupBoth)	360	|| status_return == XLookupBoth)
…		…
353	#ifdef KEYSYM_RESOURCE	392	#ifdef KEYSYM_RESOURCE
354	if (keyboard->dispatch (this, keysym, ev.state))	393	if (keyboard->dispatch (this, keysym, ev.state))
355	return;	394	return;
356	#endif	395	#endif
357		396
358	if (TermWin.saveLines)	397	if (saveLines)
359	{	398	{
360	#ifdef UNSHIFTED_SCROLLKEYS	399	#ifdef UNSHIFTED_SCROLLKEYS
361	if (!ctrl && !meta)	400	if (!ctrl && !meta)
362	#else	401	#else
363	if (IS_SCROLL_MOD)	402	if (IS_SCROLL_MOD)
364	#endif	403	#endif
365	{	404	{
366	int lnsppg;	405	int lnsppg;
367		406
368	#ifdef PAGING_CONTEXT_LINES	407	#ifdef PAGING_CONTEXT_LINES
369	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	408	lnsppg = nrow - PAGING_CONTEXT_LINES;
370	#else	409	#else
371	lnsppg = TermWin.nrow * 4 / 5;	410	lnsppg = nrow * 4 / 5;
372	#endif	411	#endif
373	if (keysym == XK_Prior)	412	if (keysym == XK_Prior)
374	{	413	{
375	scr_page (UP, lnsppg);	414	scr_page (UP, lnsppg);
376	return;	415	return;
…		…
513	else	552	else
514	strcpy (kbuf, key_backspace);	553	strcpy (kbuf, key_backspace);
515	break;	554	break;
516	#endif	555	#endif
517	#ifndef NO_DELETE_KEY	556	#ifndef NO_DELETE_KEY
		557	# ifdef XK_KP_Prior
		558	case XK_KP_Delete:
		559	/* allow shift to override */
		560	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		561	{
		562	strcpy (kbuf, "\033On");
		563	break;
		564	}
		565	/* FALLTHROUGH */
		566	# endif
518	case XK_Delete:	567	case XK_Delete:
519	strcpy (kbuf, key_delete);	568	strcpy (kbuf, key_delete);
520	break;	569	break;
521	#endif	570	#endif
522	case XK_Tab:	571	case XK_Tab:
…		…
625	#ifdef XK_KP_Begin	674	#ifdef XK_KP_Begin
626	case XK_KP_Begin:	675	case XK_KP_Begin:
627	strcpy (kbuf, "\033Ou");	676	strcpy (kbuf, "\033Ou");
628	break;	677	break;
629		678
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	679	#endif
638	case XK_KP_F1: /* "\033OP" */	680	case XK_KP_F1: /* "\033OP" */
639	case XK_KP_F2: /* "\033OQ" */	681	case XK_KP_F2: /* "\033OQ" */
640	case XK_KP_F3: /* "\033OR" */	682	case XK_KP_F3: /* "\033OR" */
641	case XK_KP_F4: /* "\033OS" */	683	case XK_KP_F4: /* "\033OS" */
…		…
673	break;	715	break;
674		716
675	case XK_Find:	717	case XK_Find:
676	strcpy (kbuf, "\033[1~");	718	strcpy (kbuf, "\033[1~");
677	break;	719	break;
		720
		721	#ifdef XK_KP_End
		722	case XK_KP_Insert:
		723	/* allow shift to override */
		724	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		725	{
		726	strcpy (kbuf, "\033Op");
		727	break;
		728	}
		729	/* FALLTHROUGH */
		730	#endif
678	case XK_Insert:	731	case XK_Insert:
679	strcpy (kbuf, "\033[2~");	732	strcpy (kbuf, "\033[2~");
680	break;	733	break;
681	#ifdef DXK_Remove /* support for DEC remove like key */	734	#ifdef DXK_Remove /* support for DEC remove like key */
682	case DXK_Remove:	735	case DXK_Remove:
…		…
817	}	870	}
818		871
819	if (len <= 0)	872	if (len <= 0)
820	return; /* not mapped */	873	return; /* not mapped */
821		874
822	if (options & Opt_scrollTtyKeypress)	875	if (OPTION (Opt_scrollTtyKeypress))
823	if (TermWin.view_start)	876	if (view_start)
824	{	877	{
825	TermWin.view_start = 0;	878	view_start = 0;
826	want_refresh = 1;	879	want_refresh = 1;
827	}	880	}
828		881
829	/*	882	/*
830	* these modifications only affect the static keybuffer	883	* these modifications only affect the static keybuffer
…		…
933	SET_LOCALE (locale);	986	SET_LOCALE (locale);
934		987
935	display->flush ();	988	display->flush ();
936		989
937	if (want_refresh && !flush_ev.active)	990	if (want_refresh && !flush_ev.active)
938	flush_ev.start (NOW + 0.01);	991	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939	}	992	}
940		993
941	void	994	void
942	rxvt_term::flush_cb (time_watcher &w)	995	rxvt_term::flush_cb (time_watcher &w)
943	{	996	{
…		…
1007	{	1060	{
1008	if (mouse_slip_wheel_speed == 0	1061	if (mouse_slip_wheel_speed == 0
1009	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1062	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010	: scr_page (UP, mouse_slip_wheel_speed))	1063	: scr_page (UP, mouse_slip_wheel_speed))
1011	{	1064	{
1012	if (TermWin.view_start == TermWin.nscrolled ||	1065	if (view_start == nsaved ||
1013	TermWin.view_start == 0)	1066	view_start == 0)
1014	mouse_slip_wheel_speed = 0;	1067	mouse_slip_wheel_speed = 0;
1015		1068
1016	refresh_type |= SMOOTH_REFRESH;	1069	refresh_type |= SMOOTH_REFRESH;
1017	want_refresh = 1;	1070	want_refresh = 1;
1018	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019	}	1072	}
1020	}	1073	}
1021	#endif	1074	#endif
1022		1075
		1076	#if HAVE_SCHED_YIELD
		1077	static struct event_handler
		1078	{
		1079	check_watcher cw_yield;
		1080
		1081	void yield (check_watcher &w)
		1082	{
		1083	sched_yield ();
		1084	w.stop ();
		1085	}
		1086
		1087	event_handler ()
		1088	: cw_yield (this, &event_handler::yield)
		1089	{
		1090	}
		1091	} event_handler;
		1092	#endif
		1093
1023	bool	1094	bool
1024	rxvt_term::pty_fill ()	1095	rxvt_term::pty_fill ()
1025	{	1096	{
1026	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1097	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027		1098
…		…
1033		1104
1034	memmove (cmdbuf_base, cmdbuf_ptr, n);	1105	memmove (cmdbuf_base, cmdbuf_ptr, n);
1035	cmdbuf_ptr = cmdbuf_base;	1106	cmdbuf_ptr = cmdbuf_base;
1036	cmdbuf_endp = cmdbuf_ptr + n;	1107	cmdbuf_endp = cmdbuf_ptr + n;
1037		1108
1038	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1109	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1039		1110
1040	if (n > 0)	1111	if (r > 0)
1041	{	1112	{
1042	cmdbuf_endp += n;	1113	cmdbuf_endp += r;
1043	return true;	1114	return true;
1044	}	1115	}
1045	else if (n < 0 && errno != EAGAIN)	1116	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
		1117	{
		1118	#if HAVE_SCHED_YIELD
		1119	if (display->is_local)
		1120	event_handler.cw_yield.start ();
		1121	#endif
		1122	}
		1123	else
		1124	{
		1125	pty_ev.stop ();
		1126
		1127	if (!OPTION (Opt_hold))
1046	destroy ();	1128	destroy ();
		1129	}
1047		1130
1048	return false;	1131	return false;
1049	}	1132	}
1050		1133
1051	void	1134	void
…		…
1065	}	1148	}
1066		1149
1067	void	1150	void
1068	rxvt_term::pointer_unblank ()	1151	rxvt_term::pointer_unblank ()
1069	{	1152	{
1070	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1153	XDefineCursor (display->display, vt, TermWin_cursor);
1071	recolour_cursor ();	1154	recolour_cursor ();
1072		1155
1073	#ifdef POINTER_BLANK	1156	#ifdef POINTER_BLANK
1074	hidden_pointer = 0;	1157	hidden_pointer = 0;
1075		1158
1076	if (options & Opt_pointerBlank)	1159	if (OPTION (Opt_pointerBlank))
1077	pointer_ev.start (NOW + pointerBlankDelay);	1160	pointer_ev.start (NOW + pointerBlankDelay);
1078	#endif	1161	#endif
1079	}	1162	}
1080		1163
1081	#ifdef POINTER_BLANK	1164	#ifdef POINTER_BLANK
1082	void	1165	void
1083	rxvt_term::pointer_blank ()	1166	rxvt_term::pointer_blank ()
1084	{	1167	{
1085	if (! (options & Opt_pointerBlank))	1168	if (! OPTION (Opt_pointerBlank))
1086	return;	1169	return;
1087		1170
1088	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);	1171	XDefineCursor (display->display, vt, display->blank_cursor);
1089	XFlush (display->display);	1172	XFlush (display->display);
1090		1173
1091	hidden_pointer = 1;	1174	hidden_pointer = 1;
1092	}	1175	}
1093		1176
…		…
1182		1265
1183	/*{{{ process an X event */	1266	/*{{{ process an X event */
1184	void	1267	void
1185	rxvt_term::x_cb (XEvent &ev)	1268	rxvt_term::x_cb (XEvent &ev)
1186	{	1269	{
		1270	dDisp;
		1271
1187	SET_R (this);	1272	SET_R (this);
1188	SET_LOCALE (locale);	1273	SET_LOCALE (locale);
1189		1274
1190	#if defined(CURSOR_BLINK)	1275	#if defined(CURSOR_BLINK)
1191	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1276	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1192	{	1277	{
1193	if (hidden_cursor)	1278	if (hidden_cursor)
1194	{	1279	{
1195	hidden_cursor = 0;	1280	hidden_cursor = 0;
1196	want_refresh = 1;	1281	want_refresh = 1;
…		…
1199	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1284	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1200	}	1285	}
1201	#endif	1286	#endif
1202		1287
1203	#if defined(POINTER_BLANK)	1288	#if defined(POINTER_BLANK)
1204	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1289	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1205	{	1290	{
1206	if (ev.type == MotionNotify	1291	if (ev.type == MotionNotify
1207	|| ev.type == ButtonPress	1292	|| ev.type == ButtonPress
1208	|| ev.type == ButtonRelease)	1293	|| ev.type == ButtonRelease)
1209	if (hidden_pointer)	1294	if (hidden_pointer)
…		…
1307	button_release (ev.xbutton);	1392	button_release (ev.xbutton);
1308	break;	1393	break;
1309		1394
1310	case ClientMessage:	1395	case ClientMessage:
1311	if (ev.xclient.format == 32	1396	if (ev.xclient.format == 32
		1397	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1398	{
1312	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1399	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1313	destroy ();	1400	destroy ();
		1401	#if ENABLE_EWMH
		1402	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1403	XSendEvent (disp, ev.xclient.window = display->root,
		1404	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1405	&ev);
		1406	#endif
		1407	}
		1408	#if ENABLE_XEMBED
		1409	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1410	{
		1411	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1412	focus_in ();
		1413	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1414	focus_out ();
		1415	}
		1416	#endif
1314	#ifdef OFFIX_DND	1417	#ifdef OFFIX_DND
1315	/* OffiX Dnd (drag 'n' drop) protocol */	1418	/* OffiX Dnd (drag 'n' drop) protocol */
1316	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1419	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317	&& (ev.xclient.data.l[0] == DndFile	1420	&& (ev.xclient.data.l[0] == DndFile
1318	|| ev.xclient.data.l[0] == DndDir	1421	|| ev.xclient.data.l[0] == DndDir
1319	|| ev.xclient.data.l[0] == DndLink))	1422	|| ev.xclient.data.l[0] == DndLink))
1320	{	1423	{
1321	/* Get Dnd data */	1424	/* Get Dnd data */
1322	Atom ActualType;	1425	Atom ActualType;
1323	int ActualFormat;	1426	int ActualFormat;
1324	unsigned char *data;	1427	unsigned char *data;
1325	unsigned long Size, RemainingBytes;	1428	unsigned long Size, RemainingBytes;
1326		1429
1327	XGetWindowProperty (display->display, display->root,	1430	XGetWindowProperty (disp, display->root,
1328	xa[XA_DNDSELECTION],	1431	xa[XA_DNDSELECTION],
1329	0L, 1000000L,	1432	0L, 1000000L,
1330	False, AnyPropertyType,	1433	False, AnyPropertyType,
1331	&ActualType, &ActualFormat,	1434	&ActualType, &ActualFormat,
1332	&Size, &RemainingBytes,	1435	&Size, &RemainingBytes,
1333	&data);	1436	&data);
1334	set_string_property (XA_CUT_BUFFER0, data);	1437	set_string_property (XA_CUT_BUFFER0, data);
1335	XFree (data);	1438	XFree (data);
1336	selection_paste (display->root, XA_CUT_BUFFER0, true);	1439	selection_paste (display->root, XA_CUT_BUFFER0, true);
1337	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1440	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1338	}	1441	}
1339	#endif /* OFFIX_DND */	1442	#endif /* OFFIX_DND */
1340	break;	1443	break;
1341		1444
1342	case MappingNotify:	1445	case MappingNotify:
…		…
1367	break;	1470	break;
1368	}	1471	}
1369	break;	1472	break;
1370		1473
1371	case FocusIn:	1474	case FocusIn:
1372	if (!TermWin.focus)	1475	focus_in ();
		1476	break;
		1477
		1478	case FocusOut:
		1479	focus_out ();
		1480	break;
		1481
		1482	case ConfigureNotify:
		1483	if (ev.xconfigure.window == parent[0])
1373	{	1484	{
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));	1485	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1486	;
1441		1487
1442	if (szHint.width != width || szHint.height != height)	1488	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443	{	1489	{
1444	seen_resize = 1;	1490	seen_resize = 1;
1445	resize_all_windows (width, height, 1);	1491	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446	}	1492	}
1447		1493
1448	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1494	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1449	if (options & Opt_transparent)	1495	if (OPTION (Opt_transparent))
1450	check_our_parents ();	1496	check_our_parents ();
1451	#endif	1497	#endif
1452	}	1498	}
1453	break;	1499	break;
1454		1500
…		…
1471	case SelectionRequest:	1517	case SelectionRequest:
1472	selection_send (ev.xselectionrequest);	1518	selection_send (ev.xselectionrequest);
1473	break;	1519	break;
1474		1520
1475	case UnmapNotify:	1521	case UnmapNotify:
1476	TermWin.mapped = 0;	1522	mapped = 0;
1477	#ifdef TEXT_BLINK	1523	#ifdef TEXT_BLINK
1478	text_blink_ev.stop ();	1524	text_blink_ev.stop ();
1479	#endif	1525	#endif
1480	break;	1526	break;
1481		1527
1482	case MapNotify:	1528	case MapNotify:
1483	TermWin.mapped = 1;	1529	mapped = 1;
1484	#ifdef TEXT_BLINK	1530	#ifdef TEXT_BLINK
1485	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1531	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486	#endif	1532	#endif
1487	break;	1533	break;
1488		1534
…		…
1492	break;	1538	break;
1493	#endif /* TRANSPARENT */	1539	#endif /* TRANSPARENT */
1494		1540
1495	case GraphicsExpose:	1541	case GraphicsExpose:
1496	case Expose:	1542	case Expose:
1497	if (ev.xany.window == TermWin.vt)	1543	if (ev.xany.window == vt)
1498	{	1544	{
1499	do	1545	do
1500	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1501	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1502	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1548	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1503		1549
1504	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1550	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505		1551
1506	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1552	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1507	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1508	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, False);
1509		1555
1510	scr_refresh (refresh_type);	1556	scr_refresh (refresh_type);
1511	}	1557	}
1512	else	1558	else
1513	{	1559	{
1514	XEvent unused_event;	1560	XEvent unused_event;
1515		1561
1516	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1562	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1517	;	1563	;
1518	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1564	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1519	;	1565	;
1520		1566
1521	if (isScrollbarWindow (ev.xany.window))	1567	if (isScrollbarWindow (ev.xany.window))
1522	{	1568	{
1523	scrollBar.setIdle ();	1569	scrollBar.setIdle ();
…		…
1527	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1573	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528	menubar_expose ();	1574	menubar_expose ();
1529	#endif	1575	#endif
1530		1576
1531	#ifdef TRANSPARENT	1577	#ifdef TRANSPARENT
1532	if (am_transparent && ev.xany.window == TermWin.parent[0])	1578	if (am_transparent && ev.xany.window == parent[0])
1533	XClearWindow (display->display, ev.xany.window);	1579	XClearWindow (disp, ev.xany.window);
1534	#endif	1580	#endif
1535	}	1581	}
1536	break;	1582	break;
1537		1583
1538	case MotionNotify:	1584	case MotionNotify:
…		…
1548	}	1594	}
1549	#endif	1595	#endif
1550	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1596	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551	break;	1597	break;
1552		1598
1553	if (ev.xany.window == TermWin.vt)	1599	if (ev.xany.window == vt)
1554	{	1600	{
1555	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1601	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556	{	1602	{
1557	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1603	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1558	;	1604	;
1559		1605
1560	XQueryPointer (display->display, TermWin.vt,	1606	XQueryPointer (disp, vt,
1561	&unused_root, &unused_child,	1607	&unused_root, &unused_child,
1562	&unused_root_x, &unused_root_y,	1608	&unused_root_x, &unused_root_y,
1563	&ev.xbutton.x, &ev.xbutton.y,	1609	&ev.xbutton.x, &ev.xbutton.y,
1564	&ev.xbutton.state);	1610	&ev.xbutton.state);
1565	#ifdef MOUSE_THRESHOLD	1611	#ifdef MOUSE_THRESHOLD
…		…
1577	#endif	1623	#endif
1578	selection_extend (ev.xbutton.x, ev.xbutton.y,	1624	selection_extend (ev.xbutton.x, ev.xbutton.y,
1579	ev.xbutton.state & Button3Mask ? 2 : 0);	1625	ev.xbutton.state & Button3Mask ? 2 : 0);
1580		1626
1581	#ifdef SELECTION_SCROLLING	1627	#ifdef SELECTION_SCROLLING
1582	if (ev.xbutton.y < TermWin.int_bwidth	1628	if (ev.xbutton.y < int_bwidth
1583	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1629	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1584	{	1630	{
1585	int dist;	1631	int dist;
1586		1632
1587	/* don't clobber the current delay if we are	1633	/* don't clobber the current delay if we are
1588	* already in the middle of scrolling.	1634	* already in the middle of scrolling.
…		…
1596	selection_save_x = ev.xbutton.x;	1642	selection_save_x = ev.xbutton.x;
1597	selection_save_y = ev.xbutton.y;	1643	selection_save_y = ev.xbutton.y;
1598	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1644	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599		1645
1600	/* calc number of lines to scroll */	1646	/* calc number of lines to scroll */
1601	if (ev.xbutton.y < TermWin.int_bwidth)	1647	if (ev.xbutton.y < int_bwidth)
1602	{	1648	{
1603	scroll_selection_dir = UP;	1649	scroll_selection_dir = UP;
1604	dist = TermWin.int_bwidth - ev.xbutton.y;	1650	dist = int_bwidth - ev.xbutton.y;
1605	}	1651	}
1606	else	1652	else
1607	{	1653	{
1608	scroll_selection_dir = DN;	1654	scroll_selection_dir = DN;
1609	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1655	dist = ev.xbutton.y - (int_bwidth + height);
1610	}	1656	}
1611		1657
1612	scroll_selection_lines = Pixel2Height (dist)	1658	scroll_selection_lines = Pixel2Height (dist)
1613	/ SELECTION_SCROLL_LINE_SPEEDUP	1659	/ SELECTION_SCROLL_LINE_SPEEDUP
1614	+ 1;	1660	+ 1;
1615	MIN_IT (scroll_selection_lines,	1661	min_it (scroll_selection_lines,
1616	SELECTION_SCROLL_MAX_LINES);	1662	SELECTION_SCROLL_MAX_LINES);
1617	}	1663	}
1618	else	1664	else
1619	{	1665	{
1620	/* we are within the text window, so we	1666	/* we are within the text window, so we
…		…
1629	#endif	1675	#endif
1630	}	1676	}
1631	}	1677	}
1632	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1678	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633	{	1679	{
1634	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1680	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1635	MotionNotify, &ev))	1681	MotionNotify, &ev))
1636	;	1682	;
1637		1683
1638	XQueryPointer (display->display, scrollBar.win,	1684	XQueryPointer (disp, scrollBar.win,
1639	&unused_root, &unused_child,	1685	&unused_root, &unused_child,
1640	&unused_root_x, &unused_root_y,	1686	&unused_root_x, &unused_root_y,
1641	&ev.xbutton.x, &ev.xbutton.y,	1687	&ev.xbutton.x, &ev.xbutton.y,
1642	&unused_mask);	1688	&unused_mask);
1643	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1689	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1648	}	1694	}
1649	break;	1695	break;
1650	}	1696	}
1651	}	1697	}
1652		1698
		1699	void
		1700	rxvt_term::focus_in ()
		1701	{
		1702	if (!focus)
		1703	{
		1704	focus = 1;
		1705	want_refresh = 1;
		1706
		1707	PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1708
		1709	#if USE_XIM
		1710	if (Input_Context != NULL)
		1711	{
		1712	IMSetStatusPosition ();
		1713	XSetICFocus (Input_Context);
		1714	}
		1715	#endif
		1716	#if CURSOR_BLINK
		1717	if (OPTION (Opt_cursorBlink))
		1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1719	#endif
		1720	#if OFF_FOCUS_FADING
		1721	if (rs[Rs_fade])
		1722	{
		1723	pix_colors = pix_colors_focused;
		1724	scr_recolour ();
		1725	}
		1726	#endif
		1727	}
		1728	}
		1729
		1730	void
		1731	rxvt_term::focus_out ()
		1732	{
		1733	if (focus)
		1734	{
		1735	focus = 0;
		1736	want_refresh = 1;
		1737
		1738	PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1739
		1740	#if ENABLE_FRILLS || ISO_14755
		1741	if (iso14755buf)
		1742	{
		1743	iso14755buf = 0;
		1744	# if ENABLE_OVERLAY
		1745	scr_overlay_off ();
		1746	# endif
		1747	}
		1748	#endif
		1749	#if USE_XIM
		1750	if (Input_Context != NULL)
		1751	XUnsetICFocus (Input_Context);
		1752	#endif
		1753	#if CURSOR_BLINK
		1754	if (OPTION (Opt_cursorBlink))
		1755	cursor_blink_ev.stop ();
		1756	hidden_cursor = 0;
		1757	#endif
		1758	#if OFF_FOCUS_FADING
		1759	if (rs[Rs_fade])
		1760	{
		1761	pix_colors = pix_colors_unfocused;
		1762	scr_recolour ();
		1763	}
		1764	#endif
		1765	}
		1766	}
		1767
1653	#if TRANSPARENT	1768	#if TRANSPARENT
1654	void	1769	void
1655	rxvt_term::rootwin_cb (XEvent &ev)	1770	rxvt_term::rootwin_cb (XEvent &ev)
1656	{	1771	{
1657	SET_R (this);	1772	SET_R (this);
…		…
1668	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1783	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1669	return;	1784	return;
1670		1785
1671	/* FALLTHROUGH */	1786	/* FALLTHROUGH */
1672	case ReparentNotify:	1787	case ReparentNotify:
1673	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1788	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1674	want_refresh = want_full_refresh = 1;	1789	want_refresh = want_full_refresh = 1;
1675	break;	1790	break;
1676	}	1791	}
1677	}	1792	}
1678	#endif	1793	#endif
…		…
1681	rxvt_term::button_press (XButtonEvent &ev)	1796	rxvt_term::button_press (XButtonEvent &ev)
1682	{	1797	{
1683	int reportmode = 0, clickintime;	1798	int reportmode = 0, clickintime;
1684		1799
1685	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);	1800	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
		1801
1686	if (!bypass_keystate)	1802	if (!bypass_keystate)
1687	reportmode = !! (priv_modes & PrivMode_mouse_report);	1803	reportmode = !! (priv_modes & PrivMode_mouse_report);
1688		1804
1689	/*	1805	/*
1690	* VT window processing of button press	1806	* VT window processing of button press
1691	*/	1807	*/
1692	if (ev.window == TermWin.vt)	1808	if (ev.window == vt)
1693	{	1809	{
1694	#if ISO_14755	1810	#if ISO_14755
1695	// 5.4	1811	// 5.4
1696	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1812	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697	{	1813	{
…		…
1739	else	1855	else
1740	{	1856	{
1741	if (ev.button != MEvent.button)	1857	if (ev.button != MEvent.button)
1742	MEvent.clicks = 0;	1858	MEvent.clicks = 0;
1743		1859
		1860	if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1744	switch (ev.button)	1861	switch (ev.button)
1745	{	1862	{
1746	case Button1:	1863	case Button1:
1747	/* allow meta + click to select rectangular areas */	1864	/* allow meta + click to select rectangular areas */
1748	/* should be done in screen.C */	1865	/* should be done in screen.C */
1749	#if ENABLE_FRILLS	1866	#if ENABLE_FRILLS
1750	selection.rect = !!(ev.state & ModMetaMask);	1867	selection.rect = !!(ev.state & ModMetaMask);
1751	#else	1868	#else
1752	selection.rect = false;	1869	selection.rect = false;
1753	#endif	1870	#endif
1754		1871
1755	/* allow shift+left click to extend selection */	1872	/* allow shift+left click to extend selection */
1756	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1873	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1757	{	1874	{
1758	if (MEvent.button == Button1 && clickintime)	1875	if (MEvent.button == Button1 && clickintime)
1759	selection_rotate (ev.x, ev.y);	1876	selection_rotate (ev.x, ev.y);
1760	else	1877	else
1761	selection_extend (ev.x, ev.y, 1);	1878	selection_extend (ev.x, ev.y, 1);
1762	}	1879	}
1763	else	1880	else
1764	{	1881	{
1765	if (MEvent.button == Button1 && clickintime)	1882	if (MEvent.button == Button1 && clickintime)
1766	MEvent.clicks++;	1883	MEvent.clicks++;
1767	else	1884	else
1768	MEvent.clicks = 1;	1885	MEvent.clicks = 1;
1769		1886
1770	selection_click (MEvent.clicks, ev.x, ev.y);	1887	selection_click (MEvent.clicks, ev.x, ev.y);
1771	}	1888	}
1772		1889
1773	MEvent.button = Button1;	1890	MEvent.button = Button1;
1774	break;	1891	break;
1775		1892
1776	case Button3:	1893	case Button3:
1777	if (MEvent.button == Button3 && clickintime)	1894	if (MEvent.button == Button3 && clickintime)
1778	selection_rotate (ev.x, ev.y);	1895	selection_rotate (ev.x, ev.y);
1779	else	1896	else
1780	selection_extend (ev.x, ev.y, 1);	1897	selection_extend (ev.x, ev.y, 1);
1781		1898
1782	MEvent.button = Button3;	1899	MEvent.button = Button3;
1783	break;	1900	break;
1784	}	1901	}
1785	}	1902	}
1786		1903
1787	MEvent.time = ev.time;	1904	MEvent.time = ev.time;
1788	return;	1905	return;
1789	}	1906	}
1790		1907
…		…
1902	case Button3:	2019	case Button3:
1903	if (scrollBar.style != R_SB_XTERM)	2020	if (scrollBar.style != R_SB_XTERM)
1904	{	2021	{
1905	if (scrollbar_above_slider (ev.y))	2022	if (scrollbar_above_slider (ev.y))
1906	# ifdef RXVT_SCROLL_FULL	2023	# ifdef RXVT_SCROLL_FULL
1907	scr_page (UP, TermWin.nrow - 1);	2024	scr_page (UP, nrow - 1);
1908	# else	2025	# else
1909	scr_page (UP, TermWin.nrow / 4);	2026	scr_page (UP, nrow / 4);
1910	# endif	2027	# endif
1911	else if (scrollbar_below_slider (ev.y))	2028	else if (scrollbar_below_slider (ev.y))
1912	# ifdef RXVT_SCROLL_FULL	2029	# ifdef RXVT_SCROLL_FULL
1913	scr_page (DN, TermWin.nrow - 1);	2030	scr_page (DN, nrow - 1);
1914	# else	2031	# else
1915	scr_page (DN, TermWin.nrow / 4);	2032	scr_page (DN, nrow / 4);
1916	# endif	2033	# endif
1917	else	2034	else
1918	scrollBar.setMotion ();	2035	scrollBar.setMotion ();
1919	}	2036	}
1920	else	2037	else
1921	{	2038	{
1922	scr_page ((ev.button == Button1 ? DN : UP),	2039	scr_page ((ev.button == Button1 ? DN : UP),
1923	(TermWin.nrow	2040	(nrow
1924	* scrollbar_position (ev.y)	2041	* scrollbar_position (ev.y)
1925	/ scrollbar_size ()));	2042	/ scrollbar_size ()));
1926	}	2043	}
1927		2044
1928	break;	2045	break;
…		…
1960	#ifdef SELECTION_SCROLLING	2077	#ifdef SELECTION_SCROLLING
1961	if (sel_scroll_ev.active)	2078	if (sel_scroll_ev.active)
1962	sel_scroll_ev.stop();	2079	sel_scroll_ev.stop();
1963	#endif	2080	#endif
1964		2081
1965	if (ev.window == TermWin.vt)	2082	if (ev.window == vt)
1966	{	2083	{
1967	#if ISO_14755	2084	#if ISO_14755
1968	// 5.4	2085	// 5.4
1969	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2086	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970	return;	2087	return;
…		…
2020		2137
2021	v = ev.button == Button4 ? UP : DN;	2138	v = ev.button == Button4 ? UP : DN;
2022		2139
2023	if (ev.state & ShiftMask)	2140	if (ev.state & ShiftMask)
2024	i = 1;	2141	i = 1;
2025	else if (options & Opt_mouseWheelScrollPage)	2142	else if (OPTION (Opt_mouseWheelScrollPage))
2026	i = TermWin.nrow - 1;	2143	i = nrow - 1;
2027	else	2144	else
2028	i = 5;	2145	i = 5;
2029		2146
2030	# ifdef MOUSE_SLIP_WHEELING	2147	# ifdef MOUSE_SLIP_WHEELING
2031	if (ev.state & ControlMask)	2148	if (ev.state & ControlMask)
2032	{	2149	{
2033	mouse_slip_wheel_speed += v ? -1 : 1;	2150	mouse_slip_wheel_speed += v ? -1 : 1;
2034	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2151	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;	2152	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036		2153
2037	if (slip_wheel_ev.at < NOW)	2154	if (slip_wheel_ev.at < NOW)
2038	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2155	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2039		2156
2040	slip_wheel_ev.start ();	2157	slip_wheel_ev.start ();
…		…
2081	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2198	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2199	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2200	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084	int i;	2201	int i;
2085		2202
2086	Visual* visual = display->visual;	2203	Visual *visual = display->visual;
2087		2204
2088	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2205	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089		2206
2090	/* for convenience */	2207	/* for convenience */
2091	mask_r = visual->red_mask;	2208	mask_r = visual->red_mask;
…		…
2312	Atom atype;	2429	Atom atype;
2313	unsigned char *prop = NULL;	2430	unsigned char *prop = NULL;
2314	Window root, oldp, *list;	2431	Window root, oldp, *list;
2315	Pixmap rootpixmap = None;	2432	Pixmap rootpixmap = None;
2316	XWindowAttributes wattr, wrootattr;	2433	XWindowAttributes wattr, wrootattr;
		2434	dDisp;
2317		2435
2318	pchanged = 0;	2436	pchanged = 0;
2319		2437
2320	if (!(options & Opt_transparent))	2438	if (!OPTION (Opt_transparent))
2321	return pchanged; /* Don't try any more */	2439	return pchanged; /* Don't try any more */
2322		2440
2323	XGetWindowAttributes (display->display, display->root, &wrootattr);	2441	XGetWindowAttributes (disp, display->root, &wrootattr);
2324	rootdepth = wrootattr.depth;	2442	rootdepth = wrootattr.depth;
2325		2443
2326	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2444	XGetWindowAttributes (disp, parent[0], &wattr);
2327		2445
2328	if (rootdepth != wattr.depth)	2446	if (rootdepth != wattr.depth)
2329	{	2447	{
2330	if (am_transparent)	2448	if (am_transparent)
2331	{	2449	{
2332	pchanged = 1;	2450	pchanged = 1;
2333	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2451	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2334	am_transparent = am_pixmap_trans = 0;	2452	am_transparent = am_pixmap_trans = 0;
2335	}	2453	}
2336		2454
2337	return pchanged; /* Don't try any more */	2455	return pchanged; /* Don't try any more */
2338	}	2456	}
2339		2457
2340	/* Get all X ops out of the queue so that our information is up-to-date. */	2458	/* Get all X ops out of the queue so that our information is up-to-date. */
2341	XSync (display->display, False);	2459	XSync (disp, False);
2342		2460
2343	/*	2461	/*
2344	* Make the frame window set by the window manager have	2462	* Make the frame window set by the window manager have
2345	* the root background. Some window managers put multiple nested frame	2463	* the root background. Some window managers put multiple nested frame
2346	* windows for each client, so we have to take care about that.	2464	* windows for each client, so we have to take care about that.
2347	*/	2465	*/
2348	i = (xa[XA_XROOTPMAP_ID]	2466	i = (xa[XA_XROOTPMAP_ID]
2349	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2467	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2350	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351	&nitems, &bytes_after, &prop) == Success);	2469	&nitems, &bytes_after, &prop) == Success);
2352		2470
2353	if (!i || prop == NULL)	2471	if (!i || prop == NULL)
2354	i = (xa[XA_ESETROOT_PMAP_ID]	2472	i = (xa[XA_ESETROOT_PMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2473	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2474	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2475	&nitems, &bytes_after, &prop) == Success);
2358		2476
2359	if (!i || prop == NULL	2477	if (!i || prop == NULL
2360	#if TINTING	2478	#if TINTING
…		…
2379	Window cr;	2497	Window cr;
2380	XImage *image;	2498	XImage *image;
2381	GC gc;	2499	GC gc;
2382	XGCValues gcvalue;	2500	XGCValues gcvalue;
2383		2501
2384	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2502	XTranslateCoordinates (disp, parent[0], display->root,
2385	0, 0, &sx, &sy, &cr);	2503	0, 0, &sx, &sy, &cr);
2386	nw = (unsigned int)szHint.width;	2504	nw = (unsigned int)szHint.width;
2387	nh = (unsigned int)szHint.height;	2505	nh = (unsigned int)szHint.height;
2388	nx = ny = 0;	2506	nx = ny = 0;
2389		2507
…		…
2399	nh += sy;	2517	nh += sy;
2400	ny = -sy;	2518	ny = -sy;
2401	sy = 0;	2519	sy = 0;
2402	}	2520	}
2403		2521
2404	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2522	min_it (nw, (unsigned int) (wrootattr.width - sx));
2405	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2523	min_it (nh, (unsigned int) (wrootattr.height - sy));
2406		2524
2407	XSync (display->display, False);	2525	XSync (disp, False);
2408	allowedxerror = -1;	2526	allowedxerror = -1;
2409	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2527	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410		2528
2411	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2529	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2412	/* XXX: may need a delay here? */	2530	/* XXX: may need a delay here? */
2413	allowedxerror = 0;	2531	allowedxerror = 0;
2414		2532
2415	if (image == NULL)	2533	if (image == NULL)
2416	{	2534	{
2417	if (am_transparent && am_pixmap_trans)	2535	if (am_transparent && am_pixmap_trans)
2418	{	2536	{
2419	pchanged = 1;	2537	pchanged = 1;
2420	if (TermWin.pixmap != None)	2538	if (pixmap != None)
2421	{	2539	{
2422	XFreePixmap (display->display, TermWin.pixmap);	2540	XFreePixmap (disp, pixmap);
2423	TermWin.pixmap = None;	2541	pixmap = None;
2424	}	2542	}
2425	}	2543	}
2426		2544
2427	am_pixmap_trans = 0;	2545	am_pixmap_trans = 0;
2428	}	2546	}
2429	else	2547	else
2430	{	2548	{
2431	if (TermWin.pixmap != None)	2549	if (pixmap != None)
2432	XFreePixmap (display->display, TermWin.pixmap);	2550	XFreePixmap (disp, pixmap);
2433		2551
2434	#if TINTING	2552	#if TINTING
2435	if (ISSET_PIXCOLOR (Color_tint))	2553	if (ISSET_PIXCOLOR (Color_tint))
2436	{	2554	{
2437	unsigned short rm, gm, bm;	2555	unsigned short rm, gm, bm;
…		…
2441		2559
2442	ShadeXImage (display, image, shade, rm, gm, bm);	2560	ShadeXImage (display, image, shade, rm, gm, bm);
2443	}	2561	}
2444	#endif	2562	#endif
2445		2563
2446	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2564	pixmap = XCreatePixmap (disp, vt,
2447	szHint.width, szHint.height, image->depth);	2565	szHint.width, szHint.height, image->depth);
2448	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2566	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2449	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2567	XPutImage (disp, pixmap, gc, image, 0, 0,
2450	nx, ny, image->width, image->height);	2568	nx, ny, image->width, image->height);
2451	XFreeGC (display->display, gc);	2569	XFreeGC (disp, gc);
2452	XDestroyImage (image);	2570	XDestroyImage (image);
2453	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2571	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2454	XClearWindow (display->display, TermWin.parent[0]);	2572	XClearWindow (disp, parent[0]);
2455		2573
2456	if (!am_transparent || !am_pixmap_trans)	2574	if (!am_transparent || !am_pixmap_trans)
2457	pchanged = 1;	2575	pchanged = 1;
2458		2576
2459	am_transparent = am_pixmap_trans = 1;	2577	am_transparent = am_pixmap_trans = 1;
2460	}	2578	}
2461	}	2579	}
2462		2580
2463	if (am_pixmap_trans)	2581	if (am_pixmap_trans)
2464	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2582	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2465	else	2583	else
2466	{	2584	{
2467	unsigned int n;	2585	unsigned int n;
2468	/*	2586	/*
2469	* InheritPixmap transparency	2587	* InheritPixmap transparency
2470	*/	2588	*/
2471	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2589	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2472	{	2590	{
2473	oldp = TermWin.parent[i];	2591	oldp = parent[i];
2474	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2592	XQueryTree (disp, parent[i - 1], &root,
2475	&TermWin.parent[i], &list, &n);	2593	&parent[i], &list, &n);
2476	XFree (list);	2594	XFree (list);
2477		2595
2478	if (TermWin.parent[i] == display->root)	2596	if (parent[i] == display->root)
2479	{	2597	{
2480	if (oldp != None)	2598	if (oldp != None)
2481	pchanged = 1;	2599	pchanged = 1;
2482		2600
2483	break;	2601	break;
2484	}	2602	}
2485		2603
2486	if (oldp != TermWin.parent[i])	2604	if (oldp != parent[i])
2487	pchanged = 1;	2605	pchanged = 1;
2488	}	2606	}
2489		2607
2490	n = 0;	2608	n = 0;
2491		2609
2492	if (pchanged)	2610	if (pchanged)
2493	{	2611	{
2494	for (; n < (unsigned int)i; n++)	2612	for (; n < (unsigned int)i; n++)
2495	{	2613	{
2496	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2614	XGetWindowAttributes (disp, parent[n], &wattr);
2497	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2615	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498	{	2616	{
2499	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2617	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2500	break;	2618	break;
2501	}	2619	}
2502	}	2620	}
2503	}	2621	}
2504		2622
2505	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2623	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2506	{	2624	{
2507	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2625	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2508	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2626	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509	am_transparent = 0;	2627	am_transparent = 0;
2510	/* XXX: also turn off Opt_transparent? */	2628	/* XXX: also turn off Opt_transparent? */
2511	}	2629	}
2512	else	2630	else
2513	{	2631	{
…		…
2516	* needed for fvwm2.2.2 (and before?) */	2634	* needed for fvwm2.2.2 (and before?) */
2517	sleep (1);	2635	sleep (1);
2518	#endif	2636	#endif
2519	for (n = 0; n < (unsigned int)i; n++)	2637	for (n = 0; n < (unsigned int)i; n++)
2520	{	2638	{
2521	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2639	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2522	XClearWindow (display->display, TermWin.parent[n]);	2640	XClearWindow (disp, parent[n]);
2523	}	2641	}
2524		2642
2525	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2643	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2526	am_transparent = 1;	2644	am_transparent = 1;
2527	}	2645	}
2528		2646
2529	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2647	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2530	TermWin.parent[i] = None;	2648	parent[i] = None;
2531	}	2649	}
2532		2650
2533	if (scrollBar.win)	2651	if (scrollBar.win)
2534	{	2652	{
2535	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2653	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2536	scrollBar.setIdle ();	2654	scrollBar.setIdle ();
2537	scrollbar_show (0);	2655	scrollbar_show (0);
2538	}	2656	}
2539		2657
2540	if (am_transparent)	2658	if (am_transparent)
…		…
2578	// some window managers resize the window early, and these programs	2696	// some window managers resize the window early, and these programs
2579	// then sometimes get the size wrong.	2697	// then sometimes get the size wrong.
2580	// unfortunately other programs are even more buggy and dislike	2698	// unfortunately other programs are even more buggy and dislike
2581	// being sent SIGWINCH, so only do it when we were in fact being	2699	// being sent SIGWINCH, so only do it when we were in fact being
2582	// resized.	2700	// resized.
2583	if (seen_resize)	2701	if (seen_resize && cmd_pid)
2584	kill (-cmd_pid, SIGWINCH);	2702	kill (-cmd_pid, SIGWINCH);
2585	}	2703	}
2586		2704
2587	/* Read a text string from the input buffer */	2705	/* Read a text string from the input buffer */
2588	unicode_t buf[UBUFSIZ];	2706	unicode_t buf[UBUFSIZ];
2589	bool refreshnow = false;	2707	bool refreshnow = false;
2590	int nlines = 0;	2708	int nlines = 0;
2591	unicode_t *str = buf;	2709	unicode_t *str = buf;
		2710	unicode_t *eol = str + min (ncol, UBUFSIZ);
2592		2711
2593	for (;;)	2712	for (;;)
2594	{	2713	{
2595	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2714	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596	break;	2715	break;
2597		2716
2598	*str++ = ch;	2717	*str++ = ch;
2599		2718
2600	if (ch == C0_LF)	2719	if (ch == C0_LF || str >= eol)
2601	{	2720	{
		2721	if (ch == C0_LF)
2602	nlines++;	2722	nlines++;
		2723
2603	refresh_count++;	2724	refresh_count++;
2604		2725
2605	if (!(options & Opt_jumpScroll)	2726	if (!OPTION (Opt_jumpScroll)
2606	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2727	|| (refresh_count >= refresh_limit * (nrow - 1)))
2607	{	2728	{
2608	refreshnow = true;	2729	refreshnow = true;
		2730	refresh_count = 0;
2609	ch = NOCHAR;	2731	ch = NOCHAR;
2610	break;	2732	break;
2611	}	2733	}
2612		2734
2613	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2735	// scr_add_lines only works for nlines <= nrow - 1.
2614	if (nlines >= TermWin.nrow - 1)	2736	if (nlines >= nrow - 1)
2615	{	2737	{
2616	scr_add_lines (buf, nlines, str - buf);	2738	scr_add_lines (buf, nlines, str - buf);
2617	nlines = 0;	2739	nlines = 0;
2618	str = buf;	2740	str = buf;
		2741	eol = str + min (ncol, UBUFSIZ);
2619	}	2742	}
2620	}
2621		2743
2622	if (str >= buf + UBUFSIZ)	2744	if (str >= eol)
2623	{	2745	{
		2746	if (eol >= buf + UBUFSIZ)
		2747	{
2624	ch = NOCHAR;	2748	ch = NOCHAR;
2625	break;	2749	break;
		2750	}
		2751	else
		2752	eol = min (eol + ncol, buf + UBUFSIZ);
		2753	}
		2754
2626	}	2755	}
2627		2756
2628	seq_begin = cmdbuf_ptr;	2757	seq_begin = cmdbuf_ptr;
2629	ch = next_char ();	2758	ch = next_char ();
2630	}	2759	}
…		…
2637	* the number of pages between refreshes is refresh_limit, which	2766	* the number of pages between refreshes is refresh_limit, which
2638	* is incremented here because we must be doing flat-out scrolling.	2767	* is incremented here because we must be doing flat-out scrolling.
2639	*/	2768	*/
2640	if (refreshnow)	2769	if (refreshnow)
2641	{	2770	{
2642	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2771	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643	refresh_limit++;	2772	refresh_limit++;
2644	else	2773	else
2645	{	2774	{
2646	flag = true;	2775	flag = true;
2647	scr_refresh (refresh_type);	2776	scr_refresh (refresh_type);
		2777	flush_ev.stop ();
2648	}	2778	}
2649	}	2779	}
2650		2780
2651	}	2781	}
2652	else	2782	else
…		…
3174	{	3304	{
3175	switch (priv)	3305	switch (priv)
3176	{	3306	{
3177	case '>':	3307	case '>':
3178	if (ch == CSI_DA) /* secondary device attributes */	3308	if (ch == CSI_DA) /* secondary device attributes */
3179	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3309	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3180	break;	3310	break;
3181	case '?':	3311	case '?':
3182	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3312	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183	process_terminal_mode (ch, priv, nargs, arg);	3313	process_terminal_mode (ch, priv, nargs, arg);
3184	break;	3314	break;
…		…
3289		3419
3290	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3420	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291	arg[0] = -arg[0];	3421	arg[0] = -arg[0];
3292	/* FALLTHROUGH */	3422	/* FALLTHROUGH */
3293	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3423	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3424	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295	break;	3425	break;
3296		3426
3297	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3427	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298	tt_write ((const unsigned char *)VT100_ANS,	3428	tt_write ((const unsigned char *)VT100_ANS,
3299	(unsigned int) (sizeof (VT100_ANS) - 1));	3429	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3311	break;	3441	break;
3312	case 6: /* CPR requested */	3442	case 6: /* CPR requested */
3313	scr_report_position ();	3443	scr_report_position ();
3314	break;	3444	break;
3315	case 7: /* unofficial extension */	3445	case 7: /* unofficial extension */
3316	if (options & Opt_insecure)	3446	if (OPTION (Opt_insecure))
3317	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3447	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318	break;	3448	break;
3319	case 8: /* unofficial extension */	3449	case 8: /* unofficial extension */
3320	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3450	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321	break;	3451	break;
…		…
3413	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3543	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414	{	3544	{
3415	int x, y;	3545	int x, y;
3416	XWindowAttributes wattr;	3546	XWindowAttributes wattr;
3417	Window wdummy;	3547	Window wdummy;
		3548	dDisp;
3418		3549
3419	if (nargs == 0)	3550	if (nargs == 0)
3420	return;	3551	return;
3421		3552
3422	switch (args[0])	3553	switch (args[0])
3423	{	3554	{
3424	/*	3555	/*
3425	* commands	3556	* commands
3426	*/	3557	*/
3427	case 1: /* deiconify window */	3558	case 1: /* deiconify window */
3428	XMapWindow (display->display, TermWin.parent[0]);	3559	XMapWindow (disp, parent[0]);
3429	break;	3560	break;
3430	case 2: /* iconify window */	3561	case 2: /* iconify window */
3431	XIconifyWindow (display->display, TermWin.parent[0],	3562	XIconifyWindow (disp, parent[0], display->screen);
3432	DefaultScreen (display->display));
3433	break;	3563	break;
3434	case 3: /* set position (pixels) */	3564	case 3: /* set position (pixels) */
3435	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3565	XMoveWindow (disp, parent[0], args[1], args[2]);
3436	break;	3566	break;
3437	case 4: /* set size (pixels) */	3567	case 4: /* set size (pixels) */
3438	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3568	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439	break;	3569	break;
3440	case 5: /* raise window */	3570	case 5: /* raise window */
3441	XRaiseWindow (display->display, TermWin.parent[0]);	3571	XRaiseWindow (disp, parent[0]);
3442	break;	3572	break;
3443	case 6: /* lower window */	3573	case 6: /* lower window */
3444	XLowerWindow (display->display, TermWin.parent[0]);	3574	XLowerWindow (disp, parent[0]);
3445	break;	3575	break;
3446	case 7: /* refresh window */	3576	case 7: /* refresh window */
3447	scr_touch (true);	3577	scr_touch (true);
3448	break;	3578	break;
3449	case 8: /* set size (chars) */	3579	case 8: /* set size (chars) */
3450	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3580	set_widthheight ((unsigned int) (args[2] * fwidth),
3451	(unsigned int) (args[1] * TermWin.fheight));	3581	(unsigned int) (args[1] * fheight));
3452	break;	3582	break;
3453		3583
3454	//case 9: NYI, TODO, restore maximized window or maximize window	3584	//case 9: NYI, TODO, restore maximized window or maximize window
3455	default:	3585	default:
3456	if (args[0] >= 24) /* set height (chars) */	3586	if (args[0] >= 24) /* set height (chars) */
3457	set_widthheight ((unsigned int)TermWin.width,	3587	set_widthheight ((unsigned int)width,
3458	(unsigned int) (args[1] * TermWin.fheight));	3588	(unsigned int) (args[1] * fheight));
3459	break;	3589	break;
3460		3590
3461		3591
3462	/*	3592	/*
3463	* reports - some output format copied from XTerm	3593	* reports - some output format copied from XTerm
3464	*/	3594	*/
3465	case 11: /* report window state */	3595	case 11: /* report window state */
3466	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3596	XGetWindowAttributes (disp, parent[0], &wattr);
3467	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3597	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468	break;	3598	break;
3469	case 13: /* report window position */	3599	case 13: /* report window position */
3470	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3600	XGetWindowAttributes (disp, parent[0], &wattr);
3471	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3601	XTranslateCoordinates (disp, parent[0], wattr.root,
3472	-wattr.border_width, -wattr.border_width,	3602	-wattr.border_width, -wattr.border_width,
3473	&x, &y, &wdummy);	3603	&x, &y, &wdummy);
3474	tt_printf ("\033[3;%d;%dt", x, y);	3604	tt_printf ("\033[3;%d;%dt", x, y);
3475	break;	3605	break;
3476	case 14: /* report window size (pixels) */	3606	case 14: /* report window size (pixels) */
3477	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3607	XGetWindowAttributes (disp, parent[0], &wattr);
3478	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3608	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479	break;	3609	break;
3480	case 18: /* report text area size (chars) */	3610	case 18: /* report text area size (chars) */
3481	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3611	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482	break;	3612	break;
3483	case 19: /* report window size (chars) */	3613	case 19: /* report window size (chars) */
3484	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3614	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485	break;	3615	break;
3486	case 20: /* report icon label */	3616	case 20: /* report icon label */
3487	{	3617	{
3488	char *s;	3618	char *s;
3489	XGetIconName (display->display, TermWin.parent[0], &s);	3619	XGetIconName (disp, parent[0], &s);
3490	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3620	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491	XFree (s);	3621	XFree (s);
3492	}	3622	}
3493	break;	3623	break;
3494	case 21: /* report window title */	3624	case 21: /* report window title */
3495	{	3625	{
3496	char *s;	3626	char *s;
3497	XFetchName (display->display, TermWin.parent[0], &s);	3627	XFetchName (disp, parent[0], &s);
3498	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3628	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499	XFree (s);	3629	XFree (s);
3500	}	3630	}
3501	break;	3631	break;
3502	}	3632	}
3503	}	3633	}
…		…
3535	else if (ch < 0x20)	3665	else if (ch < 0x20)
3536	return NULL; /* other control character - exit */	3666	return NULL; /* other control character - exit */
3537		3667
3538	seen_esc = false;	3668	seen_esc = false;
3539		3669
3540	if (n >= sizeof (string) - 1)	3670	if (n >= STRING_MAX - 1)
3541	// stop at some sane length	3671	// stop at some sane length
3542	return NULL;	3672	return NULL;
3543		3673
3544	if (ch == C0_SYN)	3674	if (ch == C0_SYN)
3545	string[n++] = cmd_get8 ();	3675	string[n++] = cmd_get8 ();
…		…
3613	set_window_color (color, str);	3743	set_window_color (color, str);
3614	}	3744	}
3615		3745
3616	/*	3746	/*
3617	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3747	* 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	*/	3748	*/
3641	void	3749	void
3642	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3750	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3643	{	3751	{
3644	int changed = 0;	3752	int changed = 0;
3645	int color;	3753	int color;
3646	char *buf, *name;	3754	char *buf, *name;
3647	bool query = str[0] == '?' && !str[1];	3755	bool query = str[0] == '?' && !str[1];
3648	int saveop = op;	3756	int saveop = op;
		3757	dDisp;
3649		3758
3650	assert (str != NULL);	3759	assert (str != NULL);
3651	switch (op)	3760	switch (op)
3652	{	3761	{
3653	case XTerm_name:	3762	case XTerm_name:
…		…
3669	unsigned long bytes_after;	3778	unsigned long bytes_after;
3670	unsigned char *value = 0;	3779	unsigned char *value = 0;
3671	const char *str = "";	3780	const char *str = "";
3672		3781
3673	if (prop	3782	if (prop
3674	&& XGetWindowProperty (display->display, TermWin.parent[0],	3783	&& XGetWindowProperty (disp, parent[0],
3675	prop, 0, 1<<16, 0, AnyPropertyType,	3784	prop, 0, 1<<16, 0, AnyPropertyType,
3676	&actual_type, &actual_format,	3785	&actual_type, &actual_format,
3677	&nitems, &bytes_after, &value) == Success	3786	&nitems, &bytes_after, &value) == Success
3678	&& actual_type != None	3787	&& actual_type != None
3679	&& actual_format == 8)	3788	&& actual_format == 8)
…		…
3691	{	3800	{
3692	*eq = 0;	3801	*eq = 0;
3693	set_utf8_property (display->atom (str), eq + 1);	3802	set_utf8_property (display->atom (str), eq + 1);
3694	}	3803	}
3695	else	3804	else
3696	XDeleteProperty (display->display, TermWin.parent[0],	3805	XDeleteProperty (disp, parent[0],
3697	display->atom (str));	3806	display->atom (str));
3698	}	3807	}
3699	break;	3808	break;
3700		3809
3701	case XTerm_Color:	3810	case XTerm_Color:
…		…
3742	break;	3851	break;
3743	#ifndef NO_BOLD_UNDERLINE_REVERSE	3852	#ifndef NO_BOLD_UNDERLINE_REVERSE
3744	case XTerm_Color_BD:	3853	case XTerm_Color_BD:
3745	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3854	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746	break;	3855	break;
3747	case XTerm_Color_IT:
3748	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749	break;
3750	case XTerm_Color_UL:	3856	case XTerm_Color_UL:
3751	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3857	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752	break;	3858	break;
3753	case XTerm_Color_RV:	3859	case XTerm_Color_RV:
3754	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3860	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3755	break;	3861	break;
		3862	case URxvt_Color_IT:
		3863	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3864	break;
3756	#endif	3865	#endif
3757	#if TRANSPARENT && TINTING	3866	#if TRANSPARENT && TINTING
3758	case XTerm_Color_tint:	3867	case URxvt_Color_tint:
3759	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3868	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3760	check_our_parents ();	3869	check_our_parents ();
3761	if (am_transparent)	3870	if (am_transparent)
3762	want_full_refresh = want_refresh = 1;	3871	want_full_refresh = want_refresh = 1;
3763	break;	3872	break;
3764	#endif	3873	#endif
…		…
3798		3907
3799	case XTerm_logfile:	3908	case XTerm_logfile:
3800	// TODO, when secure mode?	3909	// TODO, when secure mode?
3801	break;	3910	break;
3802		3911
		3912	#ifdef MENUBAR
		3913	case URxvt_Menu:
		3914	if (OPTION (Opt_insecure))
		3915	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3916	break;
		3917	#endif
		3918	#if 0
		3919	case XTerm_dumpscreen: /* no error notices */
		3920	{
		3921	int fd;
		3922	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3923	{
		3924	scr_dump (fd);
		3925	close (fd);
		3926	}
		3927	}
		3928	break;
		3929	#endif
3803	case XTerm_font:	3930	case XTerm_font:
3804	op = URxvt_font;	3931	op = URxvt_font;
3805	case URxvt_font:	3932	case URxvt_font:
3806	#if ENABLE_STYLES	3933	#if ENABLE_STYLES
3807	case URxvt_boldFont:	3934	case URxvt_boldFont:
3808	case URxvt_italicFont:	3935	case URxvt_italicFont:
3809	case URxvt_boldItalicFont:	3936	case URxvt_boldItalicFont:
3810	#endif	3937	#endif
3811	if (query)	3938	if (query)
3812	tt_printf ("\33]%d;%-.250s%c", saveop,	3939	tt_printf ("\33]%d;%-.250s%c", saveop,
3813	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3940	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3941	? fontset[op - URxvt_font]->fontdesc : "",
3815	resp);	3942	resp);
3816	else	3943	else
3817	{	3944	{
3818	const char *&res = rs[Rs_font + (op - URxvt_font)];	3945	const char *&res = rs[Rs_font + (op - URxvt_font)];
3819		3946
…		…
3822	set_fonts ();	3949	set_fonts ();
3823	}	3950	}
3824	break;	3951	break;
3825		3952
3826	#if ENABLE_FRILLS	3953	#if ENABLE_FRILLS
3827	case XTerm_locale:	3954	case URxvt_locale:
3828	if (query)	3955	if (query)
3829	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3956	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3830	else	3957	else
3831	{	3958	{
3832	set_locale (str);	3959	set_locale (str);
3833	pty.set_utf8_mode (enc_utf8);	3960	pty.set_utf8_mode (enc_utf8);
3834	# ifdef USE_XIM
3835	im_cb ();	3961	init_xlocale ();
3836	# endif
3837	}	3962	}
3838	break;	3963	break;
3839	#endif
3840		3964
3841	#ifdef MENUBAR	3965	case URxvt_view_up:
3842	case XTerm_Menu:	3966	case URxvt_view_down:
3843	if (options & Opt_insecure)	3967	{
3844	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3968	int lines = atoi (str);
		3969
		3970	if (lines)
		3971	scr_page (op == URxvt_view_up ? UP : DN, lines);
		3972	else
		3973	scr_erase_savelines ();
		3974	}
		3975
3845	break;	3976	break;
3846	#endif	3977	#endif
3847	#if 0	3978
3848	case XTerm_dumpscreen: /* no error notices */	3979	#if ENABLE_PERL
3849	{	3980	case URxvt_perl:
3850	int fd;	3981	if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3851	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3982	; // no responses yet
3852	{
3853	scr_dump (fd);
3854	close (fd);
3855	}
3856	}
3857	break;	3983	break;
3858	#endif	3984	#endif
3859	}	3985	}
3860	}	3986	}
3861	/*----------------------------------------------------------------------*/	3987	/*----------------------------------------------------------------------*/
…		…
3970	}	4096	}
3971		4097
3972	/* extra handling for values with state unkept */	4098	/* extra handling for values with state unkept */
3973	switch (arg[i])	4099	switch (arg[i])
3974	{	4100	{
		4101	#if ENABLE_STYLES
		4102	case 1021:
		4103	if (mode)
		4104	SET_OPTION (Opt_intensityStyles);
		4105	else
		4106	CLR_OPTION (Opt_intensityStyles);
		4107
		4108	scr_touch (true);
		4109	break;
		4110	#endif
3975	case 1048: /* alternative cursor save */	4111	case 1048: /* alternative cursor save */
3976	case 1049:	4112	case 1049:
3977	if (options & Opt_secondaryScreen)	4113	if (OPTION (Opt_secondaryScreen))
3978	if (mode == 0)	4114	if (mode == 0)
3979	scr_cursor (RESTORE);	4115	scr_cursor (RESTORE);
3980	else if (mode == 1)	4116	else if (mode == 1)
3981	scr_cursor (SAVE);	4117	scr_cursor (SAVE);
3982	break;	4118	break;
…		…
3994	*/	4130	*/
3995	PrivMode (1, PrivMode_vt52);	4131	PrivMode (1, PrivMode_vt52);
3996	break;	4132	break;
3997	case 3: /* 80/132 */	4133	case 3: /* 80/132 */
3998	if (priv_modes & PrivMode_132OK)	4134	if (priv_modes & PrivMode_132OK)
3999	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4135	set_widthheight (((state ? 132 : 80) * fwidth), height);
4000	break;	4136	break;
4001	case 4: /* smooth scrolling */	4137	case 4: /* smooth scrolling */
4002	if (state)	4138	if (!state)
4003	options &= ~Opt_jumpScroll;	4139	SET_OPTION (Opt_jumpScroll);
4004	else	4140	else
4005	options |= Opt_jumpScroll;	4141	CLR_OPTION (Opt_jumpScroll);
4006	break;	4142	break;
4007	case 5: /* reverse video */	4143	case 5: /* reverse video */
4008	scr_rvideo_mode (state);	4144	scr_rvideo_mode (state);
4009	break;	4145	break;
4010	case 6: /* relative/absolute origins */	4146	case 6: /* relative/absolute origins */
…		…
4051	#if 0	4187	#if 0
4052	case 1001:	4188	case 1001:
4053	break; /* X11 mouse highlighting */	4189	break; /* X11 mouse highlighting */
4054	#endif	4190	#endif
4055	case 1010: /* scroll to bottom on TTY output inhibit */	4191	case 1010: /* scroll to bottom on TTY output inhibit */
4056	if (state)	4192	if (!state)
4057	options &= ~Opt_scrollTtyOutput;	4193	SET_OPTION (Opt_scrollTtyOutput);
4058	else	4194	else
4059	options |= Opt_scrollTtyOutput;	4195	CLR_OPTION (Opt_scrollTtyOutput);
4060	break;	4196	break;
4061	case 1011: /* scroll to bottom on key press */	4197	case 1011: /* scroll to bottom on key press */
4062	if (state)	4198	if (state)
4063	options |= Opt_scrollTtyKeypress;	4199	SET_OPTION (Opt_scrollTtyKeypress);
4064	else	4200	else
4065	options &= ~Opt_scrollTtyKeypress;	4201	CLR_OPTION (Opt_scrollTtyKeypress);
4066	break;	4202	break;
4067	case 1047: /* secondary screen w/ clearing last */	4203	case 1047: /* secondary screen w/ clearing last */
4068	if (options & Opt_secondaryScreen)	4204	if (OPTION (Opt_secondaryScreen))
4069	if (current_screen != PRIMARY)	4205	if (current_screen != PRIMARY)
4070	scr_erase_screen (2);	4206	scr_erase_screen (2);
4071	scr_change_screen (state);	4207	scr_change_screen (state);
4072	break;	4208	break;
4073	case 1049: /* secondary screen w/ clearing first */	4209	case 1049: /* secondary screen w/ clearing first */
4074	scr_change_screen (state);	4210	scr_change_screen (state);
4075	if (options & Opt_secondaryScreen)	4211	if (OPTION (Opt_secondaryScreen))
4076	if (current_screen != PRIMARY)	4212	if (current_screen != PRIMARY)
4077	scr_erase_screen (2);	4213	scr_erase_screen (2);
4078	break;	4214	break;
4079	default:	4215	default:
4080	break;	4216	break;
…		…
4230	case 106:	4366	case 106:
4231	case 107:	4367	case 107:
4232	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4368	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233	break;	4369	break;
4234	#endif	4370	#endif
4235
4236	}	4371	}
4237	}	4372	}
4238	}	4373	}
4239	/*}}} */	4374	/*}}} */
4240		4375
…		…
4321	}	4456	}
4322		4457
4323	memmove (v_buffer, v_buffer + written, v_buflen);	4458	memmove (v_buffer, v_buffer + written, v_buflen);
4324	}	4459	}
4325	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4460	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326	// original code just ignores this...	4461	pty_ev.set (EVENT_READ);
4327	destroy ();
4328	}	4462	}
4329		4463
4330	/*----------------------- end-of-file (C source) -----------------------*/	4464	/*----------------------- end-of-file (C source) -----------------------*/
4331		4465

Diff Legend

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