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

Diff Legend

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