ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

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

Diff Legend

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