ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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