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

Diff Legend

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