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.178 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 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 <wchar.h>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
54	#include <signal.h>	57	#include <csignal>
55		58
56	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
57		60
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		62
…		…
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]);
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
151	#if ENABLE_OVERLAY	162	#if ENABLE_OVERLAY
152	void	163	void
153	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154	{	165	{
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;
		170
		171	fname = rxvt_utf8towcs (f->name);
159		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);
…		…
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	int width = wcswidth (fname, wcslen (fname));
178		191
179	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	192	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180		193
181	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	194	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182		195
…		…
195	#endif	208	#endif
196	scr_overlay_set (11, y, ch, r);	209	scr_overlay_set (11, y, ch, r);
197	scr_overlay_set (12, y, NOCHAR, r);	210	scr_overlay_set (12, y, NOCHAR, r);
198	}	211	}
199		212
200	scr_overlay_set (0, len, f->name);	213	scr_overlay_set (0, len, fname);
		214
		215	free (fname);
201		216
202	#if ENABLE_COMBINING	217	#if ENABLE_COMBINING
203	if (alloc)	218	if (alloc)
204	delete [] alloc;	219	delete [] alloc;
205	#endif	220	#endif
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	288	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	289	* escape sequence to toggle the Keypad.
275	*	290	*
276	* Always permit `shift' to override the current setting	291	* Always permit `shift' to override the current setting
277	*/	292	*/
278	shft = (ev.state & ShiftMask);	293	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	294	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	295	meta = ev.state & ModMetaMask;
281		296
282	if (numlock_state || (ev.state & ModNumLockMask))	297	if (numlock_state || (ev.state & ModNumLockMask))
283	{	298	{
284	numlock_state = (ev.state & ModNumLockMask);	299	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	300	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		320
306	// the XOpenIM manpage lies about hardcoding the locale	321	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	322	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	323	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	324	SET_LOCALE (rs[Rs_imLocale]);
		325
310	// assume wchar_t == unicode or better	326	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	327	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	328	KBUFSZ, &keysym, &status_return);
		329
313	if (rs[Rs_imLocale])	330	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	331	SET_LOCALE (locale);
315		332
316	if (status_return == XLookupChars	333	if (status_return == XLookupChars
317	|| status_return == XLookupBoth)	334	|| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	361	valid_keysym = keysym != NoSymbol;
345	}	362	}
346		363
347	if (valid_keysym)	364	if (valid_keysym)
348	{	365	{
		366	#ifdef KEYSYM_RESOURCE
		367	if (keyboard->dispatch (this, keysym, ev.state))
		368	return;
		369	#endif
		370
349	if (TermWin.saveLines)	371	if (saveLines)
350	{	372	{
351	#ifdef UNSHIFTED_SCROLLKEYS	373	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	374	if (!ctrl && !meta)
353	#else	375	#else
354	if (IS_SCROLL_MOD)	376	if (IS_SCROLL_MOD)
355	#endif	377	#endif
356	{	378	{
357	int lnsppg;	379	int lnsppg;
358		380
359	#ifdef PAGING_CONTEXT_LINES	381	#ifdef PAGING_CONTEXT_LINES
360	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	382	lnsppg = nrow - PAGING_CONTEXT_LINES;
361	#else	383	#else
362	lnsppg = TermWin.nrow * 4 / 5;	384	lnsppg = nrow * 4 / 5;
363	#endif	385	#endif
364	if (keysym == XK_Prior)	386	if (keysym == XK_Prior)
365	{	387	{
366	scr_page (UP, lnsppg);	388	scr_page (UP, lnsppg);
367	return;	389	return;
…		…
487	}	509	}
488	#endif	510	#endif
489		511
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	512	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	513	{
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	{	514	{
518	newlen = 1;	515	newlen = 1;
519	switch (keysym)	516	switch (keysym)
520	{	517	{
521	#ifndef NO_BACKSPACE_KEY	518	#ifndef NO_BACKSPACE_KEY
…		…
529	else	526	else
530	strcpy (kbuf, key_backspace);	527	strcpy (kbuf, key_backspace);
531	break;	528	break;
532	#endif	529	#endif
533	#ifndef NO_DELETE_KEY	530	#ifndef NO_DELETE_KEY
		531	# ifdef XK_KP_Prior
		532	case XK_KP_Delete:
		533	/* allow shift to override */
		534	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		535	{
		536	strcpy (kbuf, "\033On");
		537	break;
		538	}
		539	/* FALLTHROUGH */
		540	# endif
534	case XK_Delete:	541	case XK_Delete:
535	strcpy (kbuf, key_delete);	542	strcpy (kbuf, key_delete);
536	break;	543	break;
537	#endif	544	#endif
538	case XK_Tab:	545	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	648	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	649	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	650	strcpy (kbuf, "\033Ou");
644	break;	651	break;
645		652
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	653	#endif
654	case XK_KP_F1: /* "\033OP" */	654	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	655	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	656	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	657	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	689	break;
690		690
691	case XK_Find:	691	case XK_Find:
692	strcpy (kbuf, "\033[1~");	692	strcpy (kbuf, "\033[1~");
693	break;	693	break;
		694
		695	#ifdef XK_KP_End
		696	case XK_KP_Insert:
		697	/* allow shift to override */
		698	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		699	{
		700	strcpy (kbuf, "\033Op");
		701	break;
		702	}
		703	/* FALLTHROUGH */
		704	#endif
694	case XK_Insert:	705	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	706	strcpy (kbuf, "\033[2~");
696	break;	707	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	708	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	709	case DXK_Remove:
…		…
788	#undef FKEY	799	#undef FKEY
789	default:	800	default:
790	newlen = 0;	801	newlen = 0;
791	break;	802	break;
792	}	803	}
		804
793	if (newlen)	805	if (newlen)
794	len = strlen (kbuf);	806	len = strlen (kbuf);
795	}	807	}
796		808
797	/*	809	/*
…		…
806	else if (ctrl && keysym == XK_minus)	818	else if (ctrl && keysym == XK_minus)
807	{	819	{
808	len = 1;	820	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	821	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810	}	822	}
		823	else if (keysym == XK_ISO_Left_Tab)
		824	{
		825	strcpy (kbuf, "\033[Z");
		826	len = 3;
		827	}
811	else	828	else
812	{	829	{
813	#ifdef META8_OPTION	830	#ifdef META8_OPTION
814	/* set 8-bit on */	831	/* set 8-bit on */
815	if (meta && (meta_char == 0x80))	832	if (meta && (meta_char == 0x80))
…		…
828		845
829	if (len <= 0)	846	if (len <= 0)
830	return; /* not mapped */	847	return; /* not mapped */
831		848
832	if (options & Opt_scrollTtyKeypress)	849	if (options & Opt_scrollTtyKeypress)
833	if (TermWin.view_start)	850	if (view_start)
834	{	851	{
835	TermWin.view_start = 0;	852	view_start = 0;
836	want_refresh = 1;	853	want_refresh = 1;
837	}	854	}
838		855
839	/*	856	/*
840	* these modifications only affect the static keybuffer	857	* these modifications only affect the static keybuffer
…		…
873	#endif /* DEBUG_CMD */	890	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	891	tt_write (kbuf, (unsigned int)len);
875	}	892	}
876	/*}}} */	893	/*}}} */
877		894
878	#if (MENUBAR_MAX)	895	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	896	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880	/* attempt to `write' count to the input buffer */	897	/* attempt to `write' count to the input buffer */
881	unsigned int	898	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	899	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	900	{
…		…
906		923
907	cmd_parse ();	924	cmd_parse ();
908		925
909	return 0;	926	return 0;
910	}	927	}
911	#endif /* MENUBAR_MAX */	928	#endif
912		929
913	void	930	void
914	rxvt_term::flush ()	931	rxvt_term::flush ()
915	{	932	{
916	flush_ev.stop ();	933	flush_ev.stop ();
…		…
1017	{	1034	{
1018	if (mouse_slip_wheel_speed == 0	1035	if (mouse_slip_wheel_speed == 0
1019	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1036	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1037	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1038	{
		1039	if (view_start == nsaved ||
		1040	view_start == 0)
		1041	mouse_slip_wheel_speed = 0;
		1042
1022	refresh_type |= SMOOTH_REFRESH;	1043	refresh_type |= SMOOTH_REFRESH;
1023	want_refresh = 1;	1044	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1045	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1046	}
1026	}	1047	}
…		…
1046	if (n > 0)	1067	if (n > 0)
1047	{	1068	{
1048	cmdbuf_endp += n;	1069	cmdbuf_endp += n;
1049	return true;	1070	return true;
1050	}	1071	}
1051	else if (n < 0 && errno != EAGAIN)	1072	else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
		1073	{
		1074	pty_ev.stop ();
		1075
		1076	if (!(options & Opt_hold))
1052	destroy ();	1077	destroy ();
		1078	}
1053		1079
1054	return false;	1080	return false;
1055	}	1081	}
1056		1082
1057	void	1083	void
…		…
1071	}	1097	}
1072		1098
1073	void	1099	void
1074	rxvt_term::pointer_unblank ()	1100	rxvt_term::pointer_unblank ()
1075	{	1101	{
1076	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1102	XDefineCursor (display->display, vt, TermWin_cursor);
1077	recolour_cursor ();	1103	recolour_cursor ();
1078		1104
1079	#ifdef POINTER_BLANK	1105	#ifdef POINTER_BLANK
1080	hidden_pointer = 0;	1106	hidden_pointer = 0;
1081		1107
…		…
1089	rxvt_term::pointer_blank ()	1115	rxvt_term::pointer_blank ()
1090	{	1116	{
1091	if (! (options & Opt_pointerBlank))	1117	if (! (options & Opt_pointerBlank))
1092	return;	1118	return;
1093		1119
1094	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1120	XDefineCursor (display->display, vt, display->blank_cursor);
1095	XFlush (display->display);	1121	XFlush (display->display);
1096		1122
1097	hidden_pointer = 1;	1123	hidden_pointer = 1;
1098	}	1124	}
1099		1125
…		…
1188		1214
1189	/*{{{ process an X event */	1215	/*{{{ process an X event */
1190	void	1216	void
1191	rxvt_term::x_cb (XEvent &ev)	1217	rxvt_term::x_cb (XEvent &ev)
1192	{	1218	{
		1219	dDisp;
		1220
1193	SET_R (this);	1221	SET_R (this);
1194	SET_LOCALE (locale);	1222	SET_LOCALE (locale);
1195		1223
1196	#if defined(CURSOR_BLINK)	1224	#if defined(CURSOR_BLINK)
1197	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1225	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1313	button_release (ev.xbutton);	1341	button_release (ev.xbutton);
1314	break;	1342	break;
1315		1343
1316	case ClientMessage:	1344	case ClientMessage:
1317	if (ev.xclient.format == 32	1345	if (ev.xclient.format == 32
		1346	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1347	{
1318	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1348	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319	destroy ();	1349	destroy ();
		1350	#if ENABLE_EWMH
		1351	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1352	XSendEvent (disp, ev.xclient.window = display->root,
		1353	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1354	&ev);
		1355	#endif
		1356	}
		1357	#if ENABLE_XEMBED
		1358	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1359	{
		1360	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1361	focus_in ();
		1362	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1363	focus_out ();
		1364	}
		1365	#endif
1320	#ifdef OFFIX_DND	1366	#ifdef OFFIX_DND
1321	/* OffiX Dnd (drag 'n' drop) protocol */	1367	/* OffiX Dnd (drag 'n' drop) protocol */
1322	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1368	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323	&& (ev.xclient.data.l[0] == DndFile	1369	&& (ev.xclient.data.l[0] == DndFile
1324	|| ev.xclient.data.l[0] == DndDir	1370	|| ev.xclient.data.l[0] == DndDir
1325	|| ev.xclient.data.l[0] == DndLink))	1371	|| ev.xclient.data.l[0] == DndLink))
1326	{	1372	{
1327	/* Get Dnd data */	1373	/* Get Dnd data */
1328	Atom ActualType;	1374	Atom ActualType;
1329	int ActualFormat;	1375	int ActualFormat;
1330	unsigned char *data;	1376	unsigned char *data;
1331	unsigned long Size, RemainingBytes;	1377	unsigned long Size, RemainingBytes;
1332		1378
1333	XGetWindowProperty (display->display, display->root,	1379	XGetWindowProperty (disp, display->root,
1334	xa[XA_DNDSELECTION],	1380	xa[XA_DNDSELECTION],
1335	0L, 1000000L,	1381	0L, 1000000L,
1336	False, AnyPropertyType,	1382	False, AnyPropertyType,
1337	&ActualType, &ActualFormat,	1383	&ActualType, &ActualFormat,
1338	&Size, &RemainingBytes,	1384	&Size, &RemainingBytes,
1339	&data);	1385	&data);
1340	set_string_property (XA_CUT_BUFFER0, data);	1386	set_string_property (XA_CUT_BUFFER0, data);
1341	XFree (data);	1387	XFree (data);
1342	selection_paste (display->root, XA_CUT_BUFFER0, true);	1388	selection_paste (display->root, XA_CUT_BUFFER0, true);
1343	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1389	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344	}	1390	}
1345	#endif /* OFFIX_DND */	1391	#endif /* OFFIX_DND */
1346	break;	1392	break;
1347		1393
1348	case MappingNotify:	1394	case MappingNotify:
…		…
1373	break;	1419	break;
1374	}	1420	}
1375	break;	1421	break;
1376		1422
1377	case FocusIn:	1423	case FocusIn:
1378	if (!TermWin.focus)	1424	focus_in ();
		1425	break;
		1426
		1427	case FocusOut:
		1428	focus_out ();
		1429	break;
		1430
		1431	case ConfigureNotify:
		1432	if (ev.xconfigure.window == parent[0])
1379	{	1433	{
1380	TermWin.focus = 1;
1381	want_refresh = 1;
1382	#ifdef USE_XIM
1383	if (Input_Context != NULL)
1384	{
1385	IMSetStatusPosition ();
1386	XSetICFocus (Input_Context);
1387	}
1388	#endif
1389	#ifdef CURSOR_BLINK
1390	if (options & Opt_cursorBlink)
1391	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392	#endif
1393	#ifdef OFF_FOCUS_FADING
1394	if (rs[Rs_fade])
1395	{
1396	pix_colors = pix_colors_focused;
1397	scr_recolour ();
1398	}
1399	#endif
1400
1401	}
1402	break;
1403
1404	case FocusOut:
1405	if (TermWin.focus)
1406	{
1407	TermWin.focus = 0;
1408	want_refresh = 1;
1409
1410	#if ENABLE_FRILLS || ISO_14755
1411	iso14755buf = 0;
1412	#endif
1413	#if ENABLE_OVERLAY
1414	scr_overlay_off ();
1415	#endif
1416	#ifdef USE_XIM
1417	if (Input_Context != NULL)
1418	XUnsetICFocus (Input_Context);
1419	#endif
1420	#ifdef CURSOR_BLINK
1421	if (options & Opt_cursorBlink)
1422	cursor_blink_ev.stop ();
1423	hidden_cursor = 0;
1424	#endif
1425	#ifdef OFF_FOCUS_FADING
1426	if (rs[Rs_fade])
1427	{
1428	pix_colors = pix_colors_unfocused;
1429	scr_recolour ();
1430	}
1431	#endif
1432	}
1433	break;
1434
1435	case ConfigureNotify:
1436	if (ev.xconfigure.window == TermWin.parent[0])
1437	{
1438	int height, width;
1439
1440	do
1441	{ /* Wrap lots of configures into one */
1442	width = ev.xconfigure.width;
1443	height = ev.xconfigure.height;
1444	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445	}
1446	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1434	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1435	;
1447		1436
1448	if (szHint.width != width || szHint.height != height)	1437	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449	{	1438	{
1450	seen_resize = 1;	1439	seen_resize = 1;
1451	resize_all_windows (width, height, 1);	1440	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452	}	1441	}
1453		1442
1454	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1443	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455	if (options & Opt_transparent)	1444	if (options & Opt_transparent)
1456	check_our_parents ();	1445	check_our_parents ();
…		…
1477	case SelectionRequest:	1466	case SelectionRequest:
1478	selection_send (ev.xselectionrequest);	1467	selection_send (ev.xselectionrequest);
1479	break;	1468	break;
1480		1469
1481	case UnmapNotify:	1470	case UnmapNotify:
1482	TermWin.mapped = 0;	1471	mapped = 0;
1483	#ifdef TEXT_BLINK	1472	#ifdef TEXT_BLINK
1484	text_blink_ev.stop ();	1473	text_blink_ev.stop ();
1485	#endif	1474	#endif
1486	break;	1475	break;
1487		1476
1488	case MapNotify:	1477	case MapNotify:
1489	TermWin.mapped = 1;	1478	mapped = 1;
1490	#ifdef TEXT_BLINK	1479	#ifdef TEXT_BLINK
1491	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1480	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492	#endif	1481	#endif
1493	break;	1482	break;
1494		1483
…		…
1498	break;	1487	break;
1499	#endif /* TRANSPARENT */	1488	#endif /* TRANSPARENT */
1500		1489
1501	case GraphicsExpose:	1490	case GraphicsExpose:
1502	case Expose:	1491	case Expose:
1503	if (ev.xany.window == TermWin.vt)	1492	if (ev.xany.window == vt)
1504	{	1493	{
1505	do	1494	do
1506	scr_expose (ev.xexpose.x, ev.xexpose.y,	1495	scr_expose (ev.xexpose.x, ev.xexpose.y,
1507	ev.xexpose.width, ev.xexpose.height, False);	1496	ev.xexpose.width, ev.xexpose.height, False);
1508	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1497	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509		1498
1510	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1499	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511		1500
1512	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1501	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1514	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
1515		1504
1516	scr_refresh (refresh_type);	1505	scr_refresh (refresh_type);
1517	}	1506	}
1518	else	1507	else
1519	{	1508	{
1520	XEvent unused_event;	1509	XEvent unused_event;
1521		1510
1522	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1511	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523	;	1512	;
1524	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1513	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525	;	1514	;
1526		1515
1527	if (isScrollbarWindow (ev.xany.window))	1516	if (isScrollbarWindow (ev.xany.window))
1528	{	1517	{
1529	scrollBar.setIdle ();	1518	scrollBar.setIdle ();
…		…
1533	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1522	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534	menubar_expose ();	1523	menubar_expose ();
1535	#endif	1524	#endif
1536		1525
1537	#ifdef TRANSPARENT	1526	#ifdef TRANSPARENT
1538	if (am_transparent && ev.xany.window == TermWin.parent[0])	1527	if (am_transparent && ev.xany.window == parent[0])
1539	XClearWindow (display->display, ev.xany.window);	1528	XClearWindow (disp, ev.xany.window);
1540	#endif	1529	#endif
1541	}	1530	}
1542	break;	1531	break;
1543		1532
1544	case MotionNotify:	1533	case MotionNotify:
…		…
1554	}	1543	}
1555	#endif	1544	#endif
1556	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1545	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557	break;	1546	break;
1558		1547
1559	if (ev.xany.window == TermWin.vt)	1548	if (ev.xany.window == vt)
1560	{	1549	{
1561	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1550	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562	{	1551	{
1563	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1552	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564	;	1553	;
1565		1554
1566	XQueryPointer (display->display, TermWin.vt,	1555	XQueryPointer (disp, vt,
1567	&unused_root, &unused_child,	1556	&unused_root, &unused_child,
1568	&unused_root_x, &unused_root_y,	1557	&unused_root_x, &unused_root_y,
1569	&ev.xbutton.x, &ev.xbutton.y,	1558	&ev.xbutton.x, &ev.xbutton.y,
1570	&ev.xbutton.state);	1559	&ev.xbutton.state);
1571	#ifdef MOUSE_THRESHOLD	1560	#ifdef MOUSE_THRESHOLD
…		…
1583	#endif	1572	#endif
1584	selection_extend (ev.xbutton.x, ev.xbutton.y,	1573	selection_extend (ev.xbutton.x, ev.xbutton.y,
1585	ev.xbutton.state & Button3Mask ? 2 : 0);	1574	ev.xbutton.state & Button3Mask ? 2 : 0);
1586		1575
1587	#ifdef SELECTION_SCROLLING	1576	#ifdef SELECTION_SCROLLING
1588	if (ev.xbutton.y < TermWin.int_bwidth	1577	if (ev.xbutton.y < int_bwidth
1589	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1578	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1590	{	1579	{
1591	int dist;	1580	int dist;
1592		1581
1593	/* don't clobber the current delay if we are	1582	/* don't clobber the current delay if we are
1594	* already in the middle of scrolling.	1583	* already in the middle of scrolling.
…		…
1602	selection_save_x = ev.xbutton.x;	1591	selection_save_x = ev.xbutton.x;
1603	selection_save_y = ev.xbutton.y;	1592	selection_save_y = ev.xbutton.y;
1604	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1593	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605		1594
1606	/* calc number of lines to scroll */	1595	/* calc number of lines to scroll */
1607	if (ev.xbutton.y < TermWin.int_bwidth)	1596	if (ev.xbutton.y < int_bwidth)
1608	{	1597	{
1609	scroll_selection_dir = UP;	1598	scroll_selection_dir = UP;
1610	dist = TermWin.int_bwidth - ev.xbutton.y;	1599	dist = int_bwidth - ev.xbutton.y;
1611	}	1600	}
1612	else	1601	else
1613	{	1602	{
1614	scroll_selection_dir = DN;	1603	scroll_selection_dir = DN;
1615	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1604	dist = ev.xbutton.y - (int_bwidth + height);
1616	}	1605	}
1617		1606
1618	scroll_selection_lines = Pixel2Height (dist)	1607	scroll_selection_lines = Pixel2Height (dist)
1619	/ SELECTION_SCROLL_LINE_SPEEDUP	1608	/ SELECTION_SCROLL_LINE_SPEEDUP
1620	+ 1;	1609	+ 1;
1621	MIN_IT (scroll_selection_lines,	1610	min_it (scroll_selection_lines,
1622	SELECTION_SCROLL_MAX_LINES);	1611	SELECTION_SCROLL_MAX_LINES);
1623	}	1612	}
1624	else	1613	else
1625	{	1614	{
1626	/* we are within the text window, so we	1615	/* we are within the text window, so we
…		…
1635	#endif	1624	#endif
1636	}	1625	}
1637	}	1626	}
1638	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1627	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639	{	1628	{
1640	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1629	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641	MotionNotify, &ev))	1630	MotionNotify, &ev))
1642	;	1631	;
1643		1632
1644	XQueryPointer (display->display, scrollBar.win,	1633	XQueryPointer (disp, scrollBar.win,
1645	&unused_root, &unused_child,	1634	&unused_root, &unused_child,
1646	&unused_root_x, &unused_root_y,	1635	&unused_root_x, &unused_root_y,
1647	&ev.xbutton.x, &ev.xbutton.y,	1636	&ev.xbutton.x, &ev.xbutton.y,
1648	&unused_mask);	1637	&unused_mask);
1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1638	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1654	}	1643	}
1655	break;	1644	break;
1656	}	1645	}
1657	}	1646	}
1658		1647
		1648	void
		1649	rxvt_term::focus_in ()
		1650	{
		1651	if (!focus)
		1652	{
		1653	focus = 1;
		1654	want_refresh = 1;
		1655	#if USE_XIM
		1656	if (Input_Context != NULL)
		1657	{
		1658	IMSetStatusPosition ();
		1659	XSetICFocus (Input_Context);
		1660	}
		1661	#endif
		1662	#if CURSOR_BLINK
		1663	if (options & Opt_cursorBlink)
		1664	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1665	#endif
		1666	#if OFF_FOCUS_FADING
		1667	if (rs[Rs_fade])
		1668	{
		1669	pix_colors = pix_colors_focused;
		1670	scr_recolour ();
		1671	}
		1672	#endif
		1673	}
		1674	}
		1675
		1676	void
		1677	rxvt_term::focus_out ()
		1678	{
		1679	if (focus)
		1680	{
		1681	focus = 0;
		1682	want_refresh = 1;
		1683
		1684	#if ENABLE_FRILLS || ISO_14755
		1685	iso14755buf = 0;
		1686	#endif
		1687	#if ENABLE_OVERLAY
		1688	scr_overlay_off ();
		1689	#endif
		1690	#if USE_XIM
		1691	if (Input_Context != NULL)
		1692	XUnsetICFocus (Input_Context);
		1693	#endif
		1694	#if CURSOR_BLINK
		1695	if (options & Opt_cursorBlink)
		1696	cursor_blink_ev.stop ();
		1697	hidden_cursor = 0;
		1698	#endif
		1699	#if OFF_FOCUS_FADING
		1700	if (rs[Rs_fade])
		1701	{
		1702	pix_colors = pix_colors_unfocused;
		1703	scr_recolour ();
		1704	}
		1705	#endif
		1706	}
		1707	}
		1708
1659	#if TRANSPARENT	1709	#if TRANSPARENT
1660	void	1710	void
1661	rxvt_term::rootwin_cb (XEvent &ev)	1711	rxvt_term::rootwin_cb (XEvent &ev)
1662	{	1712	{
1663	SET_R (this);	1713	SET_R (this);
…		…
1668	case PropertyNotify:	1718	case PropertyNotify:
1669	/*	1719	/*
1670	* if user used some Esetroot compatible prog to set the root bg,	1720	* if user used some Esetroot compatible prog to set the root bg,
1671	* use the property to determine the pixmap. We use it later on.	1721	* use the property to determine the pixmap. We use it later on.
1672	*/	1722	*/
1673	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1723	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1674	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1724	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1675	return;	1725	return;
1676		1726
1677	/* FALLTHROUGH */	1727	/* FALLTHROUGH */
1678	case ReparentNotify:	1728	case ReparentNotify:
1679	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1729	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1693	reportmode = !! (priv_modes & PrivMode_mouse_report);	1743	reportmode = !! (priv_modes & PrivMode_mouse_report);
1694		1744
1695	/*	1745	/*
1696	* VT window processing of button press	1746	* VT window processing of button press
1697	*/	1747	*/
1698	if (ev.window == TermWin.vt)	1748	if (ev.window == vt)
1699	{	1749	{
1700	#if ISO_14755	1750	#if ISO_14755
1701	// 5.4	1751	// 5.4
1702	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1752	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703	{	1753	{
…		…
1751	{	1801	{
1752	case Button1:	1802	case Button1:
1753	/* allow meta + click to select rectangular areas */	1803	/* allow meta + click to select rectangular areas */
1754	/* should be done in screen.C */	1804	/* should be done in screen.C */
1755	#if ENABLE_FRILLS	1805	#if ENABLE_FRILLS
1756	selection.rect = !! (ev.state & ModMetaMask);	1806	selection.rect = !!(ev.state & ModMetaMask);
1757	#else	1807	#else
1758	selection.rect = false;	1808	selection.rect = false;
1759	#endif	1809	#endif
1760		1810
1761	/* allow shift+left click to extend selection */	1811	/* allow shift+left click to extend selection */
…		…
1908	case Button3:	1958	case Button3:
1909	if (scrollBar.style != R_SB_XTERM)	1959	if (scrollBar.style != R_SB_XTERM)
1910	{	1960	{
1911	if (scrollbar_above_slider (ev.y))	1961	if (scrollbar_above_slider (ev.y))
1912	# ifdef RXVT_SCROLL_FULL	1962	# ifdef RXVT_SCROLL_FULL
1913	scr_page (UP, TermWin.nrow - 1);	1963	scr_page (UP, nrow - 1);
1914	# else	1964	# else
1915	scr_page (UP, TermWin.nrow / 4);	1965	scr_page (UP, nrow / 4);
1916	# endif	1966	# endif
1917	else if (scrollbar_below_slider (ev.y))	1967	else if (scrollbar_below_slider (ev.y))
1918	# ifdef RXVT_SCROLL_FULL	1968	# ifdef RXVT_SCROLL_FULL
1919	scr_page (DN, TermWin.nrow - 1);	1969	scr_page (DN, nrow - 1);
1920	# else	1970	# else
1921	scr_page (DN, TermWin.nrow / 4);	1971	scr_page (DN, nrow / 4);
1922	# endif	1972	# endif
1923	else	1973	else
1924	scrollBar.setMotion ();	1974	scrollBar.setMotion ();
1925	}	1975	}
1926	else	1976	else
1927	{	1977	{
1928	scr_page ((ev.button == Button1 ? DN : UP),	1978	scr_page ((ev.button == Button1 ? DN : UP),
1929	(TermWin.nrow	1979	(nrow
1930	* scrollbar_position (ev.y)	1980	* scrollbar_position (ev.y)
1931	/ scrollbar_size ()));	1981	/ scrollbar_size ()));
1932	}	1982	}
1933		1983
1934	break;	1984	break;
…		…
1966	#ifdef SELECTION_SCROLLING	2016	#ifdef SELECTION_SCROLLING
1967	if (sel_scroll_ev.active)	2017	if (sel_scroll_ev.active)
1968	sel_scroll_ev.stop();	2018	sel_scroll_ev.stop();
1969	#endif	2019	#endif
1970		2020
1971	if (ev.window == TermWin.vt)	2021	if (ev.window == vt)
1972	{	2022	{
1973	#if ISO_14755	2023	#if ISO_14755
1974	// 5.4	2024	// 5.4
1975	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2025	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976	return;	2026	return;
…		…
2027	v = ev.button == Button4 ? UP : DN;	2077	v = ev.button == Button4 ? UP : DN;
2028		2078
2029	if (ev.state & ShiftMask)	2079	if (ev.state & ShiftMask)
2030	i = 1;	2080	i = 1;
2031	else if (options & Opt_mouseWheelScrollPage)	2081	else if (options & Opt_mouseWheelScrollPage)
2032	i = TermWin.nrow - 1;	2082	i = nrow - 1;
2033	else	2083	else
2034	i = 5;	2084	i = 5;
2035		2085
2036	# ifdef MOUSE_SLIP_WHEELING	2086	# ifdef MOUSE_SLIP_WHEELING
2037	if (ev.state & ControlMask)	2087	if (ev.state & ControlMask)
2038	{	2088	{
2039	mouse_slip_wheel_speed += v ? -1 : 1;	2089	mouse_slip_wheel_speed += v ? -1 : 1;
2040	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2090	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2041	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2091	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042		2092
2043	if (slip_wheel_ev.at < NOW)	2093	if (slip_wheel_ev.at < NOW)
2044	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2094	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045		2095
2046	slip_wheel_ev.start ();	2096	slip_wheel_ev.start ();
…		…
2087	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2137	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2138	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2139	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090	int i;	2140	int i;
2091		2141
2092	Visual* visual = display->visual;	2142	Visual *visual = display->visual;
2093		2143
2094	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2144	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095		2145
2096	/* for convenience */	2146	/* for convenience */
2097	mask_r = visual->red_mask;	2147	mask_r = visual->red_mask;
…		…
2318	Atom atype;	2368	Atom atype;
2319	unsigned char *prop = NULL;	2369	unsigned char *prop = NULL;
2320	Window root, oldp, *list;	2370	Window root, oldp, *list;
2321	Pixmap rootpixmap = None;	2371	Pixmap rootpixmap = None;
2322	XWindowAttributes wattr, wrootattr;	2372	XWindowAttributes wattr, wrootattr;
		2373	dDisp;
2323		2374
2324	pchanged = 0;	2375	pchanged = 0;
2325		2376
2326	if (!(options & Opt_transparent))	2377	if (!(options & Opt_transparent))
2327	return pchanged; /* Don't try any more */	2378	return pchanged; /* Don't try any more */
2328		2379
2329	XGetWindowAttributes (display->display, display->root, &wrootattr);	2380	XGetWindowAttributes (disp, display->root, &wrootattr);
2330	rootdepth = wrootattr.depth;	2381	rootdepth = wrootattr.depth;
2331		2382
2332	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2383	XGetWindowAttributes (disp, parent[0], &wattr);
2333		2384
2334	if (rootdepth != wattr.depth)	2385	if (rootdepth != wattr.depth)
2335	{	2386	{
2336	if (am_transparent)	2387	if (am_transparent)
2337	{	2388	{
2338	pchanged = 1;	2389	pchanged = 1;
2339	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2390	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340	am_transparent = am_pixmap_trans = 0;	2391	am_transparent = am_pixmap_trans = 0;
2341	}	2392	}
2342		2393
2343	return pchanged; /* Don't try any more */	2394	return pchanged; /* Don't try any more */
2344	}	2395	}
2345		2396
2346	/* Get all X ops out of the queue so that our information is up-to-date. */	2397	/* Get all X ops out of the queue so that our information is up-to-date. */
2347	XSync (display->display, False);	2398	XSync (disp, False);
2348		2399
2349	/*	2400	/*
2350	* Make the frame window set by the window manager have	2401	* Make the frame window set by the window manager have
2351	* the root background. Some window managers put multiple nested frame	2402	* the root background. Some window managers put multiple nested frame
2352	* windows for each client, so we have to take care about that.	2403	* windows for each client, so we have to take care about that.
2353	*/	2404	*/
2354	i = (xa[XA_XROOTPMAP_ID]	2405	i = (xa[XA_XROOTPMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2406	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2407	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2408	&nitems, &bytes_after, &prop) == Success);
2358		2409
2359	if (!i || prop == NULL)	2410	if (!i || prop == NULL)
2360	i = (xa[XA_ESETROOT_PMAP_ID]	2411	i = (xa[XA_ESETROOT_PMAP_ID]
2361	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2412	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2413	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363	&nitems, &bytes_after, &prop) == Success);	2414	&nitems, &bytes_after, &prop) == Success);
2364		2415
2365	if (!i || prop == NULL	2416	if (!i || prop == NULL
2366	#if TINTING	2417	#if TINTING
…		…
2385	Window cr;	2436	Window cr;
2386	XImage *image;	2437	XImage *image;
2387	GC gc;	2438	GC gc;
2388	XGCValues gcvalue;	2439	XGCValues gcvalue;
2389		2440
2390	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2441	XTranslateCoordinates (disp, parent[0], display->root,
2391	0, 0, &sx, &sy, &cr);	2442	0, 0, &sx, &sy, &cr);
2392	nw = (unsigned int)szHint.width;	2443	nw = (unsigned int)szHint.width;
2393	nh = (unsigned int)szHint.height;	2444	nh = (unsigned int)szHint.height;
2394	nx = ny = 0;	2445	nx = ny = 0;
2395		2446
…		…
2405	nh += sy;	2456	nh += sy;
2406	ny = -sy;	2457	ny = -sy;
2407	sy = 0;	2458	sy = 0;
2408	}	2459	}
2409		2460
2410	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2461	min_it (nw, (unsigned int) (wrootattr.width - sx));
2411	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2462	min_it (nh, (unsigned int) (wrootattr.height - sy));
2412		2463
2413	XSync (display->display, False);	2464	XSync (disp, False);
2414	allowedxerror = -1;	2465	allowedxerror = -1;
2415	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2466	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416		2467
2417	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2468	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2418	/* XXX: may need a delay here? */	2469	/* XXX: may need a delay here? */
2419	allowedxerror = 0;	2470	allowedxerror = 0;
2420		2471
2421	if (image == NULL)	2472	if (image == NULL)
2422	{	2473	{
2423	if (am_transparent && am_pixmap_trans)	2474	if (am_transparent && am_pixmap_trans)
2424	{	2475	{
2425	pchanged = 1;	2476	pchanged = 1;
2426	if (TermWin.pixmap != None)	2477	if (pixmap != None)
2427	{	2478	{
2428	XFreePixmap (display->display, TermWin.pixmap);	2479	XFreePixmap (disp, pixmap);
2429	TermWin.pixmap = None;	2480	pixmap = None;
2430	}	2481	}
2431	}	2482	}
2432		2483
2433	am_pixmap_trans = 0;	2484	am_pixmap_trans = 0;
2434	}	2485	}
2435	else	2486	else
2436	{	2487	{
2437	if (TermWin.pixmap != None)	2488	if (pixmap != None)
2438	XFreePixmap (display->display, TermWin.pixmap);	2489	XFreePixmap (disp, pixmap);
2439		2490
2440	#if TINTING	2491	#if TINTING
2441	if (ISSET_PIXCOLOR (Color_tint))	2492	if (ISSET_PIXCOLOR (Color_tint))
2442	{	2493	{
2443	unsigned short rm, gm, bm;	2494	unsigned short rm, gm, bm;
…		…
2447		2498
2448	ShadeXImage (display, image, shade, rm, gm, bm);	2499	ShadeXImage (display, image, shade, rm, gm, bm);
2449	}	2500	}
2450	#endif	2501	#endif
2451		2502
2452	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2503	pixmap = XCreatePixmap (disp, vt,
2453	szHint.width, szHint.height, image->depth);	2504	szHint.width, szHint.height, image->depth);
2454	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2505	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2455	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2506	XPutImage (disp, pixmap, gc, image, 0, 0,
2456	nx, ny, image->width, image->height);	2507	nx, ny, image->width, image->height);
2457	XFreeGC (display->display, gc);	2508	XFreeGC (disp, gc);
2458	XDestroyImage (image);	2509	XDestroyImage (image);
2459	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2510	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2460	XClearWindow (display->display, TermWin.parent[0]);	2511	XClearWindow (disp, parent[0]);
2461		2512
2462	if (!am_transparent || !am_pixmap_trans)	2513	if (!am_transparent || !am_pixmap_trans)
2463	pchanged = 1;	2514	pchanged = 1;
2464		2515
2465	am_transparent = am_pixmap_trans = 1;	2516	am_transparent = am_pixmap_trans = 1;
2466	}	2517	}
2467	}	2518	}
2468		2519
2469	if (am_pixmap_trans)	2520	if (am_pixmap_trans)
2470	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2521	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2471	else	2522	else
2472	{	2523	{
2473	unsigned int n;	2524	unsigned int n;
2474	/*	2525	/*
2475	* InheritPixmap transparency	2526	* InheritPixmap transparency
2476	*/	2527	*/
2477	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2528	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2478	{	2529	{
2479	oldp = TermWin.parent[i];	2530	oldp = parent[i];
2480	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2531	XQueryTree (disp, parent[i - 1], &root,
2481	&TermWin.parent[i], &list, &n);	2532	&parent[i], &list, &n);
2482	XFree (list);	2533	XFree (list);
2483		2534
2484	if (TermWin.parent[i] == display->root)	2535	if (parent[i] == display->root)
2485	{	2536	{
2486	if (oldp != None)	2537	if (oldp != None)
2487	pchanged = 1;	2538	pchanged = 1;
2488		2539
2489	break;	2540	break;
2490	}	2541	}
2491		2542
2492	if (oldp != TermWin.parent[i])	2543	if (oldp != parent[i])
2493	pchanged = 1;	2544	pchanged = 1;
2494	}	2545	}
2495		2546
2496	n = 0;	2547	n = 0;
2497		2548
2498	if (pchanged)	2549	if (pchanged)
2499	{	2550	{
2500	for (; n < (unsigned int)i; n++)	2551	for (; n < (unsigned int)i; n++)
2501	{	2552	{
2502	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2553	XGetWindowAttributes (disp, parent[n], &wattr);
2503	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2554	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504	{	2555	{
2505	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2556	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2506	break;	2557	break;
2507	}	2558	}
2508	}	2559	}
2509	}	2560	}
2510		2561
2511	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2562	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2512	{	2563	{
2513	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2564	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2514	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2565	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2515	am_transparent = 0;	2566	am_transparent = 0;
2516	/* XXX: also turn off Opt_transparent? */	2567	/* XXX: also turn off Opt_transparent? */
2517	}	2568	}
2518	else	2569	else
2519	{	2570	{
…		…
2522	* needed for fvwm2.2.2 (and before?) */	2573	* needed for fvwm2.2.2 (and before?) */
2523	sleep (1);	2574	sleep (1);
2524	#endif	2575	#endif
2525	for (n = 0; n < (unsigned int)i; n++)	2576	for (n = 0; n < (unsigned int)i; n++)
2526	{	2577	{
2527	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2578	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2528	XClearWindow (display->display, TermWin.parent[n]);	2579	XClearWindow (disp, parent[n]);
2529	}	2580	}
2530		2581
2531	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2582	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2532	am_transparent = 1;	2583	am_transparent = 1;
2533	}	2584	}
2534		2585
2535	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2586	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2536	TermWin.parent[i] = None;	2587	parent[i] = None;
2537	}	2588	}
2538		2589
2539	if (scrollBar.win)	2590	if (scrollBar.win)
2540	{	2591	{
2541	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2592	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542	scrollBar.setIdle ();	2593	scrollBar.setIdle ();
2543	scrollbar_show (0);	2594	scrollbar_show (0);
2544	}	2595	}
2545		2596
2546	if (am_transparent)	2597	if (am_transparent)
…		…
2584	// some window managers resize the window early, and these programs	2635	// some window managers resize the window early, and these programs
2585	// then sometimes get the size wrong.	2636	// then sometimes get the size wrong.
2586	// unfortunately other programs are even more buggy and dislike	2637	// unfortunately other programs are even more buggy and dislike
2587	// being sent SIGWINCH, so only do it when we were in fact being	2638	// being sent SIGWINCH, so only do it when we were in fact being
2588	// resized.	2639	// resized.
2589	if (seen_resize)	2640	if (seen_resize && cmd_pid)
2590	kill (-cmd_pid, SIGWINCH);	2641	kill (-cmd_pid, SIGWINCH);
2591	}	2642	}
2592		2643
2593	/* Read a text string from the input buffer */	2644	/* Read a text string from the input buffer */
2594	unicode_t buf[UBUFSIZ];	2645	unicode_t buf[UBUFSIZ];
2595	bool refreshnow = false;	2646	bool refreshnow = false;
2596	int nlines = 0;	2647	int nlines = 0;
2597	unicode_t *str = buf;	2648	unicode_t *str = buf;
		2649	unicode_t *eol = str + min (ncol, UBUFSIZ);
2598		2650
2599	for (;;)	2651	for (;;)
2600	{	2652	{
2601	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2653	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2602	break;	2654	break;
2603		2655
2604	*str++ = ch;	2656	*str++ = ch;
2605		2657
2606	if (ch == C0_LF)	2658	if (ch == C0_LF || str >= eol)
2607	{	2659	{
		2660	if (ch == C0_LF)
2608	nlines++;	2661	nlines++;
		2662
2609	refresh_count++;	2663	refresh_count++;
2610		2664
2611	if (!(options & Opt_jumpScroll)	2665	if (!(options & Opt_jumpScroll)
2612	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2666	|| (refresh_count >= refresh_limit * (nrow - 1)))
2613	{	2667	{
2614	refreshnow = true;	2668	refreshnow = true;
2615	ch = NOCHAR;	2669	ch = NOCHAR;
2616	break;	2670	break;
2617	}	2671	}
2618		2672
2619	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2673	// scr_add_lines only works for nlines <= nrow - 1.
2620	if (nlines >= TermWin.nrow - 1)	2674	if (nlines >= nrow - 1)
2621	{	2675	{
2622	scr_add_lines (buf, nlines, str - buf);	2676	scr_add_lines (buf, nlines, str - buf);
2623	nlines = 0;	2677	nlines = 0;
2624	str = buf;	2678	str = buf;
		2679	eol = str + min (ncol, UBUFSIZ);
2625	}	2680	}
2626	}
2627		2681
2628	if (str >= buf + UBUFSIZ)	2682	if (str >= eol)
2629	{	2683	{
		2684	if (eol >= buf + UBUFSIZ)
		2685	{
2630	ch = NOCHAR;	2686	ch = NOCHAR;
2631	break;	2687	break;
		2688	}
		2689	else
		2690	eol = min (eol + ncol, buf + UBUFSIZ);
		2691	}
		2692
2632	}	2693	}
2633		2694
2634	seq_begin = cmdbuf_ptr;	2695	seq_begin = cmdbuf_ptr;
2635	ch = next_char ();	2696	ch = next_char ();
2636	}	2697	}
…		…
2707	if (len == (size_t)-1)	2768	if (len == (size_t)-1)
2708	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2769	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709		2770
2710	// assume wchar == unicode	2771	// assume wchar == unicode
2711	cmdbuf_ptr += len;	2772	cmdbuf_ptr += len;
2712	return wc;	2773	return wc & UNICODE_MASK;
2713	}	2774	}
2714		2775
2715	return NOCHAR;	2776	return NOCHAR;
2716	}	2777	}
2717		2778
…		…
3180	{	3241	{
3181	switch (priv)	3242	switch (priv)
3182	{	3243	{
3183	case '>':	3244	case '>':
3184	if (ch == CSI_DA) /* secondary device attributes */	3245	if (ch == CSI_DA) /* secondary device attributes */
3185	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3246	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3186	break;	3247	break;
3187	case '?':	3248	case '?':
3188	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3249	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189	process_terminal_mode (ch, priv, nargs, arg);	3250	process_terminal_mode (ch, priv, nargs, arg);
3190	break;	3251	break;
…		…
3295		3356
3296	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3357	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3297	arg[0] = -arg[0];	3358	arg[0] = -arg[0];
3298	/* FALLTHROUGH */	3359	/* FALLTHROUGH */
3299	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3360	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3300	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3361	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3301	break;	3362	break;
3302		3363
3303	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3364	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3304	tt_write ((const unsigned char *)VT100_ANS,	3365	tt_write ((const unsigned char *)VT100_ANS,
3305	(unsigned int) (sizeof (VT100_ANS) - 1));	3366	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3419	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3480	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420	{	3481	{
3421	int x, y;	3482	int x, y;
3422	XWindowAttributes wattr;	3483	XWindowAttributes wattr;
3423	Window wdummy;	3484	Window wdummy;
		3485	dDisp;
3424		3486
3425	if (nargs == 0)	3487	if (nargs == 0)
3426	return;	3488	return;
3427		3489
3428	switch (args[0])	3490	switch (args[0])
3429	{	3491	{
3430	/*	3492	/*
3431	* commands	3493	* commands
3432	*/	3494	*/
3433	case 1: /* deiconify window */	3495	case 1: /* deiconify window */
3434	XMapWindow (display->display, TermWin.parent[0]);	3496	XMapWindow (disp, parent[0]);
3435	break;	3497	break;
3436	case 2: /* iconify window */	3498	case 2: /* iconify window */
3437	XIconifyWindow (display->display, TermWin.parent[0],	3499	XIconifyWindow (disp, parent[0], display->screen);
3438	DefaultScreen (display->display));
3439	break;	3500	break;
3440	case 3: /* set position (pixels) */	3501	case 3: /* set position (pixels) */
3441	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3502	XMoveWindow (disp, parent[0], args[1], args[2]);
3442	break;	3503	break;
3443	case 4: /* set size (pixels) */	3504	case 4: /* set size (pixels) */
3444	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3505	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445	break;	3506	break;
3446	case 5: /* raise window */	3507	case 5: /* raise window */
3447	XRaiseWindow (display->display, TermWin.parent[0]);	3508	XRaiseWindow (disp, parent[0]);
3448	break;	3509	break;
3449	case 6: /* lower window */	3510	case 6: /* lower window */
3450	XLowerWindow (display->display, TermWin.parent[0]);	3511	XLowerWindow (disp, parent[0]);
3451	break;	3512	break;
3452	case 7: /* refresh window */	3513	case 7: /* refresh window */
3453	scr_touch (true);	3514	scr_touch (true);
3454	break;	3515	break;
3455	case 8: /* set size (chars) */	3516	case 8: /* set size (chars) */
3456	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3517	set_widthheight ((unsigned int) (args[2] * fwidth),
3457	(unsigned int) (args[1] * TermWin.fheight));	3518	(unsigned int) (args[1] * fheight));
3458	break;	3519	break;
3459		3520
3460	//case 9: NYI, TODO, restore maximized window or maximize window	3521	//case 9: NYI, TODO, restore maximized window or maximize window
3461	default:	3522	default:
3462	if (args[0] >= 24) /* set height (chars) */	3523	if (args[0] >= 24) /* set height (chars) */
3463	set_widthheight ((unsigned int)TermWin.width,	3524	set_widthheight ((unsigned int)width,
3464	(unsigned int) (args[1] * TermWin.fheight));	3525	(unsigned int) (args[1] * fheight));
3465	break;	3526	break;
3466		3527
3467		3528
3468	/*	3529	/*
3469	* reports - some output format copied from XTerm	3530	* reports - some output format copied from XTerm
3470	*/	3531	*/
3471	case 11: /* report window state */	3532	case 11: /* report window state */
3472	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3533	XGetWindowAttributes (disp, parent[0], &wattr);
3473	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3534	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474	break;	3535	break;
3475	case 13: /* report window position */	3536	case 13: /* report window position */
3476	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3537	XGetWindowAttributes (disp, parent[0], &wattr);
3477	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3538	XTranslateCoordinates (disp, parent[0], wattr.root,
3478	-wattr.border_width, -wattr.border_width,	3539	-wattr.border_width, -wattr.border_width,
3479	&x, &y, &wdummy);	3540	&x, &y, &wdummy);
3480	tt_printf ("\033[3;%d;%dt", x, y);	3541	tt_printf ("\033[3;%d;%dt", x, y);
3481	break;	3542	break;
3482	case 14: /* report window size (pixels) */	3543	case 14: /* report window size (pixels) */
3483	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3544	XGetWindowAttributes (disp, parent[0], &wattr);
3484	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3545	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485	break;	3546	break;
3486	case 18: /* report text area size (chars) */	3547	case 18: /* report text area size (chars) */
3487	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3548	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3488	break;	3549	break;
3489	case 19: /* report window size (chars) */	3550	case 19: /* report window size (chars) */
3490	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3551	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3491	break;	3552	break;
3492	case 20: /* report icon label */	3553	case 20: /* report icon label */
3493	{	3554	{
3494	char *s;	3555	char *s;
3495	XGetIconName (display->display, TermWin.parent[0], &s);	3556	XGetIconName (disp, parent[0], &s);
3496	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3557	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497	XFree (s);	3558	XFree (s);
3498	}	3559	}
3499	break;	3560	break;
3500	case 21: /* report window title */	3561	case 21: /* report window title */
3501	{	3562	{
3502	char *s;	3563	char *s;
3503	XFetchName (display->display, TermWin.parent[0], &s);	3564	XFetchName (disp, parent[0], &s);
3504	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3565	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505	XFree (s);	3566	XFree (s);
3506	}	3567	}
3507	break;	3568	break;
3508	}	3569	}
…		…
3541	else if (ch < 0x20)	3602	else if (ch < 0x20)
3542	return NULL; /* other control character - exit */	3603	return NULL; /* other control character - exit */
3543		3604
3544	seen_esc = false;	3605	seen_esc = false;
3545		3606
3546	if (n >= sizeof (string) - 1)	3607	if (n >= STRING_MAX - 1)
3547	// stop at some sane length	3608	// stop at some sane length
3548	return NULL;	3609	return NULL;
3549		3610
3550	if (ch == C0_SYN)	3611	if (ch == C0_SYN)
3551	string[n++] = cmd_get8 ();	3612	string[n++] = cmd_get8 ();
…		…
3619	set_window_color (color, str);	3680	set_window_color (color, str);
3620	}	3681	}
3621		3682
3622	/*	3683	/*
3623	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3684	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624	* 0 = change iconName/title
3625	* 1 = change iconName
3626	* 2 = change title
3627	* 4 = change color
3628	* 10 = change fg color
3629	* 11 = change bg color
3630	* 12 = change text color
3631	* 13 = change mouse foreground color
3632	* 17 = change highlight character colour
3633	* 18 = change bold character color
3634	* 19 = change underlined character color
3635	* 46 = change logfile (not implemented)
3636	* 50 = change font
3637	*
3638	* rxvt extensions:
3639	* 20 = bg pixmap
3640	* 39 = change default fg color
3641	* 49 = change default bg color
3642	* 55 = dump scrollback buffer and all of screen
3643	* 701 = change locale
3644	* 702 = find font
3645	* 703 = menu
3646	*/	3685	*/
3647	void	3686	void
3648	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3687	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649	{	3688	{
3650	int changed = 0;	3689	int changed = 0;
3651	int color;	3690	int color;
3652	char *buf, *name;	3691	char *buf, *name;
3653	bool query = str[0] == '?' && !str[1];	3692	bool query = str[0] == '?' && !str[1];
3654	int saveop = op;	3693	int saveop = op;
		3694	dDisp;
3655		3695
3656	assert (str != NULL);	3696	assert (str != NULL);
3657	switch (op)	3697	switch (op)
3658	{	3698	{
3659	case XTerm_name:	3699	case XTerm_name:
…		…
3675	unsigned long bytes_after;	3715	unsigned long bytes_after;
3676	unsigned char *value = 0;	3716	unsigned char *value = 0;
3677	const char *str = "";	3717	const char *str = "";
3678		3718
3679	if (prop	3719	if (prop
3680	&& XGetWindowProperty (display->display, TermWin.parent[0],	3720	&& XGetWindowProperty (disp, parent[0],
3681	prop, 0, 1<<16, 0, AnyPropertyType,	3721	prop, 0, 1<<16, 0, AnyPropertyType,
3682	&actual_type, &actual_format,	3722	&actual_type, &actual_format,
3683	&nitems, &bytes_after, &value) == Success	3723	&nitems, &bytes_after, &value) == Success
3684	&& actual_type != None	3724	&& actual_type != None
3685	&& actual_format == 8)	3725	&& actual_format == 8)
…		…
3697	{	3737	{
3698	*eq = 0;	3738	*eq = 0;
3699	set_utf8_property (display->atom (str), eq + 1);	3739	set_utf8_property (display->atom (str), eq + 1);
3700	}	3740	}
3701	else	3741	else
3702	XDeleteProperty (display->display, TermWin.parent[0],	3742	XDeleteProperty (disp, parent[0],
3703	display->atom (str));	3743	display->atom (str));
3704	}	3744	}
3705	break;	3745	break;
3706		3746
3707	case XTerm_Color:	3747	case XTerm_Color:
…		…
3748	break;	3788	break;
3749	#ifndef NO_BOLD_UNDERLINE_REVERSE	3789	#ifndef NO_BOLD_UNDERLINE_REVERSE
3750	case XTerm_Color_BD:	3790	case XTerm_Color_BD:
3751	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3791	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752	break;	3792	break;
3753	case XTerm_Color_IT:
3754	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755	break;
3756	case XTerm_Color_UL:	3793	case XTerm_Color_UL:
3757	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3794	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758	break;	3795	break;
3759	case XTerm_Color_RV:	3796	case XTerm_Color_RV:
3760	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3797	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761	break;	3798	break;
		3799	case URxvt_Color_IT:
		3800	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3801	break;
3762	#endif	3802	#endif
3763	#if TRANSPARENT && TINTING	3803	#if TRANSPARENT && TINTING
3764	case XTerm_Color_tint:	3804	case URxvt_Color_tint:
3765	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3805	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3766	check_our_parents ();	3806	check_our_parents ();
3767	if (am_transparent)	3807	if (am_transparent)
3768	want_full_refresh = want_refresh = 1;	3808	want_full_refresh = want_refresh = 1;
3769	break;	3809	break;
3770	#endif	3810	#endif
…		…
3782	{	3822	{
3783	str++;	3823	str++;
3784	#if XPM_BACKGROUND	3824	#if XPM_BACKGROUND
3785	changed += scale_pixmap (str);	3825	changed += scale_pixmap (str);
3786	#endif	3826	#endif
3787
3788	}	3827	}
		3828
3789	if (changed)	3829	if (changed)
3790	{	3830	{
3791	#ifdef XPM_BACKGROUND	3831	#ifdef XPM_BACKGROUND
3792	resize_pixmap ();	3832	resize_pixmap ();
3793	#endif	3833	#endif
…		…
3804		3844
3805	case XTerm_logfile:	3845	case XTerm_logfile:
3806	// TODO, when secure mode?	3846	// TODO, when secure mode?
3807	break;	3847	break;
3808		3848
		3849	#ifdef MENUBAR
		3850	case URxvt_Menu:
		3851	if (options & Opt_insecure)
		3852	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3853	break;
		3854	#endif
		3855	#if 0
		3856	case XTerm_dumpscreen: /* no error notices */
		3857	{
		3858	int fd;
		3859	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3860	{
		3861	scr_dump (fd);
		3862	close (fd);
		3863	}
		3864	}
		3865	break;
		3866	#endif
3809	case XTerm_font:	3867	case XTerm_font:
3810	op = URxvt_font;	3868	op = URxvt_font;
3811	case URxvt_font:	3869	case URxvt_font:
3812	#if ENABLE_STYLES	3870	#if ENABLE_STYLES
3813	case URxvt_boldFont:	3871	case URxvt_boldFont:
3814	case URxvt_italicFont:	3872	case URxvt_italicFont:
3815	case URxvt_boldItalicFont:	3873	case URxvt_boldItalicFont:
3816	#endif	3874	#endif
3817	if (query)	3875	if (query)
3818	tt_printf ("\33]%d;%-.250s%c", saveop,	3876	tt_printf ("\33]%d;%-.250s%c", saveop,
3819	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3877	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3820	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3878	? fontset[op - URxvt_font]->fontdesc : "",
3821	resp);	3879	resp);
3822	else	3880	else
3823	{	3881	{
3824	const char *&res = rs[Rs_font + (op - URxvt_font)];	3882	const char *&res = rs[Rs_font + (op - URxvt_font)];
3825		3883
…		…
3828	set_fonts ();	3886	set_fonts ();
3829	}	3887	}
3830	break;	3888	break;
3831		3889
3832	#if ENABLE_FRILLS	3890	#if ENABLE_FRILLS
3833	case XTerm_locale:	3891	case URxvt_locale:
3834	if (query)	3892	if (query)
3835	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3893	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3836	else	3894	else
3837	{	3895	{
3838	set_locale (str);	3896	set_locale (str);
3839	# ifdef USE_XIM	3897	pty.set_utf8_mode (enc_utf8);
3840	im_cb ();	3898	init_xlocale ();
3841	# endif
3842	}	3899	}
3843	break;	3900	break;
3844	#endif
3845		3901
3846	#ifdef MENUBAR	3902	case URxvt_view_up:
3847	case XTerm_Menu:	3903	case URxvt_view_down:
3848	if (options & Opt_insecure)	3904	int lines = atoi (str);
3849	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3905
3850	break;	3906	if (lines)
3851	#endif	3907	scr_page (op == URxvt_view_up ? UP : DN, lines);
3852	#if 0
3853	case XTerm_dumpscreen: /* no error notices */
3854	{	3908	else
3855	int fd;
3856	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3857	{	3909	{
3858	scr_dump (fd);	3910	scr_erase_savelines ();
3859	close (fd);
3860	}	3911	}
3861	}	3912
3862	break;	3913	break;
3863	#endif	3914	#endif
3864	}	3915	}
3865	}	3916	}
3866	/*----------------------------------------------------------------------*/	3917	/*----------------------------------------------------------------------*/
…		…
3999	*/	4050	*/
4000	PrivMode (1, PrivMode_vt52);	4051	PrivMode (1, PrivMode_vt52);
4001	break;	4052	break;
4002	case 3: /* 80/132 */	4053	case 3: /* 80/132 */
4003	if (priv_modes & PrivMode_132OK)	4054	if (priv_modes & PrivMode_132OK)
4004	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4055	set_widthheight (((state ? 132 : 80) * fwidth), height);
4005	break;	4056	break;
4006	case 4: /* smooth scrolling */	4057	case 4: /* smooth scrolling */
4007	if (state)	4058	if (state)
4008	options &= ~Opt_jumpScroll;	4059	options &= ~Opt_jumpScroll;
4009	else	4060	else
…		…
4326	}	4377	}
4327		4378
4328	memmove (v_buffer, v_buffer + written, v_buflen);	4379	memmove (v_buffer, v_buffer + written, v_buflen);
4329	}	4380	}
4330	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4381	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331	// original code just ignores this...	4382	pty_ev.set (EVENT_READ);
4332	destroy ();
4333	}	4383	}
4334		4384
4335	/*----------------------- end-of-file (C source) -----------------------*/	4385	/*----------------------- end-of-file (C source) -----------------------*/
4336		4386

Diff Legend

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