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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.196 by root, Thu Feb 17 12:23:39 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)
…		…
133	{	145	{
134	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
135		147
136	if (t != NOCHAR || !x)	148	if (t != NOCHAR || !x)
137	{	149	{
138	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]);	150	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
		151	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
139	iso14755buf = ISO_14755_54;	152	iso14755buf = ISO_14755_54;
140	break;	153	break;
141	}	154	}
142		155
143	x--;	156	x--;
…		…
146	}	159	}
147	#endif	160	#endif
148		161
149	#if ENABLE_OVERLAY	162	#if ENABLE_OVERLAY
150	void	163	void
151	rxvt_term::iso14755_51 (wchar_t ch)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
152	{	165	{
		166	rxvt_fontset *fs = FONTSET (r);
		167	rxvt_font *f = (*fs)[fs->find_font (ch)];
153	wchar_t *chr, *alloc;	168	wchar_t *chr, *alloc, ch2;
154	int len;	169	int len;
155		170
156	#if ENABLE_COMBINING	171	#if ENABLE_COMBINING
157	if (IS_COMPOSE (ch))	172	if (IS_COMPOSE (ch))
158	{	173	{
…		…
161	rxvt_composite.expand (ch, chr);	176	rxvt_composite.expand (ch, chr);
162	}	177	}
163	else	178	else
164	#endif	179	#endif
165	{	180	{
		181	ch2 = ch;
		182
166	alloc = 0;	183	alloc = 0;
167	chr = &ch;	184	chr = &ch2;
168	len = 1;	185	len = 1;
169	}	186	}
170		187
171	scr_overlay_new (0, -1, 8 + 5, len);	188	int width = strlen (f->name);
		189
		190	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
		191
		192	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172		193
173	for (int y = 0; y < len; y++)	194	for (int y = 0; y < len; y++)
174	{	195	{
175	char buf[9];	196	char buf[9];
176		197
…		…
181	scr_overlay_set (9, y, '=');	202	scr_overlay_set (9, y, '=');
182	#if !UNICODE3	203	#if !UNICODE3
183	if (ch >= 0x10000)	204	if (ch >= 0x10000)
184	ch = 0xfffd;	205	ch = 0xfffd;
185	#endif	206	#endif
186	scr_overlay_set (11, y, ch);	207	scr_overlay_set (11, y, ch, r);
187	scr_overlay_set (12, y, NOCHAR);	208	scr_overlay_set (12, y, NOCHAR, r);
188	}	209	}
		210
		211	scr_overlay_set (0, len, f->name);
189		212
190	#if ENABLE_COMBINING	213	#if ENABLE_COMBINING
191	if (alloc)	214	if (alloc)
192	delete [] alloc;	215	delete [] alloc;
193	#endif	216	#endif
…		…
261	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	284	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262	* escape sequence to toggle the Keypad.	285	* escape sequence to toggle the Keypad.
263	*	286	*
264	* Always permit `shift' to override the current setting	287	* Always permit `shift' to override the current setting
265	*/	288	*/
266	shft = (ev.state & ShiftMask);	289	shft = ev.state & ShiftMask;
267	ctrl = (ev.state & ControlMask);	290	ctrl = ev.state & ControlMask;
268	meta = (ev.state & ModMetaMask);	291	meta = ev.state & ModMetaMask;
269		292
270	if (numlock_state || (ev.state & ModNumLockMask))	293	if (numlock_state || (ev.state & ModNumLockMask))
271	{	294	{
272	numlock_state = (ev.state & ModNumLockMask);	295	numlock_state = (ev.state & ModNumLockMask);
273	PrivMode ((!numlock_state), PrivMode_aplKP);	296	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
332	valid_keysym = keysym != NoSymbol;	355	valid_keysym = keysym != NoSymbol;
333	}	356	}
334		357
335	if (valid_keysym)	358	if (valid_keysym)
336	{	359	{
		360	#ifdef KEYSYM_RESOURCE
		361	if (keyboard->dispatch (this, keysym, ev.state))
		362	return;
		363	#endif
		364
337	if (TermWin.saveLines)	365	if (TermWin.saveLines)
338	{	366	{
339	#ifdef UNSHIFTED_SCROLLKEYS	367	#ifdef UNSHIFTED_SCROLLKEYS
340	if (!ctrl && !meta)	368	if (!ctrl && !meta)
341	#else	369	#else
…		…
406	{	434	{
407	/* normal XTerm key bindings */	435	/* normal XTerm key bindings */
408	case XK_Insert: /* Shift+Insert = paste mouse selection */	436	case XK_Insert: /* Shift+Insert = paste mouse selection */
409	selection_request (ev.time, 0, 0);	437	selection_request (ev.time, 0, 0);
410	return;	438	return;
411	#if TODO // TODO	439	#if TODO
412	/* rxvt extras */	440	/* rxvt extras */
413	case XK_KP_Add: /* Shift+KP_Add = bigger font */	441	case XK_KP_Add: /* Shift+KP_Add = bigger font */
414	change_font (FONT_UP);	442	change_font (FONT_UP);
415	return;	443	return;
416	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	444	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
475	}	503	}
476	#endif	504	#endif
477		505
478	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	506	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479	{	507	{
480	#ifdef KEYSYM_RESOURCE
481	if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482	{
483	unsigned int l;
484	const unsigned char *kbuf0;
485
486	kbuf0 = (Keysym_map[keysym & 0xFF]);
487	l = (unsigned int)*kbuf0++;
488
489	/* escape prefix */
490	if (meta
491	# ifdef META8_OPTION
492	&& meta_char == C0_ESC
493	# endif
494	)
495	{
496	const unsigned char ch = C0_ESC;
497	tt_write (&ch, 1);
498	}
499
500	tt_write (kbuf0, l);
501	return;
502	}
503	else
504	#endif
505	{	508	{
506	newlen = 1;	509	newlen = 1;
507	switch (keysym)	510	switch (keysym)
508	{	511	{
509	#ifndef NO_BACKSPACE_KEY	512	#ifndef NO_BACKSPACE_KEY
…		…
517	else	520	else
518	strcpy (kbuf, key_backspace);	521	strcpy (kbuf, key_backspace);
519	break;	522	break;
520	#endif	523	#endif
521	#ifndef NO_DELETE_KEY	524	#ifndef NO_DELETE_KEY
		525	# ifdef XK_KP_Prior
		526	case XK_KP_Delete:
		527	/* allow shift to override */
		528	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		529	{
		530	strcpy (kbuf, "\033On");
		531	break;
		532	}
		533	/* FALLTHROUGH */
		534	# endif
522	case XK_Delete:	535	case XK_Delete:
523	strcpy (kbuf, key_delete);	536	strcpy (kbuf, key_delete);
524	break;	537	break;
525	#endif	538	#endif
526	case XK_Tab:	539	case XK_Tab:
…		…
629	#ifdef XK_KP_Begin	642	#ifdef XK_KP_Begin
630	case XK_KP_Begin:	643	case XK_KP_Begin:
631	strcpy (kbuf, "\033Ou");	644	strcpy (kbuf, "\033Ou");
632	break;	645	break;
633		646
634	case XK_KP_Insert:
635	strcpy (kbuf, "\033Op");
636	break;
637
638	case XK_KP_Delete:
639	strcpy (kbuf, "\033On");
640	break;
641	#endif	647	#endif
642	case XK_KP_F1: /* "\033OP" */	648	case XK_KP_F1: /* "\033OP" */
643	case XK_KP_F2: /* "\033OQ" */	649	case XK_KP_F2: /* "\033OQ" */
644	case XK_KP_F3: /* "\033OR" */	650	case XK_KP_F3: /* "\033OR" */
645	case XK_KP_F4: /* "\033OS" */	651	case XK_KP_F4: /* "\033OS" */
…		…
677	break;	683	break;
678		684
679	case XK_Find:	685	case XK_Find:
680	strcpy (kbuf, "\033[1~");	686	strcpy (kbuf, "\033[1~");
681	break;	687	break;
		688
		689	#ifdef XK_KP_End
		690	case XK_KP_Insert:
		691	/* allow shift to override */
		692	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		693	{
		694	strcpy (kbuf, "\033Op");
		695	break;
		696	}
		697	/* FALLTHROUGH */
		698	#endif
682	case XK_Insert:	699	case XK_Insert:
683	strcpy (kbuf, "\033[2~");	700	strcpy (kbuf, "\033[2~");
684	break;	701	break;
685	#ifdef DXK_Remove /* support for DEC remove like key */	702	#ifdef DXK_Remove /* support for DEC remove like key */
686	case DXK_Remove:	703	case DXK_Remove:
…		…
776	#undef FKEY	793	#undef FKEY
777	default:	794	default:
778	newlen = 0;	795	newlen = 0;
779	break;	796	break;
780	}	797	}
		798
781	if (newlen)	799	if (newlen)
782	len = strlen (kbuf);	800	len = strlen (kbuf);
783	}	801	}
784		802
785	/*	803	/*
…		…
793	}	811	}
794	else if (ctrl && keysym == XK_minus)	812	else if (ctrl && keysym == XK_minus)
795	{	813	{
796	len = 1;	814	len = 1;
797	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	815	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
		816	}
		817	else if (keysym == XK_ISO_Left_Tab)
		818	{
		819	strcpy (kbuf, "\033[Z");
		820	len = 3;
798	}	821	}
799	else	822	else
800	{	823	{
801	#ifdef META8_OPTION	824	#ifdef META8_OPTION
802	/* set 8-bit on */	825	/* set 8-bit on */
…		…
861	#endif /* DEBUG_CMD */	884	#endif /* DEBUG_CMD */
862	tt_write (kbuf, (unsigned int)len);	885	tt_write (kbuf, (unsigned int)len);
863	}	886	}
864	/*}}} */	887	/*}}} */
865		888
866	#if (MENUBAR_MAX)	889	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
867	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	890	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868	/* attempt to `write' count to the input buffer */	891	/* attempt to `write' count to the input buffer */
869	unsigned int	892	unsigned int
870	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	893	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
871	{	894	{
…		…
894		917
895	cmd_parse ();	918	cmd_parse ();
896		919
897	return 0;	920	return 0;
898	}	921	}
899	#endif /* MENUBAR_MAX */	922	#endif
900		923
901	void	924	void
902	rxvt_term::flush ()	925	rxvt_term::flush ()
903	{	926	{
		927	flush_ev.stop ();
		928
904	#ifdef TRANSPARENT	929	#ifdef TRANSPARENT
905	if (want_full_refresh)	930	if (want_full_refresh)
906	{	931	{
907	want_full_refresh = 0;	932	want_full_refresh = 0;
908	scr_clear ();	933	scr_clear ();
…		…
918	IMSendSpot ();	943	IMSendSpot ();
919	#endif	944	#endif
920	}	945	}
921		946
922	display->flush ();	947	display->flush ();
923
924	flush_ev.stop ();
925	}	948	}
926		949
927	void	950	void
928	rxvt_term::check_cb (check_watcher &w)	951	rxvt_term::check_cb (check_watcher &w)
929	{	952	{
…		…
1005	{	1028	{
1006	if (mouse_slip_wheel_speed == 0	1029	if (mouse_slip_wheel_speed == 0
1007	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1030	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008	: scr_page (UP, mouse_slip_wheel_speed))	1031	: scr_page (UP, mouse_slip_wheel_speed))
1009	{	1032	{
		1033	if (TermWin.view_start == TermWin.nscrolled ||
		1034	TermWin.view_start == 0)
		1035	mouse_slip_wheel_speed = 0;
		1036
1010	refresh_type |= SMOOTH_REFRESH;	1037	refresh_type |= SMOOTH_REFRESH;
1011	want_refresh = 1;	1038	want_refresh = 1;
1012	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1039	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013	}	1040	}
1014	}	1041	}
…		…
1046	rxvt_term::pty_cb (io_watcher &w, short revents)	1073	rxvt_term::pty_cb (io_watcher &w, short revents)
1047	{	1074	{
1048	SET_R (this);	1075	SET_R (this);
1049	SET_LOCALE (locale);	1076	SET_LOCALE (locale);
1050		1077
1051	if (revents & EVENT_WRITE)
1052	tt_write (0, 0);
1053	else if (revents & EVENT_READ)	1078	if (revents & EVENT_READ)
1054	// loop, but don't allow a single term to monopolize us	1079	// loop, but don't allow a single term to monopolize us
1055	while (pty_fill ())	1080	while (pty_fill ())
1056	if (cmd_parse ())	1081	if (cmd_parse ())
1057	break;	1082	break;
		1083
		1084	if (revents & EVENT_WRITE)
		1085	pty_write ();
1058	}	1086	}
1059		1087
1060	void	1088	void
1061	rxvt_term::pointer_unblank ()	1089	rxvt_term::pointer_unblank ()
1062	{	1090	{
…		…
1076	rxvt_term::pointer_blank ()	1104	rxvt_term::pointer_blank ()
1077	{	1105	{
1078	if (! (options & Opt_pointerBlank))	1106	if (! (options & Opt_pointerBlank))
1079	return;	1107	return;
1080		1108
1081	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1109	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1082	XFlush (display->display);	1110	XFlush (display->display);
1083		1111
1084	hidden_pointer = 1;	1112	hidden_pointer = 1;
1085	}	1113	}
1086		1114
…		…
1137	+ ((MEvent.state & ModMetaMask) ? 8 : 0)	1165	+ ((MEvent.state & ModMetaMask) ? 8 : 0)
1138	+ ((MEvent.state & ControlMask) ? 16 : 0);	1166	+ ((MEvent.state & ControlMask) ? 16 : 0);
1139	#ifdef MOUSE_REPORT_DOUBLECLICK	1167	#ifdef MOUSE_REPORT_DOUBLECLICK
1140	key_state += ((MEvent.clicks > 1) ? 32 : 0);	1168	key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141	#endif	1169	#endif
1142
1143	}	1170	}
1144		1171
1145	#ifdef DEBUG_MOUSEREPORT	1172	#if DEBUG_MOUSEREPORT
1146	fprintf (stderr, "Mouse [");	1173	fprintf (stderr, "Mouse [");
1147	if (key_state & 16)	1174	if (key_state & 16)
1148	fputc ('C', stderr);	1175	fputc ('C', stderr);
1149	if (key_state & 4)	1176	if (key_state & 4)
1150	fputc ('S', stderr);	1177	fputc ('S', stderr);
…		…
1154	fputc ('2', stderr);	1181	fputc ('2', stderr);
1155	fprintf (stderr, "]: <%d>, %d/%d\n",	1182	fprintf (stderr, "]: <%d>, %d/%d\n",
1156	button_number,	1183	button_number,
1157	x + 1,	1184	x + 1,
1158	y + 1);	1185	y + 1);
1159	#else	1186	#endif
		1187
1160	tt_printf ("\033[M%c%c%c",	1188	tt_printf ("\033[M%c%c%c",
1161	(32 + button_number + key_state),	1189	(32 + button_number + key_state),
1162	(32 + x + 1),	1190	(32 + x + 1),
1163	(32 + y + 1));	1191	(32 + y + 1));
1164	#endif
1165	}	1192	}
1166		1193
1167	#ifdef USING_W11LIB	1194	#ifdef USING_W11LIB
1168	void	1195	void
1169	rxvt_W11_process_x_event (XEvent *ev)	1196	rxvt_W11_process_x_event (XEvent *ev)
…		…
1176		1203
1177	/*{{{ process an X event */	1204	/*{{{ process an X event */
1178	void	1205	void
1179	rxvt_term::x_cb (XEvent &ev)	1206	rxvt_term::x_cb (XEvent &ev)
1180	{	1207	{
		1208	dDisp;
		1209
1181	SET_R (this);	1210	SET_R (this);
1182	SET_LOCALE (locale);	1211	SET_LOCALE (locale);
1183		1212
1184	#if defined(CURSOR_BLINK)	1213	#if defined(CURSOR_BLINK)
1185	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1214	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1206	if (ev.type == KeyPress && hidden_pointer == 0)	1235	if (ev.type == KeyPress && hidden_pointer == 0)
1207	pointer_blank ();	1236	pointer_blank ();
1208	}	1237	}
1209	#endif	1238	#endif
1210		1239
1211	#ifdef USE_XIM
1212	if (XFilterEvent (&ev, None))
1213	return;
1214	#endif
1215
1216	Window unused_root, unused_child;	1240	Window unused_root, unused_child;
1217	int unused_root_x, unused_root_y;	1241	int unused_root_x, unused_root_y;
1218	unsigned int unused_mask;	1242	unsigned int unused_mask;
1219		1243
1220	switch (ev.type)	1244	switch (ev.type)
1221	{	1245	{
1222	case KeyPress:	1246	case KeyPress:
1223	#if ISO_14755	1247	#if ISO_14755
…		…
1227		1251
1228	break;	1252	break;
1229		1253
1230	case KeyRelease:	1254	case KeyRelease:
1231	{	1255	{
1232	#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)	1256	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1233	KeySym ks;	1257	KeySym ks;
1234		1258
1235	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1259	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236	#endif	1260	#endif
1237		1261
…		…
1321	Atom ActualType;	1345	Atom ActualType;
1322	int ActualFormat;	1346	int ActualFormat;
1323	unsigned char *data;	1347	unsigned char *data;
1324	unsigned long Size, RemainingBytes;	1348	unsigned long Size, RemainingBytes;
1325		1349
1326	XGetWindowProperty (display->display, display->root,	1350	XGetWindowProperty (disp, display->root,
1327	xa[XA_DNDSELECTION],	1351	xa[XA_DNDSELECTION],
1328	0L, 1000000L,	1352	0L, 1000000L,
1329	False, AnyPropertyType,	1353	False, AnyPropertyType,
1330	&ActualType, &ActualFormat,	1354	&ActualType, &ActualFormat,
1331	&Size, &RemainingBytes,	1355	&Size, &RemainingBytes,
1332	&data);	1356	&data);
1333	XChangeProperty (display->display, display->root,	1357	set_string_property (XA_CUT_BUFFER0, data);
1334	XA_CUT_BUFFER0, XA_STRING,
1335	8, PropModeReplace,
1336	data, strlen (data));
1337	XFree (data);	1358	XFree (data);
1338	selection_paste (display->root, XA_CUT_BUFFER0, True);	1359	selection_paste (display->root, XA_CUT_BUFFER0, true);
1339	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1360	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340	}	1361	}
1341	#endif /* OFFIX_DND */	1362	#endif /* OFFIX_DND */
1342	break;	1363	break;
1343		1364
1344	case MappingNotify:	1365	case MappingNotify:
…		…
1388	#endif	1409	#endif
1389	#ifdef OFF_FOCUS_FADING	1410	#ifdef OFF_FOCUS_FADING
1390	if (rs[Rs_fade])	1411	if (rs[Rs_fade])
1391	{	1412	{
1392	pix_colors = pix_colors_focused;	1413	pix_colors = pix_colors_focused;
1393	set_colorfgbg ();
1394	scr_clear ();	1414	scr_recolour ();
1395	scr_touch (true);
1396	}	1415	}
1397	#endif	1416	#endif
1398		1417
1399	}	1418	}
1400	break;	1419	break;
…		…
1402	case FocusOut:	1421	case FocusOut:
1403	if (TermWin.focus)	1422	if (TermWin.focus)
1404	{	1423	{
1405	TermWin.focus = 0;	1424	TermWin.focus = 0;
1406	want_refresh = 1;	1425	want_refresh = 1;
		1426
		1427	#if ENABLE_FRILLS || ISO_14755
		1428	iso14755buf = 0;
		1429	#endif
		1430	#if ENABLE_OVERLAY
		1431	scr_overlay_off ();
		1432	#endif
1407	#ifdef USE_XIM	1433	#ifdef USE_XIM
1408	if (Input_Context != NULL)	1434	if (Input_Context != NULL)
1409	XUnsetICFocus (Input_Context);	1435	XUnsetICFocus (Input_Context);
1410	#endif	1436	#endif
1411	#ifdef CURSOR_BLINK	1437	#ifdef CURSOR_BLINK
…		…
1415	#endif	1441	#endif
1416	#ifdef OFF_FOCUS_FADING	1442	#ifdef OFF_FOCUS_FADING
1417	if (rs[Rs_fade])	1443	if (rs[Rs_fade])
1418	{	1444	{
1419	pix_colors = pix_colors_unfocused;	1445	pix_colors = pix_colors_unfocused;
1420	set_colorfgbg ();
1421	scr_clear ();	1446	scr_recolour ();
1422	scr_touch (true);
1423	}	1447	}
1424	#endif	1448	#endif
1425
1426	}	1449	}
1427	break;	1450	break;
1428		1451
1429	case ConfigureNotify:	1452	case ConfigureNotify:
1430	if (ev.xconfigure.window == TermWin.parent[0])	1453	if (ev.xconfigure.window == TermWin.parent[0])
…		…
1435	{ /* Wrap lots of configures into one */	1458	{ /* Wrap lots of configures into one */
1436	width = ev.xconfigure.width;	1459	width = ev.xconfigure.width;
1437	height = ev.xconfigure.height;	1460	height = ev.xconfigure.height;
1438	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1461	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439	}	1462	}
1440	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1463	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1441		1464
1442	if (szHint.width != width || szHint.height != height)	1465	if (szHint.width != width || szHint.height != height)
		1466	{
		1467	seen_resize = 1;
1443	resize_all_windows (width, height, 1);	1468	resize_all_windows (width, height, 1);
		1469	}
1444		1470
1445	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1471	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446	if (options & Opt_transparent)	1472	if (options & Opt_transparent)
1447	{
1448	check_our_parents ();	1473	check_our_parents ();
1449	if (am_transparent)
1450	want_refresh = want_full_refresh = 1;
1451	}
1452	#endif	1474	#endif
1453	}	1475	}
1454	break;	1476	break;
1455		1477
1456	case PropertyNotify:	1478	case PropertyNotify:
…		…
1464	selection_clear ();	1486	selection_clear ();
1465	break;	1487	break;
1466		1488
1467	case SelectionNotify:	1489	case SelectionNotify:
1468	if (selection_wait == Sel_normal)	1490	if (selection_wait == Sel_normal)
1469	selection_paste (ev.xselection.requestor,	1491	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470	ev.xselection.property, True);
1471	break;	1492	break;
1472		1493
1473	case SelectionRequest:	1494	case SelectionRequest:
1474	selection_send (ev.xselectionrequest);	1495	selection_send (ev.xselectionrequest);
1475	break;	1496	break;
…		…
1499	if (ev.xany.window == TermWin.vt)	1520	if (ev.xany.window == TermWin.vt)
1500	{	1521	{
1501	do	1522	do
1502	scr_expose (ev.xexpose.x, ev.xexpose.y,	1523	scr_expose (ev.xexpose.x, ev.xexpose.y,
1503	ev.xexpose.width, ev.xexpose.height, False);	1524	ev.xexpose.width, ev.xexpose.height, False);
1504	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1525	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1505		1526
1506	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1527	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507		1528
1508	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1529	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1509	scr_expose (ev.xexpose.x, ev.xexpose.y,	1530	scr_expose (ev.xexpose.x, ev.xexpose.y,
1510	ev.xexpose.width, ev.xexpose.height, False);	1531	ev.xexpose.width, ev.xexpose.height, False);
1511		1532
1512	scr_refresh (refresh_type);	1533	scr_refresh (refresh_type);
1513	}	1534	}
1514	else	1535	else
1515	{	1536	{
1516	XEvent unused_event;	1537	XEvent unused_event;
1517		1538
1518	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1539	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519	;	1540	;
1520	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1541	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521	;	1542	;
1522		1543
1523	if (isScrollbarWindow (ev.xany.window))	1544	if (isScrollbarWindow (ev.xany.window))
1524	{	1545	{
1525	scrollBar.setIdle ();	1546	scrollBar.setIdle ();
…		…
1530	menubar_expose ();	1551	menubar_expose ();
1531	#endif	1552	#endif
1532		1553
1533	#ifdef TRANSPARENT	1554	#ifdef TRANSPARENT
1534	if (am_transparent && ev.xany.window == TermWin.parent[0])	1555	if (am_transparent && ev.xany.window == TermWin.parent[0])
1535	XClearWindow (display->display, ev.xany.window);	1556	XClearWindow (disp, ev.xany.window);
1536	#endif	1557	#endif
1537	}	1558	}
1538	break;	1559	break;
1539		1560
1540	case MotionNotify:	1561	case MotionNotify:
…		…
1547	{	1568	{
1548	menubar_control (ev.xbutton);	1569	menubar_control (ev.xbutton);
1549	break;	1570	break;
1550	}	1571	}
1551	#endif	1572	#endif
1552	if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))	1573	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553	break;	1574	break;
1554		1575
1555	if (ev.xany.window == TermWin.vt)	1576	if (ev.xany.window == TermWin.vt)
1556	{	1577	{
1557	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1578	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558	{	1579	{
1559	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1580	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1560	;	1581	;
1561		1582
1562	XQueryPointer (display->display, TermWin.vt,	1583	XQueryPointer (disp, TermWin.vt,
1563	&unused_root, &unused_child,	1584	&unused_root, &unused_child,
1564	&unused_root_x, &unused_root_y,	1585	&unused_root_x, &unused_root_y,
1565	& (ev.xbutton.x), & (ev.xbutton.y),	1586	&ev.xbutton.x, &ev.xbutton.y,
1566	&unused_mask);	1587	&ev.xbutton.state);
1567	#ifdef MOUSE_THRESHOLD	1588	#ifdef MOUSE_THRESHOLD
1568	/* deal with a `jumpy' mouse */	1589	/* deal with a `jumpy' mouse */
1569	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)	1590	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570	{	1591	{
1571	#endif	1592	#endif
…		…
1576	iso14755_54 (ev.xbutton.x, ev.xbutton.y);	1597	iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577	break;	1598	break;
1578	}	1599	}
1579	#endif	1600	#endif
1580	selection_extend (ev.xbutton.x, ev.xbutton.y,	1601	selection_extend (ev.xbutton.x, ev.xbutton.y,
1581	(ev.xbutton.state & Button3Mask) ? 2 : 0);	1602	ev.xbutton.state & Button3Mask ? 2 : 0);
		1603
1582	#ifdef SELECTION_SCROLLING	1604	#ifdef SELECTION_SCROLLING
1583	if (ev.xbutton.y < TermWin.int_bwidth	1605	if (ev.xbutton.y < TermWin.int_bwidth
1584	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1606	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1585	{	1607	{
1586	int dist;	1608	int dist;
…		…
1597	selection_save_x = ev.xbutton.x;	1619	selection_save_x = ev.xbutton.x;
1598	selection_save_y = ev.xbutton.y;	1620	selection_save_y = ev.xbutton.y;
1599	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1621	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600		1622
1601	/* calc number of lines to scroll */	1623	/* calc number of lines to scroll */
1602	if (ev.xbutton.y<TermWin.int_bwidth)	1624	if (ev.xbutton.y < TermWin.int_bwidth)
1603	{	1625	{
1604	scroll_selection_dir = UP;	1626	scroll_selection_dir = UP;
1605	dist = TermWin.int_bwidth - ev.xbutton.y;	1627	dist = TermWin.int_bwidth - ev.xbutton.y;
1606	}	1628	}
1607	else	1629	else
…		…
1630	#endif	1652	#endif
1631	}	1653	}
1632	}	1654	}
1633	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1655	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634	{	1656	{
1635	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1657	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636	MotionNotify, &ev)) ;	1658	MotionNotify, &ev))
		1659	;
		1660
1637	XQueryPointer (display->display, scrollBar.win,	1661	XQueryPointer (disp, scrollBar.win,
1638	&unused_root, &unused_child,	1662	&unused_root, &unused_child,
1639	&unused_root_x, &unused_root_y,	1663	&unused_root_x, &unused_root_y,
1640	& (ev.xbutton.x), & (ev.xbutton.y),	1664	&ev.xbutton.x, &ev.xbutton.y,
1641	&unused_mask);	1665	&unused_mask);
1642	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643	scrollbar_size ());	1667	scrollbar_size ());
1644	scr_refresh (refresh_type);	1668	scr_refresh (refresh_type);
1645	refresh_limit = 0;	1669	refresh_limit = 0;
…		…
1661	case PropertyNotify:	1685	case PropertyNotify:
1662	/*	1686	/*
1663	* if user used some Esetroot compatible prog to set the root bg,	1687	* if user used some Esetroot compatible prog to set the root bg,
1664	* use the property to determine the pixmap. We use it later on.	1688	* use the property to determine the pixmap. We use it later on.
1665	*/	1689	*/
1666	if (xa[XA_XROOTPMAPID] == 0)
1667	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1690	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1691	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670	return;	1692	return;
1671		1693
1672	/* FALLTHROUGH */	1694	/* FALLTHROUGH */
1673	case ReparentNotify:	1695	case ReparentNotify:
1674	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1696	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1700	return;	1722	return;
1701	}	1723	}
1702	#endif	1724	#endif
1703		1725
1704	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;	1726	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
		1727
1705	if (reportmode)	1728	if (reportmode)
1706	{	1729	{
1707	/* mouse report from vt window */	1730	/* mouse report from vt window */
1708	/* save the xbutton state (for ButtonRelease) */	1731	/* save the xbutton state (for ButtonRelease) */
1709	MEvent.state = ev.state;	1732	MEvent.state = ev.state;
…		…
1738	}	1761	}
1739	else	1762	else
1740	{	1763	{
1741	if (ev.button != MEvent.button)	1764	if (ev.button != MEvent.button)
1742	MEvent.clicks = 0;	1765	MEvent.clicks = 0;
		1766
1743	switch (ev.button)	1767	switch (ev.button)
1744	{	1768	{
1745	case Button1:	1769	case Button1:
		1770	/* allow meta + click to select rectangular areas */
		1771	/* should be done in screen.C */
		1772	#if ENABLE_FRILLS
		1773	selection.rect = !!(ev.state & ModMetaMask);
		1774	#else
		1775	selection.rect = false;
		1776	#endif
		1777
1746	/* allow shift+left click to extend selection */	1778	/* allow shift+left click to extend selection */
1747	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1779	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1748	{	1780	{
1749	if (MEvent.button == Button1 && clickintime)	1781	if (MEvent.button == Button1 && clickintime)
1750	selection_rotate (ev.x, ev.y);	1782	selection_rotate (ev.x, ev.y);
…		…
2072	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2104	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2105	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2106	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075	int i;	2107	int i;
2076		2108
2077	Visual* visual = display->visual;	2109	Visual *visual = display->visual;
2078		2110
2079	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2111	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080		2112
2081	/* for convenience */	2113	/* for convenience */
2082	mask_r = visual->red_mask;	2114	mask_r = visual->red_mask;
…		…
2303	Atom atype;	2335	Atom atype;
2304	unsigned char *prop = NULL;	2336	unsigned char *prop = NULL;
2305	Window root, oldp, *list;	2337	Window root, oldp, *list;
2306	Pixmap rootpixmap = None;	2338	Pixmap rootpixmap = None;
2307	XWindowAttributes wattr, wrootattr;	2339	XWindowAttributes wattr, wrootattr;
		2340	dDisp;
2308		2341
2309	pchanged = 0;	2342	pchanged = 0;
2310		2343
2311	if (!(options & Opt_transparent))	2344	if (!(options & Opt_transparent))
2312	return pchanged; /* Don't try any more */	2345	return pchanged; /* Don't try any more */
2313		2346
2314	XGetWindowAttributes (display->display, display->root, &wrootattr);	2347	XGetWindowAttributes (disp, display->root, &wrootattr);
2315	rootdepth = wrootattr.depth;	2348	rootdepth = wrootattr.depth;
2316		2349
2317	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2350	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2318		2351
2319	if (rootdepth != wattr.depth)	2352	if (rootdepth != wattr.depth)
2320	{	2353	{
2321	if (am_transparent)	2354	if (am_transparent)
2322	{	2355	{
2323	pchanged = 1;	2356	pchanged = 1;
2324	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2357	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2325	am_transparent = am_pixmap_trans = 0;	2358	am_transparent = am_pixmap_trans = 0;
2326	}	2359	}
2327		2360
2328	return pchanged; /* Don't try any more */	2361	return pchanged; /* Don't try any more */
2329	}	2362	}
2330		2363
2331	/* Get all X ops out of the queue so that our information is up-to-date. */	2364	/* Get all X ops out of the queue so that our information is up-to-date. */
2332	XSync (display->display, False);	2365	XSync (disp, False);
2333		2366
2334	/*	2367	/*
2335	* Make the frame window set by the window manager have	2368	* Make the frame window set by the window manager have
2336	* the root background. Some window managers put multiple nested frame	2369	* the root background. Some window managers put multiple nested frame
2337	* windows for each client, so we have to take care about that.	2370	* windows for each client, so we have to take care about that.
2338	*/	2371	*/
2339	i = (xa[XA_XROOTPMAPID]	2372	i = (xa[XA_XROOTPMAP_ID]
2340	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2373	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2374	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342	&nitems, &bytes_after, &prop) == Success);	2375	&nitems, &bytes_after, &prop) == Success);
2343		2376
2344	if (!i || prop == NULL)	2377	if (!i || prop == NULL)
2345	i = (xa[XA_XSETROOTID]	2378	i = (xa[XA_ESETROOT_PMAP_ID]
2346	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2379	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2380	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348	&nitems, &bytes_after, &prop) == Success);	2381	&nitems, &bytes_after, &prop) == Success);
2349		2382
2350	if (!i || prop == NULL	2383	if (!i || prop == NULL
2351	#if TINTING	2384	#if TINTING
…		…
2370	Window cr;	2403	Window cr;
2371	XImage *image;	2404	XImage *image;
2372	GC gc;	2405	GC gc;
2373	XGCValues gcvalue;	2406	XGCValues gcvalue;
2374		2407
2375	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2408	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2376	0, 0, &sx, &sy, &cr);	2409	0, 0, &sx, &sy, &cr);
2377	nw = (unsigned int)szHint.width;	2410	nw = (unsigned int)szHint.width;
2378	nh = (unsigned int)szHint.height;	2411	nh = (unsigned int)szHint.height;
2379	nx = ny = 0;	2412	nx = ny = 0;
2380		2413
…		…
2392	sy = 0;	2425	sy = 0;
2393	}	2426	}
2394		2427
2395	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2428	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2396	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2429	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2430
		2431	XSync (disp, False);
2397	allowedxerror = -1;	2432	allowedxerror = -1;
2398	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2433	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399		2434
2400	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2435	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2401	/* XXX: may need a delay here? */	2436	/* XXX: may need a delay here? */
2402	allowedxerror = 0;	2437	allowedxerror = 0;
2403		2438
…		…
2406	if (am_transparent && am_pixmap_trans)	2441	if (am_transparent && am_pixmap_trans)
2407	{	2442	{
2408	pchanged = 1;	2443	pchanged = 1;
2409	if (TermWin.pixmap != None)	2444	if (TermWin.pixmap != None)
2410	{	2445	{
2411	XFreePixmap (display->display, TermWin.pixmap);	2446	XFreePixmap (disp, TermWin.pixmap);
2412	TermWin.pixmap = None;	2447	TermWin.pixmap = None;
2413	}	2448	}
2414	}	2449	}
2415		2450
2416	am_pixmap_trans = 0;	2451	am_pixmap_trans = 0;
2417	}	2452	}
2418	else	2453	else
2419	{	2454	{
2420	if (TermWin.pixmap != None)	2455	if (TermWin.pixmap != None)
2421	XFreePixmap (display->display, TermWin.pixmap);	2456	XFreePixmap (disp, TermWin.pixmap);
2422		2457
2423	#if TINTING	2458	#if TINTING
2424	if (ISSET_PIXCOLOR (Color_tint))	2459	if (ISSET_PIXCOLOR (Color_tint))
2425	{	2460	{
2426	unsigned short rm, gm, bm;	2461	unsigned short rm, gm, bm;
…		…
2430		2465
2431	ShadeXImage (display, image, shade, rm, gm, bm);	2466	ShadeXImage (display, image, shade, rm, gm, bm);
2432	}	2467	}
2433	#endif	2468	#endif
2434		2469
2435	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2470	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2436	szHint.width, szHint.height, image->depth);	2471	szHint.width, szHint.height, image->depth);
2437	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2472	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2438	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2473	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2439	nx, ny, image->width, image->height);	2474	nx, ny, image->width, image->height);
2440	XFreeGC (display->display, gc);	2475	XFreeGC (disp, gc);
2441	XDestroyImage (image);	2476	XDestroyImage (image);
2442	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2477	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2443	XClearWindow (display->display, TermWin.parent[0]);	2478	XClearWindow (disp, TermWin.parent[0]);
2444		2479
2445	if (!am_transparent || !am_pixmap_trans)	2480	if (!am_transparent || !am_pixmap_trans)
2446	pchanged = 1;	2481	pchanged = 1;
2447		2482
2448	am_transparent = am_pixmap_trans = 1;	2483	am_transparent = am_pixmap_trans = 1;
2449	}	2484	}
2450	}	2485	}
2451		2486
2452	if (!am_pixmap_trans)	2487	if (am_pixmap_trans)
		2488	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
		2489	else
