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.216 by root, Tue Dec 27 01:25:42 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 <wchar.h>	53	#ifdef KEYSYM_RESOURCE
		54	# include "keyboard.h"
		55	#endif
		56
54	#include <signal.h>	57	#include <csignal>
55		58
56	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
57		60
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		62
…		…
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]);
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	160	#endif
150		161
151	#if ENABLE_OVERLAY	162	#if ENABLE_OVERLAY
152	void	163	void
153	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154	{	165	{
155	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
156	rxvt_font *f = (*fs)[fs->find_font (ch)];	167	rxvt_font *f = (*fs)[fs->find_font (ch)];
157	wchar_t *chr, *alloc, ch2;	168	wchar_t *chr, *alloc, ch2, *fname;
158	int len;	169	int len;
		170
		171	fname = rxvt_utf8towcs (f->name);
159		172
160	#if ENABLE_COMBINING	173	#if ENABLE_COMBINING
161	if (IS_COMPOSE (ch))	174	if (IS_COMPOSE (ch))
162	{	175	{
163	len = rxvt_composite.expand (ch, 0);	176	len = rxvt_composite.expand (ch, 0);
…		…
172	alloc = 0;	185	alloc = 0;
173	chr = &ch2;	186	chr = &ch2;
174	len = 1;	187	len = 1;
175	}	188	}
176		189
177	int width = strlen (f->name);	190	char attr[80]; // plenty
178		191
		192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		193	(int)r,
		194	GET_FGCOLOR (r), GET_BGCOLOR (r),
		195	r & RS_Bold ? " bold" : "",
		196	r & RS_Italic ? " italic" : "",
		197	r & RS_Blink ? " blink" : "",
		198	r & RS_RVid ? " rvid" : "",
		199	r & RS_Uline ? " uline" : "",
		200	r & RS_Careful ? " careful" : "");
		201
		202	int width = wcswidth (fname, wcslen (fname));
		203
		204	max_it (width, 8+5); // for char + hey
		205	max_it (width, strlen (attr));
		206
179	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	207	scr_overlay_new (0, -1, width, len + 2);
180		208
181	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	209	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182		210
183	for (int y = 0; y < len; y++)	211	for (int y = 0; y < len; y++)
184	{	212	{
…		…
195	#endif	223	#endif
196	scr_overlay_set (11, y, ch, r);	224	scr_overlay_set (11, y, ch, r);
197	scr_overlay_set (12, y, NOCHAR, r);	225	scr_overlay_set (12, y, NOCHAR, r);
198	}	226	}
199		227
		228	scr_overlay_set (0, len , attr);
200	scr_overlay_set (0, len, f->name);	229	scr_overlay_set (0, len + 1, fname);
		230
		231	free (fname);
201		232
202	#if ENABLE_COMBINING	233	#if ENABLE_COMBINING
203	if (alloc)	234	if (alloc)
204	delete [] alloc;	235	delete [] alloc;
205	#endif	236	#endif
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	304	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	305	* escape sequence to toggle the Keypad.
275	*	306	*
276	* Always permit `shift' to override the current setting	307	* Always permit `shift' to override the current setting
277	*/	308	*/
278	shft = (ev.state & ShiftMask);	309	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	310	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	311	meta = ev.state & ModMetaMask;
281		312
282	if (numlock_state || (ev.state & ModNumLockMask))	313	if (numlock_state || (ev.state & ModNumLockMask))
283	{	314	{
284	numlock_state = (ev.state & ModNumLockMask);	315	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	316	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		336
306	// the XOpenIM manpage lies about hardcoding the locale	337	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	338	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	339	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	340	SET_LOCALE (rs[Rs_imLocale]);
		341
310	// assume wchar_t == unicode or better	342	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	343	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	344	KBUFSZ, &keysym, &status_return);
		345
313	if (rs[Rs_imLocale])	346	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	347	SET_LOCALE (locale);
315		348
316	if (status_return == XLookupChars	349	if (status_return == XLookupChars
317	|| status_return == XLookupBoth)	350	|| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	377	valid_keysym = keysym != NoSymbol;
345	}	378	}
346		379
347	if (valid_keysym)	380	if (valid_keysym)
348	{	381	{
		382	#ifdef KEYSYM_RESOURCE
		383	if (keyboard->dispatch (this, keysym, ev.state))
		384	return;
		385	#endif
		386
349	if (TermWin.saveLines)	387	if (saveLines)
350	{	388	{
351	#ifdef UNSHIFTED_SCROLLKEYS	389	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	390	if (!ctrl && !meta)
353	#else	391	#else
354	if (IS_SCROLL_MOD)	392	if (IS_SCROLL_MOD)
355	#endif	393	#endif
356	{	394	{
357	int lnsppg;	395	int lnsppg;
358		396
359	#ifdef PAGING_CONTEXT_LINES	397	#ifdef PAGING_CONTEXT_LINES
360	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	398	lnsppg = nrow - PAGING_CONTEXT_LINES;
361	#else	399	#else
362	lnsppg = TermWin.nrow * 4 / 5;	400	lnsppg = nrow * 4 / 5;
363	#endif	401	#endif
364	if (keysym == XK_Prior)	402	if (keysym == XK_Prior)
365	{	403	{
366	scr_page (UP, lnsppg);	404	scr_page (UP, lnsppg);
367	return;	405	return;
…		…
487	}	525	}
488	#endif	526	#endif
489		527
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	528	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	529	{
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	{	530	{
518	newlen = 1;	531	newlen = 1;
519	switch (keysym)	532	switch (keysym)
520	{	533	{
521	#ifndef NO_BACKSPACE_KEY	534	#ifndef NO_BACKSPACE_KEY
…		…
529	else	542	else
530	strcpy (kbuf, key_backspace);	543	strcpy (kbuf, key_backspace);
531	break;	544	break;
532	#endif	545	#endif
533	#ifndef NO_DELETE_KEY	546	#ifndef NO_DELETE_KEY
		547	# ifdef XK_KP_Prior
		548	case XK_KP_Delete:
		549	/* allow shift to override */
		550	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		551	{
		552	strcpy (kbuf, "\033On");
		553	break;
		554	}
		555	/* FALLTHROUGH */
		556	# endif
534	case XK_Delete:	557	case XK_Delete:
535	strcpy (kbuf, key_delete);	558	strcpy (kbuf, key_delete);
536	break;	559	break;
537	#endif	560	#endif
538	case XK_Tab:	561	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	664	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	665	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	666	strcpy (kbuf, "\033Ou");
644	break;	667	break;
645		668
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	669	#endif
654	case XK_KP_F1: /* "\033OP" */	670	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	671	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	672	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	673	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	705	break;
690		706
691	case XK_Find:	707	case XK_Find:
692	strcpy (kbuf, "\033[1~");	708	strcpy (kbuf, "\033[1~");
693	break;	709	break;
		710
		711	#ifdef XK_KP_End
		712	case XK_KP_Insert:
		713	/* allow shift to override */
		714	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		715	{
		716	strcpy (kbuf, "\033Op");
		717	break;
		718	}
		719	/* FALLTHROUGH */
		720	#endif
694	case XK_Insert:	721	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	722	strcpy (kbuf, "\033[2~");
696	break;	723	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	724	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	725	case DXK_Remove:
…		…
788	#undef FKEY	815	#undef FKEY
789	default:	816	default:
790	newlen = 0;	817	newlen = 0;
791	break;	818	break;
792	}	819	}
		820
793	if (newlen)	821	if (newlen)
794	len = strlen (kbuf);	822	len = strlen (kbuf);
795	}	823	}
796		824
797	/*	825	/*
…		…
806	else if (ctrl && keysym == XK_minus)	834	else if (ctrl && keysym == XK_minus)
807	{	835	{
808	len = 1;	836	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	837	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810	}	838	}
		839	else if (keysym == XK_ISO_Left_Tab)
		840	{
		841	strcpy (kbuf, "\033[Z");
		842	len = 3;
		843	}
811	else	844	else
812	{	845	{
813	#ifdef META8_OPTION	846	#ifdef META8_OPTION
814	/* set 8-bit on */	847	/* set 8-bit on */
815	if (meta && (meta_char == 0x80))	848	if (meta && (meta_char == 0x80))
…		…
828		861
829	if (len <= 0)	862	if (len <= 0)
830	return; /* not mapped */	863	return; /* not mapped */
831		864
832	if (options & Opt_scrollTtyKeypress)	865	if (options & Opt_scrollTtyKeypress)
833	if (TermWin.view_start)	866	if (view_start)
834	{	867	{
835	TermWin.view_start = 0;	868	view_start = 0;
836	want_refresh = 1;	869	want_refresh = 1;
837	}	870	}
838		871
839	/*	872	/*
840	* these modifications only affect the static keybuffer	873	* these modifications only affect the static keybuffer
…		…
873	#endif /* DEBUG_CMD */	906	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	907	tt_write (kbuf, (unsigned int)len);
875	}	908	}
876	/*}}} */	909	/*}}} */
877		910
878	#if (MENUBAR_MAX)	911	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	912	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880	/* attempt to `write' count to the input buffer */	913	/* attempt to `write' count to the input buffer */
881	unsigned int	914	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	915	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	916	{
…		…
906		939
907	cmd_parse ();	940	cmd_parse ();
908		941
909	return 0;	942	return 0;
910	}	943	}
911	#endif /* MENUBAR_MAX */	944	#endif
912		945
913	void	946	void
914	rxvt_term::flush ()	947	rxvt_term::flush ()
915	{	948	{
916	flush_ev.stop ();	949	flush_ev.stop ();
…		…
1017	{	1050	{
1018	if (mouse_slip_wheel_speed == 0	1051	if (mouse_slip_wheel_speed == 0
1019	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1052	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1053	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1054	{
		1055	if (view_start == nsaved ||
		1056	view_start == 0)
		1057	mouse_slip_wheel_speed = 0;
		1058
1022	refresh_type |= SMOOTH_REFRESH;	1059	refresh_type |= SMOOTH_REFRESH;
1023	want_refresh = 1;	1060	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1061	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1062	}
1026	}	1063	}
…		…
1046	if (n > 0)	1083	if (n > 0)
1047	{	1084	{
1048	cmdbuf_endp += n;	1085	cmdbuf_endp += n;
1049	return true;	1086	return true;
1050	}	1087	}
1051	else if (n < 0 && errno != EAGAIN)	1088	else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
		1089	{
		1090	pty_ev.stop ();
		1091
		1092	if (!(options & Opt_hold))
1052	destroy ();	1093	destroy ();
		1094	}
1053		1095
1054	return false;	1096	return false;
1055	}	1097	}
1056		1098
1057	void	1099	void
…		…
1071	}	1113	}
1072		1114
1073	void	1115	void
1074	rxvt_term::pointer_unblank ()	1116	rxvt_term::pointer_unblank ()
1075	{	1117	{
1076	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1118	XDefineCursor (display->display, vt, TermWin_cursor);
1077	recolour_cursor ();	1119	recolour_cursor ();
1078		1120
1079	#ifdef POINTER_BLANK	1121	#ifdef POINTER_BLANK
1080	hidden_pointer = 0;	1122	hidden_pointer = 0;
1081		1123
…		…
1089	rxvt_term::pointer_blank ()	1131	rxvt_term::pointer_blank ()
1090	{	1132	{
1091	if (! (options & Opt_pointerBlank))	1133	if (! (options & Opt_pointerBlank))
1092	return;	1134	return;
1093		1135
1094	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1136	XDefineCursor (display->display, vt, display->blank_cursor);
1095	XFlush (display->display);	1137	XFlush (display->display);
1096		1138
1097	hidden_pointer = 1;	1139	hidden_pointer = 1;
1098	}	1140	}
1099		1141
…		…
1188		1230
1189	/*{{{ process an X event */	1231	/*{{{ process an X event */
1190	void	1232	void
1191	rxvt_term::x_cb (XEvent &ev)	1233	rxvt_term::x_cb (XEvent &ev)
1192	{	1234	{
		1235	dDisp;
		1236
1193	SET_R (this);	1237	SET_R (this);
1194	SET_LOCALE (locale);	1238	SET_LOCALE (locale);
1195		1239
1196	#if defined(CURSOR_BLINK)	1240	#if defined(CURSOR_BLINK)
1197	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1241	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1313	button_release (ev.xbutton);	1357	button_release (ev.xbutton);
1314	break;	1358	break;
1315		1359
1316	case ClientMessage:	1360	case ClientMessage:
1317	if (ev.xclient.format == 32	1361	if (ev.xclient.format == 32
		1362	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1363	{
1318	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1364	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319	destroy ();	1365	destroy ();
		1366	#if ENABLE_EWMH
		1367	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1368	XSendEvent (disp, ev.xclient.window = display->root,
		1369	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1370	&ev);
		1371	#endif
		1372	}
		1373	#if ENABLE_XEMBED
		1374	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1375	{
		1376	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1377	focus_in ();
		1378	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1379	focus_out ();
		1380	}
		1381	#endif
1320	#ifdef OFFIX_DND	1382	#ifdef OFFIX_DND
1321	/* OffiX Dnd (drag 'n' drop) protocol */	1383	/* OffiX Dnd (drag 'n' drop) protocol */
1322	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1384	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323	&& (ev.xclient.data.l[0] == DndFile	1385	&& (ev.xclient.data.l[0] == DndFile
1324	|| ev.xclient.data.l[0] == DndDir	1386	|| ev.xclient.data.l[0] == DndDir
1325	|| ev.xclient.data.l[0] == DndLink))	1387	|| ev.xclient.data.l[0] == DndLink))
1326	{	1388	{
1327	/* Get Dnd data */	1389	/* Get Dnd data */
1328	Atom ActualType;	1390	Atom ActualType;
1329	int ActualFormat;	1391	int ActualFormat;
1330	unsigned char *data;	1392	unsigned char *data;
1331	unsigned long Size, RemainingBytes;	1393	unsigned long Size, RemainingBytes;
1332		1394
1333	XGetWindowProperty (display->display, display->root,	1395	XGetWindowProperty (disp, display->root,
1334	xa[XA_DNDSELECTION],	1396	xa[XA_DNDSELECTION],
1335	0L, 1000000L,	1397	0L, 1000000L,
1336	False, AnyPropertyType,	1398	False, AnyPropertyType,
1337	&ActualType, &ActualFormat,	1399	&ActualType, &ActualFormat,
1338	&Size, &RemainingBytes,	1400	&Size, &RemainingBytes,
1339	&data);	1401	&data);
1340	set_string_property (XA_CUT_BUFFER0, data);	1402	set_string_property (XA_CUT_BUFFER0, data);
1341	XFree (data);	1403	XFree (data);
1342	selection_paste (display->root, XA_CUT_BUFFER0, true);	1404	selection_paste (display->root, XA_CUT_BUFFER0, true);
1343	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1405	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344	}	1406	}
1345	#endif /* OFFIX_DND */	1407	#endif /* OFFIX_DND */
1346	break;	1408	break;
1347		1409
1348	case MappingNotify:	1410	case MappingNotify:
…		…
1373	break;	1435	break;
1374	}	1436	}
1375	break;	1437	break;
1376		1438
1377	case FocusIn:	1439	case FocusIn:
1378	if (!TermWin.focus)	1440	focus_in ();
		1441	break;
		1442
		1443	case FocusOut:
		1444	focus_out ();
		1445	break;
		1446
		1447	case ConfigureNotify:
		1448	if (ev.xconfigure.window == parent[0])
1379	{	1449	{
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));	1450	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1451	;
1447		1452
1448	if (szHint.width != width || szHint.height != height)	1453	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449	{	1454	{
1450	seen_resize = 1;	1455	seen_resize = 1;
1451	resize_all_windows (width, height, 1);	1456	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452	}	1457	}
1453		1458
1454	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1459	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455	if (options & Opt_transparent)	1460	if (options & Opt_transparent)
1456	check_our_parents ();	1461	check_our_parents ();
…		…
1477	case SelectionRequest:	1482	case SelectionRequest:
1478	selection_send (ev.xselectionrequest);	1483	selection_send (ev.xselectionrequest);
1479	break;	1484	break;
1480		1485
1481	case UnmapNotify:	1486	case UnmapNotify:
1482	TermWin.mapped = 0;	1487	mapped = 0;
1483	#ifdef TEXT_BLINK	1488	#ifdef TEXT_BLINK
1484	text_blink_ev.stop ();	1489	text_blink_ev.stop ();
1485	#endif	1490	#endif
1486	break;	1491	break;
1487		1492
1488	case MapNotify:	1493	case MapNotify:
1489	TermWin.mapped = 1;	1494	mapped = 1;
1490	#ifdef TEXT_BLINK	1495	#ifdef TEXT_BLINK
1491	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1496	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492	#endif	1497	#endif
1493	break;	1498	break;
1494		1499
…		…
1498	break;	1503	break;
1499	#endif /* TRANSPARENT */	1504	#endif /* TRANSPARENT */
1500		1505
1501	case GraphicsExpose:	1506	case GraphicsExpose:
1502	case Expose:	1507	case Expose:
1503	if (ev.xany.window == TermWin.vt)	1508	if (ev.xany.window == vt)
1504	{	1509	{
1505	do	1510	do
1506	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1507	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
1508	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1513	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509		1514
1510	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1515	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511		1516
1512	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1517	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513	scr_expose (ev.xexpose.x, ev.xexpose.y,	1518	scr_expose (ev.xexpose.x, ev.xexpose.y,
1514	ev.xexpose.width, ev.xexpose.height, False);	1519	ev.xexpose.width, ev.xexpose.height, False);
1515		1520
1516	scr_refresh (refresh_type);	1521	scr_refresh (refresh_type);
1517	}	1522	}
1518	else	1523	else
1519	{	1524	{
1520	XEvent unused_event;	1525	XEvent unused_event;
1521		1526
1522	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1527	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523	;	1528	;
1524	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1529	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525	;	1530	;
1526		1531
1527	if (isScrollbarWindow (ev.xany.window))	1532	if (isScrollbarWindow (ev.xany.window))
1528	{	1533	{
1529	scrollBar.setIdle ();	1534	scrollBar.setIdle ();
…		…
1533	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1538	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534	menubar_expose ();	1539	menubar_expose ();
1535	#endif	1540	#endif
1536		1541
1537	#ifdef TRANSPARENT	1542	#ifdef TRANSPARENT
1538	if (am_transparent && ev.xany.window == TermWin.parent[0])	1543	if (am_transparent && ev.xany.window == parent[0])
1539	XClearWindow (display->display, ev.xany.window);	1544	XClearWindow (disp, ev.xany.window);
1540	#endif	1545	#endif
1541	}	1546	}
1542	break;	1547	break;
1543		1548
1544	case MotionNotify:	1549	case MotionNotify:
…		…
1554	}	1559	}
1555	#endif	1560	#endif
1556	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1561	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557	break;	1562	break;
1558		1563
1559	if (ev.xany.window == TermWin.vt)	1564	if (ev.xany.window == vt)
1560	{	1565	{
1561	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1566	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562	{	1567	{
1563	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1568	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564	;	1569	;
1565		1570
1566	XQueryPointer (display->display, TermWin.vt,	1571	XQueryPointer (disp, vt,
1567	&unused_root, &unused_child,	1572	&unused_root, &unused_child,
1568	&unused_root_x, &unused_root_y,	1573	&unused_root_x, &unused_root_y,
1569	&ev.xbutton.x, &ev.xbutton.y,	1574	&ev.xbutton.x, &ev.xbutton.y,
1570	&ev.xbutton.state);	1575	&ev.xbutton.state);
1571	#ifdef MOUSE_THRESHOLD	1576	#ifdef MOUSE_THRESHOLD
…		…
1583	#endif	1588	#endif
1584	selection_extend (ev.xbutton.x, ev.xbutton.y,	1589	selection_extend (ev.xbutton.x, ev.xbutton.y,
1585	ev.xbutton.state & Button3Mask ? 2 : 0);	1590	ev.xbutton.state & Button3Mask ? 2 : 0);
1586		1591
1587	#ifdef SELECTION_SCROLLING	1592	#ifdef SELECTION_SCROLLING
1588	if (ev.xbutton.y < TermWin.int_bwidth	1593	if (ev.xbutton.y < int_bwidth
1589	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1594	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1590	{	1595	{
1591	int dist;	1596	int dist;
1592		1597
1593	/* don't clobber the current delay if we are	1598	/* don't clobber the current delay if we are
1594	* already in the middle of scrolling.	1599	* already in the middle of scrolling.
…		…
1602	selection_save_x = ev.xbutton.x;	1607	selection_save_x = ev.xbutton.x;
1603	selection_save_y = ev.xbutton.y;	1608	selection_save_y = ev.xbutton.y;
1604	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1609	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605		1610
1606	/* calc number of lines to scroll */	1611	/* calc number of lines to scroll */
1607	if (ev.xbutton.y < TermWin.int_bwidth)	1612	if (ev.xbutton.y < int_bwidth)
1608	{	1613	{
1609	scroll_selection_dir = UP;	1614	scroll_selection_dir = UP;
1610	dist = TermWin.int_bwidth - ev.xbutton.y;	1615	dist = int_bwidth - ev.xbutton.y;
1611	}	1616	}
1612	else	1617	else
1613	{	1618	{
1614	scroll_selection_dir = DN;	1619	scroll_selection_dir = DN;
1615	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1620	dist = ev.xbutton.y - (int_bwidth + height);
1616	}	1621	}
1617		1622
1618	scroll_selection_lines = Pixel2Height (dist)	1623	scroll_selection_lines = Pixel2Height (dist)
1619	/ SELECTION_SCROLL_LINE_SPEEDUP	1624	/ SELECTION_SCROLL_LINE_SPEEDUP
1620	+ 1;	1625	+ 1;
1621	MIN_IT (scroll_selection_lines,	1626	min_it (scroll_selection_lines,
1622	SELECTION_SCROLL_MAX_LINES);	1627	SELECTION_SCROLL_MAX_LINES);
1623	}	1628	}
1624	else	1629	else
1625	{	1630	{
1626	/* we are within the text window, so we	1631	/* we are within the text window, so we
…		…
1635	#endif	1640	#endif
1636	}	1641	}
1637	}	1642	}
1638	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1643	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639	{	1644	{
1640	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1645	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641	MotionNotify, &ev))	1646	MotionNotify, &ev))
1642	;	1647	;
1643		1648
1644	XQueryPointer (display->display, scrollBar.win,	1649	XQueryPointer (disp, scrollBar.win,
1645	&unused_root, &unused_child,	1650	&unused_root, &unused_child,
1646	&unused_root_x, &unused_root_y,	1651	&unused_root_x, &unused_root_y,
1647	&ev.xbutton.x, &ev.xbutton.y,	1652	&ev.xbutton.x, &ev.xbutton.y,
1648	&unused_mask);	1653	&unused_mask);
1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1654	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1654	}	1659	}
1655	break;	1660	break;
1656	}	1661	}
1657	}	1662	}
1658		1663
		1664	void
		1665	rxvt_term::focus_in ()
		1666	{
		1667	if (!focus)
		1668	{
		1669	focus = 1;
		1670	want_refresh = 1;
		1671	#if USE_XIM
		1672	if (Input_Context != NULL)
		1673	{
		1674	IMSetStatusPosition ();
		1675	XSetICFocus (Input_Context);
		1676	}
		1677	#endif
		1678	#if CURSOR_BLINK
		1679	if (options & Opt_cursorBlink)
		1680	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1681	#endif
		1682	#if OFF_FOCUS_FADING
		1683	if (rs[Rs_fade])
		1684	{
		1685	pix_colors = pix_colors_focused;
		1686	scr_recolour ();
		1687	}
		1688	#endif
		1689	}
		1690	}
		1691
		1692	void
		1693	rxvt_term::focus_out ()
		1694	{
		1695	if (focus)
		1696	{
		1697	focus = 0;
		1698	want_refresh = 1;
		1699
		1700	#if ENABLE_FRILLS || ISO_14755
		1701	iso14755buf = 0;
		1702	#endif
		1703	#if ENABLE_OVERLAY
		1704	scr_overlay_off ();
		1705	#endif
		1706	#if USE_XIM
		1707	if (Input_Context != NULL)
		1708	XUnsetICFocus (Input_Context);
		1709	#endif
		1710	#if CURSOR_BLINK
		1711	if (options & Opt_cursorBlink)
		1712	cursor_blink_ev.stop ();
		1713	hidden_cursor = 0;
		1714	#endif
		1715	#if OFF_FOCUS_FADING
		1716	if (rs[Rs_fade])
		1717	{
		1718	pix_colors = pix_colors_unfocused;
		1719	scr_recolour ();
		1720	}
		1721	#endif
		1722	}
		1723	}
		1724
1659	#if TRANSPARENT	1725	#if TRANSPARENT
1660	void	1726	void
1661	rxvt_term::rootwin_cb (XEvent &ev)	1727	rxvt_term::rootwin_cb (XEvent &ev)
1662	{	1728	{
1663	SET_R (this);	1729	SET_R (this);
…		…
1668	case PropertyNotify:	1734	case PropertyNotify:
1669	/*	1735	/*
1670	* if user used some Esetroot compatible prog to set the root bg,	1736	* 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.	1737	* use the property to determine the pixmap. We use it later on.
1672	*/	1738	*/
1673	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1739	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1674	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1740	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1675	return;	1741	return;
1676		1742
1677	/* FALLTHROUGH */	1743	/* FALLTHROUGH */
1678	case ReparentNotify:	1744	case ReparentNotify:
1679	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1745	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1693	reportmode = !! (priv_modes & PrivMode_mouse_report);	1759	reportmode = !! (priv_modes & PrivMode_mouse_report);
1694		1760
1695	/*	1761	/*
1696	* VT window processing of button press	1762	* VT window processing of button press
1697	*/	1763	*/
1698	if (ev.window == TermWin.vt)	1764	if (ev.window == vt)
1699	{	1765	{
1700	#if ISO_14755	1766	#if ISO_14755
1701	// 5.4	1767	// 5.4
1702	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1768	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703	{	1769	{
…		…
1751	{	1817	{
1752	case Button1:	1818	case Button1:
1753	/* allow meta + click to select rectangular areas */	1819	/* allow meta + click to select rectangular areas */
1754	/* should be done in screen.C */	1820	/* should be done in screen.C */
1755	#if ENABLE_FRILLS	1821	#if ENABLE_FRILLS
1756	selection.rect = !! (ev.state & ModMetaMask);	1822	selection.rect = !!(ev.state & ModMetaMask);
1757	#else	1823	#else
1758	selection.rect = false;	1824	selection.rect = false;
1759	#endif	1825	#endif
1760		1826
1761	/* allow shift+left click to extend selection */	1827	/* allow shift+left click to extend selection */
…		…
1908	case Button3:	1974	case Button3:
1909	if (scrollBar.style != R_SB_XTERM)	1975	if (scrollBar.style != R_SB_XTERM)
1910	{	1976	{
1911	if (scrollbar_above_slider (ev.y))	1977	if (scrollbar_above_slider (ev.y))
1912	# ifdef RXVT_SCROLL_FULL	1978	# ifdef RXVT_SCROLL_FULL
1913	scr_page (UP, TermWin.nrow - 1);	1979	scr_page (UP, nrow - 1);
1914	# else	1980	# else
1915	scr_page (UP, TermWin.nrow / 4);	1981	scr_page (UP, nrow / 4);
1916	# endif	1982	# endif
1917	else if (scrollbar_below_slider (ev.y))	1983	else if (scrollbar_below_slider (ev.y))
1918	# ifdef RXVT_SCROLL_FULL	1984	# ifdef RXVT_SCROLL_FULL
1919	scr_page (DN, TermWin.nrow - 1);	1985	scr_page (DN, nrow - 1);
1920	# else	1986	# else
1921	scr_page (DN, TermWin.nrow / 4);	1987	scr_page (DN, nrow / 4);
1922	# endif	1988	# endif
1923	else	1989	else
1924	scrollBar.setMotion ();	1990	scrollBar.setMotion ();
1925	}	1991	}
1926	else	1992	else
1927	{	1993	{
1928	scr_page ((ev.button == Button1 ? DN : UP),	1994	scr_page ((ev.button == Button1 ? DN : UP),
1929	(TermWin.nrow	1995	(nrow
1930	* scrollbar_position (ev.y)	1996	* scrollbar_position (ev.y)
1931	/ scrollbar_size ()));	1997	/ scrollbar_size ()));
1932	}	1998	}
1933		1999
1934	break;	2000	break;
…		…
1966	#ifdef SELECTION_SCROLLING	2032	#ifdef SELECTION_SCROLLING
1967	if (sel_scroll_ev.active)	2033	if (sel_scroll_ev.active)
1968	sel_scroll_ev.stop();	2034	sel_scroll_ev.stop();
1969	#endif	2035	#endif
1970		2036
1971	if (ev.window == TermWin.vt)	2037	if (ev.window == vt)
1972	{	2038	{
1973	#if ISO_14755	2039	#if ISO_14755
1974	// 5.4	2040	// 5.4
1975	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2041	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976	return;	2042	return;
…		…
2027	v = ev.button == Button4 ? UP : DN;	2093	v = ev.button == Button4 ? UP : DN;
2028		2094
2029	if (ev.state & ShiftMask)	2095	if (ev.state & ShiftMask)
2030	i = 1;	2096	i = 1;
2031	else if (options & Opt_mouseWheelScrollPage)	2097	else if (options & Opt_mouseWheelScrollPage)
2032	i = TermWin.nrow - 1;	2098	i = nrow - 1;
2033	else	2099	else
2034	i = 5;	2100	i = 5;
2035		2101
2036	# ifdef MOUSE_SLIP_WHEELING	2102	# ifdef MOUSE_SLIP_WHEELING
2037	if (ev.state & ControlMask)	2103	if (ev.state & ControlMask)
2038	{	2104	{
2039	mouse_slip_wheel_speed += v ? -1 : 1;	2105	mouse_slip_wheel_speed += v ? -1 : 1;
2040	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2106	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;	2107	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042		2108
2043	if (slip_wheel_ev.at < NOW)	2109	if (slip_wheel_ev.at < NOW)
2044	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2110	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045		2111
2046	slip_wheel_ev.start ();	2112	slip_wheel_ev.start ();
…		…
2087	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2153	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2154	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2155	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090	int i;	2156	int i;
2091		2157
2092	Visual* visual = display->visual;	2158	Visual *visual = display->visual;
2093		2159
2094	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2160	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095		2161
2096	/* for convenience */	2162	/* for convenience */
2097	mask_r = visual->red_mask;	2163	mask_r = visual->red_mask;
…		…
2318	Atom atype;	2384	Atom atype;
2319	unsigned char *prop = NULL;	2385	unsigned char *prop = NULL;
2320	Window root, oldp, *list;	2386	Window root, oldp, *list;
2321	Pixmap rootpixmap = None;	2387	Pixmap rootpixmap = None;
2322	XWindowAttributes wattr, wrootattr;	2388	XWindowAttributes wattr, wrootattr;
		2389	dDisp;
2323		2390
2324	pchanged = 0;	2391	pchanged = 0;
2325		2392
2326	if (!(options & Opt_transparent))	2393	if (!(options & Opt_transparent))
2327	return pchanged; /* Don't try any more */	2394	return pchanged; /* Don't try any more */
2328		2395
2329	XGetWindowAttributes (display->display, display->root, &wrootattr);	2396	XGetWindowAttributes (disp, display->root, &wrootattr);
2330	rootdepth = wrootattr.depth;	2397	rootdepth = wrootattr.depth;
2331		2398
2332	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2399	XGetWindowAttributes (disp, parent[0], &wattr);
2333		2400
2334	if (rootdepth != wattr.depth)	2401	if (rootdepth != wattr.depth)
2335	{	2402	{
2336	if (am_transparent)	2403	if (am_transparent)
2337	{	2404	{
2338	pchanged = 1;	2405	pchanged = 1;
2339	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2406	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340	am_transparent = am_pixmap_trans = 0;	2407	am_transparent = am_pixmap_trans = 0;
2341	}	2408	}
2342		2409
2343	return pchanged; /* Don't try any more */	2410	return pchanged; /* Don't try any more */
2344	}	2411	}
2345		2412
2346	/* Get all X ops out of the queue so that our information is up-to-date. */	2413	/* Get all X ops out of the queue so that our information is up-to-date. */
2347	XSync (display->display, False);	2414	XSync (disp, False);
2348		2415
2349	/*	2416	/*
2350	* Make the frame window set by the window manager have	2417	* Make the frame window set by the window manager have
2351	* the root background. Some window managers put multiple nested frame	2418	* the root background. Some window managers put multiple nested frame
2352	* windows for each client, so we have to take care about that.	2419	* windows for each client, so we have to take care about that.
2353	*/	2420	*/
2354	i = (xa[XA_XROOTPMAP_ID]	2421	i = (xa[XA_XROOTPMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2422	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2423	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2424	&nitems, &bytes_after, &prop) == Success);
2358		2425
2359	if (!i || prop == NULL)	2426	if (!i || prop == NULL)
2360	i = (xa[XA_ESETROOT_PMAP_ID]	2427	i = (xa[XA_ESETROOT_PMAP_ID]
2361	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2428	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2429	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363	&nitems, &bytes_after, &prop) == Success);	2430	&nitems, &bytes_after, &prop) == Success);
2364		2431
2365	if (!i || prop == NULL	2432	if (!i || prop == NULL
2366	#if TINTING	2433	#if TINTING
…		…
2385	Window cr;	2452	Window cr;
2386	XImage *image;	2453	XImage *image;
2387	GC gc;	2454	GC gc;
2388	XGCValues gcvalue;	2455	XGCValues gcvalue;
2389		2456
2390	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2457	XTranslateCoordinates (disp, parent[0], display->root,
2391	0, 0, &sx, &sy, &cr);	2458	0, 0, &sx, &sy, &cr);
2392	nw = (unsigned int)szHint.width;	2459	nw = (unsigned int)szHint.width;
2393	nh = (unsigned int)szHint.height;	2460	nh = (unsigned int)szHint.height;
2394	nx = ny = 0;	2461	nx = ny = 0;
2395		2462
…		…
2405	nh += sy;	2472	nh += sy;
2406	ny = -sy;	2473	ny = -sy;
2407	sy = 0;	2474	sy = 0;
2408	}	2475	}
2409		2476
2410	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2477	min_it (nw, (unsigned int) (wrootattr.width - sx));
2411	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2478	min_it (nh, (unsigned int) (wrootattr.height - sy));
2412		2479
2413	XSync (display->display, False);	2480	XSync (disp, False);
2414	allowedxerror = -1;	2481	allowedxerror = -1;
2415	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2482	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416		2483
2417	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2484	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2418	/* XXX: may need a delay here? */	2485	/* XXX: may need a delay here? */
2419	allowedxerror = 0;	2486	allowedxerror = 0;
2420		2487
2421	if (image == NULL)	2488	if (image == NULL)
2422	{	2489	{
2423	if (am_transparent && am_pixmap_trans)	2490	if (am_transparent && am_pixmap_trans)
2424	{	2491	{
2425	pchanged = 1;	2492	pchanged = 1;
2426	if (TermWin.pixmap != None)	2493	if (pixmap != None)
2427	{	2494	{
2428	XFreePixmap (display->display, TermWin.pixmap);	2495	XFreePixmap (disp, pixmap);
2429	TermWin.pixmap = None;	2496	pixmap = None;
2430	}	2497	}
2431	}	2498	}
2432		2499
2433	am_pixmap_trans = 0;	2500	am_pixmap_trans = 0;
2434	}	2501	}
2435	else	2502	else
2436	{	2503	{
2437	if (TermWin.pixmap != None)	2504	if (pixmap != None)
2438	XFreePixmap (display->display, TermWin.pixmap);	2505	XFreePixmap (disp, pixmap);
2439		2506
2440	#if TINTING	2507	#if TINTING
2441	if (ISSET_PIXCOLOR (Color_tint))	2508	if (ISSET_PIXCOLOR (Color_tint))
2442	{	2509	{
2443	unsigned short rm, gm, bm;	2510	unsigned short rm, gm, bm;
…		…
2447		2514
2448	ShadeXImage (display, image, shade, rm, gm, bm);	2515	ShadeXImage (display, image, shade, rm, gm, bm);
2449	}	2516	}
2450	#endif	2517	#endif
2451		2518
2452	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2519	pixmap = XCreatePixmap (disp, vt,
2453	szHint.width, szHint.height, image->depth);	2520	szHint.width, szHint.height, image->depth);
2454	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2521	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2455	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2522	XPutImage (disp, pixmap, gc, image, 0, 0,
2456	nx, ny, image->width, image->height);	2523	nx, ny, image->width, image->height);
2457	XFreeGC (display->display, gc);	2524	XFreeGC (disp, gc);
2458	XDestroyImage (image);	2525	XDestroyImage (image);
2459	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2526	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2460	XClearWindow (display->display, TermWin.parent[0]);	2527	XClearWindow (disp, parent[0]);
2461		2528
2462	if (!am_transparent || !am_pixmap_trans)	2529	if (!am_transparent || !am_pixmap_trans)
2463	pchanged = 1;	2530	pchanged = 1;
2464		2531
2465	am_transparent = am_pixmap_trans = 1;	2532	am_transparent = am_pixmap_trans = 1;
2466	}	2533	}
2467	}	2534	}
2468		2535
2469	if (am_pixmap_trans)	2536	if (am_pixmap_trans)
2470	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2537	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2471	else	2538	else
2472	{	2539	{
2473	unsigned int n;	2540	unsigned int n;
2474	/*	2541	/*
2475	* InheritPixmap transparency	2542	* InheritPixmap transparency
2476	*/	2543	*/
2477	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2544	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2478	{	2545	{
2479	oldp = TermWin.parent[i];	2546	oldp = parent[i];
2480	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2547	XQueryTree (disp, parent[i - 1], &root,
2481	&TermWin.parent[i], &list, &n);	2548	&parent[i], &list, &n);
2482	XFree (list);	2549	XFree (list);
2483		2550
2484	if (TermWin.parent[i] == display->root)	2551	if (parent[i] == display->root)
2485	{	2552	{
2486	if (oldp != None)	2553	if (oldp != None)
2487	pchanged = 1;	2554	pchanged = 1;
2488		2555
2489	break;	2556	break;
2490	}	2557	}
2491		2558
2492	if (oldp != TermWin.parent[i])	2559	if (oldp != parent[i])
2493	pchanged = 1;	2560	pchanged = 1;
2494	}	2561	}
2495		2562
2496	n = 0;	2563	n = 0;
2497		2564
2498	if (pchanged)	2565	if (pchanged)
2499	{	2566	{
2500	for (; n < (unsigned int)i; n++)	2567	for (; n < (unsigned int)i; n++)
2501	{	2568	{
2502	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2569	XGetWindowAttributes (disp, parent[n], &wattr);
2503	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2570	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504	{	2571	{
2505	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2572	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2506	break;	2573	break;
2507	}	2574	}
2508	}	2575	}
2509	}	2576	}
2510		2577
2511	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2578	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2512	{	2579	{
2513	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2580	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2514	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2581	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2515	am_transparent = 0;	2582	am_transparent = 0;
2516	/* XXX: also turn off Opt_transparent? */	2583	/* XXX: also turn off Opt_transparent? */
2517	}	2584	}
2518	else	2585	else
2519	{	2586	{
…		…
2522	* needed for fvwm2.2.2 (and before?) */	2589	* needed for fvwm2.2.2 (and before?) */
2523	sleep (1);	2590	sleep (1);
2524	#endif	2591	#endif
2525	for (n = 0; n < (unsigned int)i; n++)	2592	for (n = 0; n < (unsigned int)i; n++)
2526	{	2593	{
2527	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2594	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2528	XClearWindow (display->display, TermWin.parent[n]);	2595	XClearWindow (disp, parent[n]);
2529	}	2596	}
2530		2597
2531	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2532	am_transparent = 1;	2599	am_transparent = 1;
2533	}	2600	}
2534		2601
2535	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2602	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2536	TermWin.parent[i] = None;	2603	parent[i] = None;
2537	}	2604	}
2538		2605
2539	if (scrollBar.win)	2606	if (scrollBar.win)
2540	{	2607	{
2541	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2608	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542	scrollBar.setIdle ();	2609	scrollBar.setIdle ();
2543	scrollbar_show (0);	2610	scrollbar_show (0);
2544	}	2611	}
2545		2612
2546	if (am_transparent)	2613	if (am_transparent)
…		…
2584	// some window managers resize the window early, and these programs	2651	// some window managers resize the window early, and these programs
2585	// then sometimes get the size wrong.	2652	// then sometimes get the size wrong.
2586	// unfortunately other programs are even more buggy and dislike	2653	// unfortunately other programs are even more buggy and dislike
2587	// being sent SIGWINCH, so only do it when we were in fact being	2654	// being sent SIGWINCH, so only do it when we were in fact being
2588	// resized.	2655	// resized.
2589	if (seen_resize)	2656	if (seen_resize && cmd_pid)
2590	kill (-cmd_pid, SIGWINCH);	2657	kill (-cmd_pid, SIGWINCH);
2591	}	2658	}
2592		2659
2593	/* Read a text string from the input buffer */	2660	/* Read a text string from the input buffer */
2594	unicode_t buf[UBUFSIZ];	2661	unicode_t buf[UBUFSIZ];
2595	bool refreshnow = false;	2662	bool refreshnow = false;
2596	int nlines = 0;	2663	int nlines = 0;
2597	unicode_t *str = buf;	2664	unicode_t *str = buf;
		2665	unicode_t *eol = str + min (ncol, UBUFSIZ);
2598		2666
2599	for (;;)	2667	for (;;)
2600	{	2668	{
2601	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2669	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2602	break;	2670	break;
2603		2671
2604	*str++ = ch;	2672	*str++ = ch;
2605		2673
2606	if (ch == C0_LF)	2674	if (ch == C0_LF || str >= eol)
2607	{	2675	{
		2676	if (ch == C0_LF)
2608	nlines++;	2677	nlines++;
		2678
2609	refresh_count++;	2679	refresh_count++;
2610		2680
2611	if (!(options & Opt_jumpScroll)	2681	if (!(options & Opt_jumpScroll)
2612	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2682	|| (refresh_count >= refresh_limit * (nrow - 1)))
2613	{	2683	{
2614	refreshnow = true;	2684	refreshnow = true;
2615	ch = NOCHAR;	2685	ch = NOCHAR;
2616	break;	2686	break;
2617	}	2687	}
2618		2688
2619	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2689	// scr_add_lines only works for nlines <= nrow - 1.
2620	if (nlines >= TermWin.nrow - 1)	2690	if (nlines >= nrow - 1)
2621	{	2691	{
2622	scr_add_lines (buf, nlines, str - buf);	2692	scr_add_lines (buf, nlines, str - buf);
2623	nlines = 0;	2693	nlines = 0;
2624	str = buf;	2694	str = buf;
		2695	eol = str + min (ncol, UBUFSIZ);
2625	}	2696	}
2626	}
2627		2697
2628	if (str >= buf + UBUFSIZ)	2698	if (str >= eol)
2629	{	2699	{
		2700	if (eol >= buf + UBUFSIZ)
		2701	{
2630	ch = NOCHAR;	2702	ch = NOCHAR;
2631	break;	2703	break;
		2704	}
		2705	else
		2706	eol = min (eol + ncol, buf + UBUFSIZ);
		2707	}
		2708
2632	}	2709	}
2633		2710
2634	seq_begin = cmdbuf_ptr;	2711	seq_begin = cmdbuf_ptr;
2635	ch = next_char ();	2712	ch = next_char ();
2636	}	2713	}
…		…
2707	if (len == (size_t)-1)	2784	if (len == (size_t)-1)
2708	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2785	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709		2786
2710	// assume wchar == unicode	2787	// assume wchar == unicode
2711	cmdbuf_ptr += len;	2788	cmdbuf_ptr += len;
2712	return wc;	2789	return wc & UNICODE_MASK;
2713	}	2790	}
2714		2791
2715	return NOCHAR;	2792	return NOCHAR;
2716	}	2793	}
2717		2794
…		…
3180	{	3257	{
3181	switch (priv)	3258	switch (priv)
3182	{	3259	{
3183	case '>':	3260	case '>':
3184	if (ch == CSI_DA) /* secondary device attributes */	3261	if (ch == CSI_DA) /* secondary device attributes */
3185	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3262	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3186	break;	3263	break;
3187	case '?':	3264	case '?':
3188	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3265	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189	process_terminal_mode (ch, priv, nargs, arg);	3266	process_terminal_mode (ch, priv, nargs, arg);
3190	break;	3267	break;
…		…
3295		3372
3296	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3373	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3297	arg[0] = -arg[0];	3374	arg[0] = -arg[0];
3298	/* FALLTHROUGH */	3375	/* FALLTHROUGH */
3299	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3376	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3300	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3377	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3301	break;	3378	break;
3302		3379
3303	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3380	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3304	tt_write ((const unsigned char *)VT100_ANS,	3381	tt_write ((const unsigned char *)VT100_ANS,
3305	(unsigned int) (sizeof (VT100_ANS) - 1));	3382	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3419	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3496	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420	{	3497	{
3421	int x, y;	3498	int x, y;
3422	XWindowAttributes wattr;	3499	XWindowAttributes wattr;
3423	Window wdummy;	3500	Window wdummy;
		3501	dDisp;
3424		3502
3425	if (nargs == 0)	3503	if (nargs == 0)
3426	return;	3504	return;
3427		3505
3428	switch (args[0])	3506	switch (args[0])
3429	{	3507	{
3430	/*	3508	/*
3431	* commands	3509	* commands
3432	*/	3510	*/
3433	case 1: /* deiconify window */	3511	case 1: /* deiconify window */
3434	XMapWindow (display->display, TermWin.parent[0]);	3512	XMapWindow (disp, parent[0]);
3435	break;	3513	break;
3436	case 2: /* iconify window */	3514	case 2: /* iconify window */
3437	XIconifyWindow (display->display, TermWin.parent[0],	3515	XIconifyWindow (disp, parent[0], display->screen);
3438	DefaultScreen (display->display));
3439	break;	3516	break;
3440	case 3: /* set position (pixels) */	3517	case 3: /* set position (pixels) */
3441	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3518	XMoveWindow (disp, parent[0], args[1], args[2]);
3442	break;	3519	break;
3443	case 4: /* set size (pixels) */	3520	case 4: /* set size (pixels) */
3444	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3521	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445	break;	3522	break;
3446	case 5: /* raise window */	3523	case 5: /* raise window */
3447	XRaiseWindow (display->display, TermWin.parent[0]);	3524	XRaiseWindow (disp, parent[0]);
3448	break;	3525	break;
3449	case 6: /* lower window */	3526	case 6: /* lower window */
3450	XLowerWindow (display->display, TermWin.parent[0]);	3527	XLowerWindow (disp, parent[0]);
3451	break;	3528	break;
3452	case 7: /* refresh window */	3529	case 7: /* refresh window */
3453	scr_touch (true);	3530	scr_touch (true);
3454	break;	3531	break;
3455	case 8: /* set size (chars) */	3532	case 8: /* set size (chars) */
3456	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3533	set_widthheight ((unsigned int) (args[2] * fwidth),
3457	(unsigned int) (args[1] * TermWin.fheight));	3534	(unsigned int) (args[1] * fheight));
3458	break;	3535	break;
3459		3536
3460	//case 9: NYI, TODO, restore maximized window or maximize window	3537	//case 9: NYI, TODO, restore maximized window or maximize window
3461	default:	3538	default:
3462	if (args[0] >= 24) /* set height (chars) */	3539	if (args[0] >= 24) /* set height (chars) */
3463	set_widthheight ((unsigned int)TermWin.width,	3540	set_widthheight ((unsigned int)width,
3464	(unsigned int) (args[1] * TermWin.fheight));	3541	(unsigned int) (args[1] * fheight));
3465	break;	3542	break;
3466		3543
3467		3544
3468	/*	3545	/*
3469	* reports - some output format copied from XTerm	3546	* reports - some output format copied from XTerm
3470	*/	3547	*/
3471	case 11: /* report window state */	3548	case 11: /* report window state */
3472	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3549	XGetWindowAttributes (disp, parent[0], &wattr);
3473	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3550	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474	break;	3551	break;
3475	case 13: /* report window position */	3552	case 13: /* report window position */
3476	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3553	XGetWindowAttributes (disp, parent[0], &wattr);
3477	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3554	XTranslateCoordinates (disp, parent[0], wattr.root,
3478	-wattr.border_width, -wattr.border_width,	3555	-wattr.border_width, -wattr.border_width,
3479	&x, &y, &wdummy);	3556	&x, &y, &wdummy);
3480	tt_printf ("\033[3;%d;%dt", x, y);	3557	tt_printf ("\033[3;%d;%dt", x, y);
3481	break;	3558	break;
3482	case 14: /* report window size (pixels) */	3559	case 14: /* report window size (pixels) */
3483	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3560	XGetWindowAttributes (disp, parent[0], &wattr);
3484	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3561	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485	break;	3562	break;
3486	case 18: /* report text area size (chars) */	3563	case 18: /* report text area size (chars) */
3487	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3564	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3488	break;	3565	break;
3489	case 19: /* report window size (chars) */	3566	case 19: /* report window size (chars) */
3490	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3567	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3491	break;	3568	break;
3492	case 20: /* report icon label */	3569	case 20: /* report icon label */
3493	{	3570	{
3494	char *s;	3571	char *s;
3495	XGetIconName (display->display, TermWin.parent[0], &s);	3572	XGetIconName (disp, parent[0], &s);
3496	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3573	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497	XFree (s);	3574	XFree (s);
3498	}	3575	}
3499	break;	3576	break;
3500	case 21: /* report window title */	3577	case 21: /* report window title */
3501	{	3578	{
3502	char *s;	3579	char *s;
3503	XFetchName (display->display, TermWin.parent[0], &s);	3580	XFetchName (disp, parent[0], &s);
3504	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3581	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505	XFree (s);	3582	XFree (s);
3506	}	3583	}
3507	break;	3584	break;
3508	}	3585	}
…		…
3541	else if (ch < 0x20)	3618	else if (ch < 0x20)
3542	return NULL; /* other control character - exit */	3619	return NULL; /* other control character - exit */
3543		3620
3544	seen_esc = false;	3621	seen_esc = false;
3545		3622
3546	if (n >= sizeof (string) - 1)	3623	if (n >= STRING_MAX - 1)
3547	// stop at some sane length	3624	// stop at some sane length
3548	return NULL;	3625	return NULL;
3549		3626
3550	if (ch == C0_SYN)	3627	if (ch == C0_SYN)
3551	string[n++] = cmd_get8 ();	3628	string[n++] = cmd_get8 ();
…		…
3619	set_window_color (color, str);	3696	set_window_color (color, str);
3620	}	3697	}
3621		3698
3622	/*	3699	/*
3623	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3700	* 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	*/	3701	*/
3647	void	3702	void
3648	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3703	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649	{	3704	{
3650	int changed = 0;	3705	int changed = 0;
3651	int color;	3706	int color;
3652	char *buf, *name;	3707	char *buf, *name;
3653	bool query = str[0] == '?' && !str[1];	3708	bool query = str[0] == '?' && !str[1];
3654	int saveop = op;	3709	int saveop = op;
		3710	dDisp;
3655		3711
3656	assert (str != NULL);	3712	assert (str != NULL);
3657	switch (op)	3713	switch (op)
3658	{	3714	{
3659	case XTerm_name:	3715	case XTerm_name:
…		…
3675	unsigned long bytes_after;	3731	unsigned long bytes_after;
3676	unsigned char *value = 0;	3732	unsigned char *value = 0;
3677	const char *str = "";	3733	const char *str = "";
3678		3734
3679	if (prop	3735	if (prop
3680	&& XGetWindowProperty (display->display, TermWin.parent[0],	3736	&& XGetWindowProperty (disp, parent[0],
3681	prop, 0, 1<<16, 0, AnyPropertyType,	3737	prop, 0, 1<<16, 0, AnyPropertyType,
3682	&actual_type, &actual_format,	3738	&actual_type, &actual_format,
3683	&nitems, &bytes_after, &value) == Success	3739	&nitems, &bytes_after, &value) == Success
3684	&& actual_type != None	3740	&& actual_type != None
3685	&& actual_format == 8)	3741	&& actual_format == 8)
…		…
3697	{	3753	{
3698	*eq = 0;	3754	*eq = 0;
3699	set_utf8_property (display->atom (str), eq + 1);	3755	set_utf8_property (display->atom (str), eq + 1);
3700	}	3756	}
3701	else	3757	else
3702	XDeleteProperty (display->display, TermWin.parent[0],	3758	XDeleteProperty (disp, parent[0],
3703	display->atom (str));	3759	display->atom (str));
3704	}	3760	}
3705	break;	3761	break;
3706		3762
3707	case XTerm_Color:	3763	case XTerm_Color:
…		…
3748	break;	3804	break;
3749	#ifndef NO_BOLD_UNDERLINE_REVERSE	3805	#ifndef NO_BOLD_UNDERLINE_REVERSE
3750	case XTerm_Color_BD:	3806	case XTerm_Color_BD:
3751	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3807	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752	break;	3808	break;
3753	case XTerm_Color_IT:
3754	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755	break;
3756	case XTerm_Color_UL:	3809	case XTerm_Color_UL:
3757	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3810	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758	break;	3811	break;
3759	case XTerm_Color_RV:	3812	case XTerm_Color_RV:
3760	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3813	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761	break;	3814	break;
		3815	case URxvt_Color_IT:
		3816	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3817	break;
3762	#endif	3818	#endif
3763	#if TRANSPARENT && TINTING	3819	#if TRANSPARENT && TINTING
3764	case XTerm_Color_tint:	3820	case URxvt_Color_tint:
3765	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3821	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3766	check_our_parents ();	3822	check_our_parents ();
3767	if (am_transparent)	3823	if (am_transparent)
3768	want_full_refresh = want_refresh = 1;	3824	want_full_refresh = want_refresh = 1;
3769	break;	3825	break;
3770	#endif	3826	#endif
…		…
3782	{	3838	{
3783	str++;	3839	str++;
3784	#if XPM_BACKGROUND	3840	#if XPM_BACKGROUND
3785	changed += scale_pixmap (str);	3841	changed += scale_pixmap (str);
3786	#endif	3842	#endif
3787
3788	}	3843	}
		3844
3789	if (changed)	3845	if (changed)
3790	{	3846	{
3791	#ifdef XPM_BACKGROUND	3847	#ifdef XPM_BACKGROUND
3792	resize_pixmap ();	3848	resize_pixmap ();
3793	#endif	3849	#endif
…		…
3804		3860
3805	case XTerm_logfile:	3861	case XTerm_logfile:
3806	// TODO, when secure mode?	3862	// TODO, when secure mode?
3807	break;	3863	break;
3808		3864
		3865	#ifdef MENUBAR
		3866	case URxvt_Menu:
		3867	if (options & Opt_insecure)
		3868	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3869	break;
		3870	#endif
		3871	#if 0
		3872	case XTerm_dumpscreen: /* no error notices */
		3873	{
		3874	int fd;
		3875	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3876	{
		3877	scr_dump (fd);
		3878	close (fd);
		3879	}
		3880	}
		3881	break;
		3882	#endif
3809	case XTerm_font:	3883	case XTerm_font:
3810	op = URxvt_font;	3884	op = URxvt_font;
3811	case URxvt_font:	3885	case URxvt_font:
3812	#if ENABLE_STYLES	3886	#if ENABLE_STYLES
3813	case URxvt_boldFont:	3887	case URxvt_boldFont:
3814	case URxvt_italicFont:	3888	case URxvt_italicFont:
3815	case URxvt_boldItalicFont:	3889	case URxvt_boldItalicFont:
3816	#endif	3890	#endif
3817	if (query)	3891	if (query)
3818	tt_printf ("\33]%d;%-.250s%c", saveop,	3892	tt_printf ("\33]%d;%-.250s%c", saveop,
3819	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3893	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3820	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3894	? fontset[op - URxvt_font]->fontdesc : "",
3821	resp);	3895	resp);
3822	else	3896	else
3823	{	3897	{
3824	const char *&res = rs[Rs_font + (op - URxvt_font)];	3898	const char *&res = rs[Rs_font + (op - URxvt_font)];
3825		3899
…		…
3828	set_fonts ();	3902	set_fonts ();
3829	}	3903	}
3830	break;	3904	break;
3831		3905
3832	#if ENABLE_FRILLS	3906	#if ENABLE_FRILLS
3833	case XTerm_locale:	3907	case URxvt_locale:
3834	if (query)	3908	if (query)
3835	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3909	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3836	else	3910	else
3837	{	3911	{
3838	set_locale (str);	3912	set_locale (str);
3839	# ifdef USE_XIM	3913	pty.set_utf8_mode (enc_utf8);
3840	im_cb ();	3914	init_xlocale ();
3841	# endif
3842	}	3915	}
3843	break;	3916	break;
3844	#endif
3845		3917
3846	#ifdef MENUBAR	3918	case URxvt_view_up:
3847	case XTerm_Menu:	3919	case URxvt_view_down:
3848	if (options & Opt_insecure)	3920	int lines = atoi (str);
3849	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3921
3850	break;	3922	if (lines)
3851	#endif	3923	scr_page (op == URxvt_view_up ? UP : DN, lines);
3852	#if 0
3853	case XTerm_dumpscreen: /* no error notices */
3854	{	3924	else
3855	int fd;
3856	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3857	{	3925	{
3858	scr_dump (fd);	3926	scr_erase_savelines ();
3859	close (fd);
3860	}	3927	}
3861	}	3928
3862	break;	3929	break;
3863	#endif	3930	#endif
3864	}	3931	}
3865	}	3932	}
3866	/*----------------------------------------------------------------------*/	3933	/*----------------------------------------------------------------------*/
…		…
3999	*/	4066	*/
4000	PrivMode (1, PrivMode_vt52);	4067	PrivMode (1, PrivMode_vt52);
4001	break;	4068	break;
4002	case 3: /* 80/132 */	4069	case 3: /* 80/132 */
4003	if (priv_modes & PrivMode_132OK)	4070	if (priv_modes & PrivMode_132OK)
4004	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4071	set_widthheight (((state ? 132 : 80) * fwidth), height);
4005	break;	4072	break;
4006	case 4: /* smooth scrolling */	4073	case 4: /* smooth scrolling */
4007	if (state)	4074	if (state)
4008	options &= ~Opt_jumpScroll;	4075	options &= ~Opt_jumpScroll;
4009	else	4076	else
…		…
4326	}	4393	}
4327		4394
4328	memmove (v_buffer, v_buffer + written, v_buflen);	4395	memmove (v_buffer, v_buffer + written, v_buflen);
4329	}	4396	}
4330	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4397	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331	// original code just ignores this...	4398	pty_ev.set (EVENT_READ);
4332	destroy ();
4333	}	4399	}
4334		4400
4335	/*----------------------- end-of-file (C source) -----------------------*/	4401	/*----------------------- end-of-file (C source) -----------------------*/
4336		4402

Diff Legend

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