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

Diff Legend

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