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.217 by root, Sat Dec 31 16:30: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], x, y);
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
		162	void
		163	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
		164	{
150	#if ENABLE_OVERLAY	165	#if ENABLE_OVERLAY
151	void
152	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
153	{
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;
158		170
		171	fname = rxvt_utf8towcs (f->name);
		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);
163	alloc = chr = new wchar_t[len];	177	alloc = chr = new wchar_t[len];
164	rxvt_composite.expand (ch, chr);	178	rxvt_composite.expand (ch, chr);
165	}	179	}
166	else	180	else
167	#endif	181	# endif
168	{	182	{
169	ch2 = ch;	183	ch2 = ch;
170		184
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
178	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	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
		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);
179		214
180	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181		216
182	for (int y = 0; y < len; y++)	217	for (int y = 0; y < len; y++)
183	{	218	{
…		…
186	ch = *chr++;	221	ch = *chr++;
187		222
188	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
189	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
190	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
191	#if !UNICODE3	226	# if !UNICODE3
192	if (ch >= 0x10000)	227	if (ch >= 0x10000)
193	ch = 0xfffd;	228	ch = 0xfffd;
194	#endif	229	# endif
195	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
196	scr_overlay_set (12, y, NOCHAR, r);	231	scr_overlay_set (12, y, NOCHAR, r);
197	}	232	}
198		233
		234	scr_overlay_set (0, len , attr);
199	scr_overlay_set (0, len, f->name);	235	scr_overlay_set (0, len + 1, fname);
200		236
		237	free (fname);
		238
201	#if ENABLE_COMBINING	239	# if ENABLE_COMBINING
202	if (alloc)	240	if (alloc)
203	delete [] alloc;	241	delete [] alloc;
204	#endif	242	# endif
205	}
206	#endif	243	#endif
		244	}
