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.227 by root, Mon Jan 2 15:35:43 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.
…		…
43	* along with this program; if not, write to the Free Software	43	* along with this program; if not, write to the Free Software
44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45	*----------------------------------------------------------------------*/	45	*----------------------------------------------------------------------*/
46		46
47	/*{{{ includes: */	47	/*{{{ includes: */
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h"
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h"
		50	#include "rxvtperl.h"
50	#include "version.h"	51	#include "version.h"
51	#include "command.h"	52	#include "command.h"
52		53
		54	#if HAVE_SCHED_YIELD
53	#include <wchar.h>	55	# include <sched.h>
		56	#endif
		57
		58	#ifdef KEYSYM_RESOURCE
		59	# include "keyboard.h"
		60	#endif
		61
54	#include <signal.h>	62	#include <csignal>
55		63
56	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
57		65
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		67
…		…
114	XK_Escape, 0x238b,	122	XK_Escape, 0x238b,
115	XK_Undo, 0x238c,	123	XK_Undo, 0x238c,
116	XK_Print, 0x2399,	124	XK_Print, 0x2399,
117		125
118	XK_space, 0x2423,	126	XK_space, 0x2423,
		127
		128	#ifdef XK_KP_Begin
		129	XK_KP_Prior, 0x21de,
		130	XK_KP_Next, 0x21df,
		131	XK_KP_Begin, 0x2320,
		132	XK_KP_Insert, 0x2380,
		133	XK_KP_Delete, 0x2326,
119	XK_KP_Space, 0x2422,	134	XK_KP_Space, 0x2422,
		135	#endif
