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.222 by root, Sat Dec 31 19:35:56 2005 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
53	#include <cwchar>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
54	#include <csignal>	57	#include <csignal>
55		58
56	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
57		60
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
114	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
115	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
116	XK_Print, 0x2399,	119	XK_Print, 0x2399,
117		120
118	XK_space, 0x2423,	121	XK_space, 0x2423,
		122
		123	#ifdef XK_KP_Begin
		124	XK_KP_Prior, 0x21de,
		125	XK_KP_Next, 0x21df,
		126	XK_KP_Begin, 0x2320,
		127	XK_KP_Insert, 0x2380,
		128	XK_KP_Delete, 0x2326,
119	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
120	0,	131	0,
121	};	132	};
122		133
123	void	134	void
124	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
125	{	136	{
126	x = Pixel2Col (x);	137	x = Pixel2Col (x);
127	y = Pixel2Row (y);	138	y = Pixel2Row (y);
128		139
129	if (x < 0 || x >= TermWin.ncol	140	if (!IN_RANGE_EXC (x, 0, ncol)
130	|| y < 0 || y >= TermWin.nrow)	141	|| !IN_RANGE_EXC (y, 0, nrow))
131	return;	142	return;
132		143
133	for (;;)	144	for (;;)
134	{	145	{
135	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	const line_t &l = ROW(y - view_start);
		147
		148	text_t t = l.t[x];
136		149
137	if (t != NOCHAR || !x)	150	if (t != NOCHAR || !x)
138	{	151	{
139	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	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;	153	iso14755buf = ISO_14755_54;
142	break;	154	break;
143	}	155	}
144		156
145	x--;	157	x--;
146	}	158	}
147
148	}	159	}
149	#endif
150		160
151	#if ENABLE_OVERLAY
152	void	161	void
153	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	162	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154	{	163	{
155	rxvt_fontset *fs = FONTSET (r);	164	rxvt_fontset *fs = FONTSET (r);
156	rxvt_font *f = (*fs)[fs->find_font (ch)];	165	rxvt_font *f = (*fs)[fs->find_font (ch)];
157	wchar_t *chr, *alloc, ch2;	166	wchar_t *chr, *alloc, ch2, *fname;
158	int len;	167	int len;
159		168
		169	fname = rxvt_utf8towcs (f->name);
		170
160	#if ENABLE_COMBINING	171	# if ENABLE_COMBINING
161	if (IS_COMPOSE (ch))	172	if (IS_COMPOSE (ch))
162	{	173	{
163	len = rxvt_composite.expand (ch, 0);	174	len = rxvt_composite.expand (ch, 0);
164	alloc = chr = new wchar_t[len];	175	alloc = chr = new wchar_t[len];
165	rxvt_composite.expand (ch, chr);	176	rxvt_composite.expand (ch, chr);
166	}	177	}
167	else	178	else
168	#endif	179	# endif
169	{	180	{
170	ch2 = ch;	181	ch2 = ch;
171		182
172	alloc = 0;	183	alloc = 0;
173	chr = &ch2;	184	chr = &ch2;
174	len = 1;	185	len = 1;
175	}	186	}
176		187
177	int width = strlen (f->name);	188	char attr[80]; // plenty
178		189
179	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	190	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		191	(int)r,
		192	fgcolor_of (r), bgcolor_of (r),
		193	r & RS_Bold ? " bold" : "",
		194	r & RS_Italic ? " italic" : "",
		195	r & RS_Blink ? " blink" : "",
		196	r & RS_RVid ? " rvid" : "",
		197	r & RS_Uline ? " uline" : "",
		198	r & RS_Careful ? " careful" : "");
		199
		200	int width = wcswidth (fname, wcslen (fname));
		201
		202	max_it (width, 8+5); // for char + hey
		203	max_it (width, strlen (attr));
		204
		205	if (y >= 0)
		206	{
		207	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		208	x = 0;
		209	}
		210
		211	scr_overlay_new (x, y, width, len + 2);
180		212
181	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	213	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182		214
183	for (int y = 0; y < len; y++)	215	for (int y = 0; y < len; y++)
184	{	216	{
…		…
187	ch = *chr++;	219	ch = *chr++;
188		220
189	sprintf (buf, "%8x", ch);	221	sprintf (buf, "%8x", ch);
190	scr_overlay_set (0, y, buf);	222	scr_overlay_set (0, y, buf);
191	scr_overlay_set (9, y, '=');	223	scr_overlay_set (9, y, '=');
192	#if !UNICODE3	224	# if !UNICODE3
193	if (ch >= 0x10000)	225	if (ch >= 0x10000)
194	ch = 0xfffd;	226	ch = 0xfffd;
195	#endif	227	# endif
196	scr_overlay_set (11, y, ch, r);	228	scr_overlay_set (11, y, ch, r);
197	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
198	}	230	}
199		231
		232	scr_overlay_set (0, len , attr);
200	scr_overlay_set (0, len, f->name);	233	scr_overlay_set (0, len + 1, fname);
201		234
		235	free (fname);
		236
202	#if ENABLE_COMBINING	237	# if ENABLE_COMBINING
203	if (alloc)	238	if (alloc)
204	delete [] alloc;	239	delete [] alloc;
205	#endif	240	# endif
206	}	241	}
207	#endif	242	#endif
208		243
209	void	244	void
210	rxvt_term::commit_iso14755 ()	245	rxvt_term::commit_iso14755 ()
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	309	* escape sequence to toggle the Keypad.
275	*	310	*
276	* Always permit `shift' to override the current setting	311	* Always permit `shift' to override the current setting
277	*/	312	*/
278	shft = (ev.state & ShiftMask);	313	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	314	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	315	meta = ev.state & ModMetaMask;
281		316
282	if (numlock_state || (ev.state & ModNumLockMask))	317	if (numlock_state || (ev.state & ModNumLockMask))
283	{	318	{
284	numlock_state = (ev.state & ModNumLockMask);	319	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	320	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		340
306	// the XOpenIM manpage lies about hardcoding the locale	341	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	342	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	343	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	344	SET_LOCALE (rs[Rs_imLocale]);
		345
310	// assume wchar_t == unicode or better	346	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	347	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	348	KBUFSZ, &keysym, &status_return);
		349
313	if (rs[Rs_imLocale])	350	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	351	SET_LOCALE (locale);
315		352
316	if (status_return == XLookupChars	353	if (status_return == XLookupChars
317	|| status_return == XLookupBoth)	354	|| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	381	valid_keysym = keysym != NoSymbol;
345	}	382	}
346		383
347	if (valid_keysym)	384	if (valid_keysym)
348	{	385	{
		386	#ifdef KEYSYM_RESOURCE
		387	if (keyboard->dispatch (this, keysym, ev.state))
		388	return;
		389	#endif
		390
349	if (TermWin.saveLines)	391	if (saveLines)
350	{	392	{
351	#ifdef UNSHIFTED_SCROLLKEYS	393	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	394	if (!ctrl && !meta)
353	#else	395	#else
354	if (IS_SCROLL_MOD)	396	if (IS_SCROLL_MOD)
355	#endif	397	#endif
356	{	398	{
357	int lnsppg;	399	int lnsppg;
358		400
359	#ifdef PAGING_CONTEXT_LINES	401	#ifdef PAGING_CONTEXT_LINES
360	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	402	lnsppg = nrow - PAGING_CONTEXT_LINES;
361	#else	403	#else
362	lnsppg = TermWin.nrow * 4 / 5;	404	lnsppg = nrow * 4 / 5;
363	#endif	405	#endif
364	if (keysym == XK_Prior)	406	if (keysym == XK_Prior)
365	{	407	{
366	scr_page (UP, lnsppg);	408	scr_page (UP, lnsppg);
367	return;	409	return;
…		…
487	}	529	}
488	#endif	530	#endif
489		531
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	532	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	533	{
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	{	534	{
518	newlen = 1;	535	newlen = 1;
519	switch (keysym)	536	switch (keysym)
520	{	537	{
521	#ifndef NO_BACKSPACE_KEY	538	#ifndef NO_BACKSPACE_KEY
…		…
529	else	546	else
530	strcpy (kbuf, key_backspace);	547	strcpy (kbuf, key_backspace);
531	break;	548	break;
532	#endif	549	#endif
533	#ifndef NO_DELETE_KEY	550	#ifndef NO_DELETE_KEY
		551	# ifdef XK_KP_Prior
		552	case XK_KP_Delete:
		553	/* allow shift to override */
		554	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		555	{
		556	strcpy (kbuf, "\033On");
		557	break;
		558	}
		559	/* FALLTHROUGH */
		560	# endif
534	case XK_Delete:	561	case XK_Delete:
535	strcpy (kbuf, key_delete);	562	strcpy (kbuf, key_delete);
536	break;	563	break;
537	#endif	564	#endif
538	case XK_Tab:	565	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	668	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	669	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	670	strcpy (kbuf, "\033Ou");
644	break;	671	break;
645		672
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	673	#endif
654	case XK_KP_F1: /* "\033OP" */	674	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	675	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	676	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	677	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	709	break;
690		710
691	case XK_Find:	711	case XK_Find:
692	strcpy (kbuf, "\033[1~");	712	strcpy (kbuf, "\033[1~");
693	break;	713	break;
		714
		715	#ifdef XK_KP_End
		716	case XK_KP_Insert:
		717	/* allow shift to override */
		718	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		719	{
		720	strcpy (kbuf, "\033Op");
		721	break;
		722	}
		723	/* FALLTHROUGH */
		724	#endif
694	case XK_Insert:	725	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	726	strcpy (kbuf, "\033[2~");
696	break;	727	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	728	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	729	case DXK_Remove:
…		…
785	case XK_F35: /* "\033[49~" */	816	case XK_F35: /* "\033[49~" */
786	FKEY (31, XK_F17);	817	FKEY (31, XK_F17);
787	break;	818	break;
788	#undef FKEY	819	#undef FKEY
789	default:	820	default:
790	if (len == 0	821	newlen = 0;
791	&& (keysym & 0xfff0) != 0xff70	822	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	}	823	}
796		824
797	if (newlen)	825	if (newlen)
798	len = strlen (kbuf);	826	len = strlen (kbuf);
799	}	827	}
…		…
815	else if (keysym == XK_ISO_Left_Tab)	843	else if (keysym == XK_ISO_Left_Tab)
816	{	844	{
817	strcpy (kbuf, "\033[Z");	845	strcpy (kbuf, "\033[Z");
818	len = 3;	846	len = 3;
819	}	847	}
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	848	else
828	{	849	{
829	#ifdef META8_OPTION	850	#ifdef META8_OPTION
830	/* set 8-bit on */	851	/* set 8-bit on */
831	if (meta && (meta_char == 0x80))	852	if (meta && (meta_char == 0x80))
…		…
843	}	864	}
844		865
845	if (len <= 0)	866	if (len <= 0)
846	return; /* not mapped */	867	return; /* not mapped */
847		868
848	if (options & Opt_scrollTtyKeypress)	869	if (OPTION (Opt_scrollTtyKeypress))
849	if (TermWin.view_start)	870	if (view_start)
850	{	871	{
851	TermWin.view_start = 0;	872	view_start = 0;
852	want_refresh = 1;	873	want_refresh = 1;
853	}	874	}
854		875
855	/*	876	/*
856	* these modifications only affect the static keybuffer	877	* these modifications only affect the static keybuffer
…		…
889	#endif /* DEBUG_CMD */	910	#endif /* DEBUG_CMD */
890	tt_write (kbuf, (unsigned int)len);	911	tt_write (kbuf, (unsigned int)len);
891	}	912	}
892	/*}}} */	913	/*}}} */
893		914
894	#if (MENUBAR_MAX)	915	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	916	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896	/* attempt to `write' count to the input buffer */	917	/* attempt to `write' count to the input buffer */
897	unsigned int	918	unsigned int
898	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	919	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
899	{	920	{
…		…
922		943
923	cmd_parse ();	944	cmd_parse ();
924		945
925	return 0;	946	return 0;
926	}	947	}
927	#endif /* MENUBAR_MAX */	948	#endif
928		949
929	void	950	void
930	rxvt_term::flush ()	951	rxvt_term::flush ()
931	{	952	{
932	flush_ev.stop ();	953	flush_ev.stop ();
…		…
1033	{	1054	{
1034	if (mouse_slip_wheel_speed == 0	1055	if (mouse_slip_wheel_speed == 0
1035	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1056	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036	: scr_page (UP, mouse_slip_wheel_speed))	1057	: scr_page (UP, mouse_slip_wheel_speed))
1037	{	1058	{
		1059	if (view_start == nsaved ||
		1060	view_start == 0)
		1061	mouse_slip_wheel_speed = 0;
		1062
1038	refresh_type |= SMOOTH_REFRESH;	1063	refresh_type |= SMOOTH_REFRESH;
1039	want_refresh = 1;	1064	want_refresh = 1;
1040	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041	}	1066	}
1042	}	1067	}
…		…
1062	if (n > 0)	1087	if (n > 0)
1063	{	1088	{
1064	cmdbuf_endp += n;	1089	cmdbuf_endp += n;
1065	return true;	1090	return true;
1066	}	1091	}
1067	else if (n < 0 && errno != EAGAIN)	1092	else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
		1093	{
		1094	pty_ev.stop ();
		1095
		1096	if (!OPTION (Opt_hold))
1068	destroy ();	1097	destroy ();
		1098	}
1069		1099
1070	return false;	1100	return false;
1071	}	1101	}
1072		1102
1073	void	1103	void
…		…
1087	}	1117	}
1088		1118
1089	void	1119	void
1090	rxvt_term::pointer_unblank ()	1120	rxvt_term::pointer_unblank ()
1091	{	1121	{
1092	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1122	XDefineCursor (display->display, vt, TermWin_cursor);
1093	recolour_cursor ();	1123	recolour_cursor ();
1094		1124
1095	#ifdef POINTER_BLANK	1125	#ifdef POINTER_BLANK
1096	hidden_pointer = 0;	1126	hidden_pointer = 0;
1097		1127
1098	if (options & Opt_pointerBlank)	1128	if (OPTION (Opt_pointerBlank))
1099	pointer_ev.start (NOW + pointerBlankDelay);	1129	pointer_ev.start (NOW + pointerBlankDelay);
1100	#endif	1130	#endif
1101	}	1131	}
1102		1132
1103	#ifdef POINTER_BLANK	1133	#ifdef POINTER_BLANK
1104	void	1134	void
1105	rxvt_term::pointer_blank ()	1135	rxvt_term::pointer_blank ()
1106	{	1136	{
1107	if (! (options & Opt_pointerBlank))	1137	if (! OPTION (Opt_pointerBlank))
1108	return;	1138	return;
1109		1139
1110	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1140	XDefineCursor (display->display, vt, display->blank_cursor);
1111	XFlush (display->display);	1141	XFlush (display->display);
1112		1142
1113	hidden_pointer = 1;	1143	hidden_pointer = 1;
1114	}	1144	}
1115		1145
…		…
1204		1234
1205	/*{{{ process an X event */	1235	/*{{{ process an X event */
1206	void	1236	void
1207	rxvt_term::x_cb (XEvent &ev)	1237	rxvt_term::x_cb (XEvent &ev)
1208	{	1238	{
		1239	dDisp;
		1240
1209	SET_R (this);	1241	SET_R (this);
1210	SET_LOCALE (locale);	1242	SET_LOCALE (locale);
1211		1243
1212	#if defined(CURSOR_BLINK)	1244	#if defined(CURSOR_BLINK)
1213	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1245	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1214	{	1246	{
1215	if (hidden_cursor)	1247	if (hidden_cursor)
1216	{	1248	{
1217	hidden_cursor = 0;	1249	hidden_cursor = 0;
1218	want_refresh = 1;	1250	want_refresh = 1;
…		…
1221	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1253	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1222	}	1254	}
1223	#endif	1255	#endif
1224		1256
1225	#if defined(POINTER_BLANK)	1257	#if defined(POINTER_BLANK)
1226	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1258	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1227	{	1259	{
1228	if (ev.type == MotionNotify	1260	if (ev.type == MotionNotify
1229	|| ev.type == ButtonPress	1261	|| ev.type == ButtonPress
1230	|| ev.type == ButtonRelease)	1262	|| ev.type == ButtonRelease)
1231	if (hidden_pointer)	1263	if (hidden_pointer)
…		…
1329	button_release (ev.xbutton);	1361	button_release (ev.xbutton);
1330	break;	1362	break;
1331		1363
1332	case ClientMessage:	1364	case ClientMessage:
1333	if (ev.xclient.format == 32	1365	if (ev.xclient.format == 32
		1366	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1367	{
1334	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1368	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335	destroy ();	1369	destroy ();
		1370	#if ENABLE_EWMH
		1371	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1372	XSendEvent (disp, ev.xclient.window = display->root,
		1373	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1374	&ev);
		1375	#endif
		1376	}
		1377	#if ENABLE_XEMBED
		1378	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1379	{
		1380	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1381	focus_in ();
		1382	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1383	focus_out ();
		1384	}
		1385	#endif
1336	#ifdef OFFIX_DND	1386	#ifdef OFFIX_DND
1337	/* OffiX Dnd (drag 'n' drop) protocol */	1387	/* OffiX Dnd (drag 'n' drop) protocol */
1338	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1388	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339	&& (ev.xclient.data.l[0] == DndFile	1389	&& (ev.xclient.data.l[0] == DndFile
1340	|| ev.xclient.data.l[0] == DndDir	1390	|| ev.xclient.data.l[0] == DndDir
1341	|| ev.xclient.data.l[0] == DndLink))	1391	|| ev.xclient.data.l[0] == DndLink))
1342	{	1392	{
1343	/* Get Dnd data */	1393	/* Get Dnd data */
1344	Atom ActualType;	1394	Atom ActualType;
1345	int ActualFormat;	1395	int ActualFormat;
1346	unsigned char *data;	1396	unsigned char *data;
1347	unsigned long Size, RemainingBytes;	1397	unsigned long Size, RemainingBytes;
1348		1398
1349	XGetWindowProperty (display->display, display->root,	1399	XGetWindowProperty (disp, display->root,
1350	xa[XA_DNDSELECTION],	1400	xa[XA_DNDSELECTION],
1351	0L, 1000000L,	1401	0L, 1000000L,
1352	False, AnyPropertyType,	1402	False, AnyPropertyType,
1353	&ActualType, &ActualFormat,	1403	&ActualType, &ActualFormat,
1354	&Size, &RemainingBytes,	1404	&Size, &RemainingBytes,
1355	&data);	1405	&data);
1356	set_string_property (XA_CUT_BUFFER0, data);	1406	set_string_property (XA_CUT_BUFFER0, data);
1357	XFree (data);	1407	XFree (data);
1358	selection_paste (display->root, XA_CUT_BUFFER0, true);	1408	selection_paste (display->root, XA_CUT_BUFFER0, true);
1359	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1409	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360	}	1410	}
1361	#endif /* OFFIX_DND */	1411	#endif /* OFFIX_DND */
1362	break;	1412	break;
1363		1413
1364	case MappingNotify:	1414	case MappingNotify:
…		…
1389	break;	1439	break;
1390	}	1440	}
1391	break;	1441	break;
1392		1442
1393	case FocusIn:	1443	case FocusIn:
1394	if (!TermWin.focus)	1444	focus_in ();
		1445	break;
		1446
		1447	case FocusOut:
		1448	focus_out ();
		1449	break;
		1450
		1451	case ConfigureNotify:
		1452	if (ev.xconfigure.window == parent[0])
1395	{	1453	{
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));	1454	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1455	;
1463		1456
1464	if (szHint.width != width || szHint.height != height)	1457	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465	{	1458	{
1466	seen_resize = 1;	1459	seen_resize = 1;
1467	resize_all_windows (width, height, 1);	1460	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468	}	1461	}
1469		1462
1470	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1463	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471	if (options & Opt_transparent)	1464	if (OPTION (Opt_transparent))
1472	check_our_parents ();	1465	check_our_parents ();
1473	#endif	1466	#endif
1474	}	1467	}
1475	break;	1468	break;
1476		1469
…		…
1493	case SelectionRequest:	1486	case SelectionRequest:
1494	selection_send (ev.xselectionrequest);	1487	selection_send (ev.xselectionrequest);
1495	break;	1488	break;
1496		1489
1497	case UnmapNotify:	1490	case UnmapNotify:
1498	TermWin.mapped = 0;	1491	mapped = 0;
1499	#ifdef TEXT_BLINK	1492	#ifdef TEXT_BLINK
1500	text_blink_ev.stop ();	1493	text_blink_ev.stop ();
1501	#endif	1494	#endif
1502	break;	1495	break;
1503		1496
1504	case MapNotify:	1497	case MapNotify:
1505	TermWin.mapped = 1;	1498	mapped = 1;
1506	#ifdef TEXT_BLINK	1499	#ifdef TEXT_BLINK
1507	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1500	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508	#endif	1501	#endif
1509	break;	1502	break;
1510		1503
…		…
1514	break;	1507	break;
1515	#endif /* TRANSPARENT */	1508	#endif /* TRANSPARENT */
1516		1509
1517	case GraphicsExpose:	1510	case GraphicsExpose:
1518	case Expose:	1511	case Expose:
1519	if (ev.xany.window == TermWin.vt)	1512	if (ev.xany.window == vt)
1520	{	1513	{
1521	do	1514	do
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1515	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1516	ev.xexpose.width, ev.xexpose.height, False);
1524	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1517	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525		1518
1526	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1519	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527		1520
1528	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1521	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529	scr_expose (ev.xexpose.x, ev.xexpose.y,	1522	scr_expose (ev.xexpose.x, ev.xexpose.y,
1530	ev.xexpose.width, ev.xexpose.height, False);	1523	ev.xexpose.width, ev.xexpose.height, False);
1531		1524
1532	scr_refresh (refresh_type);	1525	scr_refresh (refresh_type);
1533	}	1526	}
1534	else	1527	else
1535	{	1528	{
1536	XEvent unused_event;	1529	XEvent unused_event;
1537		1530
1538	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1531	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539	;	1532	;
1540	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1533	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541	;	1534	;
1542		1535
1543	if (isScrollbarWindow (ev.xany.window))	1536	if (isScrollbarWindow (ev.xany.window))
1544	{	1537	{
1545	scrollBar.setIdle ();	1538	scrollBar.setIdle ();
…		…
1549	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1542	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550	menubar_expose ();	1543	menubar_expose ();
1551	#endif	1544	#endif
1552		1545
1553	#ifdef TRANSPARENT	1546	#ifdef TRANSPARENT
1554	if (am_transparent && ev.xany.window == TermWin.parent[0])	1547	if (am_transparent && ev.xany.window == parent[0])
1555	XClearWindow (display->display, ev.xany.window);	1548	XClearWindow (disp, ev.xany.window);
1556	#endif	1549	#endif
1557	}	1550	}
1558	break;	1551	break;
1559		1552
1560	case MotionNotify:	1553	case MotionNotify:
…		…
1570	}	1563	}
1571	#endif	1564	#endif
1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1565	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573	break;	1566	break;
1574		1567
1575	if (ev.xany.window == TermWin.vt)	1568	if (ev.xany.window == vt)
1576	{	1569	{
1577	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1570	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578	{	1571	{
1579	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1572	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580	;	1573	;
1581		1574
1582	XQueryPointer (display->display, TermWin.vt,	1575	XQueryPointer (disp, vt,
1583	&unused_root, &unused_child,	1576	&unused_root, &unused_child,
1584	&unused_root_x, &unused_root_y,	1577	&unused_root_x, &unused_root_y,
1585	&ev.xbutton.x, &ev.xbutton.y,	1578	&ev.xbutton.x, &ev.xbutton.y,
1586	&ev.xbutton.state);	1579	&ev.xbutton.state);
1587	#ifdef MOUSE_THRESHOLD	1580	#ifdef MOUSE_THRESHOLD
…		…
1599	#endif	1592	#endif
1600	selection_extend (ev.xbutton.x, ev.xbutton.y,	1593	selection_extend (ev.xbutton.x, ev.xbutton.y,
1601	ev.xbutton.state & Button3Mask ? 2 : 0);	1594	ev.xbutton.state & Button3Mask ? 2 : 0);
1602		1595
1603	#ifdef SELECTION_SCROLLING	1596	#ifdef SELECTION_SCROLLING
1604	if (ev.xbutton.y < TermWin.int_bwidth	1597	if (ev.xbutton.y < int_bwidth
1605	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1598	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1606	{	1599	{
1607	int dist;	1600	int dist;
1608		1601
1609	/* don't clobber the current delay if we are	1602	/* don't clobber the current delay if we are
1610	* already in the middle of scrolling.	1603	* already in the middle of scrolling.
…		…
1618	selection_save_x = ev.xbutton.x;	1611	selection_save_x = ev.xbutton.x;
1619	selection_save_y = ev.xbutton.y;	1612	selection_save_y = ev.xbutton.y;
1620	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1613	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621		1614
1622	/* calc number of lines to scroll */	1615	/* calc number of lines to scroll */
1623	if (ev.xbutton.y < TermWin.int_bwidth)	1616	if (ev.xbutton.y < int_bwidth)
1624	{	1617	{
1625	scroll_selection_dir = UP;	1618	scroll_selection_dir = UP;
1626	dist = TermWin.int_bwidth - ev.xbutton.y;	1619	dist = int_bwidth - ev.xbutton.y;
1627	}	1620	}
1628	else	1621	else
1629	{	1622	{
1630	scroll_selection_dir = DN;	1623	scroll_selection_dir = DN;
1631	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1624	dist = ev.xbutton.y - (int_bwidth + height);
1632	}	1625	}
1633		1626
1634	scroll_selection_lines = Pixel2Height (dist)	1627	scroll_selection_lines = Pixel2Height (dist)
1635	/ SELECTION_SCROLL_LINE_SPEEDUP	1628	/ SELECTION_SCROLL_LINE_SPEEDUP
1636	+ 1;	1629	+ 1;
1637	MIN_IT (scroll_selection_lines,	1630	min_it (scroll_selection_lines,
1638	SELECTION_SCROLL_MAX_LINES);	1631	SELECTION_SCROLL_MAX_LINES);
1639	}	1632	}
1640	else	1633	else
1641	{	1634	{
1642	/* we are within the text window, so we	1635	/* we are within the text window, so we
…		…
1651	#endif	1644	#endif
1652	}	1645	}
1653	}	1646	}
1654	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1647	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655	{	1648	{
1656	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1649	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657	MotionNotify, &ev))	1650	MotionNotify, &ev))
1658	;	1651	;
1659		1652
1660	XQueryPointer (display->display, scrollBar.win,	1653	XQueryPointer (disp, scrollBar.win,
1661	&unused_root, &unused_child,	1654	&unused_root, &unused_child,
1662	&unused_root_x, &unused_root_y,	1655	&unused_root_x, &unused_root_y,
1663	&ev.xbutton.x, &ev.xbutton.y,	1656	&ev.xbutton.x, &ev.xbutton.y,
1664	&unused_mask);	1657	&unused_mask);
1665	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1670	}	1663	}
1671	break;	1664	break;
1672	}	1665	}
1673	}	1666	}
1674		1667
		1668	void
		1669	rxvt_term::focus_in ()
		1670	{
		1671	if (!focus)
		1672	{
		1673	focus = 1;
		1674	want_refresh = 1;
		1675	#if USE_XIM
		1676	if (Input_Context != NULL)
		1677	{
		1678	IMSetStatusPosition ();
		1679	XSetICFocus (Input_Context);
		1680	}
		1681	#endif
		1682	#if CURSOR_BLINK
		1683	if (OPTION (Opt_cursorBlink))
		1684	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1685	#endif
		1686	#if OFF_FOCUS_FADING
		1687	if (rs[Rs_fade])
		1688	{
		1689	pix_colors = pix_colors_focused;
		1690	scr_recolour ();
		1691	}
		1692	#endif
		1693	}
		1694	}
		1695
		1696	void
		1697	rxvt_term::focus_out ()
		1698	{
		1699	if (focus)
		1700	{
		1701	focus = 0;
		1702	want_refresh = 1;
		1703
		1704	#if ENABLE_FRILLS || ISO_14755
		1705	iso14755buf = 0;
		1706	#endif
		1707	#if ENABLE_OVERLAY
		1708	scr_overlay_off ();
		1709	#endif
		1710	#if USE_XIM
		1711	if (Input_Context != NULL)
		1712	XUnsetICFocus (Input_Context);
		1713	#endif
		1714	#if CURSOR_BLINK
		1715	if (OPTION (Opt_cursorBlink))
		1716	cursor_blink_ev.stop ();
		1717	hidden_cursor = 0;
		1718	#endif
		1719	#if OFF_FOCUS_FADING
		1720	if (rs[Rs_fade])
		1721	{
		1722	pix_colors = pix_colors_unfocused;
		1723	scr_recolour ();
		1724	}
		1725	#endif
		1726	}
		1727	}
		1728
1675	#if TRANSPARENT	1729	#if TRANSPARENT
1676	void	1730	void
1677	rxvt_term::rootwin_cb (XEvent &ev)	1731	rxvt_term::rootwin_cb (XEvent &ev)
1678	{	1732	{
1679	SET_R (this);	1733	SET_R (this);
…		…
1690	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1744	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691	return;	1745	return;
1692		1746
1693	/* FALLTHROUGH */	1747	/* FALLTHROUGH */
1694	case ReparentNotify:	1748	case ReparentNotify:
1695	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1749	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696	want_refresh = want_full_refresh = 1;	1750	want_refresh = want_full_refresh = 1;
1697	break;	1751	break;
1698	}	1752	}
1699	}	1753	}
1700	#endif	1754	#endif
…		…
1709	reportmode = !! (priv_modes & PrivMode_mouse_report);	1763	reportmode = !! (priv_modes & PrivMode_mouse_report);
1710		1764
1711	/*	1765	/*
1712	* VT window processing of button press	1766	* VT window processing of button press
1713	*/	1767	*/
1714	if (ev.window == TermWin.vt)	1768	if (ev.window == vt)
1715	{	1769	{
1716	#if ISO_14755	1770	#if ISO_14755
1717	// 5.4	1771	// 5.4
1718	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1772	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719	{	1773	{
…		…
1767	{	1821	{
1768	case Button1:	1822	case Button1:
1769	/* allow meta + click to select rectangular areas */	1823	/* allow meta + click to select rectangular areas */
1770	/* should be done in screen.C */	1824	/* should be done in screen.C */
1771	#if ENABLE_FRILLS	1825	#if ENABLE_FRILLS
1772	selection.rect = !! (ev.state & ModMetaMask);	1826	selection.rect = !!(ev.state & ModMetaMask);
1773	#else	1827	#else
1774	selection.rect = false;	1828	selection.rect = false;
1775	#endif	1829	#endif
1776		1830
1777	/* allow shift+left click to extend selection */	1831	/* allow shift+left click to extend selection */
…		…
1924	case Button3:	1978	case Button3:
1925	if (scrollBar.style != R_SB_XTERM)	1979	if (scrollBar.style != R_SB_XTERM)
1926	{	1980	{
1927	if (scrollbar_above_slider (ev.y))	1981	if (scrollbar_above_slider (ev.y))
1928	# ifdef RXVT_SCROLL_FULL	1982	# ifdef RXVT_SCROLL_FULL
1929	scr_page (UP, TermWin.nrow - 1);	1983	scr_page (UP, nrow - 1);
1930	# else	1984	# else
1931	scr_page (UP, TermWin.nrow / 4);	1985	scr_page (UP, nrow / 4);
1932	# endif	1986	# endif
1933	else if (scrollbar_below_slider (ev.y))	1987	else if (scrollbar_below_slider (ev.y))
1934	# ifdef RXVT_SCROLL_FULL	1988	# ifdef RXVT_SCROLL_FULL
1935	scr_page (DN, TermWin.nrow - 1);	1989	scr_page (DN, nrow - 1);
1936	# else	1990	# else
1937	scr_page (DN, TermWin.nrow / 4);	1991	scr_page (DN, nrow / 4);
1938	# endif	1992	# endif
1939	else	1993	else
1940	scrollBar.setMotion ();	1994	scrollBar.setMotion ();
1941	}	1995	}
1942	else	1996	else
1943	{	1997	{
1944	scr_page ((ev.button == Button1 ? DN : UP),	1998	scr_page ((ev.button == Button1 ? DN : UP),
1945	(TermWin.nrow	1999	(nrow
1946	* scrollbar_position (ev.y)	2000	* scrollbar_position (ev.y)
1947	/ scrollbar_size ()));	2001	/ scrollbar_size ()));
1948	}	2002	}
1949		2003
1950	break;	2004	break;
…		…
1982	#ifdef SELECTION_SCROLLING	2036	#ifdef SELECTION_SCROLLING
1983	if (sel_scroll_ev.active)	2037	if (sel_scroll_ev.active)
1984	sel_scroll_ev.stop();	2038	sel_scroll_ev.stop();
1985	#endif	2039	#endif
1986		2040
1987	if (ev.window == TermWin.vt)	2041	if (ev.window == vt)
1988	{	2042	{
1989	#if ISO_14755	2043	#if ISO_14755
1990	// 5.4	2044	// 5.4
1991	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2045	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992	return;	2046	return;
…		…
2042		2096
2043	v = ev.button == Button4 ? UP : DN;	2097	v = ev.button == Button4 ? UP : DN;
2044		2098
2045	if (ev.state & ShiftMask)	2099	if (ev.state & ShiftMask)
2046	i = 1;	2100	i = 1;
2047	else if (options & Opt_mouseWheelScrollPage)	2101	else if (OPTION (Opt_mouseWheelScrollPage))
2048	i = TermWin.nrow - 1;	2102	i = nrow - 1;
2049	else	2103	else
2050	i = 5;	2104	i = 5;
2051		2105
2052	# ifdef MOUSE_SLIP_WHEELING	2106	# ifdef MOUSE_SLIP_WHEELING
2053	if (ev.state & ControlMask)	2107	if (ev.state & ControlMask)
2054	{	2108	{
2055	mouse_slip_wheel_speed += v ? -1 : 1;	2109	mouse_slip_wheel_speed += v ? -1 : 1;
2056	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2110	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;	2111	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058		2112
2059	if (slip_wheel_ev.at < NOW)	2113	if (slip_wheel_ev.at < NOW)
2060	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2114	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061		2115
2062	slip_wheel_ev.start ();	2116	slip_wheel_ev.start ();
…		…
2103	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2157	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2158	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2159	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106	int i;	2160	int i;
2107		2161
2108	Visual* visual = display->visual;	2162	Visual *visual = display->visual;
2109		2163
2110	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2164	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111		2165
2112	/* for convenience */	2166	/* for convenience */
2113	mask_r = visual->red_mask;	2167	mask_r = visual->red_mask;
…		…
2334	Atom atype;	2388	Atom atype;
2335	unsigned char *prop = NULL;	2389	unsigned char *prop = NULL;
2336	Window root, oldp, *list;	2390	Window root, oldp, *list;
2337	Pixmap rootpixmap = None;	2391	Pixmap rootpixmap = None;
2338	XWindowAttributes wattr, wrootattr;	2392	XWindowAttributes wattr, wrootattr;
		2393	dDisp;
2339		2394
2340	pchanged = 0;	2395	pchanged = 0;
2341		2396
2342	if (!(options & Opt_transparent))	2397	if (!OPTION (Opt_transparent))
2343	return pchanged; /* Don't try any more */	2398	return pchanged; /* Don't try any more */
2344		2399
2345	XGetWindowAttributes (display->display, display->root, &wrootattr);	2400	XGetWindowAttributes (disp, display->root, &wrootattr);
2346	rootdepth = wrootattr.depth;	2401	rootdepth = wrootattr.depth;
2347		2402
2348	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2403	XGetWindowAttributes (disp, parent[0], &wattr);
2349		2404
2350	if (rootdepth != wattr.depth)	2405	if (rootdepth != wattr.depth)
2351	{	2406	{
2352	if (am_transparent)	2407	if (am_transparent)
2353	{	2408	{
2354	pchanged = 1;	2409	pchanged = 1;
2355	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2410	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356	am_transparent = am_pixmap_trans = 0;	2411	am_transparent = am_pixmap_trans = 0;
2357	}	2412	}
2358		2413
2359	return pchanged; /* Don't try any more */	2414	return pchanged; /* Don't try any more */
2360	}	2415	}
2361		2416
2362	/* Get all X ops out of the queue so that our information is up-to-date. */	2417	/* Get all X ops out of the queue so that our information is up-to-date. */
2363	XSync (display->display, False);	2418	XSync (disp, False);
2364		2419
2365	/*	2420	/*
2366	* Make the frame window set by the window manager have	2421	* Make the frame window set by the window manager have
2367	* the root background. Some window managers put multiple nested frame	2422	* the root background. Some window managers put multiple nested frame
2368	* windows for each client, so we have to take care about that.	2423	* windows for each client, so we have to take care about that.
2369	*/	2424	*/
2370	i = (xa[XA_XROOTPMAP_ID]	2425	i = (xa[XA_XROOTPMAP_ID]
2371	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2426	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2427	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373	&nitems, &bytes_after, &prop) == Success);	2428	&nitems, &bytes_after, &prop) == Success);
2374		2429
2375	if (!i || prop == NULL)	2430	if (!i || prop == NULL)
2376	i = (xa[XA_ESETROOT_PMAP_ID]	2431	i = (xa[XA_ESETROOT_PMAP_ID]
2377	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2432	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2380		2435
2381	if (!i || prop == NULL	2436	if (!i || prop == NULL
2382	#if TINTING	2437	#if TINTING
…		…
2401	Window cr;	2456	Window cr;
2402	XImage *image;	2457	XImage *image;
2403	GC gc;	2458	GC gc;
2404	XGCValues gcvalue;	2459	XGCValues gcvalue;
2405		2460
2406	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2461	XTranslateCoordinates (disp, parent[0], display->root,
2407	0, 0, &sx, &sy, &cr);	2462	0, 0, &sx, &sy, &cr);
2408	nw = (unsigned int)szHint.width;	2463	nw = (unsigned int)szHint.width;
2409	nh = (unsigned int)szHint.height;	2464	nh = (unsigned int)szHint.height;
2410	nx = ny = 0;	2465	nx = ny = 0;
2411		2466
…		…
2421	nh += sy;	2476	nh += sy;
2422	ny = -sy;	2477	ny = -sy;
2423	sy = 0;	2478	sy = 0;
2424	}	2479	}
2425		2480
2426	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2481	min_it (nw, (unsigned int) (wrootattr.width - sx));
2427	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2482	min_it (nh, (unsigned int) (wrootattr.height - sy));
2428		2483
2429	XSync (display->display, False);	2484	XSync (disp, False);
2430	allowedxerror = -1;	2485	allowedxerror = -1;
2431	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2486	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432		2487
2433	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2488	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2434	/* XXX: may need a delay here? */	2489	/* XXX: may need a delay here? */
2435	allowedxerror = 0;	2490	allowedxerror = 0;
2436		2491
2437	if (image == NULL)	2492	if (image == NULL)
2438	{	2493	{
2439	if (am_transparent && am_pixmap_trans)	2494	if (am_transparent && am_pixmap_trans)
2440	{	2495	{
2441	pchanged = 1;	2496	pchanged = 1;
2442	if (TermWin.pixmap != None)	2497	if (pixmap != None)
2443	{	2498	{
2444	XFreePixmap (display->display, TermWin.pixmap);	2499	XFreePixmap (disp, pixmap);
2445	TermWin.pixmap = None;	2500	pixmap = None;
2446	}	2501	}
2447	}	2502	}
2448		2503
2449	am_pixmap_trans = 0;	2504	am_pixmap_trans = 0;
2450	}	2505	}
2451	else	2506	else
2452	{	2507	{
2453	if (TermWin.pixmap != None)	2508	if (pixmap != None)
2454	XFreePixmap (display->display, TermWin.pixmap);	2509	XFreePixmap (disp, pixmap);
2455		2510
2456	#if TINTING	2511	#if TINTING
2457	if (ISSET_PIXCOLOR (Color_tint))	2512	if (ISSET_PIXCOLOR (Color_tint))
2458	{	2513	{
2459	unsigned short rm, gm, bm;	2514	unsigned short rm, gm, bm;
…		…
2463		2518
2464	ShadeXImage (display, image, shade, rm, gm, bm);	2519	ShadeXImage (display, image, shade, rm, gm, bm);
2465	}	2520	}
2466	#endif	2521	#endif
2467		2522
2468	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2523	pixmap = XCreatePixmap (disp, vt,
2469	szHint.width, szHint.height, image->depth);	2524	szHint.width, szHint.height, image->depth);
2470	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2525	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2526	XPutImage (disp, pixmap, gc, image, 0, 0,
2472	nx, ny, image->width, image->height);	2527	nx, ny, image->width, image->height);
2473	XFreeGC (display->display, gc);	2528	XFreeGC (disp, gc);
2474	XDestroyImage (image);	2529	XDestroyImage (image);
2475	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2530	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476	XClearWindow (display->display, TermWin.parent[0]);	2531	XClearWindow (disp, parent[0]);
2477		2532
2478	if (!am_transparent || !am_pixmap_trans)	2533	if (!am_transparent || !am_pixmap_trans)
2479	pchanged = 1;	2534	pchanged = 1;
2480		2535
2481	am_transparent = am_pixmap_trans = 1;	2536	am_transparent = am_pixmap_trans = 1;
2482	}	2537	}
2483	}	2538	}
2484		2539
2485	if (am_pixmap_trans)	2540	if (am_pixmap_trans)
2486	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2541	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487	else	2542	else
2488	{	2543	{
2489	unsigned int n;	2544	unsigned int n;
2490	/*	2545	/*
2491	* InheritPixmap transparency	2546	* InheritPixmap transparency
2492	*/	2547	*/
2493	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2548	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494	{	2549	{
2495	oldp = TermWin.parent[i];	2550	oldp = parent[i];
2496	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2551	XQueryTree (disp, parent[i - 1], &root,
2497	&TermWin.parent[i], &list, &n);	2552	&parent[i], &list, &n);
2498	XFree (list);	2553	XFree (list);
2499		2554
2500	if (TermWin.parent[i] == display->root)	2555	if (parent[i] == display->root)
2501	{	2556	{
2502	if (oldp != None)	2557	if (oldp != None)
2503	pchanged = 1;	2558	pchanged = 1;
2504		2559
2505	break;	2560	break;
2506	}	2561	}
2507		2562
2508	if (oldp != TermWin.parent[i])	2563	if (oldp != parent[i])
2509	pchanged = 1;	2564	pchanged = 1;
2510	}	2565	}
2511		2566
2512	n = 0;	2567	n = 0;
2513		2568
2514	if (pchanged)	2569	if (pchanged)
2515	{	2570	{
2516	for (; n < (unsigned int)i; n++)	2571	for (; n < (unsigned int)i; n++)
2517	{	2572	{
2518	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2573	XGetWindowAttributes (disp, parent[n], &wattr);
2519	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2574	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520	{	2575	{
2521	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2576	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522	break;	2577	break;
2523	}	2578	}
2524	}	2579	}
2525	}	2580	}
2526		2581
2527	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2582	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528	{	2583	{
2529	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2584	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2585	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531	am_transparent = 0;	2586	am_transparent = 0;
2532	/* XXX: also turn off Opt_transparent? */	2587	/* XXX: also turn off Opt_transparent? */
2533	}	2588	}
2534	else	2589	else
2535	{	2590	{
…		…
2538	* needed for fvwm2.2.2 (and before?) */	2593	* needed for fvwm2.2.2 (and before?) */
2539	sleep (1);	2594	sleep (1);
2540	#endif	2595	#endif
2541	for (n = 0; n < (unsigned int)i; n++)	2596	for (n = 0; n < (unsigned int)i; n++)
2542	{	2597	{
2543	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2598	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544	XClearWindow (display->display, TermWin.parent[n]);	2599	XClearWindow (disp, parent[n]);
2545	}	2600	}
2546		2601
2547	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2602	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548	am_transparent = 1;	2603	am_transparent = 1;
2549	}	2604	}
2550		2605
2551	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2606	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552	TermWin.parent[i] = None;	2607	parent[i] = None;
2553	}	2608	}
2554		2609
2555	if (scrollBar.win)	2610	if (scrollBar.win)
2556	{	2611	{
2557	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2612	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558	scrollBar.setIdle ();	2613	scrollBar.setIdle ();
2559	scrollbar_show (0);	2614	scrollbar_show (0);
2560	}	2615	}
2561		2616
2562	if (am_transparent)	2617	if (am_transparent)
…		…
2600	// some window managers resize the window early, and these programs	2655	// some window managers resize the window early, and these programs
2601	// then sometimes get the size wrong.	2656	// then sometimes get the size wrong.
2602	// unfortunately other programs are even more buggy and dislike	2657	// unfortunately other programs are even more buggy and dislike
2603	// being sent SIGWINCH, so only do it when we were in fact being	2658	// being sent SIGWINCH, so only do it when we were in fact being
2604	// resized.	2659	// resized.
2605	if (seen_resize)	2660	if (seen_resize && cmd_pid)
2606	kill (-cmd_pid, SIGWINCH);	2661	kill (-cmd_pid, SIGWINCH);
2607	}	2662	}
2608		2663
2609	/* Read a text string from the input buffer */	2664	/* Read a text string from the input buffer */
2610	unicode_t buf[UBUFSIZ];	2665	unicode_t buf[UBUFSIZ];
2611	bool refreshnow = false;	2666	bool refreshnow = false;
2612	int nlines = 0;	2667	int nlines = 0;
2613	unicode_t *str = buf;	2668	unicode_t *str = buf;
		2669	unicode_t *eol = str + min (ncol, UBUFSIZ);
2614		2670
2615	for (;;)	2671	for (;;)
2616	{	2672	{
2617	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2673	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618	break;	2674	break;
2619		2675
2620	*str++ = ch;	2676	*str++ = ch;
2621		2677
2622	if (ch == C0_LF)	2678	if (ch == C0_LF || str >= eol)
2623	{	2679	{
		2680	if (ch == C0_LF)
2624	nlines++;	2681	nlines++;
		2682
2625	refresh_count++;	2683	refresh_count++;
2626		2684
2627	if (!(options & Opt_jumpScroll)	2685	if (!OPTION (Opt_jumpScroll)
2628	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2686	|| (refresh_count >= refresh_limit * (nrow - 1)))
2629	{	2687	{
2630	refreshnow = true;	2688	refreshnow = true;
2631	ch = NOCHAR;	2689	ch = NOCHAR;
2632	break;	2690	break;
2633	}	2691	}
2634		2692
2635	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2693	// scr_add_lines only works for nlines <= nrow - 1.
2636	if (nlines >= TermWin.nrow - 1)	2694	if (nlines >= nrow - 1)
2637	{	2695	{
2638	scr_add_lines (buf, nlines, str - buf);	2696	scr_add_lines (buf, nlines, str - buf);
2639	nlines = 0;	2697	nlines = 0;
2640	str = buf;	2698	str = buf;
		2699	eol = str + min (ncol, UBUFSIZ);
2641	}	2700	}
2642	}
2643		2701
2644	if (str >= buf + UBUFSIZ)	2702	if (str >= eol)
2645	{	2703	{
		2704	if (eol >= buf + UBUFSIZ)
		2705	{
2646	ch = NOCHAR;	2706	ch = NOCHAR;
2647	break;	2707	break;
		2708	}
		2709	else
		2710	eol = min (eol + ncol, buf + UBUFSIZ);
		2711	}
		2712
2648	}	2713	}
2649		2714
2650	seq_begin = cmdbuf_ptr;	2715	seq_begin = cmdbuf_ptr;
2651	ch = next_char ();	2716	ch = next_char ();
2652	}	2717	}
…		…
2659	* the number of pages between refreshes is refresh_limit, which	2724	* the number of pages between refreshes is refresh_limit, which
2660	* is incremented here because we must be doing flat-out scrolling.	2725	* is incremented here because we must be doing flat-out scrolling.
2661	*/	2726	*/
2662	if (refreshnow)	2727	if (refreshnow)
2663	{	2728	{
2664	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2729	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665	refresh_limit++;	2730	refresh_limit++;
2666	else	2731	else
2667	{	2732	{
2668	flag = true;	2733	flag = true;
2669	scr_refresh (refresh_type);	2734	scr_refresh (refresh_type);
…		…
3196	{	3261	{
3197	switch (priv)	3262	switch (priv)
3198	{	3263	{
3199	case '>':	3264	case '>':
3200	if (ch == CSI_DA) /* secondary device attributes */	3265	if (ch == CSI_DA) /* secondary device attributes */
3201	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3266	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202	break;	3267	break;
3203	case '?':	3268	case '?':
3204	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3269	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205	process_terminal_mode (ch, priv, nargs, arg);	3270	process_terminal_mode (ch, priv, nargs, arg);
3206	break;	3271	break;
…		…
3311		3376
3312	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3377	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313	arg[0] = -arg[0];	3378	arg[0] = -arg[0];
3314	/* FALLTHROUGH */	3379	/* FALLTHROUGH */
3315	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3380	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3381	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317	break;	3382	break;
3318		3383
3319	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3384	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320	tt_write ((const unsigned char *)VT100_ANS,	3385	tt_write ((const unsigned char *)VT100_ANS,
3321	(unsigned int) (sizeof (VT100_ANS) - 1));	3386	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3333	break;	3398	break;
3334	case 6: /* CPR requested */	3399	case 6: /* CPR requested */
3335	scr_report_position ();	3400	scr_report_position ();
3336	break;	3401	break;
3337	case 7: /* unofficial extension */	3402	case 7: /* unofficial extension */
3338	if (options & Opt_insecure)	3403	if (OPTION (Opt_insecure))
3339	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3404	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340	break;	3405	break;
3341	case 8: /* unofficial extension */	3406	case 8: /* unofficial extension */
3342	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3407	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343	break;	3408	break;
…		…
3435	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3500	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436	{	3501	{
3437	int x, y;	3502	int x, y;
3438	XWindowAttributes wattr;	3503	XWindowAttributes wattr;
3439	Window wdummy;	3504	Window wdummy;
		3505	dDisp;
3440		3506
3441	if (nargs == 0)	3507	if (nargs == 0)
3442	return;	3508	return;
3443		3509
3444	switch (args[0])	3510	switch (args[0])
3445	{	3511	{
3446	/*	3512	/*
3447	* commands	3513	* commands
3448	*/	3514	*/
3449	case 1: /* deiconify window */	3515	case 1: /* deiconify window */
3450	XMapWindow (display->display, TermWin.parent[0]);	3516	XMapWindow (disp, parent[0]);
3451	break;	3517	break;
3452	case 2: /* iconify window */	3518	case 2: /* iconify window */
3453	XIconifyWindow (display->display, TermWin.parent[0],	3519	XIconifyWindow (disp, parent[0], display->screen);
3454	DefaultScreen (display->display));
3455	break;	3520	break;
3456	case 3: /* set position (pixels) */	3521	case 3: /* set position (pixels) */
3457	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3522	XMoveWindow (disp, parent[0], args[1], args[2]);
3458	break;	3523	break;
3459	case 4: /* set size (pixels) */	3524	case 4: /* set size (pixels) */
3460	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3525	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461	break;	3526	break;
3462	case 5: /* raise window */	3527	case 5: /* raise window */
3463	XRaiseWindow (display->display, TermWin.parent[0]);	3528	XRaiseWindow (disp, parent[0]);
3464	break;	3529	break;
3465	case 6: /* lower window */	3530	case 6: /* lower window */
3466	XLowerWindow (display->display, TermWin.parent[0]);	3531	XLowerWindow (disp, parent[0]);
3467	break;	3532	break;
3468	case 7: /* refresh window */	3533	case 7: /* refresh window */
3469	scr_touch (true);	3534	scr_touch (true);
3470	break;	3535	break;
3471	case 8: /* set size (chars) */	3536	case 8: /* set size (chars) */
3472	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3537	set_widthheight ((unsigned int) (args[2] * fwidth),
3473	(unsigned int) (args[1] * TermWin.fheight));	3538	(unsigned int) (args[1] * fheight));
3474	break;	3539	break;
3475		3540
3476	//case 9: NYI, TODO, restore maximized window or maximize window	3541	//case 9: NYI, TODO, restore maximized window or maximize window
3477	default:	3542	default:
3478	if (args[0] >= 24) /* set height (chars) */	3543	if (args[0] >= 24) /* set height (chars) */
3479	set_widthheight ((unsigned int)TermWin.width,	3544	set_widthheight ((unsigned int)width,
3480	(unsigned int) (args[1] * TermWin.fheight));	3545	(unsigned int) (args[1] * fheight));
3481	break;	3546	break;
3482		3547
3483		3548
3484	/*	3549	/*
3485	* reports - some output format copied from XTerm	3550	* reports - some output format copied from XTerm
3486	*/	3551	*/
3487	case 11: /* report window state */	3552	case 11: /* report window state */
3488	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3553	XGetWindowAttributes (disp, parent[0], &wattr);
3489	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3554	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490	break;	3555	break;
3491	case 13: /* report window position */	3556	case 13: /* report window position */
3492	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3557	XGetWindowAttributes (disp, parent[0], &wattr);
3493	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3558	XTranslateCoordinates (disp, parent[0], wattr.root,
3494	-wattr.border_width, -wattr.border_width,	3559	-wattr.border_width, -wattr.border_width,
3495	&x, &y, &wdummy);	3560	&x, &y, &wdummy);
3496	tt_printf ("\033[3;%d;%dt", x, y);	3561	tt_printf ("\033[3;%d;%dt", x, y);
3497	break;	3562	break;
3498	case 14: /* report window size (pixels) */	3563	case 14: /* report window size (pixels) */
3499	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3564	XGetWindowAttributes (disp, parent[0], &wattr);
3500	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3565	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501	break;	3566	break;
3502	case 18: /* report text area size (chars) */	3567	case 18: /* report text area size (chars) */
3503	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3568	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504	break;	3569	break;
3505	case 19: /* report window size (chars) */	3570	case 19: /* report window size (chars) */
3506	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3571	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507	break;	3572	break;
3508	case 20: /* report icon label */	3573	case 20: /* report icon label */
3509	{	3574	{
3510	char *s;	3575	char *s;
3511	XGetIconName (display->display, TermWin.parent[0], &s);	3576	XGetIconName (disp, parent[0], &s);
3512	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3577	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513	XFree (s);	3578	XFree (s);
3514	}	3579	}
3515	break;	3580	break;
3516	case 21: /* report window title */	3581	case 21: /* report window title */
3517	{	3582	{
3518	char *s;	3583	char *s;
3519	XFetchName (display->display, TermWin.parent[0], &s);	3584	XFetchName (disp, parent[0], &s);
3520	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3585	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521	XFree (s);	3586	XFree (s);
3522	}	3587	}
3523	break;	3588	break;
3524	}	3589	}
3525	}	3590	}
…		…
3557	else if (ch < 0x20)	3622	else if (ch < 0x20)
3558	return NULL; /* other control character - exit */	3623	return NULL; /* other control character - exit */
3559		3624
3560	seen_esc = false;	3625	seen_esc = false;
3561		3626
3562	if (n >= sizeof (string) - 1)	3627	if (n >= STRING_MAX - 1)
3563	// stop at some sane length	3628	// stop at some sane length
3564	return NULL;	3629	return NULL;
3565		3630
3566	if (ch == C0_SYN)	3631	if (ch == C0_SYN)
3567	string[n++] = cmd_get8 ();	3632	string[n++] = cmd_get8 ();
…		…
3635	set_window_color (color, str);	3700	set_window_color (color, str);
3636	}	3701	}
3637		3702
3638	/*	3703	/*
3639	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3704	* 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	*/	3705	*/
3663	void	3706	void
3664	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3707	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3665	{	3708	{
3666	int changed = 0;	3709	int changed = 0;
3667	int color;	3710	int color;
3668	char *buf, *name;	3711	char *buf, *name;
3669	bool query = str[0] == '?' && !str[1];	3712	bool query = str[0] == '?' && !str[1];
3670	int saveop = op;	3713	int saveop = op;
		3714	dDisp;
3671		3715
3672	assert (str != NULL);	3716	assert (str != NULL);
3673	switch (op)	3717	switch (op)
3674	{	3718	{
3675	case XTerm_name:	3719	case XTerm_name:
…		…
3691	unsigned long bytes_after;	3735	unsigned long bytes_after;
3692	unsigned char *value = 0;	3736	unsigned char *value = 0;
3693	const char *str = "";	3737	const char *str = "";
3694		3738
3695	if (prop	3739	if (prop
3696	&& XGetWindowProperty (display->display, TermWin.parent[0],	3740	&& XGetWindowProperty (disp, parent[0],
3697	prop, 0, 1<<16, 0, AnyPropertyType,	3741	prop, 0, 1<<16, 0, AnyPropertyType,
3698	&actual_type, &actual_format,	3742	&actual_type, &actual_format,
3699	&nitems, &bytes_after, &value) == Success	3743	&nitems, &bytes_after, &value) == Success
3700	&& actual_type != None	3744	&& actual_type != None
3701	&& actual_format == 8)	3745	&& actual_format == 8)
…		…
3713	{	3757	{
3714	*eq = 0;	3758	*eq = 0;
3715	set_utf8_property (display->atom (str), eq + 1);	3759	set_utf8_property (display->atom (str), eq + 1);
3716	}	3760	}
3717	else	3761	else
3718	XDeleteProperty (display->display, TermWin.parent[0],	3762	XDeleteProperty (disp, parent[0],
3719	display->atom (str));	3763	display->atom (str));
3720	}	3764	}
3721	break;	3765	break;
3722		3766
3723	case XTerm_Color:	3767	case XTerm_Color:
…		…
3764	break;	3808	break;
3765	#ifndef NO_BOLD_UNDERLINE_REVERSE	3809	#ifndef NO_BOLD_UNDERLINE_REVERSE
3766	case XTerm_Color_BD:	3810	case XTerm_Color_BD:
3767	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3811	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768	break;	3812	break;
3769	case XTerm_Color_IT:
3770	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771	break;
3772	case XTerm_Color_UL:	3813	case XTerm_Color_UL:
3773	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3814	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774	break;	3815	break;
3775	case XTerm_Color_RV:	3816	case XTerm_Color_RV:
3776	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3817	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777	break;	3818	break;
		3819	case URxvt_Color_IT:
		3820	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3821	break;
3778	#endif	3822	#endif
3779	#if TRANSPARENT && TINTING	3823	#if TRANSPARENT && TINTING
3780	case XTerm_Color_tint:	3824	case URxvt_Color_tint:
3781	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3825	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782	check_our_parents ();	3826	check_our_parents ();
3783	if (am_transparent)	3827	if (am_transparent)
3784	want_full_refresh = want_refresh = 1;	3828	want_full_refresh = want_refresh = 1;
3785	break;	3829	break;
3786	#endif	3830	#endif
…		…
3798	{	3842	{
3799	str++;	3843	str++;
3800	#if XPM_BACKGROUND	3844	#if XPM_BACKGROUND
3801	changed += scale_pixmap (str);	3845	changed += scale_pixmap (str);
3802	#endif	3846	#endif
3803
3804	}	3847	}
		3848
3805	if (changed)	3849	if (changed)
3806	{	3850	{
3807	#ifdef XPM_BACKGROUND	3851	#ifdef XPM_BACKGROUND
3808	resize_pixmap ();	3852	resize_pixmap ();
3809	#endif	3853	#endif
…		…
3820		3864
3821	case XTerm_logfile:	3865	case XTerm_logfile:
3822	// TODO, when secure mode?	3866	// TODO, when secure mode?
3823	break;	3867	break;
3824		3868
		3869	#ifdef MENUBAR
		3870	case URxvt_Menu:
		3871	if (OPTION (Opt_insecure))
		3872	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3873	break;
		3874	#endif
		3875	#if 0
		3876	case XTerm_dumpscreen: /* no error notices */
		3877	{
		3878	int fd;
		3879	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3880	{
		3881	scr_dump (fd);
		3882	close (fd);
		3883	}
		3884	}
		3885	break;
		3886	#endif
3825	case XTerm_font:	3887	case XTerm_font:
3826	op = URxvt_font;	3888	op = URxvt_font;
3827	case URxvt_font:	3889	case URxvt_font:
3828	#if ENABLE_STYLES	3890	#if ENABLE_STYLES
3829	case URxvt_boldFont:	3891	case URxvt_boldFont:
3830	case URxvt_italicFont:	3892	case URxvt_italicFont:
3831	case URxvt_boldItalicFont:	3893	case URxvt_boldItalicFont:
3832	#endif	3894	#endif
3833	if (query)	3895	if (query)
3834	tt_printf ("\33]%d;%-.250s%c", saveop,	3896	tt_printf ("\33]%d;%-.250s%c", saveop,
3835	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3897	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3898	? fontset[op - URxvt_font]->fontdesc : "",
3837	resp);	3899	resp);
3838	else	3900	else
3839	{	3901	{
3840	const char *&res = rs[Rs_font + (op - URxvt_font)];	3902	const char *&res = rs[Rs_font + (op - URxvt_font)];
3841		3903
…		…
3844	set_fonts ();	3906	set_fonts ();
3845	}	3907	}
3846	break;	3908	break;
3847		3909
3848	#if ENABLE_FRILLS	3910	#if ENABLE_FRILLS
3849	case XTerm_locale:	3911	case URxvt_locale:
3850	if (query)	3912	if (query)
3851	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3913	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3852	else	3914	else
3853	{	3915	{
3854	set_locale (str);	3916	set_locale (str);
3855	# ifdef USE_XIM	3917	pty.set_utf8_mode (enc_utf8);
3856	im_cb ();	3918	init_xlocale ();
3857	# endif
3858	}	3919	}
3859	break;	3920	break;
3860	#endif
3861		3921
3862	#ifdef MENUBAR	3922	case URxvt_view_up:
3863	case XTerm_Menu:	3923	case URxvt_view_down:
3864	if (options & Opt_insecure)	3924	int lines = atoi (str);
3865	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3925
3866	break;	3926	if (lines)
3867	#endif	3927	scr_page (op == URxvt_view_up ? UP : DN, lines);
3868	#if 0
3869	case XTerm_dumpscreen: /* no error notices */
3870	{	3928	else
3871	int fd;
3872	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3873	{	3929	{
3874	scr_dump (fd);	3930	scr_erase_savelines ();
3875	close (fd);
3876	}	3931	}
3877	}	3932
3878	break;	3933	break;
3879	#endif	3934	#endif
3880	}	3935	}
3881	}	3936	}
3882	/*----------------------------------------------------------------------*/	3937	/*----------------------------------------------------------------------*/
…		…
3991	}	4046	}
3992		4047
3993	/* extra handling for values with state unkept */	4048	/* extra handling for values with state unkept */
3994	switch (arg[i])	4049	switch (arg[i])
3995	{	4050	{
		4051	#if ENABLE_STYLES
		4052	case 1021:
		4053	if (mode)
		4054	SET_OPTION (Opt_intensityStyles);
		4055	else
		4056	CLR_OPTION (Opt_intensityStyles);
		4057
		4058	want_refresh = 1;
		4059	want_full_refresh = 1;
		4060	break;
		4061	#endif
3996	case 1048: /* alternative cursor save */	4062	case 1048: /* alternative cursor save */
3997	case 1049:	4063	case 1049:
3998	if (options & Opt_secondaryScreen)	4064	if (OPTION (Opt_secondaryScreen))
3999	if (mode == 0)	4065	if (mode == 0)
4000	scr_cursor (RESTORE);	4066	scr_cursor (RESTORE);
4001	else if (mode == 1)	4067	else if (mode == 1)
4002	scr_cursor (SAVE);	4068	scr_cursor (SAVE);
4003	break;	4069	break;
…		…
4015	*/	4081	*/
4016	PrivMode (1, PrivMode_vt52);	4082	PrivMode (1, PrivMode_vt52);
4017	break;	4083	break;
4018	case 3: /* 80/132 */	4084	case 3: /* 80/132 */
4019	if (priv_modes & PrivMode_132OK)	4085	if (priv_modes & PrivMode_132OK)
4020	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4086	set_widthheight (((state ? 132 : 80) * fwidth), height);
4021	break;	4087	break;
4022	case 4: /* smooth scrolling */	4088	case 4: /* smooth scrolling */
4023	if (state)	4089	if (!state)
4024	options &= ~Opt_jumpScroll;	4090	SET_OPTION (Opt_jumpScroll);
4025	else	4091	else
4026	options |= Opt_jumpScroll;	4092	CLR_OPTION (Opt_jumpScroll);
4027	break;	4093	break;
4028	case 5: /* reverse video */	4094	case 5: /* reverse video */
4029	scr_rvideo_mode (state);	4095	scr_rvideo_mode (state);
4030	break;	4096	break;
4031	case 6: /* relative/absolute origins */	4097	case 6: /* relative/absolute origins */
…		…
4072	#if 0	4138	#if 0
4073	case 1001:	4139	case 1001:
4074	break; /* X11 mouse highlighting */	4140	break; /* X11 mouse highlighting */
4075	#endif	4141	#endif
4076	case 1010: /* scroll to bottom on TTY output inhibit */	4142	case 1010: /* scroll to bottom on TTY output inhibit */
4077	if (state)	4143	if (!state)
4078	options &= ~Opt_scrollTtyOutput;	4144	SET_OPTION (Opt_scrollTtyOutput);
4079	else	4145	else
4080	options |= Opt_scrollTtyOutput;	4146	CLR_OPTION (Opt_scrollTtyOutput);
4081	break;	4147	break;
4082	case 1011: /* scroll to bottom on key press */	4148	case 1011: /* scroll to bottom on key press */
4083	if (state)	4149	if (state)
4084	options |= Opt_scrollTtyKeypress;	4150	SET_OPTION (Opt_scrollTtyKeypress);
4085	else	4151	else
4086	options &= ~Opt_scrollTtyKeypress;	4152	CLR_OPTION (Opt_scrollTtyKeypress);
4087	break;	4153	break;
4088	case 1047: /* secondary screen w/ clearing last */	4154	case 1047: /* secondary screen w/ clearing last */
4089	if (options & Opt_secondaryScreen)	4155	if (OPTION (Opt_secondaryScreen))
4090	if (current_screen != PRIMARY)	4156	if (current_screen != PRIMARY)
4091	scr_erase_screen (2);	4157	scr_erase_screen (2);
4092	scr_change_screen (state);	4158	scr_change_screen (state);
4093	break;	4159	break;
4094	case 1049: /* secondary screen w/ clearing first */	4160	case 1049: /* secondary screen w/ clearing first */
4095	scr_change_screen (state);	4161	scr_change_screen (state);
4096	if (options & Opt_secondaryScreen)	4162	if (OPTION (Opt_secondaryScreen))
4097	if (current_screen != PRIMARY)	4163	if (current_screen != PRIMARY)
4098	scr_erase_screen (2);	4164	scr_erase_screen (2);
4099	break;	4165	break;
4100	default:	4166	default:
4101	break;	4167	break;
…		…
4251	case 106:	4317	case 106:
4252	case 107:	4318	case 107:
4253	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4319	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254	break;	4320	break;
4255	#endif	4321	#endif
4256
4257	}	4322	}
4258	}	4323	}
4259	}	4324	}
4260	/*}}} */	4325	/*}}} */
4261		4326
…		…
4342	}	4407	}
4343		4408
4344	memmove (v_buffer, v_buffer + written, v_buflen);	4409	memmove (v_buffer, v_buffer + written, v_buflen);
4345	}	4410	}
4346	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4411	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347	// original code just ignores this...	4412	pty_ev.set (EVENT_READ);
4348	destroy ();
4349	}	4413	}
4350		4414
4351	/*----------------------- end-of-file (C source) -----------------------*/	4415	/*----------------------- end-of-file (C source) -----------------------*/
4352		4416

Diff Legend

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