207		245
208	void	246	void
209	rxvt_term::commit_iso14755 ()	247	rxvt_term::commit_iso14755 ()
210	{	248	{
211	wchar_t ch[2];	249	wchar_t ch[2];
…		…
272	* 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
273	* escape sequence to toggle the Keypad.	311	* escape sequence to toggle the Keypad.
274	*	312	*
275	* Always permit `shift' to override the current setting	313	* Always permit `shift' to override the current setting
276	*/	314	*/
277	shft = (ev.state & ShiftMask);	315	shft = ev.state & ShiftMask;
278	ctrl = (ev.state & ControlMask);	316	ctrl = ev.state & ControlMask;
279	meta = (ev.state & ModMetaMask);	317	meta = ev.state & ModMetaMask;
280		318
281	if (numlock_state || (ev.state & ModNumLockMask))	319	if (numlock_state || (ev.state & ModNumLockMask))
282	{	320	{
283	numlock_state = (ev.state & ModNumLockMask);	321	numlock_state = (ev.state & ModNumLockMask);
284	PrivMode ((!numlock_state), PrivMode_aplKP);	322	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
304		342
305	// the XOpenIM manpage lies about hardcoding the locale	343	// the XOpenIM manpage lies about hardcoding the locale
306	// at the point of XOpenIM, so temporarily switch locales	344	// at the point of XOpenIM, so temporarily switch locales
307	if (rs[Rs_imLocale])	345	if (rs[Rs_imLocale])
308	SET_LOCALE (rs[Rs_imLocale]);	346	SET_LOCALE (rs[Rs_imLocale]);
		347
309	// assume wchar_t == unicode or better	348	// assume wchar_t == unicode or better
310	len = XwcLookupString (Input_Context, &ev, wkbuf,	349	len = XwcLookupString (Input_Context, &ev, wkbuf,
311	KBUFSZ, &keysym, &status_return);	350	KBUFSZ, &keysym, &status_return);
		351
312	if (rs[Rs_imLocale])	352	if (rs[Rs_imLocale])
313	SET_LOCALE (locale);	353	SET_LOCALE (locale);
314		354
315	if (status_return == XLookupChars	355	if (status_return == XLookupChars
316	|| status_return == XLookupBoth)	356	|| status_return == XLookupBoth)
…		…
343	valid_keysym = keysym != NoSymbol;	383	valid_keysym = keysym != NoSymbol;
344	}	384	}
345		385
346	if (valid_keysym)	386	if (valid_keysym)
347	{	387	{
		388	#ifdef KEYSYM_RESOURCE
		389	if (keyboard->dispatch (this, keysym, ev.state))
		390	return;
		391	#endif
		392
348	if (TermWin.saveLines)	393	if (saveLines)
349	{	394	{
350	#ifdef UNSHIFTED_SCROLLKEYS	395	#ifdef UNSHIFTED_SCROLLKEYS
351	if (!ctrl && !meta)	396	if (!ctrl && !meta)
352	#else	397	#else
353	if (IS_SCROLL_MOD)	398	if (IS_SCROLL_MOD)
354	#endif	399	#endif
355	{	400	{
356	int lnsppg;	401	int lnsppg;
357		402
358	#ifdef PAGING_CONTEXT_LINES	403	#ifdef PAGING_CONTEXT_LINES
359	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	404	lnsppg = nrow - PAGING_CONTEXT_LINES;
360	#else	405	#else
361	lnsppg = TermWin.nrow * 4 / 5;	406	lnsppg = nrow * 4 / 5;
362	#endif	407	#endif
363	if (keysym == XK_Prior)	408	if (keysym == XK_Prior)
364	{	409	{
365	scr_page (UP, lnsppg);	410	scr_page (UP, lnsppg);
366	return;	411	return;
…		…
417	{	462	{
418	/* normal XTerm key bindings */	463	/* normal XTerm key bindings */
419	case XK_Insert: /* Shift+Insert = paste mouse selection */	464	case XK_Insert: /* Shift+Insert = paste mouse selection */
420	selection_request (ev.time, 0, 0);	465	selection_request (ev.time, 0, 0);
421	return;	466	return;
422	#if TODO // TODO	467	#if TODO
423	/* rxvt extras */	468	/* rxvt extras */
424	case XK_KP_Add: /* Shift+KP_Add = bigger font */	469	case XK_KP_Add: /* Shift+KP_Add = bigger font */
425	change_font (FONT_UP);	470	change_font (FONT_UP);
426	return;	471	return;
427	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	472	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
486	}	531	}
487	#endif	532	#endif
488		533
489	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	534	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490	{	535	{
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	{	536	{
517	newlen = 1;	537	newlen = 1;
518	switch (keysym)	538	switch (keysym)
519	{	539	{
520	#ifndef NO_BACKSPACE_KEY	540	#ifndef NO_BACKSPACE_KEY
…		…
528	else	548	else
529	strcpy (kbuf, key_backspace);	549	strcpy (kbuf, key_backspace);
530	break;	550	break;
531	#endif	551	#endif
532	#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
533	case XK_Delete:	563	case XK_Delete:
534	strcpy (kbuf, key_delete);	564	strcpy (kbuf, key_delete);
535	break;	565	break;
536	#endif	566	#endif
537	case XK_Tab:	567	case XK_Tab:
…		…
640	#ifdef XK_KP_Begin	670	#ifdef XK_KP_Begin
641	case XK_KP_Begin:	671	case XK_KP_Begin:
642	strcpy (kbuf, "\033Ou");	672	strcpy (kbuf, "\033Ou");
643	break;	673	break;
644		674
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	675	#endif
653	case XK_KP_F1: /* "\033OP" */	676	case XK_KP_F1: /* "\033OP" */
654	case XK_KP_F2: /* "\033OQ" */	677	case XK_KP_F2: /* "\033OQ" */
655	case XK_KP_F3: /* "\033OR" */	678	case XK_KP_F3: /* "\033OR" */
656	case XK_KP_F4: /* "\033OS" */	679	case XK_KP_F4: /* "\033OS" */
…		…
688	break;	711	break;
689		712
690	case XK_Find:	713	case XK_Find:
691	strcpy (kbuf, "\033[1~");	714	strcpy (kbuf, "\033[1~");
692	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
693	case XK_Insert:	727	case XK_Insert:
694	strcpy (kbuf, "\033[2~");	728	strcpy (kbuf, "\033[2~");
695	break;	729	break;
696	#ifdef DXK_Remove /* support for DEC remove like key */	730	#ifdef DXK_Remove /* support for DEC remove like key */
697	case DXK_Remove:	731	case DXK_Remove:
…		…
787	#undef FKEY	821	#undef FKEY
788	default:	822	default:
789	newlen = 0;	823	newlen = 0;
790	break;	824	break;
791	}	825	}
		826
792	if (newlen)	827	if (newlen)
793	len = strlen (kbuf);	828	len = strlen (kbuf);
794	}	829	}
795		830
796	/*	831	/*
…		…
805	else if (ctrl && keysym == XK_minus)	840	else if (ctrl && keysym == XK_minus)
806	{	841	{
807	len = 1;	842	len = 1;
808	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	843	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809	}	844	}
		845	else if (keysym == XK_ISO_Left_Tab)
		846	{
		847	strcpy (kbuf, "\033[Z");
		848	len = 3;
		849	}
810	else	850	else
811	{	851	{
812	#ifdef META8_OPTION	852	#ifdef META8_OPTION
813	/* set 8-bit on */	853	/* set 8-bit on */
814	if (meta && (meta_char == 0x80))	854	if (meta && (meta_char == 0x80))
…		…
827		867
828	if (len <= 0)	868	if (len <= 0)
829	return; /* not mapped */	869	return; /* not mapped */
830		870
831	if (options & Opt_scrollTtyKeypress)	871	if (options & Opt_scrollTtyKeypress)
832	if (TermWin.view_start)	872	if (view_start)
833	{	873	{
834	TermWin.view_start = 0;	874	view_start = 0;
835	want_refresh = 1;	875	want_refresh = 1;
836	}	876	}
837		877
838	/*	878	/*
839	* these modifications only affect the static keybuffer	879	* these modifications only affect the static keybuffer
…		…
872	#endif /* DEBUG_CMD */	912	#endif /* DEBUG_CMD */
873	tt_write (kbuf, (unsigned int)len);	913	tt_write (kbuf, (unsigned int)len);
874	}	914	}
875	/*}}} */	915	/*}}} */
876		916
877	#if (MENUBAR_MAX)	917	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	918	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879	/* attempt to `write' count to the input buffer */	919	/* attempt to `write' count to the input buffer */
880	unsigned int	920	unsigned int
881	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	921	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882	{	922	{
…		…
905		945
906	cmd_parse ();	946	cmd_parse ();
907		947
908	return 0;	948	return 0;
909	}	949	}
910	#endif /* MENUBAR_MAX */	950	#endif
911		951
912	void	952	void
913	rxvt_term::flush ()	953	rxvt_term::flush ()
914	{	954	{
		955	flush_ev.stop ();
		956
915	#ifdef TRANSPARENT	957	#ifdef TRANSPARENT
916	if (want_full_refresh)	958	if (want_full_refresh)
917	{	959	{
918	want_full_refresh = 0;	960	want_full_refresh = 0;
919	scr_clear ();	961	scr_clear ();
…		…
929	IMSendSpot ();	971	IMSendSpot ();
930	#endif	972	#endif
931	}	973	}
932		974
933	display->flush ();	975	display->flush ();
934
935	flush_ev.stop ();
936	}	976	}
937		977
938	void	978	void
939	rxvt_term::check_cb (check_watcher &w)	979	rxvt_term::check_cb (check_watcher &w)
940	{	980	{
…		…
1016	{	1056	{
1017	if (mouse_slip_wheel_speed == 0	1057	if (mouse_slip_wheel_speed == 0
1018	|| 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)
1019	: scr_page (UP, mouse_slip_wheel_speed))	1059	: scr_page (UP, mouse_slip_wheel_speed))
1020	{	1060	{
		1061	if (view_start == nsaved ||
		1062	view_start == 0)
		1063	mouse_slip_wheel_speed = 0;
		1064
1021	refresh_type |= SMOOTH_REFRESH;	1065	refresh_type |= SMOOTH_REFRESH;
1022	want_refresh = 1;	1066	want_refresh = 1;
1023	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1067	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024	}	1068	}
1025	}	1069	}
…		…
1045	if (n > 0)	1089	if (n > 0)
1046	{	1090	{
1047	cmdbuf_endp += n;	1091	cmdbuf_endp += n;
1048	return true;	1092	return true;
1049	}	1093	}
1050	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 (!(options & Opt_hold))
1051	destroy ();	1099	destroy ();
		1100	}
1052		1101
1053	return false;	1102	return false;
1054	}	1103	}
1055		1104
1056	void	1105	void
1057	rxvt_term::pty_cb (io_watcher &w, short revents)	1106	rxvt_term::pty_cb (io_watcher &w, short revents)
1058	{	1107	{
1059	SET_R (this);	1108	SET_R (this);
1060	SET_LOCALE (locale);	1109	SET_LOCALE (locale);
1061		1110
1062	if (revents & EVENT_WRITE)
1063	tt_write (0, 0);
1064	else if (revents & EVENT_READ)	1111	if (revents & EVENT_READ)
1065	// loop, but don't allow a single term to monopolize us	1112	// loop, but don't allow a single term to monopolize us
1066	while (pty_fill ())	1113	while (pty_fill ())
1067	if (cmd_parse ())	1114	if (cmd_parse ())
1068	break;	1115	break;
		1116
		1117	if (revents & EVENT_WRITE)
		1118	pty_write ();
1069	}	1119	}
1070		1120
1071	void	1121	void
1072	rxvt_term::pointer_unblank ()	1122	rxvt_term::pointer_unblank ()
1073	{	1123	{
1074	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1124	XDefineCursor (display->display, vt, TermWin_cursor);
1075	recolour_cursor ();	1125	recolour_cursor ();
1076		1126
1077	#ifdef POINTER_BLANK	1127	#ifdef POINTER_BLANK
1078	hidden_pointer = 0;	1128	hidden_pointer = 0;
1079		1129
…		…
1087	rxvt_term::pointer_blank ()	1137	rxvt_term::pointer_blank ()
1088	{	1138	{
1089	if (! (options & Opt_pointerBlank))	1139	if (! (options & Opt_pointerBlank))
1090	return;	1140	return;
1091		1141
1092	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1142	XDefineCursor (display->display, vt, display->blank_cursor);
1093	XFlush (display->display);	1143	XFlush (display->display);
1094		1144
1095	hidden_pointer = 1;	1145	hidden_pointer = 1;
1096	}	1146	}
1097		1147
…		…
1186		1236
1187	/*{{{ process an X event */	1237	/*{{{ process an X event */
1188	void	1238	void
1189	rxvt_term::x_cb (XEvent &ev)	1239	rxvt_term::x_cb (XEvent &ev)
1190	{	1240	{
		1241	dDisp;
		1242
1191	SET_R (this);	1243	SET_R (this);
1192	SET_LOCALE (locale);	1244	SET_LOCALE (locale);
1193		1245
1194	#if defined(CURSOR_BLINK)	1246	#if defined(CURSOR_BLINK)
1195	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1247	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1216	if (ev.type == KeyPress && hidden_pointer == 0)	1268	if (ev.type == KeyPress && hidden_pointer == 0)
1217	pointer_blank ();	1269	pointer_blank ();
1218	}	1270	}
1219	#endif	1271	#endif
1220		1272
1221	#ifdef USE_XIM
1222	if (XFilterEvent (&ev, None))
1223	return;
1224	#endif
1225
1226	Window unused_root, unused_child;	1273	Window unused_root, unused_child;
1227	int unused_root_x, unused_root_y;	1274	int unused_root_x, unused_root_y;
1228	unsigned int unused_mask;	1275	unsigned int unused_mask;
1229		1276
1230	switch (ev.type)	1277	switch (ev.type)
1231	{	1278	{
1232	case KeyPress:	1279	case KeyPress:
1233	#if ISO_14755	1280	#if ISO_14755
…		…
1316	button_release (ev.xbutton);	1363	button_release (ev.xbutton);
1317	break;	1364	break;
1318		1365
1319	case ClientMessage:	1366	case ClientMessage:
1320	if (ev.xclient.format == 32	1367	if (ev.xclient.format == 32
		1368	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1369	{
1321	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1370	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1322	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
1323	#ifdef OFFIX_DND	1388	#ifdef OFFIX_DND
1324	/* OffiX Dnd (drag 'n' drop) protocol */	1389	/* OffiX Dnd (drag 'n' drop) protocol */
1325	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1390	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1326	&& (ev.xclient.data.l[0] == DndFile	1391	&& (ev.xclient.data.l[0] == DndFile
1327	|| ev.xclient.data.l[0] == DndDir	1392	|| ev.xclient.data.l[0] == DndDir
1328	|| ev.xclient.data.l[0] == DndLink))	1393	|| ev.xclient.data.l[0] == DndLink))
1329	{	1394	{
1330	/* Get Dnd data */	1395	/* Get Dnd data */
1331	Atom ActualType;	1396	Atom ActualType;
1332	int ActualFormat;	1397	int ActualFormat;
1333	unsigned char *data;	1398	unsigned char *data;
1334	unsigned long Size, RemainingBytes;	1399	unsigned long Size, RemainingBytes;
1335		1400
1336	XGetWindowProperty (display->display, display->root,	1401	XGetWindowProperty (disp, display->root,
1337	xa[XA_DNDSELECTION],	1402	xa[XA_DNDSELECTION],
1338	0L, 1000000L,	1403	0L, 1000000L,
1339	False, AnyPropertyType,	1404	False, AnyPropertyType,
1340	&ActualType, &ActualFormat,	1405	&ActualType, &ActualFormat,
1341	&Size, &RemainingBytes,	1406	&Size, &RemainingBytes,
1342	&data);	1407	&data);
1343	XChangeProperty (display->display, display->root,	1408	set_string_property (XA_CUT_BUFFER0, data);
1344	XA_CUT_BUFFER0, XA_STRING,
1345	8, PropModeReplace,
1346	data, strlen (data));
1347	XFree (data);	1409	XFree (data);
1348	selection_paste (display->root, XA_CUT_BUFFER0, True);	1410	selection_paste (display->root, XA_CUT_BUFFER0, true);
1349	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1411	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1350	}	1412	}
1351	#endif /* OFFIX_DND */	1413	#endif /* OFFIX_DND */
1352	break;	1414	break;
1353		1415
1354	case MappingNotify:	1416	case MappingNotify:
…		…
1379	break;	1441	break;
1380	}	1442	}
1381	break;	1443	break;
1382		1444
1383	case FocusIn:	1445	case FocusIn:
1384	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])
1385	{	1455	{
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));	1456	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1457	;
1453		1458
1454	if (szHint.width != width || szHint.height != height)	1459	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1455	{	1460	{
1456	seen_resize = 1;	1461	seen_resize = 1;
1457	resize_all_windows (width, height, 1);	1462	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1458	}	1463	}
1459		1464
1460	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1465	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461	if (options & Opt_transparent)	1466	if (options & Opt_transparent)
1462	{
1463	check_our_parents ();	1467	check_our_parents ();
1464	if (am_transparent)
1465	want_refresh = want_full_refresh = 1;
1466	}
1467	#endif	1468	#endif
1468	}	1469	}
1469	break;	1470	break;
1470		1471
1471	case PropertyNotify:	1472	case PropertyNotify:
…		…
1479	selection_clear ();	1480	selection_clear ();
1480	break;	1481	break;
1481		1482
1482	case SelectionNotify:	1483	case SelectionNotify:
1483	if (selection_wait == Sel_normal)	1484	if (selection_wait == Sel_normal)
1484	selection_paste (ev.xselection.requestor,	1485	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485	ev.xselection.property, True);
1486	break;	1486	break;
1487		1487
1488	case SelectionRequest:	1488	case SelectionRequest:
1489	selection_send (ev.xselectionrequest);	1489	selection_send (ev.xselectionrequest);
1490	break;	1490	break;
1491		1491
1492	case UnmapNotify:	1492	case UnmapNotify:
1493	TermWin.mapped = 0;	1493	mapped = 0;
1494	#ifdef TEXT_BLINK	1494	#ifdef TEXT_BLINK
1495	text_blink_ev.stop ();	1495	text_blink_ev.stop ();
1496	#endif	1496	#endif
1497	break;	1497	break;
1498		1498
1499	case MapNotify:	1499	case MapNotify:
1500	TermWin.mapped = 1;	1500	mapped = 1;
1501	#ifdef TEXT_BLINK	1501	#ifdef TEXT_BLINK
1502	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1502	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503	#endif	1503	#endif
1504	break;	1504	break;
1505		1505
…		…
1509	break;	1509	break;
1510	#endif /* TRANSPARENT */	1510	#endif /* TRANSPARENT */
1511		1511
1512	case GraphicsExpose:	1512	case GraphicsExpose:
1513	case Expose:	1513	case Expose:
1514	if (ev.xany.window == TermWin.vt)	1514	if (ev.xany.window == vt)
1515	{	1515	{
1516	do	1516	do
1517	scr_expose (ev.xexpose.x, ev.xexpose.y,	1517	scr_expose (ev.xexpose.x, ev.xexpose.y,
1518	ev.xexpose.width, ev.xexpose.height, False);	1518	ev.xexpose.width, ev.xexpose.height, False);
1519	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1519	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1520		1520
1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522		1522
1523	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1523	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1524	scr_expose (ev.xexpose.x, ev.xexpose.y,	1524	scr_expose (ev.xexpose.x, ev.xexpose.y,
1525	ev.xexpose.width, ev.xexpose.height, False);	1525	ev.xexpose.width, ev.xexpose.height, False);
1526		1526
1527	scr_refresh (refresh_type);	1527	scr_refresh (refresh_type);
1528	}	1528	}
1529	else	1529	else
1530	{	1530	{
1531	XEvent unused_event;	1531	XEvent unused_event;
1532		1532
1533	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1533	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1534	;	1534	;
1535	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1535	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1536	;	1536	;
1537		1537
1538	if (isScrollbarWindow (ev.xany.window))	1538	if (isScrollbarWindow (ev.xany.window))
1539	{	1539	{
1540	scrollBar.setIdle ();	1540	scrollBar.setIdle ();
…		…
1544	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1544	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545	menubar_expose ();	1545	menubar_expose ();
1546	#endif	1546	#endif
1547		1547
1548	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1549	if (am_transparent && ev.xany.window == TermWin.parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1550	XClearWindow (display->display, ev.xany.window);	1550	XClearWindow (disp, ev.xany.window);
1551	#endif	1551	#endif
1552	}	1552	}
1553	break;	1553	break;
1554		1554
1555	case MotionNotify:	1555	case MotionNotify:
…		…
1562	{	1562	{
1563	menubar_control (ev.xbutton);	1563	menubar_control (ev.xbutton);
1564	break;	1564	break;
1565	}	1565	}
1566	#endif	1566	#endif
1567	if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568	break;	1568	break;
1569		1569
1570	if (ev.xany.window == TermWin.vt)	1570	if (ev.xany.window == vt)
1571	{	1571	{
1572	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1572	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573	{	1573	{
1574	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1574	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575	;	1575	;
1576		1576
1577	XQueryPointer (display->display, TermWin.vt,	1577	XQueryPointer (disp, vt,
1578	&unused_root, &unused_child,	1578	&unused_root, &unused_child,
1579	&unused_root_x, &unused_root_y,	1579	&unused_root_x, &unused_root_y,
1580	& (ev.xbutton.x), & (ev.xbutton.y),	1580	&ev.xbutton.x, &ev.xbutton.y,
1581	&unused_mask);	1581	&ev.xbutton.state);
1582	#ifdef MOUSE_THRESHOLD	1582	#ifdef MOUSE_THRESHOLD
1583	/* deal with a `jumpy' mouse */	1583	/* deal with a `jumpy' mouse */
1584	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)	1584	if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585	{	1585	{
1586	#endif	1586	#endif
…		…
1591	iso14755_54 (ev.xbutton.x, ev.xbutton.y);	1591	iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592	break;	1592	break;
1593	}	1593	}
1594	#endif	1594	#endif
1595	selection_extend (ev.xbutton.x, ev.xbutton.y,	1595	selection_extend (ev.xbutton.x, ev.xbutton.y,
1596	(ev.xbutton.state & Button3Mask) ? 2 : 0);	1596	ev.xbutton.state & Button3Mask ? 2 : 0);
		1597
1597	#ifdef SELECTION_SCROLLING	1598	#ifdef SELECTION_SCROLLING
1598	if (ev.xbutton.y < TermWin.int_bwidth	1599	if (ev.xbutton.y < int_bwidth
1599	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1600	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1600	{	1601	{
1601	int dist;	1602	int dist;
1602		1603
1603	/* don't clobber the current delay if we are	1604	/* don't clobber the current delay if we are
1604	* already in the middle of scrolling.	1605	* already in the middle of scrolling.
…		…
1612	selection_save_x = ev.xbutton.x;	1613	selection_save_x = ev.xbutton.x;
1613	selection_save_y = ev.xbutton.y;	1614	selection_save_y = ev.xbutton.y;
1614	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1615	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615		1616
1616	/* calc number of lines to scroll */	1617	/* calc number of lines to scroll */
1617	if (ev.xbutton.y<TermWin.int_bwidth)	1618	if (ev.xbutton.y < int_bwidth)
1618	{	1619	{
1619	scroll_selection_dir = UP;	1620	scroll_selection_dir = UP;
1620	dist = TermWin.int_bwidth - ev.xbutton.y;	1621	dist = int_bwidth - ev.xbutton.y;
1621	}	1622	}
1622	else	1623	else
1623	{	1624	{
1624	scroll_selection_dir = DN;	1625	scroll_selection_dir = DN;
1625	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1626	dist = ev.xbutton.y - (int_bwidth + height);
1626	}	1627	}
1627		1628
1628	scroll_selection_lines = Pixel2Height (dist)	1629	scroll_selection_lines = Pixel2Height (dist)
1629	/ SELECTION_SCROLL_LINE_SPEEDUP	1630	/ SELECTION_SCROLL_LINE_SPEEDUP
1630	+ 1;	1631	+ 1;
1631	MIN_IT (scroll_selection_lines,	1632	min_it (scroll_selection_lines,
1632	SELECTION_SCROLL_MAX_LINES);	1633	SELECTION_SCROLL_MAX_LINES);
1633	}	1634	}
1634	else	1635	else
1635	{	1636	{
1636	/* we are within the text window, so we	1637	/* we are within the text window, so we
…		…
1645	#endif	1646	#endif
1646	}	1647	}
1647	}	1648	}
1648	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1649	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649	{	1650	{
1650	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1651	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1651	MotionNotify, &ev)) ;	1652	MotionNotify, &ev))
		1653	;
		1654
1652	XQueryPointer (display->display, scrollBar.win,	1655	XQueryPointer (disp, scrollBar.win,
1653	&unused_root, &unused_child,	1656	&unused_root, &unused_child,
1654	&unused_root_x, &unused_root_y,	1657	&unused_root_x, &unused_root_y,
1655	& (ev.xbutton.x), & (ev.xbutton.y),	1658	&ev.xbutton.x, &ev.xbutton.y,
1656	&unused_mask);	1659	&unused_mask);
1657	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1660	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658	scrollbar_size ());	1661	scrollbar_size ());
1659	scr_refresh (refresh_type);	1662	scr_refresh (refresh_type);
1660	refresh_limit = 0;	1663	refresh_limit = 0;
…		…
1662	}	1665	}
1663	break;	1666	break;
1664	}	1667	}
1665	}	1668	}
1666		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 (options & 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 (options & 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
1667	#if TRANSPARENT	1731	#if TRANSPARENT
1668	void	1732	void
1669	rxvt_term::rootwin_cb (XEvent &ev)	1733	rxvt_term::rootwin_cb (XEvent &ev)
1670	{	1734	{
1671	SET_R (this);	1735	SET_R (this);
…		…
1676	case PropertyNotify:	1740	case PropertyNotify:
1677	/*	1741	/*
1678	* 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,
1679	* 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.
1680	*/	1744	*/
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])	1745	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1746	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1685	return;	1747	return;
1686		1748
1687	/* FALLTHROUGH */	1749	/* FALLTHROUGH */
1688	case ReparentNotify:	1750	case ReparentNotify:
1689	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1751	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1703	reportmode = !! (priv_modes & PrivMode_mouse_report);	1765	reportmode = !! (priv_modes & PrivMode_mouse_report);
1704		1766
1705	/*	1767	/*
1706	* VT window processing of button press	1768	* VT window processing of button press
1707	*/	1769	*/
1708	if (ev.window == TermWin.vt)	1770	if (ev.window == vt)
1709	{	1771	{
1710	#if ISO_14755	1772	#if ISO_14755
1711	// 5.4	1773	// 5.4
1712	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1774	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713	{	1775	{
…		…
1715	return;	1777	return;
1716	}	1778	}
1717	#endif	1779	#endif
1718		1780
1719	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;	1781	clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
		1782
1720	if (reportmode)	1783	if (reportmode)
1721	{	1784	{
1722	/* mouse report from vt window */	1785	/* mouse report from vt window */
1723	/* save the xbutton state (for ButtonRelease) */	1786	/* save the xbutton state (for ButtonRelease) */
1724	MEvent.state = ev.state;	1787	MEvent.state = ev.state;
…		…
1753	}	1816	}
1754	else	1817	else
1755	{	1818	{
1756	if (ev.button != MEvent.button)	1819	if (ev.button != MEvent.button)
1757	MEvent.clicks = 0;	1820	MEvent.clicks = 0;
		1821
1758	switch (ev.button)	1822	switch (ev.button)
1759	{	1823	{
1760	case Button1:	1824	case Button1:
		1825	/* allow meta + click to select rectangular areas */
		1826	/* should be done in screen.C */
		1827	#if ENABLE_FRILLS
		1828	selection.rect = !!(ev.state & ModMetaMask);
		1829	#else
		1830	selection.rect = false;
		1831	#endif
		1832
1761	/* allow shift+left click to extend selection */	1833	/* allow shift+left click to extend selection */
1762	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1834	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763	{	1835	{
1764	if (MEvent.button == Button1 && clickintime)	1836	if (MEvent.button == Button1 && clickintime)
1765	selection_rotate (ev.x, ev.y);	1837	selection_rotate (ev.x, ev.y);
…		…
1908	case Button3:	1980	case Button3:
1909	if (scrollBar.style != R_SB_XTERM)	1981	if (scrollBar.style != R_SB_XTERM)
1910	{	1982	{
1911	if (scrollbar_above_slider (ev.y))	1983	if (scrollbar_above_slider (ev.y))
1912	# ifdef RXVT_SCROLL_FULL	1984	# ifdef RXVT_SCROLL_FULL
1913	scr_page (UP, TermWin.nrow - 1);	1985	scr_page (UP, nrow - 1);
1914	# else	1986	# else
1915	scr_page (UP, TermWin.nrow / 4);	1987	scr_page (UP, nrow / 4);
1916	# endif	1988	# endif
1917	else if (scrollbar_below_slider (ev.y))	1989	else if (scrollbar_below_slider (ev.y))
1918	# ifdef RXVT_SCROLL_FULL	1990	# ifdef RXVT_SCROLL_FULL
1919	scr_page (DN, TermWin.nrow - 1);	1991	scr_page (DN, nrow - 1);
1920	# else	1992	# else
1921	scr_page (DN, TermWin.nrow / 4);	1993	scr_page (DN, nrow / 4);
1922	# endif	1994	# endif
1923	else	1995	else
1924	scrollBar.setMotion ();	1996	scrollBar.setMotion ();
1925	}	1997	}
1926	else	1998	else
1927	{	1999	{
1928	scr_page ((ev.button == Button1 ? DN : UP),	2000	scr_page ((ev.button == Button1 ? DN : UP),
1929	(TermWin.nrow	2001	(nrow
1930	* scrollbar_position (ev.y)	2002	* scrollbar_position (ev.y)
1931	/ scrollbar_size ()));	2003	/ scrollbar_size ()));
1932	}	2004	}
1933		2005
1934	break;	2006	break;
…		…
1966	#ifdef SELECTION_SCROLLING	2038	#ifdef SELECTION_SCROLLING
1967	if (sel_scroll_ev.active)	2039	if (sel_scroll_ev.active)
1968	sel_scroll_ev.stop();	2040	sel_scroll_ev.stop();
1969	#endif	2041	#endif
1970		2042
1971	if (ev.window == TermWin.vt)	2043	if (ev.window == vt)
1972	{	2044	{
1973	#if ISO_14755	2045	#if ISO_14755
1974	// 5.4	2046	// 5.4
1975	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2047	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976	return;	2048	return;
…		…
2027	v = ev.button == Button4 ? UP : DN;	2099	v = ev.button == Button4 ? UP : DN;
2028		2100
2029	if (ev.state & ShiftMask)	2101	if (ev.state & ShiftMask)
2030	i = 1;	2102	i = 1;
2031	else if (options & Opt_mouseWheelScrollPage)	2103	else if (options & Opt_mouseWheelScrollPage)
2032	i = TermWin.nrow - 1;	2104	i = nrow - 1;
2033	else	2105	else
2034	i = 5;	2106	i = 5;
2035		2107
2036	# ifdef MOUSE_SLIP_WHEELING	2108	# ifdef MOUSE_SLIP_WHEELING
2037	if (ev.state & ControlMask)	2109	if (ev.state & ControlMask)
2038	{	2110	{
2039	mouse_slip_wheel_speed += v ? -1 : 1;	2111	mouse_slip_wheel_speed += v ? -1 : 1;
2040	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;
2041	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;
2042		2114
2043	if (slip_wheel_ev.at < NOW)	2115	if (slip_wheel_ev.at < NOW)
2044	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2116	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045		2117
2046	slip_wheel_ev.start ();	2118	slip_wheel_ev.start ();
…		…
2087	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2159	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2160	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2161	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090	int i;	2162	int i;
2091		2163
2092	Visual* visual = display->visual;	2164	Visual *visual = display->visual;
2093		2165
2094	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2166	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095		2167
2096	/* for convenience */	2168	/* for convenience */
2097	mask_r = visual->red_mask;	2169	mask_r = visual->red_mask;
…		…
2318	Atom atype;	2390	Atom atype;
2319	unsigned char *prop = NULL;	2391	unsigned char *prop = NULL;
2320	Window root, oldp, *list;	2392	Window root, oldp, *list;
2321	Pixmap rootpixmap = None;	2393	Pixmap rootpixmap = None;
2322	XWindowAttributes wattr, wrootattr;	2394	XWindowAttributes wattr, wrootattr;
		2395	dDisp;
2323		2396
2324	pchanged = 0;	2397	pchanged = 0;
2325		2398
2326	if (!(options & Opt_transparent))	2399	if (!(options & Opt_transparent))
2327	return pchanged; /* Don't try any more */	2400	return pchanged; /* Don't try any more */
2328		2401
2329	XGetWindowAttributes (display->display, display->root, &wrootattr);	2402	XGetWindowAttributes (disp, display->root, &wrootattr);
2330	rootdepth = wrootattr.depth;	2403	rootdepth = wrootattr.depth;
2331		2404
2332	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2405	XGetWindowAttributes (disp, parent[0], &wattr);
2333		2406
2334	if (rootdepth != wattr.depth)	2407	if (rootdepth != wattr.depth)
2335	{	2408	{
2336	if (am_transparent)	2409	if (am_transparent)
2337	{	2410	{
2338	pchanged = 1;	2411	pchanged = 1;
2339	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2412	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340	am_transparent = am_pixmap_trans = 0;	2413	am_transparent = am_pixmap_trans = 0;
2341	}	2414	}
2342		2415
2343	return pchanged; /* Don't try any more */	2416	return pchanged; /* Don't try any more */
2344	}	2417	}
2345		2418
2346	/* 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. */
2347	XSync (display->display, False);	2420	XSync (disp, False);
2348		2421
2349	/*	2422	/*
2350	* Make the frame window set by the window manager have	2423	* Make the frame window set by the window manager have
2351	* the root background. Some window managers put multiple nested frame	2424	* the root background. Some window managers put multiple nested frame
2352	* 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.
2353	*/	2426	*/
2354	i = (xa[XA_XROOTPMAPID]	2427	i = (xa[XA_XROOTPMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2428	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2429	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2430	&nitems, &bytes_after, &prop) == Success);
2358		2431
2359	if (!i || prop == NULL)	2432	if (!i || prop == NULL)
2360	i = (xa[XA_XSETROOTID]	2433	i = (xa[XA_ESETROOT_PMAP_ID]
2361	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2434	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2435	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363	&nitems, &bytes_after, &prop) == Success);	2436	&nitems, &bytes_after, &prop) == Success);
2364		2437
2365	if (!i || prop == NULL	2438	if (!i || prop == NULL
2366	#if TINTING	2439	#if TINTING
…		…
2385	Window cr;	2458	Window cr;
2386	XImage *image;	2459	XImage *image;
2387	GC gc;	2460	GC gc;
2388	XGCValues gcvalue;	2461	XGCValues gcvalue;
2389		2462
2390	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2463	XTranslateCoordinates (disp, parent[0], display->root,
2391	0, 0, &sx, &sy, &cr);	2464	0, 0, &sx, &sy, &cr);
2392	nw = (unsigned int)szHint.width;	2465	nw = (unsigned int)szHint.width;
2393	nh = (unsigned int)szHint.height;	2466	nh = (unsigned int)szHint.height;
2394	nx = ny = 0;	2467	nx = ny = 0;
2395		2468
…		…
2405	nh += sy;	2478	nh += sy;
2406	ny = -sy;	2479	ny = -sy;
2407	sy = 0;	2480	sy = 0;
2408	}	2481	}
2409		2482
2410	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2483	min_it (nw, (unsigned int) (wrootattr.width - sx));
2411	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2484	min_it (nh, (unsigned int) (wrootattr.height - sy));
		2485
		2486	XSync (disp, False);
2412	allowedxerror = -1;	2487	allowedxerror = -1;
2413	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2488	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414		2489
2415	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2490	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2416	/* XXX: may need a delay here? */	2491	/* XXX: may need a delay here? */
2417	allowedxerror = 0;	2492	allowedxerror = 0;
2418		2493
2419	if (image == NULL)	2494	if (image == NULL)
2420	{	2495	{
2421	if (am_transparent && am_pixmap_trans)	2496	if (am_transparent && am_pixmap_trans)
2422	{	2497	{
2423	pchanged = 1;	2498	pchanged = 1;
2424	if (TermWin.pixmap != None)	2499	if (pixmap != None)
2425	{	2500	{
2426	XFreePixmap (display->display, TermWin.pixmap);	2501	XFreePixmap (disp, pixmap);
2427	TermWin.pixmap = None;	2502	pixmap = None;
2428	}	2503	}
2429	}	2504	}
2430		2505
2431	am_pixmap_trans = 0;	2506	am_pixmap_trans = 0;
2432	}	2507	}
2433	else	2508	else
2434	{	2509	{
2435	if (TermWin.pixmap != None)	2510	if (pixmap != None)
2436	XFreePixmap (display->display, TermWin.pixmap);	2511	XFreePixmap (disp, pixmap);
2437		2512
2438	#if TINTING	2513	#if TINTING
2439	if (ISSET_PIXCOLOR (Color_tint))	2514	if (ISSET_PIXCOLOR (Color_tint))
2440	{	2515	{
2441	unsigned short rm, gm, bm;	2516	unsigned short rm, gm, bm;
…		…
2445		2520
2446	ShadeXImage (display, image, shade, rm, gm, bm);	2521	ShadeXImage (display, image, shade, rm, gm, bm);
2447	}	2522	}
2448	#endif	2523	#endif
2449		2524
2450	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2525	pixmap = XCreatePixmap (disp, vt,
2451	szHint.width, szHint.height, image->depth);	2526	szHint.width, szHint.height, image->depth);
2452	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2527	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2453	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2528	XPutImage (disp, pixmap, gc, image, 0, 0,
2454	nx, ny, image->width, image->height);	2529	nx, ny, image->width, image->height);
2455	XFreeGC (display->display, gc);	2530	XFreeGC (disp, gc);
2456	XDestroyImage (image);	2531	XDestroyImage (image);
2457	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2532	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2458	XClearWindow (display->display, TermWin.parent[0]);	2533	XClearWindow (disp, parent[0]);
2459		2534
2460	if (!am_transparent || !am_pixmap_trans)	2535	if (!am_transparent || !am_pixmap_trans)
2461	pchanged = 1;	2536	pchanged = 1;
2462		2537
2463	am_transparent = am_pixmap_trans = 1;	2538	am_transparent = am_pixmap_trans = 1;
2464	}	2539	}
2465	}	2540	}
2466		2541
2467	if (!am_pixmap_trans)	2542	if (am_pixmap_trans)
		2543	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
		2544	else
2468	{	2545	{
2469	unsigned int n;	2546	unsigned int n;
2470	/*	2547	/*
2471	* InheritPixmap transparency	2548	* InheritPixmap transparency
2472	*/	2549	*/
2473	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2550	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474	{	2551	{
2475	oldp = TermWin.parent[i];	2552	oldp = parent[i];
2476	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2553	XQueryTree (disp, parent[i - 1], &root,
2477	&TermWin.parent[i], &list, &n);	2554	&parent[i], &list, &n);
2478	XFree (list);	2555	XFree (list);
2479		2556
2480	if (TermWin.parent[i] == display->root)	2557	if (parent[i] == display->root)
2481	{	2558	{
2482	if (oldp != None)	2559	if (oldp != None)
2483	pchanged = 1;	2560	pchanged = 1;
2484		2561
2485	break;	2562	break;
2486	}	2563	}
2487		2564
2488	if (oldp != TermWin.parent[i])	2565	if (oldp != parent[i])
2489	pchanged = 1;	2566	pchanged = 1;
2490	}	2567	}
2491		2568
2492	n = 0;	2569	n = 0;
2493		2570
2494	if (pchanged)	2571	if (pchanged)
2495	{	2572	{
2496	for (; n < (unsigned int)i; n++)	2573	for (; n < (unsigned int)i; n++)
2497	{	2574	{
2498	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2575	XGetWindowAttributes (disp, parent[n], &wattr);
2499	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2576	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500	{	2577	{
2501	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2578	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502	break;	2579	break;
2503	}	2580	}
2504	}	2581	}
2505	}	2582	}
2506		2583
2507	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2584	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508	{	2585	{
2509	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2586	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2587	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511	am_transparent = 0;	2588	am_transparent = 0;
2512	/* XXX: also turn off Opt_transparent? */	2589	/* XXX: also turn off Opt_transparent? */
2513	}	2590	}
2514	else	2591	else
2515	{	2592	{
…		…
2518	* needed for fvwm2.2.2 (and before?) */	2595	* needed for fvwm2.2.2 (and before?) */
2519	sleep (1);	2596	sleep (1);
2520	#endif	2597	#endif
2521	for (n = 0; n < (unsigned int)i; n++)	2598	for (n = 0; n < (unsigned int)i; n++)
2522	{	2599	{
2523	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2600	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524	XClearWindow (display->display, TermWin.parent[n]);	2601	XClearWindow (disp, parent[n]);
2525	}	2602	}
2526		2603
2527	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2604	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528	am_transparent = 1;	2605	am_transparent = 1;
2529	}	2606	}
2530		2607
2531	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2608	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532	TermWin.parent[i] = None;	2609	parent[i] = None;
2533	}	2610	}
2534		2611
2535	if (scrollBar.win)	2612	if (scrollBar.win)
2536	{	2613	{
2537	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2614	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538	scrollBar.setIdle ();	2615	scrollBar.setIdle ();
2539	scrollbar_show (0);	2616	scrollbar_show (0);
		2617	}
		2618
		2619	if (am_transparent)
		2620	{
		2621	want_refresh = want_full_refresh = 1;
		2622	if (am_pixmap_trans)
		2623	flush ();
2540	}	2624	}
2541		2625
2542	return pchanged;	2626	return pchanged;
2543	}	2627	}
2544	#endif	2628	#endif
…		…
2573	// some window managers resize the window early, and these programs	2657	// some window managers resize the window early, and these programs
2574	// then sometimes get the size wrong.	2658	// then sometimes get the size wrong.
2575	// unfortunately other programs are even more buggy and dislike	2659	// unfortunately other programs are even more buggy and dislike
2576	// 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
2577	// resized.	2661	// resized.
2578	if (seen_resize)	2662	if (seen_resize && cmd_pid)
2579	kill (-cmd_pid, SIGWINCH);	2663	kill (-cmd_pid, SIGWINCH);
2580	}	2664	}
2581		2665
2582	/* Read a text string from the input buffer */	2666	/* Read a text string from the input buffer */
2583	unicode_t buf[UBUFSIZ];	2667	unicode_t buf[UBUFSIZ];
2584	bool refreshnow = false;	2668	bool refreshnow = false;
2585	int nlines = 0;	2669	int nlines = 0;
2586	unicode_t *str = buf;	2670	unicode_t *str = buf;
		2671	unicode_t *eol = str + min (ncol, UBUFSIZ);
2587		2672
2588	for (;;)	2673	for (;;)
2589	{	2674	{
2590	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))
2591	break;	2676	break;
2592		2677
2593	*str++ = ch;	2678	*str++ = ch;
2594		2679
2595	if (ch == C0_LF)	2680	if (ch == C0_LF || str >= eol)
2596	{	2681	{
		2682	if (ch == C0_LF)
2597	nlines++;	2683	nlines++;
		2684
2598	refresh_count++;	2685	refresh_count++;
2599		2686
2600	if (!(options & Opt_jumpScroll)	2687	if (!(options & Opt_jumpScroll)
2601	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2688	|| (refresh_count >= refresh_limit * (nrow - 1)))
2602	{	2689	{
2603	refreshnow = true;	2690	refreshnow = true;
2604	ch = NOCHAR;	2691	ch = NOCHAR;
2605	break;	2692	break;
2606	}	2693	}
2607		2694
2608	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2695	// scr_add_lines only works for nlines <= nrow - 1.
2609	if (nlines >= TermWin.nrow - 1)	2696	if (nlines >= nrow - 1)
2610	{	2697	{
2611	scr_add_lines (buf, nlines, str - buf);	2698	scr_add_lines (buf, nlines, str - buf);
2612	nlines = 0;	2699	nlines = 0;
2613	str = buf;	2700	str = buf;
		2701	eol = str + min (ncol, UBUFSIZ);
2614	}	2702	}
2615	}
2616		2703
2617	if (str >= buf + UBUFSIZ)	2704	if (str >= eol)
2618	{	2705	{
		2706	if (eol >= buf + UBUFSIZ)
		2707	{
2619	ch = NOCHAR;	2708	ch = NOCHAR;
2620	break;	2709	break;
		2710	}
		2711	else
		2712	eol = min (eol + ncol, buf + UBUFSIZ);
		2713	}
		2714
2621	}	2715	}
2622		2716
2623	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2624	ch = next_char ();	2718	ch = next_char ();
2625	}	2719	}
…		…
2696	if (len == (size_t)-1)	2790	if (len == (size_t)-1)
2697	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
2698		2792
2699	// assume wchar == unicode	2793	// assume wchar == unicode
2700	cmdbuf_ptr += len;	2794	cmdbuf_ptr += len;
2701	return wc;	2795	return wc & UNICODE_MASK;
2702	}	2796	}
2703		2797
2704	return NOCHAR;	2798	return NOCHAR;
2705	}	2799	}
2706		2800
…		…
3169	{	3263	{
3170	switch (priv)	3264	switch (priv)
3171	{	3265	{
3172	case '>':	3266	case '>':
3173	if (ch == CSI_DA) /* secondary device attributes */	3267	if (ch == CSI_DA) /* secondary device attributes */
3174	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3268	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3175	break;	3269	break;
3176	case '?':	3270	case '?':
3177	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3271	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3178	process_terminal_mode (ch, priv, nargs, arg);	3272	process_terminal_mode (ch, priv, nargs, arg);
3179	break;	3273	break;
…		…
3284		3378
3285	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3379	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3286	arg[0] = -arg[0];	3380	arg[0] = -arg[0];
3287	/* FALLTHROUGH */	3381	/* FALLTHROUGH */
3288	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3382	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3289	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3383	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3290	break;	3384	break;
3291		3385
3292	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3386	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3293	tt_write ((const unsigned char *)VT100_ANS,	3387	tt_write ((const unsigned char *)VT100_ANS,
3294	(unsigned int) (sizeof (VT100_ANS) - 1));	3388	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3408	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3502	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409	{	3503	{
3410	int x, y;	3504	int x, y;
3411	XWindowAttributes wattr;	3505	XWindowAttributes wattr;
3412	Window wdummy;	3506	Window wdummy;
		3507	dDisp;
3413		3508
3414	if (nargs == 0)	3509	if (nargs == 0)
3415	return;	3510	return;
3416		3511
3417	switch (args[0])	3512	switch (args[0])
3418	{	3513	{
3419	/*	3514	/*
3420	* commands	3515	* commands
3421	*/	3516	*/
3422	case 1: /* deiconify window */	3517	case 1: /* deiconify window */
3423	XMapWindow (display->display, TermWin.parent[0]);	3518	XMapWindow (disp, parent[0]);
3424	break;	3519	break;
3425	case 2: /* iconify window */	3520	case 2: /* iconify window */
3426	XIconifyWindow (display->display, TermWin.parent[0],	3521	XIconifyWindow (disp, parent[0], display->screen);
3427	DefaultScreen (display->display));
3428	break;	3522	break;
3429	case 3: /* set position (pixels) */	3523	case 3: /* set position (pixels) */
3430	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3524	XMoveWindow (disp, parent[0], args[1], args[2]);
3431	break;	3525	break;
3432	case 4: /* set size (pixels) */	3526	case 4: /* set size (pixels) */
3433	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3527	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434	break;	3528	break;
3435	case 5: /* raise window */	3529	case 5: /* raise window */
3436	XRaiseWindow (display->display, TermWin.parent[0]);	3530	XRaiseWindow (disp, parent[0]);
3437	break;	3531	break;
3438	case 6: /* lower window */	3532	case 6: /* lower window */
3439	XLowerWindow (display->display, TermWin.parent[0]);	3533	XLowerWindow (disp, parent[0]);
3440	break;	3534	break;
3441	case 7: /* refresh window */	3535	case 7: /* refresh window */
3442	scr_touch (true);	3536	scr_touch (true);
3443	break;	3537	break;
3444	case 8: /* set size (chars) */	3538	case 8: /* set size (chars) */
3445	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3539	set_widthheight ((unsigned int) (args[2] * fwidth),
3446	(unsigned int) (args[1] * TermWin.fheight));	3540	(unsigned int) (args[1] * fheight));
3447	break;	3541	break;
3448		3542
3449	//case 9: NYI, TODO, restore maximized window or maximize window	3543	//case 9: NYI, TODO, restore maximized window or maximize window
3450	default:	3544	default:
3451	if (args[0] >= 24) /* set height (chars) */	3545	if (args[0] >= 24) /* set height (chars) */
3452	set_widthheight ((unsigned int)TermWin.width,	3546	set_widthheight ((unsigned int)width,
3453	(unsigned int) (args[1] * TermWin.fheight));	3547	(unsigned int) (args[1] * fheight));
3454	break;	3548	break;
3455		3549
3456		3550
3457	/*	3551	/*
3458	* reports - some output format copied from XTerm	3552	* reports - some output format copied from XTerm
3459	*/	3553	*/
3460	case 11: /* report window state */	3554	case 11: /* report window state */
3461	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3555	XGetWindowAttributes (disp, parent[0], &wattr);
3462	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3556	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463	break;	3557	break;
3464	case 13: /* report window position */	3558	case 13: /* report window position */
3465	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3559	XGetWindowAttributes (disp, parent[0], &wattr);
3466	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3560	XTranslateCoordinates (disp, parent[0], wattr.root,
3467	-wattr.border_width, -wattr.border_width,	3561	-wattr.border_width, -wattr.border_width,
3468	&x, &y, &wdummy);	3562	&x, &y, &wdummy);
3469	tt_printf ("\033[3;%d;%dt", x, y);	3563	tt_printf ("\033[3;%d;%dt", x, y);
3470	break;	3564	break;
3471	case 14: /* report window size (pixels) */	3565	case 14: /* report window size (pixels) */
3472	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3566	XGetWindowAttributes (disp, parent[0], &wattr);
3473	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3567	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474	break;	3568	break;
3475	case 18: /* report text area size (chars) */	3569	case 18: /* report text area size (chars) */
3476	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3570	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3477	break;	3571	break;
3478	case 19: /* report window size (chars) */	3572	case 19: /* report window size (chars) */
3479	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3573	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3480	break;	3574	break;
3481	case 20: /* report icon label */	3575	case 20: /* report icon label */
3482	{	3576	{
3483	char *s;	3577	char *s;
3484	XGetIconName (display->display, TermWin.parent[0], &s);	3578	XGetIconName (disp, parent[0], &s);
3485	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3579	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486	XFree (s);	3580	XFree (s);
3487	}	3581	}
3488	break;	3582	break;
3489	case 21: /* report window title */	3583	case 21: /* report window title */
3490	{	3584	{
3491	char *s;	3585	char *s;
3492	XFetchName (display->display, TermWin.parent[0], &s);	3586	XFetchName (disp, parent[0], &s);
3493	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3587	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494	XFree (s);	3588	XFree (s);
3495	}	3589	}
3496	break;	3590	break;
3497	}	3591	}
…		…
3504	* ends_how is terminator used. returned input must be free()'d	3598	* ends_how is terminator used. returned input must be free()'d
3505	*/	3599	*/
3506	unsigned char *	3600	unsigned char *
3507	rxvt_term::get_to_st (unicode_t &ends_how)	3601	rxvt_term::get_to_st (unicode_t &ends_how)
3508	{	3602	{
3509	unicode_t seen_esc = 0, ch;	3603	unicode_t ch;
		3604	bool seen_esc = false;
3510	unsigned int n = 0;	3605	unsigned int n = 0;
3511	unsigned char *s;
3512	unsigned char string[STRING_MAX];	3606	wchar_t string[STRING_MAX];
3513		3607
3514	while ((ch = cmd_getc ()) != NOCHAR)	3608	while ((ch = cmd_getc ()) != NOCHAR)
3515	{	3609	{
3516	if (seen_esc)	3610	if (seen_esc)
3517	{	3611	{
…		…
3520	else	3614	else
3521	return NULL;	3615	return NULL;
3522	}	3616	}
3523	else if (ch == C0_ESC)	3617	else if (ch == C0_ESC)
3524	{	3618	{
3525	seen_esc = 1;	3619	seen_esc = true;
3526	continue;	3620	continue;
3527	}	3621	}
3528	else if (ch == C0_BEL || ch == CHAR_ST)	3622	else if (ch == C0_BEL || ch == CHAR_ST)
3529	break;	3623	break;
3530	else if (ch < 0x20)	3624	else if (ch < 0x20)
3531	return NULL; /* other control character - exit */	3625	return NULL; /* other control character - exit */
3532		3626
3533	seen_esc = 0;	3627	seen_esc = false;
3534		3628
3535	if (n >= sizeof (string) - 1)	3629	if (n >= STRING_MAX - 1)
3536	// stop at some sane length	3630	// stop at some sane length
3537	return NULL;	3631	return NULL;
3538		3632
3539	if (ch == C0_SYN)	3633	if (ch == C0_SYN)
3540	string[n++] = cmd_get8 ();	3634	string[n++] = cmd_get8 ();
…		…
3542	string[n++] = ch;	3636	string[n++] = ch;
3543	}	3637	}
3544		3638
3545	string[n++] = '\0';	3639	string[n++] = '\0';
3546		3640
3547	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548	return NULL;
3549
3550	ends_how = (ch == 0x5c ? C0_ESC : ch);	3641	ends_how = (ch == 0x5c ? C0_ESC : ch);
3551	strncpy (s, string, n);	3642
3552	return s;	3643	return (unsigned char *)rxvt_wcstombs (string);
3553	}	3644	}
3554		3645
3555	/*----------------------------------------------------------------------*/	3646	/*----------------------------------------------------------------------*/
3556	/*	3647	/*
3557	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3648	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
…		…
3611	set_window_color (color, str);	3702	set_window_color (color, str);
3612	}	3703	}
3613		3704
3614	/*	3705	/*
3615	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3706	* 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	*/	3707	*/
3639	void	3708	void
3640	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)
3641	{	3710	{
3642	int changed = 0;	3711	int changed = 0;
3643	int color;	3712	int color;
3644	char *buf, *name;	3713	char *buf, *name;
3645	bool query = str[0] == '?' && !str[1];	3714	bool query = str[0] == '?' && !str[1];
3646	int saveop = op;	3715	int saveop = op;
		3716	dDisp;
3647		3717
3648	assert (str != NULL);	3718	assert (str != NULL);
3649	switch (op)	3719	switch (op)
3650	{	3720	{
3651	case XTerm_name:	3721	case XTerm_name:
…		…
3658	set_title (str);	3728	set_title (str);
3659	break;	3729	break;
3660	case XTerm_property:	3730	case XTerm_property:
3661	if (str[0] == '?')	3731	if (str[0] == '?')
3662	{	3732	{
3663	Atom prop = XInternAtom (display->display, str + 1, True);	3733	Atom prop = display->atom (str + 1);
3664	Atom actual_type;	3734	Atom actual_type;
3665	int actual_format;	3735	int actual_format;
3666	unsigned long nitems;	3736	unsigned long nitems;
3667	unsigned long bytes_after;	3737	unsigned long bytes_after;
3668	unsigned char *value = 0;	3738	unsigned char *value = 0;
3669	const char *str = "";	3739	const char *str = "";
3670		3740
3671	if (prop	3741	if (prop
3672	&& XGetWindowProperty (display->display, TermWin.parent[0],	3742	&& XGetWindowProperty (disp, parent[0],
3673	prop, 0, 1<<16, 0, AnyPropertyType,	3743	prop, 0, 1<<16, 0, AnyPropertyType,
3674	&actual_type, &actual_format,	3744	&actual_type, &actual_format,
3675	&nitems, &bytes_after, &value) == Success	3745	&nitems, &bytes_after, &value) == Success
3676	&& actual_type != None	3746	&& actual_type != None
3677	&& actual_format == 8)	3747	&& actual_format == 8)
…		…
3686	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3756	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687		3757
3688	if (eq)	3758	if (eq)
3689	{	3759	{
3690	*eq = 0;	3760	*eq = 0;
3691	XChangeProperty (display->display, TermWin.parent[0],	3761	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	}	3762	}
3696	else	3763	else
3697	XDeleteProperty (display->display, TermWin.parent[0],	3764	XDeleteProperty (disp, parent[0],
3698	display->atom (str));	3765	display->atom (str));
3699	}	3766	}
3700	break;	3767	break;
3701		3768
3702	case XTerm_Color:	3769	case XTerm_Color:
…		…
3743	break;	3810	break;
3744	#ifndef NO_BOLD_UNDERLINE_REVERSE	3811	#ifndef NO_BOLD_UNDERLINE_REVERSE
3745	case XTerm_Color_BD:	3812	case XTerm_Color_BD:
3746	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3813	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3747	break;	3814	break;
3748	case XTerm_Color_IT:
3749	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750	break;
3751	case XTerm_Color_UL:	3815	case XTerm_Color_UL:
3752	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3816	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3753	break;	3817	break;
3754	case XTerm_Color_RV:	3818	case XTerm_Color_RV:
3755	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3819	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756	break;	3820	break;
		3821	case URxvt_Color_IT:
		3822	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3823	break;
3757	#endif	3824	#endif
3758	#if TRANSPARENT || TINTING	3825	#if TRANSPARENT && TINTING
3759	case XTerm_Color_tint:	3826	case URxvt_Color_tint:
3760	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3827	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3761	check_our_parents ();	3828	check_our_parents ();
3762	if (am_transparent)	3829	if (am_transparent)
3763	want_full_refresh = want_refresh = 1;	3830	want_full_refresh = want_refresh = 1;
3764	break;	3831	break;
3765	#endif	3832	#endif
…		…
3777	{	3844	{
3778	str++;	3845	str++;
3779	#if XPM_BACKGROUND	3846	#if XPM_BACKGROUND
3780	changed += scale_pixmap (str);	3847	changed += scale_pixmap (str);
3781	#endif	3848	#endif
3782
3783	}	3849	}
		3850
3784	if (changed)	3851	if (changed)
3785	{	3852	{
3786	#ifdef XPM_BACKGROUND	3853	#ifdef XPM_BACKGROUND
3787	resize_pixmap ();	3854	resize_pixmap ();
3788	#endif	3855	#endif
…		…
3799		3866
3800	case XTerm_logfile:	3867	case XTerm_logfile:
3801	// TODO, when secure mode?	3868	// TODO, when secure mode?
3802	break;	3869	break;
3803		3870
		3871	#ifdef MENUBAR
		3872	case URxvt_Menu:
		3873	if (options & 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
3804	case XTerm_font:	3889	case XTerm_font:
3805	op = URxvt_font;	3890	op = URxvt_font;
3806	case URxvt_font:	3891	case URxvt_font:
3807	#if ENABLE_STYLES	3892	#if ENABLE_STYLES
3808	case URxvt_boldFont:	3893	case URxvt_boldFont:
3809	case URxvt_italicFont:	3894	case URxvt_italicFont:
3810	case URxvt_boldItalicFont:	3895	case URxvt_boldItalicFont:
3811	#endif	3896	#endif
3812	if (query)	3897	if (query)
3813	tt_printf ("\33]%d;%-.250s%c", saveop,	3898	tt_printf ("\33]%d;%-.250s%c", saveop,
3814	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3899	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3815	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3900	? fontset[op - URxvt_font]->fontdesc : "",
3816	resp);	3901	resp);
3817	else	3902	else
3818	{	3903	{
3819	const char *&res = rs[Rs_font + (op - URxvt_font)];	3904	const char *&res = rs[Rs_font + (op - URxvt_font)];
3820		3905
…		…
3823	set_fonts ();	3908	set_fonts ();
3824	}	3909	}
3825	break;	3910	break;
3826		3911
3827	#if ENABLE_FRILLS	3912	#if ENABLE_FRILLS
3828	case XTerm_locale:	3913	case URxvt_locale:
3829	if (query)	3914	if (query)
3830	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3915	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3831	else	3916	else
3832	{	3917	{
3833	set_locale (str);	3918	set_locale (str);
3834	# ifdef USE_XIM	3919	pty.set_utf8_mode (enc_utf8);
3835	im_cb ();	3920	init_xlocale ();
3836	# endif
3837	}	3921	}
3838	break;	3922	break;
3839	#endif
3840		3923
3841	#ifdef MENUBAR	3924	case URxvt_view_up:
3842	case XTerm_Menu:	3925	case URxvt_view_down:
3843	if (options & Opt_insecure)	3926	int lines = atoi (str);
3844	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3927
3845	break;	3928	if (lines)
3846	#endif	3929	scr_page (op == URxvt_view_up ? UP : DN, lines);
3847	#if 0
3848	case XTerm_dumpscreen: /* no error notices */
3849	{	3930	else
3850	int fd;
3851	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852	{	3931	{
3853	scr_dump (fd);	3932	scr_erase_savelines ();
3854	close (fd);
3855	}	3933	}
3856	}	3934
3857	break;	3935	break;
3858	#endif	3936	#endif
3859	}	3937	}
3860	}	3938	}
3861	/*----------------------------------------------------------------------*/	3939	/*----------------------------------------------------------------------*/
…		…
3994	*/	4072	*/
3995	PrivMode (1, PrivMode_vt52);	4073	PrivMode (1, PrivMode_vt52);
3996	break;	4074	break;
3997	case 3: /* 80/132 */	4075	case 3: /* 80/132 */
3998	if (priv_modes & PrivMode_132OK)	4076	if (priv_modes & PrivMode_132OK)
3999	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4077	set_widthheight (((state ? 132 : 80) * fwidth), height);
4000	break;	4078	break;
4001	case 4: /* smooth scrolling */	4079	case 4: /* smooth scrolling */
4002	if (state)	4080	if (state)
4003	options &= ~Opt_jumpScroll;	4081	options &= ~Opt_jumpScroll;
4004	else	4082	else
…		…
4276		4354
4277	/* ---------------------------------------------------------------------- */	4355	/* ---------------------------------------------------------------------- */
4278	/* Write data to the pty as typed by the user, pasted with the mouse,	4356	/* 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.	4357	* or generated by us in response to a query ESC sequence.
4280	*/	4358	*/
		4359	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4360
4281	void	4361	void
4282	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4362	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4283	{	4363	{
4284	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4364	if (v_buflen == 0)
		4365	{
		4366	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4285		4367
4286	if (len)	4368	if ((unsigned int)written == len)
		4369	return;
		4370
		4371	data += written;
		4372	len -= written;
4287	{	4373	}
		4374
		4375	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4376
		4377	memcpy (v_buffer + v_buflen, data, len);
		4378	v_buflen += len;
		4379
		4380	pty_ev.set (EVENT_READ | EVENT_WRITE);
		4381	}
		4382
		4383	void rxvt_term::pty_write ()
		4384	{
		4385	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4386
		4387	if (written > 0)
		4388	{
		4389	v_buflen -= written;
		4390
4288	if (v_buflen == 0)	4391	if (v_buflen == 0)
4289	{	4392	{
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);	4393	free (v_buffer);
4317	v_buffer = 0;	4394	v_buffer = 0;
4318	v_buflen = 0;	4395	v_buflen = 0;
4319		4396
4320	pty_ev.set (EVENT_READ);	4397	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;	4398	return;
4333	}	4399	}
		4400
		4401	memmove (v_buffer, v_buffer + written, v_buflen);
4334	}	4402	}
		4403	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4404	pty_ev.set (EVENT_READ);
4335	}	4405	}
4336		4406
4337	/*----------------------- end-of-file (C source) -----------------------*/	4407	/*----------------------- end-of-file (C source) -----------------------*/
4338		4408

Diff Legend

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