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.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.216 by root, Tue Dec 27 01:25:42 2005 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
53	#include <wchar.h>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
		57	#include <csignal>
54		58
55	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
56		60
57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58		62
…		…
113	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
114	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
115	XK_Print, 0x2399,	119	XK_Print, 0x2399,
116		120
117	XK_space, 0x2423,	121	XK_space, 0x2423,
		122
		123	#ifdef XK_KP_Begin
		124	XK_KP_Prior, 0x21de,
		125	XK_KP_Next, 0x21df,
		126	XK_KP_Begin, 0x2320,
		127	XK_KP_Insert, 0x2380,
		128	XK_KP_Delete, 0x2326,
118	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
119	0,	131	0,
120	};	132	};
121		133
122	void	134	void
123	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
124	{	136	{
125	x = Pixel2Col (x);	137	x = Pixel2Col (x);
126	y = Pixel2Row (y);	138	y = Pixel2Row (y);
127		139
128	if (x < 0 || x >= TermWin.ncol	140	if (!IN_RANGE_EXC (x, 0, ncol)
129	|| y < 0 || y >= TermWin.nrow)	141	|| !IN_RANGE_EXC (y, 0, nrow))
130	return;	142	return;
131		143
132	for (;;)	144	for (;;)
133	{	145	{
134	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	const line_t &l = ROW(y - view_start);
		147
		148	text_t t = l.t[x];
135		149
136	if (t != NOCHAR || !x)	150	if (t != NOCHAR || !x)
137	{	151	{
138	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	iso14755_51 (l.t[x], l.r[x]);
139	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140	iso14755buf = ISO_14755_54;	153	iso14755buf = ISO_14755_54;
141	break;	154	break;
142	}	155	}
143		156
144	x--;	157	x--;
145	}	158	}
146
147	}	159	}
148	#endif	160	#endif
149		161
150	#if ENABLE_OVERLAY	162	#if ENABLE_OVERLAY
151	void	163	void
152	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
153	{	165	{
154	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
155	rxvt_font *f = (*fs)[fs->find_font (ch)];	167	rxvt_font *f = (*fs)[fs->find_font (ch)];
156	wchar_t *chr, *alloc, ch2;	168	wchar_t *chr, *alloc, ch2, *fname;
157	int len;	169	int len;
		170
		171	fname = rxvt_utf8towcs (f->name);
158		172
159	#if ENABLE_COMBINING	173	#if ENABLE_COMBINING
160	if (IS_COMPOSE (ch))	174	if (IS_COMPOSE (ch))
161	{	175	{
162	len = rxvt_composite.expand (ch, 0);	176	len = rxvt_composite.expand (ch, 0);
…		…
171	alloc = 0;	185	alloc = 0;
172	chr = &ch2;	186	chr = &ch2;
173	len = 1;	187	len = 1;
174	}	188	}
175		189
176	int width = strlen (f->name);	190	char attr[80]; // plenty
177		191
		192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		193	(int)r,
		194	GET_FGCOLOR (r), GET_BGCOLOR (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
178	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	207	scr_overlay_new (0, -1, width, len + 2);
179		208
180	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	209	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181		210
182	for (int y = 0; y < len; y++)	211	for (int y = 0; y < len; y++)
183	{	212	{
…		…
194	#endif	223	#endif
195	scr_overlay_set (11, y, ch, r);	224	scr_overlay_set (11, y, ch, r);
196	scr_overlay_set (12, y, NOCHAR, r);	225	scr_overlay_set (12, y, NOCHAR, r);
197	}	226	}
198		227
		228	scr_overlay_set (0, len , attr);
199	scr_overlay_set (0, len, f->name);	229	scr_overlay_set (0, len + 1, fname);
		230
		231	free (fname);
200		232
201	#if ENABLE_COMBINING	233	#if ENABLE_COMBINING
202	if (alloc)	234	if (alloc)
203	delete [] alloc;	235	delete [] alloc;
204	#endif	236	#endif
…		…
272	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	304	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273	* escape sequence to toggle the Keypad.	305	* escape sequence to toggle the Keypad.
274	*	306	*
275	* Always permit `shift' to override the current setting	307	* Always permit `shift' to override the current setting
276	*/	308	*/
277	shft = (ev.state & ShiftMask);	309	shft = ev.state & ShiftMask;
278	ctrl = (ev.state & ControlMask);	310	ctrl = ev.state & ControlMask;
279	meta = (ev.state & ModMetaMask);	311	meta = ev.state & ModMetaMask;
280		312
281	if (numlock_state || (ev.state & ModNumLockMask))	313	if (numlock_state || (ev.state & ModNumLockMask))
282	{	314	{
283	numlock_state = (ev.state & ModNumLockMask);	315	numlock_state = (ev.state & ModNumLockMask);
284	PrivMode ((!numlock_state), PrivMode_aplKP);	316	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
304		336
305	// the XOpenIM manpage lies about hardcoding the locale	337	// the XOpenIM manpage lies about hardcoding the locale
306	// at the point of XOpenIM, so temporarily switch locales	338	// at the point of XOpenIM, so temporarily switch locales
307	if (rs[Rs_imLocale])	339	if (rs[Rs_imLocale])
308	SET_LOCALE (rs[Rs_imLocale]);	340	SET_LOCALE (rs[Rs_imLocale]);
		341
309	// assume wchar_t == unicode or better	342	// assume wchar_t == unicode or better
310	len = XwcLookupString (Input_Context, &ev, wkbuf,	343	len = XwcLookupString (Input_Context, &ev, wkbuf,
311	KBUFSZ, &keysym, &status_return);	344	KBUFSZ, &keysym, &status_return);
		345
312	if (rs[Rs_imLocale])	346	if (rs[Rs_imLocale])
313	SET_LOCALE (locale);	347	SET_LOCALE (locale);
314		348
315	if (status_return == XLookupChars	349	if (status_return == XLookupChars
316	|| status_return == XLookupBoth)	350	|| status_return == XLookupBoth)
…		…
343	valid_keysym = keysym != NoSymbol;	377	valid_keysym = keysym != NoSymbol;
344	}	378	}
345		379
346	if (valid_keysym)	380	if (valid_keysym)
347	{	381	{
		382	#ifdef KEYSYM_RESOURCE
		383	if (keyboard->dispatch (this, keysym, ev.state))
		384	return;
		385	#endif
		386
348	if (TermWin.saveLines)	387	if (saveLines)
349	{	388	{
350	#ifdef UNSHIFTED_SCROLLKEYS	389	#ifdef UNSHIFTED_SCROLLKEYS
351	if (!ctrl && !meta)	390	if (!ctrl && !meta)
352	#else	391	#else
353	if (IS_SCROLL_MOD)	392	if (IS_SCROLL_MOD)
354	#endif	393	#endif
355	{	394	{
356	int lnsppg;	395	int lnsppg;
357		396
358	#ifdef PAGING_CONTEXT_LINES	397	#ifdef PAGING_CONTEXT_LINES
359	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	398	lnsppg = nrow - PAGING_CONTEXT_LINES;
360	#else	399	#else
361	lnsppg = TermWin.nrow * 4 / 5;	400	lnsppg = nrow * 4 / 5;
362	#endif	401	#endif
363	if (keysym == XK_Prior)	402	if (keysym == XK_Prior)
364	{	403	{
365	scr_page (UP, lnsppg);	404	scr_page (UP, lnsppg);
366	return;	405	return;
…		…
417	{	456	{
418	/* normal XTerm key bindings */	457	/* normal XTerm key bindings */
419	case XK_Insert: /* Shift+Insert = paste mouse selection */	458	case XK_Insert: /* Shift+Insert = paste mouse selection */
420	selection_request (ev.time, 0, 0);	459	selection_request (ev.time, 0, 0);
421	return;	460	return;
422	#if TODO // TODO	461	#if TODO
423	/* rxvt extras */	462	/* rxvt extras */
424	case XK_KP_Add: /* Shift+KP_Add = bigger font */	463	case XK_KP_Add: /* Shift+KP_Add = bigger font */
425	change_font (FONT_UP);	464	change_font (FONT_UP);
426	return;	465	return;
427	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	466	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
486	}	525	}
487	#endif	526	#endif
488		527
489	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	528	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490	{	529	{
491	#ifdef KEYSYM_RESOURCE
492	if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493	{
494	unsigned int l;
495	const unsigned char *kbuf0;
496
497	kbuf0 = (Keysym_map[keysym & 0xFF]);
498	l = (unsigned int)*kbuf0++;
499
500	/* escape prefix */
501	if (meta
502	# ifdef META8_OPTION
503	&& meta_char == C0_ESC
504	# endif
505	)
506	{
507	const unsigned char ch = C0_ESC;
508	tt_write (&ch, 1);
509	}
510
511	tt_write (kbuf0, l);
512	return;
513	}
514	else
515	#endif
516	{	530	{
517	newlen = 1;	531	newlen = 1;
518	switch (keysym)	532	switch (keysym)
519	{	533	{
520	#ifndef NO_BACKSPACE_KEY	534	#ifndef NO_BACKSPACE_KEY
…		…
528	else	542	else
529	strcpy (kbuf, key_backspace);	543	strcpy (kbuf, key_backspace);
530	break;	544	break;
531	#endif	545	#endif
532	#ifndef NO_DELETE_KEY	546	#ifndef NO_DELETE_KEY
		547	# ifdef XK_KP_Prior
		548	case XK_KP_Delete:
		549	/* allow shift to override */
		550	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		551	{
		552	strcpy (kbuf, "\033On");
		553	break;
		554	}
		555	/* FALLTHROUGH */
		556	# endif
533	case XK_Delete:	557	case XK_Delete:
534	strcpy (kbuf, key_delete);	558	strcpy (kbuf, key_delete);
535	break;	559	break;
536	#endif	560	#endif
537	case XK_Tab:	561	case XK_Tab:
…		…
640	#ifdef XK_KP_Begin	664	#ifdef XK_KP_Begin
641	case XK_KP_Begin:	665	case XK_KP_Begin:
642	strcpy (kbuf, "\033Ou");	666	strcpy (kbuf, "\033Ou");
643	break;	667	break;
644		668
645	case XK_KP_Insert:
646	strcpy (kbuf, "\033Op");
647	break;
648
649	case XK_KP_Delete:
650	strcpy (kbuf, "\033On");
651	break;
652	#endif	669	#endif
653	case XK_KP_F1: /* "\033OP" */	670	case XK_KP_F1: /* "\033OP" */
654	case XK_KP_F2: /* "\033OQ" */	671	case XK_KP_F2: /* "\033OQ" */
655	case XK_KP_F3: /* "\033OR" */	672	case XK_KP_F3: /* "\033OR" */
656	case XK_KP_F4: /* "\033OS" */	673	case XK_KP_F4: /* "\033OS" */
…		…
688	break;	705	break;
689		706
690	case XK_Find:	707	case XK_Find:
691	strcpy (kbuf, "\033[1~");	708	strcpy (kbuf, "\033[1~");
692	break;	709	break;
		710
		711	#ifdef XK_KP_End
		712	case XK_KP_Insert:
		713	/* allow shift to override */
		714	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		715	{
		716	strcpy (kbuf, "\033Op");
		717	break;
		718	}
		719	/* FALLTHROUGH */
		720	#endif
693	case XK_Insert:	721	case XK_Insert:
694	strcpy (kbuf, "\033[2~");	722	strcpy (kbuf, "\033[2~");
695	break;	723	break;
696	#ifdef DXK_Remove /* support for DEC remove like key */	724	#ifdef DXK_Remove /* support for DEC remove like key */
697	case DXK_Remove:	725	case DXK_Remove:
…		…
787	#undef FKEY	815	#undef FKEY
788	default:	816	default:
789	newlen = 0;	817	newlen = 0;
790	break;	818	break;
791	}	819	}
		820
792	if (newlen)	821	if (newlen)
793	len = strlen (kbuf);	822	len = strlen (kbuf);
794	}	823	}
795		824
796	/*	825	/*
…		…
805	else if (ctrl && keysym == XK_minus)	834	else if (ctrl && keysym == XK_minus)
806	{	835	{
807	len = 1;	836	len = 1;
808	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	837	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809	}	838	}
		839	else if (keysym == XK_ISO_Left_Tab)
		840	{
		841	strcpy (kbuf, "\033[Z");
		842	len = 3;
		843	}
810	else	844	else
811	{	845	{
812	#ifdef META8_OPTION	846	#ifdef META8_OPTION
813	/* set 8-bit on */	847	/* set 8-bit on */
814	if (meta && (meta_char == 0x80))	848	if (meta && (meta_char == 0x80))
…		…
827		861
828	if (len <= 0)	862	if (len <= 0)
829	return; /* not mapped */	863	return; /* not mapped */
830		864
831	if (options & Opt_scrollTtyKeypress)	865	if (options & Opt_scrollTtyKeypress)
832	if (TermWin.view_start)	866	if (view_start)
833	{	867	{
834	TermWin.view_start = 0;	868	view_start = 0;
835	want_refresh = 1;	869	want_refresh = 1;
836	}	870	}
837		871
838	/*	872	/*
839	* these modifications only affect the static keybuffer	873	* these modifications only affect the static keybuffer
…		…
872	#endif /* DEBUG_CMD */	906	#endif /* DEBUG_CMD */
873	tt_write (kbuf, (unsigned int)len);	907	tt_write (kbuf, (unsigned int)len);
874	}	908	}
875	/*}}} */	909	/*}}} */
876		910
877	#if (MENUBAR_MAX)	911	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	912	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879	/* attempt to `write' count to the input buffer */	913	/* attempt to `write' count to the input buffer */
880	unsigned int	914	unsigned int
881	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	915	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882	{	916	{
…		…
905		939
906	cmd_parse ();	940	cmd_parse ();
907		941
908	return 0;	942	return 0;
909	}	943	}
910	#endif /* MENUBAR_MAX */	944	#endif
911		945
912	void	946	void
913	rxvt_term::flush ()	947	rxvt_term::flush ()
914	{	948	{
		949	flush_ev.stop ();
		950
915	#ifdef TRANSPARENT	951	#ifdef TRANSPARENT
916	if (want_full_refresh)	952	if (want_full_refresh)
917	{	953	{
918	want_full_refresh = 0;	954	want_full_refresh = 0;
919	scr_clear ();	955	scr_clear ();
…		…
929	IMSendSpot ();	965	IMSendSpot ();
930	#endif	966	#endif
931	}	967	}
932		968
933	display->flush ();	969	display->flush ();
934
935	flush_ev.stop ();
936	}	970	}
937		971
938	void	972	void
939	rxvt_term::check_cb (check_watcher &w)	973	rxvt_term::check_cb (check_watcher &w)
940	{	974	{
…		…
1016	{	1050	{
1017	if (mouse_slip_wheel_speed == 0	1051	if (mouse_slip_wheel_speed == 0
1018	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1052	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019	: scr_page (UP, mouse_slip_wheel_speed))	1053	: scr_page (UP, mouse_slip_wheel_speed))
1020	{	1054	{
		1055	if (view_start == nsaved ||
		1056	view_start == 0)
		1057	mouse_slip_wheel_speed = 0;
		1058
1021	refresh_type |= SMOOTH_REFRESH;	1059	refresh_type |= SMOOTH_REFRESH;
1022	want_refresh = 1;	1060	want_refresh = 1;
1023	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1061	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024	}	1062	}
1025	}	1063	}
…		…
1045	if (n > 0)	1083	if (n > 0)
1046	{	1084	{
1047	cmdbuf_endp += n;	1085	cmdbuf_endp += n;
1048	return true;	1086	return true;
1049	}	1087	}
1050	else if (n < 0 && errno != EAGAIN)	1088	else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
		1089	{
		1090	pty_ev.stop ();
		1091
		1092	if (!(options & Opt_hold))
1051	destroy ();	1093	destroy ();
		1094	}
1052		1095
1053	return false;	1096	return false;
1054	}	1097	}
1055		1098
1056	void	1099	void
1057	rxvt_term::pty_cb (io_watcher &w, short revents)	1100	rxvt_term::pty_cb (io_watcher &w, short revents)
1058	{	1101	{
1059	SET_R (this);	1102	SET_R (this);
1060	SET_LOCALE (locale);	1103	SET_LOCALE (locale);
1061		1104
1062	if (revents & EVENT_WRITE)
1063	tt_write (0, 0);
1064	else if (revents & EVENT_READ)	1105	if (revents & EVENT_READ)
1065	// loop, but don't allow a single term to monopolize us	1106	// loop, but don't allow a single term to monopolize us
1066	while (pty_fill ())	1107	while (pty_fill ())
1067	if (cmd_parse ())	1108	if (cmd_parse ())
1068	break;	1109	break;
		1110
		1111	if (revents & EVENT_WRITE)
		1112	pty_write ();
1069	}	1113	}
1070		1114
1071	void	1115	void
1072	rxvt_term::pointer_unblank ()	1116	rxvt_term::pointer_unblank ()
1073	{	1117	{
1074	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1118	XDefineCursor (display->display, vt, TermWin_cursor);
1075	recolour_cursor ();	1119	recolour_cursor ();
1076		1120
1077	#ifdef POINTER_BLANK	1121	#ifdef POINTER_BLANK
1078	hidden_pointer = 0;	1122	hidden_pointer = 0;
1079		1123
…		…
1087	rxvt_term::pointer_blank ()	1131	rxvt_term::pointer_blank ()
1088	{	1132	{
1089	if (! (options & Opt_pointerBlank))	1133	if (! (options & Opt_pointerBlank))
1090	return;	1134	return;
1091		1135
1092	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1136	XDefineCursor (display->display, vt, display->blank_cursor);
1093	XFlush (display->display);	1137	XFlush (display->display);
1094		1138
1095	hidden_pointer = 1;	1139	hidden_pointer = 1;
1096	}	1140	}
1097		1141
…		…
1186		1230
1187	/*{{{ process an X event */	1231	/*{{{ process an X event */
1188	void	1232	void
1189	rxvt_term::x_cb (XEvent &ev)	1233	rxvt_term::x_cb (XEvent &ev)
1190	{	1234	{
		1235	dDisp;
		1236
1191	SET_R (this);	1237	SET_R (this);
1192	SET_LOCALE (locale);	1238	SET_LOCALE (locale);
1193		1239
1194	#if defined(CURSOR_BLINK)	1240	#if defined(CURSOR_BLINK)
1195	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1241	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1216	if (ev.type == KeyPress && hidden_pointer == 0)	1262	if (ev.type == KeyPress && hidden_pointer == 0)
1217	pointer_blank ();	1263	pointer_blank ();
1218	}	1264	}
1219	#endif	1265	#endif
1220		1266
1221	#ifdef USE_XIM
1222	if (XFilterEvent (&ev, None))
1223	return;
1224	#endif
1225
1226	Window unused_root, unused_child;	1267	Window unused_root, unused_child;
1227	int unused_root_x, unused_root_y;	1268	int unused_root_x, unused_root_y;
1228	unsigned int unused_mask;	1269	unsigned int unused_mask;
1229		1270
1230	switch (ev.type)	1271	switch (ev.type)
1231	{	1272	{
1232	case KeyPress:	1273	case KeyPress:
1233	#if ISO_14755	1274	#if ISO_14755
…		…
1316	button_release (ev.xbutton);	1357	button_release (ev.xbutton);
1317	break;	1358	break;
1318		1359
1319	case ClientMessage:	1360	case ClientMessage:
1320	if (ev.xclient.format == 32	1361	if (ev.xclient.format == 32
		1362	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1363	{
1321	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1364	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1322	destroy ();	1365	destroy ();
		1366	#if ENABLE_EWMH
		1367	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1368	XSendEvent (disp, ev.xclient.window = display->root,
		1369	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1370	&ev);
		1371	#endif
		1372	}
		1373	#if ENABLE_XEMBED
		1374	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1375	{
		1376	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1377	focus_in ();
		1378	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1379	focus_out ();
		1380	}
		1381	#endif
1323	#ifdef OFFIX_DND	1382	#ifdef OFFIX_DND
1324	/* OffiX Dnd (drag 'n' drop) protocol */	1383	/* OffiX Dnd (drag 'n' drop) protocol */
1325	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1384	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1326	&& (ev.xclient.data.l[0] == DndFile	1385	&& (ev.xclient.data.l[0] == DndFile
1327	|| ev.xclient.data.l[0] == DndDir	1386	|| ev.xclient.data.l[0] == DndDir
1328	|| ev.xclient.data.l[0] == DndLink))	1387	|| ev.xclient.data.l[0] == DndLink))
1329	{	1388	{
1330	/* Get Dnd data */	1389	/* Get Dnd data */
1331	Atom ActualType;	1390	Atom ActualType;
1332	int ActualFormat;	1391	int ActualFormat;
1333	unsigned char *data;	1392	unsigned char *data;
1334	unsigned long Size, RemainingBytes;	1393	unsigned long Size, RemainingBytes;
1335		1394
1336	XGetWindowProperty (display->display, display->root,	1395	XGetWindowProperty (disp, display->root,
1337	xa[XA_DNDSELECTION],	1396	xa[XA_DNDSELECTION],
1338	0L, 1000000L,	1397	0L, 1000000L,
1339	False, AnyPropertyType,	1398	False, AnyPropertyType,
1340	&ActualType, &ActualFormat,	1399	&ActualType, &ActualFormat,
1341	&Size, &RemainingBytes,	1400	&Size, &RemainingBytes,
1342	&data);	1401	&data);
1343	XChangeProperty (display->display, display->root,	1402	set_string_property (XA_CUT_BUFFER0, data);
1344	XA_CUT_BUFFER0, XA_STRING,
1345	8, PropModeReplace,
1346	data, strlen (data));
1347	XFree (data);	1403	XFree (data);
1348	selection_paste (display->root, XA_CUT_BUFFER0, True);	1404	selection_paste (display->root, XA_CUT_BUFFER0, true);
1349	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1405	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1350	}	1406	}
1351	#endif /* OFFIX_DND */	1407	#endif /* OFFIX_DND */
1352	break;	1408	break;
1353		1409
1354	case MappingNotify:	1410	case MappingNotify:
…		…
1379	break;	1435	break;
1380	}	1436	}
1381	break;	1437	break;
1382		1438
1383	case FocusIn:	1439	case FocusIn:
1384	if (!TermWin.focus)	1440	focus_in ();
		1441	break;
		1442
		1443	case FocusOut:
		1444	focus_out ();
		1445	break;
		1446
		1447	case ConfigureNotify:
		1448	if (ev.xconfigure.window == parent[0])
1385	{	1449	{
1386	TermWin.focus = 1;
1387	want_refresh = 1;
1388	#ifdef USE_XIM
1389	if (Input_Context != NULL)
1390	{
1391	IMSetStatusPosition ();
1392	XSetICFocus (Input_Context);
1393	}
1394	#endif
1395	#ifdef CURSOR_BLINK
1396	if (options & Opt_cursorBlink)
1397	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1398	#endif
1399	#ifdef OFF_FOCUS_FADING
1400	if (rs[Rs_fade])
1401	{
1402	pix_colors = pix_colors_focused;
1403	scr_recolour ();
1404	}
1405	#endif
1406
1407	}
1408	break;
1409
1410	case FocusOut:
1411	if (TermWin.focus)
1412	{
1413	TermWin.focus = 0;
1414	want_refresh = 1;
1415
1416	#if ENABLE_FRILLS || ISO_14755
1417	iso14755buf = 0;
1418	#endif
1419	#if ENABLE_OVERLAY
1420	scr_overlay_off ();
1421	#endif
1422	#ifdef USE_XIM
1423	if (Input_Context != NULL)
1424	XUnsetICFocus (Input_Context);
1425	#endif
1426	#ifdef CURSOR_BLINK
1427	if (options & Opt_cursorBlink)
1428	cursor_blink_ev.stop ();
1429	hidden_cursor = 0;
1430	#endif
1431	#ifdef OFF_FOCUS_FADING
1432	if (rs[Rs_fade])
1433	{
1434	pix_colors = pix_colors_unfocused;
1435	scr_recolour ();
1436	}
1437	#endif
1438	}
1439	break;
1440
1441	case ConfigureNotify:
1442	if (ev.xconfigure.window == TermWin.parent[0])
1443	{
1444	int height, width;
1445
1446	do
1447	{ /* Wrap lots of configures into one */
1448	width = ev.xconfigure.width;
1449	height = ev.xconfigure.height;
1450	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451	}
1452	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1450	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1451	;
1453		1452
1454	if (szHint.width != width || szHint.height != height)	1453	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1455	{	1454	{
1456	seen_resize = 1;	1455	seen_resize = 1;
1457	resize_all_windows (width, height, 1);	1456	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1458	}	1457	}
1459		1458
1460	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1459	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461	if (options & Opt_transparent)	1460	if (options & Opt_transparent)
1462	{
1463	check_our_parents ();	1461	check_our_parents ();
1464	if (am_transparent)
1465	want_refresh = want_full_refresh = 1;
1466	}
1467	#endif	1462	#endif
1468	}	1463	}
1469	break;	1464	break;
1470		1465
1471	case PropertyNotify:	1466	case PropertyNotify:
…		…
1479	selection_clear ();	1474	selection_clear ();
1480	break;	1475	break;
1481		1476
1482	case SelectionNotify:	1477	case SelectionNotify:
1483	if (selection_wait == Sel_normal)	1478	if (selection_wait == Sel_normal)
1484	selection_paste (ev.xselection.requestor,	1479	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485	ev.xselection.property, True);
1486	break;	1480	break;
1487		1481
1488	case SelectionRequest:	1482	case SelectionRequest:
1489	selection_send (ev.xselectionrequest);	1483	selection_send (ev.xselectionrequest);
1490	break;	1484	break;
1491		1485
1492	case UnmapNotify:	1486	case UnmapNotify:
1493	TermWin.mapped = 0;	1487	mapped = 0;
1494	#ifdef TEXT_BLINK	1488	#ifdef TEXT_BLINK
1495	text_blink_ev.stop ();	1489	text_blink_ev.stop ();
1496	#endif	1490	#endif
1497	break;	1491	break;
1498		1492
1499	case MapNotify:	1493	case MapNotify:
1500	TermWin.mapped = 1;	1494	mapped = 1;
1501	#ifdef TEXT_BLINK	1495	#ifdef TEXT_BLINK
1502	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1496	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503	#endif	1497	#endif
1504	break;	1498	break;
1505		1499
…		…
1509	break;	1503	break;
1510	#endif /* TRANSPARENT */	1504	#endif /* TRANSPARENT */
1511		1505
1512	case GraphicsExpose:	1506	case GraphicsExpose:
1513	case Expose:	1507	case Expose:
1514	if (ev.xany.window == TermWin.vt)	1508	if (ev.xany.window == vt)
1515	{	1509	{
1516	do	1510	do
1517	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1518	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1513	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1520		1514
1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1515	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522		1516
1523	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1517	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1524	scr_expose (ev.xexpose.x, ev.xexpose.y,	1518	scr_expose (ev.xexpose.x, ev.xexpose.y,
1525	ev.xexpose.width, ev.xexpose.height, False);	1519	ev.xexpose.width, ev.xexpose.height, False);
1526		1520
1527	scr_refresh (refresh_type);	1521	scr_refresh (refresh_type);
1528	}	1522	}
1529	else	1523	else
1530	{	1524	{
1531	XEvent unused_event;	1525	XEvent unused_event;
1532		1526
1533	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1527	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1534	;	1528	;
1535	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1529	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1536	;	1530	;
1537		1531
1538	if (isScrollbarWindow (ev.xany.window))	1532	if (isScrollbarWindow (ev.xany.window))
1539	{	1533	{
1540	scrollBar.setIdle ();	1534	scrollBar.setIdle ();
…		…
1544	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1538	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545	menubar_expose ();	1539	menubar_expose ();
1546	#endif	1540	#endif
1547		1541
1548	#ifdef TRANSPARENT	1542	#ifdef TRANSPARENT
1549	if (am_transparent && ev.xany.window == TermWin.parent[0])	1543	if (am_transparent && ev.xany.window == parent[0])
1550	XClearWindow (display->display, ev.xany.window);	1544	XClearWindow (disp, ev.xany.window);
1551	#endif	1545	#endif
1552	}	1546	}
1553	break;	1547	break;
1554		1548
1555	case MotionNotify:	1549	case MotionNotify:
…		…
1562	{	1556	{
1563	menubar_control (ev.xbutton);	1557	menubar_control (ev.xbutton);
1564	break;	1558	break;
1565	}	1559	}
1566	#endif	1560	#endif
1567	if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))	1561	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568	break;	1562	break;
1569		1563
1570	if (ev.xany.window == TermWin.vt)	1564	if (ev.xany.window == vt)
1571	{	1565	{
1572	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1566	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573	{	1567	{
1574	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1568	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575	;	1569	;
1576		1570
1577	XQueryPointer (display->display, TermWin.vt,	1571	XQueryPointer (disp, vt,
1578	&unused_root, &unused_child,	1572	&unused_root, &unused_child,
1579	&unused_root_x, &unused_root_y,	1573	&unused_root_x, &unused_root_y,
1580	& (ev.xbutton.x), & (ev.xbutton.y),	1574	&ev.xbutton.x, &ev.xbutton.y,
1581	&unused_mask);	1575	&ev.xbutton.state);
1582	#ifdef MOUSE_THRESHOLD	1576	#ifdef MOUSE_THRESHOLD
1583	/* deal with a `jumpy' mouse */	1577	/* deal with a `jumpy' mouse */
1584	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)	1578	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585	{	1579	{
1586	#endif	1580	#endif
…		…
1591	iso14755_54 (ev.xbutton.x, ev.xbutton.y);	1585	iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592	break;	1586	break;
1593	}	1587	}
1594	#endif	1588	#endif
1595	selection_extend (ev.xbutton.x, ev.xbutton.y,	1589	selection_extend (ev.xbutton.x, ev.xbutton.y,
1596	(ev.xbutton.state & Button3Mask) ? 2 : 0);	1590	ev.xbutton.state & Button3Mask ? 2 : 0);
		1591
1597	#ifdef SELECTION_SCROLLING	1592	#ifdef SELECTION_SCROLLING
1598	if (ev.xbutton.y < TermWin.int_bwidth	1593	if (ev.xbutton.y < int_bwidth
1599	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1594	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1600	{	1595	{
1601	int dist;	1596	int dist;
1602		1597
1603	/* don't clobber the current delay if we are	1598	/* don't clobber the current delay if we are
1604	* already in the middle of scrolling.	1599	* already in the middle of scrolling.
…		…
1612	selection_save_x = ev.xbutton.x;	1607	selection_save_x = ev.xbutton.x;
1613	selection_save_y = ev.xbutton.y;	1608	selection_save_y = ev.xbutton.y;
1614	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1609	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615		1610
1616	/* calc number of lines to scroll */	1611	/* calc number of lines to scroll */
1617	if (ev.xbutton.y<TermWin.int_bwidth)	1612	if (ev.xbutton.y < int_bwidth)
1618	{	1613	{
1619	scroll_selection_dir = UP;	1614	scroll_selection_dir = UP;
1620	dist = TermWin.int_bwidth - ev.xbutton.y;	1615	dist = int_bwidth - ev.xbutton.y;
1621	}	1616	}
1622	else	1617	else
1623	{	1618	{
1624	scroll_selection_dir = DN;	1619	scroll_selection_dir = DN;
1625	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1620	dist = ev.xbutton.y - (int_bwidth + height);
1626	}	1621	}
1627		1622
1628	scroll_selection_lines = Pixel2Height (dist)	1623	scroll_selection_lines = Pixel2Height (dist)
1629	/ SELECTION_SCROLL_LINE_SPEEDUP	1624	/ SELECTION_SCROLL_LINE_SPEEDUP
1630	+ 1;	1625	+ 1;
1631	MIN_IT (scroll_selection_lines,	1626	min_it (scroll_selection_lines,
1632	SELECTION_SCROLL_MAX_LINES);	1627	SELECTION_SCROLL_MAX_LINES);
1633	}	1628	}
1634	else	1629	else
1635	{	1630	{
1636	/* we are within the text window, so we	1631	/* we are within the text window, so we
…		…
1645	#endif	1640	#endif
1646	}	1641	}
1647	}	1642	}
1648	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1643	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649	{	1644	{
1650	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1645	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1651	MotionNotify, &ev)) ;	1646	MotionNotify, &ev))
		1647	;
		1648
1652	XQueryPointer (display->display, scrollBar.win,	1649	XQueryPointer (disp, scrollBar.win,
1653	&unused_root, &unused_child,	1650	&unused_root, &unused_child,
1654	&unused_root_x, &unused_root_y,	1651	&unused_root_x, &unused_root_y,
1655	& (ev.xbutton.x), & (ev.xbutton.y),	1652	&ev.xbutton.x, &ev.xbutton.y,
1656	&unused_mask);	1653	&unused_mask);
1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1654	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658	scrollbar_size ());	1655	scrollbar_size ());
1659	scr_refresh (refresh_type);	1656	scr_refresh (refresh_type);
1660	refresh_limit = 0;	1657	refresh_limit = 0;
…		…
1662	}	1659	}
1663	break;	1660	break;
1664	}	1661	}
1665	}	1662	}
1666		1663
		1664	void
		1665	rxvt_term::focus_in ()
		1666	{
		1667	if (!focus)
		1668	{
		1669	focus = 1;
		1670	want_refresh = 1;
		1671	#if USE_XIM
		1672	if (Input_Context != NULL)
		1673	{
		1674	IMSetStatusPosition ();
		1675	XSetICFocus (Input_Context);
		1676	}
		1677	#endif
		1678	#if CURSOR_BLINK
		1679	if (options & Opt_cursorBlink)
		1680	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1681	#endif
		1682	#if OFF_FOCUS_FADING
		1683	if (rs[Rs_fade])
		1684	{
		1685	pix_colors = pix_colors_focused;
		1686	scr_recolour ();
		1687	}
		1688	#endif
		1689	}
		1690	}
		1691
		1692	void
		1693	rxvt_term::focus_out ()
		1694	{
		1695	if (focus)
		1696	{
		1697	focus = 0;
		1698	want_refresh = 1;
		1699
		1700	#if ENABLE_FRILLS || ISO_14755
		1701	iso14755buf = 0;
		1702	#endif
		1703	#if ENABLE_OVERLAY
		1704	scr_overlay_off ();
		1705	#endif
		1706	#if USE_XIM
		1707	if (Input_Context != NULL)
		1708	XUnsetICFocus (Input_Context);
		1709	#endif
		1710	#if CURSOR_BLINK
		1711	if (options & Opt_cursorBlink)
		1712	cursor_blink_ev.stop ();
		1713	hidden_cursor = 0;
		1714	#endif
		1715	#if OFF_FOCUS_FADING
		1716	if (rs[Rs_fade])
		1717	{
		1718	pix_colors = pix_colors_unfocused;
		1719	scr_recolour ();
		1720	}
		1721	#endif
		1722	}
		1723	}
		1724
1667	#if TRANSPARENT	1725	#if TRANSPARENT
1668	void	1726	void
1669	rxvt_term::rootwin_cb (XEvent &ev)	1727	rxvt_term::rootwin_cb (XEvent &ev)
1670	{	1728	{
1671	SET_R (this);	1729	SET_R (this);
…		…
1676	case PropertyNotify:	1734	case PropertyNotify:
1677	/*	1735	/*
1678	* if user used some Esetroot compatible prog to set the root bg,	1736	* if user used some Esetroot compatible prog to set the root bg,
1679	* use the property to determine the pixmap. We use it later on.	1737	* use the property to determine the pixmap. We use it later on.
1680	*/	1738	*/
1681	if (xa[XA_XROOTPMAPID] == 0)
1682	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1683
1684	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1739	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1740	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1685	return;	1741	return;
1686		1742
1687	/* FALLTHROUGH */	1743	/* FALLTHROUGH */
1688	case ReparentNotify:	1744	case ReparentNotify:
1689	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1745	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1703	reportmode = !! (priv_modes & PrivMode_mouse_report);	1759	reportmode = !! (priv_modes & PrivMode_mouse_report);
1704		1760
1705	/*	1761	/*
1706	* VT window processing of button press	1762	* VT window processing of button press
1707	*/	1763	*/
1708	if (ev.window == TermWin.vt)	1764	if (ev.window == vt)
1709	{	1765	{
1710	#if ISO_14755	1766	#if ISO_14755
1711	// 5.4	1767	// 5.4
1712	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1768	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713	{	1769	{
…		…
1715	return;	1771	return;
1716	}	1772	}
1717	#endif	1773	#endif
1718		1774
1719	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;	1775	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
		1776
1720	if (reportmode)	1777	if (reportmode)
1721	{	1778	{
1722	/* mouse report from vt window */	1779	/* mouse report from vt window */
1723	/* save the xbutton state (for ButtonRelease) */	1780	/* save the xbutton state (for ButtonRelease) */
1724	MEvent.state = ev.state;	1781	MEvent.state = ev.state;
…		…
1753	}	1810	}
1754	else	1811	else
1755	{	1812	{
1756	if (ev.button != MEvent.button)	1813	if (ev.button != MEvent.button)
1757	MEvent.clicks = 0;	1814	MEvent.clicks = 0;
		1815
1758	switch (ev.button)	1816	switch (ev.button)
1759	{	1817	{
1760	case Button1:	1818	case Button1:
		1819	/* allow meta + click to select rectangular areas */
		1820	/* should be done in screen.C */
		1821	#if ENABLE_FRILLS
		1822	selection.rect = !!(ev.state & ModMetaMask);
		1823	#else
		1824	selection.rect = false;
		1825	#endif
		1826
1761	/* allow shift+left click to extend selection */	1827	/* allow shift+left click to extend selection */
1762	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1828	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763	{	1829	{
1764	if (MEvent.button == Button1 && clickintime)	1830	if (MEvent.button == Button1 && clickintime)
1765	selection_rotate (ev.x, ev.y);	1831	selection_rotate (ev.x, ev.y);
…		…
1908	case Button3:	1974	case Button3:
1909	if (scrollBar.style != R_SB_XTERM)	1975	if (scrollBar.style != R_SB_XTERM)
1910	{	1976	{
1911	if (scrollbar_above_slider (ev.y))	1977	if (scrollbar_above_slider (ev.y))
1912	# ifdef RXVT_SCROLL_FULL	1978	# ifdef RXVT_SCROLL_FULL
1913	scr_page (UP, TermWin.nrow - 1);	1979	scr_page (UP, nrow - 1);
1914	# else	1980	# else
1915	scr_page (UP, TermWin.nrow / 4);	1981	scr_page (UP, nrow / 4);
1916	# endif	1982	# endif
1917	else if (scrollbar_below_slider (ev.y))	1983	else if (scrollbar_below_slider (ev.y))
1918	# ifdef RXVT_SCROLL_FULL	1984	# ifdef RXVT_SCROLL_FULL
1919	scr_page (DN, TermWin.nrow - 1);	1985	scr_page (DN, nrow - 1);
1920	# else	1986	# else
1921	scr_page (DN, TermWin.nrow / 4);	1987	scr_page (DN, nrow / 4);
1922	# endif	1988	# endif
1923	else	1989	else
1924	scrollBar.setMotion ();	1990	scrollBar.setMotion ();
1925	}	1991	}
1926	else	1992	else
1927	{	1993	{
1928	scr_page ((ev.button == Button1 ? DN : UP),	1994	scr_page ((ev.button == Button1 ? DN : UP),
1929	(TermWin.nrow	1995	(nrow
1930	* scrollbar_position (ev.y)	1996	* scrollbar_position (ev.y)
1931	/ scrollbar_size ()));	1997	/ scrollbar_size ()));
1932	}	1998	}
1933		1999
1934	break;	2000	break;
…		…
1966	#ifdef SELECTION_SCROLLING	2032	#ifdef SELECTION_SCROLLING
1967	if (sel_scroll_ev.active)	2033	if (sel_scroll_ev.active)
1968	sel_scroll_ev.stop();	2034	sel_scroll_ev.stop();
1969	#endif	2035	#endif
1970		2036
1971	if (ev.window == TermWin.vt)	2037	if (ev.window == vt)
1972	{	2038	{
1973	#if ISO_14755	2039	#if ISO_14755
1974	// 5.4	2040	// 5.4
1975	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2041	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976	return;	2042	return;
…		…
2027	v = ev.button == Button4 ? UP : DN;	2093	v = ev.button == Button4 ? UP : DN;
2028		2094
2029	if (ev.state & ShiftMask)	2095	if (ev.state & ShiftMask)
2030	i = 1;	2096	i = 1;
2031	else if (options & Opt_mouseWheelScrollPage)	2097	else if (options & Opt_mouseWheelScrollPage)
2032	i = TermWin.nrow - 1;	2098	i = nrow - 1;
2033	else	2099	else
2034	i = 5;	2100	i = 5;
2035		2101
2036	# ifdef MOUSE_SLIP_WHEELING	2102	# ifdef MOUSE_SLIP_WHEELING
2037	if (ev.state & ControlMask)	2103	if (ev.state & ControlMask)
2038	{	2104	{
2039	mouse_slip_wheel_speed += v ? -1 : 1;	2105	mouse_slip_wheel_speed += v ? -1 : 1;
2040	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2106	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2041	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2107	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042		2108
2043	if (slip_wheel_ev.at < NOW)	2109	if (slip_wheel_ev.at < NOW)
2044	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2110	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045		2111
2046	slip_wheel_ev.start ();	2112	slip_wheel_ev.start ();
…		…
2087	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2153	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2154	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2155	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090	int i;	2156	int i;
2091		2157
2092	Visual* visual = display->visual;	2158	Visual *visual = display->visual;
2093		2159
2094	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2160	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095		2161
2096	/* for convenience */	2162	/* for convenience */
2097	mask_r = visual->red_mask;	2163	mask_r = visual->red_mask;
…		…
2318	Atom atype;	2384	Atom atype;
2319	unsigned char *prop = NULL;	2385	unsigned char *prop = NULL;
2320	Window root, oldp, *list;	2386	Window root, oldp, *list;
2321	Pixmap rootpixmap = None;	2387	Pixmap rootpixmap = None;
2322	XWindowAttributes wattr, wrootattr;	2388	XWindowAttributes wattr, wrootattr;
		2389	dDisp;
2323		2390
2324	pchanged = 0;	2391	pchanged = 0;
2325		2392
2326	if (!(options & Opt_transparent))	2393	if (!(options & Opt_transparent))
2327	return pchanged; /* Don't try any more */	2394	return pchanged; /* Don't try any more */
2328		2395
2329	XGetWindowAttributes (display->display, display->root, &wrootattr);	2396	XGetWindowAttributes (disp, display->root, &wrootattr);
2330	rootdepth = wrootattr.depth;	2397	rootdepth = wrootattr.depth;
2331		2398
2332	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2399	XGetWindowAttributes (disp, parent[0], &wattr);
2333		2400
2334	if (rootdepth != wattr.depth)	2401	if (rootdepth != wattr.depth)
2335	{	2402	{
2336	if (am_transparent)	2403	if (am_transparent)
2337	{	2404	{
2338	pchanged = 1;	2405	pchanged = 1;
2339	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2406	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340	am_transparent = am_pixmap_trans = 0;	2407	am_transparent = am_pixmap_trans = 0;
2341	}	2408	}
2342		2409
2343	return pchanged; /* Don't try any more */	2410	return pchanged; /* Don't try any more */
2344	}	2411	}
2345		2412
2346	/* Get all X ops out of the queue so that our information is up-to-date. */	2413	/* Get all X ops out of the queue so that our information is up-to-date. */
2347	XSync (display->display, False);	2414	XSync (disp, False);
2348		2415
2349	/*	2416	/*
2350	* Make the frame window set by the window manager have	2417	* Make the frame window set by the window manager have
2351	* the root background. Some window managers put multiple nested frame	2418	* the root background. Some window managers put multiple nested frame
2352	* windows for each client, so we have to take care about that.	2419	* windows for each client, so we have to take care about that.
2353	*/	2420	*/
2354	i = (xa[XA_XROOTPMAPID]	2421	i = (xa[XA_XROOTPMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2422	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2423	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2424	&nitems, &bytes_after, &prop) == Success);
2358		2425
2359	if (!i || prop == NULL)	2426	if (!i || prop == NULL)
2360	i = (xa[XA_XSETROOTID]	2427	i = (xa[XA_ESETROOT_PMAP_ID]
2361	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2428	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2429	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363	&nitems, &bytes_after, &prop) == Success);	2430	&nitems, &bytes_after, &prop) == Success);
2364		2431
2365	if (!i || prop == NULL	2432	if (!i || prop == NULL
2366	#if TINTING	2433	#if TINTING
…		…
2385	Window cr;	2452	Window cr;
2386	XImage *image;	2453	XImage *image;
2387	GC gc;	2454	GC gc;
2388	XGCValues gcvalue;	2455	XGCValues gcvalue;
2389		2456
2390	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2457	XTranslateCoordinates (disp, parent[0], display->root,
2391	0, 0, &sx, &sy, &cr);	2458	0, 0, &sx, &sy, &cr);
2392	nw = (unsigned int)szHint.width;	2459	nw = (unsigned int)szHint.width;
2393	nh = (unsigned int)szHint.height;	2460	nh = (unsigned int)szHint.height;
2394	nx = ny = 0;	2461	nx = ny = 0;
2395		2462
…		…
2405	nh += sy;	2472	nh += sy;
2406	ny = -sy;	2473	ny = -sy;
2407	sy = 0;	2474	sy = 0;
2408	}	2475	}
2409		2476
2410	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2477	min_it (nw, (unsigned int) (wrootattr.width - sx));
2411	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2478	min_it (nh, (unsigned int) (wrootattr.height - sy));
		2479
		2480	XSync (disp, False);
2412	allowedxerror = -1;	2481	allowedxerror = -1;
2413	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2482	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414		2483
2415	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2484	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2416	/* XXX: may need a delay here? */	2485	/* XXX: may need a delay here? */
2417	allowedxerror = 0;	2486	allowedxerror = 0;
2418		2487
2419	if (image == NULL)	2488	if (image == NULL)
2420	{	2489	{
2421	if (am_transparent && am_pixmap_trans)	2490	if (am_transparent && am_pixmap_trans)
2422	{	2491	{
2423	pchanged = 1;	2492	pchanged = 1;
2424	if (TermWin.pixmap != None)	2493	if (pixmap != None)
2425	{	2494	{
2426	XFreePixmap (display->display, TermWin.pixmap);	2495	XFreePixmap (disp, pixmap);
2427	TermWin.pixmap = None;	2496	pixmap = None;
2428	}	2497	}
2429	}	2498	}
2430		2499
2431	am_pixmap_trans = 0;	2500	am_pixmap_trans = 0;
2432	}	2501	}
2433	else	2502	else
2434	{	2503	{
2435	if (TermWin.pixmap != None)	2504	if (pixmap != None)
2436	XFreePixmap (display->display, TermWin.pixmap);	2505	XFreePixmap (disp, pixmap);
2437		2506
2438	#if TINTING	2507	#if TINTING
2439	if (ISSET_PIXCOLOR (Color_tint))	2508	if (ISSET_PIXCOLOR (Color_tint))
2440	{	2509	{
2441	unsigned short rm, gm, bm;	2510	unsigned short rm, gm, bm;
…		…
2445		2514
2446	ShadeXImage (display, image, shade, rm, gm, bm);	2515	ShadeXImage (display, image, shade, rm, gm, bm);
2447	}	2516	}
2448	#endif	2517	#endif
2449		2518
2450	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2519	pixmap = XCreatePixmap (disp, vt,
2451	szHint.width, szHint.height, image->depth);	2520	szHint.width, szHint.height, image->depth);
2452	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2521	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2453	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2522	XPutImage (disp, pixmap, gc, image, 0, 0,
2454	nx, ny, image->width, image->height);	2523	nx, ny, image->width, image->height);
2455	XFreeGC (display->display, gc);	2524	XFreeGC (disp, gc);
2456	XDestroyImage (image);	2525	XDestroyImage (image);
2457	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2526	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2458	XClearWindow (display->display, TermWin.parent[0]);	2527	XClearWindow (disp, parent[0]);
2459		2528
2460	if (!am_transparent || !am_pixmap_trans)	2529	if (!am_transparent || !am_pixmap_trans)
2461	pchanged = 1;	2530	pchanged = 1;
2462		2531
2463	am_transparent = am_pixmap_trans = 1;	2532	am_transparent = am_pixmap_trans = 1;
2464	}	2533	}
2465	}	2534	}
2466		2535
2467	if (!am_pixmap_trans)	2536	if (am_pixmap_trans)
		2537	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
		2538	else
2468	{	2539	{
2469	unsigned int n;	2540	unsigned int n;
2470	/*	2541	/*
2471	* InheritPixmap transparency	2542	* InheritPixmap transparency
2472	*/	2543	*/
2473	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2544	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474	{	2545	{
2475	oldp = TermWin.parent[i];	2546	oldp = parent[i];
2476	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2547	XQueryTree (disp, parent[i - 1], &root,
2477	&TermWin.parent[i], &list, &n);	2548	&parent[i], &list, &n);
2478	XFree (list);	2549	XFree (list);
2479		2550
2480	if (TermWin.parent[i] == display->root)	2551	if (parent[i] == display->root)
2481	{	2552	{
2482	if (oldp != None)	2553	if (oldp != None)
2483	pchanged = 1;	2554	pchanged = 1;
2484		2555
2485	break;	2556	break;
2486	}	2557	}
2487		2558
2488	if (oldp != TermWin.parent[i])	2559	if (oldp != parent[i])
2489	pchanged = 1;	2560	pchanged = 1;
2490	}	2561	}
2491		2562
2492	n = 0;	2563	n = 0;
2493		2564
2494	if (pchanged)	2565	if (pchanged)
2495	{	2566	{
2496	for (; n < (unsigned int)i; n++)	2567	for (; n < (unsigned int)i; n++)
2497	{	2568	{
2498	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2569	XGetWindowAttributes (disp, parent[n], &wattr);
2499	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2570	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500	{	2571	{
2501	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2572	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502	break;	2573	break;
2503	}	2574	}
2504	}	2575	}
2505	}	2576	}
2506		2577
2507	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2578	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508	{	2579	{
2509	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2580	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2581	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511	am_transparent = 0;	2582	am_transparent = 0;
2512	/* XXX: also turn off Opt_transparent? */	2583	/* XXX: also turn off Opt_transparent? */
2513	}	2584	}
2514	else	2585	else
2515	{	2586	{
…		…
2518	* needed for fvwm2.2.2 (and before?) */	2589	* needed for fvwm2.2.2 (and before?) */
2519	sleep (1);	2590	sleep (1);
2520	#endif	2591	#endif
2521	for (n = 0; n < (unsigned int)i; n++)	2592	for (n = 0; n < (unsigned int)i; n++)
2522	{	2593	{
2523	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2594	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524	XClearWindow (display->display, TermWin.parent[n]);	2595	XClearWindow (disp, parent[n]);
2525	}	2596	}
2526		2597
2527	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528	am_transparent = 1;	2599	am_transparent = 1;
2529	}	2600	}
2530		2601
2531	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2602	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532	TermWin.parent[i] = None;	2603	parent[i] = None;
2533	}	2604	}
2534		2605
2535	if (scrollBar.win)	2606	if (scrollBar.win)
2536	{	2607	{
2537	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2608	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538	scrollBar.setIdle ();	2609	scrollBar.setIdle ();
2539	scrollbar_show (0);	2610	scrollbar_show (0);
		2611	}
		2612
		2613	if (am_transparent)
		2614	{
		2615	want_refresh = want_full_refresh = 1;
		2616	if (am_pixmap_trans)
		2617	flush ();
2540	}	2618	}
2541		2619
2542	return pchanged;	2620	return pchanged;
2543	}	2621	}
2544	#endif	2622	#endif
…		…
2573	// some window managers resize the window early, and these programs	2651	// some window managers resize the window early, and these programs
2574	// then sometimes get the size wrong.	2652	// then sometimes get the size wrong.
2575	// unfortunately other programs are even more buggy and dislike	2653	// unfortunately other programs are even more buggy and dislike
2576	// being sent SIGWINCH, so only do it when we were in fact being	2654	// being sent SIGWINCH, so only do it when we were in fact being
2577	// resized.	2655	// resized.
2578	if (seen_resize)	2656	if (seen_resize && cmd_pid)
2579	kill (-cmd_pid, SIGWINCH);	2657	kill (-cmd_pid, SIGWINCH);
2580	}	2658	}
2581		2659
2582	/* Read a text string from the input buffer */	2660	/* Read a text string from the input buffer */
2583	unicode_t buf[UBUFSIZ];	2661	unicode_t buf[UBUFSIZ];
2584	bool refreshnow = false;	2662	bool refreshnow = false;
2585	int nlines = 0;	2663	int nlines = 0;
2586	unicode_t *str = buf;	2664	unicode_t *str = buf;
		2665	unicode_t *eol = str + min (ncol, UBUFSIZ);
2587		2666
2588	for (;;)	2667	for (;;)
2589	{	2668	{
2590	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2669	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2591	break;	2670	break;
2592		2671
2593	*str++ = ch;	2672	*str++ = ch;
2594		2673
2595	if (ch == C0_LF)	2674	if (ch == C0_LF || str >= eol)
2596	{	2675	{
		2676	if (ch == C0_LF)
2597	nlines++;	2677	nlines++;
		2678
2598	refresh_count++;	2679	refresh_count++;
2599		2680
2600	if (!(options & Opt_jumpScroll)	2681	if (!(options & Opt_jumpScroll)
2601	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2682	|| (refresh_count >= refresh_limit * (nrow - 1)))
2602	{	2683	{
2603	refreshnow = true;	2684	refreshnow = true;
2604	ch = NOCHAR;	2685	ch = NOCHAR;
2605	break;	2686	break;
2606	}	2687	}
2607		2688
2608	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2689	// scr_add_lines only works for nlines <= nrow - 1.
2609	if (nlines >= TermWin.nrow - 1)	2690	if (nlines >= nrow - 1)
2610	{	2691	{
2611	scr_add_lines (buf, nlines, str - buf);	2692	scr_add_lines (buf, nlines, str - buf);
2612	nlines = 0;	2693	nlines = 0;
2613	str = buf;	2694	str = buf;
		2695	eol = str + min (ncol, UBUFSIZ);
2614	}	2696	}
2615	}
2616		2697
2617	if (str >= buf + UBUFSIZ)	2698	if (str >= eol)
2618	{	2699	{
		2700	if (eol >= buf + UBUFSIZ)
		2701	{
2619	ch = NOCHAR;	2702	ch = NOCHAR;
2620	break;	2703	break;
		2704	}
		2705	else
		2706	eol = min (eol + ncol, buf + UBUFSIZ);
		2707	}
		2708
2621	}	2709	}
2622		2710
2623	seq_begin = cmdbuf_ptr;	2711	seq_begin = cmdbuf_ptr;
2624	ch = next_char ();	2712	ch = next_char ();
2625	}	2713	}
…		…
2696	if (len == (size_t)-1)	2784	if (len == (size_t)-1)
2697	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2785	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2698		2786
2699	// assume wchar == unicode	2787	// assume wchar == unicode
2700	cmdbuf_ptr += len;	2788	cmdbuf_ptr += len;
2701	return wc;	2789	return wc & UNICODE_MASK;
2702	}	2790	}
2703		2791
2704	return NOCHAR;	2792	return NOCHAR;
2705	}	2793	}
2706		2794
…		…
3169	{	3257	{
3170	switch (priv)	3258	switch (priv)
3171	{	3259	{
3172	case '>':	3260	case '>':
3173	if (ch == CSI_DA) /* secondary device attributes */	3261	if (ch == CSI_DA) /* secondary device attributes */
3174	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3262	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3175	break;	3263	break;
3176	case '?':	3264	case '?':
3177	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3265	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3178	process_terminal_mode (ch, priv, nargs, arg);	3266	process_terminal_mode (ch, priv, nargs, arg);
3179	break;	3267	break;
…		…
3284		3372
3285	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3373	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3286	arg[0] = -arg[0];	3374	arg[0] = -arg[0];
3287	/* FALLTHROUGH */	3375	/* FALLTHROUGH */
3288	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3376	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3289	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3377	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3290	break;	3378	break;
3291		3379
3292	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3380	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3293	tt_write ((const unsigned char *)VT100_ANS,	3381	tt_write ((const unsigned char *)VT100_ANS,
3294	(unsigned int) (sizeof (VT100_ANS) - 1));	3382	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3408	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3496	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409	{	3497	{
3410	int x, y;	3498	int x, y;
3411	XWindowAttributes wattr;	3499	XWindowAttributes wattr;
3412	Window wdummy;	3500	Window wdummy;
		3501	dDisp;
3413		3502
3414	if (nargs == 0)	3503	if (nargs == 0)
3415	return;	3504	return;
3416		3505
3417	switch (args[0])	3506	switch (args[0])
3418	{	3507	{
3419	/*	3508	/*
3420	* commands	3509	* commands
3421	*/	3510	*/
3422	case 1: /* deiconify window */	3511	case 1: /* deiconify window */
3423	XMapWindow (display->display, TermWin.parent[0]);	3512	XMapWindow (disp, parent[0]);
3424	break;	3513	break;
3425	case 2: /* iconify window */	3514	case 2: /* iconify window */
3426	XIconifyWindow (display->display, TermWin.parent[0],	3515	XIconifyWindow (disp, parent[0], display->screen);
3427	DefaultScreen (display->display));
3428	break;	3516	break;
3429	case 3: /* set position (pixels) */	3517	case 3: /* set position (pixels) */
3430	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3518	XMoveWindow (disp, parent[0], args[1], args[2]);
3431	break;	3519	break;
3432	case 4: /* set size (pixels) */	3520	case 4: /* set size (pixels) */
3433	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3521	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434	break;	3522	break;
3435	case 5: /* raise window */	3523	case 5: /* raise window */
3436	XRaiseWindow (display->display, TermWin.parent[0]);	3524	XRaiseWindow (disp, parent[0]);
3437	break;	3525	break;
3438	case 6: /* lower window */	3526	case 6: /* lower window */
3439	XLowerWindow (display->display, TermWin.parent[0]);	3527	XLowerWindow (disp, parent[0]);
3440	break;	3528	break;
3441	case 7: /* refresh window */	3529	case 7: /* refresh window */
3442	scr_touch (true);	3530	scr_touch (true);
3443	break;	3531	break;
3444	case 8: /* set size (chars) */	3532	case 8: /* set size (chars) */
3445	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3533	set_widthheight ((unsigned int) (args[2] * fwidth),
3446	(unsigned int) (args[1] * TermWin.fheight));	3534	(unsigned int) (args[1] * fheight));
3447	break;	3535	break;
3448		3536
3449	//case 9: NYI, TODO, restore maximized window or maximize window	3537	//case 9: NYI, TODO, restore maximized window or maximize window
3450	default:	3538	default:
3451	if (args[0] >= 24) /* set height (chars) */	3539	if (args[0] >= 24) /* set height (chars) */
3452	set_widthheight ((unsigned int)TermWin.width,	3540	set_widthheight ((unsigned int)width,
3453	(unsigned int) (args[1] * TermWin.fheight));	3541	(unsigned int) (args[1] * fheight));
3454	break;	3542	break;
3455		3543
3456		3544
3457	/*	3545	/*
3458	* reports - some output format copied from XTerm	3546	* reports - some output format copied from XTerm
3459	*/	3547	*/
3460	case 11: /* report window state */	3548	case 11: /* report window state */
3461	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3549	XGetWindowAttributes (disp, parent[0], &wattr);
3462	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3550	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463	break;	3551	break;
3464	case 13: /* report window position */	3552	case 13: /* report window position */
3465	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3553	XGetWindowAttributes (disp, parent[0], &wattr);
3466	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3554	XTranslateCoordinates (disp, parent[0], wattr.root,
3467	-wattr.border_width, -wattr.border_width,	3555	-wattr.border_width, -wattr.border_width,
3468	&x, &y, &wdummy);	3556	&x, &y, &wdummy);
3469	tt_printf ("\033[3;%d;%dt", x, y);	3557	tt_printf ("\033[3;%d;%dt", x, y);
3470	break;	3558	break;
3471	case 14: /* report window size (pixels) */	3559	case 14: /* report window size (pixels) */
3472	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3560	XGetWindowAttributes (disp, parent[0], &wattr);
3473	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3561	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474	break;	3562	break;
3475	case 18: /* report text area size (chars) */	3563	case 18: /* report text area size (chars) */
3476	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3564	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3477	break;	3565	break;
3478	case 19: /* report window size (chars) */	3566	case 19: /* report window size (chars) */
3479	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3567	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3480	break;	3568	break;
3481	case 20: /* report icon label */	3569	case 20: /* report icon label */
3482	{	3570	{
3483	char *s;	3571	char *s;
3484	XGetIconName (display->display, TermWin.parent[0], &s);	3572	XGetIconName (disp, parent[0], &s);
3485	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3573	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486	XFree (s);	3574	XFree (s);
3487	}	3575	}
3488	break;	3576	break;
3489	case 21: /* report window title */	3577	case 21: /* report window title */
3490	{	3578	{
3491	char *s;	3579	char *s;
3492	XFetchName (display->display, TermWin.parent[0], &s);	3580	XFetchName (disp, parent[0], &s);
3493	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3581	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494	XFree (s);	3582	XFree (s);
3495	}	3583	}
3496	break;	3584	break;
3497	}	3585	}
…		…
3504	* ends_how is terminator used. returned input must be free()'d	3592	* ends_how is terminator used. returned input must be free()'d
3505	*/	3593	*/
3506	unsigned char *	3594	unsigned char *
3507	rxvt_term::get_to_st (unicode_t &ends_how)	3595	rxvt_term::get_to_st (unicode_t &ends_how)
3508	{	3596	{
3509	unicode_t seen_esc = 0, ch;	3597	unicode_t ch;
		3598	bool seen_esc = false;
3510	unsigned int n = 0;	3599	unsigned int n = 0;
3511	unsigned char *s;
3512	unsigned char string[STRING_MAX];	3600	wchar_t string[STRING_MAX];
3513		3601
3514	while ((ch = cmd_getc ()) != NOCHAR)	3602	while ((ch = cmd_getc ()) != NOCHAR)
3515	{	3603	{
3516	if (seen_esc)	3604	if (seen_esc)
3517	{	3605	{
…		…
3520	else	3608	else
3521	return NULL;	3609	return NULL;
3522	}	3610	}
3523	else if (ch == C0_ESC)	3611	else if (ch == C0_ESC)
3524	{	3612	{
3525	seen_esc = 1;	3613	seen_esc = true;
3526	continue;	3614	continue;
3527	}	3615	}
3528	else if (ch == C0_BEL || ch == CHAR_ST)	3616	else if (ch == C0_BEL || ch == CHAR_ST)
3529	break;	3617	break;
3530	else if (ch < 0x20)	3618	else if (ch < 0x20)
3531	return NULL; /* other control character - exit */	3619	return NULL; /* other control character - exit */
3532		3620
3533	seen_esc = 0;	3621	seen_esc = false;
3534		3622
3535	if (n >= sizeof (string) - 1)	3623	if (n >= STRING_MAX - 1)
3536	// stop at some sane length	3624	// stop at some sane length
3537	return NULL;	3625	return NULL;
3538		3626
3539	if (ch == C0_SYN)	3627	if (ch == C0_SYN)
3540	string[n++] = cmd_get8 ();	3628	string[n++] = cmd_get8 ();
…		…
3542	string[n++] = ch;	3630	string[n++] = ch;
3543	}	3631	}
3544		3632
3545	string[n++] = '\0';	3633	string[n++] = '\0';
3546		3634
3547	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548	return NULL;
3549
3550	ends_how = (ch == 0x5c ? C0_ESC : ch);	3635	ends_how = (ch == 0x5c ? C0_ESC : ch);
3551	strncpy (s, string, n);	3636
3552	return s;	3637	return (unsigned char *)rxvt_wcstombs (string);
3553	}	3638	}
3554		3639
3555	/*----------------------------------------------------------------------*/	3640	/*----------------------------------------------------------------------*/
3556	/*	3641	/*
3557	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3642	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
…		…
3611	set_window_color (color, str);	3696	set_window_color (color, str);
3612	}	3697	}
3613		3698
3614	/*	3699	/*
3615	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3700	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3616	* 0 = change iconName/title
3617	* 1 = change iconName
3618	* 2 = change title
3619	* 4 = change color
3620	* 10 = change fg color
3621	* 11 = change bg color
3622	* 12 = change text color
3623	* 13 = change mouse foreground color
3624	* 17 = change highlight character colour
3625	* 18 = change bold character color
3626	* 19 = change underlined character color
3627	* 46 = change logfile (not implemented)
3628	* 50 = change font
3629	*
3630	* rxvt extensions:
3631	* 20 = bg pixmap
3632	* 39 = change default fg color
3633	* 49 = change default bg color
3634	* 55 = dump scrollback buffer and all of screen
3635	* 701 = change locale
3636	* 702 = find font
3637	* 703 = menu
3638	*/	3701	*/
3639	void	3702	void
3640	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3703	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3641	{	3704	{
3642	int changed = 0;	3705	int changed = 0;
3643	int color;	3706	int color;
3644	char *buf, *name;	3707	char *buf, *name;
3645	bool query = str[0] == '?' && !str[1];	3708	bool query = str[0] == '?' && !str[1];
3646	int saveop = op;	3709	int saveop = op;
		3710	dDisp;
3647		3711
3648	assert (str != NULL);	3712	assert (str != NULL);
3649	switch (op)	3713	switch (op)
3650	{	3714	{
3651	case XTerm_name:	3715	case XTerm_name:
…		…
3658	set_title (str);	3722	set_title (str);
3659	break;	3723	break;
3660	case XTerm_property:	3724	case XTerm_property:
3661	if (str[0] == '?')	3725	if (str[0] == '?')
3662	{	3726	{
3663	Atom prop = XInternAtom (display->display, str + 1, True);	3727	Atom prop = display->atom (str + 1);
3664	Atom actual_type;	3728	Atom actual_type;
3665	int actual_format;	3729	int actual_format;
3666	unsigned long nitems;	3730	unsigned long nitems;
3667	unsigned long bytes_after;	3731	unsigned long bytes_after;
3668	unsigned char *value = 0;	3732	unsigned char *value = 0;
3669	const char *str = "";	3733	const char *str = "";
3670		3734
3671	if (prop	3735	if (prop
3672	&& XGetWindowProperty (display->display, TermWin.parent[0],	3736	&& XGetWindowProperty (disp, parent[0],
3673	prop, 0, 1<<16, 0, AnyPropertyType,	3737	prop, 0, 1<<16, 0, AnyPropertyType,
3674	&actual_type, &actual_format,	3738	&actual_type, &actual_format,
3675	&nitems, &bytes_after, &value) == Success	3739	&nitems, &bytes_after, &value) == Success
3676	&& actual_type != None	3740	&& actual_type != None
3677	&& actual_format == 8)	3741	&& actual_format == 8)
…		…
3686	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3750	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687		3751
3688	if (eq)	3752	if (eq)
3689	{	3753	{
3690	*eq = 0;	3754	*eq = 0;
3691	XChangeProperty (display->display, TermWin.parent[0],	3755	set_utf8_property (display->atom (str), eq + 1);
3692	display->atom (str), XA_STRING, 8,
3693	PropModeReplace, (unsigned char *)eq + 1,
3694	strlen (eq + 1));
3695	}	3756	}
3696	else	3757	else
3697	XDeleteProperty (display->display, TermWin.parent[0],	3758	XDeleteProperty (disp, parent[0],
3698	display->atom (str));	3759	display->atom (str));
3699	}	3760	}
3700	break;	3761	break;
3701		3762
3702	case XTerm_Color:	3763	case XTerm_Color:
…		…
3743	break;	3804	break;
3744	#ifndef NO_BOLD_UNDERLINE_REVERSE	3805	#ifndef NO_BOLD_UNDERLINE_REVERSE
3745	case XTerm_Color_BD:	3806	case XTerm_Color_BD:
3746	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3807	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3747	break;	3808	break;
3748	case XTerm_Color_IT:
3749	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750	break;
3751	case XTerm_Color_UL:	3809	case XTerm_Color_UL:
3752	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3810	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3753	break;	3811	break;
3754	case XTerm_Color_RV:	3812	case XTerm_Color_RV:
3755	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3813	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756	break;	3814	break;
		3815	case URxvt_Color_IT:
		3816	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3817	break;
3757	#endif	3818	#endif
3758	#if TRANSPARENT || TINTING	3819	#if TRANSPARENT && TINTING
3759	case XTerm_Color_tint:	3820	case URxvt_Color_tint:
3760	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3821	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3761	check_our_parents ();	3822	check_our_parents ();
3762	if (am_transparent)	3823	if (am_transparent)
3763	want_full_refresh = want_refresh = 1;	3824	want_full_refresh = want_refresh = 1;
3764	break;	3825	break;
3765	#endif	3826	#endif
…		…
3777	{	3838	{
3778	str++;	3839	str++;
3779	#if XPM_BACKGROUND	3840	#if XPM_BACKGROUND
3780	changed += scale_pixmap (str);	3841	changed += scale_pixmap (str);
3781	#endif	3842	#endif
3782
3783	}	3843	}
		3844
3784	if (changed)	3845	if (changed)
3785	{	3846	{
3786	#ifdef XPM_BACKGROUND	3847	#ifdef XPM_BACKGROUND
3787	resize_pixmap ();	3848	resize_pixmap ();
3788	#endif	3849	#endif
…		…
3799		3860
3800	case XTerm_logfile:	3861	case XTerm_logfile:
3801	// TODO, when secure mode?	3862	// TODO, when secure mode?
3802	break;	3863	break;
3803		3864
		3865	#ifdef MENUBAR
		3866	case URxvt_Menu:
		3867	if (options & Opt_insecure)
		3868	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3869	break;
		3870	#endif
		3871	#if 0
		3872	case XTerm_dumpscreen: /* no error notices */
		3873	{
		3874	int fd;
		3875	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3876	{
		3877	scr_dump (fd);
		3878	close (fd);
		3879	}
		3880	}
		3881	break;
		3882	#endif
3804	case XTerm_font:	3883	case XTerm_font:
3805	op = URxvt_font;	3884	op = URxvt_font;
3806	case URxvt_font:	3885	case URxvt_font:
3807	#if ENABLE_STYLES	3886	#if ENABLE_STYLES
3808	case URxvt_boldFont:	3887	case URxvt_boldFont:
3809	case URxvt_italicFont:	3888	case URxvt_italicFont:
3810	case URxvt_boldItalicFont:	3889	case URxvt_boldItalicFont:
3811	#endif	3890	#endif
3812	if (query)	3891	if (query)
3813	tt_printf ("\33]%d;%-.250s%c", saveop,	3892	tt_printf ("\33]%d;%-.250s%c", saveop,
3814	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3893	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3815	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3894	? fontset[op - URxvt_font]->fontdesc : "",
3816	resp);	3895	resp);
3817	else	3896	else
3818	{	3897	{
3819	const char *&res = rs[Rs_font + (op - URxvt_font)];	3898	const char *&res = rs[Rs_font + (op - URxvt_font)];
3820		3899
…		…
3823	set_fonts ();	3902	set_fonts ();
3824	}	3903	}
3825	break;	3904	break;
3826		3905
3827	#if ENABLE_FRILLS	3906	#if ENABLE_FRILLS
3828	case XTerm_locale:	3907	case URxvt_locale:
3829	if (query)	3908	if (query)
3830	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3909	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3831	else	3910	else
3832	{	3911	{
3833	set_locale (str);	3912	set_locale (str);
3834	# ifdef USE_XIM	3913	pty.set_utf8_mode (enc_utf8);
3835	im_cb ();	3914	init_xlocale ();
3836	# endif
3837	}	3915	}
3838	break;	3916	break;
3839	#endif
3840		3917
3841	#ifdef MENUBAR	3918	case URxvt_view_up:
3842	case XTerm_Menu:	3919	case URxvt_view_down:
3843	if (options & Opt_insecure)	3920	int lines = atoi (str);
3844	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3921
3845	break;	3922	if (lines)
3846	#endif	3923	scr_page (op == URxvt_view_up ? UP : DN, lines);
3847	#if 0
3848	case XTerm_dumpscreen: /* no error notices */
3849	{	3924	else
3850	int fd;
3851	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852	{	3925	{
3853	scr_dump (fd);	3926	scr_erase_savelines ();
3854	close (fd);
3855	}	3927	}
3856	}	3928
3857	break;	3929	break;
3858	#endif	3930	#endif
3859	}	3931	}
3860	}	3932	}
3861	/*----------------------------------------------------------------------*/	3933	/*----------------------------------------------------------------------*/
…		…
3994	*/	4066	*/
3995	PrivMode (1, PrivMode_vt52);	4067	PrivMode (1, PrivMode_vt52);
3996	break;	4068	break;
3997	case 3: /* 80/132 */	4069	case 3: /* 80/132 */
3998	if (priv_modes & PrivMode_132OK)	4070	if (priv_modes & PrivMode_132OK)
3999	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4071	set_widthheight (((state ? 132 : 80) * fwidth), height);
4000	break;	4072	break;
4001	case 4: /* smooth scrolling */	4073	case 4: /* smooth scrolling */
4002	if (state)	4074	if (state)
4003	options &= ~Opt_jumpScroll;	4075	options &= ~Opt_jumpScroll;
4004	else	4076	else
…		…
4276		4348
4277	/* ---------------------------------------------------------------------- */	4349	/* ---------------------------------------------------------------------- */
4278	/* Write data to the pty as typed by the user, pasted with the mouse,	4350	/* Write data to the pty as typed by the user, pasted with the mouse,
4279	* or generated by us in response to a query ESC sequence.	4351	* or generated by us in response to a query ESC sequence.
4280	*/	4352	*/
		4353	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4354
4281	void	4355	void
4282	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4356	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4283	{	4357	{
4284	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4358	if (v_buflen == 0)
		4359	{
		4360	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4285		4361
4286	if (len)	4362	if ((unsigned int)written == len)
		4363	return;
		4364
		4365	data += written;
		4366	len -= written;
4287	{	4367	}
		4368
		4369	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4370
		4371	memcpy (v_buffer + v_buflen, data, len);
		4372	v_buflen += len;
		4373
		4374	pty_ev.set (EVENT_READ | EVENT_WRITE);
		4375	}
		4376
		4377	void rxvt_term::pty_write ()
		4378	{
		4379	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4380
		4381	if (written > 0)
		4382	{
		4383	v_buflen -= written;
		4384
4288	if (v_buflen == 0)	4385	if (v_buflen == 0)
4289	{	4386	{
4290	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291
4292	if ((unsigned int)written == len)
4293	return;
4294
4295	data += written;
4296	len -= written;
4297	}
4298
4299
4300	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302	memcpy (v_buffer + v_buflen, data, len);
4303	v_buflen += len;
4304	}
4305
4306	for (;;)
4307	{
4308	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4309
4310	if (written > 0)
4311	{
4312	v_buflen -= written;
4313
4314	if (v_buflen == 0)
4315	{
4316	free (v_buffer);	4387	free (v_buffer);
4317	v_buffer = 0;	4388	v_buffer = 0;
4318	v_buflen = 0;	4389	v_buflen = 0;
4319		4390
4320	pty_ev.set (EVENT_READ);	4391	pty_ev.set (EVENT_READ);
4321	return;
4322	}
4323
4324	memmove (v_buffer, v_buffer + written, v_buflen);
4325	}
4326	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4327	// original code just ignores this...
4328	destroy ();
4329	else
4330	{
4331	pty_ev.set (EVENT_READ | EVENT_WRITE);
4332	return;	4392	return;
4333	}	4393	}
		4394
		4395	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}	4396	}
		4397	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4398	pty_ev.set (EVENT_READ);
4335	}	4399	}
4336		4400
4337	/*----------------------- end-of-file (C source) -----------------------*/	4401	/*----------------------- end-of-file (C source) -----------------------*/
4338		4402

Diff Legend

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