120	0,	136	0,
121	};	137	};
122		138
123	void	139	void
124	rxvt_term::iso14755_54 (int x, int y)	140	rxvt_term::iso14755_54 (int x, int y)
125	{	141	{
126	x = Pixel2Col (x);	142	x = Pixel2Col (x);
127	y = Pixel2Row (y);	143	y = Pixel2Row (y);
128		144
129	if (x < 0 || x >= TermWin.ncol	145	if (!IN_RANGE_EXC (x, 0, ncol)
130	|| y < 0 || y >= TermWin.nrow)	146	|| !IN_RANGE_EXC (y, 0, nrow))
131	return;	147	return;
132		148
133	for (;;)	149	for (;;)
134	{	150	{
135	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	151	const line_t &l = ROW(y - view_start);
		152
		153	text_t t = l.t[x];
136		154
137	if (t != NOCHAR || !x)	155	if (t != NOCHAR || !x)
138	{	156	{
139	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	157	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;	158	iso14755buf = ISO_14755_54;
142	break;	159	break;
143	}	160	}
144		161
145	x--;	162	x--;
146	}	163	}
147
148	}	164	}
149	#endif
150		165
151	#if ENABLE_OVERLAY
152	void	166	void
153	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	167	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154	{	168	{
155	rxvt_fontset *fs = FONTSET (r);	169	rxvt_fontset *fs = FONTSET (r);
156	rxvt_font *f = (*fs)[fs->find_font (ch)];	170	rxvt_font *f = (*fs)[fs->find_font (ch)];
157	wchar_t *chr, *alloc, ch2;	171	wchar_t *chr, *alloc, ch2, *fname;
158	int len;	172	int len;
159		173
		174	fname = rxvt_utf8towcs (f->name);
		175
160	#if ENABLE_COMBINING	176	# if ENABLE_COMBINING
161	if (IS_COMPOSE (ch))	177	if (IS_COMPOSE (ch))
162	{	178	{
163	len = rxvt_composite.expand (ch, 0);	179	len = rxvt_composite.expand (ch, 0);
164	alloc = chr = new wchar_t[len];	180	alloc = chr = new wchar_t[len];
165	rxvt_composite.expand (ch, chr);	181	rxvt_composite.expand (ch, chr);
166	}	182	}
167	else	183	else
168	#endif	184	# endif
169	{	185	{
170	ch2 = ch;	186	ch2 = ch;
171		187
172	alloc = 0;	188	alloc = 0;
173	chr = &ch2;	189	chr = &ch2;
174	len = 1;	190	len = 1;
175	}	191	}
176		192
177	int width = strlen (f->name);	193	char attr[80]; // plenty
178		194
179	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	195	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		196	(int)r,
		197	fgcolor_of (r), bgcolor_of (r),
		198	r & RS_Bold ? " bold" : "",
		199	r & RS_Italic ? " italic" : "",
		200	r & RS_Blink ? " blink" : "",
		201	r & RS_RVid ? " rvid" : "",
		202	r & RS_Uline ? " uline" : "",
		203	r & RS_Careful ? " careful" : "");
		204
		205	int width = wcswidth (fname, wcslen (fname));
		206
		207	max_it (width, 8+5); // for char + hey
		208	max_it (width, strlen (attr));
		209
		210	if (y >= 0)
		211	{
		212	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		213	x = 0;
		214	}
		215
		216	scr_overlay_new (x, y, width, len + 2);
180		217
181	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	218	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182		219
183	for (int y = 0; y < len; y++)	220	for (int y = 0; y < len; y++)
184	{	221	{
…		…
187	ch = *chr++;	224	ch = *chr++;
188		225
189	sprintf (buf, "%8x", ch);	226	sprintf (buf, "%8x", ch);
190	scr_overlay_set (0, y, buf);	227	scr_overlay_set (0, y, buf);
191	scr_overlay_set (9, y, '=');	228	scr_overlay_set (9, y, '=');
192	#if !UNICODE3	229	# if !UNICODE3
193	if (ch >= 0x10000)	230	if (ch >= 0x10000)
194	ch = 0xfffd;	231	ch = 0xfffd;
195	#endif	232	# endif
196	scr_overlay_set (11, y, ch, r);	233	scr_overlay_set (11, y, ch, r);
197	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
198	}	235	}
199		236
		237	scr_overlay_set (0, len , attr);
200	scr_overlay_set (0, len, f->name);	238	scr_overlay_set (0, len + 1, fname);
201		239
		240	free (fname);
		241
202	#if ENABLE_COMBINING	242	# if ENABLE_COMBINING
203	if (alloc)	243	if (alloc)
204	delete [] alloc;	244	delete [] alloc;
205	#endif	245	# endif
206	}	246	}
207	#endif	247	#endif
208		248
209	void	249	void
210	rxvt_term::commit_iso14755 ()	250	rxvt_term::commit_iso14755 ()
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	313	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	314	* escape sequence to toggle the Keypad.
275	*	315	*
276	* Always permit `shift' to override the current setting	316	* Always permit `shift' to override the current setting
277	*/	317	*/
278	shft = (ev.state & ShiftMask);	318	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	319	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	320	meta = ev.state & ModMetaMask;
281		321
282	if (numlock_state || (ev.state & ModNumLockMask))	322	if (numlock_state || (ev.state & ModNumLockMask))
283	{	323	{
284	numlock_state = (ev.state & ModNumLockMask);	324	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	325	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		345
306	// the XOpenIM manpage lies about hardcoding the locale	346	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	347	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	348	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	349	SET_LOCALE (rs[Rs_imLocale]);
		350
310	// assume wchar_t == unicode or better	351	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	352	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	353	KBUFSZ, &keysym, &status_return);
		354
313	if (rs[Rs_imLocale])	355	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	356	SET_LOCALE (locale);
315		357
316	if (status_return == XLookupChars	358	if (status_return == XLookupChars
317	|| status_return == XLookupBoth)	359	|| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	386	valid_keysym = keysym != NoSymbol;
345	}	387	}
346		388
347	if (valid_keysym)	389	if (valid_keysym)
348	{	390	{
		391	#ifdef KEYSYM_RESOURCE
		392	if (keyboard->dispatch (this, keysym, ev.state))
		393	return;
		394	#endif
		395
349	if (TermWin.saveLines)	396	if (saveLines)
350	{	397	{
351	#ifdef UNSHIFTED_SCROLLKEYS	398	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	399	if (!ctrl && !meta)
353	#else	400	#else
354	if (IS_SCROLL_MOD)	401	if (IS_SCROLL_MOD)
355	#endif	402	#endif
356	{	403	{
357	int lnsppg;	404	int lnsppg;
358		405
359	#ifdef PAGING_CONTEXT_LINES	406	#ifdef PAGING_CONTEXT_LINES
360	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	407	lnsppg = nrow - PAGING_CONTEXT_LINES;
361	#else	408	#else
362	lnsppg = TermWin.nrow * 4 / 5;	409	lnsppg = nrow * 4 / 5;
363	#endif	410	#endif
364	if (keysym == XK_Prior)	411	if (keysym == XK_Prior)
365	{	412	{
366	scr_page (UP, lnsppg);	413	scr_page (UP, lnsppg);
367	return;	414	return;
…		…
487	}	534	}
488	#endif	535	#endif
489		536
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	537	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	538	{
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	{	539	{
518	newlen = 1;	540	newlen = 1;
519	switch (keysym)	541	switch (keysym)
520	{	542	{
521	#ifndef NO_BACKSPACE_KEY	543	#ifndef NO_BACKSPACE_KEY
…		…
529	else	551	else
530	strcpy (kbuf, key_backspace);	552	strcpy (kbuf, key_backspace);
531	break;	553	break;
532	#endif	554	#endif
533	#ifndef NO_DELETE_KEY	555	#ifndef NO_DELETE_KEY
		556	# ifdef XK_KP_Prior
		557	case XK_KP_Delete:
		558	/* allow shift to override */
		559	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		560	{
		561	strcpy (kbuf, "\033On");
		562	break;
		563	}
		564	/* FALLTHROUGH */
		565	# endif
534	case XK_Delete:	566	case XK_Delete:
535	strcpy (kbuf, key_delete);	567	strcpy (kbuf, key_delete);
536	break;	568	break;
537	#endif	569	#endif
538	case XK_Tab:	570	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	673	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	674	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	675	strcpy (kbuf, "\033Ou");
644	break;	676	break;
645		677
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	678	#endif
654	case XK_KP_F1: /* "\033OP" */	679	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	680	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	681	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	682	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	714	break;
690		715
691	case XK_Find:	716	case XK_Find:
692	strcpy (kbuf, "\033[1~");	717	strcpy (kbuf, "\033[1~");
693	break;	718	break;
		719
		720	#ifdef XK_KP_End
		721	case XK_KP_Insert:
		722	/* allow shift to override */
		723	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		724	{
		725	strcpy (kbuf, "\033Op");
		726	break;
		727	}
		728	/* FALLTHROUGH */
		729	#endif
694	case XK_Insert:	730	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	731	strcpy (kbuf, "\033[2~");
696	break;	732	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	733	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	734	case DXK_Remove:
…		…
788	#undef FKEY	824	#undef FKEY
789	default:	825	default:
790	newlen = 0;	826	newlen = 0;
791	break;	827	break;
792	}	828	}
		829
793	if (newlen)	830	if (newlen)
794	len = strlen (kbuf);	831	len = strlen (kbuf);
795	}	832	}
796		833
797	/*	834	/*
…		…
806	else if (ctrl && keysym == XK_minus)	843	else if (ctrl && keysym == XK_minus)
807	{	844	{
808	len = 1;	845	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	846	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810	}	847	}
		848	else if (keysym == XK_ISO_Left_Tab)
		849	{
		850	strcpy (kbuf, "\033[Z");
		851	len = 3;
		852	}
811	else	853	else
812	{	854	{
813	#ifdef META8_OPTION	855	#ifdef META8_OPTION
814	/* set 8-bit on */	856	/* set 8-bit on */
815	if (meta && (meta_char == 0x80))	857	if (meta && (meta_char == 0x80))
…		…
827	}	869	}
828		870
829	if (len <= 0)	871	if (len <= 0)
830	return; /* not mapped */	872	return; /* not mapped */
831		873
832	if (options & Opt_scrollTtyKeypress)	874	if (OPTION (Opt_scrollTtyKeypress))
833	if (TermWin.view_start)	875	if (view_start)
834	{	876	{
835	TermWin.view_start = 0;	877	view_start = 0;
836	want_refresh = 1;	878	want_refresh = 1;
837	}	879	}
838		880
839	/*	881	/*
840	* these modifications only affect the static keybuffer	882	* these modifications only affect the static keybuffer
…		…
873	#endif /* DEBUG_CMD */	915	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	916	tt_write (kbuf, (unsigned int)len);
875	}	917	}
876	/*}}} */	918	/*}}} */
877		919
878	#if (MENUBAR_MAX)	920	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	921	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880	/* attempt to `write' count to the input buffer */	922	/* attempt to `write' count to the input buffer */
881	unsigned int	923	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	924	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	925	{
…		…
906		948
907	cmd_parse ();	949	cmd_parse ();
908		950
909	return 0;	951	return 0;
910	}	952	}
911	#endif /* MENUBAR_MAX */	953	#endif
912		954
913	void	955	void
914	rxvt_term::flush ()	956	rxvt_term::flush ()
915	{	957	{
916	flush_ev.stop ();	958	flush_ev.stop ();
…		…
943	SET_LOCALE (locale);	985	SET_LOCALE (locale);
944		986
945	display->flush ();	987	display->flush ();
946		988
947	if (want_refresh && !flush_ev.active)	989	if (want_refresh && !flush_ev.active)
948	flush_ev.start (NOW + 0.01);	990	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949	}	991	}
950		992
951	void	993	void
952	rxvt_term::flush_cb (time_watcher &w)	994	rxvt_term::flush_cb (time_watcher &w)
953	{	995	{
…		…
1017	{	1059	{
1018	if (mouse_slip_wheel_speed == 0	1060	if (mouse_slip_wheel_speed == 0
1019	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1061	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1062	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1063	{
		1064	if (view_start == nsaved ||
		1065	view_start == 0)
		1066	mouse_slip_wheel_speed = 0;
		1067
1022	refresh_type |= SMOOTH_REFRESH;	1068	refresh_type |= SMOOTH_REFRESH;
1023	want_refresh = 1;	1069	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1070	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1071	}
1026	}	1072	}
1027	#endif	1073	#endif
1028		1074
		1075	#if HAVE_SCHED_YIELD
		1076	static struct event_handler
		1077	{
		1078	check_watcher cw_yield;
		1079
		1080	void yield (check_watcher &w)
		1081	{
		1082	sched_yield ();
		1083	w.stop ();
		1084	}
		1085
		1086	event_handler ()
		1087	: cw_yield (this, &event_handler::yield)
		1088	{
		1089	}
		1090	} event_handler;
		1091	#endif
		1092
1029	bool	1093	bool
1030	rxvt_term::pty_fill ()	1094	rxvt_term::pty_fill ()
1031	{	1095	{
1032	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1096	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033		1097
…		…
1039		1103
1040	memmove (cmdbuf_base, cmdbuf_ptr, n);	1104	memmove (cmdbuf_base, cmdbuf_ptr, n);
1041	cmdbuf_ptr = cmdbuf_base;	1105	cmdbuf_ptr = cmdbuf_base;
1042	cmdbuf_endp = cmdbuf_ptr + n;	1106	cmdbuf_endp = cmdbuf_ptr + n;
1043		1107
1044	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1108	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1045		1109
1046	if (n > 0)	1110	if (r > 0)
1047	{	1111	{
1048	cmdbuf_endp += n;	1112	cmdbuf_endp += r;
1049	return true;	1113	return true;
1050	}	1114	}
1051	else if (n < 0 && errno != EAGAIN)	1115	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
		1116	{
		1117	#if HAVE_SCHED_YIELD
		1118	event_handler.cw_yield.start ();
		1119	#endif
		1120	}
		1121	else
		1122	{
		1123	pty_ev.stop ();
		1124
		1125	if (!OPTION (Opt_hold))
1052	destroy ();	1126	destroy ();
		1127	}
1053		1128
1054	return false;	1129	return false;
1055	}	1130	}
1056		1131
1057	void	1132	void
1058	rxvt_term::pty_cb (io_watcher &w, short revents)	1133	rxvt_term::pty_cb (io_watcher &w, short revents)
1059	{	1134	{
1060	SET_R (this);	1135	SET_R (this);
1061	SET_LOCALE (locale);	1136	SET_LOCALE (locale);
1062		1137
1063	if (revents & EVENT_WRITE)
1064	tt_write (0, 0);
1065	else if (revents & EVENT_READ)	1138	if (revents & EVENT_READ)
1066	// loop, but don't allow a single term to monopolize us	1139	// loop, but don't allow a single term to monopolize us
1067	while (pty_fill ())	1140	while (pty_fill ())
1068	if (cmd_parse ())	1141	if (cmd_parse ())
1069	break;	1142	break;
		1143
		1144	if (revents & EVENT_WRITE)
		1145	pty_write ();
1070	}	1146	}
1071		1147
1072	void	1148	void
1073	rxvt_term::pointer_unblank ()	1149	rxvt_term::pointer_unblank ()
1074	{	1150	{
1075	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1151	XDefineCursor (display->display, vt, TermWin_cursor);
1076	recolour_cursor ();	1152	recolour_cursor ();
1077		1153
1078	#ifdef POINTER_BLANK	1154	#ifdef POINTER_BLANK
1079	hidden_pointer = 0;	1155	hidden_pointer = 0;
1080		1156
1081	if (options & Opt_pointerBlank)	1157	if (OPTION (Opt_pointerBlank))
1082	pointer_ev.start (NOW + pointerBlankDelay);	1158	pointer_ev.start (NOW + pointerBlankDelay);
1083	#endif	1159	#endif
1084	}	1160	}
1085		1161
1086	#ifdef POINTER_BLANK	1162	#ifdef POINTER_BLANK
1087	void	1163	void
1088	rxvt_term::pointer_blank ()	1164	rxvt_term::pointer_blank ()
1089	{	1165	{
1090	if (! (options & Opt_pointerBlank))	1166	if (! OPTION (Opt_pointerBlank))
1091	return;	1167	return;
1092		1168
1093	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1169	XDefineCursor (display->display, vt, display->blank_cursor);
1094	XFlush (display->display);	1170	XFlush (display->display);
1095		1171
1096	hidden_pointer = 1;	1172	hidden_pointer = 1;
1097	}	1173	}
1098		1174
…		…
1187		1263
1188	/*{{{ process an X event */	1264	/*{{{ process an X event */
1189	void	1265	void
1190	rxvt_term::x_cb (XEvent &ev)	1266	rxvt_term::x_cb (XEvent &ev)
1191	{	1267	{
		1268	dDisp;
		1269
1192	SET_R (this);	1270	SET_R (this);
1193	SET_LOCALE (locale);	1271	SET_LOCALE (locale);
1194		1272
1195	#if defined(CURSOR_BLINK)	1273	#if defined(CURSOR_BLINK)
1196	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1274	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1197	{	1275	{
1198	if (hidden_cursor)	1276	if (hidden_cursor)
1199	{	1277	{
1200	hidden_cursor = 0;	1278	hidden_cursor = 0;
1201	want_refresh = 1;	1279	want_refresh = 1;
…		…
1204	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1282	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1205	}	1283	}
1206	#endif	1284	#endif
1207		1285
1208	#if defined(POINTER_BLANK)	1286	#if defined(POINTER_BLANK)
1209	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1287	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1210	{	1288	{
1211	if (ev.type == MotionNotify	1289	if (ev.type == MotionNotify
1212	|| ev.type == ButtonPress	1290	|| ev.type == ButtonPress
1213	|| ev.type == ButtonRelease)	1291	|| ev.type == ButtonRelease)
1214	if (hidden_pointer)	1292	if (hidden_pointer)
…		…
1312	button_release (ev.xbutton);	1390	button_release (ev.xbutton);
1313	break;	1391	break;
1314		1392
1315	case ClientMessage:	1393	case ClientMessage:
1316	if (ev.xclient.format == 32	1394	if (ev.xclient.format == 32
		1395	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1396	{
1317	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318	destroy ();	1398	destroy ();
		1399	#if ENABLE_EWMH
		1400	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1401	XSendEvent (disp, ev.xclient.window = display->root,
		1402	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1403	&ev);
		1404	#endif
		1405	}
		1406	#if ENABLE_XEMBED
		1407	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1408	{
		1409	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1410	focus_in ();
		1411	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1412	focus_out ();
		1413	}
		1414	#endif
1319	#ifdef OFFIX_DND	1415	#ifdef OFFIX_DND
1320	/* OffiX Dnd (drag 'n' drop) protocol */	1416	/* OffiX Dnd (drag 'n' drop) protocol */
1321	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1417	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322	&& (ev.xclient.data.l[0] == DndFile	1418	&& (ev.xclient.data.l[0] == DndFile
1323	|| ev.xclient.data.l[0] == DndDir	1419	|| ev.xclient.data.l[0] == DndDir
1324	|| ev.xclient.data.l[0] == DndLink))	1420	|| ev.xclient.data.l[0] == DndLink))
1325	{	1421	{
1326	/* Get Dnd data */	1422	/* Get Dnd data */
1327	Atom ActualType;	1423	Atom ActualType;
1328	int ActualFormat;	1424	int ActualFormat;
1329	unsigned char *data;	1425	unsigned char *data;
1330	unsigned long Size, RemainingBytes;	1426	unsigned long Size, RemainingBytes;
1331		1427
1332	XGetWindowProperty (display->display, display->root,	1428	XGetWindowProperty (disp, display->root,
1333	xa[XA_DNDSELECTION],	1429	xa[XA_DNDSELECTION],
1334	0L, 1000000L,	1430	0L, 1000000L,
1335	False, AnyPropertyType,	1431	False, AnyPropertyType,
1336	&ActualType, &ActualFormat,	1432	&ActualType, &ActualFormat,
1337	&Size, &RemainingBytes,	1433	&Size, &RemainingBytes,
1338	&data);	1434	&data);
1339	set_string_property (XA_CUT_BUFFER0, data);	1435	set_string_property (XA_CUT_BUFFER0, data);
1340	XFree (data);	1436	XFree (data);
1341	selection_paste (display->root, XA_CUT_BUFFER0, true);	1437	selection_paste (display->root, XA_CUT_BUFFER0, true);
1342	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1438	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343	}	1439	}
1344	#endif /* OFFIX_DND */	1440	#endif /* OFFIX_DND */
1345	break;	1441	break;
1346		1442
1347	case MappingNotify:	1443	case MappingNotify:
…		…
1372	break;	1468	break;
1373	}	1469	}
1374	break;	1470	break;
1375		1471
1376	case FocusIn:	1472	case FocusIn:
1377	if (!TermWin.focus)	1473	focus_in ();
		1474	break;
		1475
		1476	case FocusOut:
		1477	focus_out ();
		1478	break;
		1479
		1480	case ConfigureNotify:
		1481	if (ev.xconfigure.window == parent[0])
1378	{	1482	{
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));	1483	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1484	;
1446		1485
1447	if (szHint.width != width || szHint.height != height)	1486	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1448	{	1487	{
1449	seen_resize = 1;	1488	seen_resize = 1;
1450	resize_all_windows (width, height, 1);	1489	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1451	}	1490	}
1452		1491
1453	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1492	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1454	if (options & Opt_transparent)	1493	if (OPTION (Opt_transparent))
1455	check_our_parents ();	1494	check_our_parents ();
1456	#endif	1495	#endif
1457	}	1496	}
1458	break;	1497	break;
1459		1498
…		…
1476	case SelectionRequest:	1515	case SelectionRequest:
1477	selection_send (ev.xselectionrequest);	1516	selection_send (ev.xselectionrequest);
1478	break;	1517	break;
1479		1518
1480	case UnmapNotify:	1519	case UnmapNotify:
1481	TermWin.mapped = 0;	1520	mapped = 0;
1482	#ifdef TEXT_BLINK	1521	#ifdef TEXT_BLINK
1483	text_blink_ev.stop ();	1522	text_blink_ev.stop ();
1484	#endif	1523	#endif
1485	break;	1524	break;
1486		1525
1487	case MapNotify:	1526	case MapNotify:
1488	TermWin.mapped = 1;	1527	mapped = 1;
1489	#ifdef TEXT_BLINK	1528	#ifdef TEXT_BLINK
1490	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1529	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1491	#endif	1530	#endif
1492	break;	1531	break;
1493		1532
…		…
1497	break;	1536	break;
1498	#endif /* TRANSPARENT */	1537	#endif /* TRANSPARENT */
1499		1538
1500	case GraphicsExpose:	1539	case GraphicsExpose:
1501	case Expose:	1540	case Expose:
1502	if (ev.xany.window == TermWin.vt)	1541	if (ev.xany.window == vt)
1503	{	1542	{
1504	do	1543	do
1505	scr_expose (ev.xexpose.x, ev.xexpose.y,	1544	scr_expose (ev.xexpose.x, ev.xexpose.y,
1506	ev.xexpose.width, ev.xexpose.height, False);	1545	ev.xexpose.width, ev.xexpose.height, False);
1507	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1546	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1508		1547
1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1548	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510		1549
1511	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1550	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1512	scr_expose (ev.xexpose.x, ev.xexpose.y,	1551	scr_expose (ev.xexpose.x, ev.xexpose.y,
1513	ev.xexpose.width, ev.xexpose.height, False);	1552	ev.xexpose.width, ev.xexpose.height, False);
1514		1553
1515	scr_refresh (refresh_type);	1554	scr_refresh (refresh_type);
1516	}	1555	}
1517	else	1556	else
1518	{	1557	{
1519	XEvent unused_event;	1558	XEvent unused_event;
1520		1559
1521	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1560	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1522	;	1561	;
1523	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1562	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1524	;	1563	;
1525		1564
1526	if (isScrollbarWindow (ev.xany.window))	1565	if (isScrollbarWindow (ev.xany.window))
1527	{	1566	{
1528	scrollBar.setIdle ();	1567	scrollBar.setIdle ();
…		…
1532	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1571	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1533	menubar_expose ();	1572	menubar_expose ();
1534	#endif	1573	#endif
1535		1574
1536	#ifdef TRANSPARENT	1575	#ifdef TRANSPARENT
1537	if (am_transparent && ev.xany.window == TermWin.parent[0])	1576	if (am_transparent && ev.xany.window == parent[0])
1538	XClearWindow (display->display, ev.xany.window);	1577	XClearWindow (disp, ev.xany.window);
1539	#endif	1578	#endif
1540	}	1579	}
1541	break;	1580	break;
1542		1581
1543	case MotionNotify:	1582	case MotionNotify:
…		…
1553	}	1592	}
1554	#endif	1593	#endif
1555	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1594	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1556	break;	1595	break;
1557		1596
1558	if (ev.xany.window == TermWin.vt)	1597	if (ev.xany.window == vt)
1559	{	1598	{
1560	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1599	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1561	{	1600	{
1562	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1601	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1563	;	1602	;
1564		1603
1565	XQueryPointer (display->display, TermWin.vt,	1604	XQueryPointer (disp, vt,
1566	&unused_root, &unused_child,	1605	&unused_root, &unused_child,
1567	&unused_root_x, &unused_root_y,	1606	&unused_root_x, &unused_root_y,
1568	&ev.xbutton.x, &ev.xbutton.y,	1607	&ev.xbutton.x, &ev.xbutton.y,
1569	&ev.xbutton.state);	1608	&ev.xbutton.state);
1570	#ifdef MOUSE_THRESHOLD	1609	#ifdef MOUSE_THRESHOLD
…		…
1582	#endif	1621	#endif
1583	selection_extend (ev.xbutton.x, ev.xbutton.y,	1622	selection_extend (ev.xbutton.x, ev.xbutton.y,
1584	ev.xbutton.state & Button3Mask ? 2 : 0);	1623	ev.xbutton.state & Button3Mask ? 2 : 0);
1585		1624
1586	#ifdef SELECTION_SCROLLING	1625	#ifdef SELECTION_SCROLLING
1587	if (ev.xbutton.y < TermWin.int_bwidth	1626	if (ev.xbutton.y < int_bwidth
1588	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1627	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1589	{	1628	{
1590	int dist;	1629	int dist;
1591		1630
1592	/* don't clobber the current delay if we are	1631	/* don't clobber the current delay if we are
1593	* already in the middle of scrolling.	1632	* already in the middle of scrolling.
…		…
1601	selection_save_x = ev.xbutton.x;	1640	selection_save_x = ev.xbutton.x;
1602	selection_save_y = ev.xbutton.y;	1641	selection_save_y = ev.xbutton.y;
1603	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1642	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1604		1643
1605	/* calc number of lines to scroll */	1644	/* calc number of lines to scroll */
1606	if (ev.xbutton.y < TermWin.int_bwidth)	1645	if (ev.xbutton.y < int_bwidth)
1607	{	1646	{
1608	scroll_selection_dir = UP;	1647	scroll_selection_dir = UP;
1609	dist = TermWin.int_bwidth - ev.xbutton.y;	1648	dist = int_bwidth - ev.xbutton.y;
1610	}	1649	}
1611	else	1650	else
1612	{	1651	{
1613	scroll_selection_dir = DN;	1652	scroll_selection_dir = DN;
1614	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1653	dist = ev.xbutton.y - (int_bwidth + height);
1615	}	1654	}
1616		1655
1617	scroll_selection_lines = Pixel2Height (dist)	1656	scroll_selection_lines = Pixel2Height (dist)
1618	/ SELECTION_SCROLL_LINE_SPEEDUP	1657	/ SELECTION_SCROLL_LINE_SPEEDUP
1619	+ 1;	1658	+ 1;
1620	MIN_IT (scroll_selection_lines,	1659	min_it (scroll_selection_lines,
1621	SELECTION_SCROLL_MAX_LINES);	1660	SELECTION_SCROLL_MAX_LINES);
1622	}	1661	}
1623	else	1662	else
1624	{	1663	{
1625	/* we are within the text window, so we	1664	/* we are within the text window, so we
…		…
1634	#endif	1673	#endif
1635	}	1674	}
1636	}	1675	}
1637	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1676	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638	{	1677	{
1639	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1678	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1640	MotionNotify, &ev))	1679	MotionNotify, &ev))
1641	;	1680	;
1642		1681
1643	XQueryPointer (display->display, scrollBar.win,	1682	XQueryPointer (disp, scrollBar.win,
1644	&unused_root, &unused_child,	1683	&unused_root, &unused_child,
1645	&unused_root_x, &unused_root_y,	1684	&unused_root_x, &unused_root_y,
1646	&ev.xbutton.x, &ev.xbutton.y,	1685	&ev.xbutton.x, &ev.xbutton.y,
1647	&unused_mask);	1686	&unused_mask);
1648	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1687	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1653	}	1692	}
1654	break;	1693	break;
1655	}	1694	}
1656	}	1695	}
1657		1696
		1697	void
		1698	rxvt_term::focus_in ()
		1699	{
		1700	if (!focus)
		1701	{
		1702	focus = 1;
		1703	want_refresh = 1;
		1704
		1705	PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1706
		1707	#if USE_XIM
		1708	if (Input_Context != NULL)
		1709	{
		1710	IMSetStatusPosition ();
		1711	XSetICFocus (Input_Context);
		1712	}
		1713	#endif
		1714	#if CURSOR_BLINK
		1715	if (OPTION (Opt_cursorBlink))
		1716	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1717	#endif
		1718	#if OFF_FOCUS_FADING
		1719	if (rs[Rs_fade])
		1720	{
		1721	pix_colors = pix_colors_focused;
		1722	scr_recolour ();
		1723	}
		1724	#endif
		1725	}
		1726	}
		1727
		1728	void
		1729	rxvt_term::focus_out ()
		1730	{
		1731	if (focus)
		1732	{
		1733	focus = 0;
		1734	want_refresh = 1;
		1735
		1736	PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1737
		1738	#if ENABLE_FRILLS || ISO_14755
		1739	if (iso14755buf)
		1740	{
		1741	iso14755buf = 0;
		1742	# if ENABLE_OVERLAY
		1743	scr_overlay_off ();
		1744	# endif
		1745	}
		1746	#endif
		1747	#if USE_XIM
		1748	if (Input_Context != NULL)
		1749	XUnsetICFocus (Input_Context);
		1750	#endif
		1751	#if CURSOR_BLINK
		1752	if (OPTION (Opt_cursorBlink))
		1753	cursor_blink_ev.stop ();
		1754	hidden_cursor = 0;
		1755	#endif
		1756	#if OFF_FOCUS_FADING
		1757	if (rs[Rs_fade])
		1758	{
		1759	pix_colors = pix_colors_unfocused;
		1760	scr_recolour ();
		1761	}
		1762	#endif
		1763	}
		1764	}
		1765
1658	#if TRANSPARENT	1766	#if TRANSPARENT
1659	void	1767	void
1660	rxvt_term::rootwin_cb (XEvent &ev)	1768	rxvt_term::rootwin_cb (XEvent &ev)
1661	{	1769	{
1662	SET_R (this);	1770	SET_R (this);
…		…
1667	case PropertyNotify:	1775	case PropertyNotify:
1668	/*	1776	/*
1669	* if user used some Esetroot compatible prog to set the root bg,	1777	* 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.	1778	* use the property to determine the pixmap. We use it later on.
1671	*/	1779	*/
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])	1780	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1781	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1676	return;	1782	return;
1677		1783
1678	/* FALLTHROUGH */	1784	/* FALLTHROUGH */
1679	case ReparentNotify:	1785	case ReparentNotify:
1680	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1786	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1681	want_refresh = want_full_refresh = 1;	1787	want_refresh = want_full_refresh = 1;
1682	break;	1788	break;
1683	}	1789	}
1684	}	1790	}
1685	#endif	1791	#endif
…		…
1694	reportmode = !! (priv_modes & PrivMode_mouse_report);	1800	reportmode = !! (priv_modes & PrivMode_mouse_report);
1695		1801
1696	/*	1802	/*
1697	* VT window processing of button press	1803	* VT window processing of button press
1698	*/	1804	*/
1699	if (ev.window == TermWin.vt)	1805	if (ev.window == vt)
1700	{	1806	{
1701	#if ISO_14755	1807	#if ISO_14755
1702	// 5.4	1808	// 5.4
1703	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1809	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704	{	1810	{
…		…
1752	{	1858	{
1753	case Button1:	1859	case Button1:
1754	/* allow meta + click to select rectangular areas */	1860	/* allow meta + click to select rectangular areas */
1755	/* should be done in screen.C */	1861	/* should be done in screen.C */
1756	#if ENABLE_FRILLS	1862	#if ENABLE_FRILLS
1757	selection.rect = !! (ev.state & ModMetaMask);	1863	selection.rect = !!(ev.state & ModMetaMask);
1758	#else	1864	#else
1759	selection.rect = false;	1865	selection.rect = false;
1760	#endif	1866	#endif
1761		1867
1762	/* allow shift+left click to extend selection */	1868	/* allow shift+left click to extend selection */
…		…
1909	case Button3:	2015	case Button3:
1910	if (scrollBar.style != R_SB_XTERM)	2016	if (scrollBar.style != R_SB_XTERM)
1911	{	2017	{
1912	if (scrollbar_above_slider (ev.y))	2018	if (scrollbar_above_slider (ev.y))
1913	# ifdef RXVT_SCROLL_FULL	2019	# ifdef RXVT_SCROLL_FULL
1914	scr_page (UP, TermWin.nrow - 1);	2020	scr_page (UP, nrow - 1);
1915	# else	2021	# else
1916	scr_page (UP, TermWin.nrow / 4);	2022	scr_page (UP, nrow / 4);
1917	# endif	2023	# endif
1918	else if (scrollbar_below_slider (ev.y))	2024	else if (scrollbar_below_slider (ev.y))
1919	# ifdef RXVT_SCROLL_FULL	2025	# ifdef RXVT_SCROLL_FULL
1920	scr_page (DN, TermWin.nrow - 1);	2026	scr_page (DN, nrow - 1);
1921	# else	2027	# else
1922	scr_page (DN, TermWin.nrow / 4);	2028	scr_page (DN, nrow / 4);
1923	# endif	2029	# endif
1924	else	2030	else
1925	scrollBar.setMotion ();	2031	scrollBar.setMotion ();
1926	}	2032	}
1927	else	2033	else
1928	{	2034	{
1929	scr_page ((ev.button == Button1 ? DN : UP),	2035	scr_page ((ev.button == Button1 ? DN : UP),
1930	(TermWin.nrow	2036	(nrow
1931	* scrollbar_position (ev.y)	2037	* scrollbar_position (ev.y)
1932	/ scrollbar_size ()));	2038	/ scrollbar_size ()));
1933	}	2039	}
1934		2040
1935	break;	2041	break;
…		…
1967	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
1968	if (sel_scroll_ev.active)	2074	if (sel_scroll_ev.active)
1969	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
1970	#endif	2076	#endif
1971		2077
1972	if (ev.window == TermWin.vt)	2078	if (ev.window == vt)
1973	{	2079	{
1974	#if ISO_14755	2080	#if ISO_14755
1975	// 5.4	2081	// 5.4
1976	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2082	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977	return;	2083	return;
…		…
2027		2133
2028	v = ev.button == Button4 ? UP : DN;	2134	v = ev.button == Button4 ? UP : DN;
2029		2135
2030	if (ev.state & ShiftMask)	2136	if (ev.state & ShiftMask)
2031	i = 1;	2137	i = 1;
2032	else if (options & Opt_mouseWheelScrollPage)	2138	else if (OPTION (Opt_mouseWheelScrollPage))
2033	i = TermWin.nrow - 1;	2139	i = nrow - 1;
2034	else	2140	else
2035	i = 5;	2141	i = 5;
2036		2142
2037	# ifdef MOUSE_SLIP_WHEELING	2143	# ifdef MOUSE_SLIP_WHEELING
2038	if (ev.state & ControlMask)	2144	if (ev.state & ControlMask)
2039	{	2145	{
2040	mouse_slip_wheel_speed += v ? -1 : 1;	2146	mouse_slip_wheel_speed += v ? -1 : 1;
2041	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2147	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;	2148	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2043		2149
2044	if (slip_wheel_ev.at < NOW)	2150	if (slip_wheel_ev.at < NOW)
2045	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2151	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046		2152
2047	slip_wheel_ev.start ();	2153	slip_wheel_ev.start ();
…		…
2088	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2194	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2195	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2196	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091	int i;	2197	int i;
2092		2198
2093	Visual* visual = display->visual;	2199	Visual *visual = display->visual;
2094		2200
2095	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2201	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096		2202
2097	/* for convenience */	2203	/* for convenience */
2098	mask_r = visual->red_mask;	2204	mask_r = visual->red_mask;
…		…
2319	Atom atype;	2425	Atom atype;
2320	unsigned char *prop = NULL;	2426	unsigned char *prop = NULL;
2321	Window root, oldp, *list;	2427	Window root, oldp, *list;
2322	Pixmap rootpixmap = None;	2428	Pixmap rootpixmap = None;
2323	XWindowAttributes wattr, wrootattr;	2429	XWindowAttributes wattr, wrootattr;
		2430	dDisp;
2324		2431
2325	pchanged = 0;	2432	pchanged = 0;
2326		2433
2327	if (!(options & Opt_transparent))	2434	if (!OPTION (Opt_transparent))
2328	return pchanged; /* Don't try any more */	2435	return pchanged; /* Don't try any more */
2329		2436
2330	XGetWindowAttributes (display->display, display->root, &wrootattr);	2437	XGetWindowAttributes (disp, display->root, &wrootattr);
2331	rootdepth = wrootattr.depth;	2438	rootdepth = wrootattr.depth;
2332		2439
2333	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2440	XGetWindowAttributes (disp, parent[0], &wattr);
2334		2441
2335	if (rootdepth != wattr.depth)	2442	if (rootdepth != wattr.depth)
2336	{	2443	{
2337	if (am_transparent)	2444	if (am_transparent)
2338	{	2445	{
2339	pchanged = 1;	2446	pchanged = 1;
2340	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2447	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2341	am_transparent = am_pixmap_trans = 0;	2448	am_transparent = am_pixmap_trans = 0;
2342	}	2449	}
2343		2450
2344	return pchanged; /* Don't try any more */	2451	return pchanged; /* Don't try any more */
2345	}	2452	}
2346		2453
2347	/* Get all X ops out of the queue so that our information is up-to-date. */	2454	/* Get all X ops out of the queue so that our information is up-to-date. */
2348	XSync (display->display, False);	2455	XSync (disp, False);
2349		2456
2350	/*	2457	/*
2351	* Make the frame window set by the window manager have	2458	* Make the frame window set by the window manager have
2352	* the root background. Some window managers put multiple nested frame	2459	* the root background. Some window managers put multiple nested frame
2353	* windows for each client, so we have to take care about that.	2460	* windows for each client, so we have to take care about that.
2354	*/	2461	*/
2355	i = (xa[XA_XROOTPMAPID]	2462	i = (xa[XA_XROOTPMAP_ID]
2356	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2463	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2357	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2464	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358	&nitems, &bytes_after, &prop) == Success);	2465	&nitems, &bytes_after, &prop) == Success);
2359		2466
2360	if (!i || prop == NULL)	2467	if (!i || prop == NULL)
2361	i = (xa[XA_XSETROOTID]	2468	i = (xa[XA_ESETROOT_PMAP_ID]
2362	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2469	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2363	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2470	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364	&nitems, &bytes_after, &prop) == Success);	2471	&nitems, &bytes_after, &prop) == Success);
2365		2472
2366	if (!i || prop == NULL	2473	if (!i || prop == NULL
2367	#if TINTING	2474	#if TINTING
…		…
2386	Window cr;	2493	Window cr;
2387	XImage *image;	2494	XImage *image;
2388	GC gc;	2495	GC gc;
2389	XGCValues gcvalue;	2496	XGCValues gcvalue;
2390		2497
2391	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2498	XTranslateCoordinates (disp, parent[0], display->root,
2392	0, 0, &sx, &sy, &cr);	2499	0, 0, &sx, &sy, &cr);
2393	nw = (unsigned int)szHint.width;	2500	nw = (unsigned int)szHint.width;
2394	nh = (unsigned int)szHint.height;	2501	nh = (unsigned int)szHint.height;
2395	nx = ny = 0;	2502	nx = ny = 0;
2396		2503
…		…
2406	nh += sy;	2513	nh += sy;
2407	ny = -sy;	2514	ny = -sy;
2408	sy = 0;	2515	sy = 0;
2409	}	2516	}
2410		2517
2411	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2518	min_it (nw, (unsigned int) (wrootattr.width - sx));
2412	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2519	min_it (nh, (unsigned int) (wrootattr.height - sy));
2413		2520
2414	XSync (display->display, False);	2521	XSync (disp, False);
2415	allowedxerror = -1;	2522	allowedxerror = -1;
2416	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2523	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417		2524
2418	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2525	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2419	/* XXX: may need a delay here? */	2526	/* XXX: may need a delay here? */
2420	allowedxerror = 0;	2527	allowedxerror = 0;
2421		2528
2422	if (image == NULL)	2529	if (image == NULL)
2423	{	2530	{
2424	if (am_transparent && am_pixmap_trans)	2531	if (am_transparent && am_pixmap_trans)
2425	{	2532	{
2426	pchanged = 1;	2533	pchanged = 1;
2427	if (TermWin.pixmap != None)	2534	if (pixmap != None)
2428	{	2535	{
2429	XFreePixmap (display->display, TermWin.pixmap);	2536	XFreePixmap (disp, pixmap);
2430	TermWin.pixmap = None;	2537	pixmap = None;
2431	}	2538	}
2432	}	2539	}
2433		2540
2434	am_pixmap_trans = 0;	2541	am_pixmap_trans = 0;
2435	}	2542	}
2436	else	2543	else
2437	{	2544	{
2438	if (TermWin.pixmap != None)	2545	if (pixmap != None)
2439	XFreePixmap (display->display, TermWin.pixmap);	2546	XFreePixmap (disp, pixmap);
2440		2547
2441	#if TINTING	2548	#if TINTING
2442	if (ISSET_PIXCOLOR (Color_tint))	2549	if (ISSET_PIXCOLOR (Color_tint))
2443	{	2550	{
2444	unsigned short rm, gm, bm;	2551	unsigned short rm, gm, bm;
…		…
2448		2555
2449	ShadeXImage (display, image, shade, rm, gm, bm);	2556	ShadeXImage (display, image, shade, rm, gm, bm);
2450	}	2557	}
2451	#endif	2558	#endif
2452		2559
2453	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2560	pixmap = XCreatePixmap (disp, vt,
2454	szHint.width, szHint.height, image->depth);	2561	szHint.width, szHint.height, image->depth);
2455	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2562	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2456	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2563	XPutImage (disp, pixmap, gc, image, 0, 0,
2457	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2458	XFreeGC (display->display, gc);	2565	XFreeGC (disp, gc);
2459	XDestroyImage (image);	2566	XDestroyImage (image);
2460	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2567	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2461	XClearWindow (display->display, TermWin.parent[0]);	2568	XClearWindow (disp, parent[0]);
2462		2569
2463	if (!am_transparent || !am_pixmap_trans)	2570	if (!am_transparent || !am_pixmap_trans)
2464	pchanged = 1;	2571	pchanged = 1;
2465		2572
2466	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2467	}	2574	}
2468	}	2575	}
2469		2576
2470	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2471	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2472	else	2579	else
2473	{	2580	{
2474	unsigned int n;	2581	unsigned int n;
2475	/*	2582	/*
2476	* InheritPixmap transparency	2583	* InheritPixmap transparency
2477	*/	2584	*/
2478	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2479	{	2586	{
2480	oldp = TermWin.parent[i];	2587	oldp = parent[i];
2481	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2588	XQueryTree (disp, parent[i - 1], &root,
2482	&TermWin.parent[i], &list, &n);	2589	&parent[i], &list, &n);
2483	XFree (list);	2590	XFree (list);
2484		2591
2485	if (TermWin.parent[i] == display->root)	2592	if (parent[i] == display->root)
2486	{	2593	{
2487	if (oldp != None)	2594	if (oldp != None)
2488	pchanged = 1;	2595	pchanged = 1;
2489		2596
2490	break;	2597	break;
2491	}	2598	}
2492		2599
2493	if (oldp != TermWin.parent[i])	2600	if (oldp != parent[i])
2494	pchanged = 1;	2601	pchanged = 1;
2495	}	2602	}
2496		2603
2497	n = 0;	2604	n = 0;
2498		2605
2499	if (pchanged)	2606	if (pchanged)
2500	{	2607	{
2501	for (; n < (unsigned int)i; n++)	2608	for (; n < (unsigned int)i; n++)
2502	{	2609	{
2503	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2610	XGetWindowAttributes (disp, parent[n], &wattr);
2504	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2611	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2505	{	2612	{
2506	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2613	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2507	break;	2614	break;
2508	}	2615	}
2509	}	2616	}
2510	}	2617	}
2511		2618
2512	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2619	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2513	{	2620	{
2514	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2621	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2515	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2622	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2516	am_transparent = 0;	2623	am_transparent = 0;
2517	/* XXX: also turn off Opt_transparent? */	2624	/* XXX: also turn off Opt_transparent? */
2518	}	2625	}
2519	else	2626	else
2520	{	2627	{
…		…
2523	* needed for fvwm2.2.2 (and before?) */	2630	* needed for fvwm2.2.2 (and before?) */
2524	sleep (1);	2631	sleep (1);
2525	#endif	2632	#endif
2526	for (n = 0; n < (unsigned int)i; n++)	2633	for (n = 0; n < (unsigned int)i; n++)
2527	{	2634	{
2528	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2635	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2529	XClearWindow (display->display, TermWin.parent[n]);	2636	XClearWindow (disp, parent[n]);
2530	}	2637	}
2531		2638
2532	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2639	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2533	am_transparent = 1;	2640	am_transparent = 1;
2534	}	2641	}
2535		2642
2536	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2643	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2537	TermWin.parent[i] = None;	2644	parent[i] = None;
2538	}	2645	}
2539		2646
2540	if (scrollBar.win)	2647	if (scrollBar.win)
2541	{	2648	{
2542	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2649	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2543	scrollBar.setIdle ();	2650	scrollBar.setIdle ();
2544	scrollbar_show (0);	2651	scrollbar_show (0);
2545	}	2652	}
2546		2653
2547	if (am_transparent)	2654	if (am_transparent)
…		…
2585	// some window managers resize the window early, and these programs	2692	// some window managers resize the window early, and these programs
2586	// then sometimes get the size wrong.	2693	// then sometimes get the size wrong.
2587	// unfortunately other programs are even more buggy and dislike	2694	// unfortunately other programs are even more buggy and dislike
2588	// being sent SIGWINCH, so only do it when we were in fact being	2695	// being sent SIGWINCH, so only do it when we were in fact being
2589	// resized.	2696	// resized.
2590	if (seen_resize)	2697	if (seen_resize && cmd_pid)
2591	kill (-cmd_pid, SIGWINCH);	2698	kill (-cmd_pid, SIGWINCH);
2592	}	2699	}
2593		2700
2594	/* Read a text string from the input buffer */	2701	/* Read a text string from the input buffer */
2595	unicode_t buf[UBUFSIZ];	2702	unicode_t buf[UBUFSIZ];
2596	bool refreshnow = false;	2703	bool refreshnow = false;
2597	int nlines = 0;	2704	int nlines = 0;
2598	unicode_t *str = buf;	2705	unicode_t *str = buf;
		2706	unicode_t *eol = str + min (ncol, UBUFSIZ);
2599		2707
2600	for (;;)	2708	for (;;)
2601	{	2709	{
2602	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2710	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2603	break;	2711	break;
2604		2712
2605	*str++ = ch;	2713	*str++ = ch;
2606		2714
2607	if (ch == C0_LF)	2715	if (ch == C0_LF || str >= eol)
2608	{	2716	{
		2717	if (ch == C0_LF)
2609	nlines++;	2718	nlines++;
		2719
2610	refresh_count++;	2720	refresh_count++;
2611		2721
2612	if (!(options & Opt_jumpScroll)	2722	if (!OPTION (Opt_jumpScroll)
2613	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2723	|| (refresh_count >= refresh_limit * (nrow - 1)))
2614	{	2724	{
2615	refreshnow = true;	2725	refreshnow = true;
		2726	refresh_count = 0;
2616	ch = NOCHAR;	2727	ch = NOCHAR;
2617	break;	2728	break;
2618	}	2729	}
2619		2730
2620	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2731	// scr_add_lines only works for nlines <= nrow - 1.
2621	if (nlines >= TermWin.nrow - 1)	2732	if (nlines >= nrow - 1)
2622	{	2733	{
2623	scr_add_lines (buf, nlines, str - buf);	2734	scr_add_lines (buf, nlines, str - buf);
2624	nlines = 0;	2735	nlines = 0;
2625	str = buf;	2736	str = buf;
		2737	eol = str + min (ncol, UBUFSIZ);
2626	}	2738	}
2627	}
2628		2739
2629	if (str >= buf + UBUFSIZ)	2740	if (str >= eol)
2630	{	2741	{
		2742	if (eol >= buf + UBUFSIZ)
		2743	{
2631	ch = NOCHAR;	2744	ch = NOCHAR;
2632	break;	2745	break;
		2746	}
		2747	else
		2748	eol = min (eol + ncol, buf + UBUFSIZ);
		2749	}
		2750
2633	}	2751	}
2634		2752
2635	seq_begin = cmdbuf_ptr;	2753	seq_begin = cmdbuf_ptr;
2636	ch = next_char ();	2754	ch = next_char ();
2637	}	2755	}
…		…
2644	* the number of pages between refreshes is refresh_limit, which	2762	* the number of pages between refreshes is refresh_limit, which
2645	* is incremented here because we must be doing flat-out scrolling.	2763	* is incremented here because we must be doing flat-out scrolling.
2646	*/	2764	*/
2647	if (refreshnow)	2765	if (refreshnow)
2648	{	2766	{
2649	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2767	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2650	refresh_limit++;	2768	refresh_limit++;
2651	else	2769	else
2652	{	2770	{
2653	flag = true;	2771	flag = true;
2654	scr_refresh (refresh_type);	2772	scr_refresh (refresh_type);
		2773	flush_ev.stop ();
2655	}	2774	}
2656	}	2775	}
2657		2776
2658	}	2777	}
2659	else	2778	else
…		…
2708	if (len == (size_t)-1)	2827	if (len == (size_t)-1)
2709	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2828	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2710		2829
2711	// assume wchar == unicode	2830	// assume wchar == unicode
2712	cmdbuf_ptr += len;	2831	cmdbuf_ptr += len;
2713	return wc;	2832	return wc & UNICODE_MASK;
2714	}	2833	}
2715		2834
2716	return NOCHAR;	2835	return NOCHAR;
2717	}	2836	}
2718		2837
…		…
3181	{	3300	{
3182	switch (priv)	3301	switch (priv)
3183	{	3302	{
3184	case '>':	3303	case '>':
3185	if (ch == CSI_DA) /* secondary device attributes */	3304	if (ch == CSI_DA) /* secondary device attributes */
3186	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3305	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3187	break;	3306	break;
3188	case '?':	3307	case '?':
3189	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3308	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3190	process_terminal_mode (ch, priv, nargs, arg);	3309	process_terminal_mode (ch, priv, nargs, arg);
3191	break;	3310	break;
…		…
3296		3415
3297	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3416	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3298	arg[0] = -arg[0];	3417	arg[0] = -arg[0];
3299	/* FALLTHROUGH */	3418	/* FALLTHROUGH */
3300	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3419	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3301	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3420	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3302	break;	3421	break;
3303		3422
3304	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3423	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3305	tt_write ((const unsigned char *)VT100_ANS,	3424	tt_write ((const unsigned char *)VT100_ANS,
3306	(unsigned int) (sizeof (VT100_ANS) - 1));	3425	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3318	break;	3437	break;
3319	case 6: /* CPR requested */	3438	case 6: /* CPR requested */
3320	scr_report_position ();	3439	scr_report_position ();
3321	break;	3440	break;
3322	case 7: /* unofficial extension */	3441	case 7: /* unofficial extension */
3323	if (options & Opt_insecure)	3442	if (OPTION (Opt_insecure))
3324	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3443	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3325	break;	3444	break;
3326	case 8: /* unofficial extension */	3445	case 8: /* unofficial extension */
3327	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3446	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3328	break;	3447	break;
…		…
3420	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3539	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421	{	3540	{
3422	int x, y;	3541	int x, y;
3423	XWindowAttributes wattr;	3542	XWindowAttributes wattr;
3424	Window wdummy;	3543	Window wdummy;
		3544	dDisp;
3425		3545
3426	if (nargs == 0)	3546	if (nargs == 0)
3427	return;	3547	return;
3428		3548
3429	switch (args[0])	3549	switch (args[0])
3430	{	3550	{
3431	/*	3551	/*
3432	* commands	3552	* commands
3433	*/	3553	*/
3434	case 1: /* deiconify window */	3554	case 1: /* deiconify window */
3435	XMapWindow (display->display, TermWin.parent[0]);	3555	XMapWindow (disp, parent[0]);
3436	break;	3556	break;
3437	case 2: /* iconify window */	3557	case 2: /* iconify window */
3438	XIconifyWindow (display->display, TermWin.parent[0],	3558	XIconifyWindow (disp, parent[0], display->screen);
3439	DefaultScreen (display->display));
3440	break;	3559	break;
3441	case 3: /* set position (pixels) */	3560	case 3: /* set position (pixels) */
3442	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3561	XMoveWindow (disp, parent[0], args[1], args[2]);
3443	break;	3562	break;
3444	case 4: /* set size (pixels) */	3563	case 4: /* set size (pixels) */
3445	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3564	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446	break;	3565	break;
3447	case 5: /* raise window */	3566	case 5: /* raise window */
3448	XRaiseWindow (display->display, TermWin.parent[0]);	3567	XRaiseWindow (disp, parent[0]);
3449	break;	3568	break;
3450	case 6: /* lower window */	3569	case 6: /* lower window */
3451	XLowerWindow (display->display, TermWin.parent[0]);	3570	XLowerWindow (disp, parent[0]);
3452	break;	3571	break;
3453	case 7: /* refresh window */	3572	case 7: /* refresh window */
3454	scr_touch (true);	3573	scr_touch (true);
3455	break;	3574	break;
3456	case 8: /* set size (chars) */	3575	case 8: /* set size (chars) */
3457	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3576	set_widthheight ((unsigned int) (args[2] * fwidth),
3458	(unsigned int) (args[1] * TermWin.fheight));	3577	(unsigned int) (args[1] * fheight));
3459	break;	3578	break;
3460		3579
3461	//case 9: NYI, TODO, restore maximized window or maximize window	3580	//case 9: NYI, TODO, restore maximized window or maximize window
3462	default:	3581	default:
3463	if (args[0] >= 24) /* set height (chars) */	3582	if (args[0] >= 24) /* set height (chars) */
3464	set_widthheight ((unsigned int)TermWin.width,	3583	set_widthheight ((unsigned int)width,
3465	(unsigned int) (args[1] * TermWin.fheight));	3584	(unsigned int) (args[1] * fheight));
3466	break;	3585	break;
3467		3586
3468		3587
3469	/*	3588	/*
3470	* reports - some output format copied from XTerm	3589	* reports - some output format copied from XTerm
3471	*/	3590	*/
3472	case 11: /* report window state */	3591	case 11: /* report window state */
3473	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3592	XGetWindowAttributes (disp, parent[0], &wattr);
3474	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3593	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475	break;	3594	break;
3476	case 13: /* report window position */	3595	case 13: /* report window position */
3477	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3596	XGetWindowAttributes (disp, parent[0], &wattr);
3478	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3597	XTranslateCoordinates (disp, parent[0], wattr.root,
3479	-wattr.border_width, -wattr.border_width,	3598	-wattr.border_width, -wattr.border_width,
3480	&x, &y, &wdummy);	3599	&x, &y, &wdummy);
3481	tt_printf ("\033[3;%d;%dt", x, y);	3600	tt_printf ("\033[3;%d;%dt", x, y);
3482	break;	3601	break;
3483	case 14: /* report window size (pixels) */	3602	case 14: /* report window size (pixels) */
3484	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3603	XGetWindowAttributes (disp, parent[0], &wattr);
3485	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3604	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486	break;	3605	break;
3487	case 18: /* report text area size (chars) */	3606	case 18: /* report text area size (chars) */
3488	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3607	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3489	break;	3608	break;
3490	case 19: /* report window size (chars) */	3609	case 19: /* report window size (chars) */
3491	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3610	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3492	break;	3611	break;
3493	case 20: /* report icon label */	3612	case 20: /* report icon label */
3494	{	3613	{
3495	char *s;	3614	char *s;
3496	XGetIconName (display->display, TermWin.parent[0], &s);	3615	XGetIconName (disp, parent[0], &s);
3497	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3616	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3498	XFree (s);	3617	XFree (s);
3499	}	3618	}
3500	break;	3619	break;
3501	case 21: /* report window title */	3620	case 21: /* report window title */
3502	{	3621	{
3503	char *s;	3622	char *s;
3504	XFetchName (display->display, TermWin.parent[0], &s);	3623	XFetchName (disp, parent[0], &s);
3505	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3624	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3506	XFree (s);	3625	XFree (s);
3507	}	3626	}
3508	break;	3627	break;
3509	}	3628	}
3510	}	3629	}
…		…
3542	else if (ch < 0x20)	3661	else if (ch < 0x20)
3543	return NULL; /* other control character - exit */	3662	return NULL; /* other control character - exit */
3544		3663
3545	seen_esc = false;	3664	seen_esc = false;
3546		3665
3547	if (n >= sizeof (string) - 1)	3666	if (n >= STRING_MAX - 1)
3548	// stop at some sane length	3667	// stop at some sane length
3549	return NULL;	3668	return NULL;
3550		3669
3551	if (ch == C0_SYN)	3670	if (ch == C0_SYN)
3552	string[n++] = cmd_get8 ();	3671	string[n++] = cmd_get8 ();
…		…
3620	set_window_color (color, str);	3739	set_window_color (color, str);
3621	}	3740	}
3622		3741
3623	/*	3742	/*
3624	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3743	* 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	*/	3744	*/
3648	void	3745	void
3649	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3746	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3650	{	3747	{
3651	int changed = 0;	3748	int changed = 0;
3652	int color;	3749	int color;
3653	char *buf, *name;	3750	char *buf, *name;
3654	bool query = str[0] == '?' && !str[1];	3751	bool query = str[0] == '?' && !str[1];
3655	int saveop = op;	3752	int saveop = op;
		3753	dDisp;
3656		3754
3657	assert (str != NULL);	3755	assert (str != NULL);
3658	switch (op)	3756	switch (op)
3659	{	3757	{
3660	case XTerm_name:	3758	case XTerm_name:
…		…
3676	unsigned long bytes_after;	3774	unsigned long bytes_after;
3677	unsigned char *value = 0;	3775	unsigned char *value = 0;
3678	const char *str = "";	3776	const char *str = "";
3679		3777
3680	if (prop	3778	if (prop
3681	&& XGetWindowProperty (display->display, TermWin.parent[0],	3779	&& XGetWindowProperty (disp, parent[0],
3682	prop, 0, 1<<16, 0, AnyPropertyType,	3780	prop, 0, 1<<16, 0, AnyPropertyType,
3683	&actual_type, &actual_format,	3781	&actual_type, &actual_format,
3684	&nitems, &bytes_after, &value) == Success	3782	&nitems, &bytes_after, &value) == Success
3685	&& actual_type != None	3783	&& actual_type != None
3686	&& actual_format == 8)	3784	&& actual_format == 8)
…		…
3698	{	3796	{
3699	*eq = 0;	3797	*eq = 0;
3700	set_utf8_property (display->atom (str), eq + 1);	3798	set_utf8_property (display->atom (str), eq + 1);
3701	}	3799	}
3702	else	3800	else
3703	XDeleteProperty (display->display, TermWin.parent[0],	3801	XDeleteProperty (disp, parent[0],
3704	display->atom (str));	3802	display->atom (str));
3705	}	3803	}
3706	break;	3804	break;
3707		3805
3708	case XTerm_Color:	3806	case XTerm_Color:
…		…
3749	break;	3847	break;
3750	#ifndef NO_BOLD_UNDERLINE_REVERSE	3848	#ifndef NO_BOLD_UNDERLINE_REVERSE
3751	case XTerm_Color_BD:	3849	case XTerm_Color_BD:
3752	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3850	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3753	break;	3851	break;
3754	case XTerm_Color_IT:
3755	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756	break;
3757	case XTerm_Color_UL:	3852	case XTerm_Color_UL:
3758	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3853	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3759	break;	3854	break;
3760	case XTerm_Color_RV:	3855	case XTerm_Color_RV:
3761	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3856	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762	break;	3857	break;
		3858	case URxvt_Color_IT:
		3859	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3860	break;
3763	#endif	3861	#endif
3764	#if TRANSPARENT && TINTING	3862	#if TRANSPARENT && TINTING
3765	case XTerm_Color_tint:	3863	case URxvt_Color_tint:
3766	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3864	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3767	check_our_parents ();	3865	check_our_parents ();
3768	if (am_transparent)	3866	if (am_transparent)
3769	want_full_refresh = want_refresh = 1;	3867	want_full_refresh = want_refresh = 1;
3770	break;	3868	break;
3771	#endif	3869	#endif
…		…
3783	{	3881	{
3784	str++;	3882	str++;
3785	#if XPM_BACKGROUND	3883	#if XPM_BACKGROUND
3786	changed += scale_pixmap (str);	3884	changed += scale_pixmap (str);
3787	#endif	3885	#endif
3788
3789	}	3886	}
		3887
3790	if (changed)	3888	if (changed)
3791	{	3889	{
3792	#ifdef XPM_BACKGROUND	3890	#ifdef XPM_BACKGROUND
3793	resize_pixmap ();	3891	resize_pixmap ();
3794	#endif	3892	#endif
…		…
3805		3903
3806	case XTerm_logfile:	3904	case XTerm_logfile:
3807	// TODO, when secure mode?	3905	// TODO, when secure mode?
3808	break;	3906	break;
3809		3907
		3908	#ifdef MENUBAR
		3909	case URxvt_Menu:
		3910	if (OPTION (Opt_insecure))
		3911	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3912	break;
		3913	#endif
		3914	#if 0
		3915	case XTerm_dumpscreen: /* no error notices */
		3916	{
		3917	int fd;
		3918	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3919	{
		3920	scr_dump (fd);
		3921	close (fd);
		3922	}
		3923	}
		3924	break;
		3925	#endif
3810	case XTerm_font:	3926	case XTerm_font:
3811	op = URxvt_font;	3927	op = URxvt_font;
3812	case URxvt_font:	3928	case URxvt_font:
3813	#if ENABLE_STYLES	3929	#if ENABLE_STYLES
3814	case URxvt_boldFont:	3930	case URxvt_boldFont:
3815	case URxvt_italicFont:	3931	case URxvt_italicFont:
3816	case URxvt_boldItalicFont:	3932	case URxvt_boldItalicFont:
3817	#endif	3933	#endif
3818	if (query)	3934	if (query)
3819	tt_printf ("\33]%d;%-.250s%c", saveop,	3935	tt_printf ("\33]%d;%-.250s%c", saveop,
3820	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3936	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3821	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3937	? fontset[op - URxvt_font]->fontdesc : "",
3822	resp);	3938	resp);
3823	else	3939	else
3824	{	3940	{
3825	const char *&res = rs[Rs_font + (op - URxvt_font)];	3941	const char *&res = rs[Rs_font + (op - URxvt_font)];
3826		3942
…		…
3829	set_fonts ();	3945	set_fonts ();
3830	}	3946	}
3831	break;	3947	break;
3832		3948
3833	#if ENABLE_FRILLS	3949	#if ENABLE_FRILLS
3834	case XTerm_locale:	3950	case URxvt_locale:
3835	if (query)	3951	if (query)
3836	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3952	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3837	else	3953	else
3838	{	3954	{
3839	set_locale (str);	3955	set_locale (str);
3840	# ifdef USE_XIM	3956	pty.set_utf8_mode (enc_utf8);
3841	im_cb ();	3957	init_xlocale ();
3842	# endif
3843	}	3958	}
3844	break;	3959	break;
3845	#endif
3846		3960
3847	#ifdef MENUBAR	3961	case URxvt_view_up:
3848	case XTerm_Menu:	3962	case URxvt_view_down:
3849	if (options & Opt_insecure)	3963	int lines = atoi (str);
3850	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3964
3851	break;	3965	if (lines)
3852	#endif	3966	scr_page (op == URxvt_view_up ? UP : DN, lines);
3853	#if 0
3854	case XTerm_dumpscreen: /* no error notices */
3855	{	3967	else
3856	int fd;
3857	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3858	{	3968	{
3859	scr_dump (fd);	3969	scr_erase_savelines ();
3860	close (fd);
3861	}	3970	}
3862	}	3971
3863	break;	3972	break;
3864	#endif	3973	#endif
3865	}	3974	}
3866	}	3975	}
3867	/*----------------------------------------------------------------------*/	3976	/*----------------------------------------------------------------------*/
…		…
3976	}	4085	}
3977		4086
3978	/* extra handling for values with state unkept */	4087	/* extra handling for values with state unkept */
3979	switch (arg[i])	4088	switch (arg[i])
3980	{	4089	{
		4090	#if ENABLE_STYLES
		4091	case 1021:
		4092	if (mode)
		4093	SET_OPTION (Opt_intensityStyles);
		4094	else
		4095	CLR_OPTION (Opt_intensityStyles);
		4096
		4097	scr_touch (true);
		4098	break;
		4099	#endif
3981	case 1048: /* alternative cursor save */	4100	case 1048: /* alternative cursor save */
3982	case 1049:	4101	case 1049:
3983	if (options & Opt_secondaryScreen)	4102	if (OPTION (Opt_secondaryScreen))
3984	if (mode == 0)	4103	if (mode == 0)
3985	scr_cursor (RESTORE);	4104	scr_cursor (RESTORE);
3986	else if (mode == 1)	4105	else if (mode == 1)
3987	scr_cursor (SAVE);	4106	scr_cursor (SAVE);
3988	break;	4107	break;
…		…
4000	*/	4119	*/
4001	PrivMode (1, PrivMode_vt52);	4120	PrivMode (1, PrivMode_vt52);
4002	break;	4121	break;
4003	case 3: /* 80/132 */	4122	case 3: /* 80/132 */
4004	if (priv_modes & PrivMode_132OK)	4123	if (priv_modes & PrivMode_132OK)
4005	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4124	set_widthheight (((state ? 132 : 80) * fwidth), height);
4006	break;	4125	break;
4007	case 4: /* smooth scrolling */	4126	case 4: /* smooth scrolling */
4008	if (state)	4127	if (!state)
4009	options &= ~Opt_jumpScroll;	4128	SET_OPTION (Opt_jumpScroll);
4010	else	4129	else
4011	options |= Opt_jumpScroll;	4130	CLR_OPTION (Opt_jumpScroll);
4012	break;	4131	break;
4013	case 5: /* reverse video */	4132	case 5: /* reverse video */
4014	scr_rvideo_mode (state);	4133	scr_rvideo_mode (state);
4015	break;	4134	break;
4016	case 6: /* relative/absolute origins */	4135	case 6: /* relative/absolute origins */
…		…
4057	#if 0	4176	#if 0
4058	case 1001:	4177	case 1001:
4059	break; /* X11 mouse highlighting */	4178	break; /* X11 mouse highlighting */
4060	#endif	4179	#endif
4061	case 1010: /* scroll to bottom on TTY output inhibit */	4180	case 1010: /* scroll to bottom on TTY output inhibit */
4062	if (state)	4181	if (!state)
4063	options &= ~Opt_scrollTtyOutput;	4182	SET_OPTION (Opt_scrollTtyOutput);
4064	else	4183	else
4065	options |= Opt_scrollTtyOutput;	4184	CLR_OPTION (Opt_scrollTtyOutput);
4066	break;	4185	break;
4067	case 1011: /* scroll to bottom on key press */	4186	case 1011: /* scroll to bottom on key press */
4068	if (state)	4187	if (state)
4069	options |= Opt_scrollTtyKeypress;	4188	SET_OPTION (Opt_scrollTtyKeypress);
4070	else	4189	else
4071	options &= ~Opt_scrollTtyKeypress;	4190	CLR_OPTION (Opt_scrollTtyKeypress);
4072	break;	4191	break;
4073	case 1047: /* secondary screen w/ clearing last */	4192	case 1047: /* secondary screen w/ clearing last */
4074	if (options & Opt_secondaryScreen)	4193	if (OPTION (Opt_secondaryScreen))
4075	if (current_screen != PRIMARY)	4194	if (current_screen != PRIMARY)
4076	scr_erase_screen (2);	4195	scr_erase_screen (2);
4077	scr_change_screen (state);	4196	scr_change_screen (state);
4078	break;	4197	break;
4079	case 1049: /* secondary screen w/ clearing first */	4198	case 1049: /* secondary screen w/ clearing first */
4080	scr_change_screen (state);	4199	scr_change_screen (state);
4081	if (options & Opt_secondaryScreen)	4200	if (OPTION (Opt_secondaryScreen))
4082	if (current_screen != PRIMARY)	4201	if (current_screen != PRIMARY)
4083	scr_erase_screen (2);	4202	scr_erase_screen (2);
4084	break;	4203	break;
4085	default:	4204	default:
4086	break;	4205	break;
…		…
4236	case 106:	4355	case 106:
4237	case 107:	4356	case 107:
4238	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4357	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4239	break;	4358	break;
4240	#endif	4359	#endif
4241
4242	}	4360	}
4243	}	4361	}
4244	}	4362	}
4245	/*}}} */	4363	/*}}} */
4246		4364
…		…
4282		4400
4283	/* ---------------------------------------------------------------------- */	4401	/* ---------------------------------------------------------------------- */
4284	/* Write data to the pty as typed by the user, pasted with the mouse,	4402	/* 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.	4403	* or generated by us in response to a query ESC sequence.
4286	*/	4404	*/
		4405	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4406
4287	void	4407	void
4288	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4408	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289	{	4409	{
4290	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4410	if (v_buflen == 0)
		4411	{
		4412	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291		4413
4292	if (len)	4414	if ((unsigned int)written == len)
		4415	return;
		4416
		4417	data += written;
		4418	len -= written;
4293	{	4419	}
		4420
		4421	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4422
		4423	memcpy (v_buffer + v_buflen, data, len);
		4424	v_buflen += len;
		4425
		4426	pty_ev.set (EVENT_READ | EVENT_WRITE);
		4427	}
		4428
		4429	void rxvt_term::pty_write ()
		4430	{
		4431	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4432
		4433	if (written > 0)
		4434	{
		4435	v_buflen -= written;
		4436
4294	if (v_buflen == 0)	4437	if (v_buflen == 0)
4295	{	4438	{
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);	4439	free (v_buffer);
4323	v_buffer = 0;	4440	v_buffer = 0;
4324	v_buflen = 0;	4441	v_buflen = 0;
4325		4442
4326	pty_ev.set (EVENT_READ);	4443	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;	4444	return;
4339	}	4445	}
		4446
		4447	memmove (v_buffer, v_buffer + written, v_buflen);
4340	}	4448	}
		4449	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4450	pty_ev.set (EVENT_READ);
4341	}	4451	}
4342		4452
4343	/*----------------------- end-of-file (C source) -----------------------*/	4453	/*----------------------- end-of-file (C source) -----------------------*/
4344		4454

Diff Legend

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