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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.226 by root, Sun Jan 1 15:03:49 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	#include <cwchar>	53	#if HAVE_SCHED_YIELD
		54	# include <sched.h>
		55	#endif
		56
		57	#ifdef KEYSYM_RESOURCE
		58	# include "keyboard.h"
		59	#endif
		60
54	#include <csignal>	61	#include <csignal>
55		62
56	/*----------------------------------------------------------------------*/	63	/*----------------------------------------------------------------------*/
57		64
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	65	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
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:
…		…
785	case XK_F35: /* "\033[49~" */	820	case XK_F35: /* "\033[49~" */
786	FKEY (31, XK_F17);	821	FKEY (31, XK_F17);
787	break;	822	break;
788	#undef FKEY	823	#undef FKEY
789	default:	824	default:
790	if (len == 0	825	newlen = 0;
791	&& (keysym & 0xfff0) != 0xff70	826	break;
792	&& (keysym & 0xfff0) != 0xffe0)
793	/* generate a keycode for every remaining keypress */
794	sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795	}	827	}
796		828
797	if (newlen)	829	if (newlen)
798	len = strlen (kbuf);	830	len = strlen (kbuf);
799	}	831	}
…		…
815	else if (keysym == XK_ISO_Left_Tab)	847	else if (keysym == XK_ISO_Left_Tab)
816	{	848	{
817	strcpy (kbuf, "\033[Z");	849	strcpy (kbuf, "\033[Z");
818	len = 3;	850	len = 3;
819	}	851	}
820	else if (len == 0
821	&& (keysym & 0xffe0) != 0xfe00
822	&& (keysym < 0xfe50 || keysym > 0xfe6f))
823	{
824	/* generate a keycode for every remaining keypress */
825	len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826	}
827	else	852	else
828	{	853	{
829	#ifdef META8_OPTION	854	#ifdef META8_OPTION
830	/* set 8-bit on */	855	/* set 8-bit on */
831	if (meta && (meta_char == 0x80))	856	if (meta && (meta_char == 0x80))
…		…
843	}	868	}
844		869
845	if (len <= 0)	870	if (len <= 0)
846	return; /* not mapped */	871	return; /* not mapped */
847		872
848	if (options & Opt_scrollTtyKeypress)	873	if (OPTION (Opt_scrollTtyKeypress))
849	if (TermWin.view_start)	874	if (view_start)
850	{	875	{
851	TermWin.view_start = 0;	876	view_start = 0;
852	want_refresh = 1;	877	want_refresh = 1;
853	}	878	}
854		879
855	/*	880	/*
856	* these modifications only affect the static keybuffer	881	* these modifications only affect the static keybuffer
…		…
889	#endif /* DEBUG_CMD */	914	#endif /* DEBUG_CMD */
890	tt_write (kbuf, (unsigned int)len);	915	tt_write (kbuf, (unsigned int)len);
891	}	916	}
892	/*}}} */	917	/*}}} */
893		918
894	#if (MENUBAR_MAX)	919	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	920	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896	/* attempt to `write' count to the input buffer */	921	/* attempt to `write' count to the input buffer */
897	unsigned int	922	unsigned int
898	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	923	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
899	{	924	{
…		…
922		947
923	cmd_parse ();	948	cmd_parse ();
924		949
925	return 0;	950	return 0;
926	}	951	}
927	#endif /* MENUBAR_MAX */	952	#endif
928		953
929	void	954	void
930	rxvt_term::flush ()	955	rxvt_term::flush ()
931	{	956	{
932	flush_ev.stop ();	957	flush_ev.stop ();
…		…
959	SET_LOCALE (locale);	984	SET_LOCALE (locale);
960		985
961	display->flush ();	986	display->flush ();
962		987
963	if (want_refresh && !flush_ev.active)	988	if (want_refresh && !flush_ev.active)
964	flush_ev.start (NOW + 0.01);	989	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965	}	990	}
966		991
967	void	992	void
968	rxvt_term::flush_cb (time_watcher &w)	993	rxvt_term::flush_cb (time_watcher &w)
969	{	994	{
…		…
1033	{	1058	{
1034	if (mouse_slip_wheel_speed == 0	1059	if (mouse_slip_wheel_speed == 0
1035	|| 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)
1036	: scr_page (UP, mouse_slip_wheel_speed))	1061	: scr_page (UP, mouse_slip_wheel_speed))
1037	{	1062	{
		1063	if (view_start == nsaved ||
		1064	view_start == 0)
		1065	mouse_slip_wheel_speed = 0;
		1066
1038	refresh_type |= SMOOTH_REFRESH;	1067	refresh_type |= SMOOTH_REFRESH;
1039	want_refresh = 1;	1068	want_refresh = 1;
1040	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1069	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041	}	1070	}
1042	}	1071	}
…		…
1055		1084
1056	memmove (cmdbuf_base, cmdbuf_ptr, n);	1085	memmove (cmdbuf_base, cmdbuf_ptr, n);
1057	cmdbuf_ptr = cmdbuf_base;	1086	cmdbuf_ptr = cmdbuf_base;
1058	cmdbuf_endp = cmdbuf_ptr + n;	1087	cmdbuf_endp = cmdbuf_ptr + n;
1059		1088
1060	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1089	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1061		1090
1062	if (n > 0)	1091	if (r > 0)
1063	{	1092	{
1064	cmdbuf_endp += n;	1093	cmdbuf_endp += r;
1065	return true;	1094	return true;
1066	}	1095	}
1067	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))
1068	destroy ();	1107	destroy ();
		1108	}