2453	{	2490	{
2454	unsigned int n;	2491	unsigned int n;
2455	/*	2492	/*
2456	* InheritPixmap transparency	2493	* InheritPixmap transparency
2457	*/	2494	*/
2458	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2495	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2459	{	2496	{
2460	oldp = TermWin.parent[i];	2497	oldp = TermWin.parent[i];
2461	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2498	XQueryTree (disp, TermWin.parent[i - 1], &root,
2462	&TermWin.parent[i], &list, &n);	2499	&TermWin.parent[i], &list, &n);
2463	XFree (list);	2500	XFree (list);
2464		2501
2465	if (TermWin.parent[i] == display->root)	2502	if (TermWin.parent[i] == display->root)
2466	{	2503	{
…		…
2478		2515
2479	if (pchanged)	2516	if (pchanged)
2480	{	2517	{
2481	for (; n < (unsigned int)i; n++)	2518	for (; n < (unsigned int)i; n++)
2482	{	2519	{
2483	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2520	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2484	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2521	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485	{	2522	{
2486	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2523	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2487	break;	2524	break;
2488	}	2525	}
2489	}	2526	}
2490	}	2527	}
2491		2528
2492	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2529	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2493	{	2530	{
2494	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2531	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2495	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2532	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2496	am_transparent = 0;	2533	am_transparent = 0;
2497	/* XXX: also turn off Opt_transparent? */	2534	/* XXX: also turn off Opt_transparent? */
2498	}	2535	}
2499	else	2536	else
2500	{	2537	{
…		…
2503	* needed for fvwm2.2.2 (and before?) */	2540	* needed for fvwm2.2.2 (and before?) */
2504	sleep (1);	2541	sleep (1);
2505	#endif	2542	#endif
2506	for (n = 0; n < (unsigned int)i; n++)	2543	for (n = 0; n < (unsigned int)i; n++)
2507	{	2544	{
2508	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2545	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2509	XClearWindow (display->display, TermWin.parent[n]);	2546	XClearWindow (disp, TermWin.parent[n]);
2510	}	2547	}
2511		2548
2512	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2549	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2513	am_transparent = 1;	2550	am_transparent = 1;
2514	}	2551	}
2515		2552
2516	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2553	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2517	TermWin.parent[i] = None;	2554	TermWin.parent[i] = None;
2518	}	2555	}
2519		2556
2520	// this is experimental
2521	if (scrollBar.win)	2557	if (scrollBar.win)
2522	{	2558	{
2523	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2559	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524	XClearWindow (display->display, scrollBar.win);
2525	scrollBar.setIdle ();	2560	scrollBar.setIdle ();
2526	scrollbar_show (0);	2561	scrollbar_show (0);
		2562	}
		2563
		2564	if (am_transparent)
		2565	{
		2566	want_refresh = want_full_refresh = 1;
		2567	if (am_pixmap_trans)
		2568	flush ();
2527	}	2569	}
2528		2570
2529	return pchanged;	2571	return pchanged;
2530	}	2572	}
2531	#endif	2573	#endif
…		…
2557	seen_input = 1;	2599	seen_input = 1;
2558	// many badly-written programs (e.g. jed) contain a race condition:	2600	// many badly-written programs (e.g. jed) contain a race condition:
2559	// they first read the screensize and then install a SIGWINCH handler.	2601	// they first read the screensize and then install a SIGWINCH handler.
2560	// some window managers resize the window early, and these programs	2602	// some window managers resize the window early, and these programs
2561	// then sometimes get the size wrong.	2603	// then sometimes get the size wrong.
		2604	// unfortunately other programs are even more buggy and dislike
		2605	// being sent SIGWINCH, so only do it when we were in fact being
		2606	// resized.
		2607	if (seen_resize)
2562	kill (-cmd_pid, SIGWINCH);	2608	kill (-cmd_pid, SIGWINCH);
2563	}	2609	}
2564		2610
2565	/* Read a text string from the input buffer */	2611	/* Read a text string from the input buffer */
2566	unicode_t buf[UBUFSIZ];	2612	unicode_t buf[UBUFSIZ];
2567	bool refreshnow = false;	2613	bool refreshnow = false;
…		…
2679	if (len == (size_t)-1)	2725	if (len == (size_t)-1)
2680	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2726	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681		2727
2682	// assume wchar == unicode	2728	// assume wchar == unicode
2683	cmdbuf_ptr += len;	2729	cmdbuf_ptr += len;
2684	return wc;	2730	return wc & UNICODE_MASK;
2685	}	2731	}
2686		2732
2687	return NOCHAR;	2733	return NOCHAR;
2688	}	2734	}
2689		2735
…		…
3152	{	3198	{
3153	switch (priv)	3199	switch (priv)
3154	{	3200	{
3155	case '>':	3201	case '>':
3156	if (ch == CSI_DA) /* secondary device attributes */	3202	if (ch == CSI_DA) /* secondary device attributes */
3157	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3203	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158	break;	3204	break;
3159	case '?':	3205	case '?':
3160	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3206	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161	process_terminal_mode (ch, priv, nargs, arg);	3207	process_terminal_mode (ch, priv, nargs, arg);
3162	break;	3208	break;
…		…
3391	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3437	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392	{	3438	{
3393	int x, y;	3439	int x, y;
3394	XWindowAttributes wattr;	3440	XWindowAttributes wattr;
3395	Window wdummy;	3441	Window wdummy;
		3442	dDisp;
3396		3443
3397	if (nargs == 0)	3444	if (nargs == 0)
3398	return;	3445	return;
3399		3446
3400	switch (args[0])	3447	switch (args[0])
3401	{	3448	{
3402	/*	3449	/*
3403	* commands	3450	* commands
3404	*/	3451	*/
3405	case 1: /* deiconify window */	3452	case 1: /* deiconify window */
3406	XMapWindow (display->display, TermWin.parent[0]);	3453	XMapWindow (disp, TermWin.parent[0]);
3407	break;	3454	break;
3408	case 2: /* iconify window */	3455	case 2: /* iconify window */
3409	XIconifyWindow (display->display, TermWin.parent[0],	3456	XIconifyWindow (disp, TermWin.parent[0], display->screen);
3410	DefaultScreen (display->display));
3411	break;	3457	break;
3412	case 3: /* set position (pixels) */	3458	case 3: /* set position (pixels) */
3413	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3459	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3414	break;	3460	break;
3415	case 4: /* set size (pixels) */	3461	case 4: /* set size (pixels) */
3416	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3462	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417	break;	3463	break;
3418	case 5: /* raise window */	3464	case 5: /* raise window */
3419	XRaiseWindow (display->display, TermWin.parent[0]);	3465	XRaiseWindow (disp, TermWin.parent[0]);
3420	break;	3466	break;
3421	case 6: /* lower window */	3467	case 6: /* lower window */
3422	XLowerWindow (display->display, TermWin.parent[0]);	3468	XLowerWindow (disp, TermWin.parent[0]);
3423	break;	3469	break;
3424	case 7: /* refresh window */	3470	case 7: /* refresh window */
3425	scr_touch (true);	3471	scr_touch (true);
3426	break;	3472	break;
3427	case 8: /* set size (chars) */	3473	case 8: /* set size (chars) */
…		…
3439		3485
3440	/*	3486	/*
3441	* reports - some output format copied from XTerm	3487	* reports - some output format copied from XTerm
3442	*/	3488	*/
3443	case 11: /* report window state */	3489	case 11: /* report window state */
3444	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3490	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3445	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3491	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446	break;	3492	break;
3447	case 13: /* report window position */	3493	case 13: /* report window position */
3448	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3494	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3449	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3495	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3450	-wattr.border_width, -wattr.border_width,	3496	-wattr.border_width, -wattr.border_width,
3451	&x, &y, &wdummy);	3497	&x, &y, &wdummy);
3452	tt_printf ("\033[3;%d;%dt", x, y);	3498	tt_printf ("\033[3;%d;%dt", x, y);
3453	break;	3499	break;
3454	case 14: /* report window size (pixels) */	3500	case 14: /* report window size (pixels) */
3455	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3501	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3456	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3502	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457	break;	3503	break;
3458	case 18: /* report text area size (chars) */	3504	case 18: /* report text area size (chars) */
3459	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3505	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3460	break;	3506	break;
…		…
3462	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3508	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3463	break;	3509	break;
3464	case 20: /* report icon label */	3510	case 20: /* report icon label */
3465	{	3511	{
3466	char *s;	3512	char *s;
3467	XGetIconName (display->display, TermWin.parent[0], &s);	3513	XGetIconName (disp, TermWin.parent[0], &s);
3468	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3514	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469	XFree (s);	3515	XFree (s);
3470	}	3516	}
3471	break;	3517	break;
3472	case 21: /* report window title */	3518	case 21: /* report window title */
3473	{	3519	{
3474	char *s;	3520	char *s;
3475	XFetchName (display->display, TermWin.parent[0], &s);	3521	XFetchName (disp, TermWin.parent[0], &s);
3476	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3522	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477	XFree (s);	3523	XFree (s);
3478	}	3524	}
3479	break;	3525	break;
3480	}	3526	}
…		…
3487	* ends_how is terminator used. returned input must be free()'d	3533	* ends_how is terminator used. returned input must be free()'d
3488	*/	3534	*/
3489	unsigned char *	3535	unsigned char *
3490	rxvt_term::get_to_st (unicode_t &ends_how)	3536	rxvt_term::get_to_st (unicode_t &ends_how)
3491	{	3537	{
3492	unicode_t prev = 0, ch;	3538	unicode_t ch;
		3539	bool seen_esc = false;
3493	unsigned int n = 0;	3540	unsigned int n = 0;
3494	unsigned char *s;
3495	unsigned char string[STRING_MAX];	3541	wchar_t string[STRING_MAX];
3496		3542
3497	while ((ch = cmd_getc ()) != NOCHAR)	3543	while ((ch = cmd_getc ()) != NOCHAR)
3498	{	3544	{
3499	if (prev == C0_ESC)	3545	if (seen_esc)
3500	{	3546	{
3501	if (ch == 0x5c) /* 7bit ST */	3547	if (ch == 0x5c) /* 7bit ST */
3502	break;	3548	break;
3503	else	3549	else
3504	return NULL;	3550	return NULL;
3505	}	3551	}
		3552	else if (ch == C0_ESC)
		3553	{
		3554	seen_esc = true;
		3555	continue;
		3556	}
3506	else if (ch == C0_BEL || ch == CHAR_ST)	3557	else if (ch == C0_BEL || ch == CHAR_ST)
3507	break;	3558	break;
3508	else if (ch < 0x20)	3559	else if (ch < 0x20)
3509	return NULL; /* other control character - exit */	3560	return NULL; /* other control character - exit */
		3561
		3562	seen_esc = false;
3510		3563
3511	if (n >= sizeof (string) - 1)	3564	if (n >= sizeof (string) - 1)
3512	// stop at some sane length	3565	// stop at some sane length
3513	return NULL;	3566	return NULL;
3514		3567
3515	if (ch == C0_SYN)	3568	if (ch == C0_SYN)
3516	{
3517	string[n++] = cmd_get8 ();	3569	string[n++] = cmd_get8 ();
3518	prev = 0;
3519	}
3520	else	3570	else
3521	string[n++] = prev = ch;	3571	string[n++] = ch;
3522	}	3572	}
3523		3573
3524	string[n++] = '\0';	3574	string[n++] = '\0';
3525		3575
3526	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527	return NULL;
3528
3529	ends_how = (ch == 0x5c ? C0_ESC : ch);	3576	ends_how = (ch == 0x5c ? C0_ESC : ch);
3530	strncpy (s, string, n);	3577
3531	return s;	3578	return (unsigned char *)rxvt_wcstombs (string);
3532	}	3579	}
3533		3580
3534	/*----------------------------------------------------------------------*/	3581	/*----------------------------------------------------------------------*/
3535	/*	3582	/*
3536	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3583	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
…		…
3620	{	3667	{
3621	int changed = 0;	3668	int changed = 0;
3622	int color;	3669	int color;
3623	char *buf, *name;	3670	char *buf, *name;
3624	bool query = str[0] == '?' && !str[1];	3671	bool query = str[0] == '?' && !str[1];
		3672	int saveop = op;
		3673	dDisp;
3625		3674
3626	assert (str != NULL);	3675	assert (str != NULL);
3627	switch (op)	3676	switch (op)
3628	{	3677	{
3629	case XTerm_name:	3678	case XTerm_name:
…		…
3636	set_title (str);	3685	set_title (str);
3637	break;	3686	break;
3638	case XTerm_property:	3687	case XTerm_property:
3639	if (str[0] == '?')	3688	if (str[0] == '?')
3640	{	3689	{
3641	Atom prop = XInternAtom (display->display, str + 1, True);	3690	Atom prop = display->atom (str + 1);
3642	Atom actual_type;	3691	Atom actual_type;
3643	int actual_format;	3692	int actual_format;
3644	unsigned long nitems;	3693	unsigned long nitems;
3645	unsigned long bytes_after;	3694	unsigned long bytes_after;
3646	unsigned char *value = 0;	3695	unsigned char *value = 0;
3647	const char *str = "";	3696	const char *str = "";
3648		3697
3649	if (prop	3698	if (prop
3650	&& XGetWindowProperty (display->display, TermWin.parent[0],	3699	&& XGetWindowProperty (disp, TermWin.parent[0],
3651	prop, 0, 1<<16, 0, AnyPropertyType,	3700	prop, 0, 1<<16, 0, AnyPropertyType,
3652	&actual_type, &actual_format,	3701	&actual_type, &actual_format,
3653	&nitems, &bytes_after, &value) == Success	3702	&nitems, &bytes_after, &value) == Success
3654	&& actual_type != None	3703	&& actual_type != None
3655	&& actual_format == 8)	3704	&& actual_format == 8)
…		…
3664	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3713	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665		3714
3666	if (eq)	3715	if (eq)
3667	{	3716	{
3668	*eq = 0;	3717	*eq = 0;
3669	XChangeProperty (display->display, TermWin.parent[0],	3718	set_utf8_property (display->atom (str), eq + 1);
3670	display->atom (str), XA_STRING, 8,
3671	PropModeReplace, (unsigned char *)eq + 1,
3672	strlen (eq + 1));
3673	}	3719	}
3674	else	3720	else
3675	XDeleteProperty (display->display, TermWin.parent[0],	3721	XDeleteProperty (disp, TermWin.parent[0],
3676	display->atom (str));	3722	display->atom (str));
3677	}	3723	}
3678	break;	3724	break;
3679		3725
3680	case XTerm_Color:	3726	case XTerm_Color:
…		…
3721	break;	3767	break;
3722	#ifndef NO_BOLD_UNDERLINE_REVERSE	3768	#ifndef NO_BOLD_UNDERLINE_REVERSE
3723	case XTerm_Color_BD:	3769	case XTerm_Color_BD:
3724	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3770	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3725	break;	3771	break;
		3772	case XTerm_Color_IT:
		3773	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
		3774	break;
3726	case XTerm_Color_UL:	3775	case XTerm_Color_UL:
3727	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3776	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728	break;	3777	break;
3729	case XTerm_Color_RV:	3778	case XTerm_Color_RV:
3730	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3779	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3780	break;
		3781	#endif
		3782	#if TRANSPARENT && TINTING
		3783	case XTerm_Color_tint:
		3784	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
		3785	check_our_parents ();
		3786	if (am_transparent)
		3787	want_full_refresh = want_refresh = 1;
3731	break;	3788	break;
3732	#endif	3789	#endif
3733		3790
3734	case XTerm_Pixmap:	3791	case XTerm_Pixmap:
3735	if (*str != ';')	3792	if (*str != ';')
…		…
3744	{	3801	{
3745	str++;	3802	str++;
3746	#if XPM_BACKGROUND	3803	#if XPM_BACKGROUND
3747	changed += scale_pixmap (str);	3804	changed += scale_pixmap (str);
3748	#endif	3805	#endif
3749
3750	}	3806	}
		3807
3751	if (changed)	3808	if (changed)
3752	{	3809	{
3753	#ifdef XPM_BACKGROUND	3810	#ifdef XPM_BACKGROUND
3754	resize_pixmap ();	3811	resize_pixmap ();
3755	#endif	3812	#endif
…		…
3767	case XTerm_logfile:	3824	case XTerm_logfile:
3768	// TODO, when secure mode?	3825	// TODO, when secure mode?
3769	break;	3826	break;
3770		3827
3771	case XTerm_font:	3828	case XTerm_font:
		3829	op = URxvt_font;
		3830	case URxvt_font:
		3831	#if ENABLE_STYLES
		3832	case URxvt_boldFont:
		3833	case URxvt_italicFont:
		3834	case URxvt_boldItalicFont:
		3835	#endif
3772	if (query)	3836	if (query)
3773	tt_printf ("\33]%d;%-.250s%c", XTerm_font,	3837	tt_printf ("\33]%d;%-.250s%c", saveop,
3774	(options & Opt_insecure) && TermWin.fontset->fontdesc	3838	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3775	? TermWin.fontset->fontdesc : "",	3839	? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3776	resp);	3840	resp);
3777	else	3841	else
		3842	{
		3843	const char *&res = rs[Rs_font + (op - URxvt_font)];
		3844
		3845	res = strdup (str);
		3846	allocated.push_back ((void *)res);
3778	change_font (str);	3847	set_fonts ();
		3848	}
3779	break;	3849	break;
3780		3850
3781	#if ENABLE_FRILLS	3851	#if ENABLE_FRILLS
3782	case XTerm_locale:	3852	case XTerm_locale:
3783	if (query)	3853	if (query)
3784	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3854	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785	else	3855	else
3786	{	3856	{
3787	set_locale (str);	3857	set_locale (str);
		3858	pty.set_utf8_mode (enc_utf8);
3788	# ifdef USE_XIM	3859	# ifdef USE_XIM
3789	im_cb ();	3860	im_cb ();
3790	# endif	3861	# endif
3791	}	3862	}
3792	break;
3793
3794	case XTerm_findfont:
3795	{
3796	int fid = TermWin.fontset->find_font (atoi (str));
3797	tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798	fid,
3799	(options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800	resp);
3801	}
3802	break;	3863	break;
3803	#endif	3864	#endif
3804		3865
3805	#ifdef MENUBAR	3866	#ifdef MENUBAR
3806	case XTerm_Menu:	3867	case XTerm_Menu:
…		…
3935		3996
3936	/* extra handling for values with state unkept */	3997	/* extra handling for values with state unkept */
3937	switch (arg[i])	3998	switch (arg[i])
3938	{	3999	{
3939	case 1048: /* alternative cursor save */	4000	case 1048: /* alternative cursor save */
		4001	case 1049:
3940	if (options & Opt_secondaryScreen)	4002	if (options & Opt_secondaryScreen)
3941	if (mode == 0)	4003	if (mode == 0)
3942	scr_cursor (RESTORE);	4004	scr_cursor (RESTORE);
3943	else if (mode == 1)	4005	else if (mode == 1)
3944	scr_cursor (SAVE);	4006	scr_cursor (SAVE);
…		…
4069	rendset = 0, rendstyle = ~RS_None;	4131	rendset = 0, rendstyle = ~RS_None;
4070	break;	4132	break;
4071	case 1:	4133	case 1:
4072	rendset = 1, rendstyle = RS_Bold;	4134	rendset = 1, rendstyle = RS_Bold;
4073	break;	4135	break;
4074	//case 2: // faint or second colour	4136	//case 2: // low intensity
4075	//case 3: // italic	4137	case 3:
		4138	rendset = 1, rendstyle = RS_Italic;
		4139	break;
4076	case 4:	4140	case 4:
4077	rendset = 1, rendstyle = RS_Uline;	4141	rendset = 1, rendstyle = RS_Uline;
4078	break;	4142	break;
4079	case 5: // slowly blinking	4143	case 5: // slowly blinking
4080	case 6: // rapidly blinking	4144	case 6: // rapidly blinking
…		…
4092	//case 11: // scoansi acs on, first alt font	4156	//case 11: // scoansi acs on, first alt font
4093	//case 12: // scoansi acs on, |0x80, second alt font	4157	//case 12: // scoansi acs on, |0x80, second alt font
4094	//...	4158	//...
4095	//case 19: // ninth alt font	4159	//case 19: // ninth alt font
4096	//case 20: // gothic	4160	//case 20: // gothic
4097	case 21: // disable bold, faint	4161	case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098	rendset = 0, rendstyle = RS_Bold;	4162	rendset = 0, rendstyle = RS_Bold;
4099	break;	4163	break;
4100	case 22:	4164	case 22: // normal intensity
4101	rendset = 0, rendstyle = RS_Bold;	4165	rendset = 0, rendstyle = RS_Bold;
4102	break;	4166	break;
4103	//case 23: disable italic	4167	case 23: // disable italic
		4168	rendset = 0, rendstyle = RS_Italic;
		4169	break;
4104	case 24:	4170	case 24:
4105	rendset = 0, rendstyle = RS_Uline;	4171	rendset = 0, rendstyle = RS_Uline;
4106	break;	4172	break;
4107	case 25:	4173	case 25:
4108	rendset = 0, rendstyle = RS_Blink;	4174	rendset = 0, rendstyle = RS_Blink;
4109	break;	4175	break;
4110	case 26:	4176	case 26: // variable spacing (iso 8613)
4111	rendset = 0, rendstyle = RS_Blink;	4177	rendset = 0, rendstyle = RS_Blink;
4112	break;	4178	break;
4113	case 27:	4179	case 27:
4114	rendset = 0, rendstyle = RS_RVid;	4180	rendset = 0, rendstyle = RS_RVid;
4115	break;	4181	break;
…		…
4133	case 35:	4199	case 35:
4134	case 36:	4200	case 36:
4135	case 37:	4201	case 37:
4136	scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);	4202	scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137	break;	4203	break;
4138	#ifdef TTY_256COLOR	4204	case 38: // set fg color, ISO 8613-6
4139	case 38:
4140	if (nargs > i + 2 && arg[i + 1] == 5)	4205	if (nargs > i + 2 && arg[i + 1] == 5)
4141	{	4206	{
4142	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);	4207	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143	i += 2;	4208	i += 2;
4144	}	4209	}
4145	break;	4210	break;
4146	#endif
4147	case 39: /* default fg */	4211	case 39: /* default fg */
4148	scr_color (Color_fg, Color_fg);	4212	scr_color (Color_fg, Color_fg);
4149	break;	4213	break;
4150		4214
4151	case 40:	4215	case 40:
…		…
4156	case 45:	4220	case 45:
4157	case 46:	4221	case 46:
4158	case 47:	4222	case 47:
4159	scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);	4223	scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160	break;	4224	break;
4161	#ifdef TTY_256COLOR	4225	case 48: // set bg color, ISO 8613-6
4162	case 48:
4163	if (nargs > i + 2 && arg[i + 1] == 5)	4226	if (nargs > i + 2 && arg[i + 1] == 5)
4164	{	4227	{
4165	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);	4228	scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166	i += 2;	4229	i += 2;
4167	}	4230	}
4168	break;	4231	break;
4169	#endif
4170	case 49: /* default bg */	4232	case 49: /* default bg */
4171	scr_color (Color_bg, Color_bg);	4233	scr_color (Color_bg, Color_bg);
4172	break;	4234	break;
		4235
		4236	//case 50: // not variable spacing
4173		4237
4174	#ifndef NO_BRIGHTCOLOR	4238	#ifndef NO_BRIGHTCOLOR
4175	case 90:	4239	case 90:
4176	case 91: /* set bright fg color */	4240	case 91: /* set bright fg color */
4177	case 92:	4241	case 92:
4178	case 93:	4242	case 93:
4179	case 94:	4243	case 94:
4180	case 95:	4244	case 95:
4181	case 96:	4245	case 96:
4182	case 97:	4246	case 97:
4183	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),	4247	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184	Color_fg);
4185	break;	4248	break;
4186	case 100:	4249	case 100:
4187	case 101: /* set bright bg color */	4250	case 101: /* set bright bg color */
4188	case 102:	4251	case 102:
4189	case 103:	4252	case 103:
4190	case 104:	4253	case 104:
4191	case 105:	4254	case 105:
4192	case 106:	4255	case 106:
4193	case 107:	4256	case 107:
4194	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),	4257	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195	Color_bg);
4196	break;	4258	break;
4197	#endif	4259	#endif
4198		4260
4199	}	4261	}
4200	}	4262	}
…		…
4239		4301
4240	/* ---------------------------------------------------------------------- */	4302	/* ---------------------------------------------------------------------- */
4241	/* Write data to the pty as typed by the user, pasted with the mouse,	4303	/* Write data to the pty as typed by the user, pasted with the mouse,
4242	* or generated by us in response to a query ESC sequence.	4304	* or generated by us in response to a query ESC sequence.
4243	*/	4305	*/
		4306	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4307
