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.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.212 by root, Wed Dec 21 14:19:19 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(-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	}
…		…
1058	rxvt_term::pty_cb (io_watcher &w, short revents)	1079	rxvt_term::pty_cb (io_watcher &w, short revents)
1059	{	1080	{
1060	SET_R (this);	1081	SET_R (this);
1061	SET_LOCALE (locale);	1082	SET_LOCALE (locale);
1062		1083
1063	if (revents & EVENT_WRITE)
1064	tt_write (0, 0);
1065	else if (revents & EVENT_READ)	1084	if (revents & EVENT_READ)
1066	// loop, but don't allow a single term to monopolize us	1085	// loop, but don't allow a single term to monopolize us
1067	while (pty_fill ())	1086	while (pty_fill ())
1068	if (cmd_parse ())	1087	if (cmd_parse ())
1069	break;	1088	break;
		1089
		1090	if (revents & EVENT_WRITE)
		1091	pty_write ();
1070	}	1092	}
1071		1093
1072	void	1094	void
1073	rxvt_term::pointer_unblank ()	1095	rxvt_term::pointer_unblank ()
1074	{	1096	{
1075	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1097	XDefineCursor (display->display, vt, TermWin_cursor);
1076	recolour_cursor ();	1098	recolour_cursor ();
1077		1099
1078	#ifdef POINTER_BLANK	1100	#ifdef POINTER_BLANK
1079	hidden_pointer = 0;	1101	hidden_pointer = 0;
1080		1102
…		…
1088	rxvt_term::pointer_blank ()	1110	rxvt_term::pointer_blank ()
1089	{	1111	{
1090	if (! (options & Opt_pointerBlank))	1112	if (! (options & Opt_pointerBlank))
1091	return;	1113	return;
1092		1114
1093	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1115	XDefineCursor (display->display, vt, display->blank_cursor);
1094	XFlush (display->display);	1116	XFlush (display->display);
1095		1117
1096	hidden_pointer = 1;	1118	hidden_pointer = 1;
1097	}	1119	}
1098		1120
…		…
1187		1209
1188	/*{{{ process an X event */	1210	/*{{{ process an X event */
1189	void	1211	void
1190	rxvt_term::x_cb (XEvent &ev)	1212	rxvt_term::x_cb (XEvent &ev)
1191	{	1213	{
		1214	dDisp;
		1215
1192	SET_R (this);	1216	SET_R (this);
1193	SET_LOCALE (locale);	1217	SET_LOCALE (locale);
1194		1218
1195	#if defined(CURSOR_BLINK)	1219	#if defined(CURSOR_BLINK)
1196	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1220	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1217	if (ev.type == KeyPress && hidden_pointer == 0)	1241	if (ev.type == KeyPress && hidden_pointer == 0)
1218	pointer_blank ();	1242	pointer_blank ();
1219	}	1243	}
1220	#endif	1244	#endif
1221		1245
1222	Window unused_root, unused_child;	1246	Window unused_root, unused_child;
1223	int unused_root_x, unused_root_y;	1247	int unused_root_x, unused_root_y;
1224	unsigned int unused_mask;	1248	unsigned int unused_mask;
1225		1249
1226	switch (ev.type)	1250	switch (ev.type)
1227	{	1251	{
1228	case KeyPress:	1252	case KeyPress:
1229	#if ISO_14755	1253	#if ISO_14755
…		…
1312	button_release (ev.xbutton);	1336	button_release (ev.xbutton);
1313	break;	1337	break;
1314		1338
1315	case ClientMessage:	1339	case ClientMessage:
1316	if (ev.xclient.format == 32	1340	if (ev.xclient.format == 32
		1341	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1342	{
1317	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1343	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318	destroy ();	1344	destroy ();
		1345	#if ENABLE_EWMH
		1346	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1347	XSendEvent (disp, ev.xclient.window = display->root,
		1348	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1349	&ev);
		1350	#endif
		1351	}
		1352	#if ENABLE_XEMBED
		1353	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1354	{
		1355	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1356	focus_in ();
		1357	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1358	focus_out ();
		1359	}
		1360	#endif
1319	#ifdef OFFIX_DND	1361	#ifdef OFFIX_DND
1320	/* OffiX Dnd (drag 'n' drop) protocol */	1362	/* OffiX Dnd (drag 'n' drop) protocol */
1321	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1363	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322	&& (ev.xclient.data.l[0] == DndFile	1364	&& (ev.xclient.data.l[0] == DndFile
1323	|| ev.xclient.data.l[0] == DndDir	1365	|| ev.xclient.data.l[0] == DndDir
1324	|| ev.xclient.data.l[0] == DndLink))	1366	|| ev.xclient.data.l[0] == DndLink))
1325	{	1367	{
1326	/* Get Dnd data */	1368	/* Get Dnd data */
1327	Atom ActualType;	1369	Atom ActualType;
1328	int ActualFormat;	1370	int ActualFormat;
1329	unsigned char *data;	1371	unsigned char *data;
1330	unsigned long Size, RemainingBytes;	1372	unsigned long Size, RemainingBytes;
1331		1373
1332	XGetWindowProperty (display->display, display->root,	1374	XGetWindowProperty (disp, display->root,
1333	xa[XA_DNDSELECTION],	1375	xa[XA_DNDSELECTION],
1334	0L, 1000000L,	1376	0L, 1000000L,
1335	False, AnyPropertyType,	1377	False, AnyPropertyType,
1336	&ActualType, &ActualFormat,	1378	&ActualType, &ActualFormat,
1337	&Size, &RemainingBytes,	1379	&Size, &RemainingBytes,
1338	&data);	1380	&data);
1339	XChangeProperty (display->display, display->root,	1381	set_string_property (XA_CUT_BUFFER0, data);
1340	XA_CUT_BUFFER0, XA_STRING,
1341	8, PropModeReplace,
1342	data, strlen (data));
1343	XFree (data);	1382	XFree (data);
1344	selection_paste (display->root, XA_CUT_BUFFER0, True);	1383	selection_paste (display->root, XA_CUT_BUFFER0, true);
1345	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1384	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1346	}	1385	}
1347	#endif /* OFFIX_DND */	1386	#endif /* OFFIX_DND */
1348	break;	1387	break;
1349		1388
1350	case MappingNotify:	1389	case MappingNotify:
…		…
1375	break;	1414	break;
1376	}	1415	}
1377	break;	1416	break;
1378		1417
1379	case FocusIn:	1418	case FocusIn:
1380	if (!TermWin.focus)	1419	focus_in ();
		1420	break;
		1421
		1422	case FocusOut:
		1423	focus_out ();
		1424	break;
		1425
		1426	case ConfigureNotify:
		1427	if (ev.xconfigure.window == parent[0])
1381	{	1428	{
1382	TermWin.focus = 1;
1383	want_refresh = 1;
1384	#ifdef USE_XIM
1385	if (Input_Context != NULL)
1386	{
1387	IMSetStatusPosition ();
1388	XSetICFocus (Input_Context);
1389	}
1390	#endif
1391	#ifdef CURSOR_BLINK
1392	if (options & Opt_cursorBlink)
1393	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394	#endif
1395	#ifdef OFF_FOCUS_FADING
1396	if (rs[Rs_fade])
1397	{
1398	pix_colors = pix_colors_focused;
1399	scr_recolour ();
1400	}
1401	#endif
1402
1403	}
1404	break;
1405
1406	case FocusOut:
1407	if (TermWin.focus)
1408	{
1409	TermWin.focus = 0;
1410	want_refresh = 1;
1411
1412	#if ENABLE_FRILLS || ISO_14755
1413	iso14755buf = 0;
1414	#endif
1415	#if ENABLE_OVERLAY
1416	scr_overlay_off ();
1417	#endif
1418	#ifdef USE_XIM
1419	if (Input_Context != NULL)
1420	XUnsetICFocus (Input_Context);
1421	#endif
1422	#ifdef CURSOR_BLINK
1423	if (options & Opt_cursorBlink)
1424	cursor_blink_ev.stop ();
1425	hidden_cursor = 0;
1426	#endif
1427	#ifdef OFF_FOCUS_FADING
1428	if (rs[Rs_fade])
1429	{
1430	pix_colors = pix_colors_unfocused;
1431	scr_recolour ();
1432	}
1433	#endif
1434	}
1435	break;
1436
1437	case ConfigureNotify:
1438	if (ev.xconfigure.window == TermWin.parent[0])
1439	{
1440	int height, width;
1441
1442	do
1443	{ /* Wrap lots of configures into one */
1444	width = ev.xconfigure.width;
1445	height = ev.xconfigure.height;
1446	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447	}
1448	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1429	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1430	;
1449		1431
1450	if (szHint.width != width || szHint.height != height)	1432	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451	{	1433	{
1452	seen_resize = 1;	1434	seen_resize = 1;
1453	resize_all_windows (width, height, 1);	1435	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454	}	1436	}
1455		1437
1456	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1438	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457	if (options & Opt_transparent)	1439	if (options & Opt_transparent)
1458	{
1459	check_our_parents ();	1440	check_our_parents ();
1460	if (am_transparent)
1461	want_refresh = want_full_refresh = 1;
1462	}
1463	#endif	1441	#endif
1464	}	1442	}
1465	break;	1443	break;
1466		1444
1467	case PropertyNotify:	1445	case PropertyNotify:
…		…
1475	selection_clear ();	1453	selection_clear ();
1476	break;	1454	break;
1477		1455
1478	case SelectionNotify:	1456	case SelectionNotify:
1479	if (selection_wait == Sel_normal)	1457	if (selection_wait == Sel_normal)
1480	selection_paste (ev.xselection.requestor,	1458	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481	ev.xselection.property, True);
1482	break;	1459	break;
1483		1460
1484	case SelectionRequest:	1461	case SelectionRequest:
1485	selection_send (ev.xselectionrequest);	1462	selection_send (ev.xselectionrequest);
1486	break;	1463	break;
1487		1464
1488	case UnmapNotify:	1465	case UnmapNotify:
1489	TermWin.mapped = 0;	1466	mapped = 0;
1490	#ifdef TEXT_BLINK	1467	#ifdef TEXT_BLINK
1491	text_blink_ev.stop ();	1468	text_blink_ev.stop ();
1492	#endif	1469	#endif
1493	break;	1470	break;
1494		1471
1495	case MapNotify:	1472	case MapNotify:
1496	TermWin.mapped = 1;	1473	mapped = 1;
1497	#ifdef TEXT_BLINK	1474	#ifdef TEXT_BLINK
1498	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1475	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1499	#endif	1476	#endif
1500	break;	1477	break;
1501		1478
…		…
1505	break;	1482	break;
1506	#endif /* TRANSPARENT */	1483	#endif /* TRANSPARENT */
1507		1484
1508	case GraphicsExpose:	1485	case GraphicsExpose:
1509	case Expose:	1486	case Expose:
1510	if (ev.xany.window == TermWin.vt)	1487	if (ev.xany.window == vt)
1511	{	1488	{
1512	do	1489	do
1513	scr_expose (ev.xexpose.x, ev.xexpose.y,	1490	scr_expose (ev.xexpose.x, ev.xexpose.y,
1514	ev.xexpose.width, ev.xexpose.height, False);	1491	ev.xexpose.width, ev.xexpose.height, False);
1515	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1492	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1516		1493
1517	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1494	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518		1495
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1496	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1520	scr_expose (ev.xexpose.x, ev.xexpose.y,	1497	scr_expose (ev.xexpose.x, ev.xexpose.y,
1521	ev.xexpose.width, ev.xexpose.height, False);	1498	ev.xexpose.width, ev.xexpose.height, False);
1522		1499
1523	scr_refresh (refresh_type);	1500	scr_refresh (refresh_type);
1524	}	1501	}
1525	else	1502	else
1526	{	1503	{
1527	XEvent unused_event;	1504	XEvent unused_event;
1528		1505
1529	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1506	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1530	;	1507	;
1531	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1508	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1532	;	1509	;
1533		1510
1534	if (isScrollbarWindow (ev.xany.window))	1511	if (isScrollbarWindow (ev.xany.window))
1535	{	1512	{
1536	scrollBar.setIdle ();	1513	scrollBar.setIdle ();
…		…
1540	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1517	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1541	menubar_expose ();	1518	menubar_expose ();
1542	#endif	1519	#endif
1543		1520
1544	#ifdef TRANSPARENT	1521	#ifdef TRANSPARENT
1545	if (am_transparent && ev.xany.window == TermWin.parent[0])	1522	if (am_transparent && ev.xany.window == parent[0])
1546	XClearWindow (display->display, ev.xany.window);	1523	XClearWindow (disp, ev.xany.window);
1547	#endif	1524	#endif
1548	}	1525	}
1549	break;	1526	break;
1550		1527
1551	case MotionNotify:	1528	case MotionNotify:
…		…
1561	}	1538	}
1562	#endif	1539	#endif
1563	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1540	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1564	break;	1541	break;
1565		1542
1566	if (ev.xany.window == TermWin.vt)	1543	if (ev.xany.window == vt)
1567	{	1544	{
1568	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1545	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569	{	1546	{
1570	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1547	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1571	;	1548	;
1572		1549
1573	XQueryPointer (display->display, TermWin.vt,	1550	XQueryPointer (disp, vt,
1574	&unused_root, &unused_child,	1551	&unused_root, &unused_child,
1575	&unused_root_x, &unused_root_y,	1552	&unused_root_x, &unused_root_y,
1576	&ev.xbutton.x, &ev.xbutton.y,	1553	&ev.xbutton.x, &ev.xbutton.y,
1577	&ev.xbutton.state);	1554	&ev.xbutton.state);
1578	#ifdef MOUSE_THRESHOLD	1555	#ifdef MOUSE_THRESHOLD
…		…
1590	#endif	1567	#endif
1591	selection_extend (ev.xbutton.x, ev.xbutton.y,	1568	selection_extend (ev.xbutton.x, ev.xbutton.y,
1592	ev.xbutton.state & Button3Mask ? 2 : 0);	1569	ev.xbutton.state & Button3Mask ? 2 : 0);
1593		1570
1594	#ifdef SELECTION_SCROLLING	1571	#ifdef SELECTION_SCROLLING
1595	if (ev.xbutton.y < TermWin.int_bwidth	1572	if (ev.xbutton.y < int_bwidth
1596	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1573	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1597	{	1574	{
1598	int dist;	1575	int dist;
1599		1576
1600	/* don't clobber the current delay if we are	1577	/* don't clobber the current delay if we are
1601	* already in the middle of scrolling.	1578	* already in the middle of scrolling.
…		…
1609	selection_save_x = ev.xbutton.x;	1586	selection_save_x = ev.xbutton.x;
1610	selection_save_y = ev.xbutton.y;	1587	selection_save_y = ev.xbutton.y;
1611	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1588	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1612		1589
1613	/* calc number of lines to scroll */	1590	/* calc number of lines to scroll */
1614	if (ev.xbutton.y < TermWin.int_bwidth)	1591	if (ev.xbutton.y < int_bwidth)
1615	{	1592	{
1616	scroll_selection_dir = UP;	1593	scroll_selection_dir = UP;
1617	dist = TermWin.int_bwidth - ev.xbutton.y;	1594	dist = int_bwidth - ev.xbutton.y;
1618	}	1595	}
1619	else	1596	else
1620	{	1597	{
1621	scroll_selection_dir = DN;	1598	scroll_selection_dir = DN;
1622	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1599	dist = ev.xbutton.y - (int_bwidth + height);
1623	}	1600	}
1624		1601
1625	scroll_selection_lines = Pixel2Height (dist)	1602	scroll_selection_lines = Pixel2Height (dist)
1626	/ SELECTION_SCROLL_LINE_SPEEDUP	1603	/ SELECTION_SCROLL_LINE_SPEEDUP
1627	+ 1;	1604	+ 1;
1628	MIN_IT (scroll_selection_lines,	1605	min_it (scroll_selection_lines,
1629	SELECTION_SCROLL_MAX_LINES);	1606	SELECTION_SCROLL_MAX_LINES);
1630	}	1607	}
1631	else	1608	else
1632	{	1609	{
1633	/* we are within the text window, so we	1610	/* we are within the text window, so we
…		…
1642	#endif	1619	#endif
1643	}	1620	}
1644	}	1621	}
1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1622	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646	{	1623	{
1647	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1624	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1648	MotionNotify, &ev))	1625	MotionNotify, &ev))
1649	;	1626	;
1650		1627
1651	XQueryPointer (display->display, scrollBar.win,	1628	XQueryPointer (disp, scrollBar.win,
1652	&unused_root, &unused_child,	1629	&unused_root, &unused_child,
1653	&unused_root_x, &unused_root_y,	1630	&unused_root_x, &unused_root_y,
1654	&ev.xbutton.x, &ev.xbutton.y,	1631	&ev.xbutton.x, &ev.xbutton.y,
1655	&unused_mask);	1632	&unused_mask);
1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1633	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1661	}	1638	}
1662	break;	1639	break;
1663	}	1640	}
1664	}	1641	}
1665		1642
		1643	void
		1644	rxvt_term::focus_in ()
		1645	{
		1646	if (!focus)
		1647	{
		1648	focus = 1;
		1649	want_refresh = 1;
		1650	#if USE_XIM
		1651	if (Input_Context != NULL)
		1652	{
		1653	IMSetStatusPosition ();
		1654	XSetICFocus (Input_Context);
		1655	}
		1656	#endif
		1657	#if CURSOR_BLINK
		1658	if (options & Opt_cursorBlink)
		1659	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1660	#endif
		1661	#if OFF_FOCUS_FADING
		1662	if (rs[Rs_fade])
		1663	{
		1664	pix_colors = pix_colors_focused;
		1665	scr_recolour ();
		1666	}
		1667	#endif
		1668	}
		1669	}
		1670
		1671	void
		1672	rxvt_term::focus_out ()
		1673	{
		1674	if (focus)
		1675	{
		1676	focus = 0;
		1677	want_refresh = 1;
		1678
		1679	#if ENABLE_FRILLS || ISO_14755
		1680	iso14755buf = 0;
		1681	#endif
		1682	#if ENABLE_OVERLAY
		1683	scr_overlay_off ();
		1684	#endif
		1685	#if USE_XIM
		1686	if (Input_Context != NULL)
		1687	XUnsetICFocus (Input_Context);
		1688	#endif
		1689	#if CURSOR_BLINK
		1690	if (options & Opt_cursorBlink)
		1691	cursor_blink_ev.stop ();
		1692	hidden_cursor = 0;
		1693	#endif
		1694	#if OFF_FOCUS_FADING
		1695	if (rs[Rs_fade])
		1696	{
		1697	pix_colors = pix_colors_unfocused;
		1698	scr_recolour ();
		1699	}
		1700	#endif
		1701	}
		1702	}
		1703
1666	#if TRANSPARENT	1704	#if TRANSPARENT
1667	void	1705	void
1668	rxvt_term::rootwin_cb (XEvent &ev)	1706	rxvt_term::rootwin_cb (XEvent &ev)
1669	{	1707	{
1670	SET_R (this);	1708	SET_R (this);
…		…
1675	case PropertyNotify:	1713	case PropertyNotify:
1676	/*	1714	/*
1677	* if user used some Esetroot compatible prog to set the root bg,	1715	* if user used some Esetroot compatible prog to set the root bg,
1678	* use the property to determine the pixmap. We use it later on.	1716	* use the property to determine the pixmap. We use it later on.
1679	*/	1717	*/
1680	if (xa[XA_XROOTPMAPID] == 0)
1681	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1718	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1719	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684	return;	1720	return;
1685		1721
1686	/* FALLTHROUGH */	1722	/* FALLTHROUGH */
1687	case ReparentNotify:	1723	case ReparentNotify:
1688	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1724	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1702	reportmode = !! (priv_modes & PrivMode_mouse_report);	1738	reportmode = !! (priv_modes & PrivMode_mouse_report);
1703		1739
1704	/*	1740	/*
1705	* VT window processing of button press	1741	* VT window processing of button press
1706	*/	1742	*/
1707	if (ev.window == TermWin.vt)	1743	if (ev.window == vt)
1708	{	1744	{
1709	#if ISO_14755	1745	#if ISO_14755
1710	// 5.4	1746	// 5.4
1711	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1747	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712	{	1748	{
…		…
1760	{	1796	{
1761	case Button1:	1797	case Button1:
1762	/* allow meta + click to select rectangular areas */	1798	/* allow meta + click to select rectangular areas */
1763	/* should be done in screen.C */	1799	/* should be done in screen.C */
1764	#if ENABLE_FRILLS	1800	#if ENABLE_FRILLS
1765	selection.rect = !! (ev.state & ModMetaMask);	1801	selection.rect = !!(ev.state & ModMetaMask);
1766	#else	1802	#else
1767	selection.rect = false;	1803	selection.rect = false;
1768	#endif	1804	#endif
1769		1805
1770	/* allow shift+left click to extend selection */	1806	/* allow shift+left click to extend selection */
…		…
1917	case Button3:	1953	case Button3:
1918	if (scrollBar.style != R_SB_XTERM)	1954	if (scrollBar.style != R_SB_XTERM)
1919	{	1955	{
1920	if (scrollbar_above_slider (ev.y))	1956	if (scrollbar_above_slider (ev.y))
1921	# ifdef RXVT_SCROLL_FULL	1957	# ifdef RXVT_SCROLL_FULL
1922	scr_page (UP, TermWin.nrow - 1);	1958	scr_page (UP, nrow - 1);
1923	# else	1959	# else
1924	scr_page (UP, TermWin.nrow / 4);	1960	scr_page (UP, nrow / 4);
1925	# endif	1961	# endif
1926	else if (scrollbar_below_slider (ev.y))	1962	else if (scrollbar_below_slider (ev.y))
1927	# ifdef RXVT_SCROLL_FULL	1963	# ifdef RXVT_SCROLL_FULL
1928	scr_page (DN, TermWin.nrow - 1);	1964	scr_page (DN, nrow - 1);
1929	# else	1965	# else
1930	scr_page (DN, TermWin.nrow / 4);	1966	scr_page (DN, nrow / 4);
1931	# endif	1967	# endif
1932	else	1968	else
1933	scrollBar.setMotion ();	1969	scrollBar.setMotion ();
1934	}	1970	}
1935	else	1971	else
1936	{	1972	{
1937	scr_page ((ev.button == Button1 ? DN : UP),	1973	scr_page ((ev.button == Button1 ? DN : UP),
1938	(TermWin.nrow	1974	(nrow
1939	* scrollbar_position (ev.y)	1975	* scrollbar_position (ev.y)
1940	/ scrollbar_size ()));	1976	/ scrollbar_size ()));
1941	}	1977	}
1942		1978
1943	break;	1979	break;
…		…
1975	#ifdef SELECTION_SCROLLING	2011	#ifdef SELECTION_SCROLLING
1976	if (sel_scroll_ev.active)	2012	if (sel_scroll_ev.active)
1977	sel_scroll_ev.stop();	2013	sel_scroll_ev.stop();
1978	#endif	2014	#endif
1979		2015
1980	if (ev.window == TermWin.vt)	2016	if (ev.window == vt)
1981	{	2017	{
1982	#if ISO_14755	2018	#if ISO_14755
1983	// 5.4	2019	// 5.4
1984	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2020	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985	return;	2021	return;
…		…
2036	v = ev.button == Button4 ? UP : DN;	2072	v = ev.button == Button4 ? UP : DN;
2037		2073
2038	if (ev.state & ShiftMask)	2074	if (ev.state & ShiftMask)
2039	i = 1;	2075	i = 1;
2040	else if (options & Opt_mouseWheelScrollPage)	2076	else if (options & Opt_mouseWheelScrollPage)
2041	i = TermWin.nrow - 1;	2077	i = nrow - 1;
2042	else	2078	else
2043	i = 5;	2079	i = 5;
2044		2080
2045	# ifdef MOUSE_SLIP_WHEELING	2081	# ifdef MOUSE_SLIP_WHEELING
2046	if (ev.state & ControlMask)	2082	if (ev.state & ControlMask)
2047	{	2083	{
2048	mouse_slip_wheel_speed += v ? -1 : 1;	2084	mouse_slip_wheel_speed += v ? -1 : 1;
2049	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2085	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2050	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;
2051		2087
2052	if (slip_wheel_ev.at < NOW)	2088	if (slip_wheel_ev.at < NOW)
2053	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2089	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054		2090
2055	slip_wheel_ev.start ();	2091	slip_wheel_ev.start ();
…		…
2096	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2132	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2133	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2134	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099	int i;	2135	int i;
2100		2136
2101	Visual* visual = display->visual;	2137	Visual *visual = display->visual;
2102		2138
2103	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2139	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104		2140
2105	/* for convenience */	2141	/* for convenience */
2106	mask_r = visual->red_mask;	2142	mask_r = visual->red_mask;
…		…
2327	Atom atype;	2363	Atom atype;
2328	unsigned char *prop = NULL;	2364	unsigned char *prop = NULL;
2329	Window root, oldp, *list;	2365	Window root, oldp, *list;
2330	Pixmap rootpixmap = None;	2366	Pixmap rootpixmap = None;
2331	XWindowAttributes wattr, wrootattr;	2367	XWindowAttributes wattr, wrootattr;
		2368	dDisp;
2332		2369
2333	pchanged = 0;	2370	pchanged = 0;
2334		2371
2335	if (!(options & Opt_transparent))	2372	if (!(options & Opt_transparent))
2336	return pchanged; /* Don't try any more */	2373	return pchanged; /* Don't try any more */
2337		2374
2338	XGetWindowAttributes (display->display, display->root, &wrootattr);	2375	XGetWindowAttributes (disp, display->root, &wrootattr);
2339	rootdepth = wrootattr.depth;	2376	rootdepth = wrootattr.depth;
2340		2377
2341	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2378	XGetWindowAttributes (disp, parent[0], &wattr);
2342		2379
2343	if (rootdepth != wattr.depth)	2380	if (rootdepth != wattr.depth)
2344	{	2381	{
2345	if (am_transparent)	2382	if (am_transparent)
2346	{	2383	{
2347	pchanged = 1;	2384	pchanged = 1;
2348	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2385	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2349	am_transparent = am_pixmap_trans = 0;	2386	am_transparent = am_pixmap_trans = 0;
2350	}	2387	}
2351		2388
2352	return pchanged; /* Don't try any more */	2389	return pchanged; /* Don't try any more */
2353	}	2390	}
2354		2391
2355	/* Get all X ops out of the queue so that our information is up-to-date. */	2392	/* Get all X ops out of the queue so that our information is up-to-date. */
2356	XSync (display->display, False);	2393	XSync (disp, False);
2357		2394
2358	/*	2395	/*
2359	* Make the frame window set by the window manager have	2396	* Make the frame window set by the window manager have
2360	* the root background. Some window managers put multiple nested frame	2397	* the root background. Some window managers put multiple nested frame
2361	* windows for each client, so we have to take care about that.	2398	* windows for each client, so we have to take care about that.
2362	*/	2399	*/
2363	i = (xa[XA_XROOTPMAPID]	2400	i = (xa[XA_XROOTPMAP_ID]
2364	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2401	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2365	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2402	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366	&nitems, &bytes_after, &prop) == Success);	2403	&nitems, &bytes_after, &prop) == Success);
2367		2404
2368	if (!i || prop == NULL)	2405	if (!i || prop == NULL)
2369	i = (xa[XA_XSETROOTID]	2406	i = (xa[XA_ESETROOT_PMAP_ID]
2370	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2407	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2371	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2408	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372	&nitems, &bytes_after, &prop) == Success);	2409	&nitems, &bytes_after, &prop) == Success);
2373		2410
2374	if (!i || prop == NULL	2411	if (!i || prop == NULL
2375	#if TINTING	2412	#if TINTING
…		…
2394	Window cr;	2431	Window cr;
2395	XImage *image;	2432	XImage *image;
2396	GC gc;	2433	GC gc;
2397	XGCValues gcvalue;	2434	XGCValues gcvalue;
2398		2435
2399	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2436	XTranslateCoordinates (disp, parent[0], display->root,
2400	0, 0, &sx, &sy, &cr);	2437	0, 0, &sx, &sy, &cr);
2401	nw = (unsigned int)szHint.width;	2438	nw = (unsigned int)szHint.width;
2402	nh = (unsigned int)szHint.height;	2439	nh = (unsigned int)szHint.height;
2403	nx = ny = 0;	2440	nx = ny = 0;
2404		2441
…		…
2414	nh += sy;	2451	nh += sy;
2415	ny = -sy;	2452	ny = -sy;
2416	sy = 0;	2453	sy = 0;
2417	}	2454	}
2418		2455
2419	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2456	min_it (nw, (unsigned int) (wrootattr.width - sx));
2420	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2457	min_it (nh, (unsigned int) (wrootattr.height - sy));
		2458
		2459	XSync (disp, False);
2421	allowedxerror = -1;	2460	allowedxerror = -1;
2422	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2461	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423		2462
2424	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2463	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2425	/* XXX: may need a delay here? */	2464	/* XXX: may need a delay here? */
2426	allowedxerror = 0;	2465	allowedxerror = 0;
2427		2466
2428	if (image == NULL)	2467	if (image == NULL)
2429	{	2468	{
2430	if (am_transparent && am_pixmap_trans)	2469	if (am_transparent && am_pixmap_trans)
2431	{	2470	{
2432	pchanged = 1;	2471	pchanged = 1;
2433	if (TermWin.pixmap != None)	2472	if (pixmap != None)
2434	{	2473	{
2435	XFreePixmap (display->display, TermWin.pixmap);	2474	XFreePixmap (disp, pixmap);
2436	TermWin.pixmap = None;	2475	pixmap = None;
2437	}	2476	}
2438	}	2477	}
2439		2478
2440	am_pixmap_trans = 0;	2479	am_pixmap_trans = 0;
2441	}	2480	}
2442	else	2481	else
2443	{	2482	{
2444	if (TermWin.pixmap != None)	2483	if (pixmap != None)
2445	XFreePixmap (display->display, TermWin.pixmap);	2484	XFreePixmap (disp, pixmap);
2446		2485
2447	#if TINTING	2486	#if TINTING
2448	if (ISSET_PIXCOLOR (Color_tint))	2487	if (ISSET_PIXCOLOR (Color_tint))
2449	{	2488	{
2450	unsigned short rm, gm, bm;	2489	unsigned short rm, gm, bm;
…		…
2454		2493
2455	ShadeXImage (display, image, shade, rm, gm, bm);	2494	ShadeXImage (display, image, shade, rm, gm, bm);
2456	}	2495	}
2457	#endif	2496	#endif
2458		2497
2459	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2498	pixmap = XCreatePixmap (disp, vt,
2460	szHint.width, szHint.height, image->depth);	2499	szHint.width, szHint.height, image->depth);
2461	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2500	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2462	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2501	XPutImage (disp, pixmap, gc, image, 0, 0,
2463	nx, ny, image->width, image->height);	2502	nx, ny, image->width, image->height);
2464	XFreeGC (display->display, gc);	2503	XFreeGC (disp, gc);
2465	XDestroyImage (image);	2504	XDestroyImage (image);
2466	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2505	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2467	XClearWindow (display->display, TermWin.parent[0]);	2506	XClearWindow (disp, parent[0]);
2468		2507
2469	if (!am_transparent || !am_pixmap_trans)	2508	if (!am_transparent || !am_pixmap_trans)
2470	pchanged = 1;	2509	pchanged = 1;
2471		2510
2472	am_transparent = am_pixmap_trans = 1;	2511	am_transparent = am_pixmap_trans = 1;
2473	}	2512	}
2474	}	2513	}
2475		2514
2476	if (!am_pixmap_trans)	2515	if (am_pixmap_trans)
		2516	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
		2517	else
2477	{	2518	{
2478	unsigned int n;	2519	unsigned int n;
2479	/*	2520	/*
2480	* InheritPixmap transparency	2521	* InheritPixmap transparency
2481	*/	2522	*/
2482	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2523	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2483	{	2524	{
2484	oldp = TermWin.parent[i];	2525	oldp = parent[i];
2485	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2526	XQueryTree (disp, parent[i - 1], &root,
2486	&TermWin.parent[i], &list, &n);	2527	&parent[i], &list, &n);
2487	XFree (list);	2528	XFree (list);
2488		2529
2489	if (TermWin.parent[i] == display->root)	2530	if (parent[i] == display->root)
2490	{	2531	{
2491	if (oldp != None)	2532	if (oldp != None)
2492	pchanged = 1;	2533	pchanged = 1;
2493		2534
2494	break;	2535	break;
2495	}	2536	}
2496		2537
2497	if (oldp != TermWin.parent[i])	2538	if (oldp != parent[i])
2498	pchanged = 1;	2539	pchanged = 1;
2499	}	2540	}
2500		2541
2501	n = 0;	2542	n = 0;
2502		2543
2503	if (pchanged)	2544	if (pchanged)
2504	{	2545	{
2505	for (; n < (unsigned int)i; n++)	2546	for (; n < (unsigned int)i; n++)
2506	{	2547	{
2507	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2548	XGetWindowAttributes (disp, parent[n], &wattr);
2508	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2549	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2509	{	2550	{
2510	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2551	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2511	break;	2552	break;
2512	}	2553	}
2513	}	2554	}
2514	}	2555	}
2515		2556
2516	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2557	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2517	{	2558	{
2518	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2559	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2519	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2560	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2520	am_transparent = 0;	2561	am_transparent = 0;
2521	/* XXX: also turn off Opt_transparent? */	2562	/* XXX: also turn off Opt_transparent? */
2522	}	2563	}
2523	else	2564	else
2524	{	2565	{
…		…
2527	* needed for fvwm2.2.2 (and before?) */	2568	* needed for fvwm2.2.2 (and before?) */
2528	sleep (1);	2569	sleep (1);
2529	#endif	2570	#endif
2530	for (n = 0; n < (unsigned int)i; n++)	2571	for (n = 0; n < (unsigned int)i; n++)
2531	{	2572	{
2532	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2573	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2533	XClearWindow (display->display, TermWin.parent[n]);	2574	XClearWindow (disp, parent[n]);
2534	}	2575	}
2535		2576
2536	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2577	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2537	am_transparent = 1;	2578	am_transparent = 1;
2538	}	2579	}
2539		2580
2540	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2581	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2541	TermWin.parent[i] = None;	2582	parent[i] = None;
2542	}	2583	}
2543		2584
2544	if (scrollBar.win)	2585	if (scrollBar.win)
2545	{	2586	{
2546	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2587	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2547	scrollBar.setIdle ();	2588	scrollBar.setIdle ();
2548	scrollbar_show (0);	2589	scrollbar_show (0);
		2590	}
		2591
		2592	if (am_transparent)
		2593	{
		2594	want_refresh = want_full_refresh = 1;
		2595	if (am_pixmap_trans)
		2596	flush ();
2549	}	2597	}
2550		2598
2551	return pchanged;	2599	return pchanged;
2552	}	2600	}
2553	#endif	2601	#endif
…		…
2582	// some window managers resize the window early, and these programs	2630	// some window managers resize the window early, and these programs
2583	// then sometimes get the size wrong.	2631	// then sometimes get the size wrong.
2584	// unfortunately other programs are even more buggy and dislike	2632	// unfortunately other programs are even more buggy and dislike
2585	// being sent SIGWINCH, so only do it when we were in fact being	2633	// being sent SIGWINCH, so only do it when we were in fact being
2586	// resized.	2634	// resized.
2587	if (seen_resize)	2635	if (seen_resize && cmd_pid)
2588	kill (-cmd_pid, SIGWINCH);	2636	kill (-cmd_pid, SIGWINCH);
2589	}	2637	}
2590		2638
2591	/* Read a text string from the input buffer */	2639	/* Read a text string from the input buffer */
2592	unicode_t buf[UBUFSIZ];	2640	unicode_t buf[UBUFSIZ];
2593	bool refreshnow = false;	2641	bool refreshnow = false;
2594	int nlines = 0;	2642	int nlines = 0;
2595	unicode_t *str = buf;	2643	unicode_t *str = buf;
		2644	unicode_t *eol = str + min (ncol, UBUFSIZ);
2596		2645
2597	for (;;)	2646	for (;;)
2598	{	2647	{
2599	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2648	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600	break;	2649	break;
2601		2650
2602	*str++ = ch;	2651	*str++ = ch;
2603		2652
2604	if (ch == C0_LF)	2653	if (ch == C0_LF || str >= eol)
2605	{	2654	{
		2655	if (ch == C0_LF)
2606	nlines++;	2656	nlines++;
		2657
2607	refresh_count++;	2658	refresh_count++;
2608		2659
2609	if (!(options & Opt_jumpScroll)	2660	if (!(options & Opt_jumpScroll)
2610	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2661	|| (refresh_count >= refresh_limit * (nrow - 1)))
2611	{	2662	{
2612	refreshnow = true;	2663	refreshnow = true;
2613	ch = NOCHAR;	2664	ch = NOCHAR;
2614	break;	2665	break;
2615	}	2666	}
2616		2667
2617	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2668	// scr_add_lines only works for nlines <= nrow - 1.
2618	if (nlines >= TermWin.nrow - 1)	2669	if (nlines >= nrow - 1)
2619	{	2670	{
2620	scr_add_lines (buf, nlines, str - buf);	2671	scr_add_lines (buf, nlines, str - buf);
2621	nlines = 0;	2672	nlines = 0;
2622	str = buf;	2673	str = buf;
		2674	eol = str + min (ncol, UBUFSIZ);
2623	}	2675	}
2624	}
2625		2676
2626	if (str >= buf + UBUFSIZ)	2677	if (str >= eol)
2627	{	2678	{
		2679	if (eol >= buf + UBUFSIZ)
		2680	{
2628	ch = NOCHAR;	2681	ch = NOCHAR;
2629	break;	2682	break;
		2683	}
		2684	else
		2685	eol = min (eol + ncol, buf + UBUFSIZ);
		2686	}
		2687
2630	}	2688	}
2631		2689
2632	seq_begin = cmdbuf_ptr;	2690	seq_begin = cmdbuf_ptr;
2633	ch = next_char ();	2691	ch = next_char ();
2634	}	2692	}
…		…
2705	if (len == (size_t)-1)	2763	if (len == (size_t)-1)
2706	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2764	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707		2765
2708	// assume wchar == unicode	2766	// assume wchar == unicode
2709	cmdbuf_ptr += len;	2767	cmdbuf_ptr += len;
2710	return wc;	2768	return wc & UNICODE_MASK;
2711	}	2769	}
2712		2770
2713	return NOCHAR;	2771	return NOCHAR;
2714	}	2772	}
2715		2773
…		…
3178	{	3236	{
3179	switch (priv)	3237	switch (priv)
3180	{	3238	{
3181	case '>':	3239	case '>':
3182	if (ch == CSI_DA) /* secondary device attributes */	3240	if (ch == CSI_DA) /* secondary device attributes */
3183	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3241	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3184	break;	3242	break;
3185	case '?':	3243	case '?':
3186	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3244	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3187	process_terminal_mode (ch, priv, nargs, arg);	3245	process_terminal_mode (ch, priv, nargs, arg);
3188	break;	3246	break;
…		…
3293		3351
3294	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3352	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3295	arg[0] = -arg[0];	3353	arg[0] = -arg[0];
3296	/* FALLTHROUGH */	3354	/* FALLTHROUGH */
3297	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3355	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3298	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3356	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3299	break;	3357	break;
3300		3358
3301	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3359	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3302	tt_write ((const unsigned char *)VT100_ANS,	3360	tt_write ((const unsigned char *)VT100_ANS,
3303	(unsigned int) (sizeof (VT100_ANS) - 1));	3361	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3417	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3475	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418	{	3476	{
3419	int x, y;	3477	int x, y;
3420	XWindowAttributes wattr;	3478	XWindowAttributes wattr;
3421	Window wdummy;	3479	Window wdummy;
		3480	dDisp;
3422		3481
3423	if (nargs == 0)	3482	if (nargs == 0)
3424	return;	3483	return;
3425		3484
3426	switch (args[0])	3485	switch (args[0])
3427	{	3486	{
3428	/*	3487	/*
3429	* commands	3488	* commands
3430	*/	3489	*/
3431	case 1: /* deiconify window */	3490	case 1: /* deiconify window */
3432	XMapWindow (display->display, TermWin.parent[0]);	3491	XMapWindow (disp, parent[0]);
3433	break;	3492	break;
3434	case 2: /* iconify window */	3493	case 2: /* iconify window */
3435	XIconifyWindow (display->display, TermWin.parent[0],	3494	XIconifyWindow (disp, parent[0], display->screen);
3436	DefaultScreen (display->display));
3437	break;	3495	break;
3438	case 3: /* set position (pixels) */	3496	case 3: /* set position (pixels) */
3439	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3497	XMoveWindow (disp, parent[0], args[1], args[2]);
3440	break;	3498	break;
3441	case 4: /* set size (pixels) */	3499	case 4: /* set size (pixels) */
3442	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3500	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443	break;	3501	break;
3444	case 5: /* raise window */	3502	case 5: /* raise window */
3445	XRaiseWindow (display->display, TermWin.parent[0]);	3503	XRaiseWindow (disp, parent[0]);
3446	break;	3504	break;
3447	case 6: /* lower window */	3505	case 6: /* lower window */
3448	XLowerWindow (display->display, TermWin.parent[0]);	3506	XLowerWindow (disp, parent[0]);
3449	break;	3507	break;
3450	case 7: /* refresh window */	3508	case 7: /* refresh window */
3451	scr_touch (true);	3509	scr_touch (true);
3452	break;	3510	break;
3453	case 8: /* set size (chars) */	3511	case 8: /* set size (chars) */
3454	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3512	set_widthheight ((unsigned int) (args[2] * fwidth),
3455	(unsigned int) (args[1] * TermWin.fheight));	3513	(unsigned int) (args[1] * fheight));
3456	break;	3514	break;
3457		3515
3458	//case 9: NYI, TODO, restore maximized window or maximize window	3516	//case 9: NYI, TODO, restore maximized window or maximize window
3459	default:	3517	default:
3460	if (args[0] >= 24) /* set height (chars) */	3518	if (args[0] >= 24) /* set height (chars) */
3461	set_widthheight ((unsigned int)TermWin.width,	3519	set_widthheight ((unsigned int)width,
3462	(unsigned int) (args[1] * TermWin.fheight));	3520	(unsigned int) (args[1] * fheight));
3463	break;	3521	break;
3464		3522
3465		3523
3466	/*	3524	/*
3467	* reports - some output format copied from XTerm	3525	* reports - some output format copied from XTerm
3468	*/	3526	*/
3469	case 11: /* report window state */	3527	case 11: /* report window state */
3470	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3528	XGetWindowAttributes (disp, parent[0], &wattr);
3471	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3529	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472	break;	3530	break;
3473	case 13: /* report window position */	3531	case 13: /* report window position */
3474	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3532	XGetWindowAttributes (disp, parent[0], &wattr);
3475	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3533	XTranslateCoordinates (disp, parent[0], wattr.root,
3476	-wattr.border_width, -wattr.border_width,	3534	-wattr.border_width, -wattr.border_width,
3477	&x, &y, &wdummy);	3535	&x, &y, &wdummy);
3478	tt_printf ("\033[3;%d;%dt", x, y);	3536	tt_printf ("\033[3;%d;%dt", x, y);
3479	break;	3537	break;
3480	case 14: /* report window size (pixels) */	3538	case 14: /* report window size (pixels) */
3481	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3539	XGetWindowAttributes (disp, parent[0], &wattr);
3482	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3540	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483	break;	3541	break;
3484	case 18: /* report text area size (chars) */	3542	case 18: /* report text area size (chars) */
3485	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3543	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3486	break;	3544	break;
3487	case 19: /* report window size (chars) */	3545	case 19: /* report window size (chars) */
3488	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3546	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3489	break;	3547	break;
3490	case 20: /* report icon label */	3548	case 20: /* report icon label */
3491	{	3549	{
3492	char *s;	3550	char *s;
3493	XGetIconName (display->display, TermWin.parent[0], &s);	3551	XGetIconName (disp, parent[0], &s);
3494	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3552	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495	XFree (s);	3553	XFree (s);
3496	}	3554	}
3497	break;	3555	break;
3498	case 21: /* report window title */	3556	case 21: /* report window title */
3499	{	3557	{
3500	char *s;	3558	char *s;
3501	XFetchName (display->display, TermWin.parent[0], &s);	3559	XFetchName (disp, parent[0], &s);
3502	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3560	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503	XFree (s);	3561	XFree (s);
3504	}	3562	}
3505	break;	3563	break;
3506	}	3564	}
…		…
3513	* ends_how is terminator used. returned input must be free()'d	3571	* ends_how is terminator used. returned input must be free()'d
3514	*/	3572	*/
3515	unsigned char *	3573	unsigned char *
3516	rxvt_term::get_to_st (unicode_t &ends_how)	3574	rxvt_term::get_to_st (unicode_t &ends_how)
3517	{	3575	{
3518	unicode_t seen_esc = 0, ch;	3576	unicode_t ch;
		3577	bool seen_esc = false;
3519	unsigned int n = 0;	3578	unsigned int n = 0;
3520	unsigned char *s;
3521	unsigned char string[STRING_MAX];	3579	wchar_t string[STRING_MAX];
3522		3580
3523	while ((ch = cmd_getc ()) != NOCHAR)	3581	while ((ch = cmd_getc ()) != NOCHAR)
3524	{	3582	{
3525	if (seen_esc)	3583	if (seen_esc)
3526	{	3584	{
…		…
3529	else	3587	else
3530	return NULL;	3588	return NULL;
3531	}	3589	}
3532	else if (ch == C0_ESC)	3590	else if (ch == C0_ESC)
3533	{	3591	{
3534	seen_esc = 1;	3592	seen_esc = true;
3535	continue;	3593	continue;
3536	}	3594	}
3537	else if (ch == C0_BEL || ch == CHAR_ST)	3595	else if (ch == C0_BEL || ch == CHAR_ST)
3538	break;	3596	break;
3539	else if (ch < 0x20)	3597	else if (ch < 0x20)
3540	return NULL; /* other control character - exit */	3598	return NULL; /* other control character - exit */
3541		3599
3542	seen_esc = 0;	3600	seen_esc = false;
3543		3601
3544	if (n >= sizeof (string) - 1)	3602	if (n >= STRING_MAX - 1)
3545	// stop at some sane length	3603	// stop at some sane length
3546	return NULL;	3604	return NULL;
3547		3605
3548	if (ch == C0_SYN)	3606	if (ch == C0_SYN)
3549	string[n++] = cmd_get8 ();	3607	string[n++] = cmd_get8 ();
…		…
3551	string[n++] = ch;	3609	string[n++] = ch;
3552	}	3610	}
3553		3611
3554	string[n++] = '\0';	3612	string[n++] = '\0';
3555		3613
3556	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557	return NULL;
3558
3559	ends_how = (ch == 0x5c ? C0_ESC : ch);	3614	ends_how = (ch == 0x5c ? C0_ESC : ch);
3560	strncpy (s, string, n);	3615
3561	return s;	3616	return (unsigned char *)rxvt_wcstombs (string);
3562	}	3617	}
3563		3618
3564	/*----------------------------------------------------------------------*/	3619	/*----------------------------------------------------------------------*/
3565	/*	3620	/*
3566	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3621	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
…		…
3620	set_window_color (color, str);	3675	set_window_color (color, str);
3621	}	3676	}
3622		3677
3623	/*	3678	/*
3624	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3679	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3625	* 0 = change iconName/title
3626	* 1 = change iconName
3627	* 2 = change title
3628	* 4 = change color
3629	* 10 = change fg color
3630	* 11 = change bg color
3631	* 12 = change text color
3632	* 13 = change mouse foreground color
3633	* 17 = change highlight character colour
3634	* 18 = change bold character color
3635	* 19 = change underlined character color
3636	* 46 = change logfile (not implemented)
3637	* 50 = change font
3638	*
3639	* rxvt extensions:
3640	* 20 = bg pixmap
3641	* 39 = change default fg color
3642	* 49 = change default bg color
3643	* 55 = dump scrollback buffer and all of screen
3644	* 701 = change locale
3645	* 702 = find font
3646	* 703 = menu
3647	*/	3680	*/
3648	void	3681	void
3649	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3682	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3650	{	3683	{
3651	int changed = 0;	3684	int changed = 0;
3652	int color;	3685	int color;
3653	char *buf, *name;	3686	char *buf, *name;
3654	bool query = str[0] == '?' && !str[1];	3687	bool query = str[0] == '?' && !str[1];
3655	int saveop = op;	3688	int saveop = op;
		3689	dDisp;
3656		3690
3657	assert (str != NULL);	3691	assert (str != NULL);
3658	switch (op)	3692	switch (op)
3659	{	3693	{
3660	case XTerm_name:	3694	case XTerm_name:
…		…
3667	set_title (str);	3701	set_title (str);
3668	break;	3702	break;
3669	case XTerm_property:	3703	case XTerm_property:
3670	if (str[0] == '?')	3704	if (str[0] == '?')
3671	{	3705	{
3672	Atom prop = XInternAtom (display->display, str + 1, True);	3706	Atom prop = display->atom (str + 1);
3673	Atom actual_type;	3707	Atom actual_type;
3674	int actual_format;	3708	int actual_format;
3675	unsigned long nitems;	3709	unsigned long nitems;
3676	unsigned long bytes_after;	3710	unsigned long bytes_after;
3677	unsigned char *value = 0;	3711	unsigned char *value = 0;
3678	const char *str = "";	3712	const char *str = "";
3679		3713
3680	if (prop	3714	if (prop
3681	&& XGetWindowProperty (display->display, TermWin.parent[0],	3715	&& XGetWindowProperty (disp, parent[0],
3682	prop, 0, 1<<16, 0, AnyPropertyType,	3716	prop, 0, 1<<16, 0, AnyPropertyType,
3683	&actual_type, &actual_format,	3717	&actual_type, &actual_format,
3684	&nitems, &bytes_after, &value) == Success	3718	&nitems, &bytes_after, &value) == Success
3685	&& actual_type != None	3719	&& actual_type != None
3686	&& actual_format == 8)	3720	&& actual_format == 8)
…		…
3695	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3729	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696		3730
3697	if (eq)	3731	if (eq)
3698	{	3732	{
3699	*eq = 0;	3733	*eq = 0;
3700	XChangeProperty (display->display, TermWin.parent[0],	3734	set_utf8_property (display->atom (str), eq + 1);
3701	display->atom (str), XA_STRING, 8,
3702	PropModeReplace, (unsigned char *)eq + 1,
3703	strlen (eq + 1));
3704	}	3735	}
3705	else	3736	else
3706	XDeleteProperty (display->display, TermWin.parent[0],	3737	XDeleteProperty (disp, parent[0],
3707	display->atom (str));	3738	display->atom (str));
3708	}	3739	}
3709	break;	3740	break;
3710		3741
3711	case XTerm_Color:	3742	case XTerm_Color:
…		…
3752	break;	3783	break;
3753	#ifndef NO_BOLD_UNDERLINE_REVERSE	3784	#ifndef NO_BOLD_UNDERLINE_REVERSE
3754	case XTerm_Color_BD:	3785	case XTerm_Color_BD:
3755	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3786	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756	break;	3787	break;
3757	case XTerm_Color_IT:
3758	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3759	break;
3760	case XTerm_Color_UL:	3788	case XTerm_Color_UL:
3761	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3789	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3762	break;	3790	break;
3763	case XTerm_Color_RV:	3791	case XTerm_Color_RV:
3764	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3792	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3765	break;	3793	break;
		3794	case URxvt_Color_IT:
		3795	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3796	break;
3766	#endif	3797	#endif
3767	#if TRANSPARENT && TINTING	3798	#if TRANSPARENT && TINTING
3768	case XTerm_Color_tint:	3799	case URxvt_Color_tint:
3769	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3800	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3770	check_our_parents ();	3801	check_our_parents ();
3771	if (am_transparent)	3802	if (am_transparent)
3772	want_full_refresh = want_refresh = 1;	3803	want_full_refresh = want_refresh = 1;
3773	break;	3804	break;
3774	#endif	3805	#endif
…		…
3786	{	3817	{
3787	str++;	3818	str++;
3788	#if XPM_BACKGROUND	3819	#if XPM_BACKGROUND
3789	changed += scale_pixmap (str);	3820	changed += scale_pixmap (str);
3790	#endif	3821	#endif
3791
3792	}	3822	}
		3823
3793	if (changed)	3824	if (changed)
3794	{	3825	{
3795	#ifdef XPM_BACKGROUND	3826	#ifdef XPM_BACKGROUND
3796	resize_pixmap ();	3827	resize_pixmap ();
3797	#endif	3828	#endif
…		…
3808		3839
3809	case XTerm_logfile:	3840	case XTerm_logfile:
3810	// TODO, when secure mode?	3841	// TODO, when secure mode?
3811	break;	3842	break;
3812		3843
		3844	#ifdef MENUBAR
		3845	case URxvt_Menu:
		3846	if (options & Opt_insecure)
		3847	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3848	break;
		3849	#endif
		3850	#if 0
		3851	case XTerm_dumpscreen: /* no error notices */
		3852	{
		3853	int fd;
		3854	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3855	{
		3856	scr_dump (fd);
		3857	close (fd);
		3858	}
		3859	}
		3860	break;
		3861	#endif
3813	case XTerm_font:	3862	case XTerm_font:
3814	op = URxvt_font;	3863	op = URxvt_font;
3815	case URxvt_font:	3864	case URxvt_font:
3816	#if ENABLE_STYLES	3865	#if ENABLE_STYLES
3817	case URxvt_boldFont:	3866	case URxvt_boldFont:
3818	case URxvt_italicFont:	3867	case URxvt_italicFont:
3819	case URxvt_boldItalicFont:	3868	case URxvt_boldItalicFont:
3820	#endif	3869	#endif
3821	if (query)	3870	if (query)
3822	tt_printf ("\33]%d;%-.250s%c", saveop,	3871	tt_printf ("\33]%d;%-.250s%c", saveop,
3823	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3872	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3824	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3873	? fontset[op - URxvt_font]->fontdesc : "",
3825	resp);	3874	resp);
3826	else	3875	else
3827	{	3876	{
3828	const char *&res = rs[Rs_font + (op - URxvt_font)];	3877	const char *&res = rs[Rs_font + (op - URxvt_font)];
3829		3878
…		…
3832	set_fonts ();	3881	set_fonts ();
3833	}	3882	}
3834	break;	3883	break;
3835		3884
3836	#if ENABLE_FRILLS	3885	#if ENABLE_FRILLS
3837	case XTerm_locale:	3886	case URxvt_locale:
3838	if (query)	3887	if (query)
3839	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3888	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3840	else	3889	else
3841	{	3890	{
3842	set_locale (str);	3891	set_locale (str);
3843	# ifdef USE_XIM	3892	pty.set_utf8_mode (enc_utf8);
3844	im_cb ();	3893	init_xlocale ();
3845	# endif
3846	}	3894	}
3847	break;	3895	break;
3848	#endif
3849		3896
3850	#ifdef MENUBAR	3897	case URxvt_view_up:
3851	case XTerm_Menu:	3898	case URxvt_view_down:
3852	if (options & Opt_insecure)	3899	int lines = atoi (str);
3853	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3900
3854	break;	3901	if (lines)
3855	#endif	3902	scr_page (op == URxvt_view_up ? UP : DN, lines);
3856	#if 0
3857	case XTerm_dumpscreen: /* no error notices */
3858	{	3903	else
3859	int fd;
3860	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3861	{	3904	{
3862	scr_dump (fd);	3905	scr_erase_savelines ();
3863	close (fd);
3864	}	3906	}
3865	}	3907
3866	break;	3908	break;
3867	#endif	3909	#endif
3868	}	3910	}
3869	}	3911	}
3870	/*----------------------------------------------------------------------*/	3912	/*----------------------------------------------------------------------*/
…		…
4003	*/	4045	*/
4004	PrivMode (1, PrivMode_vt52);	4046	PrivMode (1, PrivMode_vt52);
4005	break;	4047	break;
4006	case 3: /* 80/132 */	4048	case 3: /* 80/132 */
4007	if (priv_modes & PrivMode_132OK)	4049	if (priv_modes & PrivMode_132OK)
4008	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4050	set_widthheight (((state ? 132 : 80) * fwidth), height);
4009	break;	4051	break;
4010	case 4: /* smooth scrolling */	4052	case 4: /* smooth scrolling */
4011	if (state)	4053	if (state)
4012	options &= ~Opt_jumpScroll;	4054	options &= ~Opt_jumpScroll;
4013	else	4055	else
…		…
4285		4327
4286	/* ---------------------------------------------------------------------- */	4328	/* ---------------------------------------------------------------------- */
4287	/* Write data to the pty as typed by the user, pasted with the mouse,	4329	/* Write data to the pty as typed by the user, pasted with the mouse,
4288	* or generated by us in response to a query ESC sequence.	4330	* or generated by us in response to a query ESC sequence.
4289	*/	4331	*/
		4332	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4333
4290	void	4334	void
4291	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4335	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292	{	4336	{
4293	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4337	if (v_buflen == 0)
		4338	{
		4339	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4294		4340
4295	if (len)	4341	if ((unsigned int)written == len)
		4342	return;
		4343
		4344	data += written;
		4345	len -= written;
4296	{	4346	}
		4347
		4348	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4349
		4350	memcpy (v_buffer + v_buflen, data, len);
		4351	v_buflen += len;
		4352
		4353	pty_ev.set (EVENT_READ | EVENT_WRITE);
		4354	}
		4355
		4356	void rxvt_term::pty_write ()
		4357	{
		4358	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4359
		4360	if (written > 0)
		4361	{
		4362	v_buflen -= written;
		4363
4297	if (v_buflen == 0)	4364	if (v_buflen == 0)
4298	{	4365	{
4299	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301	if ((unsigned int)written == len)
4302	return;
4303
4304	data += written;
4305	len -= written;
4306	}
4307
4308
4309	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311	memcpy (v_buffer + v_buflen, data, len);
4312	v_buflen += len;
4313	}
4314
4315	for (;;)
4316	{
4317	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319	if (written > 0)
4320	{
4321	v_buflen -= written;
4322
4323	if (v_buflen == 0)
4324	{
4325	free (v_buffer);	4366	free (v_buffer);
4326	v_buffer = 0;	4367	v_buffer = 0;
4327	v_buflen = 0;	4368	v_buflen = 0;
4328		4369
4329	pty_ev.set (EVENT_READ);	4370	pty_ev.set (EVENT_READ);
4330	return;
4331	}
4332
4333	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}
4335	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4336	// original code just ignores this...
4337	destroy ();
4338	else
4339	{
4340	pty_ev.set (EVENT_READ | EVENT_WRITE);
4341	return;	4371	return;
4342	}	4372	}
		4373
		4374	memmove (v_buffer, v_buffer + written, v_buflen);
4343	}	4375	}
		4376	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4377	// original code just ignores this...
		4378	destroy ();
4344	}	4379	}
4345		4380
4346	/*----------------------- end-of-file (C source) -----------------------*/	4381	/*----------------------- end-of-file (C source) -----------------------*/
4347		4382

Diff Legend

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