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.168 by root, Sun Sep 5 09:32:59 2004 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 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
		57	#include <csignal>
54		58
55	/*----------------------------------------------------------------------*/	59	/*----------------------------------------------------------------------*/
56		60
57	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	61	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58		62
…		…
113	XK_Escape, 0x238b,	117	XK_Escape, 0x238b,
114	XK_Undo, 0x238c,	118	XK_Undo, 0x238c,
115	XK_Print, 0x2399,	119	XK_Print, 0x2399,
116		120
117	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,
118	XK_KP_Space, 0x2422,	129	XK_KP_Space, 0x2422,
		130	#endif
119	0,	131	0,
120	};	132	};
121		133
122	void	134	void
123	rxvt_term::iso14755_54 (int x, int y)	135	rxvt_term::iso14755_54 (int x, int y)
124	{	136	{
125	x = Pixel2Col (x);	137	x = Pixel2Col (x);
126	y = Pixel2Row (y);	138	y = Pixel2Row (y);
127		139
128	if (x < 0 || x >= TermWin.ncol	140	if (x < 0 || x >= ncol
129	|| y < 0 || y >= TermWin.nrow)	141	|| y < 0 || y >= nrow)
130	return;	142	return;
131		143
132	for (;;)	144	for (;;)
133	{	145	{
134	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	146	const line_t &l = save[y + saveLines - view_start];
		147
		148	text_t t = l.t[x];
135		149
136	if (t != NOCHAR || !x)	150	if (t != NOCHAR || !x)
137	{	151	{
138	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	152	iso14755_51 (l.t[x], l.r[x]);
139	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140	iso14755buf = ISO_14755_54;	153	iso14755buf = ISO_14755_54;
141	break;	154	break;
142	}	155	}
143		156
144	x--;	157	x--;
…		…
151	void	164	void
152	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	165	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
153	{	166	{
154	rxvt_fontset *fs = FONTSET (r);	167	rxvt_fontset *fs = FONTSET (r);
155	rxvt_font *f = (*fs)[fs->find_font (ch)];	168	rxvt_font *f = (*fs)[fs->find_font (ch)];
156	wchar_t *chr, *alloc, ch2;	169	wchar_t *chr, *alloc, ch2, *fname;
157	int len;	170	int len;
		171
		172	fname = rxvt_utf8towcs (f->name);
158		173
159	#if ENABLE_COMBINING	174	#if ENABLE_COMBINING
160	if (IS_COMPOSE (ch))	175	if (IS_COMPOSE (ch))
161	{	176	{
162	len = rxvt_composite.expand (ch, 0);	177	len = rxvt_composite.expand (ch, 0);
…		…
171	alloc = 0;	186	alloc = 0;
172	chr = &ch2;	187	chr = &ch2;
173	len = 1;	188	len = 1;
174	}	189	}
175		190
176	int width = strlen (f->name);	191	int width = wcswidth (fname, wcslen (fname));
177		192
178	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	193	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
179		194
180	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	195	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181		196
…		…
194	#endif	209	#endif
195	scr_overlay_set (11, y, ch, r);	210	scr_overlay_set (11, y, ch, r);
196	scr_overlay_set (12, y, NOCHAR, r);	211	scr_overlay_set (12, y, NOCHAR, r);
197	}	212	}
198		213
199	scr_overlay_set (0, len, f->name);	214	scr_overlay_set (0, len, fname);
		215
		216	free (fname);
200		217
201	#if ENABLE_COMBINING	218	#if ENABLE_COMBINING
202	if (alloc)	219	if (alloc)
203	delete [] alloc;	220	delete [] alloc;
204	#endif	221	#endif
…		…
272	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	289	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273	* escape sequence to toggle the Keypad.	290	* escape sequence to toggle the Keypad.
274	*	291	*
275	* Always permit `shift' to override the current setting	292	* Always permit `shift' to override the current setting
276	*/	293	*/
277	shft = (ev.state & ShiftMask);	294	shft = ev.state & ShiftMask;
278	ctrl = (ev.state & ControlMask);	295	ctrl = ev.state & ControlMask;
279	meta = (ev.state & ModMetaMask);	296	meta = ev.state & ModMetaMask;
280		297
281	if (numlock_state || (ev.state & ModNumLockMask))	298	if (numlock_state || (ev.state & ModNumLockMask))
282	{	299	{
283	numlock_state = (ev.state & ModNumLockMask);	300	numlock_state = (ev.state & ModNumLockMask);
284	PrivMode ((!numlock_state), PrivMode_aplKP);	301	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
304		321
305	// the XOpenIM manpage lies about hardcoding the locale	322	// the XOpenIM manpage lies about hardcoding the locale
306	// at the point of XOpenIM, so temporarily switch locales	323	// at the point of XOpenIM, so temporarily switch locales
307	if (rs[Rs_imLocale])	324	if (rs[Rs_imLocale])
308	SET_LOCALE (rs[Rs_imLocale]);	325	SET_LOCALE (rs[Rs_imLocale]);
		326
309	// assume wchar_t == unicode or better	327	// assume wchar_t == unicode or better
310	len = XwcLookupString (Input_Context, &ev, wkbuf,	328	len = XwcLookupString (Input_Context, &ev, wkbuf,
311	KBUFSZ, &keysym, &status_return);	329	KBUFSZ, &keysym, &status_return);
		330
312	if (rs[Rs_imLocale])	331	if (rs[Rs_imLocale])
313	SET_LOCALE (locale);	332	SET_LOCALE (locale);
314		333
315	if (status_return == XLookupChars	334	if (status_return == XLookupChars
316	|| status_return == XLookupBoth)	335	|| status_return == XLookupBoth)
…		…
343	valid_keysym = keysym != NoSymbol;	362	valid_keysym = keysym != NoSymbol;
344	}	363	}
345		364
346	if (valid_keysym)	365	if (valid_keysym)
347	{	366	{
		367	#ifdef KEYSYM_RESOURCE
		368	if (keyboard->dispatch (this, keysym, ev.state))
		369	return;
		370	#endif
		371
348	if (TermWin.saveLines)	372	if (saveLines)
349	{	373	{
350	#ifdef UNSHIFTED_SCROLLKEYS	374	#ifdef UNSHIFTED_SCROLLKEYS
351	if (!ctrl && !meta)	375	if (!ctrl && !meta)
352	#else	376	#else
353	if (IS_SCROLL_MOD)	377	if (IS_SCROLL_MOD)
354	#endif	378	#endif
355	{	379	{
356	int lnsppg;	380	int lnsppg;
357		381
358	#ifdef PAGING_CONTEXT_LINES	382	#ifdef PAGING_CONTEXT_LINES
359	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	383	lnsppg = nrow - PAGING_CONTEXT_LINES;
360	#else	384	#else
361	lnsppg = TermWin.nrow * 4 / 5;	385	lnsppg = nrow * 4 / 5;
362	#endif	386	#endif
363	if (keysym == XK_Prior)	387	if (keysym == XK_Prior)
364	{	388	{
365	scr_page (UP, lnsppg);	389	scr_page (UP, lnsppg);
366	return;	390	return;
…		…
417	{	441	{
418	/* normal XTerm key bindings */	442	/* normal XTerm key bindings */
419	case XK_Insert: /* Shift+Insert = paste mouse selection */	443	case XK_Insert: /* Shift+Insert = paste mouse selection */
420	selection_request (ev.time, 0, 0);	444	selection_request (ev.time, 0, 0);
421	return;	445	return;
422	#if TODO // TODO	446	#if TODO
423	/* rxvt extras */	447	/* rxvt extras */
424	case XK_KP_Add: /* Shift+KP_Add = bigger font */	448	case XK_KP_Add: /* Shift+KP_Add = bigger font */
425	change_font (FONT_UP);	449	change_font (FONT_UP);
426	return;	450	return;
427	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	451	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
…		…
486	}	510	}
487	#endif	511	#endif
488		512
489	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	513	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490	{	514	{
491	#ifdef KEYSYM_RESOURCE
492	if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493	{
494	unsigned int l;
495	const unsigned char *kbuf0;
496
497	kbuf0 = (Keysym_map[keysym & 0xFF]);
498	l = (unsigned int)*kbuf0++;
499
500	/* escape prefix */
501	if (meta
502	# ifdef META8_OPTION
503	&& meta_char == C0_ESC
504	# endif
505	)
506	{
507	const unsigned char ch = C0_ESC;
508	tt_write (&ch, 1);
509	}
510
511	tt_write (kbuf0, l);
512	return;
513	}
514	else
515	#endif
516	{	515	{
517	newlen = 1;	516	newlen = 1;
518	switch (keysym)	517	switch (keysym)
519	{	518	{
520	#ifndef NO_BACKSPACE_KEY	519	#ifndef NO_BACKSPACE_KEY
…		…
528	else	527	else
529	strcpy (kbuf, key_backspace);	528	strcpy (kbuf, key_backspace);
530	break;	529	break;
531	#endif	530	#endif
532	#ifndef NO_DELETE_KEY	531	#ifndef NO_DELETE_KEY
		532	# ifdef XK_KP_Prior
		533	case XK_KP_Delete:
		534	/* allow shift to override */
		535	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		536	{
		537	strcpy (kbuf, "\033On");
		538	break;
		539	}
		540	/* FALLTHROUGH */
		541	# endif
533	case XK_Delete:	542	case XK_Delete:
534	strcpy (kbuf, key_delete);	543	strcpy (kbuf, key_delete);
535	break;	544	break;
536	#endif	545	#endif
537	case XK_Tab:	546	case XK_Tab:
…		…
640	#ifdef XK_KP_Begin	649	#ifdef XK_KP_Begin
641	case XK_KP_Begin:	650	case XK_KP_Begin:
642	strcpy (kbuf, "\033Ou");	651	strcpy (kbuf, "\033Ou");
643	break;	652	break;
644		653
645	case XK_KP_Insert:
646	strcpy (kbuf, "\033Op");
647	break;
648
649	case XK_KP_Delete:
650	strcpy (kbuf, "\033On");
651	break;
652	#endif	654	#endif
653	case XK_KP_F1: /* "\033OP" */	655	case XK_KP_F1: /* "\033OP" */
654	case XK_KP_F2: /* "\033OQ" */	656	case XK_KP_F2: /* "\033OQ" */
655	case XK_KP_F3: /* "\033OR" */	657	case XK_KP_F3: /* "\033OR" */
656	case XK_KP_F4: /* "\033OS" */	658	case XK_KP_F4: /* "\033OS" */
…		…
688	break;	690	break;
689		691
690	case XK_Find:	692	case XK_Find:
691	strcpy (kbuf, "\033[1~");	693	strcpy (kbuf, "\033[1~");
692	break;	694	break;
		695
		696	#ifdef XK_KP_End
		697	case XK_KP_Insert:
		698	/* allow shift to override */
		699	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		700	{
		701	strcpy (kbuf, "\033Op");
		702	break;
		703	}
		704	/* FALLTHROUGH */
		705	#endif
693	case XK_Insert:	706	case XK_Insert:
694	strcpy (kbuf, "\033[2~");	707	strcpy (kbuf, "\033[2~");
695	break;	708	break;
696	#ifdef DXK_Remove /* support for DEC remove like key */	709	#ifdef DXK_Remove /* support for DEC remove like key */
697	case DXK_Remove:	710	case DXK_Remove:
…		…
787	#undef FKEY	800	#undef FKEY
788	default:	801	default:
789	newlen = 0;	802	newlen = 0;
790	break;	803	break;
791	}	804	}
		805
792	if (newlen)	806	if (newlen)
793	len = strlen (kbuf);	807	len = strlen (kbuf);
794	}	808	}
795		809
796	/*	810	/*
…		…
805	else if (ctrl && keysym == XK_minus)	819	else if (ctrl && keysym == XK_minus)
806	{	820	{
807	len = 1;	821	len = 1;
808	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	822	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809	}	823	}
		824	else if (keysym == XK_ISO_Left_Tab)
		825	{
		826	strcpy (kbuf, "\033[Z");
		827	len = 3;
		828	}
810	else	829	else
811	{	830	{
812	#ifdef META8_OPTION	831	#ifdef META8_OPTION
813	/* set 8-bit on */	832	/* set 8-bit on */
814	if (meta && (meta_char == 0x80))	833	if (meta && (meta_char == 0x80))
…		…
827		846
828	if (len <= 0)	847	if (len <= 0)
829	return; /* not mapped */	848	return; /* not mapped */
830		849
831	if (options & Opt_scrollTtyKeypress)	850	if (options & Opt_scrollTtyKeypress)
832	if (TermWin.view_start)	851	if (view_start)
833	{	852	{
834	TermWin.view_start = 0;	853	view_start = 0;
835	want_refresh = 1;	854	want_refresh = 1;
836	}	855	}
837		856
838	/*	857	/*
839	* these modifications only affect the static keybuffer	858	* these modifications only affect the static keybuffer
…		…
872	#endif /* DEBUG_CMD */	891	#endif /* DEBUG_CMD */
873	tt_write (kbuf, (unsigned int)len);	892	tt_write (kbuf, (unsigned int)len);
874	}	893	}
875	/*}}} */	894	/*}}} */
876		895
877	#if (MENUBAR_MAX)	896	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	897	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879	/* attempt to `write' count to the input buffer */	898	/* attempt to `write' count to the input buffer */
880	unsigned int	899	unsigned int
881	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	900	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882	{	901	{
…		…
905		924
906	cmd_parse ();	925	cmd_parse ();
907		926
908	return 0;	927	return 0;
909	}	928	}
910	#endif /* MENUBAR_MAX */	929	#endif
911		930
912	void	931	void
913	rxvt_term::flush ()	932	rxvt_term::flush ()
914	{	933	{
915	flush_ev.stop ();	934	flush_ev.stop ();
…		…
1016	{	1035	{
1017	if (mouse_slip_wheel_speed == 0	1036	if (mouse_slip_wheel_speed == 0
1018	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1037	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019	: scr_page (UP, mouse_slip_wheel_speed))	1038	: scr_page (UP, mouse_slip_wheel_speed))
1020	{	1039	{
		1040	if (view_start == nsaved ||
		1041	view_start == 0)
		1042	mouse_slip_wheel_speed = 0;
		1043
1021	refresh_type |= SMOOTH_REFRESH;	1044	refresh_type |= SMOOTH_REFRESH;
1022	want_refresh = 1;	1045	want_refresh = 1;
1023	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1046	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024	}	1047	}
1025	}	1048	}
…		…
1057	rxvt_term::pty_cb (io_watcher &w, short revents)	1080	rxvt_term::pty_cb (io_watcher &w, short revents)
1058	{	1081	{
1059	SET_R (this);	1082	SET_R (this);
1060	SET_LOCALE (locale);	1083	SET_LOCALE (locale);
1061		1084
1062	if (revents & EVENT_WRITE)
1063	tt_write (0, 0);
1064	else if (revents & EVENT_READ)	1085	if (revents & EVENT_READ)
1065	// loop, but don't allow a single term to monopolize us	1086	// loop, but don't allow a single term to monopolize us
1066	while (pty_fill ())	1087	while (pty_fill ())
1067	if (cmd_parse ())	1088	if (cmd_parse ())
1068	break;	1089	break;
		1090
		1091	if (revents & EVENT_WRITE)
		1092	pty_write ();
1069	}	1093	}
1070		1094
1071	void	1095	void
1072	rxvt_term::pointer_unblank ()	1096	rxvt_term::pointer_unblank ()
1073	{	1097	{
1074	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1098	XDefineCursor (display->display, vt, TermWin_cursor);
1075	recolour_cursor ();	1099	recolour_cursor ();
1076		1100
1077	#ifdef POINTER_BLANK	1101	#ifdef POINTER_BLANK
1078	hidden_pointer = 0;	1102	hidden_pointer = 0;
1079		1103
…		…
1087	rxvt_term::pointer_blank ()	1111	rxvt_term::pointer_blank ()
1088	{	1112	{
1089	if (! (options & Opt_pointerBlank))	1113	if (! (options & Opt_pointerBlank))
1090	return;	1114	return;
1091		1115
1092	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1116	XDefineCursor (display->display, vt, display->blank_cursor);
1093	XFlush (display->display);	1117	XFlush (display->display);
1094		1118
1095	hidden_pointer = 1;	1119	hidden_pointer = 1;
1096	}	1120	}
1097		1121
…		…
1186		1210
1187	/*{{{ process an X event */	1211	/*{{{ process an X event */
1188	void	1212	void
1189	rxvt_term::x_cb (XEvent &ev)	1213	rxvt_term::x_cb (XEvent &ev)
1190	{	1214	{
		1215	dDisp;
		1216
1191	SET_R (this);	1217	SET_R (this);
1192	SET_LOCALE (locale);	1218	SET_LOCALE (locale);
1193		1219
1194	#if defined(CURSOR_BLINK)	1220	#if defined(CURSOR_BLINK)
1195	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1221	if ((options & Opt_cursorBlink) && ev.type == KeyPress)
…		…
1216	if (ev.type == KeyPress && hidden_pointer == 0)	1242	if (ev.type == KeyPress && hidden_pointer == 0)
1217	pointer_blank ();	1243	pointer_blank ();
1218	}	1244	}
1219	#endif	1245	#endif
1220		1246
1221	Window unused_root, unused_child;	1247	Window unused_root, unused_child;
1222	int unused_root_x, unused_root_y;	1248	int unused_root_x, unused_root_y;
1223	unsigned int unused_mask;	1249	unsigned int unused_mask;
1224		1250
1225	switch (ev.type)	1251	switch (ev.type)
1226	{	1252	{
1227	case KeyPress:	1253	case KeyPress:
1228	#if ISO_14755	1254	#if ISO_14755
…		…
1311	button_release (ev.xbutton);	1337	button_release (ev.xbutton);
1312	break;	1338	break;
1313		1339
1314	case ClientMessage:	1340	case ClientMessage:
1315	if (ev.xclient.format == 32	1341	if (ev.xclient.format == 32
		1342	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1343	{
1316	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1344	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1317	destroy ();	1345	destroy ();
		1346	#if ENABLE_EWMH
		1347	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1348	XSendEvent (disp, ev.xclient.window = display->root,
		1349	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1350	&ev);
		1351	#endif
		1352	}
		1353	#if ENABLE_XEMBED
		1354	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1355	{
		1356	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1357	focus_in ();
		1358	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1359	focus_out ();
		1360	}
		1361	#endif
1318	#ifdef OFFIX_DND	1362	#ifdef OFFIX_DND
1319	/* OffiX Dnd (drag 'n' drop) protocol */	1363	/* OffiX Dnd (drag 'n' drop) protocol */
1320	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1364	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1321	&& (ev.xclient.data.l[0] == DndFile	1365	&& (ev.xclient.data.l[0] == DndFile
1322	|| ev.xclient.data.l[0] == DndDir	1366	|| ev.xclient.data.l[0] == DndDir
1323	|| ev.xclient.data.l[0] == DndLink))	1367	|| ev.xclient.data.l[0] == DndLink))
1324	{	1368	{
1325	/* Get Dnd data */	1369	/* Get Dnd data */
1326	Atom ActualType;	1370	Atom ActualType;
1327	int ActualFormat;	1371	int ActualFormat;
1328	unsigned char *data;	1372	unsigned char *data;
1329	unsigned long Size, RemainingBytes;	1373	unsigned long Size, RemainingBytes;
1330		1374
1331	XGetWindowProperty (display->display, display->root,	1375	XGetWindowProperty (disp, display->root,
1332	xa[XA_DNDSELECTION],	1376	xa[XA_DNDSELECTION],
1333	0L, 1000000L,	1377	0L, 1000000L,
1334	False, AnyPropertyType,	1378	False, AnyPropertyType,
1335	&ActualType, &ActualFormat,	1379	&ActualType, &ActualFormat,
1336	&Size, &RemainingBytes,	1380	&Size, &RemainingBytes,
1337	&data);	1381	&data);
1338	XChangeProperty (display->display, display->root,	1382	set_string_property (XA_CUT_BUFFER0, data);
1339	XA_CUT_BUFFER0, XA_STRING,
1340	8, PropModeReplace,
1341	data, strlen (data));
1342	XFree (data);	1383	XFree (data);
1343	selection_paste (display->root, XA_CUT_BUFFER0, True);	1384	selection_paste (display->root, XA_CUT_BUFFER0, true);
1344	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1385	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1345	}	1386	}
1346	#endif /* OFFIX_DND */	1387	#endif /* OFFIX_DND */
1347	break;	1388	break;
1348		1389
1349	case MappingNotify:	1390	case MappingNotify:
…		…
1374	break;	1415	break;
1375	}	1416	}
1376	break;	1417	break;
1377		1418
1378	case FocusIn:	1419	case FocusIn:
1379	if (!TermWin.focus)	1420	focus_in ();
		1421	break;
		1422
		1423	case FocusOut:
		1424	focus_out ();
		1425	break;
		1426
		1427	case ConfigureNotify:
		1428	if (ev.xconfigure.window == parent[0])
1380	{	1429	{
1381	TermWin.focus = 1;
1382	want_refresh = 1;
1383	#ifdef USE_XIM
1384	if (Input_Context != NULL)
1385	{
1386	IMSetStatusPosition ();
1387	XSetICFocus (Input_Context);
1388	}
1389	#endif
1390	#ifdef CURSOR_BLINK
1391	if (options & Opt_cursorBlink)
1392	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393	#endif
1394	#ifdef OFF_FOCUS_FADING
1395	if (rs[Rs_fade])
1396	{
1397	pix_colors = pix_colors_focused;
1398	scr_recolour ();
1399	}
1400	#endif
1401
1402	}
1403	break;
1404
1405	case FocusOut:
1406	if (TermWin.focus)
1407	{
1408	TermWin.focus = 0;
1409	want_refresh = 1;
1410
1411	#if ENABLE_FRILLS || ISO_14755
1412	iso14755buf = 0;
1413	#endif
1414	#if ENABLE_OVERLAY
1415	scr_overlay_off ();
1416	#endif
1417	#ifdef USE_XIM
1418	if (Input_Context != NULL)
1419	XUnsetICFocus (Input_Context);
1420	#endif
1421	#ifdef CURSOR_BLINK
1422	if (options & Opt_cursorBlink)
1423	cursor_blink_ev.stop ();
1424	hidden_cursor = 0;
1425	#endif
1426	#ifdef OFF_FOCUS_FADING
1427	if (rs[Rs_fade])
1428	{
1429	pix_colors = pix_colors_unfocused;
1430	scr_recolour ();
1431	}
1432	#endif
1433	}
1434	break;
1435
1436	case ConfigureNotify:
1437	if (ev.xconfigure.window == TermWin.parent[0])
1438	{
1439	int height, width;
1440
1441	do
1442	{ /* Wrap lots of configures into one */
1443	width = ev.xconfigure.width;
1444	height = ev.xconfigure.height;
1445	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446	}
1447	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1430	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1431	;
1448		1432
1449	if (szHint.width != width || szHint.height != height)	1433	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1450	{	1434	{
1451	seen_resize = 1;	1435	seen_resize = 1;
1452	resize_all_windows (width, height, 1);	1436	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1453	}	1437	}
1454		1438
1455	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1439	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456	if (options & Opt_transparent)	1440	if (options & Opt_transparent)
1457	{
1458	check_our_parents ();	1441	check_our_parents ();
1459	if (am_transparent)
1460	want_refresh = want_full_refresh = 1;
1461	}
1462	#endif	1442	#endif
1463	}	1443	}
1464	break;	1444	break;
1465		1445
1466	case PropertyNotify:	1446	case PropertyNotify:
…		…
1474	selection_clear ();	1454	selection_clear ();
1475	break;	1455	break;
1476		1456
1477	case SelectionNotify:	1457	case SelectionNotify:
1478	if (selection_wait == Sel_normal)	1458	if (selection_wait == Sel_normal)
1479	selection_paste (ev.xselection.requestor,	1459	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480	ev.xselection.property, True);
1481	break;	1460	break;
1482		1461
1483	case SelectionRequest:	1462	case SelectionRequest:
1484	selection_send (ev.xselectionrequest);	1463	selection_send (ev.xselectionrequest);
1485	break;	1464	break;
1486		1465
1487	case UnmapNotify:	1466	case UnmapNotify:
1488	TermWin.mapped = 0;	1467	mapped = 0;
1489	#ifdef TEXT_BLINK	1468	#ifdef TEXT_BLINK
1490	text_blink_ev.stop ();	1469	text_blink_ev.stop ();
1491	#endif	1470	#endif
1492	break;	1471	break;
1493		1472
1494	case MapNotify:	1473	case MapNotify:
1495	TermWin.mapped = 1;	1474	mapped = 1;
1496	#ifdef TEXT_BLINK	1475	#ifdef TEXT_BLINK
1497	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1476	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498	#endif	1477	#endif
1499	break;	1478	break;
1500		1479
…		…
1504	break;	1483	break;
1505	#endif /* TRANSPARENT */	1484	#endif /* TRANSPARENT */
1506		1485
1507	case GraphicsExpose:	1486	case GraphicsExpose:
1508	case Expose:	1487	case Expose:
1509	if (ev.xany.window == TermWin.vt)	1488	if (ev.xany.window == vt)
1510	{	1489	{
1511	do	1490	do
1512	scr_expose (ev.xexpose.x, ev.xexpose.y,	1491	scr_expose (ev.xexpose.x, ev.xexpose.y,
1513	ev.xexpose.width, ev.xexpose.height, False);	1492	ev.xexpose.width, ev.xexpose.height, False);
1514	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1493	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1515		1494
1516	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1495	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517		1496
1518	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1497	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1519	scr_expose (ev.xexpose.x, ev.xexpose.y,	1498	scr_expose (ev.xexpose.x, ev.xexpose.y,
1520	ev.xexpose.width, ev.xexpose.height, False);	1499	ev.xexpose.width, ev.xexpose.height, False);
1521		1500
1522	scr_refresh (refresh_type);	1501	scr_refresh (refresh_type);
1523	}	1502	}
1524	else	1503	else
1525	{	1504	{
1526	XEvent unused_event;	1505	XEvent unused_event;
1527		1506
1528	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1507	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1529	;	1508	;
1530	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1509	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1531	;	1510	;
1532		1511
1533	if (isScrollbarWindow (ev.xany.window))	1512	if (isScrollbarWindow (ev.xany.window))
1534	{	1513	{
1535	scrollBar.setIdle ();	1514	scrollBar.setIdle ();
…		…
1539	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1518	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1540	menubar_expose ();	1519	menubar_expose ();
1541	#endif	1520	#endif
1542		1521
1543	#ifdef TRANSPARENT	1522	#ifdef TRANSPARENT
1544	if (am_transparent && ev.xany.window == TermWin.parent[0])	1523	if (am_transparent && ev.xany.window == parent[0])
1545	XClearWindow (display->display, ev.xany.window);	1524	XClearWindow (disp, ev.xany.window);
1546	#endif	1525	#endif
1547	}	1526	}
1548	break;	1527	break;
1549		1528
1550	case MotionNotify:	1529	case MotionNotify:
…		…
1560	}	1539	}
1561	#endif	1540	#endif
1562	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563	break;	1542	break;
1564		1543
1565	if (ev.xany.window == TermWin.vt)	1544	if (ev.xany.window == vt)
1566	{	1545	{
1567	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1546	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568	{	1547	{
1569	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1548	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1570	;	1549	;
1571		1550
1572	XQueryPointer (display->display, TermWin.vt,	1551	XQueryPointer (disp, vt,
1573	&unused_root, &unused_child,	1552	&unused_root, &unused_child,
1574	&unused_root_x, &unused_root_y,	1553	&unused_root_x, &unused_root_y,
1575	&ev.xbutton.x, &ev.xbutton.y,	1554	&ev.xbutton.x, &ev.xbutton.y,
1576	&ev.xbutton.state);	1555	&ev.xbutton.state);
1577	#ifdef MOUSE_THRESHOLD	1556	#ifdef MOUSE_THRESHOLD
…		…
1589	#endif	1568	#endif
1590	selection_extend (ev.xbutton.x, ev.xbutton.y,	1569	selection_extend (ev.xbutton.x, ev.xbutton.y,
1591	ev.xbutton.state & Button3Mask ? 2 : 0);	1570	ev.xbutton.state & Button3Mask ? 2 : 0);
1592		1571
1593	#ifdef SELECTION_SCROLLING	1572	#ifdef SELECTION_SCROLLING
1594	if (ev.xbutton.y < TermWin.int_bwidth	1573	if (ev.xbutton.y < int_bwidth
1595	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1574	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1596	{	1575	{
1597	int dist;	1576	int dist;
1598		1577
1599	/* don't clobber the current delay if we are	1578	/* don't clobber the current delay if we are
1600	* already in the middle of scrolling.	1579	* already in the middle of scrolling.
…		…
1608	selection_save_x = ev.xbutton.x;	1587	selection_save_x = ev.xbutton.x;
1609	selection_save_y = ev.xbutton.y;	1588	selection_save_y = ev.xbutton.y;
1610	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1589	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1611		1590
1612	/* calc number of lines to scroll */	1591	/* calc number of lines to scroll */
1613	if (ev.xbutton.y < TermWin.int_bwidth)	1592	if (ev.xbutton.y < int_bwidth)
1614	{	1593	{
1615	scroll_selection_dir = UP;	1594	scroll_selection_dir = UP;
1616	dist = TermWin.int_bwidth - ev.xbutton.y;	1595	dist = int_bwidth - ev.xbutton.y;
1617	}	1596	}
1618	else	1597	else
1619	{	1598	{
1620	scroll_selection_dir = DN;	1599	scroll_selection_dir = DN;
1621	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1600	dist = ev.xbutton.y - (int_bwidth + height);
1622	}	1601	}
1623		1602
1624	scroll_selection_lines = Pixel2Height (dist)	1603	scroll_selection_lines = Pixel2Height (dist)
1625	/ SELECTION_SCROLL_LINE_SPEEDUP	1604	/ SELECTION_SCROLL_LINE_SPEEDUP
1626	+ 1;	1605	+ 1;
…		…
1641	#endif	1620	#endif
1642	}	1621	}
1643	}	1622	}
1644	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1623	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645	{	1624	{
1646	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1625	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1647	MotionNotify, &ev))	1626	MotionNotify, &ev))
1648	;	1627	;
1649		1628
1650	XQueryPointer (display->display, scrollBar.win,	1629	XQueryPointer (disp, scrollBar.win,
1651	&unused_root, &unused_child,	1630	&unused_root, &unused_child,
1652	&unused_root_x, &unused_root_y,	1631	&unused_root_x, &unused_root_y,
1653	&ev.xbutton.x, &ev.xbutton.y,	1632	&ev.xbutton.x, &ev.xbutton.y,
1654	&unused_mask);	1633	&unused_mask);
1655	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1634	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1660	}	1639	}
1661	break;	1640	break;
1662	}	1641	}
1663	}	1642	}
1664		1643
		1644	void
		1645	rxvt_term::focus_in ()
		1646	{
		1647	if (!focus)
		1648	{
		1649	focus = 1;
		1650	want_refresh = 1;
		1651	#if USE_XIM
		1652	if (Input_Context != NULL)
		1653	{
		1654	IMSetStatusPosition ();
		1655	XSetICFocus (Input_Context);
		1656	}
		1657	#endif
		1658	#if CURSOR_BLINK
		1659	if (options & Opt_cursorBlink)
		1660	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1661	#endif
		1662	#if OFF_FOCUS_FADING
		1663	if (rs[Rs_fade])
		1664	{
		1665	pix_colors = pix_colors_focused;
		1666	scr_recolour ();
		1667	}
		1668	#endif
		1669	}
		1670	}
		1671
		1672	void
		1673	rxvt_term::focus_out ()
		1674	{
		1675	if (focus)
		1676	{
		1677	focus = 0;
		1678	want_refresh = 1;
		1679
		1680	#if ENABLE_FRILLS || ISO_14755
		1681	iso14755buf = 0;
		1682	#endif
		1683	#if ENABLE_OVERLAY
		1684	scr_overlay_off ();
		1685	#endif
		1686	#if USE_XIM
		1687	if (Input_Context != NULL)
		1688	XUnsetICFocus (Input_Context);
		1689	#endif
		1690	#if CURSOR_BLINK
		1691	if (options & Opt_cursorBlink)
		1692	cursor_blink_ev.stop ();
		1693	hidden_cursor = 0;
		1694	#endif
		1695	#if OFF_FOCUS_FADING
		1696	if (rs[Rs_fade])
		1697	{
		1698	pix_colors = pix_colors_unfocused;
		1699	scr_recolour ();
		1700	}
		1701	#endif
		1702	}
		1703	}
		1704
1665	#if TRANSPARENT	1705	#if TRANSPARENT
1666	void	1706	void
1667	rxvt_term::rootwin_cb (XEvent &ev)	1707	rxvt_term::rootwin_cb (XEvent &ev)
1668	{	1708	{
1669	SET_R (this);	1709	SET_R (this);
…		…
1674	case PropertyNotify:	1714	case PropertyNotify:
1675	/*	1715	/*
1676	* if user used some Esetroot compatible prog to set the root bg,	1716	* if user used some Esetroot compatible prog to set the root bg,
1677	* use the property to determine the pixmap. We use it later on.	1717	* use the property to determine the pixmap. We use it later on.
1678	*/	1718	*/
1679	if (xa[XA_XROOTPMAPID] == 0)
1680	xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682	if (ev.xproperty.atom != xa[XA_XROOTPMAPID])	1719	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
		1720	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1683	return;	1721	return;
1684		1722
1685	/* FALLTHROUGH */	1723	/* FALLTHROUGH */
1686	case ReparentNotify:	1724	case ReparentNotify:
1687	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1725	if ((options & Opt_transparent) && check_our_parents () && am_transparent)
…		…
1701	reportmode = !! (priv_modes & PrivMode_mouse_report);	1739	reportmode = !! (priv_modes & PrivMode_mouse_report);
1702		1740
1703	/*	1741	/*
1704	* VT window processing of button press	1742	* VT window processing of button press
1705	*/	1743	*/
1706	if (ev.window == TermWin.vt)	1744	if (ev.window == vt)
1707	{	1745	{
1708	#if ISO_14755	1746	#if ISO_14755
1709	// 5.4	1747	// 5.4
1710	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1748	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711	{	1749	{
…		…
1759	{	1797	{
1760	case Button1:	1798	case Button1:
1761	/* allow meta + click to select rectangular areas */	1799	/* allow meta + click to select rectangular areas */
1762	/* should be done in screen.C */	1800	/* should be done in screen.C */
1763	#if ENABLE_FRILLS	1801	#if ENABLE_FRILLS
1764	selection.rect = !! (ev.state & ModMetaMask);	1802	selection.rect = !!(ev.state & ModMetaMask);
1765	#else	1803	#else
1766	selection.rect = false;	1804	selection.rect = false;
1767	#endif	1805	#endif
1768		1806
1769	/* allow shift+left click to extend selection */	1807	/* allow shift+left click to extend selection */
…		…
1916	case Button3:	1954	case Button3:
1917	if (scrollBar.style != R_SB_XTERM)	1955	if (scrollBar.style != R_SB_XTERM)
1918	{	1956	{
1919	if (scrollbar_above_slider (ev.y))	1957	if (scrollbar_above_slider (ev.y))
1920	# ifdef RXVT_SCROLL_FULL	1958	# ifdef RXVT_SCROLL_FULL
1921	scr_page (UP, TermWin.nrow - 1);	1959	scr_page (UP, nrow - 1);
1922	# else	1960	# else
1923	scr_page (UP, TermWin.nrow / 4);	1961	scr_page (UP, nrow / 4);
1924	# endif	1962	# endif
1925	else if (scrollbar_below_slider (ev.y))	1963	else if (scrollbar_below_slider (ev.y))
1926	# ifdef RXVT_SCROLL_FULL	1964	# ifdef RXVT_SCROLL_FULL
1927	scr_page (DN, TermWin.nrow - 1);	1965	scr_page (DN, nrow - 1);
1928	# else	1966	# else
1929	scr_page (DN, TermWin.nrow / 4);	1967	scr_page (DN, nrow / 4);
1930	# endif	1968	# endif
1931	else	1969	else
1932	scrollBar.setMotion ();	1970	scrollBar.setMotion ();
1933	}	1971	}
1934	else	1972	else
1935	{	1973	{
1936	scr_page ((ev.button == Button1 ? DN : UP),	1974	scr_page ((ev.button == Button1 ? DN : UP),
1937	(TermWin.nrow	1975	(nrow
1938	* scrollbar_position (ev.y)	1976	* scrollbar_position (ev.y)
1939	/ scrollbar_size ()));	1977	/ scrollbar_size ()));
1940	}	1978	}
1941		1979
1942	break;	1980	break;
…		…
1974	#ifdef SELECTION_SCROLLING	2012	#ifdef SELECTION_SCROLLING
1975	if (sel_scroll_ev.active)	2013	if (sel_scroll_ev.active)
1976	sel_scroll_ev.stop();	2014	sel_scroll_ev.stop();
1977	#endif	2015	#endif
1978		2016
1979	if (ev.window == TermWin.vt)	2017	if (ev.window == vt)
1980	{	2018	{
1981	#if ISO_14755	2019	#if ISO_14755
1982	// 5.4	2020	// 5.4
1983	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2021	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984	return;	2022	return;
…		…
2035	v = ev.button == Button4 ? UP : DN;	2073	v = ev.button == Button4 ? UP : DN;
2036		2074
2037	if (ev.state & ShiftMask)	2075	if (ev.state & ShiftMask)
2038	i = 1;	2076	i = 1;
2039	else if (options & Opt_mouseWheelScrollPage)	2077	else if (options & Opt_mouseWheelScrollPage)
2040	i = TermWin.nrow - 1;	2078	i = nrow - 1;
2041	else	2079	else
2042	i = 5;	2080	i = 5;
2043		2081
2044	# ifdef MOUSE_SLIP_WHEELING	2082	# ifdef MOUSE_SLIP_WHEELING
2045	if (ev.state & ControlMask)	2083	if (ev.state & ControlMask)
2046	{	2084	{
2047	mouse_slip_wheel_speed += v ? -1 : 1;	2085	mouse_slip_wheel_speed += v ? -1 : 1;
2048	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2086	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2049	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2087	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2050		2088
2051	if (slip_wheel_ev.at < NOW)	2089	if (slip_wheel_ev.at < NOW)
2052	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2090	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2053		2091
2054	slip_wheel_ev.start ();	2092	slip_wheel_ev.start ();
…		…
2095	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2133	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2096	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2134	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2135	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098	int i;	2136	int i;
2099		2137
2100	Visual* visual = display->visual;	2138	Visual *visual = display->visual;
2101		2139
2102	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2140	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2103		2141
2104	/* for convenience */	2142	/* for convenience */
2105	mask_r = visual->red_mask;	2143	mask_r = visual->red_mask;
…		…
2326	Atom atype;	2364	Atom atype;
2327	unsigned char *prop = NULL;	2365	unsigned char *prop = NULL;
2328	Window root, oldp, *list;	2366	Window root, oldp, *list;
2329	Pixmap rootpixmap = None;	2367	Pixmap rootpixmap = None;
2330	XWindowAttributes wattr, wrootattr;	2368	XWindowAttributes wattr, wrootattr;
		2369	dDisp;
2331		2370
2332	pchanged = 0;	2371	pchanged = 0;
2333		2372
2334	if (!(options & Opt_transparent))	2373	if (!(options & Opt_transparent))
2335	return pchanged; /* Don't try any more */	2374	return pchanged; /* Don't try any more */
2336		2375
2337	XGetWindowAttributes (display->display, display->root, &wrootattr);	2376	XGetWindowAttributes (disp, display->root, &wrootattr);
2338	rootdepth = wrootattr.depth;	2377	rootdepth = wrootattr.depth;
2339		2378
2340	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2379	XGetWindowAttributes (disp, parent[0], &wattr);
2341		2380
2342	if (rootdepth != wattr.depth)	2381	if (rootdepth != wattr.depth)
2343	{	2382	{
2344	if (am_transparent)	2383	if (am_transparent)
2345	{	2384	{
2346	pchanged = 1;	2385	pchanged = 1;
2347	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2386	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2348	am_transparent = am_pixmap_trans = 0;	2387	am_transparent = am_pixmap_trans = 0;
2349	}	2388	}
2350		2389
2351	return pchanged; /* Don't try any more */	2390	return pchanged; /* Don't try any more */
2352	}	2391	}
2353		2392
2354	/* Get all X ops out of the queue so that our information is up-to-date. */	2393	/* Get all X ops out of the queue so that our information is up-to-date. */
2355	XSync (display->display, False);	2394	XSync (disp, False);
2356		2395
2357	/*	2396	/*
2358	* Make the frame window set by the window manager have	2397	* Make the frame window set by the window manager have
2359	* the root background. Some window managers put multiple nested frame	2398	* the root background. Some window managers put multiple nested frame
2360	* windows for each client, so we have to take care about that.	2399	* windows for each client, so we have to take care about that.
2361	*/	2400	*/
2362	i = (xa[XA_XROOTPMAPID]	2401	i = (xa[XA_XROOTPMAP_ID]
2363	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],	2402	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2364	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2403	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365	&nitems, &bytes_after, &prop) == Success);	2404	&nitems, &bytes_after, &prop) == Success);
2366		2405
2367	if (!i || prop == NULL)	2406	if (!i || prop == NULL)
2368	i = (xa[XA_XSETROOTID]	2407	i = (xa[XA_ESETROOT_PMAP_ID]
2369	&& XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],	2408	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2370	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2409	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371	&nitems, &bytes_after, &prop) == Success);	2410	&nitems, &bytes_after, &prop) == Success);
2372		2411
2373	if (!i || prop == NULL	2412	if (!i || prop == NULL
2374	#if TINTING	2413	#if TINTING
…		…
2393	Window cr;	2432	Window cr;
2394	XImage *image;	2433	XImage *image;
2395	GC gc;	2434	GC gc;
2396	XGCValues gcvalue;	2435	XGCValues gcvalue;
2397		2436
2398	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2437	XTranslateCoordinates (disp, parent[0], display->root,
2399	0, 0, &sx, &sy, &cr);	2438	0, 0, &sx, &sy, &cr);
2400	nw = (unsigned int)szHint.width;	2439	nw = (unsigned int)szHint.width;
2401	nh = (unsigned int)szHint.height;	2440	nh = (unsigned int)szHint.height;
2402	nx = ny = 0;	2441	nx = ny = 0;
2403		2442
…		…
2415	sy = 0;	2454	sy = 0;
2416	}	2455	}
2417		2456
2418	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2457	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2419	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2458	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
		2459
		2460	XSync (disp, False);
2420	allowedxerror = -1;	2461	allowedxerror = -1;
2421	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2462	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422		2463
2423	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2464	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2424	/* XXX: may need a delay here? */	2465	/* XXX: may need a delay here? */
2425	allowedxerror = 0;	2466	allowedxerror = 0;
2426		2467
2427	if (image == NULL)	2468	if (image == NULL)
2428	{	2469	{
2429	if (am_transparent && am_pixmap_trans)	2470	if (am_transparent && am_pixmap_trans)
2430	{	2471	{
2431	pchanged = 1;	2472	pchanged = 1;
2432	if (TermWin.pixmap != None)	2473	if (pixmap != None)
2433	{	2474	{
2434	XFreePixmap (display->display, TermWin.pixmap);	2475	XFreePixmap (disp, pixmap);
2435	TermWin.pixmap = None;	2476	pixmap = None;
2436	}	2477	}
2437	}	2478	}
2438		2479
2439	am_pixmap_trans = 0;	2480	am_pixmap_trans = 0;
2440	}	2481	}
2441	else	2482	else
2442	{	2483	{
2443	if (TermWin.pixmap != None)	2484	if (pixmap != None)
2444	XFreePixmap (display->display, TermWin.pixmap);	2485	XFreePixmap (disp, pixmap);
2445		2486
2446	#if TINTING	2487	#if TINTING
2447	if (ISSET_PIXCOLOR (Color_tint))	2488	if (ISSET_PIXCOLOR (Color_tint))
2448	{	2489	{
2449	unsigned short rm, gm, bm;	2490	unsigned short rm, gm, bm;
…		…
2453		2494
2454	ShadeXImage (display, image, shade, rm, gm, bm);	2495	ShadeXImage (display, image, shade, rm, gm, bm);
2455	}	2496	}
2456	#endif	2497	#endif
2457		2498
2458	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2499	pixmap = XCreatePixmap (disp, vt,
2459	szHint.width, szHint.height, image->depth);	2500	szHint.width, szHint.height, image->depth);
2460	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2501	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2461	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2502	XPutImage (disp, pixmap, gc, image, 0, 0,
2462	nx, ny, image->width, image->height);	2503	nx, ny, image->width, image->height);
2463	XFreeGC (display->display, gc);	2504	XFreeGC (disp, gc);
2464	XDestroyImage (image);	2505	XDestroyImage (image);
2465	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2506	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2466	XClearWindow (display->display, TermWin.parent[0]);	2507	XClearWindow (disp, parent[0]);
2467		2508
2468	if (!am_transparent || !am_pixmap_trans)	2509	if (!am_transparent || !am_pixmap_trans)
2469	pchanged = 1;	2510	pchanged = 1;
2470		2511
2471	am_transparent = am_pixmap_trans = 1;	2512	am_transparent = am_pixmap_trans = 1;
2472	}	2513	}
2473	}	2514	}
2474		2515
2475	if (!am_pixmap_trans)	2516	if (am_pixmap_trans)
		2517	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
		2518	else
2476	{	2519	{
2477	unsigned int n;	2520	unsigned int n;
2478	/*	2521	/*
2479	* InheritPixmap transparency	2522	* InheritPixmap transparency
2480	*/	2523	*/
2481	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2524	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2482	{	2525	{
2483	oldp = TermWin.parent[i];	2526	oldp = parent[i];
2484	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2527	XQueryTree (disp, parent[i - 1], &root,
2485	&TermWin.parent[i], &list, &n);	2528	&parent[i], &list, &n);
2486	XFree (list);	2529	XFree (list);
2487		2530
2488	if (TermWin.parent[i] == display->root)	2531	if (parent[i] == display->root)
2489	{	2532	{
2490	if (oldp != None)	2533	if (oldp != None)
2491	pchanged = 1;	2534	pchanged = 1;
2492		2535
2493	break;	2536	break;
2494	}	2537	}
2495		2538
2496	if (oldp != TermWin.parent[i])	2539	if (oldp != parent[i])
2497	pchanged = 1;	2540	pchanged = 1;
2498	}	2541	}
2499		2542
2500	n = 0;	2543	n = 0;
2501		2544
2502	if (pchanged)	2545	if (pchanged)
2503	{	2546	{
2504	for (; n < (unsigned int)i; n++)	2547	for (; n < (unsigned int)i; n++)
2505	{	2548	{
2506	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2549	XGetWindowAttributes (disp, parent[n], &wattr);
2507	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2550	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2508	{	2551	{
2509	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2552	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2510	break;	2553	break;
2511	}	2554	}
2512	}	2555	}
2513	}	2556	}
2514		2557
2515	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2558	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2516	{	2559	{
2517	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2560	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2518	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2561	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2519	am_transparent = 0;	2562	am_transparent = 0;
2520	/* XXX: also turn off Opt_transparent? */	2563	/* XXX: also turn off Opt_transparent? */
2521	}	2564	}
2522	else	2565	else
2523	{	2566	{
…		…
2526	* needed for fvwm2.2.2 (and before?) */	2569	* needed for fvwm2.2.2 (and before?) */
2527	sleep (1);	2570	sleep (1);
2528	#endif	2571	#endif
2529	for (n = 0; n < (unsigned int)i; n++)	2572	for (n = 0; n < (unsigned int)i; n++)
2530	{	2573	{
2531	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2574	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2532	XClearWindow (display->display, TermWin.parent[n]);	2575	XClearWindow (disp, parent[n]);
2533	}	2576	}
2534		2577
2535	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2536	am_transparent = 1;	2579	am_transparent = 1;
2537	}	2580	}
2538		2581
2539	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2582	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2540	TermWin.parent[i] = None;	2583	parent[i] = None;
2541	}	2584	}
2542		2585
2543	if (scrollBar.win)	2586	if (scrollBar.win)
2544	{	2587	{
2545	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2588	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2546	scrollBar.setIdle ();	2589	scrollBar.setIdle ();
2547	scrollbar_show (0);	2590	scrollbar_show (0);
		2591	}
		2592
		2593	if (am_transparent)
		2594	{
		2595	want_refresh = want_full_refresh = 1;
		2596	if (am_pixmap_trans)
		2597	flush ();
2548	}	2598	}
2549		2599
2550	return pchanged;	2600	return pchanged;
2551	}	2601	}
2552	#endif	2602	#endif
…		…
2581	// some window managers resize the window early, and these programs	2631	// some window managers resize the window early, and these programs
2582	// then sometimes get the size wrong.	2632	// then sometimes get the size wrong.
2583	// unfortunately other programs are even more buggy and dislike	2633	// unfortunately other programs are even more buggy and dislike
2584	// being sent SIGWINCH, so only do it when we were in fact being	2634	// being sent SIGWINCH, so only do it when we were in fact being
2585	// resized.	2635	// resized.
2586	if (seen_resize)	2636	if (seen_resize && cmd_pid)
2587	kill (-cmd_pid, SIGWINCH);	2637	kill (-cmd_pid, SIGWINCH);
2588	}	2638	}
2589		2639
2590	/* Read a text string from the input buffer */	2640	/* Read a text string from the input buffer */
2591	unicode_t buf[UBUFSIZ];	2641	unicode_t buf[UBUFSIZ];
2592	bool refreshnow = false;	2642	bool refreshnow = false;
2593	int nlines = 0;	2643	int nlines = 0;
2594	unicode_t *str = buf;	2644	unicode_t *str = buf;
		2645	unicode_t *eol = str + min (ncol, UBUFSIZ);
2595		2646
2596	for (;;)	2647	for (;;)
2597	{	2648	{
2598	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2649	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599	break;	2650	break;
2600		2651
2601	*str++ = ch;	2652	*str++ = ch;
2602		2653
2603	if (ch == C0_LF)	2654	if (ch == C0_LF || str >= eol)
2604	{	2655	{
		2656	if (ch == C0_LF)
2605	nlines++;	2657	nlines++;
		2658
2606	refresh_count++;	2659	refresh_count++;
2607		2660
2608	if (!(options & Opt_jumpScroll)	2661	if (!(options & Opt_jumpScroll)
2609	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2662	|| (refresh_count >= refresh_limit * (nrow - 1)))
2610	{	2663	{
2611	refreshnow = true;	2664	refreshnow = true;
2612	ch = NOCHAR;	2665	ch = NOCHAR;
2613	break;	2666	break;
2614	}	2667	}
2615		2668
2616	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2669	// scr_add_lines only works for nlines <= nrow - 1.
2617	if (nlines >= TermWin.nrow - 1)	2670	if (nlines >= nrow - 1)
2618	{	2671	{
2619	scr_add_lines (buf, nlines, str - buf);	2672	scr_add_lines (buf, nlines, str - buf);
2620	nlines = 0;	2673	nlines = 0;
2621	str = buf;	2674	str = buf;
		2675	eol = str + min (ncol, UBUFSIZ);
2622	}	2676	}
2623	}
2624		2677
2625	if (str >= buf + UBUFSIZ)	2678	if (str >= eol)
2626	{	2679	{
		2680	if (eol >= buf + UBUFSIZ)
		2681	{
2627	ch = NOCHAR;	2682	ch = NOCHAR;
2628	break;	2683	break;
		2684	}
		2685	else
		2686	eol = min (eol + ncol, buf + UBUFSIZ);
		2687	}
		2688
2629	}	2689	}
2630		2690
2631	seq_begin = cmdbuf_ptr;	2691	seq_begin = cmdbuf_ptr;
2632	ch = next_char ();	2692	ch = next_char ();
2633	}	2693	}
…		…
2704	if (len == (size_t)-1)	2764	if (len == (size_t)-1)
2705	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2765	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706		2766
2707	// assume wchar == unicode	2767	// assume wchar == unicode
2708	cmdbuf_ptr += len;	2768	cmdbuf_ptr += len;
2709	return wc;	2769	return wc & UNICODE_MASK;
2710	}	2770	}
2711		2771
2712	return NOCHAR;	2772	return NOCHAR;
2713	}	2773	}
2714		2774
…		…
3177	{	3237	{
3178	switch (priv)	3238	switch (priv)
3179	{	3239	{
3180	case '>':	3240	case '>':
3181	if (ch == CSI_DA) /* secondary device attributes */	3241	if (ch == CSI_DA) /* secondary device attributes */
3182	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3242	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183	break;	3243	break;
3184	case '?':	3244	case '?':
3185	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3245	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186	process_terminal_mode (ch, priv, nargs, arg);	3246	process_terminal_mode (ch, priv, nargs, arg);
3187	break;	3247	break;
…		…
3292		3352
3293	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3353	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294	arg[0] = -arg[0];	3354	arg[0] = -arg[0];
3295	/* FALLTHROUGH */	3355	/* FALLTHROUGH */
3296	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3356	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3357	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298	break;	3358	break;
3299		3359
3300	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3360	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301	tt_write ((const unsigned char *)VT100_ANS,	3361	tt_write ((const unsigned char *)VT100_ANS,
3302	(unsigned int) (sizeof (VT100_ANS) - 1));	3362	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3416	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3476	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417	{	3477	{
3418	int x, y;	3478	int x, y;
3419	XWindowAttributes wattr;	3479	XWindowAttributes wattr;
3420	Window wdummy;	3480	Window wdummy;
		3481	dDisp;
3421		3482
3422	if (nargs == 0)	3483	if (nargs == 0)
3423	return;	3484	return;
3424		3485
3425	switch (args[0])	3486	switch (args[0])
3426	{	3487	{
3427	/*	3488	/*
3428	* commands	3489	* commands
3429	*/	3490	*/
3430	case 1: /* deiconify window */	3491	case 1: /* deiconify window */
3431	XMapWindow (display->display, TermWin.parent[0]);	3492	XMapWindow (disp, parent[0]);
3432	break;	3493	break;
3433	case 2: /* iconify window */	3494	case 2: /* iconify window */
3434	XIconifyWindow (display->display, TermWin.parent[0],	3495	XIconifyWindow (disp, parent[0], display->screen);
3435	DefaultScreen (display->display));
3436	break;	3496	break;
3437	case 3: /* set position (pixels) */	3497	case 3: /* set position (pixels) */
3438	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3498	XMoveWindow (disp, parent[0], args[1], args[2]);
3439	break;	3499	break;
3440	case 4: /* set size (pixels) */	3500	case 4: /* set size (pixels) */
3441	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3501	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442	break;	3502	break;
3443	case 5: /* raise window */	3503	case 5: /* raise window */
3444	XRaiseWindow (display->display, TermWin.parent[0]);	3504	XRaiseWindow (disp, parent[0]);
3445	break;	3505	break;
3446	case 6: /* lower window */	3506	case 6: /* lower window */
3447	XLowerWindow (display->display, TermWin.parent[0]);	3507	XLowerWindow (disp, parent[0]);
3448	break;	3508	break;
3449	case 7: /* refresh window */	3509	case 7: /* refresh window */
3450	scr_touch (true);	3510	scr_touch (true);
3451	break;	3511	break;
3452	case 8: /* set size (chars) */	3512	case 8: /* set size (chars) */
3453	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3513	set_widthheight ((unsigned int) (args[2] * fwidth),
3454	(unsigned int) (args[1] * TermWin.fheight));	3514	(unsigned int) (args[1] * fheight));
3455	break;	3515	break;
3456		3516
3457	//case 9: NYI, TODO, restore maximized window or maximize window	3517	//case 9: NYI, TODO, restore maximized window or maximize window
3458	default:	3518	default:
3459	if (args[0] >= 24) /* set height (chars) */	3519	if (args[0] >= 24) /* set height (chars) */
3460	set_widthheight ((unsigned int)TermWin.width,	3520	set_widthheight ((unsigned int)width,
3461	(unsigned int) (args[1] * TermWin.fheight));	3521	(unsigned int) (args[1] * fheight));
3462	break;	3522	break;
3463		3523
3464		3524
3465	/*	3525	/*
3466	* reports - some output format copied from XTerm	3526	* reports - some output format copied from XTerm
3467	*/	3527	*/
3468	case 11: /* report window state */	3528	case 11: /* report window state */
3469	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3529	XGetWindowAttributes (disp, parent[0], &wattr);
3470	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3530	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471	break;	3531	break;
3472	case 13: /* report window position */	3532	case 13: /* report window position */
3473	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3533	XGetWindowAttributes (disp, parent[0], &wattr);
3474	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3534	XTranslateCoordinates (disp, parent[0], wattr.root,
3475	-wattr.border_width, -wattr.border_width,	3535	-wattr.border_width, -wattr.border_width,
3476	&x, &y, &wdummy);	3536	&x, &y, &wdummy);
3477	tt_printf ("\033[3;%d;%dt", x, y);	3537	tt_printf ("\033[3;%d;%dt", x, y);
3478	break;	3538	break;
3479	case 14: /* report window size (pixels) */	3539	case 14: /* report window size (pixels) */
3480	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3540	XGetWindowAttributes (disp, parent[0], &wattr);
3481	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3541	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482	break;	3542	break;
3483	case 18: /* report text area size (chars) */	3543	case 18: /* report text area size (chars) */
3484	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3544	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485	break;	3545	break;
3486	case 19: /* report window size (chars) */	3546	case 19: /* report window size (chars) */
3487	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3547	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488	break;	3548	break;
3489	case 20: /* report icon label */	3549	case 20: /* report icon label */
3490	{	3550	{
3491	char *s;	3551	char *s;
3492	XGetIconName (display->display, TermWin.parent[0], &s);	3552	XGetIconName (disp, parent[0], &s);
3493	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3553	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494	XFree (s);	3554	XFree (s);
3495	}	3555	}
3496	break;	3556	break;
3497	case 21: /* report window title */	3557	case 21: /* report window title */
3498	{	3558	{
3499	char *s;	3559	char *s;
3500	XFetchName (display->display, TermWin.parent[0], &s);	3560	XFetchName (disp, parent[0], &s);
3501	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3561	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3502	XFree (s);	3562	XFree (s);
3503	}	3563	}
3504	break;	3564	break;
3505	}	3565	}
…		…
3512	* ends_how is terminator used. returned input must be free()'d	3572	* ends_how is terminator used. returned input must be free()'d
3513	*/	3573	*/
3514	unsigned char *	3574	unsigned char *
3515	rxvt_term::get_to_st (unicode_t &ends_how)	3575	rxvt_term::get_to_st (unicode_t &ends_how)
3516	{	3576	{
3517	unicode_t seen_esc = 0, ch;	3577	unicode_t ch;
		3578	bool seen_esc = false;
3518	unsigned int n = 0;	3579	unsigned int n = 0;
3519	unsigned char *s;
3520	unsigned char string[STRING_MAX];	3580	wchar_t string[STRING_MAX];
3521		3581
3522	while ((ch = cmd_getc ()) != NOCHAR)	3582	while ((ch = cmd_getc ()) != NOCHAR)
3523	{	3583	{
3524	if (seen_esc)	3584	if (seen_esc)
3525	{	3585	{
…		…
3528	else	3588	else
3529	return NULL;	3589	return NULL;
3530	}	3590	}
3531	else if (ch == C0_ESC)	3591	else if (ch == C0_ESC)
3532	{	3592	{
3533	seen_esc = 1;	3593	seen_esc = true;
3534	continue;	3594	continue;
3535	}	3595	}
3536	else if (ch == C0_BEL || ch == CHAR_ST)	3596	else if (ch == C0_BEL || ch == CHAR_ST)
3537	break;	3597	break;
3538	else if (ch < 0x20)	3598	else if (ch < 0x20)
3539	return NULL; /* other control character - exit */	3599	return NULL; /* other control character - exit */
3540		3600
3541	seen_esc = 0;	3601	seen_esc = false;
3542		3602
3543	if (n >= sizeof (string) - 1)	3603	if (n >= STRING_MAX - 1)
3544	// stop at some sane length	3604	// stop at some sane length
3545	return NULL;	3605	return NULL;
3546		3606
3547	if (ch == C0_SYN)	3607	if (ch == C0_SYN)
3548	string[n++] = cmd_get8 ();	3608	string[n++] = cmd_get8 ();
…		…
3550	string[n++] = ch;	3610	string[n++] = ch;
3551	}	3611	}
3552		3612
3553	string[n++] = '\0';	3613	string[n++] = '\0';
3554		3614
3555	if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556	return NULL;
3557
3558	ends_how = (ch == 0x5c ? C0_ESC : ch);	3615	ends_how = (ch == 0x5c ? C0_ESC : ch);
3559	strncpy (s, string, n);	3616
3560	return s;	3617	return (unsigned char *)rxvt_wcstombs (string);
3561	}	3618	}
3562		3619
3563	/*----------------------------------------------------------------------*/	3620	/*----------------------------------------------------------------------*/
3564	/*	3621	/*
3565	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3622	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
…		…
3619	set_window_color (color, str);	3676	set_window_color (color, str);
3620	}	3677	}
3621		3678
3622	/*	3679	/*
3623	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3680	* 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	*/	3681	*/
3647	void	3682	void
3648	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3683	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649	{	3684	{
3650	int changed = 0;	3685	int changed = 0;
3651	int color;	3686	int color;
3652	char *buf, *name;	3687	char *buf, *name;
3653	bool query = str[0] == '?' && !str[1];	3688	bool query = str[0] == '?' && !str[1];
3654	int saveop = op;	3689	int saveop = op;
		3690	dDisp;
3655		3691
3656	assert (str != NULL);	3692	assert (str != NULL);
3657	switch (op)	3693	switch (op)
3658	{	3694	{
3659	case XTerm_name:	3695	case XTerm_name:
…		…
3666	set_title (str);	3702	set_title (str);
3667	break;	3703	break;
3668	case XTerm_property:	3704	case XTerm_property:
3669	if (str[0] == '?')	3705	if (str[0] == '?')
3670	{	3706	{
3671	Atom prop = XInternAtom (display->display, str + 1, True);	3707	Atom prop = display->atom (str + 1);
3672	Atom actual_type;	3708	Atom actual_type;
3673	int actual_format;	3709	int actual_format;
3674	unsigned long nitems;	3710	unsigned long nitems;
3675	unsigned long bytes_after;	3711	unsigned long bytes_after;
3676	unsigned char *value = 0;	3712	unsigned char *value = 0;
3677	const char *str = "";	3713	const char *str = "";
3678		3714
3679	if (prop	3715	if (prop
3680	&& XGetWindowProperty (display->display, TermWin.parent[0],	3716	&& XGetWindowProperty (disp, parent[0],
3681	prop, 0, 1<<16, 0, AnyPropertyType,	3717	prop, 0, 1<<16, 0, AnyPropertyType,
3682	&actual_type, &actual_format,	3718	&actual_type, &actual_format,
3683	&nitems, &bytes_after, &value) == Success	3719	&nitems, &bytes_after, &value) == Success
3684	&& actual_type != None	3720	&& actual_type != None
3685	&& actual_format == 8)	3721	&& actual_format == 8)
…		…
3694	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3730	char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695		3731
3696	if (eq)	3732	if (eq)
3697	{	3733	{
3698	*eq = 0;	3734	*eq = 0;
3699	XChangeProperty (display->display, TermWin.parent[0],	3735	set_utf8_property (display->atom (str), eq + 1);
3700	display->atom (str), XA_STRING, 8,
3701	PropModeReplace, (unsigned char *)eq + 1,
3702	strlen (eq + 1));
3703	}	3736	}
3704	else	3737	else
3705	XDeleteProperty (display->display, TermWin.parent[0],	3738	XDeleteProperty (disp, parent[0],
3706	display->atom (str));	3739	display->atom (str));
3707	}	3740	}
3708	break;	3741	break;
3709		3742
3710	case XTerm_Color:	3743	case XTerm_Color:
…		…
3751	break;	3784	break;
3752	#ifndef NO_BOLD_UNDERLINE_REVERSE	3785	#ifndef NO_BOLD_UNDERLINE_REVERSE
3753	case XTerm_Color_BD:	3786	case XTerm_Color_BD:
3754	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3787	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755	break;	3788	break;
3756	case XTerm_Color_IT:
3757	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758	break;
3759	case XTerm_Color_UL:	3789	case XTerm_Color_UL:
3760	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3790	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761	break;	3791	break;
3762	case XTerm_Color_RV:	3792	case XTerm_Color_RV:
3763	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3793	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3764	break;	3794	break;
		3795	case URxvt_Color_IT:
		3796	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3797	break;
3765	#endif	3798	#endif
3766	#if TRANSPARENT || TINTING	3799	#if TRANSPARENT && TINTING
3767	case XTerm_Color_tint:	3800	case URxvt_Color_tint:
3768	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3801	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3769	check_our_parents ();	3802	check_our_parents ();
3770	if (am_transparent)	3803	if (am_transparent)
3771	want_full_refresh = want_refresh = 1;	3804	want_full_refresh = want_refresh = 1;
3772	break;	3805	break;
3773	#endif	3806	#endif
…		…
3785	{	3818	{
3786	str++;	3819	str++;
3787	#if XPM_BACKGROUND	3820	#if XPM_BACKGROUND
3788	changed += scale_pixmap (str);	3821	changed += scale_pixmap (str);
3789	#endif	3822	#endif
3790
3791	}	3823	}
		3824
3792	if (changed)	3825	if (changed)
3793	{	3826	{
3794	#ifdef XPM_BACKGROUND	3827	#ifdef XPM_BACKGROUND
3795	resize_pixmap ();	3828	resize_pixmap ();
3796	#endif	3829	#endif
…		…
3807		3840
3808	case XTerm_logfile:	3841	case XTerm_logfile:
3809	// TODO, when secure mode?	3842	// TODO, when secure mode?
3810	break;	3843	break;
3811		3844
		3845	#ifdef MENUBAR
		3846	case URxvt_Menu:
		3847	if (options & Opt_insecure)
		3848	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3849	break;
		3850	#endif
		3851	#if 0
		3852	case XTerm_dumpscreen: /* no error notices */
		3853	{
		3854	int fd;
		3855	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3856	{
		3857	scr_dump (fd);
		3858	close (fd);
		3859	}
		3860	}
		3861	break;
		3862	#endif
3812	case XTerm_font:	3863	case XTerm_font:
3813	op = URxvt_font;	3864	op = URxvt_font;
3814	case URxvt_font:	3865	case URxvt_font:
3815	#if ENABLE_STYLES	3866	#if ENABLE_STYLES
3816	case URxvt_boldFont:	3867	case URxvt_boldFont:
3817	case URxvt_italicFont:	3868	case URxvt_italicFont:
3818	case URxvt_boldItalicFont:	3869	case URxvt_boldItalicFont:
3819	#endif	3870	#endif
3820	if (query)	3871	if (query)
3821	tt_printf ("\33]%d;%-.250s%c", saveop,	3872	tt_printf ("\33]%d;%-.250s%c", saveop,
3822	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3873	(options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3823	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3874	? fontset[op - URxvt_font]->fontdesc : "",
3824	resp);	3875	resp);
3825	else	3876	else
3826	{	3877	{
3827	const char *&res = rs[Rs_font + (op - URxvt_font)];	3878	const char *&res = rs[Rs_font + (op - URxvt_font)];
3828		3879
…		…
3831	set_fonts ();	3882	set_fonts ();
3832	}	3883	}
3833	break;	3884	break;
3834		3885
3835	#if ENABLE_FRILLS	3886	#if ENABLE_FRILLS
3836	case XTerm_locale:	3887	case URxvt_locale:
3837	if (query)	3888	if (query)
3838	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3889	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3839	else	3890	else
3840	{	3891	{
3841	set_locale (str);	3892	set_locale (str);
3842	# ifdef USE_XIM	3893	pty.set_utf8_mode (enc_utf8);
3843	im_cb ();	3894	init_xlocale ();
3844	# endif
3845	}	3895	}
3846	break;	3896	break;
3847	#endif
3848		3897
3849	#ifdef MENUBAR	3898	case URxvt_view_up:
3850	case XTerm_Menu:	3899	case URxvt_view_down:
3851	if (options & Opt_insecure)	3900	int lines = atoi (str);
3852	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3901
3853	break;	3902	if (lines)
3854	#endif	3903	scr_page (op == URxvt_view_up ? UP : DN, lines);
3855	#if 0
3856	case XTerm_dumpscreen: /* no error notices */
3857	{	3904	else
3858	int fd;
3859	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860	{	3905	{
3861	scr_dump (fd);	3906	scr_erase_savelines ();
3862	close (fd);
3863	}	3907	}
3864	}	3908
3865	break;	3909	break;
3866	#endif	3910	#endif
3867	}	3911	}
3868	}	3912	}
3869	/*----------------------------------------------------------------------*/	3913	/*----------------------------------------------------------------------*/
…		…
4002	*/	4046	*/
4003	PrivMode (1, PrivMode_vt52);	4047	PrivMode (1, PrivMode_vt52);
4004	break;	4048	break;
4005	case 3: /* 80/132 */	4049	case 3: /* 80/132 */
4006	if (priv_modes & PrivMode_132OK)	4050	if (priv_modes & PrivMode_132OK)
4007	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4051	set_widthheight (((state ? 132 : 80) * fwidth), height);
4008	break;	4052	break;
4009	case 4: /* smooth scrolling */	4053	case 4: /* smooth scrolling */
4010	if (state)	4054	if (state)
4011	options &= ~Opt_jumpScroll;	4055	options &= ~Opt_jumpScroll;
4012	else	4056	else
…		…
4284		4328
4285	/* ---------------------------------------------------------------------- */	4329	/* ---------------------------------------------------------------------- */
4286	/* Write data to the pty as typed by the user, pasted with the mouse,	4330	/* Write data to the pty as typed by the user, pasted with the mouse,
4287	* or generated by us in response to a query ESC sequence.	4331	* or generated by us in response to a query ESC sequence.
4288	*/	4332	*/
		4333	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
		4334
4289	void	4335	void
4290	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4336	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4291	{	4337	{
4292	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4338	if (v_buflen == 0)
		4339	{
		4340	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4293		4341
4294	if (len)	4342	if ((unsigned int)written == len)
		4343	return;
		4344
		4345	data += written;
		4346	len -= written;
4295	{	4347	}
		4348
		4349	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
		4350
		4351	memcpy (v_buffer + v_buflen, data, len);
		4352	v_buflen += len;
		4353
		4354	pty_ev.set (EVENT_READ | EVENT_WRITE);
		4355	}
		4356
		4357	void rxvt_term::pty_write ()
		4358	{
		4359	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
		4360
		4361	if (written > 0)
		4362	{
		4363	v_buflen -= written;
		4364
4296	if (v_buflen == 0)	4365	if (v_buflen == 0)
4297	{	4366	{
4298	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300	if ((unsigned int)written == len)
4301	return;
4302
4303	data += written;
4304	len -= written;
4305	}
4306
4307
4308	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310	memcpy (v_buffer + v_buflen, data, len);
4311	v_buflen += len;
4312	}
4313
4314	for (;;)
4315	{
4316	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318	if (written > 0)
4319	{
4320	v_buflen -= written;
4321
4322	if (v_buflen == 0)
4323	{
4324	free (v_buffer);	4367	free (v_buffer);
4325	v_buffer = 0;	4368	v_buffer = 0;
4326	v_buflen = 0;	4369	v_buflen = 0;
4327		4370
4328	pty_ev.set (EVENT_READ);	4371	pty_ev.set (EVENT_READ);
4329	return;
4330	}
4331
4332	memmove (v_buffer, v_buffer + written, v_buflen);
4333	}
4334	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4335	// original code just ignores this...
4336	destroy ();
4337	else
4338	{
4339	pty_ev.set (EVENT_READ | EVENT_WRITE);
4340	return;	4372	return;
4341	}	4373	}
		4374
		4375	memmove (v_buffer, v_buffer + written, v_buflen);
4342	}	4376	}
		4377	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		4378	// original code just ignores this...
		4379	destroy ();
4343	}	4380	}
4344		4381
4345	/*----------------------- end-of-file (C source) -----------------------*/	4382	/*----------------------- end-of-file (C source) -----------------------*/
4346		4383

Diff Legend

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