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

Diff Legend

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