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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.217 by root, Sat Dec 31 16:30:42 2005 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
53	#include <cwchar>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
54	#include <csignal>	57	#include <csignal>
55		58
56	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
57		60
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
114	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
115	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
116	XK_Print, 0x2399,	119	XK_Print, 0x2399,
117		120
118	XK_space, 0x2423,	121	XK_space, 0x2423,
		122
		123	#ifdef XK_KP_Begin
		124	XK_KP_Prior, 0x21de,
		125	XK_KP_Next, 0x21df,
		126	XK_KP_Begin, 0x2320,
		127	XK_KP_Insert, 0x2380,
		128	XK_KP_Delete, 0x2326,
119	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
120	0,	131	0,
121	};	132	};
122		133
123	void	134	void
124	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
125	{	136	{
126	x = Pixel2Col (x);	137	x = Pixel2Col (x);
127	y = Pixel2Row (y);	138	y = Pixel2Row (y);
128		139
129	if (x < 0 || x >= TermWin.ncol	140	if (!IN_RANGE_EXC (x, 0, ncol)
130	|| y < 0 || y >= TermWin.nrow)	141	|| !IN_RANGE_EXC (y, 0, nrow))
131	return;	142	return;
132		143
133	for (;;)	144	for (;;)
134	{	145	{
135	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	const line_t &l = ROW(y - view_start);
		147
		148	text_t t = l.t[x];
136		149
137	if (t != NOCHAR || !x)	150	if (t != NOCHAR || !x)
138	{	151	{
139	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	iso14755_51 (l.t[x], l.r[x], x, y);
140	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141	iso14755buf = ISO_14755_54;	153	iso14755buf = ISO_14755_54;
142	break;	154	break;
143	}	155	}
144		156
145	x--;	157	x--;
146	}	158	}
147
148	}	159	}
149	#endif	160	#endif
150		161
		162	void
		163	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
		164	{
151	#if ENABLE_OVERLAY	165	#if ENABLE_OVERLAY
152	void
153	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154	{
155	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
156	rxvt_font *f = (*fs)[fs->find_font (ch)];	167	rxvt_font *f = (*fs)[fs->find_font (ch)];
157	wchar_t *chr, *alloc, ch2;	168	wchar_t *chr, *alloc, ch2, *fname;
158	int len;	169	int len;
159		170
		171	fname = rxvt_utf8towcs (f->name);
		172
160	#if ENABLE_COMBINING	173	# if ENABLE_COMBINING
161	if (IS_COMPOSE (ch))	174	if (IS_COMPOSE (ch))
162	{	175	{
163	len = rxvt_composite.expand (ch, 0);	176	len = rxvt_composite.expand (ch, 0);
164	alloc = chr = new wchar_t[len];	177	alloc = chr = new wchar_t[len];
165	rxvt_composite.expand (ch, chr);	178	rxvt_composite.expand (ch, chr);
166	}	179	}
167	else	180	else
168	#endif	181	# endif
169	{	182	{
170	ch2 = ch;	183	ch2 = ch;
171		184
172	alloc = 0;	185	alloc = 0;
173	chr = &ch2;	186	chr = &ch2;
174	len = 1;	187	len = 1;
175	}	188	}
176		189
177	int width = strlen (f->name);	190	char attr[80]; // plenty
178		191
179	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		193	(int)r,
		194	GET_FGCOLOR (r), GET_BGCOLOR (r),
		195	r & RS_Bold ? " bold" : "",
		196	r & RS_Italic ? " italic" : "",
		197	r & RS_Blink ? " blink" : "",
		198	r & RS_RVid ? " rvid" : "",
		199	r & RS_Uline ? " uline" : "",
		200	r & RS_Careful ? " careful" : "");
		201
		202	int width = wcswidth (fname, wcslen (fname));
		203
		204	max_it (width, 8+5); // for char + hey
		205	max_it (width, strlen (attr));
		206
		207	if (y >= 0)
		208	{
		209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		210	x = 0;
		211	}
		212
		213	scr_overlay_new (x, y, width, len + 2);
180		214
181	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182		216
183	for (int y = 0; y < len; y++)	217	for (int y = 0; y < len; y++)
184	{	218	{
…		…
187	ch = *chr++;	221	ch = *chr++;
188		222
189	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
190	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
191	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
192	#if !UNICODE3	226	# if !UNICODE3
193	if (ch >= 0x10000)	227	if (ch >= 0x10000)
194	ch = 0xfffd;	228	ch = 0xfffd;
195	#endif	229	# endif
196	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
197	scr_overlay_set (12, y, NOCHAR, r);	231	scr_overlay_set (12, y, NOCHAR, r);
198	}	232	}
199		233
		234	scr_overlay_set (0, len , attr);
200	scr_overlay_set (0, len, f->name);	235	scr_overlay_set (0, len + 1, fname);
201		236
		237	free (fname);
		238
202	#if ENABLE_COMBINING	239	# if ENABLE_COMBINING
203	if (alloc)	240	if (alloc)
204	delete [] alloc;	241	delete [] alloc;
205	#endif	242	# endif
206	}
207	#endif	243	#endif
		244	}
