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.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC

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

Diff Legend

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