4244	void	4308	void
4245	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4309	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4246	{	4310	{
4247	enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT	4311	if (v_buflen == 0)
		4312	{
		4313	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4248		4314
4249	if (len)	4315	if ((unsigned int)written == len)
		4316	return;
		4317
		4318	data += written;
		4319	len -= written;
4250	{	4320	}
		4321
		4322	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4323
		4324	memcpy (v_buffer + v_buflen, data, len);
		4325	v_buflen += len;
		4326
		4327	pty_ev.set (EVENT_READ | EVENT_WRITE);
		4328	}
		4329
		4330	void rxvt_term::pty_write ()
		4331	{
		4332	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4333
		4334	if (written > 0)
		4335	{
		4336	v_buflen -= written;
		4337
4251	if (v_buflen == 0)	4338	if (v_buflen == 0)
4252	{	4339	{
4253	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255	if ((unsigned int)written == len)
4256	return;
4257
4258	data += written;
4259	len -= written;
4260	}
4261
4262
4263	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265	memcpy (v_buffer + v_buflen, data, len);
4266	v_buflen += len;
4267	}
4268
4269	for (;;)
4270	{
4271	int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273	if (written > 0)
4274	{
4275	v_buflen -= written;
4276
4277	if (v_buflen == 0)
4278	{
4279	free (v_buffer);	4340	free (v_buffer);
4280	v_buffer = 0;	4341	v_buffer = 0;
4281	v_buflen = 0;	4342	v_buflen = 0;
4282		4343
4283	pty_ev.set (EVENT_READ);	4344	pty_ev.set (EVENT_READ);
4284	return;
4285	}
4286
4287	memmove (v_buffer, v_buffer + written, v_buflen);
4288	}
4289	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290	// original code just ignores this...
4291	destroy ();
4292	else
4293	{
4294	pty_ev.set (EVENT_READ | EVENT_WRITE);
4295	return;	4345	return;
4296	}	4346	}
		4347
		4348	memmove (v_buffer, v_buffer + written, v_buflen);
4297	}	4349	}
		4350	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4351	// original code just ignores this...
		4352	destroy ();
4298	}	4353	}
4299		4354
4300	/*----------------------- end-of-file (C source) -----------------------*/	4355	/*----------------------- end-of-file (C source) -----------------------*/
4301		4356

Diff Legend

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