208		245
209	void	246	void
210	rxvt_term::commit_iso14755 ()	247	rxvt_term::commit_iso14755 ()
211	{	248	{
212	wchar_t ch[2];	249	wchar_t ch[2];
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	310	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	311	* escape sequence to toggle the Keypad.
275	*	312	*
276	* Always permit `shift' to override the current setting	313	* Always permit `shift' to override the current setting
277	*/	314	*/
278	shft = (ev.state & ShiftMask);	315	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	316	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	317	meta = ev.state & ModMetaMask;
281		318
282	if (numlock_state || (ev.state & ModNumLockMask))	319	if (numlock_state || (ev.state & ModNumLockMask))
283	{	320	{
284	numlock_state = (ev.state & ModNumLockMask);	321	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	322	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		342
306	// the XOpenIM manpage lies about hardcoding the locale	343	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	344	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	345	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	346	SET_LOCALE (rs[Rs_imLocale]);
		347
310	// assume wchar_t == unicode or better	348	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	349	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	350	KBUFSZ, &keysym, &status_return);
		351
313	if (rs[Rs_imLocale])	352	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	353	SET_LOCALE (locale);
315		354
316	if (status_return == XLookupChars	355	if (status_return == XLookupChars
317	|| status_return == XLookupBoth)	356	|| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	383	valid_keysym = keysym != NoSymbol;
345	}	384	}
346		385
347	if (valid_keysym)	386	if (valid_keysym)
348	{	387	{
		388	#ifdef KEYSYM_RESOURCE
		389	if (keyboard->dispatch (this, keysym, ev.state))
		390	return;
		391	#endif
		392
349	if (TermWin.saveLines)	393	if (saveLines)
350	{	394	{
351	#ifdef UNSHIFTED_SCROLLKEYS	395	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	396	if (!ctrl && !meta)
353	#else	397	#else
354	if (IS_SCROLL_MOD)	398	if (IS_SCROLL_MOD)
355	#endif	399	#endif
356	{	400	{
357	int lnsppg;	401	int lnsppg;
358		402
359	#ifdef PAGING_CONTEXT_LINES	403	#ifdef PAGING_CONTEXT_LINES
360	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	404	lnsppg = nrow - PAGING_CONTEXT_LINES;
361	#else	405	#else
362	lnsppg = TermWin.nrow * 4 / 5;	406	lnsppg = nrow * 4 / 5;
363	#endif	407	#endif
364	if (keysym == XK_Prior)	408	if (keysym == XK_Prior)
365	{	409	{
366	scr_page (UP, lnsppg);	410	scr_page (UP, lnsppg);
367	return;	411	return;
…		…
487	}	531	}
488	#endif	532	#endif
489		533
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	534	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	535	{
492	#ifdef KEYSYM_RESOURCE
493	if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494	{
495	unsigned int l;
496	const unsigned char *kbuf0;
497
498	kbuf0 = (Keysym_map[keysym & 0xFF]);
499	l = (unsigned int)*kbuf0++;
500
501	/* escape prefix */
502	if (meta
503	# ifdef META8_OPTION
504	&& meta_char == C0_ESC
505	# endif
506	)
507	{
508	const unsigned char ch = C0_ESC;
509	tt_write (&ch, 1);
510	}
511
512	tt_write (kbuf0, l);
513	return;
514	}
515	else
516	#endif
517	{	536	{
518	newlen = 1;	537	newlen = 1;
519	switch (keysym)	538	switch (keysym)
520	{	539	{
521	#ifndef NO_BACKSPACE_KEY	540	#ifndef NO_BACKSPACE_KEY
…		…
529	else	548	else
530	strcpy (kbuf, key_backspace);	549	strcpy (kbuf, key_backspace);
531	break;	550	break;
532	#endif	551	#endif
533	#ifndef NO_DELETE_KEY	552	#ifndef NO_DELETE_KEY
		553	# ifdef XK_KP_Prior
		554	case XK_KP_Delete:
		555	/* allow shift to override */
		556	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		557	{
		558	strcpy (kbuf, "\033On");
		559	break;
		560	}
		561	/* FALLTHROUGH */
		562	# endif
534	case XK_Delete:	563	case XK_Delete:
535	strcpy (kbuf, key_delete);	564	strcpy (kbuf, key_delete);
536	break;	565	break;
537	#endif	566	#endif
538	case XK_Tab:	567	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	670	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	671	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	672	strcpy (kbuf, "\033Ou");
644	break;	673	break;
645		674
646	case XK_KP_Insert:
647	strcpy (kbuf, "\033Op");
648	break;
649
650	case XK_KP_Delete:
651	strcpy (kbuf, "\033On");
652	break;
653	#endif	675	#endif
654	case XK_KP_F1: /* "\033OP" */	676	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	677	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	678	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	679	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	711	break;
690		712
691	case XK_Find:	713	case XK_Find:
692	strcpy (kbuf, "\033[1~");	714	strcpy (kbuf, "\033[1~");
693	break;	715	break;
		716
		717	#ifdef XK_KP_End
		718	case XK_KP_Insert:
		719	/* allow shift to override */
		720	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		721	{
		722	strcpy (kbuf, "\033Op");
		723	break;
		724	}
		725	/* FALLTHROUGH */
		726	#endif
694	case XK_Insert:	727	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	728	strcpy (kbuf, "\033[2~");
696	break;	729	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	730	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	731	case DXK_Remove:
…		…
785	case XK_F35: /* "\033[49~" */	818	case XK_F35: /* "\033[49~" */
786	FKEY (31, XK_F17);	819	FKEY (31, XK_F17);
787	break;	820	break;
788	#undef FKEY	821	#undef FKEY
789	default:	822	default:
790	if (len == 0	823	newlen = 0;
791	&& (keysym & 0xfff0) != 0xff70	824	break;
792	&& (keysym & 0xfff0) != 0xffe0)
793	/* generate a keycode for every remaining keypress */
794	sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795	}	825	}
796		826
797	if (newlen)	827	if (newlen)
798	len = strlen (kbuf);	828	len = strlen (kbuf);
799	}	829	}
…		…
815	else if (keysym == XK_ISO_Left_Tab)	845	else if (keysym == XK_ISO_Left_Tab)
816	{	846	{
817	strcpy (kbuf, "\033[Z");	847	strcpy (kbuf, "\033[Z");
818	len = 3;	848	len = 3;
819	}	849	}
820	else if (len == 0
821	&& (keysym & 0xffe0) != 0xfe00
822	&& (keysym < 0xfe50 || keysym > 0xfe6f))
823	{
824	/* generate a keycode for every remaining keypress */
825	len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826	}
827	else	850	else
828	{	851	{
829	#ifdef META8_OPTION	852	#ifdef META8_OPTION
830	/* set 8-bit on */	853	/* set 8-bit on */
831	if (meta && (meta_char == 0x80))	854	if (meta && (meta_char == 0x80))
…		…
844		867
845	if (len <= 0)	868	if (len <= 0)
846	return; /* not mapped */	869	return; /* not mapped */
847		870
848	if (options & Opt_scrollTtyKeypress)	871	if (options & Opt_scrollTtyKeypress)
849	if (TermWin.view_start)	872	if (view_start)
850	{	873	{
851	TermWin.view_start = 0;	874	view_start = 0;
852	want_refresh = 1;	875	want_refresh = 1;
853	}	876	}
854		877
855	/*	878	/*
856	* these modifications only affect the static keybuffer	879	* these modifications only affect the static keybuffer
…		…
889	#endif /* DEBUG_CMD */	912	#endif /* DEBUG_CMD */
890	tt_write (kbuf, (unsigned int)len);	913	tt_write (kbuf, (unsigned int)len);
891	}	914	}
892	/*}}} */	915	/*}}} */
893		916
894	#if (MENUBAR_MAX)	917	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	918	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896	/* attempt to `write' count to the input buffer */	919	/* attempt to `write' count to the input buffer */
897	unsigned int	920	unsigned int
898	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	921	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
899	{	922	{
…		…
922		945
923	cmd_parse ();	946	cmd_parse ();
924		947
925	return 0;	948	return 0;
926	}	949	}
927	#endif /* MENUBAR_MAX */	950	#endif
928		951
929	void	952	void
930	rxvt_term::flush ()	953	rxvt_term::flush ()
931	{	954	{
932	flush_ev.stop ();	955	flush_ev.stop ();
…		…
1033	{	1056	{
1034	if (mouse_slip_wheel_speed == 0	1057	if (mouse_slip_wheel_speed == 0
1035	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1058	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036	: scr_page (UP, mouse_slip_wheel_speed))	1059	: scr_page (UP, mouse_slip_wheel_speed))
1037	{	1060	{
		1061	if (view_start == nsaved ||
		1062	view_start == 0)
		1063	mouse_slip_wheel_speed = 0;
		1064
1038	refresh_type |= SMOOTH_REFRESH;	1065	refresh_type |= SMOOTH_REFRESH;
1039	want_refresh = 1;	1066	want_refresh = 1;
1040	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1067	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041	}	1068	}
1042	}	1069	}
…		…
1062	if (n > 0)	1089	if (n > 0)
1063	{	1090	{
1064	cmdbuf_endp += n;	1091	cmdbuf_endp += n;
1065	return true;	1092	return true;
1066	}	1093	}
1067	else if (n < 0 && errno != EAGAIN)	1094	else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
		1095	{
		1096	pty_ev.stop ();
		1097
		1098	if (!(options & Opt_hold))
1068	destroy ();	1099	destroy ();
		1100	}
1069		1101
1070	return false;	1102	return false;
1071	}	1103	}
1072		1104
1073	void	1105	void
…		…
1087	}	1119	}
1088		1120
1089	void	1121	void
1090	rxvt_term::pointer_unblank ()	1122	rxvt_term::pointer_unblank ()
1091	{	1123	{
1092	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1124	XDefineCursor (display->display, vt, TermWin_cursor);
1093	recolour_cursor ();	1125	recolour_cursor ();
1094		1126
1095	#ifdef POINTER_BLANK	1127	#ifdef POINTER_BLANK
1096	hidden_pointer = 0;	1128	hidden_pointer = 0;
1097		1129
…		…
1105	rxvt_term::pointer_blank ()	1137	rxvt_term::pointer_blank ()
1106	{	1138	{
1107	if (! (options & Opt_pointerBlank))	1139	if (! (options & Opt_pointerBlank))
1108	return;	1140	return;
1109		1141
1110	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1142	XDefineCursor (display->display, vt, display->blank_cursor);
1111	XFlush (display->display);	1143	XFlush (display->display);
1112		1144
1113	hidden_pointer = 1;	1145	hidden_pointer = 1;
1114	}	1146	}
1115		1147
…		…
1204		1236
1205	/*{{{ process an X event */	1237	/*{{{ process an X event */
1206	void	1238	void
1207	rxvt_term::x_cb (XEvent &ev)	1239	rxvt_term::x_cb (XEvent &ev)
1208	{	1240	{
		1241	dDisp;
		1242
1209	SET_R (this);	1243	SET_R (this);
1210	SET_LOCALE (locale);	1244	SET_LOCALE (locale);
1211		1245
1212	#if defined(CURSOR_BLINK)	1246	#if defined(CURSOR_BLINK)
1213	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1247	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1329	button_release (ev.xbutton);	1363	button_release (ev.xbutton);
1330	break;	1364	break;
1331		1365
1332	case ClientMessage:	1366	case ClientMessage:
1333	if (ev.xclient.format == 32	1367	if (ev.xclient.format == 32
		1368	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1369	{
1334	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1370	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335	destroy ();	1371	destroy ();
		1372	#if ENABLE_EWMH
		1373	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1374	XSendEvent (disp, ev.xclient.window = display->root,
		1375	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1376	&ev);
		1377	#endif
		1378	}
		1379	#if ENABLE_XEMBED
		1380	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1381	{
		1382	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1383	focus_in ();
		1384	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1385	focus_out ();
		1386	}
		1387	#endif
1336	#ifdef OFFIX_DND	1388	#ifdef OFFIX_DND
1337	/* OffiX Dnd (drag 'n' drop) protocol */	1389	/* OffiX Dnd (drag 'n' drop) protocol */
1338	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1390	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339	&& (ev.xclient.data.l[0] == DndFile	1391	&& (ev.xclient.data.l[0] == DndFile
1340	|| ev.xclient.data.l[0] == DndDir	1392	|| ev.xclient.data.l[0] == DndDir
1341	|| ev.xclient.data.l[0] == DndLink))	1393	|| ev.xclient.data.l[0] == DndLink))
1342	{	1394	{
1343	/* Get Dnd data */	1395	/* Get Dnd data */
1344	Atom ActualType;	1396	Atom ActualType;
1345	int ActualFormat;	1397	int ActualFormat;
1346	unsigned char *data;	1398	unsigned char *data;
1347	unsigned long Size, RemainingBytes;	1399	unsigned long Size, RemainingBytes;
1348		1400
1349	XGetWindowProperty (display->display, display->root,	1401	XGetWindowProperty (disp, display->root,
1350	xa[XA_DNDSELECTION],	1402	xa[XA_DNDSELECTION],
1351	0L, 1000000L,	1403	0L, 1000000L,
1352	False, AnyPropertyType,	1404	False, AnyPropertyType,
1353	&ActualType, &ActualFormat,	1405	&ActualType, &ActualFormat,
1354	&Size, &RemainingBytes,	1406	&Size, &RemainingBytes,
1355	&data);	1407	&data);
1356	set_string_property (XA_CUT_BUFFER0, data);	1408	set_string_property (XA_CUT_BUFFER0, data);
1357	XFree (data);	1409	XFree (data);
1358	selection_paste (display->root, XA_CUT_BUFFER0, true);	1410	selection_paste (display->root, XA_CUT_BUFFER0, true);
1359	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1411	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360	}	1412	}
1361	#endif /* OFFIX_DND */	1413	#endif /* OFFIX_DND */
1362	break;	1414	break;
1363		1415
1364	case MappingNotify:	1416	case MappingNotify:
…		…
1389	break;	1441	break;
1390	}	1442	}
1391	break;	1443	break;
1392		1444
1393	case FocusIn:	1445	case FocusIn:
1394	if (!TermWin.focus)	1446	focus_in ();
		1447	break;
		1448
		1449	case FocusOut:
		1450	focus_out ();
		1451	break;
		1452
		1453	case ConfigureNotify:
		1454	if (ev.xconfigure.window == parent[0])
1395	{	1455	{
1396	TermWin.focus = 1;
1397	want_refresh = 1;
1398	#ifdef USE_XIM
1399	if (Input_Context != NULL)
1400	{
1401	IMSetStatusPosition ();
1402	XSetICFocus (Input_Context);
1403	}
1404	#endif
1405	#ifdef CURSOR_BLINK
1406	if (options & Opt_cursorBlink)
1407	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408	#endif
1409	#ifdef OFF_FOCUS_FADING
1410	if (rs[Rs_fade])
1411	{
1412	pix_colors = pix_colors_focused;
1413	scr_recolour ();
1414	}
1415	#endif
1416
1417	}
1418	break;
1419
1420	case FocusOut:
1421	if (TermWin.focus)
1422	{
1423	TermWin.focus = 0;
1424	want_refresh = 1;
1425
1426	#if ENABLE_FRILLS || ISO_14755
1427	iso14755buf = 0;
1428	#endif
1429	#if ENABLE_OVERLAY
1430	scr_overlay_off ();
1431	#endif
1432	#ifdef USE_XIM
1433	if (Input_Context != NULL)
1434	XUnsetICFocus (Input_Context);
1435	#endif
1436	#ifdef CURSOR_BLINK
1437	if (options & Opt_cursorBlink)
1438	cursor_blink_ev.stop ();
1439	hidden_cursor = 0;
1440	#endif
1441	#ifdef OFF_FOCUS_FADING
1442	if (rs[Rs_fade])
1443	{
1444	pix_colors = pix_colors_unfocused;
1445	scr_recolour ();
1446	}
1447	#endif
1448	}
1449	break;
1450
1451	case ConfigureNotify:
1452	if (ev.xconfigure.window == TermWin.parent[0])
1453	{
1454	int height, width;
1455
1456	do
1457	{ /* Wrap lots of configures into one */
1458	width = ev.xconfigure.width;
1459	height = ev.xconfigure.height;
1460	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461	}
1462	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1456	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1457	;
1463		1458
1464	if (szHint.width != width || szHint.height != height)	1459	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465	{	1460	{
1466	seen_resize = 1;	1461	seen_resize = 1;
1467	resize_all_windows (width, height, 1);	1462	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468	}	1463	}
1469		1464
1470	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1465	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471	if (options & Opt_transparent)	1466	if (options & Opt_transparent)
1472	check_our_parents ();	1467	check_our_parents ();
…		…
1493	case SelectionRequest:	1488	case SelectionRequest:
1494	selection_send (ev.xselectionrequest);	1489	selection_send (ev.xselectionrequest);
1495	break;	1490	break;
1496		1491
1497	case UnmapNotify:	1492	case UnmapNotify:
1498	TermWin.mapped = 0;	1493	mapped = 0;
1499	#ifdef TEXT_BLINK	1494	#ifdef TEXT_BLINK
1500	text_blink_ev.stop ();	1495	text_blink_ev.stop ();
1501	#endif	1496	#endif
1502	break;	1497	break;
1503		1498
1504	case MapNotify:	1499	case MapNotify:
1505	TermWin.mapped = 1;	1500	mapped = 1;
1506	#ifdef TEXT_BLINK	1501	#ifdef TEXT_BLINK
1507	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1502	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508	#endif	1503	#endif
1509	break;	1504	break;
1510		1505
…		…
1514	break;	1509	break;
1515	#endif /* TRANSPARENT */	1510	#endif /* TRANSPARENT */
1516		1511
1517	case GraphicsExpose:	1512	case GraphicsExpose:
1518	case Expose:	1513	case Expose:
1519	if (ev.xany.window == TermWin.vt)	1514	if (ev.xany.window == vt)
1520	{	1515	{
1521	do	1516	do
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1517	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1518	ev.xexpose.width, ev.xexpose.height, False);
1524	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1519	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525		1520
1526	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527		1522
1528	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1523	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529	scr_expose (ev.xexpose.x, ev.xexpose.y,	1524	scr_expose (ev.xexpose.x, ev.xexpose.y,
1530	ev.xexpose.width, ev.xexpose.height, False);	1525	ev.xexpose.width, ev.xexpose.height, False);
1531		1526
1532	scr_refresh (refresh_type);	1527	scr_refresh (refresh_type);
1533	}	1528	}
1534	else	1529	else
1535	{	1530	{
1536	XEvent unused_event;	1531	XEvent unused_event;
1537		1532
1538	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1533	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539	;	1534	;
1540	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1535	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541	;	1536	;
1542		1537
1543	if (isScrollbarWindow (ev.xany.window))	1538	if (isScrollbarWindow (ev.xany.window))
1544	{	1539	{
1545	scrollBar.setIdle ();	1540	scrollBar.setIdle ();
…		…
1549	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1544	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550	menubar_expose ();	1545	menubar_expose ();
1551	#endif	1546	#endif
1552		1547
1553	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1554	if (am_transparent && ev.xany.window == TermWin.parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1555	XClearWindow (display->display, ev.xany.window);	1550	XClearWindow (disp, ev.xany.window);
1556	#endif	1551	#endif
1557	}	1552	}
1558	break;	1553	break;
1559		1554
1560	case MotionNotify:	1555	case MotionNotify:
…		…
1570	}	1565	}
1571	#endif	1566	#endif
1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573	break;	1568	break;
1574		1569
1575	if (ev.xany.window == TermWin.vt)	1570	if (ev.xany.window == vt)
1576	{	1571	{
1577	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1572	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578	{	1573	{
1579	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1574	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580	;	1575	;
1581		1576
1582	XQueryPointer (display->display, TermWin.vt,	1577	XQueryPointer (disp, vt,
1583	&unused_root, &unused_child,	1578	&unused_root, &unused_child,
1584	&unused_root_x, &unused_root_y,	1579	&unused_root_x, &unused_root_y,
1585	&ev.xbutton.x, &ev.xbutton.y,	1580	&ev.xbutton.x, &ev.xbutton.y,
1586	&ev.xbutton.state);	1581	&ev.xbutton.state);
1587	#ifdef MOUSE_THRESHOLD	1582	#ifdef MOUSE_THRESHOLD
…		…
1599	#endif	1594	#endif
1600	selection_extend (ev.xbutton.x, ev.xbutton.y,	1595	selection_extend (ev.xbutton.x, ev.xbutton.y,
1601	ev.xbutton.state & Button3Mask ? 2 : 0);	1596	ev.xbutton.state & Button3Mask ? 2 : 0);
1602		1597
1603	#ifdef SELECTION_SCROLLING	1598	#ifdef SELECTION_SCROLLING
1604	if (ev.xbutton.y < TermWin.int_bwidth	1599	if (ev.xbutton.y < int_bwidth
1605	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1600	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1606	{	1601	{
1607	int dist;	1602	int dist;
1608		1603
1609	/* don't clobber the current delay if we are	1604	/* don't clobber the current delay if we are
1610	* already in the middle of scrolling.	1605	* already in the middle of scrolling.
…		…
1618	selection_save_x = ev.xbutton.x;	1613	selection_save_x = ev.xbutton.x;
1619	selection_save_y = ev.xbutton.y;	1614	selection_save_y = ev.xbutton.y;
1620	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1615	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621		1616
1622	/* calc number of lines to scroll */	1617	/* calc number of lines to scroll */
1623	if (ev.xbutton.y < TermWin.int_bwidth)	1618	if (ev.xbutton.y < int_bwidth)
1624	{	1619	{
1625	scroll_selection_dir = UP;	1620	scroll_selection_dir = UP;
1626	dist = TermWin.int_bwidth - ev.xbutton.y;	1621	dist = int_bwidth - ev.xbutton.y;
1627	}	1622	}
1628	else	1623	else
1629	{	1624	{
1630	scroll_selection_dir = DN;	1625	scroll_selection_dir = DN;
1631	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1626	dist = ev.xbutton.y - (int_bwidth + height);
1632	}	1627	}
1633		1628
1634	scroll_selection_lines = Pixel2Height (dist)	1629	scroll_selection_lines = Pixel2Height (dist)
1635	/ SELECTION_SCROLL_LINE_SPEEDUP	1630	/ SELECTION_SCROLL_LINE_SPEEDUP
1636	+ 1;	1631	+ 1;
1637	MIN_IT (scroll_selection_lines,	1632	min_it (scroll_selection_lines,
1638	SELECTION_SCROLL_MAX_LINES);	1633	SELECTION_SCROLL_MAX_LINES);
1639	}	1634	}
1640	else	1635	else
1641	{	1636	{
1642	/* we are within the text window, so we	1637	/* we are within the text window, so we
…		…
1651	#endif	1646	#endif
1652	}	1647	}
1653	}	1648	}
1654	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1649	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655	{	1650	{
1656	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1651	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657	MotionNotify, &ev))	1652	MotionNotify, &ev))
1658	;	1653	;
1659		1654
1660	XQueryPointer (display->display, scrollBar.win,	1655	XQueryPointer (disp, scrollBar.win,
1661	&unused_root, &unused_child,	1656	&unused_root, &unused_child,
1662	&unused_root_x, &unused_root_y,	1657	&unused_root_x, &unused_root_y,
1663	&ev.xbutton.x, &ev.xbutton.y,	1658	&ev.xbutton.x, &ev.xbutton.y,
1664	&unused_mask);	1659	&unused_mask);
1665	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1660	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1670	}	1665	}
1671	break;	1666	break;
1672	}	1667	}
1673	}	1668	}
1674		1669
		1670	void
		1671	rxvt_term::focus_in ()
		1672	{
		1673	if (!focus)
		1674	{
		1675	focus = 1;
		1676	want_refresh = 1;
		1677	#if USE_XIM
		1678	if (Input_Context != NULL)
		1679	{
		1680	IMSetStatusPosition ();
		1681	XSetICFocus (Input_Context);
		1682	}
		1683	#endif
		1684	#if CURSOR_BLINK
		1685	if (options & Opt_cursorBlink)
		1686	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1687	#endif
		1688	#if OFF_FOCUS_FADING
		1689	if (rs[Rs_fade])
		1690	{
		1691	pix_colors = pix_colors_focused;
		1692	scr_recolour ();
		1693	}
		1694	#endif
		1695	}
		1696	}
		1697
		1698	void
		1699	rxvt_term::focus_out ()
		1700	{
		1701	if (focus)
		1702	{
		1703	focus = 0;
		1704	want_refresh = 1;
		1705
		1706	#if ENABLE_FRILLS || ISO_14755
		1707	iso14755buf = 0;
		1708	#endif
		1709	#if ENABLE_OVERLAY
		1710	scr_overlay_off ();
		1711	#endif
		1712	#if USE_XIM
		1713	if (Input_Context != NULL)
		1714	XUnsetICFocus (Input_Context);
		1715	#endif
		1716	#if CURSOR_BLINK
		1717	if (options & Opt_cursorBlink)
		1718	cursor_blink_ev.stop ();
		1719	hidden_cursor = 0;
		1720	#endif
		1721	#if OFF_FOCUS_FADING
		1722	if (rs[Rs_fade])
		1723	{
		1724	pix_colors = pix_colors_unfocused;
		1725	scr_recolour ();
		1726	}
		1727	#endif
		1728	}
		1729	}
		1730
1675	#if TRANSPARENT	1731	#if TRANSPARENT
1676	void	1732	void
1677	rxvt_term::rootwin_cb (XEvent &ev)	1733	rxvt_term::rootwin_cb (XEvent &ev)
1678	{	1734	{
1679	SET_R (this);	1735	SET_R (this);
…		…
1709	reportmode = !! (priv_modes & PrivMode_mouse_report);	1765	reportmode = !! (priv_modes & PrivMode_mouse_report);
1710		1766
1711	/*	1767	/*
1712	* VT window processing of button press	1768	* VT window processing of button press
1713	*/	1769	*/
1714	if (ev.window == TermWin.vt)	1770	if (ev.window == vt)
1715	{	1771	{
1716	#if ISO_14755	1772	#if ISO_14755
1717	// 5.4	1773	// 5.4
1718	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1774	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719	{	1775	{
…		…
1767	{	1823	{
1768	case Button1:	1824	case Button1:
1769	/* allow meta + click to select rectangular areas */	1825	/* allow meta + click to select rectangular areas */
1770	/* should be done in screen.C */	1826	/* should be done in screen.C */
1771	#if ENABLE_FRILLS	1827	#if ENABLE_FRILLS
1772	selection.rect = !! (ev.state & ModMetaMask);	1828	selection.rect = !!(ev.state & ModMetaMask);
1773	#else	1829	#else
1774	selection.rect = false;	1830	selection.rect = false;
1775	#endif	1831	#endif
1776		1832
1777	/* allow shift+left click to extend selection */	1833	/* allow shift+left click to extend selection */
…		…
1924	case Button3:	1980	case Button3:
1925	if (scrollBar.style != R_SB_XTERM)	1981	if (scrollBar.style != R_SB_XTERM)
1926	{	1982	{
1927	if (scrollbar_above_slider (ev.y))	1983	if (scrollbar_above_slider (ev.y))
1928	# ifdef RXVT_SCROLL_FULL	1984	# ifdef RXVT_SCROLL_FULL
1929	scr_page (UP, TermWin.nrow - 1);	1985	scr_page (UP, nrow - 1);
1930	# else	1986	# else
1931	scr_page (UP, TermWin.nrow / 4);	1987	scr_page (UP, nrow / 4);
1932	# endif	1988	# endif
1933	else if (scrollbar_below_slider (ev.y))	1989	else if (scrollbar_below_slider (ev.y))
1934	# ifdef RXVT_SCROLL_FULL	1990	# ifdef RXVT_SCROLL_FULL
1935	scr_page (DN, TermWin.nrow - 1);	1991	scr_page (DN, nrow - 1);
1936	# else	1992	# else
1937	scr_page (DN, TermWin.nrow / 4);	1993	scr_page (DN, nrow / 4);
1938	# endif	1994	# endif
1939	else	1995	else
1940	scrollBar.setMotion ();	1996	scrollBar.setMotion ();
1941	}	1997	}
1942	else	1998	else
1943	{	1999	{
1944	scr_page ((ev.button == Button1 ? DN : UP),	2000	scr_page ((ev.button == Button1 ? DN : UP),
1945	(TermWin.nrow	2001	(nrow
1946	* scrollbar_position (ev.y)	2002	* scrollbar_position (ev.y)
1947	/ scrollbar_size ()));	2003	/ scrollbar_size ()));
1948	}	2004	}
1949		2005
1950	break;	2006	break;
…		…
1982	#ifdef SELECTION_SCROLLING	2038	#ifdef SELECTION_SCROLLING
1983	if (sel_scroll_ev.active)	2039	if (sel_scroll_ev.active)
1984	sel_scroll_ev.stop();	2040	sel_scroll_ev.stop();
1985	#endif	2041	#endif
1986		2042
1987	if (ev.window == TermWin.vt)	2043	if (ev.window == vt)
1988	{	2044	{
1989	#if ISO_14755	2045	#if ISO_14755
1990	// 5.4	2046	// 5.4
1991	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2047	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992	return;	2048	return;
…		…
2043	v = ev.button == Button4 ? UP : DN;	2099	v = ev.button == Button4 ? UP : DN;
2044		2100
2045	if (ev.state & ShiftMask)	2101	if (ev.state & ShiftMask)
2046	i = 1;	2102	i = 1;
2047	else if (options & Opt_mouseWheelScrollPage)	2103	else if (options & Opt_mouseWheelScrollPage)
2048	i = TermWin.nrow - 1;	2104	i = nrow - 1;
2049	else	2105	else
2050	i = 5;	2106	i = 5;
2051		2107
2052	# ifdef MOUSE_SLIP_WHEELING	2108	# ifdef MOUSE_SLIP_WHEELING
2053	if (ev.state & ControlMask)	2109	if (ev.state & ControlMask)
2054	{	2110	{
2055	mouse_slip_wheel_speed += v ? -1 : 1;	2111	mouse_slip_wheel_speed += v ? -1 : 1;
2056	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2112	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2113	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058		2114
2059	if (slip_wheel_ev.at < NOW)	2115	if (slip_wheel_ev.at < NOW)
2060	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2116	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061		2117
2062	slip_wheel_ev.start ();	2118	slip_wheel_ev.start ();
…		…
2103	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2159	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2160	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2161	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106	int i;	2162	int i;
2107		2163
2108	Visual* visual = display->visual;	2164	Visual *visual = display->visual;
2109		2165
2110	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2166	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111		2167
2112	/* for convenience */	2168	/* for convenience */
2113	mask_r = visual->red_mask;	2169	mask_r = visual->red_mask;
…		…
2334	Atom atype;	2390	Atom atype;
2335	unsigned char *prop = NULL;	2391	unsigned char *prop = NULL;
2336	Window root, oldp, *list;	2392	Window root, oldp, *list;
2337	Pixmap rootpixmap = None;	2393	Pixmap rootpixmap = None;
2338	XWindowAttributes wattr, wrootattr;	2394	XWindowAttributes wattr, wrootattr;
		2395	dDisp;
2339		2396
2340	pchanged = 0;	2397	pchanged = 0;
2341		2398
2342	if (!(options & Opt_transparent))	2399	if (!(options & Opt_transparent))
2343	return pchanged; /* Don't try any more */	2400	return pchanged; /* Don't try any more */
2344		2401
2345	XGetWindowAttributes (display->display, display->root, &wrootattr);	2402	XGetWindowAttributes (disp, display->root, &wrootattr);
2346	rootdepth = wrootattr.depth;	2403	rootdepth = wrootattr.depth;
2347		2404
2348	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2405	XGetWindowAttributes (disp, parent[0], &wattr);
2349		2406
2350	if (rootdepth != wattr.depth)	2407	if (rootdepth != wattr.depth)
2351	{	2408	{
2352	if (am_transparent)	2409	if (am_transparent)
2353	{	2410	{
2354	pchanged = 1;	2411	pchanged = 1;
2355	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2412	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356	am_transparent = am_pixmap_trans = 0;	2413	am_transparent = am_pixmap_trans = 0;
2357	}	2414	}
2358		2415
2359	return pchanged; /* Don't try any more */	2416	return pchanged; /* Don't try any more */
2360	}	2417	}
2361		2418
2362	/* Get all X ops out of the queue so that our information is up-to-date. */	2419	/* Get all X ops out of the queue so that our information is up-to-date. */
2363	XSync (display->display, False);	2420	XSync (disp, False);
2364		2421
2365	/*	2422	/*
2366	* Make the frame window set by the window manager have	2423	* Make the frame window set by the window manager have
2367	* the root background. Some window managers put multiple nested frame	2424	* the root background. Some window managers put multiple nested frame
2368	* windows for each client, so we have to take care about that.	2425	* windows for each client, so we have to take care about that.
2369	*/	2426	*/
2370	i = (xa[XA_XROOTPMAP_ID]	2427	i = (xa[XA_XROOTPMAP_ID]
2371	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2428	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2429	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373	&nitems, &bytes_after, &prop) == Success);	2430	&nitems, &bytes_after, &prop) == Success);
2374		2431
2375	if (!i || prop == NULL)	2432	if (!i || prop == NULL)
2376	i = (xa[XA_ESETROOT_PMAP_ID]	2433	i = (xa[XA_ESETROOT_PMAP_ID]
2377	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2434	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2435	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379	&nitems, &bytes_after, &prop) == Success);	2436	&nitems, &bytes_after, &prop) == Success);
2380		2437
2381	if (!i || prop == NULL	2438	if (!i || prop == NULL
2382	#if TINTING	2439	#if TINTING
…		…
2401	Window cr;	2458	Window cr;
2402	XImage *image;	2459	XImage *image;
2403	GC gc;	2460	GC gc;
2404	XGCValues gcvalue;	2461	XGCValues gcvalue;
2405		2462
2406	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2463	XTranslateCoordinates (disp, parent[0], display->root,
2407	0, 0, &sx, &sy, &cr);	2464	0, 0, &sx, &sy, &cr);
2408	nw = (unsigned int)szHint.width;	2465	nw = (unsigned int)szHint.width;
2409	nh = (unsigned int)szHint.height;	2466	nh = (unsigned int)szHint.height;
2410	nx = ny = 0;	2467	nx = ny = 0;
2411		2468
…		…
2421	nh += sy;	2478	nh += sy;
2422	ny = -sy;	2479	ny = -sy;
2423	sy = 0;	2480	sy = 0;
2424	}	2481	}
2425		2482
2426	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2483	min_it (nw, (unsigned int) (wrootattr.width - sx));
2427	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2484	min_it (nh, (unsigned int) (wrootattr.height - sy));
2428		2485
2429	XSync (display->display, False);	2486	XSync (disp, False);
2430	allowedxerror = -1;	2487	allowedxerror = -1;
2431	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2488	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432		2489
2433	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2490	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2434	/* XXX: may need a delay here? */	2491	/* XXX: may need a delay here? */
2435	allowedxerror = 0;	2492	allowedxerror = 0;
2436		2493
2437	if (image == NULL)	2494	if (image == NULL)
2438	{	2495	{
2439	if (am_transparent && am_pixmap_trans)	2496	if (am_transparent && am_pixmap_trans)
2440	{	2497	{
2441	pchanged = 1;	2498	pchanged = 1;
2442	if (TermWin.pixmap != None)	2499	if (pixmap != None)
2443	{	2500	{
2444	XFreePixmap (display->display, TermWin.pixmap);	2501	XFreePixmap (disp, pixmap);
2445	TermWin.pixmap = None;	2502	pixmap = None;
2446	}	2503	}
2447	}	2504	}
2448		2505
2449	am_pixmap_trans = 0;	2506	am_pixmap_trans = 0;
2450	}	2507	}
2451	else	2508	else
2452	{	2509	{
2453	if (TermWin.pixmap != None)	2510	if (pixmap != None)
2454	XFreePixmap (display->display, TermWin.pixmap);	2511	XFreePixmap (disp, pixmap);
2455		2512
2456	#if TINTING	2513	#if TINTING
2457	if (ISSET_PIXCOLOR (Color_tint))	2514	if (ISSET_PIXCOLOR (Color_tint))
2458	{	2515	{
2459	unsigned short rm, gm, bm;	2516	unsigned short rm, gm, bm;
…		…
2463		2520
2464	ShadeXImage (display, image, shade, rm, gm, bm);	2521	ShadeXImage (display, image, shade, rm, gm, bm);
2465	}	2522	}
2466	#endif	2523	#endif
2467		2524
2468	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2525	pixmap = XCreatePixmap (disp, vt,
2469	szHint.width, szHint.height, image->depth);	2526	szHint.width, szHint.height, image->depth);
2470	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2527	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2528	XPutImage (disp, pixmap, gc, image, 0, 0,
2472	nx, ny, image->width, image->height);	2529	nx, ny, image->width, image->height);
2473	XFreeGC (display->display, gc);	2530	XFreeGC (disp, gc);
2474	XDestroyImage (image);	2531	XDestroyImage (image);
2475	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2532	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476	XClearWindow (display->display, TermWin.parent[0]);	2533	XClearWindow (disp, parent[0]);
2477		2534
2478	if (!am_transparent || !am_pixmap_trans)	2535	if (!am_transparent || !am_pixmap_trans)
2479	pchanged = 1;	2536	pchanged = 1;
2480		2537
2481	am_transparent = am_pixmap_trans = 1;	2538	am_transparent = am_pixmap_trans = 1;
2482	}	2539	}
2483	}	2540	}
2484		2541
2485	if (am_pixmap_trans)	2542	if (am_pixmap_trans)
2486	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2543	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487	else	2544	else
2488	{	2545	{
2489	unsigned int n;	2546	unsigned int n;
2490	/*	2547	/*
2491	* InheritPixmap transparency	2548	* InheritPixmap transparency
2492	*/	2549	*/
2493	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2550	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494	{	2551	{
2495	oldp = TermWin.parent[i];	2552	oldp = parent[i];
2496	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2553	XQueryTree (disp, parent[i - 1], &root,
2497	&TermWin.parent[i], &list, &n);	2554	&parent[i], &list, &n);
2498	XFree (list);	2555	XFree (list);
2499		2556
2500	if (TermWin.parent[i] == display->root)	2557	if (parent[i] == display->root)
2501	{	2558	{
2502	if (oldp != None)	2559	if (oldp != None)
2503	pchanged = 1;	2560	pchanged = 1;
2504		2561
2505	break;	2562	break;
2506	}	2563	}
2507		2564
2508	if (oldp != TermWin.parent[i])	2565	if (oldp != parent[i])
2509	pchanged = 1;	2566	pchanged = 1;
2510	}	2567	}
2511		2568
2512	n = 0;	2569	n = 0;
2513		2570
2514	if (pchanged)	2571	if (pchanged)
2515	{	2572	{
2516	for (; n < (unsigned int)i; n++)	2573	for (; n < (unsigned int)i; n++)
2517	{	2574	{
2518	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2575	XGetWindowAttributes (disp, parent[n], &wattr);
2519	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2576	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520	{	2577	{
2521	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2578	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522	break;	2579	break;
2523	}	2580	}
2524	}	2581	}
2525	}	2582	}
2526		2583
2527	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2584	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528	{	2585	{
2529	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2586	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2587	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531	am_transparent = 0;	2588	am_transparent = 0;
2532	/* XXX: also turn off Opt_transparent? */	2589	/* XXX: also turn off Opt_transparent? */
2533	}	2590	}
2534	else	2591	else
2535	{	2592	{
…		…
2538	* needed for fvwm2.2.2 (and before?) */	2595	* needed for fvwm2.2.2 (and before?) */
2539	sleep (1);	2596	sleep (1);
2540	#endif	2597	#endif
2541	for (n = 0; n < (unsigned int)i; n++)	2598	for (n = 0; n < (unsigned int)i; n++)
2542	{	2599	{
2543	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2600	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544	XClearWindow (display->display, TermWin.parent[n]);	2601	XClearWindow (disp, parent[n]);
2545	}	2602	}
2546		2603
2547	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2604	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548	am_transparent = 1;	2605	am_transparent = 1;
2549	}	2606	}
2550		2607
2551	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2608	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552	TermWin.parent[i] = None;	2609	parent[i] = None;
2553	}	2610	}
2554		2611
2555	if (scrollBar.win)	2612	if (scrollBar.win)
2556	{	2613	{
2557	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2614	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558	scrollBar.setIdle ();	2615	scrollBar.setIdle ();
2559	scrollbar_show (0);	2616	scrollbar_show (0);
2560	}	2617	}
2561		2618
2562	if (am_transparent)	2619	if (am_transparent)
…		…
2600	// some window managers resize the window early, and these programs	2657	// some window managers resize the window early, and these programs
2601	// then sometimes get the size wrong.	2658	// then sometimes get the size wrong.
2602	// unfortunately other programs are even more buggy and dislike	2659	// unfortunately other programs are even more buggy and dislike
2603	// being sent SIGWINCH, so only do it when we were in fact being	2660	// being sent SIGWINCH, so only do it when we were in fact being
2604	// resized.	2661	// resized.
2605	if (seen_resize)	2662	if (seen_resize && cmd_pid)
2606	kill (-cmd_pid, SIGWINCH);	2663	kill (-cmd_pid, SIGWINCH);
2607	}	2664	}
2608		2665
2609	/* Read a text string from the input buffer */	2666	/* Read a text string from the input buffer */
2610	unicode_t buf[UBUFSIZ];	2667	unicode_t buf[UBUFSIZ];
2611	bool refreshnow = false;	2668	bool refreshnow = false;
2612	int nlines = 0;	2669	int nlines = 0;
2613	unicode_t *str = buf;	2670	unicode_t *str = buf;
		2671	unicode_t *eol = str + min (ncol, UBUFSIZ);
2614		2672
2615	for (;;)	2673	for (;;)
2616	{	2674	{
2617	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2675	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618	break;	2676	break;
2619		2677
2620	*str++ = ch;	2678	*str++ = ch;
2621		2679
2622	if (ch == C0_LF)	2680	if (ch == C0_LF || str >= eol)
2623	{	2681	{
		2682	if (ch == C0_LF)
2624	nlines++;	2683	nlines++;
		2684
2625	refresh_count++;	2685	refresh_count++;
2626		2686
2627	if (!(options & Opt_jumpScroll)	2687	if (!(options & Opt_jumpScroll)
2628	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2688	|| (refresh_count >= refresh_limit * (nrow - 1)))
2629	{	2689	{
2630	refreshnow = true;	2690	refreshnow = true;
2631	ch = NOCHAR;	2691	ch = NOCHAR;
2632	break;	2692	break;
2633	}	2693	}
2634		2694
2635	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2695	// scr_add_lines only works for nlines <= nrow - 1.
2636	if (nlines >= TermWin.nrow - 1)	2696	if (nlines >= nrow - 1)
2637	{	2697	{
2638	scr_add_lines (buf, nlines, str - buf);	2698	scr_add_lines (buf, nlines, str - buf);
2639	nlines = 0;	2699	nlines = 0;
2640	str = buf;	2700	str = buf;
		2701	eol = str + min (ncol, UBUFSIZ);
2641	}	2702	}
2642	}
2643		2703
2644	if (str >= buf + UBUFSIZ)	2704	if (str >= eol)
2645	{	2705	{
		2706	if (eol >= buf + UBUFSIZ)
		2707	{
2646	ch = NOCHAR;	2708	ch = NOCHAR;
2647	break;	2709	break;
		2710	}
		2711	else
		2712	eol = min (eol + ncol, buf + UBUFSIZ);
		2713	}
		2714
2648	}	2715	}
2649		2716
2650	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2651	ch = next_char ();	2718	ch = next_char ();
2652	}	2719	}
…		…
3196	{	3263	{
3197	switch (priv)	3264	switch (priv)
3198	{	3265	{
3199	case '>':	3266	case '>':
3200	if (ch == CSI_DA) /* secondary device attributes */	3267	if (ch == CSI_DA) /* secondary device attributes */
3201	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3268	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202	break;	3269	break;
3203	case '?':	3270	case '?':
3204	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3271	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205	process_terminal_mode (ch, priv, nargs, arg);	3272	process_terminal_mode (ch, priv, nargs, arg);
3206	break;	3273	break;
…		…
3311		3378
3312	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3379	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313	arg[0] = -arg[0];	3380	arg[0] = -arg[0];
3314	/* FALLTHROUGH */	3381	/* FALLTHROUGH */
3315	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3382	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3383	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317	break;	3384	break;
3318		3385
3319	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3386	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320	tt_write ((const unsigned char *)VT100_ANS,	3387	tt_write ((const unsigned char *)VT100_ANS,
3321	(unsigned int) (sizeof (VT100_ANS) - 1));	3388	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3435	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3502	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436	{	3503	{
3437	int x, y;	3504	int x, y;
3438	XWindowAttributes wattr;	3505	XWindowAttributes wattr;
3439	Window wdummy;	3506	Window wdummy;
		3507	dDisp;
3440		3508
3441	if (nargs == 0)	3509	if (nargs == 0)
3442	return;	3510	return;
3443		3511
3444	switch (args[0])	3512	switch (args[0])
3445	{	3513	{
3446	/*	3514	/*
3447	* commands	3515	* commands
3448	*/	3516	*/
3449	case 1: /* deiconify window */	3517	case 1: /* deiconify window */
3450	XMapWindow (display->display, TermWin.parent[0]);	3518	XMapWindow (disp, parent[0]);
3451	break;	3519	break;
3452	case 2: /* iconify window */	3520	case 2: /* iconify window */
3453	XIconifyWindow (display->display, TermWin.parent[0],	3521	XIconifyWindow (disp, parent[0], display->screen);
3454	DefaultScreen (display->display));
3455	break;	3522	break;
3456	case 3: /* set position (pixels) */	3523	case 3: /* set position (pixels) */
3457	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3524	XMoveWindow (disp, parent[0], args[1], args[2]);
3458	break;	3525	break;
3459	case 4: /* set size (pixels) */	3526	case 4: /* set size (pixels) */
3460	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3527	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461	break;	3528	break;
3462	case 5: /* raise window */	3529	case 5: /* raise window */
3463	XRaiseWindow (display->display, TermWin.parent[0]);	3530	XRaiseWindow (disp, parent[0]);
3464	break;	3531	break;
3465	case 6: /* lower window */	3532	case 6: /* lower window */
3466	XLowerWindow (display->display, TermWin.parent[0]);	3533	XLowerWindow (disp, parent[0]);
3467	break;	3534	break;
3468	case 7: /* refresh window */	3535	case 7: /* refresh window */
3469	scr_touch (true);	3536	scr_touch (true);
3470	break;	3537	break;
3471	case 8: /* set size (chars) */	3538	case 8: /* set size (chars) */
3472	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3539	set_widthheight ((unsigned int) (args[2] * fwidth),
3473	(unsigned int) (args[1] * TermWin.fheight));	3540	(unsigned int) (args[1] * fheight));
3474	break;	3541	break;
3475		3542
3476	//case 9: NYI, TODO, restore maximized window or maximize window	3543	//case 9: NYI, TODO, restore maximized window or maximize window
3477	default:	3544	default:
3478	if (args[0] >= 24) /* set height (chars) */	3545	if (args[0] >= 24) /* set height (chars) */
3479	set_widthheight ((unsigned int)TermWin.width,	3546	set_widthheight ((unsigned int)width,
3480	(unsigned int) (args[1] * TermWin.fheight));	3547	(unsigned int) (args[1] * fheight));
3481	break;	3548	break;
3482		3549
3483		3550
3484	/*	3551	/*
3485	* reports - some output format copied from XTerm	3552	* reports - some output format copied from XTerm
3486	*/	3553	*/
3487	case 11: /* report window state */	3554	case 11: /* report window state */
3488	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3555	XGetWindowAttributes (disp, parent[0], &wattr);
3489	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3556	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490	break;	3557	break;
3491	case 13: /* report window position */	3558	case 13: /* report window position */
3492	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3559	XGetWindowAttributes (disp, parent[0], &wattr);
3493	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3560	XTranslateCoordinates (disp, parent[0], wattr.root,
3494	-wattr.border_width, -wattr.border_width,	3561	-wattr.border_width, -wattr.border_width,
3495	&x, &y, &wdummy);	3562	&x, &y, &wdummy);
3496	tt_printf ("\033[3;%d;%dt", x, y);	3563	tt_printf ("\033[3;%d;%dt", x, y);
3497	break;	3564	break;
3498	case 14: /* report window size (pixels) */	3565	case 14: /* report window size (pixels) */
3499	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3566	XGetWindowAttributes (disp, parent[0], &wattr);
3500	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3567	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501	break;	3568	break;
3502	case 18: /* report text area size (chars) */	3569	case 18: /* report text area size (chars) */
3503	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3570	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504	break;	3571	break;
3505	case 19: /* report window size (chars) */	3572	case 19: /* report window size (chars) */
3506	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3573	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507	break;	3574	break;
3508	case 20: /* report icon label */	3575	case 20: /* report icon label */
3509	{	3576	{
3510	char *s;	3577	char *s;
3511	XGetIconName (display->display, TermWin.parent[0], &s);	3578	XGetIconName (disp, parent[0], &s);
3512	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3579	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513	XFree (s);	3580	XFree (s);
3514	}	3581	}
3515	break;	3582	break;
3516	case 21: /* report window title */	3583	case 21: /* report window title */
3517	{	3584	{
3518	char *s;	3585	char *s;
3519	XFetchName (display->display, TermWin.parent[0], &s);	3586	XFetchName (disp, parent[0], &s);
3520	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3587	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521	XFree (s);	3588	XFree (s);
3522	}	3589	}
3523	break;	3590	break;
3524	}	3591	}
…		…
3557	else if (ch < 0x20)	3624	else if (ch < 0x20)
3558	return NULL; /* other control character - exit */	3625	return NULL; /* other control character - exit */
3559		3626
3560	seen_esc = false;	3627	seen_esc = false;
3561		3628
3562	if (n >= sizeof (string) - 1)	3629	if (n >= STRING_MAX - 1)
3563	// stop at some sane length	3630	// stop at some sane length
3564	return NULL;	3631	return NULL;
3565		3632
3566	if (ch == C0_SYN)	3633	if (ch == C0_SYN)
3567	string[n++] = cmd_get8 ();	3634	string[n++] = cmd_get8 ();
…		…
3635	set_window_color (color, str);	3702	set_window_color (color, str);
3636	}	3703	}
3637		3704
3638	/*	3705	/*
3639	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3706	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640	* 0 = change iconName/title
3641	* 1 = change iconName
3642	* 2 = change title
3643	* 4 = change color
3644	* 10 = change fg color
3645	* 11 = change bg color
3646	* 12 = change text color
3647	* 13 = change mouse foreground color
3648	* 17 = change highlight character colour
3649	* 18 = change bold character color
3650	* 19 = change underlined character color
3651	* 46 = change logfile (not implemented)
3652	* 50 = change font
3653	*
3654	* rxvt extensions:
3655	* 20 = bg pixmap
3656	* 39 = change default fg color
3657	* 49 = change default bg color
3658	* 55 = dump scrollback buffer and all of screen
3659	* 701 = change locale
3660	* 702 = find font
3661	* 703 = menu
3662	*/	3707	*/
3663	void	3708	void
3664	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3709	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3665	{	3710	{
3666	int changed = 0;	3711	int changed = 0;
3667	int color;	3712	int color;
3668	char *buf, *name;	3713	char *buf, *name;
3669	bool query = str[0] == '?' && !str[1];	3714	bool query = str[0] == '?' && !str[1];
3670	int saveop = op;	3715	int saveop = op;
		3716	dDisp;
3671		3717
3672	assert (str != NULL);	3718	assert (str != NULL);
3673	switch (op)	3719	switch (op)
3674	{	3720	{
3675	case XTerm_name:	3721	case XTerm_name:
…		…
3691	unsigned long bytes_after;	3737	unsigned long bytes_after;
3692	unsigned char *value = 0;	3738	unsigned char *value = 0;
3693	const char *str = "";	3739	const char *str = "";
3694		3740
3695	if (prop	3741	if (prop
3696	&& XGetWindowProperty (display->display, TermWin.parent[0],	3742	&& XGetWindowProperty (disp, parent[0],
3697	prop, 0, 1<<16, 0, AnyPropertyType,	3743	prop, 0, 1<<16, 0, AnyPropertyType,
3698	&actual_type, &actual_format,	3744	&actual_type, &actual_format,
3699	&nitems, &bytes_after, &value) == Success	3745	&nitems, &bytes_after, &value) == Success
3700	&& actual_type != None	3746	&& actual_type != None
3701	&& actual_format == 8)	3747	&& actual_format == 8)
…		…
3713	{	3759	{
3714	*eq = 0;	3760	*eq = 0;
3715	set_utf8_property (display->atom (str), eq + 1);	3761	set_utf8_property (display->atom (str), eq + 1);
3716	}	3762	}
3717	else	3763	else
3718	XDeleteProperty (display->display, TermWin.parent[0],	3764	XDeleteProperty (disp, parent[0],
3719	display->atom (str));	3765	display->atom (str));
3720	}	3766	}
3721	break;	3767	break;
3722		3768
3723	case XTerm_Color:	3769	case XTerm_Color:
…		…
3764	break;	3810	break;
3765	#ifndef NO_BOLD_UNDERLINE_REVERSE	3811	#ifndef NO_BOLD_UNDERLINE_REVERSE
3766	case XTerm_Color_BD:	3812	case XTerm_Color_BD:
3767	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3813	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768	break;	3814	break;
3769	case XTerm_Color_IT:
3770	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771	break;
3772	case XTerm_Color_UL:	3815	case XTerm_Color_UL:
3773	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3816	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774	break;	3817	break;
3775	case XTerm_Color_RV:	3818	case XTerm_Color_RV:
3776	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3819	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777	break;	3820	break;
		3821	case URxvt_Color_IT:
		3822	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3823	break;
3778	#endif	3824	#endif
3779	#if TRANSPARENT && TINTING	3825	#if TRANSPARENT && TINTING
3780	case XTerm_Color_tint:	3826	case URxvt_Color_tint:
3781	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3827	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782	check_our_parents ();	3828	check_our_parents ();
3783	if (am_transparent)	3829	if (am_transparent)
3784	want_full_refresh = want_refresh = 1;	3830	want_full_refresh = want_refresh = 1;
3785	break;	3831	break;
3786	#endif	3832	#endif
…		…
3798	{	3844	{
3799	str++;	3845	str++;
3800	#if XPM_BACKGROUND	3846	#if XPM_BACKGROUND
3801	changed += scale_pixmap (str);	3847	changed += scale_pixmap (str);
3802	#endif	3848	#endif
3803
3804	}	3849	}
		3850
3805	if (changed)	3851	if (changed)
3806	{	3852	{
3807	#ifdef XPM_BACKGROUND	3853	#ifdef XPM_BACKGROUND
3808	resize_pixmap ();	3854	resize_pixmap ();
3809	#endif	3855	#endif
…		…
3820		3866
3821	case XTerm_logfile:	3867	case XTerm_logfile:
3822	// TODO, when secure mode?	3868	// TODO, when secure mode?
3823	break;	3869	break;
3824		3870
		3871	#ifdef MENUBAR
		3872	case URxvt_Menu:
		3873	if (options & Opt_insecure)
		3874	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3875	break;
		3876	#endif
		3877	#if 0
		3878	case XTerm_dumpscreen: /* no error notices */
		3879	{
		3880	int fd;
		3881	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3882	{
		3883	scr_dump (fd);
		3884	close (fd);
		3885	}
		3886	}
		3887	break;
		3888	#endif
3825	case XTerm_font:	3889	case XTerm_font:
3826	op = URxvt_font;	3890	op = URxvt_font;
3827	case URxvt_font:	3891	case URxvt_font:
3828	#if ENABLE_STYLES	3892	#if ENABLE_STYLES
3829	case URxvt_boldFont:	3893	case URxvt_boldFont:
3830	case URxvt_italicFont:	3894	case URxvt_italicFont:
3831	case URxvt_boldItalicFont:	3895	case URxvt_boldItalicFont:
3832	#endif	3896	#endif
3833	if (query)	3897	if (query)
3834	tt_printf ("\33]%d;%-.250s%c", saveop,	3898	tt_printf ("\33]%d;%-.250s%c", saveop,
3835	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3899	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3900	? fontset[op - URxvt_font]->fontdesc : "",
3837	resp);	3901	resp);
3838	else	3902	else
3839	{	3903	{
3840	const char *&res = rs[Rs_font + (op - URxvt_font)];	3904	const char *&res = rs[Rs_font + (op - URxvt_font)];
3841		3905
…		…
3844	set_fonts ();	3908	set_fonts ();
3845	}	3909	}
3846	break;	3910	break;
3847		3911
3848	#if ENABLE_FRILLS	3912	#if ENABLE_FRILLS
3849	case XTerm_locale:	3913	case URxvt_locale:
3850	if (query)	3914	if (query)
3851	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3915	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3852	else	3916	else
3853	{	3917	{
3854	set_locale (str);	3918	set_locale (str);
3855	# ifdef USE_XIM	3919	pty.set_utf8_mode (enc_utf8);
3856	im_cb ();	3920	init_xlocale ();
3857	# endif
3858	}	3921	}
3859	break;	3922	break;
3860	#endif
3861		3923
3862	#ifdef MENUBAR	3924	case URxvt_view_up:
3863	case XTerm_Menu:	3925	case URxvt_view_down:
3864	if (options & Opt_insecure)	3926	int lines = atoi (str);
3865	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3927
3866	break;	3928	if (lines)
3867	#endif	3929	scr_page (op == URxvt_view_up ? UP : DN, lines);
3868	#if 0
3869	case XTerm_dumpscreen: /* no error notices */
3870	{	3930	else
3871	int fd;
3872	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3873	{	3931	{
3874	scr_dump (fd);	3932	scr_erase_savelines ();
3875	close (fd);
3876	}	3933	}
3877	}	3934
3878	break;	3935	break;
3879	#endif	3936	#endif
3880	}	3937	}
3881	}	3938	}
3882	/*----------------------------------------------------------------------*/	3939	/*----------------------------------------------------------------------*/
…		…
4015	*/	4072	*/
4016	PrivMode (1, PrivMode_vt52);	4073	PrivMode (1, PrivMode_vt52);
4017	break;	4074	break;
4018	case 3: /* 80/132 */	4075	case 3: /* 80/132 */
4019	if (priv_modes & PrivMode_132OK)	4076	if (priv_modes & PrivMode_132OK)
4020	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4077	set_widthheight (((state ? 132 : 80) * fwidth), height);
4021	break;	4078	break;
4022	case 4: /* smooth scrolling */	4079	case 4: /* smooth scrolling */
4023	if (state)	4080	if (state)
4024	options &= ~Opt_jumpScroll;	4081	options &= ~Opt_jumpScroll;
4025	else	4082	else
…		…
4342	}	4399	}
4343		4400
4344	memmove (v_buffer, v_buffer + written, v_buflen);	4401	memmove (v_buffer, v_buffer + written, v_buflen);
4345	}	4402	}
4346	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4403	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347	// original code just ignores this...	4404	pty_ev.set (EVENT_READ);
4348	destroy ();
4349	}	4405	}
4350		4406
4351	/*----------------------- end-of-file (C source) -----------------------*/	4407	/*----------------------- end-of-file (C source) -----------------------*/
4352		4408

Diff Legend

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