1069		1109
1070	return false;	1110	return false;
1071	}	1111	}
1072		1112
1073	void	1113	void
…		…
1087	}	1127	}
1088		1128
1089	void	1129	void
1090	rxvt_term::pointer_unblank ()	1130	rxvt_term::pointer_unblank ()
1091	{	1131	{
1092	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1132	XDefineCursor (display->display, vt, TermWin_cursor);
1093	recolour_cursor ();	1133	recolour_cursor ();
1094		1134
1095	#ifdef POINTER_BLANK	1135	#ifdef POINTER_BLANK
1096	hidden_pointer = 0;	1136	hidden_pointer = 0;
1097		1137
1098	if (options & Opt_pointerBlank)	1138	if (OPTION (Opt_pointerBlank))
1099	pointer_ev.start (NOW + pointerBlankDelay);	1139	pointer_ev.start (NOW + pointerBlankDelay);
1100	#endif	1140	#endif
1101	}	1141	}
1102		1142
1103	#ifdef POINTER_BLANK	1143	#ifdef POINTER_BLANK
1104	void	1144	void
1105	rxvt_term::pointer_blank ()	1145	rxvt_term::pointer_blank ()
1106	{	1146	{
1107	if (! (options & Opt_pointerBlank))	1147	if (! OPTION (Opt_pointerBlank))
1108	return;	1148	return;
1109		1149
1110	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1150	XDefineCursor (display->display, vt, display->blank_cursor);
1111	XFlush (display->display);	1151	XFlush (display->display);
1112		1152
1113	hidden_pointer = 1;	1153	hidden_pointer = 1;
1114	}	1154	}
1115		1155
…		…
1204		1244
1205	/*{{{ process an X event */	1245	/*{{{ process an X event */
1206	void	1246	void
1207	rxvt_term::x_cb (XEvent &ev)	1247	rxvt_term::x_cb (XEvent &ev)
1208	{	1248	{
		1249	dDisp;
		1250
1209	SET_R (this);	1251	SET_R (this);
1210	SET_LOCALE (locale);	1252	SET_LOCALE (locale);
1211		1253
1212	#if defined(CURSOR_BLINK)	1254	#if defined(CURSOR_BLINK)
1213	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1255	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1214	{	1256	{
1215	if (hidden_cursor)	1257	if (hidden_cursor)
1216	{	1258	{
1217	hidden_cursor = 0;	1259	hidden_cursor = 0;
1218	want_refresh = 1;	1260	want_refresh = 1;
…		…
1221	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1263	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1222	}	1264	}
1223	#endif	1265	#endif
1224		1266
1225	#if defined(POINTER_BLANK)	1267	#if defined(POINTER_BLANK)
1226	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1268	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1227	{	1269	{
1228	if (ev.type == MotionNotify	1270	if (ev.type == MotionNotify
1229	|| ev.type == ButtonPress	1271	|| ev.type == ButtonPress
1230	|| ev.type == ButtonRelease)	1272	|| ev.type == ButtonRelease)
1231	if (hidden_pointer)	1273	if (hidden_pointer)
…		…
1329	button_release (ev.xbutton);	1371	button_release (ev.xbutton);
1330	break;	1372	break;
1331		1373
1332	case ClientMessage:	1374	case ClientMessage:
1333	if (ev.xclient.format == 32	1375	if (ev.xclient.format == 32
		1376	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1377	{
1334	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1378	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335	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
1336	#ifdef OFFIX_DND	1396	#ifdef OFFIX_DND
1337	/* OffiX Dnd (drag 'n' drop) protocol */	1397	/* OffiX Dnd (drag 'n' drop) protocol */
1338	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1398	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339	&& (ev.xclient.data.l[0] == DndFile	1399	&& (ev.xclient.data.l[0] == DndFile
1340	|| ev.xclient.data.l[0] == DndDir	1400	|| ev.xclient.data.l[0] == DndDir
1341	|| ev.xclient.data.l[0] == DndLink))	1401	|| ev.xclient.data.l[0] == DndLink))
1342	{	1402	{
1343	/* Get Dnd data */	1403	/* Get Dnd data */
1344	Atom ActualType;	1404	Atom ActualType;
1345	int ActualFormat;	1405	int ActualFormat;
1346	unsigned char *data;	1406	unsigned char *data;
1347	unsigned long Size, RemainingBytes;	1407	unsigned long Size, RemainingBytes;
1348		1408
1349	XGetWindowProperty (display->display, display->root,	1409	XGetWindowProperty (disp, display->root,
1350	xa[XA_DNDSELECTION],	1410	xa[XA_DNDSELECTION],
1351	0L, 1000000L,	1411	0L, 1000000L,
1352	False, AnyPropertyType,	1412	False, AnyPropertyType,
1353	&ActualType, &ActualFormat,	1413	&ActualType, &ActualFormat,
1354	&Size, &RemainingBytes,	1414	&Size, &RemainingBytes,
1355	&data);	1415	&data);
1356	set_string_property (XA_CUT_BUFFER0, data);	1416	set_string_property (XA_CUT_BUFFER0, data);
1357	XFree (data);	1417	XFree (data);
1358	selection_paste (display->root, XA_CUT_BUFFER0, true);	1418	selection_paste (display->root, XA_CUT_BUFFER0, true);
1359	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1419	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360	}	1420	}
1361	#endif /* OFFIX_DND */	1421	#endif /* OFFIX_DND */
1362	break;	1422	break;
1363		1423
1364	case MappingNotify:	1424	case MappingNotify:
…		…
1389	break;	1449	break;
1390	}	1450	}
1391	break;	1451	break;
1392		1452
1393	case FocusIn:	1453	case FocusIn:
1394	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])
1395	{	1463	{
1396	TermWin.focus = 1;
1397	want_refresh = 1;
1398	#ifdef USE_XIM
1399	if (Input_Context != NULL)
1400	{
1401	IMSetStatusPosition ();
1402	XSetICFocus (Input_Context);
1403	}
1404	#endif
1405	#ifdef CURSOR_BLINK
1406	if (options & Opt_cursorBlink)
1407	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408	#endif
1409	#ifdef OFF_FOCUS_FADING
1410	if (rs[Rs_fade])
1411	{
1412	pix_colors = pix_colors_focused;
1413	scr_recolour ();
1414	}
1415	#endif
1416
1417	}
1418	break;
1419
1420	case FocusOut:
1421	if (TermWin.focus)
1422	{
1423	TermWin.focus = 0;
1424	want_refresh = 1;
1425
1426	#if ENABLE_FRILLS || ISO_14755
1427	iso14755buf = 0;
1428	#endif
1429	#if ENABLE_OVERLAY
1430	scr_overlay_off ();
1431	#endif
1432	#ifdef USE_XIM
1433	if (Input_Context != NULL)
1434	XUnsetICFocus (Input_Context);
1435	#endif
1436	#ifdef CURSOR_BLINK
1437	if (options & Opt_cursorBlink)
1438	cursor_blink_ev.stop ();
1439	hidden_cursor = 0;
1440	#endif
1441	#ifdef OFF_FOCUS_FADING
1442	if (rs[Rs_fade])
1443	{
1444	pix_colors = pix_colors_unfocused;
1445	scr_recolour ();
1446	}
1447	#endif
1448	}
1449	break;
1450
1451	case ConfigureNotify:
1452	if (ev.xconfigure.window == TermWin.parent[0])
1453	{
1454	int height, width;
1455
1456	do
1457	{ /* Wrap lots of configures into one */
1458	width = ev.xconfigure.width;
1459	height = ev.xconfigure.height;
1460	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461	}
1462	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1464	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1465	;
1463		1466
1464	if (szHint.width != width || szHint.height != height)	1467	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465	{	1468	{
1466	seen_resize = 1;	1469	seen_resize = 1;
1467	resize_all_windows (width, height, 1);	1470	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468	}	1471	}
1469		1472
1470	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471	if (options & Opt_transparent)	1474	if (OPTION (Opt_transparent))
1472	check_our_parents ();	1475	check_our_parents ();
1473	#endif	1476	#endif
1474	}	1477	}
1475	break;	1478	break;
1476		1479
…		…
1493	case SelectionRequest:	1496	case SelectionRequest:
1494	selection_send (ev.xselectionrequest);	1497	selection_send (ev.xselectionrequest);
1495	break;	1498	break;
1496		1499
1497	case UnmapNotify:	1500	case UnmapNotify:
1498	TermWin.mapped = 0;	1501	mapped = 0;
1499	#ifdef TEXT_BLINK	1502	#ifdef TEXT_BLINK
1500	text_blink_ev.stop ();	1503	text_blink_ev.stop ();
1501	#endif	1504	#endif
1502	break;	1505	break;
1503		1506
1504	case MapNotify:	1507	case MapNotify:
1505	TermWin.mapped = 1;	1508	mapped = 1;
1506	#ifdef TEXT_BLINK	1509	#ifdef TEXT_BLINK
1507	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1510	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508	#endif	1511	#endif
1509	break;	1512	break;
1510		1513
…		…
1514	break;	1517	break;
1515	#endif /* TRANSPARENT */	1518	#endif /* TRANSPARENT */
1516		1519
1517	case GraphicsExpose:	1520	case GraphicsExpose:
1518	case Expose:	1521	case Expose:
1519	if (ev.xany.window == TermWin.vt)	1522	if (ev.xany.window == vt)
1520	{	1523	{
1521	do	1524	do
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1525	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1526	ev.xexpose.width, ev.xexpose.height, False);
1524	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1527	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525		1528
1526	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1529	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527		1530
1528	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1531	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529	scr_expose (ev.xexpose.x, ev.xexpose.y,	1532	scr_expose (ev.xexpose.x, ev.xexpose.y,
1530	ev.xexpose.width, ev.xexpose.height, False);	1533	ev.xexpose.width, ev.xexpose.height, False);
1531		1534
1532	scr_refresh (refresh_type);	1535	scr_refresh (refresh_type);
1533	}	1536	}
1534	else	1537	else
1535	{	1538	{
1536	XEvent unused_event;	1539	XEvent unused_event;
1537		1540
1538	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1541	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539	;	1542	;
1540	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1543	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541	;	1544	;
1542		1545
1543	if (isScrollbarWindow (ev.xany.window))	1546	if (isScrollbarWindow (ev.xany.window))
1544	{	1547	{
1545	scrollBar.setIdle ();	1548	scrollBar.setIdle ();
…		…
1549	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1552	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550	menubar_expose ();	1553	menubar_expose ();
1551	#endif	1554	#endif
1552		1555
1553	#ifdef TRANSPARENT	1556	#ifdef TRANSPARENT
1554	if (am_transparent && ev.xany.window == TermWin.parent[0])	1557	if (am_transparent && ev.xany.window == parent[0])
1555	XClearWindow (display->display, ev.xany.window);	1558	XClearWindow (disp, ev.xany.window);
1556	#endif	1559	#endif
1557	}	1560	}
1558	break;	1561	break;
1559		1562
1560	case MotionNotify:	1563	case MotionNotify:
…		…
1570	}	1573	}
1571	#endif	1574	#endif
1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1575	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573	break;	1576	break;
1574		1577
1575	if (ev.xany.window == TermWin.vt)	1578	if (ev.xany.window == vt)
1576	{	1579	{
1577	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1580	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578	{	1581	{
1579	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1582	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580	;	1583	;
1581		1584
1582	XQueryPointer (display->display, TermWin.vt,	1585	XQueryPointer (disp, vt,
1583	&unused_root, &unused_child,	1586	&unused_root, &unused_child,
1584	&unused_root_x, &unused_root_y,	1587	&unused_root_x, &unused_root_y,
1585	&ev.xbutton.x, &ev.xbutton.y,	1588	&ev.xbutton.x, &ev.xbutton.y,
1586	&ev.xbutton.state);	1589	&ev.xbutton.state);
1587	#ifdef MOUSE_THRESHOLD	1590	#ifdef MOUSE_THRESHOLD
…		…
1599	#endif	1602	#endif
1600	selection_extend (ev.xbutton.x, ev.xbutton.y,	1603	selection_extend (ev.xbutton.x, ev.xbutton.y,
1601	ev.xbutton.state & Button3Mask ? 2 : 0);	1604	ev.xbutton.state & Button3Mask ? 2 : 0);
1602		1605
1603	#ifdef SELECTION_SCROLLING	1606	#ifdef SELECTION_SCROLLING
1604	if (ev.xbutton.y < TermWin.int_bwidth	1607	if (ev.xbutton.y < int_bwidth
1605	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1608	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1606	{	1609	{
1607	int dist;	1610	int dist;
1608		1611
1609	/* don't clobber the current delay if we are	1612	/* don't clobber the current delay if we are
1610	* already in the middle of scrolling.	1613	* already in the middle of scrolling.
…		…
1618	selection_save_x = ev.xbutton.x;	1621	selection_save_x = ev.xbutton.x;
1619	selection_save_y = ev.xbutton.y;	1622	selection_save_y = ev.xbutton.y;
1620	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1623	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621		1624
1622	/* calc number of lines to scroll */	1625	/* calc number of lines to scroll */
1623	if (ev.xbutton.y < TermWin.int_bwidth)	1626	if (ev.xbutton.y < int_bwidth)
1624	{	1627	{
1625	scroll_selection_dir = UP;	1628	scroll_selection_dir = UP;
1626	dist = TermWin.int_bwidth - ev.xbutton.y;	1629	dist = int_bwidth - ev.xbutton.y;
1627	}	1630	}
1628	else	1631	else
1629	{	1632	{
1630	scroll_selection_dir = DN;	1633	scroll_selection_dir = DN;
1631	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1634	dist = ev.xbutton.y - (int_bwidth + height);
1632	}	1635	}
1633		1636
1634	scroll_selection_lines = Pixel2Height (dist)	1637	scroll_selection_lines = Pixel2Height (dist)
1635	/ SELECTION_SCROLL_LINE_SPEEDUP	1638	/ SELECTION_SCROLL_LINE_SPEEDUP
1636	+ 1;	1639	+ 1;
1637	MIN_IT (scroll_selection_lines,	1640	min_it (scroll_selection_lines,
1638	SELECTION_SCROLL_MAX_LINES);	1641	SELECTION_SCROLL_MAX_LINES);
1639	}	1642	}
1640	else	1643	else
1641	{	1644	{
1642	/* we are within the text window, so we	1645	/* we are within the text window, so we
…		…
1651	#endif	1654	#endif
1652	}	1655	}
1653	}	1656	}
1654	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1657	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655	{	1658	{
1656	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1659	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657	MotionNotify, &ev))	1660	MotionNotify, &ev))
1658	;	1661	;
1659		1662
1660	XQueryPointer (display->display, scrollBar.win,	1663	XQueryPointer (disp, scrollBar.win,
1661	&unused_root, &unused_child,	1664	&unused_root, &unused_child,
1662	&unused_root_x, &unused_root_y,	1665	&unused_root_x, &unused_root_y,
1663	&ev.xbutton.x, &ev.xbutton.y,	1666	&ev.xbutton.x, &ev.xbutton.y,
1664	&unused_mask);	1667	&unused_mask);
1665	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1668	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1670	}	1673	}
1671	break;	1674	break;
1672	}	1675	}
1673	}	1676	}
1674		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
1675	#if TRANSPARENT	1739	#if TRANSPARENT
1676	void	1740	void
1677	rxvt_term::rootwin_cb (XEvent &ev)	1741	rxvt_term::rootwin_cb (XEvent &ev)
1678	{	1742	{
1679	SET_R (this);	1743	SET_R (this);
…		…
1690	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1754	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691	return;	1755	return;
1692		1756
1693	/* FALLTHROUGH */	1757	/* FALLTHROUGH */
1694	case ReparentNotify:	1758	case ReparentNotify:
1695	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1759	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696	want_refresh = want_full_refresh = 1;	1760	want_refresh = want_full_refresh = 1;
1697	break;	1761	break;
1698	}	1762	}
1699	}	1763	}
1700	#endif	1764	#endif
…		…
1709	reportmode = !! (priv_modes & PrivMode_mouse_report);	1773	reportmode = !! (priv_modes & PrivMode_mouse_report);
1710		1774
1711	/*	1775	/*
1712	* VT window processing of button press	1776	* VT window processing of button press
1713	*/	1777	*/
1714	if (ev.window == TermWin.vt)	1778	if (ev.window == vt)
1715	{	1779	{
1716	#if ISO_14755	1780	#if ISO_14755
1717	// 5.4	1781	// 5.4
1718	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1782	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719	{	1783	{
…		…
1767	{	1831	{
1768	case Button1:	1832	case Button1:
1769	/* allow meta + click to select rectangular areas */	1833	/* allow meta + click to select rectangular areas */
1770	/* should be done in screen.C */	1834	/* should be done in screen.C */
1771	#if ENABLE_FRILLS	1835	#if ENABLE_FRILLS
1772	selection.rect = !! (ev.state & ModMetaMask);	1836	selection.rect = !!(ev.state & ModMetaMask);
1773	#else	1837	#else
1774	selection.rect = false;	1838	selection.rect = false;
1775	#endif	1839	#endif
1776		1840
1777	/* allow shift+left click to extend selection */	1841	/* allow shift+left click to extend selection */
…		…
1924	case Button3:	1988	case Button3:
1925	if (scrollBar.style != R_SB_XTERM)	1989	if (scrollBar.style != R_SB_XTERM)
1926	{	1990	{
1927	if (scrollbar_above_slider (ev.y))	1991	if (scrollbar_above_slider (ev.y))
1928	# ifdef RXVT_SCROLL_FULL	1992	# ifdef RXVT_SCROLL_FULL
1929	scr_page (UP, TermWin.nrow - 1);	1993	scr_page (UP, nrow - 1);
1930	# else	1994	# else
1931	scr_page (UP, TermWin.nrow / 4);	1995	scr_page (UP, nrow / 4);
1932	# endif	1996	# endif
1933	else if (scrollbar_below_slider (ev.y))	1997	else if (scrollbar_below_slider (ev.y))
1934	# ifdef RXVT_SCROLL_FULL	1998	# ifdef RXVT_SCROLL_FULL
1935	scr_page (DN, TermWin.nrow - 1);	1999	scr_page (DN, nrow - 1);
1936	# else	2000	# else
1937	scr_page (DN, TermWin.nrow / 4);	2001	scr_page (DN, nrow / 4);
1938	# endif	2002	# endif
1939	else	2003	else
1940	scrollBar.setMotion ();	2004	scrollBar.setMotion ();
1941	}	2005	}
1942	else	2006	else
1943	{	2007	{
1944	scr_page ((ev.button == Button1 ? DN : UP),	2008	scr_page ((ev.button == Button1 ? DN : UP),
1945	(TermWin.nrow	2009	(nrow
1946	* scrollbar_position (ev.y)	2010	* scrollbar_position (ev.y)
1947	/ scrollbar_size ()));	2011	/ scrollbar_size ()));
1948	}	2012	}
1949		2013
1950	break;	2014	break;
…		…
1982	#ifdef SELECTION_SCROLLING	2046	#ifdef SELECTION_SCROLLING
1983	if (sel_scroll_ev.active)	2047	if (sel_scroll_ev.active)
1984	sel_scroll_ev.stop();	2048	sel_scroll_ev.stop();
1985	#endif	2049	#endif
1986		2050
1987	if (ev.window == TermWin.vt)	2051	if (ev.window == vt)
1988	{	2052	{
1989	#if ISO_14755	2053	#if ISO_14755
1990	// 5.4	2054	// 5.4
1991	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2055	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992	return;	2056	return;
…		…
2042		2106
2043	v = ev.button == Button4 ? UP : DN;	2107	v = ev.button == Button4 ? UP : DN;
2044		2108
2045	if (ev.state & ShiftMask)	2109	if (ev.state & ShiftMask)
2046	i = 1;	2110	i = 1;
2047	else if (options & Opt_mouseWheelScrollPage)	2111	else if (OPTION (Opt_mouseWheelScrollPage))
2048	i = TermWin.nrow - 1;	2112	i = nrow - 1;
2049	else	2113	else
2050	i = 5;	2114	i = 5;
2051		2115
2052	# ifdef MOUSE_SLIP_WHEELING	2116	# ifdef MOUSE_SLIP_WHEELING
2053	if (ev.state & ControlMask)	2117	if (ev.state & ControlMask)
2054	{	2118	{
2055	mouse_slip_wheel_speed += v ? -1 : 1;	2119	mouse_slip_wheel_speed += v ? -1 : 1;
2056	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;
2057	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;
2058		2122
2059	if (slip_wheel_ev.at < NOW)	2123	if (slip_wheel_ev.at < NOW)
2060	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2124	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061		2125
2062	slip_wheel_ev.start ();	2126	slip_wheel_ev.start ();
…		…
2103	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2167	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2168	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2169	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106	int i;	2170	int i;
2107		2171
2108	Visual* visual = display->visual;	2172	Visual *visual = display->visual;
2109		2173
2110	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2174	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111		2175
2112	/* for convenience */	2176	/* for convenience */
2113	mask_r = visual->red_mask;	2177	mask_r = visual->red_mask;
…		…
2334	Atom atype;	2398	Atom atype;
2335	unsigned char *prop = NULL;	2399	unsigned char *prop = NULL;
2336	Window root, oldp, *list;	2400	Window root, oldp, *list;
2337	Pixmap rootpixmap = None;	2401	Pixmap rootpixmap = None;
2338	XWindowAttributes wattr, wrootattr;	2402	XWindowAttributes wattr, wrootattr;
		2403	dDisp;
2339		2404
2340	pchanged = 0;	2405	pchanged = 0;
2341		2406
2342	if (!(options & Opt_transparent))	2407	if (!OPTION (Opt_transparent))
2343	return pchanged; /* Don't try any more */	2408	return pchanged; /* Don't try any more */
2344		2409
2345	XGetWindowAttributes (display->display, display->root, &wrootattr);	2410	XGetWindowAttributes (disp, display->root, &wrootattr);
2346	rootdepth = wrootattr.depth;	2411	rootdepth = wrootattr.depth;
2347		2412
2348	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2413	XGetWindowAttributes (disp, parent[0], &wattr);
2349		2414
2350	if (rootdepth != wattr.depth)	2415	if (rootdepth != wattr.depth)
2351	{	2416	{
2352	if (am_transparent)	2417	if (am_transparent)
2353	{	2418	{
2354	pchanged = 1;	2419	pchanged = 1;
2355	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2420	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356	am_transparent = am_pixmap_trans = 0;	2421	am_transparent = am_pixmap_trans = 0;
2357	}	2422	}
2358		2423
2359	return pchanged; /* Don't try any more */	2424	return pchanged; /* Don't try any more */
2360	}	2425	}
2361		2426
2362	/* 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. */
2363	XSync (display->display, False);	2428	XSync (disp, False);
2364		2429
2365	/*	2430	/*
2366	* Make the frame window set by the window manager have	2431	* Make the frame window set by the window manager have
2367	* the root background. Some window managers put multiple nested frame	2432	* the root background. Some window managers put multiple nested frame
2368	* 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.
2369	*/	2434	*/
2370	i = (xa[XA_XROOTPMAP_ID]	2435	i = (xa[XA_XROOTPMAP_ID]
2371	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2436	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2437	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373	&nitems, &bytes_after, &prop) == Success);	2438	&nitems, &bytes_after, &prop) == Success);
2374		2439
2375	if (!i || prop == NULL)	2440	if (!i || prop == NULL)
2376	i = (xa[XA_ESETROOT_PMAP_ID]	2441	i = (xa[XA_ESETROOT_PMAP_ID]
2377	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2442	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2443	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379	&nitems, &bytes_after, &prop) == Success);	2444	&nitems, &bytes_after, &prop) == Success);
2380		2445
2381	if (!i || prop == NULL	2446	if (!i || prop == NULL
2382	#if TINTING	2447	#if TINTING
…		…
2401	Window cr;	2466	Window cr;
2402	XImage *image;	2467	XImage *image;
2403	GC gc;	2468	GC gc;
2404	XGCValues gcvalue;	2469	XGCValues gcvalue;
2405		2470
2406	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2471	XTranslateCoordinates (disp, parent[0], display->root,
2407	0, 0, &sx, &sy, &cr);	2472	0, 0, &sx, &sy, &cr);
2408	nw = (unsigned int)szHint.width;	2473	nw = (unsigned int)szHint.width;
2409	nh = (unsigned int)szHint.height;	2474	nh = (unsigned int)szHint.height;
2410	nx = ny = 0;	2475	nx = ny = 0;
2411		2476
…		…
2421	nh += sy;	2486	nh += sy;
2422	ny = -sy;	2487	ny = -sy;
2423	sy = 0;	2488	sy = 0;
2424	}	2489	}
2425		2490
2426	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2491	min_it (nw, (unsigned int) (wrootattr.width - sx));
2427	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2492	min_it (nh, (unsigned int) (wrootattr.height - sy));
2428		2493
2429	XSync (display->display, False);	2494	XSync (disp, False);
2430	allowedxerror = -1;	2495	allowedxerror = -1;
2431	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2496	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432		2497
2433	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2498	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2434	/* XXX: may need a delay here? */	2499	/* XXX: may need a delay here? */
2435	allowedxerror = 0;	2500	allowedxerror = 0;
2436		2501
2437	if (image == NULL)	2502	if (image == NULL)
2438	{	2503	{
2439	if (am_transparent && am_pixmap_trans)	2504	if (am_transparent && am_pixmap_trans)
2440	{	2505	{
2441	pchanged = 1;	2506	pchanged = 1;
2442	if (TermWin.pixmap != None)	2507	if (pixmap != None)
2443	{	2508	{
2444	XFreePixmap (display->display, TermWin.pixmap);	2509	XFreePixmap (disp, pixmap);
2445	TermWin.pixmap = None;	2510	pixmap = None;
2446	}	2511	}
2447	}	2512	}
2448		2513
2449	am_pixmap_trans = 0;	2514	am_pixmap_trans = 0;
2450	}	2515	}
2451	else	2516	else
2452	{	2517	{
2453	if (TermWin.pixmap != None)	2518	if (pixmap != None)
2454	XFreePixmap (display->display, TermWin.pixmap);	2519	XFreePixmap (disp, pixmap);
2455		2520
2456	#if TINTING	2521	#if TINTING
2457	if (ISSET_PIXCOLOR (Color_tint))	2522	if (ISSET_PIXCOLOR (Color_tint))
2458	{	2523	{
2459	unsigned short rm, gm, bm;	2524	unsigned short rm, gm, bm;
…		…
2463		2528
2464	ShadeXImage (display, image, shade, rm, gm, bm);	2529	ShadeXImage (display, image, shade, rm, gm, bm);
2465	}	2530	}
2466	#endif	2531	#endif
2467		2532
2468	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2533	pixmap = XCreatePixmap (disp, vt,
2469	szHint.width, szHint.height, image->depth);	2534	szHint.width, szHint.height, image->depth);
2470	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2535	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2536	XPutImage (disp, pixmap, gc, image, 0, 0,
2472	nx, ny, image->width, image->height);	2537	nx, ny, image->width, image->height);
2473	XFreeGC (display->display, gc);	2538	XFreeGC (disp, gc);
2474	XDestroyImage (image);	2539	XDestroyImage (image);
2475	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2540	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476	XClearWindow (display->display, TermWin.parent[0]);	2541	XClearWindow (disp, parent[0]);
2477		2542
2478	if (!am_transparent || !am_pixmap_trans)	2543	if (!am_transparent || !am_pixmap_trans)
2479	pchanged = 1;	2544	pchanged = 1;
2480		2545
2481	am_transparent = am_pixmap_trans = 1;	2546	am_transparent = am_pixmap_trans = 1;
2482	}	2547	}
2483	}	2548	}
2484		2549
2485	if (am_pixmap_trans)	2550	if (am_pixmap_trans)
2486	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2551	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487	else	2552	else
2488	{	2553	{
2489	unsigned int n;	2554	unsigned int n;
2490	/*	2555	/*
2491	* InheritPixmap transparency	2556	* InheritPixmap transparency
2492	*/	2557	*/
2493	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2558	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494	{	2559	{
2495	oldp = TermWin.parent[i];	2560	oldp = parent[i];
2496	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2561	XQueryTree (disp, parent[i - 1], &root,
2497	&TermWin.parent[i], &list, &n);	2562	&parent[i], &list, &n);
2498	XFree (list);	2563	XFree (list);
2499		2564
2500	if (TermWin.parent[i] == display->root)	2565	if (parent[i] == display->root)
2501	{	2566	{
2502	if (oldp != None)	2567	if (oldp != None)
2503	pchanged = 1;	2568	pchanged = 1;
2504		2569
2505	break;	2570	break;
2506	}	2571	}
2507		2572
2508	if (oldp != TermWin.parent[i])	2573	if (oldp != parent[i])
2509	pchanged = 1;	2574	pchanged = 1;
2510	}	2575	}
2511		2576
2512	n = 0;	2577	n = 0;
2513		2578
2514	if (pchanged)	2579	if (pchanged)
2515	{	2580	{
2516	for (; n < (unsigned int)i; n++)	2581	for (; n < (unsigned int)i; n++)
2517	{	2582	{
2518	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2583	XGetWindowAttributes (disp, parent[n], &wattr);
2519	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2584	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520	{	2585	{
2521	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2586	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522	break;	2587	break;
2523	}	2588	}
2524	}	2589	}
2525	}	2590	}
2526		2591
2527	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2592	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528	{	2593	{
2529	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2594	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2595	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531	am_transparent = 0;	2596	am_transparent = 0;
2532	/* XXX: also turn off Opt_transparent? */	2597	/* XXX: also turn off Opt_transparent? */
2533	}	2598	}
2534	else	2599	else
2535	{	2600	{
…		…
2538	* needed for fvwm2.2.2 (and before?) */	2603	* needed for fvwm2.2.2 (and before?) */
2539	sleep (1);	2604	sleep (1);
2540	#endif	2605	#endif
2541	for (n = 0; n < (unsigned int)i; n++)	2606	for (n = 0; n < (unsigned int)i; n++)
2542	{	2607	{
2543	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2608	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544	XClearWindow (display->display, TermWin.parent[n]);	2609	XClearWindow (disp, parent[n]);
2545	}	2610	}
2546		2611
2547	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2612	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548	am_transparent = 1;	2613	am_transparent = 1;
2549	}	2614	}
2550		2615
2551	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2616	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552	TermWin.parent[i] = None;	2617	parent[i] = None;
2553	}	2618	}
2554		2619
2555	if (scrollBar.win)	2620	if (scrollBar.win)
2556	{	2621	{
2557	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2622	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558	scrollBar.setIdle ();	2623	scrollBar.setIdle ();
2559	scrollbar_show (0);	2624	scrollbar_show (0);
2560	}	2625	}
2561		2626
2562	if (am_transparent)	2627	if (am_transparent)
…		…
2600	// some window managers resize the window early, and these programs	2665	// some window managers resize the window early, and these programs
2601	// then sometimes get the size wrong.	2666	// then sometimes get the size wrong.
2602	// unfortunately other programs are even more buggy and dislike	2667	// unfortunately other programs are even more buggy and dislike
2603	// 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
2604	// resized.	2669	// resized.
2605	if (seen_resize)	2670	if (seen_resize && cmd_pid)
2606	kill (-cmd_pid, SIGWINCH);	2671	kill (-cmd_pid, SIGWINCH);
2607	}	2672	}
2608		2673
2609	/* Read a text string from the input buffer */	2674	/* Read a text string from the input buffer */
2610	unicode_t buf[UBUFSIZ];	2675	unicode_t buf[UBUFSIZ];
2611	bool refreshnow = false;	2676	bool refreshnow = false;
2612	int nlines = 0;	2677	int nlines = 0;
2613	unicode_t *str = buf;	2678	unicode_t *str = buf;
		2679	unicode_t *eol = str + min (ncol, UBUFSIZ);
2614		2680
2615	for (;;)	2681	for (;;)
2616	{	2682	{
2617	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))
2618	break;	2684	break;
2619		2685
2620	*str++ = ch;	2686	*str++ = ch;
2621		2687
2622	if (ch == C0_LF)	2688	if (ch == C0_LF || str >= eol)
2623	{	2689	{
		2690	if (ch == C0_LF)
2624	nlines++;	2691	nlines++;
		2692
2625	refresh_count++;	2693	refresh_count++;
2626		2694
2627	if (!(options & Opt_jumpScroll)	2695	if (!OPTION (Opt_jumpScroll)
2628	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2696	|| (refresh_count >= refresh_limit * (nrow - 1)))
2629	{	2697	{
2630	refreshnow = true;	2698	refreshnow = true;
		2699	refresh_count = 0;
2631	ch = NOCHAR;	2700	ch = NOCHAR;
2632	break;	2701	break;
2633	}	2702	}
2634		2703
2635	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2704	// scr_add_lines only works for nlines <= nrow - 1.
2636	if (nlines >= TermWin.nrow - 1)	2705	if (nlines >= nrow - 1)
2637	{	2706	{
2638	scr_add_lines (buf, nlines, str - buf);	2707	scr_add_lines (buf, nlines, str - buf);
2639	nlines = 0;	2708	nlines = 0;
2640	str = buf;	2709	str = buf;
		2710	eol = str + min (ncol, UBUFSIZ);
2641	}	2711	}
2642	}
2643		2712
2644	if (str >= buf + UBUFSIZ)	2713	if (str >= eol)
2645	{	2714	{
		2715	if (eol >= buf + UBUFSIZ)
		2716	{
2646	ch = NOCHAR;	2717	ch = NOCHAR;
2647	break;	2718	break;
		2719	}
		2720	else
		2721	eol = min (eol + ncol, buf + UBUFSIZ);
		2722	}
		2723
2648	}	2724	}
2649		2725
2650	seq_begin = cmdbuf_ptr;	2726	seq_begin = cmdbuf_ptr;
2651	ch = next_char ();	2727	ch = next_char ();
2652	}	2728	}
…		…
2659	* the number of pages between refreshes is refresh_limit, which	2735	* the number of pages between refreshes is refresh_limit, which
2660	* is incremented here because we must be doing flat-out scrolling.	2736	* is incremented here because we must be doing flat-out scrolling.
2661	*/	2737	*/
2662	if (refreshnow)	2738	if (refreshnow)
2663	{	2739	{
2664	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2740	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665	refresh_limit++;	2741	refresh_limit++;
2666	else	2742	else
2667	{	2743	{
2668	flag = true;	2744	flag = true;
2669	scr_refresh (refresh_type);	2745	scr_refresh (refresh_type);
		2746	flush_ev.stop ();
2670	}	2747	}
2671	}	2748	}
2672		2749
2673	}	2750	}
2674	else	2751	else
…		…
3196	{	3273	{
3197	switch (priv)	3274	switch (priv)
3198	{	3275	{
3199	case '>':	3276	case '>':
3200	if (ch == CSI_DA) /* secondary device attributes */	3277	if (ch == CSI_DA) /* secondary device attributes */
3201	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3278	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202	break;	3279	break;
3203	case '?':	3280	case '?':
3204	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3281	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205	process_terminal_mode (ch, priv, nargs, arg);	3282	process_terminal_mode (ch, priv, nargs, arg);
3206	break;	3283	break;
…		…
3311		3388
3312	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3389	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313	arg[0] = -arg[0];	3390	arg[0] = -arg[0];
3314	/* FALLTHROUGH */	3391	/* FALLTHROUGH */
3315	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3392	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3393	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317	break;	3394	break;
3318		3395
3319	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3396	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320	tt_write ((const unsigned char *)VT100_ANS,	3397	tt_write ((const unsigned char *)VT100_ANS,
3321	(unsigned int) (sizeof (VT100_ANS) - 1));	3398	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3333	break;	3410	break;
3334	case 6: /* CPR requested */	3411	case 6: /* CPR requested */
3335	scr_report_position ();	3412	scr_report_position ();
3336	break;	3413	break;
3337	case 7: /* unofficial extension */	3414	case 7: /* unofficial extension */
3338	if (options & Opt_insecure)	3415	if (OPTION (Opt_insecure))
3339	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3416	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340	break;	3417	break;
3341	case 8: /* unofficial extension */	3418	case 8: /* unofficial extension */
3342	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3419	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343	break;	3420	break;
…		…
3435	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3512	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436	{	3513	{
3437	int x, y;	3514	int x, y;
3438	XWindowAttributes wattr;	3515	XWindowAttributes wattr;
3439	Window wdummy;	3516	Window wdummy;
		3517	dDisp;
3440		3518
3441	if (nargs == 0)	3519	if (nargs == 0)
3442	return;	3520	return;
3443		3521
3444	switch (args[0])	3522	switch (args[0])
3445	{	3523	{
3446	/*	3524	/*
3447	* commands	3525	* commands
3448	*/	3526	*/
3449	case 1: /* deiconify window */	3527	case 1: /* deiconify window */
3450	XMapWindow (display->display, TermWin.parent[0]);	3528	XMapWindow (disp, parent[0]);
3451	break;	3529	break;
3452	case 2: /* iconify window */	3530	case 2: /* iconify window */
3453	XIconifyWindow (display->display, TermWin.parent[0],	3531	XIconifyWindow (disp, parent[0], display->screen);
3454	DefaultScreen (display->display));
3455	break;	3532	break;
3456	case 3: /* set position (pixels) */	3533	case 3: /* set position (pixels) */
3457	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3534	XMoveWindow (disp, parent[0], args[1], args[2]);
3458	break;	3535	break;
3459	case 4: /* set size (pixels) */	3536	case 4: /* set size (pixels) */
3460	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3537	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461	break;	3538	break;
3462	case 5: /* raise window */	3539	case 5: /* raise window */
3463	XRaiseWindow (display->display, TermWin.parent[0]);	3540	XRaiseWindow (disp, parent[0]);
3464	break;	3541	break;
3465	case 6: /* lower window */	3542	case 6: /* lower window */
3466	XLowerWindow (display->display, TermWin.parent[0]);	3543	XLowerWindow (disp, parent[0]);
3467	break;	3544	break;
3468	case 7: /* refresh window */	3545	case 7: /* refresh window */
3469	scr_touch (true);	3546	scr_touch (true);
3470	break;	3547	break;
3471	case 8: /* set size (chars) */	3548	case 8: /* set size (chars) */
3472	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3549	set_widthheight ((unsigned int) (args[2] * fwidth),
3473	(unsigned int) (args[1] * TermWin.fheight));	3550	(unsigned int) (args[1] * fheight));
3474	break;	3551	break;
3475		3552
3476	//case 9: NYI, TODO, restore maximized window or maximize window	3553	//case 9: NYI, TODO, restore maximized window or maximize window
3477	default:	3554	default:
3478	if (args[0] >= 24) /* set height (chars) */	3555	if (args[0] >= 24) /* set height (chars) */
3479	set_widthheight ((unsigned int)TermWin.width,	3556	set_widthheight ((unsigned int)width,
3480	(unsigned int) (args[1] * TermWin.fheight));	3557	(unsigned int) (args[1] * fheight));
3481	break;	3558	break;
3482		3559
3483		3560
3484	/*	3561	/*
3485	* reports - some output format copied from XTerm	3562	* reports - some output format copied from XTerm
3486	*/	3563	*/
3487	case 11: /* report window state */	3564	case 11: /* report window state */
3488	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3565	XGetWindowAttributes (disp, parent[0], &wattr);
3489	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3566	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490	break;	3567	break;
3491	case 13: /* report window position */	3568	case 13: /* report window position */
3492	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3569	XGetWindowAttributes (disp, parent[0], &wattr);
3493	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3570	XTranslateCoordinates (disp, parent[0], wattr.root,
3494	-wattr.border_width, -wattr.border_width,	3571	-wattr.border_width, -wattr.border_width,
3495	&x, &y, &wdummy);	3572	&x, &y, &wdummy);
3496	tt_printf ("\033[3;%d;%dt", x, y);	3573	tt_printf ("\033[3;%d;%dt", x, y);
3497	break;	3574	break;
3498	case 14: /* report window size (pixels) */	3575	case 14: /* report window size (pixels) */
3499	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3576	XGetWindowAttributes (disp, parent[0], &wattr);
3500	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3577	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501	break;	3578	break;
3502	case 18: /* report text area size (chars) */	3579	case 18: /* report text area size (chars) */
3503	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3580	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504	break;	3581	break;
3505	case 19: /* report window size (chars) */	3582	case 19: /* report window size (chars) */
3506	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3583	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507	break;	3584	break;
3508	case 20: /* report icon label */	3585	case 20: /* report icon label */
3509	{	3586	{
3510	char *s;	3587	char *s;
3511	XGetIconName (display->display, TermWin.parent[0], &s);	3588	XGetIconName (disp, parent[0], &s);
3512	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3589	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513	XFree (s);	3590	XFree (s);
3514	}	3591	}
3515	break;	3592	break;
3516	case 21: /* report window title */	3593	case 21: /* report window title */
3517	{	3594	{
3518	char *s;	3595	char *s;
3519	XFetchName (display->display, TermWin.parent[0], &s);	3596	XFetchName (disp, parent[0], &s);
3520	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3597	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521	XFree (s);	3598	XFree (s);
3522	}	3599	}
3523	break;	3600	break;
3524	}	3601	}
3525	}	3602	}
…		…
3557	else if (ch < 0x20)	3634	else if (ch < 0x20)
3558	return NULL; /* other control character - exit */	3635	return NULL; /* other control character - exit */
3559		3636
3560	seen_esc = false;	3637	seen_esc = false;
3561		3638
3562	if (n >= sizeof (string) - 1)	3639	if (n >= STRING_MAX - 1)
3563	// stop at some sane length	3640	// stop at some sane length
3564	return NULL;	3641	return NULL;
3565		3642
3566	if (ch == C0_SYN)	3643	if (ch == C0_SYN)
3567	string[n++] = cmd_get8 ();	3644	string[n++] = cmd_get8 ();
…		…
3635	set_window_color (color, str);	3712	set_window_color (color, str);
3636	}	3713	}
3637		3714
3638	/*	3715	/*
3639	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3716	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640	* 0 = change iconName/title
3641	* 1 = change iconName
3642	* 2 = change title
3643	* 4 = change color
3644	* 10 = change fg color
3645	* 11 = change bg color
3646	* 12 = change text color
3647	* 13 = change mouse foreground color
3648	* 17 = change highlight character colour
3649	* 18 = change bold character color
3650	* 19 = change underlined character color
3651	* 46 = change logfile (not implemented)
3652	* 50 = change font
3653	*
3654	* rxvt extensions:
3655	* 20 = bg pixmap
3656	* 39 = change default fg color
3657	* 49 = change default bg color
3658	* 55 = dump scrollback buffer and all of screen
3659	* 701 = change locale
3660	* 702 = find font
3661	* 703 = menu
3662	*/	3717	*/
3663	void	3718	void
3664	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3719	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3665	{	3720	{
3666	int changed = 0;	3721	int changed = 0;
3667	int color;	3722	int color;
3668	char *buf, *name;	3723	char *buf, *name;
3669	bool query = str[0] == '?' && !str[1];	3724	bool query = str[0] == '?' && !str[1];
3670	int saveop = op;	3725	int saveop = op;
		3726	dDisp;
3671		3727
3672	assert (str != NULL);	3728	assert (str != NULL);
3673	switch (op)	3729	switch (op)
3674	{	3730	{
3675	case XTerm_name:	3731	case XTerm_name:
…		…
3691	unsigned long bytes_after;	3747	unsigned long bytes_after;
3692	unsigned char *value = 0;	3748	unsigned char *value = 0;
3693	const char *str = "";	3749	const char *str = "";
3694		3750
3695	if (prop	3751	if (prop
3696	&& XGetWindowProperty (display->display, TermWin.parent[0],	3752	&& XGetWindowProperty (disp, parent[0],
3697	prop, 0, 1<<16, 0, AnyPropertyType,	3753	prop, 0, 1<<16, 0, AnyPropertyType,
3698	&actual_type, &actual_format,	3754	&actual_type, &actual_format,
3699	&nitems, &bytes_after, &value) == Success	3755	&nitems, &bytes_after, &value) == Success
3700	&& actual_type != None	3756	&& actual_type != None
3701	&& actual_format == 8)	3757	&& actual_format == 8)
…		…
3713	{	3769	{
3714	*eq = 0;	3770	*eq = 0;
3715	set_utf8_property (display->atom (str), eq + 1);	3771	set_utf8_property (display->atom (str), eq + 1);
3716	}	3772	}
3717	else	3773	else
3718	XDeleteProperty (display->display, TermWin.parent[0],	3774	XDeleteProperty (disp, parent[0],
3719	display->atom (str));	3775	display->atom (str));
3720	}	3776	}
3721	break;	3777	break;
3722		3778
3723	case XTerm_Color:	3779	case XTerm_Color:
…		…
3764	break;	3820	break;
3765	#ifndef NO_BOLD_UNDERLINE_REVERSE	3821	#ifndef NO_BOLD_UNDERLINE_REVERSE
3766	case XTerm_Color_BD:	3822	case XTerm_Color_BD:
3767	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3823	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768	break;	3824	break;
3769	case XTerm_Color_IT:
3770	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771	break;
3772	case XTerm_Color_UL:	3825	case XTerm_Color_UL:
3773	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3826	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774	break;	3827	break;
3775	case XTerm_Color_RV:	3828	case XTerm_Color_RV:
3776	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3829	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777	break;	3830	break;
		3831	case URxvt_Color_IT:
		3832	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3833	break;
3778	#endif	3834	#endif
3779	#if TRANSPARENT && TINTING	3835	#if TRANSPARENT && TINTING
3780	case XTerm_Color_tint:	3836	case URxvt_Color_tint:
3781	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3837	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782	check_our_parents ();	3838	check_our_parents ();
3783	if (am_transparent)	3839	if (am_transparent)
3784	want_full_refresh = want_refresh = 1;	3840	want_full_refresh = want_refresh = 1;
3785	break;	3841	break;
3786	#endif	3842	#endif
…		…
3798	{	3854	{
3799	str++;	3855	str++;
3800	#if XPM_BACKGROUND	3856	#if XPM_BACKGROUND
3801	changed += scale_pixmap (str);	3857	changed += scale_pixmap (str);
3802	#endif	3858	#endif
3803
3804	}	3859	}
		3860
3805	if (changed)	3861	if (changed)
3806	{	3862	{
3807	#ifdef XPM_BACKGROUND	3863	#ifdef XPM_BACKGROUND
3808	resize_pixmap ();	3864	resize_pixmap ();
3809	#endif	3865	#endif
…		…
3820		3876
3821	case XTerm_logfile:	3877	case XTerm_logfile:
3822	// TODO, when secure mode?	3878	// TODO, when secure mode?
3823	break;	3879	break;
3824		3880
		3881	#ifdef MENUBAR
		3882	case URxvt_Menu:
		3883	if (OPTION (Opt_insecure))
		3884	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3885	break;
		3886	#endif
		3887	#if 0
		3888	case XTerm_dumpscreen: /* no error notices */
		3889	{
		3890	int fd;
		3891	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3892	{
		3893	scr_dump (fd);
		3894	close (fd);
		3895	}
		3896	}
		3897	break;
		3898	#endif
3825	case XTerm_font:	3899	case XTerm_font:
3826	op = URxvt_font;	3900	op = URxvt_font;
3827	case URxvt_font:	3901	case URxvt_font:
3828	#if ENABLE_STYLES	3902	#if ENABLE_STYLES
3829	case URxvt_boldFont:	3903	case URxvt_boldFont:
3830	case URxvt_italicFont:	3904	case URxvt_italicFont:
3831	case URxvt_boldItalicFont:	3905	case URxvt_boldItalicFont:
3832	#endif	3906	#endif
3833	if (query)	3907	if (query)
3834	tt_printf ("\33]%d;%-.250s%c", saveop,	3908	tt_printf ("\33]%d;%-.250s%c", saveop,
3835	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3909	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3910	? fontset[op - URxvt_font]->fontdesc : "",
3837	resp);	3911	resp);
3838	else	3912	else
3839	{	3913	{
3840	const char *&res = rs[Rs_font + (op - URxvt_font)];	3914	const char *&res = rs[Rs_font + (op - URxvt_font)];
3841		3915
…		…
3844	set_fonts ();	3918	set_fonts ();
3845	}	3919	}
3846	break;	3920	break;
3847		3921
3848	#if ENABLE_FRILLS	3922	#if ENABLE_FRILLS
3849	case XTerm_locale:	3923	case URxvt_locale:
3850	if (query)	3924	if (query)
3851	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3925	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3852	else	3926	else
3853	{	3927	{
3854	set_locale (str);	3928	set_locale (str);
3855	# ifdef USE_XIM	3929	pty.set_utf8_mode (enc_utf8);
3856	im_cb ();	3930	init_xlocale ();
3857	# endif
3858	}	3931	}
3859	break;	3932	break;
3860	#endif
3861		3933
3862	#ifdef MENUBAR	3934	case URxvt_view_up:
3863	case XTerm_Menu:	3935	case URxvt_view_down:
3864	if (options & Opt_insecure)	3936	int lines = atoi (str);
3865	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3937
3866	break;	3938	if (lines)
3867	#endif	3939	scr_page (op == URxvt_view_up ? UP : DN, lines);
3868	#if 0
3869	case XTerm_dumpscreen: /* no error notices */
3870	{	3940	else
3871	int fd;
3872	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3873	{	3941	{
3874	scr_dump (fd);	3942	scr_erase_savelines ();
3875	close (fd);
3876	}	3943	}
3877	}	3944
3878	break;	3945	break;
3879	#endif	3946	#endif
3880	}	3947	}
3881	}	3948	}
3882	/*----------------------------------------------------------------------*/	3949	/*----------------------------------------------------------------------*/
…		…
3991	}	4058	}
3992		4059
3993	/* extra handling for values with state unkept */	4060	/* extra handling for values with state unkept */
3994	switch (arg[i])	4061	switch (arg[i])
3995	{	4062	{
		4063	#if ENABLE_STYLES
		4064	case 1021:
		4065	if (mode)
		4066	SET_OPTION (Opt_intensityStyles);
		4067	else
		4068	CLR_OPTION (Opt_intensityStyles);
		4069
		4070	scr_touch (true);
		4071	break;
		4072	#endif
3996	case 1048: /* alternative cursor save */	4073	case 1048: /* alternative cursor save */
3997	case 1049:	4074	case 1049:
3998	if (options & Opt_secondaryScreen)	4075	if (OPTION (Opt_secondaryScreen))
3999	if (mode == 0)	4076	if (mode == 0)
4000	scr_cursor (RESTORE);	4077	scr_cursor (RESTORE);
4001	else if (mode == 1)	4078	else if (mode == 1)
4002	scr_cursor (SAVE);	4079	scr_cursor (SAVE);
4003	break;	4080	break;
…		…
4015	*/	4092	*/
4016	PrivMode (1, PrivMode_vt52);	4093	PrivMode (1, PrivMode_vt52);
4017	break;	4094	break;
4018	case 3: /* 80/132 */	4095	case 3: /* 80/132 */
4019	if (priv_modes & PrivMode_132OK)	4096	if (priv_modes & PrivMode_132OK)
4020	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4097	set_widthheight (((state ? 132 : 80) * fwidth), height);
4021	break;	4098	break;
4022	case 4: /* smooth scrolling */	4099	case 4: /* smooth scrolling */
4023	if (state)	4100	if (!state)
4024	options &= ~Opt_jumpScroll;	4101	SET_OPTION (Opt_jumpScroll);
4025	else	4102	else
4026	options |= Opt_jumpScroll;	4103	CLR_OPTION (Opt_jumpScroll);
4027	break;	4104	break;
4028	case 5: /* reverse video */	4105	case 5: /* reverse video */
4029	scr_rvideo_mode (state);	4106	scr_rvideo_mode (state);
4030	break;	4107	break;
4031	case 6: /* relative/absolute origins */	4108	case 6: /* relative/absolute origins */
…		…
4072	#if 0	4149	#if 0
4073	case 1001:	4150	case 1001:
4074	break; /* X11 mouse highlighting */	4151	break; /* X11 mouse highlighting */
4075	#endif	4152	#endif
4076	case 1010: /* scroll to bottom on TTY output inhibit */	4153	case 1010: /* scroll to bottom on TTY output inhibit */
4077	if (state)	4154	if (!state)
4078	options &= ~Opt_scrollTtyOutput;	4155	SET_OPTION (Opt_scrollTtyOutput);
4079	else	4156	else
4080	options |= Opt_scrollTtyOutput;	4157	CLR_OPTION (Opt_scrollTtyOutput);
4081	break;	4158	break;
4082	case 1011: /* scroll to bottom on key press */	4159	case 1011: /* scroll to bottom on key press */
4083	if (state)	4160	if (state)
4084	options |= Opt_scrollTtyKeypress;	4161	SET_OPTION (Opt_scrollTtyKeypress);
4085	else	4162	else
4086	options &= ~Opt_scrollTtyKeypress;	4163	CLR_OPTION (Opt_scrollTtyKeypress);
4087	break;	4164	break;
4088	case 1047: /* secondary screen w/ clearing last */	4165	case 1047: /* secondary screen w/ clearing last */
4089	if (options & Opt_secondaryScreen)	4166	if (OPTION (Opt_secondaryScreen))
4090	if (current_screen != PRIMARY)	4167	if (current_screen != PRIMARY)
4091	scr_erase_screen (2);	4168	scr_erase_screen (2);
4092	scr_change_screen (state);	4169	scr_change_screen (state);
4093	break;	4170	break;
4094	case 1049: /* secondary screen w/ clearing first */	4171	case 1049: /* secondary screen w/ clearing first */
4095	scr_change_screen (state);	4172	scr_change_screen (state);
4096	if (options & Opt_secondaryScreen)	4173	if (OPTION (Opt_secondaryScreen))
4097	if (current_screen != PRIMARY)	4174	if (current_screen != PRIMARY)
4098	scr_erase_screen (2);	4175	scr_erase_screen (2);
4099	break;	4176	break;
4100	default:	4177	default:
4101	break;	4178	break;
…		…
4251	case 106:	4328	case 106:
4252	case 107:	4329	case 107:
4253	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4330	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254	break;	4331	break;
4255	#endif	4332	#endif
4256
4257	}	4333	}
4258	}	4334	}
4259	}	4335	}
4260	/*}}} */	4336	/*}}} */
4261		4337
…		…
4342	}	4418	}
4343		4419
4344	memmove (v_buffer, v_buffer + written, v_buflen);	4420	memmove (v_buffer, v_buffer + written, v_buflen);
4345	}	4421	}
4346	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4422	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347	// original code just ignores this...	4423	pty_ev.set (EVENT_READ);
4348	destroy ();
4349	}	4424	}
4350		4425
4351	/*----------------------- end-of-file (C source) -----------------------*/	4426	/*----------------------- end-of-file (C source) -----------------------*/
4352		4427

Diff Legend

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