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.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
53	#include <wchar.h>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
54	#include <signal.h>	57	#include <csignal>
55		58
56	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
57		60
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		62
…		…
114	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
115	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
116	XK_Print, 0x2399,	119	XK_Print, 0x2399,
117		120
118	XK_space, 0x2423,	121	XK_space, 0x2423,
		122
		123	#ifdef XK_KP_Begin
		124	XK_KP_Prior, 0x21de,
		125	XK_KP_Next, 0x21df,
		126	XK_KP_Begin, 0x2320,
		127	XK_KP_Insert, 0x2380,
		128	XK_KP_Delete, 0x2326,
119	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
120	0,	131	0,
121	};	132	};
122		133
123	void	134	void
124	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
125	{	136	{
126	x = Pixel2Col (x);	137	x = Pixel2Col (x);
127	y = Pixel2Row (y);	138	y = Pixel2Row (y);
128		139
129	if (x < 0 || x >= TermWin.ncol	140	if (!IN_RANGE_EXC (x, 0, ncol)
130	|| y < 0 || y >= TermWin.nrow)	141	|| !IN_RANGE_EXC (y, 0, nrow))
131	return;	142	return;
132		143
133	for (;;)	144	for (;;)
134	{	145	{
135	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	const line_t &l = ROW(y - view_start);
		147
		148	text_t t = l.t[x];
136		149
137	if (t != NOCHAR || !x)	150	if (t != NOCHAR || !x)
138	{	151	{
139	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	iso14755_51 (l.t[x], l.r[x], x, y);
140	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141	iso14755buf = ISO_14755_54;	153	iso14755buf = ISO_14755_54;
142	break;	154	break;
143	}	155	}
144		156
145	x--;	157	x--;
146	}	158	}
147
148	}	159	}
149	#endif
150		160
151	#if ENABLE_OVERLAY
152	void	161	void
153	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	162	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154	{	163	{
155	rxvt_fontset *fs = FONTSET (r);	164	rxvt_fontset *fs = FONTSET (r);
156	rxvt_font *f = (*fs)[fs->find_font (ch)];	165	rxvt_font *f = (*fs)[fs->find_font (ch)];
157	wchar_t *chr, *alloc, ch2;	166	wchar_t *chr, *alloc, ch2, *fname;
158	int len;	167	int len;
159		168
		169	fname = rxvt_utf8towcs (f->name);
		170
160	#if ENABLE_COMBINING	171	# if ENABLE_COMBINING
161	if (IS_COMPOSE (ch))	172	if (IS_COMPOSE (ch))
162	{	173	{
163	len = rxvt_composite.expand (ch, 0);	174	len = rxvt_composite.expand (ch, 0);
164	alloc = chr = new wchar_t[len];	175	alloc = chr = new wchar_t[len];
165	rxvt_composite.expand (ch, chr);	176	rxvt_composite.expand (ch, chr);
166	}	177	}
167	else	178	else
168	#endif	179	# endif
169	{	180	{
170	ch2 = ch;	181	ch2 = ch;
171		182
172	alloc = 0;	183	alloc = 0;
173	chr = &ch2;	184	chr = &ch2;
174	len = 1;	185	len = 1;
175	}	186	}
176		187
177	int width = strlen (f->name);	188	char attr[80]; // plenty
178		189
179	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	190	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		191	(int)r,
		192	fgcolor_of (r), bgcolor_of (r),
		193	r & RS_Bold ? " bold" : "",
		194	r & RS_Italic ? " italic" : "",
		195	r & RS_Blink ? " blink" : "",
		196	r & RS_RVid ? " rvid" : "",
		197	r & RS_Uline ? " uline" : "",
		198	r & RS_Careful ? " careful" : "");
		199
		200	int width = wcswidth (fname, wcslen (fname));
		201
		202	max_it (width, 8+5); // for char + hey
		203	max_it (width, strlen (attr));
		204
		205	if (y >= 0)
		206	{
		207	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		208	x = 0;
		209	}
		210
		211	scr_overlay_new (x, y, width, len + 2);
180		212
181	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	213	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182		214
183	for (int y = 0; y < len; y++)	215	for (int y = 0; y < len; y++)
184	{	216	{
…		…
187	ch = *chr++;	219	ch = *chr++;
188		220
189	sprintf (buf, "%8x", ch);	221	sprintf (buf, "%8x", ch);
190	scr_overlay_set (0, y, buf);	222	scr_overlay_set (0, y, buf);
191	scr_overlay_set (9, y, '=');	223	scr_overlay_set (9, y, '=');
192	#if !UNICODE3	224	# if !UNICODE3
193	if (ch >= 0x10000)	225	if (ch >= 0x10000)
194	ch = 0xfffd;	226	ch = 0xfffd;
195	#endif	227	# endif
196	scr_overlay_set (11, y, ch, r);	228	scr_overlay_set (11, y, ch, r);
197	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
198	}	230	}
199		231
		232	scr_overlay_set (0, len , attr);
200	scr_overlay_set (0, len, f->name);	233	scr_overlay_set (0, len + 1, fname);
201		234
		235	free (fname);
		236
202	#if ENABLE_COMBINING	237	# if ENABLE_COMBINING
203	if (alloc)	238	if (alloc)
204	delete [] alloc;	239	delete [] alloc;
205	#endif	240	# endif
206	}	241	}
207	#endif	242	#endif
208		243
209	void	244	void
210	rxvt_term::commit_iso14755 ()	245	rxvt_term::commit_iso14755 ()
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	309	* escape sequence to toggle the Keypad.
275	*	310	*
276	* Always permit `shift' to override the current setting	311	* Always permit `shift' to override the current setting
277	*/	312	*/
278	shft = (ev.state & ShiftMask);	313	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	314	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	315	meta = ev.state & ModMetaMask;
281		316
282	if (numlock_state || (ev.state & ModNumLockMask))	317	if (numlock_state || (ev.state & ModNumLockMask))
283	{	318	{
284	numlock_state = (ev.state & ModNumLockMask);	319	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	320	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		340
306	// the XOpenIM manpage lies about hardcoding the locale	341	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	342	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	343	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	344	SET_LOCALE (rs[Rs_imLocale]);
		345
310	// assume wchar_t == unicode or better	346	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	347	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	348	KBUFSZ, &keysym, &status_return);
		349
313	if (rs[Rs_imLocale])	350	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	351	SET_LOCALE (locale);
315		352
316	if (status_return == XLookupChars	353	if (status_return == XLookupChars
317	|| status_return == XLookupBoth)	354	|| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	381	valid_keysym = keysym != NoSymbol;
345	}	382	}
346		383
347	if (valid_keysym)	384	if (valid_keysym)
348	{	385	{
		386	#ifdef KEYSYM_RESOURCE
		387	if (keyboard->dispatch (this, keysym, ev.state))
		388	return;
		389	#endif
		390
349	if (TermWin.saveLines)	391	if (saveLines)
350	{	392	{
351	#ifdef UNSHIFTED_SCROLLKEYS	393	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	394	if (!ctrl && !meta)
353	#else	395	#else
354	if (IS_SCROLL_MOD)	396	if (IS_SCROLL_MOD)
355	#endif	397	#endif
356	{	398	{
357	int lnsppg;	399	int lnsppg;
358		400
359	#ifdef PAGING_CONTEXT_LINES	401	#ifdef PAGING_CONTEXT_LINES
360	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	402	lnsppg = nrow - PAGING_CONTEXT_LINES;
361	#else	403	#else
362	lnsppg = TermWin.nrow * 4 / 5;	404	lnsppg = nrow * 4 / 5;
363	#endif	405	#endif
364	if (keysym == XK_Prior)	406	if (keysym == XK_Prior)
365	{	407	{
366	scr_page (UP, lnsppg);	408	scr_page (UP, lnsppg);
367	return;	409	return;
…		…
487	}	529	}
488	#endif	530	#endif
489		531
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	532	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	533	{
492	#ifdef KEYSYM_RESOURCE
493	if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494	{
495	unsigned int l;
496	const unsigned char *kbuf0;
497
498	kbuf0 = (Keysym_map[keysym & 0xFF]);
499	l = (unsigned int)*kbuf0++;
500
501	/* escape prefix */
502	if (meta
503	# ifdef META8_OPTION
504	&& meta_char == C0_ESC
505	# endif
506	)
507	{
508	const unsigned char ch = C0_ESC;
509	tt_write (&ch, 1);
510	}
511
512	tt_write (kbuf0, l);
513	return;
514	}
515	else
516	#endif
517	{	534	{
518	newlen = 1;	535	newlen = 1;
519	switch (keysym)	536	switch (keysym)
520	{	537	{
521	#ifndef NO_BACKSPACE_KEY	538	#ifndef NO_BACKSPACE_KEY
…		…
529	else	546	else
530	strcpy (kbuf, key_backspace);	547	strcpy (kbuf, key_backspace);
531	break;	548	break;
532	#endif	549	#endif
533	#ifndef NO_DELETE_KEY	550	#ifndef NO_DELETE_KEY
		551	# ifdef XK_KP_Prior
		552	case XK_KP_Delete:
		553	/* allow shift to override */
		554	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		555	{
		556	strcpy (kbuf, "\033On");
		557	break;
		558	}
		559	/* FALLTHROUGH */
		560	# endif
534	case XK_Delete:	561	case XK_Delete:
535	strcpy (kbuf, key_delete);	562	strcpy (kbuf, key_delete);
536	break;	563	break;
537	#endif	564	#endif
538	case XK_Tab:	565	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	668	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	669	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	670	strcpy (kbuf, "\033Ou");
644	break;	671	break;
645		672
646	case XK_KP_Insert:
647	strcpy (kbuf, "\033Op");
648	break;
649
650	case XK_KP_Delete:
651	strcpy (kbuf, "\033On");
652	break;
653	#endif	673	#endif
654	case XK_KP_F1: /* "\033OP" */	674	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	675	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	676	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	677	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	709	break;
690		710
691	case XK_Find:	711	case XK_Find:
692	strcpy (kbuf, "\033[1~");	712	strcpy (kbuf, "\033[1~");
693	break;	713	break;
		714
		715	#ifdef XK_KP_End
		716	case XK_KP_Insert:
		717	/* allow shift to override */
		718	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		719	{
		720	strcpy (kbuf, "\033Op");
		721	break;
		722	}
		723	/* FALLTHROUGH */
		724	#endif
694	case XK_Insert:	725	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	726	strcpy (kbuf, "\033[2~");
696	break;	727	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	728	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	729	case DXK_Remove:
…		…
788	#undef FKEY	819	#undef FKEY
789	default:	820	default:
790	newlen = 0;	821	newlen = 0;
791	break;	822	break;
792	}	823	}
		824
793	if (newlen)	825	if (newlen)
794	len = strlen (kbuf);	826	len = strlen (kbuf);
795	}	827	}
796		828
797	/*	829	/*
…		…
806	else if (ctrl && keysym == XK_minus)	838	else if (ctrl && keysym == XK_minus)
807	{	839	{
808	len = 1;	840	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	841	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810	}	842	}
		843	else if (keysym == XK_ISO_Left_Tab)
		844	{
		845	strcpy (kbuf, "\033[Z");
		846	len = 3;
		847	}
811	else	848	else
812	{	849	{
813	#ifdef META8_OPTION	850	#ifdef META8_OPTION
814	/* set 8-bit on */	851	/* set 8-bit on */
815	if (meta && (meta_char == 0x80))	852	if (meta && (meta_char == 0x80))
…		…
827	}	864	}
828		865
829	if (len <= 0)	866	if (len <= 0)
830	return; /* not mapped */	867	return; /* not mapped */
831		868
832	if (options & Opt_scrollTtyKeypress)	869	if (OPTION (Opt_scrollTtyKeypress))
833	if (TermWin.view_start)	870	if (view_start)
834	{	871	{
835	TermWin.view_start = 0;	872	view_start = 0;
836	want_refresh = 1;	873	want_refresh = 1;
837	}	874	}
838		875
839	/*	876	/*
840	* these modifications only affect the static keybuffer	877	* these modifications only affect the static keybuffer
…		…
873	#endif /* DEBUG_CMD */	910	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	911	tt_write (kbuf, (unsigned int)len);
875	}	912	}
876	/*}}} */	913	/*}}} */
877		914
878	#if (MENUBAR_MAX)	915	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	916	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880	/* attempt to `write' count to the input buffer */	917	/* attempt to `write' count to the input buffer */
881	unsigned int	918	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	919	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	920	{
…		…
906		943
907	cmd_parse ();	944	cmd_parse ();
908		945
909	return 0;	946	return 0;
910	}	947	}
911	#endif /* MENUBAR_MAX */	948	#endif
912		949
913	void	950	void
914	rxvt_term::flush ()	951	rxvt_term::flush ()
915	{	952	{
916	flush_ev.stop ();	953	flush_ev.stop ();
…		…
1017	{	1054	{
1018	if (mouse_slip_wheel_speed == 0	1055	if (mouse_slip_wheel_speed == 0
1019	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1056	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1057	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1058	{
		1059	if (view_start == nsaved ||
		1060	view_start == 0)
		1061	mouse_slip_wheel_speed = 0;
		1062
1022	refresh_type |= SMOOTH_REFRESH;	1063	refresh_type |= SMOOTH_REFRESH;
1023	want_refresh = 1;	1064	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1066	}
1026	}	1067	}
…		…
1046	if (n > 0)	1087	if (n > 0)
1047	{	1088	{
1048	cmdbuf_endp += n;	1089	cmdbuf_endp += n;
1049	return true;	1090	return true;
1050	}	1091	}
1051	else if (n < 0 && errno != EAGAIN)	1092	else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
		1093	{
		1094	pty_ev.stop ();
		1095
		1096	if (!OPTION (Opt_hold))
1052	destroy ();	1097	destroy ();
		1098	}
1053		1099
1054	return false;	1100	return false;
1055	}	1101	}
1056		1102
1057	void	1103	void
1058	rxvt_term::pty_cb (io_watcher &w, short revents)	1104	rxvt_term::pty_cb (io_watcher &w, short revents)
1059	{	1105	{
1060	SET_R (this);	1106	SET_R (this);
1061	SET_LOCALE (locale);	1107	SET_LOCALE (locale);
1062		1108
1063	if (revents & EVENT_WRITE)
1064	tt_write (0, 0);
1065	else if (revents & EVENT_READ)	1109	if (revents & EVENT_READ)
1066	// loop, but don't allow a single term to monopolize us	1110	// loop, but don't allow a single term to monopolize us
1067	while (pty_fill ())	1111	while (pty_fill ())
1068	if (cmd_parse ())	1112	if (cmd_parse ())
1069	break;	1113	break;
		1114
		1115	if (revents & EVENT_WRITE)
		1116	pty_write ();
1070	}	1117	}
1071		1118
1072	void	1119	void
1073	rxvt_term::pointer_unblank ()	1120	rxvt_term::pointer_unblank ()
1074	{	1121	{
1075	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1122	XDefineCursor (display->display, vt, TermWin_cursor);
1076	recolour_cursor ();	1123	recolour_cursor ();
1077		1124
1078	#ifdef POINTER_BLANK	1125	#ifdef POINTER_BLANK
1079	hidden_pointer = 0;	1126	hidden_pointer = 0;
1080		1127
1081	if (options & Opt_pointerBlank)	1128	if (OPTION (Opt_pointerBlank))
1082	pointer_ev.start (NOW + pointerBlankDelay);	1129	pointer_ev.start (NOW + pointerBlankDelay);
1083	#endif	1130	#endif
1084	}	1131	}
1085		1132
1086	#ifdef POINTER_BLANK	1133	#ifdef POINTER_BLANK
1087	void	1134	void
1088	rxvt_term::pointer_blank ()	1135	rxvt_term::pointer_blank ()
1089	{	1136	{
1090	if (! (options & Opt_pointerBlank))	1137	if (! OPTION (Opt_pointerBlank))
1091	return;	1138	return;
1092		1139
1093	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1140	XDefineCursor (display->display, vt, display->blank_cursor);
1094	XFlush (display->display);	1141	XFlush (display->display);
1095		1142
1096	hidden_pointer = 1;	1143	hidden_pointer = 1;
1097	}	1144	}
1098		1145
…		…
1187		1234
1188	/*{{{ process an X event */	1235	/*{{{ process an X event */
1189	void	1236	void
1190	rxvt_term::x_cb (XEvent &ev)	1237	rxvt_term::x_cb (XEvent &ev)
1191	{	1238	{
		1239	dDisp;
		1240
1192	SET_R (this);	1241	SET_R (this);
1193	SET_LOCALE (locale);	1242	SET_LOCALE (locale);
1194		1243
1195	#if defined(CURSOR_BLINK)	1244	#if defined(CURSOR_BLINK)
1196	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1245	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1197	{	1246	{
1198	if (hidden_cursor)	1247	if (hidden_cursor)
1199	{	1248	{
1200	hidden_cursor = 0;	1249	hidden_cursor = 0;
1201	want_refresh = 1;	1250	want_refresh = 1;
…		…
1204	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1253	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1205	}	1254	}
1206	#endif	1255	#endif
1207		1256
1208	#if defined(POINTER_BLANK)	1257	#if defined(POINTER_BLANK)
1209	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1258	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1210	{	1259	{
1211	if (ev.type == MotionNotify	1260	if (ev.type == MotionNotify
1212	|| ev.type == ButtonPress	1261	|| ev.type == ButtonPress
1213	|| ev.type == ButtonRelease)	1262	|| ev.type == ButtonRelease)
1214	if (hidden_pointer)	1263	if (hidden_pointer)
…		…
1312	button_release (ev.xbutton);	1361	button_release (ev.xbutton);
1313	break;	1362	break;
1314		1363
1315	case ClientMessage:	1364	case ClientMessage:
1316	if (ev.xclient.format == 32	1365	if (ev.xclient.format == 32
		1366	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1367	{
1317	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1368	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318	destroy ();	1369	destroy ();
		1370	#if ENABLE_EWMH
		1371	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1372	XSendEvent (disp, ev.xclient.window = display->root,
		1373	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1374	&ev);
		1375	#endif
		1376	}
		1377	#if ENABLE_XEMBED
		1378	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1379	{
		1380	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1381	focus_in ();
		1382	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1383	focus_out ();
		1384	}
		1385	#endif
1319	#ifdef OFFIX_DND	1386	#ifdef OFFIX_DND
1320	/* OffiX Dnd (drag 'n' drop) protocol */	1387	/* OffiX Dnd (drag 'n' drop) protocol */
1321	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1388	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322	&& (ev.xclient.data.l[0] == DndFile	1389	&& (ev.xclient.data.l[0] == DndFile
1323	|| ev.xclient.data.l[0] == DndDir	1390	|| ev.xclient.data.l[0] == DndDir
1324	|| ev.xclient.data.l[0] == DndLink))	1391	|| ev.xclient.data.l[0] == DndLink))
1325	{	1392	{
1326	/* Get Dnd data */	1393	/* Get Dnd data */
1327	Atom ActualType;	1394	Atom ActualType;
1328	int ActualFormat;	1395	int ActualFormat;
1329	unsigned char *data;	1396	unsigned char *data;
1330	unsigned long Size, RemainingBytes;	1397	unsigned long Size, RemainingBytes;
1331		1398
1332	XGetWindowProperty (display->display, display->root,	1399	XGetWindowProperty (disp, display->root,
1333	xa[XA_DNDSELECTION],	1400	xa[XA_DNDSELECTION],
1334	0L, 1000000L,	1401	0L, 1000000L,
1335	False, AnyPropertyType,	1402	False, AnyPropertyType,
1336	&ActualType, &ActualFormat,	1403	&ActualType, &ActualFormat,
1337	&Size, &RemainingBytes,	1404	&Size, &RemainingBytes,
1338	&data);	1405	&data);
1339	set_string_property (XA_CUT_BUFFER0, data);	1406	set_string_property (XA_CUT_BUFFER0, data);
1340	XFree (data);	1407	XFree (data);
1341	selection_paste (display->root, XA_CUT_BUFFER0, true);	1408	selection_paste (display->root, XA_CUT_BUFFER0, true);
1342	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1409	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343	}	1410	}
1344	#endif /* OFFIX_DND */	1411	#endif /* OFFIX_DND */
1345	break;	1412	break;
1346		1413
1347	case MappingNotify:	1414	case MappingNotify:
…		…
1372	break;	1439	break;
1373	}	1440	}
1374	break;	1441	break;
1375		1442
1376	case FocusIn:	1443	case FocusIn:
1377	if (!TermWin.focus)	1444	focus_in ();
		1445	break;
		1446
		1447	case FocusOut:
		1448	focus_out ();
		1449	break;
		1450
		1451	case ConfigureNotify:
		1452	if (ev.xconfigure.window == parent[0])
1378	{	1453	{
1379	TermWin.focus = 1;
1380	want_refresh = 1;
1381	#ifdef USE_XIM
1382	if (Input_Context != NULL)
1383	{
1384	IMSetStatusPosition ();
1385	XSetICFocus (Input_Context);
1386	}
1387	#endif
1388	#ifdef CURSOR_BLINK
1389	if (options & Opt_cursorBlink)
1390	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391	#endif
1392	#ifdef OFF_FOCUS_FADING
1393	if (rs[Rs_fade])
1394	{
1395	pix_colors = pix_colors_focused;
1396	scr_recolour ();
1397	}
1398	#endif
1399
1400	}
1401	break;
1402
1403	case FocusOut:
1404	if (TermWin.focus)
1405	{
1406	TermWin.focus = 0;
1407	want_refresh = 1;
1408
1409	#if ENABLE_FRILLS || ISO_14755
1410	iso14755buf = 0;
1411	#endif
1412	#if ENABLE_OVERLAY
1413	scr_overlay_off ();
1414	#endif
1415	#ifdef USE_XIM
1416	if (Input_Context != NULL)
1417	XUnsetICFocus (Input_Context);
1418	#endif
1419	#ifdef CURSOR_BLINK
1420	if (options & Opt_cursorBlink)
1421	cursor_blink_ev.stop ();
1422	hidden_cursor = 0;
1423	#endif
1424	#ifdef OFF_FOCUS_FADING
1425	if (rs[Rs_fade])
1426	{
1427	pix_colors = pix_colors_unfocused;
1428	scr_recolour ();
1429	}
1430	#endif
1431	}
1432	break;
1433
1434	case ConfigureNotify:
1435	if (ev.xconfigure.window == TermWin.parent[0])
1436	{
1437	int height, width;
1438
1439	do
1440	{ /* Wrap lots of configures into one */
1441	width = ev.xconfigure.width;
1442	height = ev.xconfigure.height;
1443	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444	}
1445	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1454	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1455	;
1446		1456
1447	if (szHint.width != width || szHint.height != height)	1457	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1448	{	1458	{
1449	seen_resize = 1;	1459	seen_resize = 1;
1450	resize_all_windows (width, height, 1);	1460	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1451	}	1461	}
1452		1462
1453	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1463	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1454	if (options & Opt_transparent)	1464	if (OPTION (Opt_transparent))
1455	check_our_parents ();	1465	check_our_parents ();
1456	#endif	1466	#endif
1457	}	1467	}
1458	break;	1468	break;
1459		1469
…		…
1476	case SelectionRequest:	1486	case SelectionRequest:
1477	selection_send (ev.xselectionrequest);	1487	selection_send (ev.xselectionrequest);
1478	break;	1488	break;
1479		1489
1480	case UnmapNotify:	1490	case UnmapNotify:
1481	TermWin.mapped = 0;	1491	mapped = 0;
1482	#ifdef TEXT_BLINK	1492	#ifdef TEXT_BLINK
1483	text_blink_ev.stop ();	1493	text_blink_ev.stop ();
1484	#endif	1494	#endif
1485	break;	1495	break;
1486		1496
1487	case MapNotify:	1497	case MapNotify:
1488	TermWin.mapped = 1;	1498	mapped = 1;
1489	#ifdef TEXT_BLINK	1499	#ifdef TEXT_BLINK
1490	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1500	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1491	#endif	1501	#endif
1492	break;	1502	break;
1493		1503
…		…
1497	break;	1507	break;
1498	#endif /* TRANSPARENT */	1508	#endif /* TRANSPARENT */
1499		1509
1500	case GraphicsExpose:	1510	case GraphicsExpose:
1501	case Expose:	1511	case Expose:
1502	if (ev.xany.window == TermWin.vt)	1512	if (ev.xany.window == vt)
1503	{	1513	{
1504	do	1514	do
1505	scr_expose (ev.xexpose.x, ev.xexpose.y,	1515	scr_expose (ev.xexpose.x, ev.xexpose.y,
1506	ev.xexpose.width, ev.xexpose.height, False);	1516	ev.xexpose.width, ev.xexpose.height, False);
1507	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1517	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1508		1518
1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1519	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510		1520
1511	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1521	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1512	scr_expose (ev.xexpose.x, ev.xexpose.y,	1522	scr_expose (ev.xexpose.x, ev.xexpose.y,
1513	ev.xexpose.width, ev.xexpose.height, False);	1523	ev.xexpose.width, ev.xexpose.height, False);
1514		1524
1515	scr_refresh (refresh_type);	1525	scr_refresh (refresh_type);
1516	}	1526	}
1517	else	1527	else
1518	{	1528	{
1519	XEvent unused_event;	1529	XEvent unused_event;
1520		1530
1521	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1531	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1522	;	1532	;
1523	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1533	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1524	;	1534	;
1525		1535
1526	if (isScrollbarWindow (ev.xany.window))	1536	if (isScrollbarWindow (ev.xany.window))
1527	{	1537	{
1528	scrollBar.setIdle ();	1538	scrollBar.setIdle ();
…		…
1532	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1542	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1533	menubar_expose ();	1543	menubar_expose ();
1534	#endif	1544	#endif
1535		1545
1536	#ifdef TRANSPARENT	1546	#ifdef TRANSPARENT
1537	if (am_transparent && ev.xany.window == TermWin.parent[0])	1547	if (am_transparent && ev.xany.window == parent[0])
1538	XClearWindow (display->display, ev.xany.window);	1548	XClearWindow (disp, ev.xany.window);
1539	#endif	1549	#endif
1540	}	1550	}
1541	break;	1551	break;
1542		1552
1543	case MotionNotify:	1553	case MotionNotify:
…		…
1553	}	1563	}
1554	#endif	1564	#endif
1555	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1565	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1556	break;	1566	break;
1557		1567
1558	if (ev.xany.window == TermWin.vt)	1568	if (ev.xany.window == vt)
1559	{	1569	{
1560	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1570	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1561	{	1571	{
1562	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1572	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1563	;	1573	;
1564		1574
1565	XQueryPointer (display->display, TermWin.vt,	1575	XQueryPointer (disp, vt,
1566	&unused_root, &unused_child,	1576	&unused_root, &unused_child,
1567	&unused_root_x, &unused_root_y,	1577	&unused_root_x, &unused_root_y,
1568	&ev.xbutton.x, &ev.xbutton.y,	1578	&ev.xbutton.x, &ev.xbutton.y,
1569	&ev.xbutton.state);	1579	&ev.xbutton.state);
1570	#ifdef MOUSE_THRESHOLD	1580	#ifdef MOUSE_THRESHOLD
…		…
1582	#endif	1592	#endif
1583	selection_extend (ev.xbutton.x, ev.xbutton.y,	1593	selection_extend (ev.xbutton.x, ev.xbutton.y,
1584	ev.xbutton.state & Button3Mask ? 2 : 0);	1594	ev.xbutton.state & Button3Mask ? 2 : 0);
1585		1595
1586	#ifdef SELECTION_SCROLLING	1596	#ifdef SELECTION_SCROLLING
1587	if (ev.xbutton.y < TermWin.int_bwidth	1597	if (ev.xbutton.y < int_bwidth
1588	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1598	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1589	{	1599	{
1590	int dist;	1600	int dist;
1591		1601
1592	/* don't clobber the current delay if we are	1602	/* don't clobber the current delay if we are
1593	* already in the middle of scrolling.	1603	* already in the middle of scrolling.
…		…
1601	selection_save_x = ev.xbutton.x;	1611	selection_save_x = ev.xbutton.x;
1602	selection_save_y = ev.xbutton.y;	1612	selection_save_y = ev.xbutton.y;
1603	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1613	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1604		1614
1605	/* calc number of lines to scroll */	1615	/* calc number of lines to scroll */
1606	if (ev.xbutton.y < TermWin.int_bwidth)	1616	if (ev.xbutton.y < int_bwidth)
1607	{	1617	{
1608	scroll_selection_dir = UP;	1618	scroll_selection_dir = UP;
1609	dist = TermWin.int_bwidth - ev.xbutton.y;	1619	dist = int_bwidth - ev.xbutton.y;
1610	}	1620	}
1611	else	1621	else
1612	{	1622	{
1613	scroll_selection_dir = DN;	1623	scroll_selection_dir = DN;
1614	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1624	dist = ev.xbutton.y - (int_bwidth + height);
1615	}	1625	}
1616		1626
1617	scroll_selection_lines = Pixel2Height (dist)	1627	scroll_selection_lines = Pixel2Height (dist)
1618	/ SELECTION_SCROLL_LINE_SPEEDUP	1628	/ SELECTION_SCROLL_LINE_SPEEDUP
1619	+ 1;	1629	+ 1;
1620	MIN_IT (scroll_selection_lines,	1630	min_it (scroll_selection_lines,
1621	SELECTION_SCROLL_MAX_LINES);	1631	SELECTION_SCROLL_MAX_LINES);
1622	}	1632	}
1623	else	1633	else
1624	{	1634	{
1625	/* we are within the text window, so we	1635	/* we are within the text window, so we
…		…
1634	#endif	1644	#endif
1635	}	1645	}
1636	}	1646	}
1637	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1647	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638	{	1648	{
1639	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1649	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1640	MotionNotify, &ev))	1650	MotionNotify, &ev))
1641	;	1651	;
1642		1652
1643	XQueryPointer (display->display, scrollBar.win,	1653	XQueryPointer (disp, scrollBar.win,
1644	&unused_root, &unused_child,	1654	&unused_root, &unused_child,
1645	&unused_root_x, &unused_root_y,	1655	&unused_root_x, &unused_root_y,
1646	&ev.xbutton.x, &ev.xbutton.y,	1656	&ev.xbutton.x, &ev.xbutton.y,
1647	&unused_mask);	1657	&unused_mask);
1648	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1653	}	1663	}
1654	break;	1664	break;
1655	}	1665	}
1656	}	1666	}
1657		1667
		1668	void
		1669	rxvt_term::focus_in ()
		1670	{
		1671	if (!focus)
		1672	{
		1673	focus = 1;
		1674	want_refresh = 1;
		1675	#if USE_XIM
		1676	if (Input_Context != NULL)
		1677	{
		1678	IMSetStatusPosition ();
		1679	XSetICFocus (Input_Context);
		1680	}
		1681	#endif
		1682	#if CURSOR_BLINK
		1683	if (OPTION (Opt_cursorBlink))
		1684	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1685	#endif
		1686	#if OFF_FOCUS_FADING
		1687	if (rs[Rs_fade])
		1688	{
		1689	pix_colors = pix_colors_focused;
		1690	scr_recolour ();
		1691	}
		1692	#endif
		1693	}
		1694	}
		1695
		1696	void
		1697	rxvt_term::focus_out ()
		1698	{
		1699	if (focus)
		1700	{
		1701	focus = 0;
		1702	want_refresh = 1;
		1703
		1704	#if ENABLE_FRILLS || ISO_14755
		1705	iso14755buf = 0;
		1706	#endif
		1707	#if ENABLE_OVERLAY
		1708	scr_overlay_off ();
		1709	#endif
		1710	#if USE_XIM
		1711	if (Input_Context != NULL)
		1712	XUnsetICFocus (Input_Context);
		1713	#endif
		1714	#if CURSOR_BLINK
		1715	if (OPTION (Opt_cursorBlink))
		1716	cursor_blink_ev.stop ();
		1717	hidden_cursor = 0;
		1718	#endif
		1719	#if OFF_FOCUS_FADING
		1720	if (rs[Rs_fade])
		1721	{
		1722	pix_colors = pix_colors_unfocused;
		1723	scr_recolour ();
		1724	}
		1725	#endif
		1726	}
		1727	}
		1728
1658	#if TRANSPARENT	1729	#if TRANSPARENT
1659	void	1730	void
1660	rxvt_term::rootwin_cb (XEvent &ev)	1731	rxvt_term::rootwin_cb (XEvent &ev)
1661	{	1732	{
1662	SET_R (this);	1733	SET_R (this);
…		…
1667	case PropertyNotify:	1738	case PropertyNotify:
1668	/*	1739	/*
1669	* if user used some Esetroot compatible prog to set the root bg,	1740	* if user used some Esetroot compatible prog to set the root bg,
1670	* use the property to determine the pixmap. We use it later on.	1741	* use the property to determine the pixmap. We use it later on.
1671	*/	1742	*/
1672	if (xa[XA_XROOTPMAPID] == 0)
1673	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1674
1675	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1743	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1744	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1676	return;	1745	return;
1677		1746
1678	/* FALLTHROUGH */	1747	/* FALLTHROUGH */
1679	case ReparentNotify:	1748	case ReparentNotify:
1680	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1749	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1681	want_refresh = want_full_refresh = 1;	1750	want_refresh = want_full_refresh = 1;
1682	break;	1751	break;
1683	}	1752	}
1684	}	1753	}
1685	#endif	1754	#endif
…		…
1694	reportmode = !! (priv_modes & PrivMode_mouse_report);	1763	reportmode = !! (priv_modes & PrivMode_mouse_report);
1695		1764
1696	/*	1765	/*
1697	* VT window processing of button press	1766	* VT window processing of button press
1698	*/	1767	*/
1699	if (ev.window == TermWin.vt)	1768	if (ev.window == vt)
1700	{	1769	{
1701	#if ISO_14755	1770	#if ISO_14755
1702	// 5.4	1771	// 5.4
1703	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1772	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704	{	1773	{
…		…
1752	{	1821	{
1753	case Button1:	1822	case Button1:
1754	/* allow meta + click to select rectangular areas */	1823	/* allow meta + click to select rectangular areas */
1755	/* should be done in screen.C */	1824	/* should be done in screen.C */
1756	#if ENABLE_FRILLS	1825	#if ENABLE_FRILLS
1757	selection.rect = !! (ev.state & ModMetaMask);	1826	selection.rect = !!(ev.state & ModMetaMask);
1758	#else	1827	#else
1759	selection.rect = false;	1828	selection.rect = false;
1760	#endif	1829	#endif
1761		1830
1762	/* allow shift+left click to extend selection */	1831	/* allow shift+left click to extend selection */
…		…
1909	case Button3:	1978	case Button3:
1910	if (scrollBar.style != R_SB_XTERM)	1979	if (scrollBar.style != R_SB_XTERM)
1911	{	1980	{
1912	if (scrollbar_above_slider (ev.y))	1981	if (scrollbar_above_slider (ev.y))
1913	# ifdef RXVT_SCROLL_FULL	1982	# ifdef RXVT_SCROLL_FULL
1914	scr_page (UP, TermWin.nrow - 1);	1983	scr_page (UP, nrow - 1);
1915	# else	1984	# else
1916	scr_page (UP, TermWin.nrow / 4);	1985	scr_page (UP, nrow / 4);
1917	# endif	1986	# endif
1918	else if (scrollbar_below_slider (ev.y))	1987	else if (scrollbar_below_slider (ev.y))
1919	# ifdef RXVT_SCROLL_FULL	1988	# ifdef RXVT_SCROLL_FULL
1920	scr_page (DN, TermWin.nrow - 1);	1989	scr_page (DN, nrow - 1);
1921	# else	1990	# else
1922	scr_page (DN, TermWin.nrow / 4);	1991	scr_page (DN, nrow / 4);
1923	# endif	1992	# endif
1924	else	1993	else
1925	scrollBar.setMotion ();	1994	scrollBar.setMotion ();
1926	}	1995	}
1927	else	1996	else
1928	{	1997	{
1929	scr_page ((ev.button == Button1 ? DN : UP),	1998	scr_page ((ev.button == Button1 ? DN : UP),
1930	(TermWin.nrow	1999	(nrow
1931	* scrollbar_position (ev.y)	2000	* scrollbar_position (ev.y)
1932	/ scrollbar_size ()));	2001	/ scrollbar_size ()));
1933	}	2002	}
1934		2003
1935	break;	2004	break;
…		…
1967	#ifdef SELECTION_SCROLLING	2036	#ifdef SELECTION_SCROLLING
1968	if (sel_scroll_ev.active)	2037	if (sel_scroll_ev.active)
1969	sel_scroll_ev.stop();	2038	sel_scroll_ev.stop();
1970	#endif	2039	#endif
1971		2040
1972	if (ev.window == TermWin.vt)	2041	if (ev.window == vt)
1973	{	2042	{
1974	#if ISO_14755	2043	#if ISO_14755
1975	// 5.4	2044	// 5.4
1976	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2045	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977	return;	2046	return;
…		…
2027		2096
2028	v = ev.button == Button4 ? UP : DN;	2097	v = ev.button == Button4 ? UP : DN;
2029		2098
2030	if (ev.state & ShiftMask)	2099	if (ev.state & ShiftMask)
2031	i = 1;	2100	i = 1;
2032	else if (options & Opt_mouseWheelScrollPage)	2101	else if (OPTION (Opt_mouseWheelScrollPage))
2033	i = TermWin.nrow - 1;	2102	i = nrow - 1;
2034	else	2103	else
2035	i = 5;	2104	i = 5;
2036		2105
2037	# ifdef MOUSE_SLIP_WHEELING	2106	# ifdef MOUSE_SLIP_WHEELING
2038	if (ev.state & ControlMask)	2107	if (ev.state & ControlMask)
2039	{	2108	{
2040	mouse_slip_wheel_speed += v ? -1 : 1;	2109	mouse_slip_wheel_speed += v ? -1 : 1;
2041	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2110	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2042	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2111	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2043		2112
2044	if (slip_wheel_ev.at < NOW)	2113	if (slip_wheel_ev.at < NOW)
2045	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2114	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046		2115
2047	slip_wheel_ev.start ();	2116	slip_wheel_ev.start ();
…		…
2088	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2157	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2158	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2159	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091	int i;	2160	int i;
2092		2161
2093	Visual* visual = display->visual;	2162	Visual *visual = display->visual;
2094		2163
2095	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2164	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096		2165
2097	/* for convenience */	2166	/* for convenience */
2098	mask_r = visual->red_mask;	2167	mask_r = visual->red_mask;
…		…
2319	Atom atype;	2388	Atom atype;
2320	unsigned char *prop = NULL;	2389	unsigned char *prop = NULL;
2321	Window root, oldp, *list;	2390	Window root, oldp, *list;
2322	Pixmap rootpixmap = None;	2391	Pixmap rootpixmap = None;
2323	XWindowAttributes wattr, wrootattr;	2392	XWindowAttributes wattr, wrootattr;
		2393	dDisp;
2324		2394
2325	pchanged = 0;	2395	pchanged = 0;
2326		2396
2327	if (!(options & Opt_transparent))	2397	if (!OPTION (Opt_transparent))
2328	return pchanged; /* Don't try any more */	2398	return pchanged; /* Don't try any more */
2329		2399
2330	XGetWindowAttributes (display->display, display->root, &wrootattr);	2400	XGetWindowAttributes (disp, display->root, &wrootattr);
2331	rootdepth = wrootattr.depth;	2401	rootdepth = wrootattr.depth;
2332		2402
2333	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2403	XGetWindowAttributes (disp, parent[0], &wattr);
2334		2404
2335	if (rootdepth != wattr.depth)	2405	if (rootdepth != wattr.depth)
2336	{	2406	{
2337	if (am_transparent)	2407	if (am_transparent)
2338	{	2408	{
2339	pchanged = 1;	2409	pchanged = 1;
2340	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2410	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2341	am_transparent = am_pixmap_trans = 0;	2411	am_transparent = am_pixmap_trans = 0;
2342	}	2412	}
2343		2413
2344	return pchanged; /* Don't try any more */	2414	return pchanged; /* Don't try any more */
2345	}	2415	}
2346		2416
2347	/* Get all X ops out of the queue so that our information is up-to-date. */	2417	/* Get all X ops out of the queue so that our information is up-to-date. */
2348	XSync (display->display, False);	2418	XSync (disp, False);
2349		2419
2350	/*	2420	/*
2351	* Make the frame window set by the window manager have	2421	* Make the frame window set by the window manager have
2352	* the root background. Some window managers put multiple nested frame	2422	* the root background. Some window managers put multiple nested frame
2353	* windows for each client, so we have to take care about that.	2423	* windows for each client, so we have to take care about that.
2354	*/	2424	*/
2355	i = (xa[XA_XROOTPMAPID]	2425	i = (xa[XA_XROOTPMAP_ID]
2356	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2426	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2357	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2427	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358	&nitems, &bytes_after, &prop) == Success);	2428	&nitems, &bytes_after, &prop) == Success);
2359		2429
2360	if (!i || prop == NULL)	2430	if (!i || prop == NULL)
2361	i = (xa[XA_XSETROOTID]	2431	i = (xa[XA_ESETROOT_PMAP_ID]
2362	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2432	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2363	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2365		2435
2366	if (!i || prop == NULL	2436	if (!i || prop == NULL
2367	#if TINTING	2437	#if TINTING
…		…
2386	Window cr;	2456	Window cr;
2387	XImage *image;	2457	XImage *image;
2388	GC gc;	2458	GC gc;
2389	XGCValues gcvalue;	2459	XGCValues gcvalue;
2390		2460
2391	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2461	XTranslateCoordinates (disp, parent[0], display->root,
2392	0, 0, &sx, &sy, &cr);	2462	0, 0, &sx, &sy, &cr);
2393	nw = (unsigned int)szHint.width;	2463	nw = (unsigned int)szHint.width;
2394	nh = (unsigned int)szHint.height;	2464	nh = (unsigned int)szHint.height;
2395	nx = ny = 0;	2465	nx = ny = 0;
2396		2466
…		…
2406	nh += sy;	2476	nh += sy;
2407	ny = -sy;	2477	ny = -sy;
2408	sy = 0;	2478	sy = 0;
2409	}	2479	}
2410		2480
2411	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2481	min_it (nw, (unsigned int) (wrootattr.width - sx));
2412	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2482	min_it (nh, (unsigned int) (wrootattr.height - sy));
2413		2483
2414	XSync (display->display, False);	2484	XSync (disp, False);
2415	allowedxerror = -1;	2485	allowedxerror = -1;
2416	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2486	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417		2487
2418	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2488	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2419	/* XXX: may need a delay here? */	2489	/* XXX: may need a delay here? */
2420	allowedxerror = 0;	2490	allowedxerror = 0;
2421		2491
2422	if (image == NULL)	2492	if (image == NULL)
2423	{	2493	{
2424	if (am_transparent && am_pixmap_trans)	2494	if (am_transparent && am_pixmap_trans)
2425	{	2495	{
2426	pchanged = 1;	2496	pchanged = 1;
2427	if (TermWin.pixmap != None)	2497	if (pixmap != None)
2428	{	2498	{
2429	XFreePixmap (display->display, TermWin.pixmap);	2499	XFreePixmap (disp, pixmap);
2430	TermWin.pixmap = None;	2500	pixmap = None;
2431	}	2501	}
2432	}	2502	}
2433		2503
2434	am_pixmap_trans = 0;	2504	am_pixmap_trans = 0;
2435	}	2505	}
2436	else	2506	else
2437	{	2507	{
2438	if (TermWin.pixmap != None)	2508	if (pixmap != None)
2439	XFreePixmap (display->display, TermWin.pixmap);	2509	XFreePixmap (disp, pixmap);
2440		2510
2441	#if TINTING	2511	#if TINTING
2442	if (ISSET_PIXCOLOR (Color_tint))	2512	if (ISSET_PIXCOLOR (Color_tint))
2443	{	2513	{
2444	unsigned short rm, gm, bm;	2514	unsigned short rm, gm, bm;
…		…
2448		2518
2449	ShadeXImage (display, image, shade, rm, gm, bm);	2519	ShadeXImage (display, image, shade, rm, gm, bm);
2450	}	2520	}
2451	#endif	2521	#endif
2452		2522
2453	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2523	pixmap = XCreatePixmap (disp, vt,
2454	szHint.width, szHint.height, image->depth);	2524	szHint.width, szHint.height, image->depth);
2455	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2525	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2456	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2526	XPutImage (disp, pixmap, gc, image, 0, 0,
2457	nx, ny, image->width, image->height);	2527	nx, ny, image->width, image->height);
2458	XFreeGC (display->display, gc);	2528	XFreeGC (disp, gc);
2459	XDestroyImage (image);	2529	XDestroyImage (image);
2460	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2530	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2461	XClearWindow (display->display, TermWin.parent[0]);	2531	XClearWindow (disp, parent[0]);
2462		2532
2463	if (!am_transparent || !am_pixmap_trans)	2533	if (!am_transparent || !am_pixmap_trans)
2464	pchanged = 1;	2534	pchanged = 1;
2465		2535
2466	am_transparent = am_pixmap_trans = 1;	2536	am_transparent = am_pixmap_trans = 1;
2467	}	2537	}
2468	}	2538	}
2469		2539
2470	if (am_pixmap_trans)	2540	if (am_pixmap_trans)
2471	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2541	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2472	else	2542	else
2473	{	2543	{
2474	unsigned int n;	2544	unsigned int n;
2475	/*	2545	/*
2476	* InheritPixmap transparency	2546	* InheritPixmap transparency
2477	*/	2547	*/
2478	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2548	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2479	{	2549	{
2480	oldp = TermWin.parent[i];	2550	oldp = parent[i];
2481	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2551	XQueryTree (disp, parent[i - 1], &root,
2482	&TermWin.parent[i], &list, &n);	2552	&parent[i], &list, &n);
2483	XFree (list);	2553	XFree (list);
2484		2554
2485	if (TermWin.parent[i] == display->root)	2555	if (parent[i] == display->root)
2486	{	2556	{
2487	if (oldp != None)	2557	if (oldp != None)
2488	pchanged = 1;	2558	pchanged = 1;
2489		2559
2490	break;	2560	break;
2491	}	2561	}
2492		2562
2493	if (oldp != TermWin.parent[i])	2563	if (oldp != parent[i])
2494	pchanged = 1;	2564	pchanged = 1;
2495	}	2565	}
2496		2566
2497	n = 0;	2567	n = 0;
2498		2568
2499	if (pchanged)	2569	if (pchanged)
2500	{	2570	{
2501	for (; n < (unsigned int)i; n++)	2571	for (; n < (unsigned int)i; n++)
2502	{	2572	{
2503	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2573	XGetWindowAttributes (disp, parent[n], &wattr);
2504	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2574	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2505	{	2575	{
2506	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2576	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2507	break;	2577	break;
2508	}	2578	}
2509	}	2579	}
2510	}	2580	}
2511		2581
2512	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2582	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2513	{	2583	{
2514	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2584	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2515	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2585	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2516	am_transparent = 0;	2586	am_transparent = 0;
2517	/* XXX: also turn off Opt_transparent? */	2587	/* XXX: also turn off Opt_transparent? */
2518	}	2588	}
2519	else	2589	else
2520	{	2590	{
…		…
2523	* needed for fvwm2.2.2 (and before?) */	2593	* needed for fvwm2.2.2 (and before?) */
2524	sleep (1);	2594	sleep (1);
2525	#endif	2595	#endif
2526	for (n = 0; n < (unsigned int)i; n++)	2596	for (n = 0; n < (unsigned int)i; n++)
2527	{	2597	{
2528	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2598	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2529	XClearWindow (display->display, TermWin.parent[n]);	2599	XClearWindow (disp, parent[n]);
2530	}	2600	}
2531		2601
2532	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2602	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2533	am_transparent = 1;	2603	am_transparent = 1;
2534	}	2604	}
2535		2605
2536	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2606	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2537	TermWin.parent[i] = None;	2607	parent[i] = None;
2538	}	2608	}
2539		2609
2540	if (scrollBar.win)	2610	if (scrollBar.win)
2541	{	2611	{
2542	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2612	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2543	scrollBar.setIdle ();	2613	scrollBar.setIdle ();
2544	scrollbar_show (0);	2614	scrollbar_show (0);
2545	}	2615	}
2546		2616
2547	if (am_transparent)	2617	if (am_transparent)
…		…
2585	// some window managers resize the window early, and these programs	2655	// some window managers resize the window early, and these programs
2586	// then sometimes get the size wrong.	2656	// then sometimes get the size wrong.
2587	// unfortunately other programs are even more buggy and dislike	2657	// unfortunately other programs are even more buggy and dislike
2588	// being sent SIGWINCH, so only do it when we were in fact being	2658	// being sent SIGWINCH, so only do it when we were in fact being
2589	// resized.	2659	// resized.
2590	if (seen_resize)	2660	if (seen_resize && cmd_pid)
2591	kill (-cmd_pid, SIGWINCH);	2661	kill (-cmd_pid, SIGWINCH);
2592	}	2662	}
2593		2663
2594	/* Read a text string from the input buffer */	2664	/* Read a text string from the input buffer */
2595	unicode_t buf[UBUFSIZ];	2665	unicode_t buf[UBUFSIZ];
2596	bool refreshnow = false;	2666	bool refreshnow = false;
2597	int nlines = 0;	2667	int nlines = 0;
2598	unicode_t *str = buf;	2668	unicode_t *str = buf;
		2669	unicode_t *eol = str + min (ncol, UBUFSIZ);
2599		2670
2600	for (;;)	2671	for (;;)
2601	{	2672	{
2602	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2673	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2603	break;	2674	break;
2604		2675
2605	*str++ = ch;	2676	*str++ = ch;
2606		2677
2607	if (ch == C0_LF)	2678	if (ch == C0_LF || str >= eol)
2608	{	2679	{
		2680	if (ch == C0_LF)
2609	nlines++;	2681	nlines++;
		2682
2610	refresh_count++;	2683	refresh_count++;
2611		2684
2612	if (!(options & Opt_jumpScroll)	2685	if (!OPTION (Opt_jumpScroll)
2613	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2686	|| (refresh_count >= refresh_limit * (nrow - 1)))
2614	{	2687	{
2615	refreshnow = true;	2688	refreshnow = true;
2616	ch = NOCHAR;	2689	ch = NOCHAR;
2617	break;	2690	break;
2618	}	2691	}
2619		2692
2620	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2693	// scr_add_lines only works for nlines <= nrow - 1.
2621	if (nlines >= TermWin.nrow - 1)	2694	if (nlines >= nrow - 1)
2622	{	2695	{
2623	scr_add_lines (buf, nlines, str - buf);	2696	scr_add_lines (buf, nlines, str - buf);
2624	nlines = 0;	2697	nlines = 0;
2625	str = buf;	2698	str = buf;
		2699	eol = str + min (ncol, UBUFSIZ);
2626	}	2700	}
2627	}
2628		2701
2629	if (str >= buf + UBUFSIZ)	2702	if (str >= eol)
2630	{	2703	{
		2704	if (eol >= buf + UBUFSIZ)
		2705	{
2631	ch = NOCHAR;	2706	ch = NOCHAR;
2632	break;	2707	break;
		2708	}
		2709	else
		2710	eol = min (eol + ncol, buf + UBUFSIZ);
		2711	}
		2712
2633	}	2713	}
2634		2714
2635	seq_begin = cmdbuf_ptr;	2715	seq_begin = cmdbuf_ptr;
2636	ch = next_char ();	2716	ch = next_char ();
2637	}	2717	}
…		…
2644	* the number of pages between refreshes is refresh_limit, which	2724	* the number of pages between refreshes is refresh_limit, which
2645	* is incremented here because we must be doing flat-out scrolling.	2725	* is incremented here because we must be doing flat-out scrolling.
2646	*/	2726	*/
2647	if (refreshnow)	2727	if (refreshnow)
2648	{	2728	{
2649	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2729	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2650	refresh_limit++;	2730	refresh_limit++;
2651	else	2731	else
2652	{	2732	{
2653	flag = true;	2733	flag = true;
2654	scr_refresh (refresh_type);	2734	scr_refresh (refresh_type);
…		…
2708	if (len == (size_t)-1)	2788	if (len == (size_t)-1)
2709	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2789	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2710		2790
2711	// assume wchar == unicode	2791	// assume wchar == unicode
2712	cmdbuf_ptr += len;	2792	cmdbuf_ptr += len;
2713	return wc;	2793	return wc & UNICODE_MASK;
2714	}	2794	}
2715		2795
2716	return NOCHAR;	2796	return NOCHAR;
2717	}	2797	}
2718		2798
…		…
3181	{	3261	{
3182	switch (priv)	3262	switch (priv)
3183	{	3263	{
3184	case '>':	3264	case '>':
3185	if (ch == CSI_DA) /* secondary device attributes */	3265	if (ch == CSI_DA) /* secondary device attributes */
3186	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3266	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3187	break;	3267	break;
3188	case '?':	3268	case '?':
3189	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3269	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3190	process_terminal_mode (ch, priv, nargs, arg);	3270	process_terminal_mode (ch, priv, nargs, arg);
3191	break;	3271	break;
…		…
3296		3376
3297	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3377	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3298	arg[0] = -arg[0];	3378	arg[0] = -arg[0];
3299	/* FALLTHROUGH */	3379	/* FALLTHROUGH */
3300	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3380	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3301	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3381	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3302	break;	3382	break;
3303		3383
3304	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3384	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3305	tt_write ((const unsigned char *)VT100_ANS,	3385	tt_write ((const unsigned char *)VT100_ANS,
3306	(unsigned int) (sizeof (VT100_ANS) - 1));	3386	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3318	break;	3398	break;
3319	case 6: /* CPR requested */	3399	case 6: /* CPR requested */
3320	scr_report_position ();	3400	scr_report_position ();
3321	break;	3401	break;
3322	case 7: /* unofficial extension */	3402	case 7: /* unofficial extension */
3323	if (options & Opt_insecure)	3403	if (OPTION (Opt_insecure))
3324	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3404	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3325	break;	3405	break;
3326	case 8: /* unofficial extension */	3406	case 8: /* unofficial extension */
3327	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3407	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3328	break;	3408	break;
…		…
3420	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3500	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421	{	3501	{
3422	int x, y;	3502	int x, y;
3423	XWindowAttributes wattr;	3503	XWindowAttributes wattr;
3424	Window wdummy;	3504	Window wdummy;
		3505	dDisp;
3425		3506
3426	if (nargs == 0)	3507	if (nargs == 0)
3427	return;	3508	return;
3428		3509
3429	switch (args[0])	3510	switch (args[0])
3430	{	3511	{
3431	/*	3512	/*
3432	* commands	3513	* commands
3433	*/	3514	*/
3434	case 1: /* deiconify window */	3515	case 1: /* deiconify window */
3435	XMapWindow (display->display, TermWin.parent[0]);	3516	XMapWindow (disp, parent[0]);
3436	break;	3517	break;
3437	case 2: /* iconify window */	3518	case 2: /* iconify window */
3438	XIconifyWindow (display->display, TermWin.parent[0],	3519	XIconifyWindow (disp, parent[0], display->screen);
3439	DefaultScreen (display->display));
3440	break;	3520	break;
3441	case 3: /* set position (pixels) */	3521	case 3: /* set position (pixels) */
3442	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3522	XMoveWindow (disp, parent[0], args[1], args[2]);
3443	break;	3523	break;
3444	case 4: /* set size (pixels) */	3524	case 4: /* set size (pixels) */
3445	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3525	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446	break;	3526	break;
3447	case 5: /* raise window */	3527	case 5: /* raise window */
3448	XRaiseWindow (display->display, TermWin.parent[0]);	3528	XRaiseWindow (disp, parent[0]);
3449	break;	3529	break;
3450	case 6: /* lower window */	3530	case 6: /* lower window */
3451	XLowerWindow (display->display, TermWin.parent[0]);	3531	XLowerWindow (disp, parent[0]);
3452	break;	3532	break;
3453	case 7: /* refresh window */	3533	case 7: /* refresh window */
3454	scr_touch (true);	3534	scr_touch (true);
3455	break;	3535	break;
3456	case 8: /* set size (chars) */	3536	case 8: /* set size (chars) */
3457	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3537	set_widthheight ((unsigned int) (args[2] * fwidth),
3458	(unsigned int) (args[1] * TermWin.fheight));	3538	(unsigned int) (args[1] * fheight));
3459	break;	3539	break;
3460		3540
3461	//case 9: NYI, TODO, restore maximized window or maximize window	3541	//case 9: NYI, TODO, restore maximized window or maximize window
3462	default:	3542	default:
3463	if (args[0] >= 24) /* set height (chars) */	3543	if (args[0] >= 24) /* set height (chars) */
3464	set_widthheight ((unsigned int)TermWin.width,	3544	set_widthheight ((unsigned int)width,
3465	(unsigned int) (args[1] * TermWin.fheight));	3545	(unsigned int) (args[1] * fheight));
3466	break;	3546	break;
3467		3547
3468		3548
3469	/*	3549	/*
3470	* reports - some output format copied from XTerm	3550	* reports - some output format copied from XTerm
3471	*/	3551	*/
3472	case 11: /* report window state */	3552	case 11: /* report window state */
3473	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3553	XGetWindowAttributes (disp, parent[0], &wattr);
3474	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3554	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475	break;	3555	break;
3476	case 13: /* report window position */	3556	case 13: /* report window position */
3477	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3557	XGetWindowAttributes (disp, parent[0], &wattr);
3478	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3558	XTranslateCoordinates (disp, parent[0], wattr.root,
3479	-wattr.border_width, -wattr.border_width,	3559	-wattr.border_width, -wattr.border_width,
3480	&x, &y, &wdummy);	3560	&x, &y, &wdummy);
3481	tt_printf ("\033[3;%d;%dt", x, y);	3561	tt_printf ("\033[3;%d;%dt", x, y);
3482	break;	3562	break;
3483	case 14: /* report window size (pixels) */	3563	case 14: /* report window size (pixels) */
3484	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3564	XGetWindowAttributes (disp, parent[0], &wattr);
3485	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3565	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486	break;	3566	break;
3487	case 18: /* report text area size (chars) */	3567	case 18: /* report text area size (chars) */
3488	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3568	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3489	break;	3569	break;
3490	case 19: /* report window size (chars) */	3570	case 19: /* report window size (chars) */
3491	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3571	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3492	break;	3572	break;
3493	case 20: /* report icon label */	3573	case 20: /* report icon label */
3494	{	3574	{
3495	char *s;	3575	char *s;
3496	XGetIconName (display->display, TermWin.parent[0], &s);	3576	XGetIconName (disp, parent[0], &s);
3497	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3577	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3498	XFree (s);	3578	XFree (s);
3499	}	3579	}
3500	break;	3580	break;
3501	case 21: /* report window title */	3581	case 21: /* report window title */
3502	{	3582	{
3503	char *s;	3583	char *s;
3504	XFetchName (display->display, TermWin.parent[0], &s);	3584	XFetchName (disp, parent[0], &s);
3505	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3585	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3506	XFree (s);	3586	XFree (s);
3507	}	3587	}
3508	break;	3588	break;
3509	}	3589	}
3510	}	3590	}
…		…
3542	else if (ch < 0x20)	3622	else if (ch < 0x20)
3543	return NULL; /* other control character - exit */	3623	return NULL; /* other control character - exit */
3544		3624
3545	seen_esc = false;	3625	seen_esc = false;
3546		3626
3547	if (n >= sizeof (string) - 1)	3627	if (n >= STRING_MAX - 1)
3548	// stop at some sane length	3628	// stop at some sane length
3549	return NULL;	3629	return NULL;
3550		3630
3551	if (ch == C0_SYN)	3631	if (ch == C0_SYN)
3552	string[n++] = cmd_get8 ();	3632	string[n++] = cmd_get8 ();
…		…
3620	set_window_color (color, str);	3700	set_window_color (color, str);
3621	}	3701	}
3622		3702
3623	/*	3703	/*
3624	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3704	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3625	* 0 = change iconName/title
3626	* 1 = change iconName
3627	* 2 = change title
3628	* 4 = change color
3629	* 10 = change fg color
3630	* 11 = change bg color
3631	* 12 = change text color
3632	* 13 = change mouse foreground color
3633	* 17 = change highlight character colour
3634	* 18 = change bold character color
3635	* 19 = change underlined character color
3636	* 46 = change logfile (not implemented)
3637	* 50 = change font
3638	*
3639	* rxvt extensions:
3640	* 20 = bg pixmap
3641	* 39 = change default fg color
3642	* 49 = change default bg color
3643	* 55 = dump scrollback buffer and all of screen
3644	* 701 = change locale
3645	* 702 = find font
3646	* 703 = menu
3647	*/	3705	*/
3648	void	3706	void
3649	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3707	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3650	{	3708	{
3651	int changed = 0;	3709	int changed = 0;
3652	int color;	3710	int color;
3653	char *buf, *name;	3711	char *buf, *name;
3654	bool query = str[0] == '?' && !str[1];	3712	bool query = str[0] == '?' && !str[1];
3655	int saveop = op;	3713	int saveop = op;
		3714	dDisp;
3656		3715
3657	assert (str != NULL);	3716	assert (str != NULL);
3658	switch (op)	3717	switch (op)
3659	{	3718	{
3660	case XTerm_name:	3719	case XTerm_name:
…		…
3676	unsigned long bytes_after;	3735	unsigned long bytes_after;
3677	unsigned char *value = 0;	3736	unsigned char *value = 0;
3678	const char *str = "";	3737	const char *str = "";
3679		3738
3680	if (prop	3739	if (prop
3681	&& XGetWindowProperty (display->display, TermWin.parent[0],	3740	&& XGetWindowProperty (disp, parent[0],
3682	prop, 0, 1<<16, 0, AnyPropertyType,	3741	prop, 0, 1<<16, 0, AnyPropertyType,
3683	&actual_type, &actual_format,	3742	&actual_type, &actual_format,
3684	&nitems, &bytes_after, &value) == Success	3743	&nitems, &bytes_after, &value) == Success
3685	&& actual_type != None	3744	&& actual_type != None
3686	&& actual_format == 8)	3745	&& actual_format == 8)
…		…
3698	{	3757	{
3699	*eq = 0;	3758	*eq = 0;
3700	set_utf8_property (display->atom (str), eq + 1);	3759	set_utf8_property (display->atom (str), eq + 1);
3701	}	3760	}
3702	else	3761	else
3703	XDeleteProperty (display->display, TermWin.parent[0],	3762	XDeleteProperty (disp, parent[0],
3704	display->atom (str));	3763	display->atom (str));
3705	}	3764	}
3706	break;	3765	break;
3707		3766
3708	case XTerm_Color:	3767	case XTerm_Color:
…		…
3749	break;	3808	break;
3750	#ifndef NO_BOLD_UNDERLINE_REVERSE	3809	#ifndef NO_BOLD_UNDERLINE_REVERSE
3751	case XTerm_Color_BD:	3810	case XTerm_Color_BD:
3752	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3811	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3753	break;	3812	break;
3754	case XTerm_Color_IT:
3755	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756	break;
3757	case XTerm_Color_UL:	3813	case XTerm_Color_UL:
3758	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3814	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3759	break;	3815	break;
3760	case XTerm_Color_RV:	3816	case XTerm_Color_RV:
3761	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3817	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762	break;	3818	break;
		3819	case URxvt_Color_IT:
		3820	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3821	break;
3763	#endif	3822	#endif
3764	#if TRANSPARENT && TINTING	3823	#if TRANSPARENT && TINTING
3765	case XTerm_Color_tint:	3824	case URxvt_Color_tint:
3766	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3825	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3767	check_our_parents ();	3826	check_our_parents ();
3768	if (am_transparent)	3827	if (am_transparent)
3769	want_full_refresh = want_refresh = 1;	3828	want_full_refresh = want_refresh = 1;
3770	break;	3829	break;
3771	#endif	3830	#endif
…		…
3783	{	3842	{
3784	str++;	3843	str++;
3785	#if XPM_BACKGROUND	3844	#if XPM_BACKGROUND
3786	changed += scale_pixmap (str);	3845	changed += scale_pixmap (str);
3787	#endif	3846	#endif
3788
3789	}	3847	}
		3848
3790	if (changed)	3849	if (changed)
3791	{	3850	{
3792	#ifdef XPM_BACKGROUND	3851	#ifdef XPM_BACKGROUND
3793	resize_pixmap ();	3852	resize_pixmap ();
3794	#endif	3853	#endif
…		…
3805		3864
3806	case XTerm_logfile:	3865	case XTerm_logfile:
3807	// TODO, when secure mode?	3866	// TODO, when secure mode?
3808	break;	3867	break;
3809		3868
		3869	#ifdef MENUBAR
		3870	case URxvt_Menu:
		3871	if (OPTION (Opt_insecure))
		3872	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3873	break;
		3874	#endif
		3875	#if 0
		3876	case XTerm_dumpscreen: /* no error notices */
		3877	{
		3878	int fd;
		3879	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3880	{
		3881	scr_dump (fd);
		3882	close (fd);
		3883	}
		3884	}
		3885	break;
		3886	#endif
3810	case XTerm_font:	3887	case XTerm_font:
3811	op = URxvt_font;	3888	op = URxvt_font;
3812	case URxvt_font:	3889	case URxvt_font:
3813	#if ENABLE_STYLES	3890	#if ENABLE_STYLES
3814	case URxvt_boldFont:	3891	case URxvt_boldFont:
3815	case URxvt_italicFont:	3892	case URxvt_italicFont:
3816	case URxvt_boldItalicFont:	3893	case URxvt_boldItalicFont:
3817	#endif	3894	#endif
3818	if (query)	3895	if (query)
3819	tt_printf ("\33]%d;%-.250s%c", saveop,	3896	tt_printf ("\33]%d;%-.250s%c", saveop,
3820	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3897	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3821	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3898	? fontset[op - URxvt_font]->fontdesc : "",
3822	resp);	3899	resp);
3823	else	3900	else
3824	{	3901	{
3825	const char *&res = rs[Rs_font + (op - URxvt_font)];	3902	const char *&res = rs[Rs_font + (op - URxvt_font)];
3826		3903
…		…
3829	set_fonts ();	3906	set_fonts ();
3830	}	3907	}
3831	break;	3908	break;
3832		3909
3833	#if ENABLE_FRILLS	3910	#if ENABLE_FRILLS
3834	case XTerm_locale:	3911	case URxvt_locale:
3835	if (query)	3912	if (query)
3836	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3913	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3837	else	3914	else
3838	{	3915	{
3839	set_locale (str);	3916	set_locale (str);
3840	# ifdef USE_XIM	3917	pty.set_utf8_mode (enc_utf8);
3841	im_cb ();	3918	init_xlocale ();
3842	# endif
3843	}	3919	}
3844	break;	3920	break;
3845	#endif
3846		3921
3847	#ifdef MENUBAR	3922	case URxvt_view_up:
3848	case XTerm_Menu:	3923	case URxvt_view_down:
3849	if (options & Opt_insecure)	3924	int lines = atoi (str);
3850	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3925
3851	break;	3926	if (lines)
3852	#endif	3927	scr_page (op == URxvt_view_up ? UP : DN, lines);
3853	#if 0
3854	case XTerm_dumpscreen: /* no error notices */
3855	{	3928	else
3856	int fd;
3857	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3858	{	3929	{
3859	scr_dump (fd);	3930	scr_erase_savelines ();
3860	close (fd);
3861	}	3931	}
3862	}	3932
3863	break;	3933	break;
3864	#endif	3934	#endif
3865	}	3935	}
3866	}	3936	}
3867	/*----------------------------------------------------------------------*/	3937	/*----------------------------------------------------------------------*/
…		…
3976	}	4046	}
3977		4047
3978	/* extra handling for values with state unkept */	4048	/* extra handling for values with state unkept */
3979	switch (arg[i])	4049	switch (arg[i])
3980	{	4050	{
		4051	#if ENABLE_STYLES
		4052	case 1021:
		4053	if (mode)
		4054	SET_OPTION (Opt_intensityStyles);
		4055	else
		4056	CLR_OPTION (Opt_intensityStyles);
		4057	#endif
3981	case 1048: /* alternative cursor save */	4058	case 1048: /* alternative cursor save */
3982	case 1049:	4059	case 1049:
3983	if (options & Opt_secondaryScreen)	4060	if (OPTION (Opt_secondaryScreen))
3984	if (mode == 0)	4061	if (mode == 0)
3985	scr_cursor (RESTORE);	4062	scr_cursor (RESTORE);
3986	else if (mode == 1)	4063	else if (mode == 1)
3987	scr_cursor (SAVE);	4064	scr_cursor (SAVE);
3988	break;	4065	break;
…		…
4000	*/	4077	*/
4001	PrivMode (1, PrivMode_vt52);	4078	PrivMode (1, PrivMode_vt52);
4002	break;	4079	break;
4003	case 3: /* 80/132 */	4080	case 3: /* 80/132 */
4004	if (priv_modes & PrivMode_132OK)	4081	if (priv_modes & PrivMode_132OK)
4005	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4082	set_widthheight (((state ? 132 : 80) * fwidth), height);
4006	break;	4083	break;
4007	case 4: /* smooth scrolling */	4084	case 4: /* smooth scrolling */
4008	if (state)	4085	if (!state)
4009	options &= ~Opt_jumpScroll;	4086	SET_OPTION (Opt_jumpScroll);
4010	else	4087	else
4011	options |= Opt_jumpScroll;	4088	CLR_OPTION (Opt_jumpScroll);
4012	break;	4089	break;
4013	case 5: /* reverse video */	4090	case 5: /* reverse video */
4014	scr_rvideo_mode (state);	4091	scr_rvideo_mode (state);
4015	break;	4092	break;
4016	case 6: /* relative/absolute origins */	4093	case 6: /* relative/absolute origins */
…		…
4057	#if 0	4134	#if 0
4058	case 1001:	4135	case 1001:
4059	break; /* X11 mouse highlighting */	4136	break; /* X11 mouse highlighting */
4060	#endif	4137	#endif
4061	case 1010: /* scroll to bottom on TTY output inhibit */	4138	case 1010: /* scroll to bottom on TTY output inhibit */
4062	if (state)	4139	if (!state)
4063	options &= ~Opt_scrollTtyOutput;	4140	SET_OPTION (Opt_scrollTtyOutput);
4064	else	4141	else
4065	options |= Opt_scrollTtyOutput;	4142	CLR_OPTION (Opt_scrollTtyOutput);
4066	break;	4143	break;
4067	case 1011: /* scroll to bottom on key press */	4144	case 1011: /* scroll to bottom on key press */
4068	if (state)	4145	if (state)
4069	options |= Opt_scrollTtyKeypress;	4146	SET_OPTION (Opt_scrollTtyKeypress);
4070	else	4147	else
4071	options &= ~Opt_scrollTtyKeypress;	4148	CLR_OPTION (Opt_scrollTtyKeypress);
4072	break;	4149	break;
4073	case 1047: /* secondary screen w/ clearing last */	4150	case 1047: /* secondary screen w/ clearing last */
4074	if (options & Opt_secondaryScreen)	4151	if (OPTION (Opt_secondaryScreen))
4075	if (current_screen != PRIMARY)	4152	if (current_screen != PRIMARY)
4076	scr_erase_screen (2);	4153	scr_erase_screen (2);
4077	scr_change_screen (state);	4154	scr_change_screen (state);
4078	break;	4155	break;
4079	case 1049: /* secondary screen w/ clearing first */	4156	case 1049: /* secondary screen w/ clearing first */
4080	scr_change_screen (state);	4157	scr_change_screen (state);
4081	if (options & Opt_secondaryScreen)	4158	if (OPTION (Opt_secondaryScreen))
4082	if (current_screen != PRIMARY)	4159	if (current_screen != PRIMARY)
4083	scr_erase_screen (2);	4160	scr_erase_screen (2);
4084	break;	4161	break;
4085	default:	4162	default:
4086	break;	4163	break;
…		…
4236	case 106:	4313	case 106:
4237	case 107:	4314	case 107:
4238	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4315	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4239	break;	4316	break;
4240	#endif	4317	#endif
4241
4242	}	4318	}
4243	}	4319	}
4244	}	4320	}
4245	/*}}} */	4321	/*}}} */
4246		4322
…		…
4282		4358
4283	/* ---------------------------------------------------------------------- */	4359	/* ---------------------------------------------------------------------- */
4284	/* Write data to the pty as typed by the user, pasted with the mouse,	4360	/* Write data to the pty as typed by the user, pasted with the mouse,
4285	* or generated by us in response to a query ESC sequence.	4361	* or generated by us in response to a query ESC sequence.
4286	*/	4362	*/
		4363	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4364
4287	void	4365	void
4288	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4366	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289	{	4367	{
4290	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4368	if (v_buflen == 0)
		4369	{
		4370	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291		4371
4292	if (len)	4372	if ((unsigned int)written == len)
		4373	return;
		4374
		4375	data += written;
		4376	len -= written;
4293	{	4377	}
		4378
		4379	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4380
		4381	memcpy (v_buffer + v_buflen, data, len);
		4382	v_buflen += len;
		4383
		4384	pty_ev.set (EVENT_READ | EVENT_WRITE);
		4385	}
		4386
		4387	void rxvt_term::pty_write ()
		4388	{
		4389	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4390
		4391	if (written > 0)
		4392	{
		4393	v_buflen -= written;
		4394
4294	if (v_buflen == 0)	4395	if (v_buflen == 0)
4295	{	4396	{
4296	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298	if ((unsigned int)written == len)
4299	return;
4300
4301	data += written;
4302	len -= written;
4303	}
4304
4305
4306	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308	memcpy (v_buffer + v_buflen, data, len);
4309	v_buflen += len;
4310	}
4311
4312	for (;;)
4313	{
4314	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316	if (written > 0)
4317	{
4318	v_buflen -= written;
4319
4320	if (v_buflen == 0)
4321	{
4322	free (v_buffer);	4397	free (v_buffer);
4323	v_buffer = 0;	4398	v_buffer = 0;
4324	v_buflen = 0;	4399	v_buflen = 0;
4325		4400
4326	pty_ev.set (EVENT_READ);	4401	pty_ev.set (EVENT_READ);
4327	return;
4328	}
4329
4330	memmove (v_buffer, v_buffer + written, v_buflen);
4331	}
4332	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333	// original code just ignores this...
4334	destroy ();
4335	else
4336	{
4337	pty_ev.set (EVENT_READ | EVENT_WRITE);
4338	return;	4402	return;
4339	}	4403	}
		4404
		4405	memmove (v_buffer, v_buffer + written, v_buflen);
4340	}	4406	}
		4407	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4408	pty_ev.set (EVENT_READ);
4341	}	4409	}
4342		4410
4343	/*----------------------- end-of-file (C source) -----------------------*/	4411	/*----------------------- end-of-file (C source) -----------------------*/
4344		4412

Diff Legend

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