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.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.313 by root, Wed Jul 5 22:46:14 2006 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*----------------------------------------------------------------------*
2	* File: command.C	2	* File: command.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
…		…
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
64		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
		63
65	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		67
72	#if ENABLE_FRILLS || ISO_14755	68	#if ENABLE_FRILLS || ISO_14755
73		69
74	#define ISO_14755_STARTED 0x80000000UL	70	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	71	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	226	# if !UNICODE3
231	if (ch >= 0x10000)	227	if (ch >= 0x10000)
232	ch = 0xfffd;	228	ch = 0xfffd;
233	# endif	229	# endif
234	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
236	}	234	}
237		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
238	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
240		243
241	free (fname);	244	free (fname);
242		245
…		…
295		298
296	return -1;	299	return -1;
297	}	300	}
298	#endif	301	#endif
299		302
300	/*{{{ Convert the keypress event into a string */
301	void	303	void
302	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
303	{	305	{
304	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
305	unsigned int newlen;	307	unsigned int newlen;
306	KeySym keysym;	308	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
464	{	468	{
465	switch (keysym)	469	switch (keysym)
466	{	470	{
467	/* normal XTerm key bindings */	471	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	472	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	473	selection_request (ev.time);
470	return;	474	return;
471	#if TODO	475	#if TODO
472	/* rxvt extras */	476	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	477	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	478	change_font (FONT_UP);
…		…
905	{	909	{
906	const char ch = C0_ESC;	910	const char ch = C0_ESC;
907	tt_write (&ch, 1);	911	tt_write (&ch, 1);
908	}	912	}
909		913
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
921	}	915	}
922	/*}}} */
923		916
		917	void
		918	rxvt_term::key_release (XKeyEvent &ev)
		919	{
		920	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
		921	KeySym keysym;
		922
		923	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		924	#endif
		925
		926	#if ENABLE_FRILLS || ISO_14755
		927	// ISO 14755 support
		928	if (iso14755buf)
		929	if (iso14755buf & ISO_14755_52)
		930	{
		931	# if ENABLE_OVERLAY
		932	scr_overlay_off ();
		933	# endif
		934	# if ISO_14755
		935	// iso14755 part 5.2 handling: release time
		936	// first: controls
		937	if ((ev.state & ControlMask)
		938	&& ((keysym >= 0x40 && keysym <= 0x5f)
		939	|| (keysym >= 0x61 && keysym <= 0x7f)))
		940	{
		941	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
		942	commit_iso14755 ();
		943
		944	return;
		945	}
		946
		947	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		948	if (i[0] == keysym)
		949	{
		950	iso14755buf = ISO_14755_51 | i[1];
		951	commit_iso14755 ();
		952
		953	return;
		954	}
		955
		956	scr_bell ();
		957	# endif
		958	iso14755buf = 0;
		959
		960	return;
		961	}
		962	else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
		963	{
		964	# if ENABLE_OVERLAY
		965	scr_overlay_off ();
		966	# endif
		967	if (iso14755buf & ISO_14755_51)
		968	commit_iso14755 ();
		969	#if ISO_14755
		970	else if (iso14755buf & ISO_14755_STARTED)
		971	{
		972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		973
		974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		976	}
		977	# endif
		978	else
		979	iso14755buf = 0;
		980	}
		981	#endif
		982
		983	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		984	return;
		985
		986	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		987	if (!(ev.state & ControlMask))
		988	slip_wheel_ev.stop ();
		989	else if (keysym == XK_Control_L || keysym == XK_Control_R)
		990	mouse_slip_wheel_speed = 0;
		991	#endif
		992	}
		993
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	995	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	997	{
930	unsigned int n, s;	998	unsigned int n, s;
931		999
…		…
1008	while (l->is_longer () && row < end_row);	1076	while (l->is_longer () && row < end_row);
1009	}	1077	}
1010	while (row < end_row);	1078	while (row < end_row);
1011	}	1079	}
1012		1080
1013	scr_refresh (refresh_type);	1081	scr_refresh ();
1014	scrollbar_show (1);	1082	scrollbar_show (1);
1015	#ifdef USE_XIM	1083	#ifdef USE_XIM
1016	IMSendSpot ();	1084	IMSendSpot ();
1017	#endif	1085	#endif
1018	}	1086	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1114	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1115	{
1048	hidden_cursor = !hidden_cursor;	1116	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1117	want_refresh = 1;
1050		1118
1051	w.start (w.at + BLINK_INTERVAL);	1119	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1120	}
1053	#endif	1121	#endif
1054		1122
1055	#ifdef TEXT_BLINK	1123	#ifdef TEXT_BLINK
1056	void	1124	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1138	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1139	{
1072	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1140	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1141	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1142	{
1075	refresh_type |= SMOOTH_REFRESH;
1076	want_refresh = 1;	1143	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1144	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1145	}
1079	}	1146	}
1080	#endif	1147	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1151	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1152	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1153	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1154	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1155	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type |= SMOOTH_REFRESH;
1090	want_refresh = 1;	1156	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1157	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1158	}
1093	}	1159	}
1094	#endif	1160	#endif
…		…
1102	: scr_page (UP, mouse_slip_wheel_speed))	1168	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1169	{
1104	if (view_start == top_row || view_start == 0)	1170	if (view_start == top_row || view_start == 0)
1105	mouse_slip_wheel_speed = 0;	1171	mouse_slip_wheel_speed = 0;
1106		1172
1107	refresh_type |= SMOOTH_REFRESH;
1108	want_refresh = 1;	1173	want_refresh = 1;
1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110	}	1175	}
1111	}	1176	}
1112	#endif	1177	#endif
1113		1178
1114	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1115	static struct event_handler	1180	static struct event_handler
1116	{	1181	{
1117	check_watcher cw_yield;	1182	check_watcher yield_ev;
1118		1183
1119	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1120	{	1185	{
1121	sched_yield ();	1186	// this should really be sched_yield(), but the linux guys thought
		1187	// that giving a process calling sched_yield () less cpu time than
		1188	// ones with high nice levels is a useful thing to do. It surely is is
		1189	// allowed by the sus... as is returning ENOSYS.
		1190
		1191	struct timespec ts = { 0, 0 };
		1192	nanosleep (&ts, 0);
		1193
1122	w.stop ();	1194	w.stop ();
1123	}	1195	}
1124		1196
1125	event_handler ()	1197	event_handler ()
1126	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1127	{	1199	{
1128	}	1200	}
1129	} event_handler;	1201	} event_handler;
1130	#endif	1202	#endif
1131		1203
…		…
1142		1214
1143	memmove (cmdbuf_base, cmdbuf_ptr, n);	1215	memmove (cmdbuf_base, cmdbuf_ptr, n);
1144	cmdbuf_ptr = cmdbuf_base;	1216	cmdbuf_ptr = cmdbuf_base;
1145	cmdbuf_endp = cmdbuf_ptr + n;	1217	cmdbuf_endp = cmdbuf_ptr + n;
1146		1218
1147	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1219	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148		1220
1149	if (r > 0)	1221	if (r > 0)
1150	{	1222	{
1151	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1152	return true;	1224	return true;
1153	}	1225	}
1154	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155	{	1227	{
1156	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1157	if (display->is_local)	1229	if (display->is_local)
1158	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1159	#endif	1231	#endif
1160	}	1232	}
1161	else	1233	else
1162	{	1234	{
1163	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1185	}	1257	}
1186		1258
1187	void	1259	void
1188	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1189	{	1261	{
1190	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1191	recolour_cursor ();	1263	recolour_cursor ();
1192		1264
1193	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1194	hidden_pointer = 0;	1266	hidden_pointer = 0;
1195		1267
…		…
1203	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1204	{	1276	{
1205	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1206	return;	1278	return;
1207		1279
1208	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1209	XFlush (display->display);	1281	XFlush (dpy);
1210		1282
1211	hidden_pointer = 1;	1283	hidden_pointer = 1;
1212	}	1284	}
1213		1285
1214	void	1286	void
…		…
1287	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1288	(32 + x + 1),	1360	(32 + x + 1),
1289	(32 + y + 1));	1361	(32 + y + 1));
1290	}	1362	}
1291		1363
1292	#ifdef USING_W11LIB
1293	void
1294	rxvt_W11_process_x_event (XEvent *ev)
1295	{
1296	rxvt_t *r = rxvt_get_r ();
1297
1298	x_cb (*ev);
1299	}
1300	#endif
1301
1302	/*{{{ process an X event */	1364	/*{{{ process an X event */
1303	void	1365	void
1304	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1305	{	1367	{
1306	make_current ();	1368	make_current ();
1307		1369
1308	dDisp;	1370	dLocal (Display *, dpy);
1309		1371
1310	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1311	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1312	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313	return;	1375	return;
…		…
1318	unsigned int unused_mask;	1380	unsigned int unused_mask;
1319		1381
1320	switch (ev.type)	1382	switch (ev.type)
1321	{	1383	{
1322	case KeyPress:	1384	case KeyPress:
1323	#if ISO_14755	1385	key_press (ev.xkey);
1324	if (!(iso14755buf & ISO_14755_52))
1325	#endif
1326	lookup_key (ev.xkey);
1327
1328	break;	1386	break;
1329		1387
1330	case KeyRelease:	1388	case KeyRelease:
1331	{	1389	key_release (ev.xkey);
1332	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333	KeySym keysym;
1334
1335	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336	#endif
1337
1338	#if ENABLE_FRILLS || ISO_14755
1339	// ISO 14755 support
1340	if (iso14755buf)
1341	if (iso14755buf & ISO_14755_52)
1342	{
1343	# if ENABLE_OVERLAY
1344	scr_overlay_off ();
1345	# endif
1346	# if ISO_14755
1347	// iso14755 part 5.2 handling: release time
1348	// first: controls
1349	if ((ev.xkey.state & ControlMask)
1350	&& ((keysym >= 0x40 && keysym <= 0x5f)
1351	|| (keysym >= 0x61 && keysym <= 0x7f)))
1352	{
1353	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354	commit_iso14755 ();
1355	goto skip_switch;
1356	}
1357
1358	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359	if (i[0] == keysym)
1360	{
1361	iso14755buf = ISO_14755_51 | i[1];
1362	commit_iso14755 ();
1363	goto skip_switch;
1364	}
1365
1366	scr_bell ();
1367	# endif
1368	iso14755buf = 0;
1369	break;
1370	}
1371	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372	{
1373	# if ENABLE_OVERLAY
1374	scr_overlay_off ();
1375	# endif
1376	if (iso14755buf & ISO_14755_51)
1377	commit_iso14755 ();
1378	#if ISO_14755
1379	else if (iso14755buf & ISO_14755_STARTED)
1380	{
1381	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385	}
1386	# endif
1387	else
1388	iso14755buf = 0;
1389	}
1390	#endif
1391
1392	if (ev.xany.window == vt
1393	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394	break;
1395
1396	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397	if (!(ev.xkey.state & ControlMask))
1398	slip_wheel_ev.stop ();
1399	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400	mouse_slip_wheel_speed = 0;
1401	#endif
1402	break;	1390	break;
1403	}
1404		1391
1405	case ButtonPress:	1392	case ButtonPress:
1406	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1407	break;	1394	break;
1408		1395
…		…
1410	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1411	break;	1398	break;
1412		1399
1413	case ClientMessage:	1400	case ClientMessage:
1414	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1415	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416	{	1403	{
		1404	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1405	{
		1406	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1407	{
1417	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1408	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1409	{
		1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418	destroy ();	1411	destroy ();
		1412	}
1419	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1420	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1414	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1422	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1423	&ev);	1417	&ev);
		1418	#endif
		1419	}
		1420	}
		1421	#if ENABLE_XEMBED
		1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1423	{
		1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1425	focus_in ();
		1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1427	focus_out ();
		1428	}
1424	#endif	1429	#endif
1425	}	1430	}
1426	#if ENABLE_XEMBED
1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428	{
1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430	focus_in ();
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();
1433	}
1434	#endif
1435	#ifdef OFFIX_DND
1436	/* OffiX Dnd (drag 'n' drop) protocol */
1437	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438	&& (ev.xclient.data.l[0] == DndFile
1439	|| ev.xclient.data.l[0] == DndDir
1440	|| ev.xclient.data.l[0] == DndLink))
1441	{
1442	/* Get Dnd data */
1443	Atom ActualType;
1444	int ActualFormat;
1445	unsigned char *data;
1446	unsigned long Size, RemainingBytes;
1447
1448	XGetWindowProperty (disp, display->root,
1449	xa[XA_DNDSELECTION],
1450	0L, 1000000L,
1451	False, AnyPropertyType,
1452	&ActualType, &ActualFormat,
1453	&Size, &RemainingBytes,
1454	&data);
1455	set_string_property (XA_CUT_BUFFER0, data);
1456	XFree (data);
1457	selection_paste (display->root, XA_CUT_BUFFER0, true);
1458	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459	}
1460	#endif /* OFFIX_DND */
1461	break;	1431	break;
1462		1432
1463	case MappingNotify:	1433	case MappingNotify:
1464	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1465	break;	1435	break;
…		…
1498	break;	1468	break;
1499		1469
1500	case ConfigureNotify:	1470	case ConfigureNotify:
1501	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1502	{	1472	{
1503	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504	;	1474	;
1505		1475
1506	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507	{	1477	{
1508	seen_resize = 1;	1478	seen_resize = 1;
1509	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510	}	1480	}
1511		1481
		1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1483
1512	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513	if (OPTION (Opt_transparent))	1485	if (OPTION (Opt_transparent))
1514	check_our_parents ();	1486	check_our_parents ();
1515	#endif	1487	#endif
1516	}	1488	}
1517	break;	1489	break;
1518		1490
1519	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1522	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1523		1496
1524	break;	1497	break;
1525		1498
1526	case SelectionClear:	1499	case SelectionClear:
1527	selection_clear ();	1500	selection_clear ();
…		…
1563	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1564	{	1537	{
1565	do	1538	do
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1568	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569		1542
1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571		1544
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1574	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1575		1548
1576	want_refresh = 1;	1549	want_refresh = 1;
1577	}	1550	}
1578	else	1551	else
1579	{	1552	{
1580	XEvent unused_event;	1553	XEvent unused_event;
1581		1554
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583	;	1556	;
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585	;	1558	;
1586		1559
1587	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1588	{	1561	{
1589	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1590	scrollbar_show (0);	1563	scrollbar_show (0);
1591	}	1564	}
1592	#ifdef MENUBAR
1593	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594	menubar_expose ();
1595	#endif
1596		1565
1597	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1598	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1599	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1600	#endif	1569	#endif
1601	}	1570	}
1602	break;	1571	break;
1603		1572
1604	case MotionNotify:	1573	case MotionNotify:
1605	#ifdef POINTER_BLANK	1574	#ifdef POINTER_BLANK
1606	if (hidden_pointer)	1575	if (hidden_pointer)
1607	pointer_unblank ();	1576	pointer_unblank ();
1608	#endif
1609	#if MENUBAR
1610	if (isMenuBarWindow (ev.xany.window))
1611	{
1612	menubar_control (ev.xbutton);
1613	break;
1614	}
1615	#endif	1577	#endif
1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1578	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617	break;	1579	break;
1618		1580
1619	if (ev.xany.window == vt)	1581	if (ev.xany.window == vt)
…		…
1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1585	; // nop
1624	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625	{	1587	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627	;	1589	;
1628		1590
1629	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1630	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1631	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1632	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1633	&ev.xbutton.state);	1595	&ev.xbutton.state);
1634	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1698	#endif	1660	#endif
1699	}	1661	}
1700	}	1662	}
1701	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702	{	1664	{
1703	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704	MotionNotify, &ev))	1666	MotionNotify, &ev))
1705	;	1667	;
1706		1668
1707	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1708	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1709	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1673	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1716	scrollbar_show (1);	1678	scrollbar_show (1);
1717	}	1679	}
1718	break;	1680	break;
1719	}	1681	}
1720		1682
1721	skip_switch: ;
1722
1723	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1724	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725	{	1685	{
1726	if (hidden_cursor)	1686	if (hidden_cursor)
1727	{	1687	{
1728	hidden_cursor = 0;	1688	hidden_cursor = 0;
1729	want_refresh = 1;	1689	want_refresh = 1;
1730	}	1690	}
1731		1691
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1693	}
1734	#endif	1694	#endif
1735		1695
1736	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1754	if (!focus)	1714	if (!focus)
1755	{	1715	{
1756	focus = 1;	1716	focus = 1;
1757	want_refresh = 1;	1717	want_refresh = 1;
1758		1718
1759	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760		1720
1761	#if USE_XIM	1721	#if USE_XIM
1762	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1763	{	1723	{
1764	IMSetStatusPosition ();	1724	IMSetPosition ();
1765	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1766	}	1726	}
1767	#endif	1727	#endif
1768	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1731	#endif
1772	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1774	{	1734	{
1775	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1813	pix_colors = pix_colors_unfocused;	1773	pix_colors = pix_colors_unfocused;
1814	scr_recolour ();	1774	scr_recolour ();
1815	}	1775	}
1816	#endif	1776	#endif
1817	}	1777	}
		1778	}
		1779
		1780	void
		1781	rxvt_term::update_fade_color (unsigned int idx)
		1782	{
		1783	#if OFF_FOCUS_FADING
		1784	if (rs[Rs_fade])
		1785	{
		1786	rgba c;
		1787	pix_colors [Color_fade].get (c);
		1788	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1789	}
		1790	#endif
1818	}	1791	}
1819		1792
1820	#if TRANSPARENT	1793	#if TRANSPARENT
1821	void	1794	void
1822	rxvt_term::rootwin_cb (XEvent &ev)	1795	rxvt_term::rootwin_cb (XEvent &ev)
…		…
1856	/*	1829	/*
1857	* VT window processing of button press	1830	* VT window processing of button press
1858	*/	1831	*/
1859	if (ev.window == vt)	1832	if (ev.window == vt)
1860	{	1833	{
		1834	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1835	return;
		1836
1861	#if ISO_14755	1837	#if ISO_14755
1862	// 5.4	1838	// 5.4
1863	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1839	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864	{	1840	{
1865	iso14755_54 (ev.x, ev.y);	1841	iso14755_54 (ev.x, ev.y);
…		…
1907	else	1883	else
1908	{	1884	{
1909	if (ev.button != MEvent.button)	1885	if (ev.button != MEvent.button)
1910	MEvent.clicks = 0;	1886	MEvent.clicks = 0;
1911		1887
1912	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913	switch (ev.button)	1888	switch (ev.button)
1914	{	1889	{
1915	case Button1:	1890	case Button1:
1916	/* allow meta + click to select rectangular areas */	1891	/* allow meta + click to select rectangular areas */
1917	/* should be done in screen.C */	1892	/* should be done in screen.C */
1918	#if ENABLE_FRILLS	1893	#if ENABLE_FRILLS
1919	selection.rect = !!(ev.state & ModMetaMask);	1894	selection.rect = !!(ev.state & ModMetaMask);
1920	#else	1895	#else
1921	selection.rect = false;	1896	selection.rect = false;
1922	#endif	1897	#endif
1923		1898
1924	/* allow shift+left click to extend selection */	1899	/* allow shift+left click to extend selection */
1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1900	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926	{	1901	{
1927	if (MEvent.button == Button1 && clickintime)	1902	if (MEvent.button == Button1 && clickintime)
1928	selection_rotate (ev.x, ev.y);	1903	selection_rotate (ev.x, ev.y);
1929	else	1904	else
1930	selection_extend (ev.x, ev.y, 1);	1905	selection_extend (ev.x, ev.y, 1);
1931	}	1906	}
1932	else	1907	else
1933	{	1908	{
1934	if (MEvent.button == Button1 && clickintime)	1909	if (MEvent.button == Button1 && clickintime)
1935	MEvent.clicks++;	1910	MEvent.clicks++;
1936	else	1911	else
1937	MEvent.clicks = 1;	1912	MEvent.clicks = 1;
1938		1913
1939	selection_click (MEvent.clicks, ev.x, ev.y);	1914	selection_click (MEvent.clicks, ev.x, ev.y);
1940	}	1915	}
1941		1916
1942	MEvent.button = Button1;	1917	MEvent.button = Button1;
1943	break;	1918	break;
1944		1919
1945	case Button3:	1920	case Button3:
1946	if (MEvent.button == Button3 && clickintime)	1921	if (MEvent.button == Button3 && clickintime)
1947	selection_rotate (ev.x, ev.y);	1922	selection_rotate (ev.x, ev.y);
1948	else	1923	else
1949	selection_extend (ev.x, ev.y, 1);	1924	selection_extend (ev.x, ev.y, 1);
1950		1925
1951	MEvent.button = Button3;	1926	MEvent.button = Button3;
1952	break;	1927	break;
1953	}	1928	}
1954	}	1929	}
1955		1930
1956	MEvent.time = ev.time;	1931	MEvent.time = ev.time;
1957	return;	1932	return;
1958	}	1933	}
1959		1934
…		…
2098	}	2073	}
2099	}	2074	}
2100		2075
2101	return;	2076	return;
2102	}	2077	}
2103
2104	#if MENUBAR
2105	/*
2106	* Menubar window processing of button press
2107	*/
2108	if (isMenuBarWindow (ev.window))
2109	menubar_control (ev);
2110	#endif
2111	}	2078	}
2112		2079
2113	void	2080	void
2114	rxvt_term::button_release (XButtonEvent &ev)	2081	rxvt_term::button_release (XButtonEvent &ev)
2115	{	2082	{
…		…
2121		2088
2122	if (scrollbar_isUpDn ())	2089	if (scrollbar_isUpDn ())
2123	{	2090	{
2124	scrollBar.setIdle ();	2091	scrollBar.setIdle ();
2125	scrollbar_show (0);	2092	scrollbar_show (0);
2126	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127	refresh_type &= ~SMOOTH_REFRESH;
2128	#endif
2129	}	2093	}
2130		2094
2131	#ifdef SELECTION_SCROLLING	2095	#ifdef SELECTION_SCROLLING
2132	if (sel_scroll_ev.active)	2096	if (sel_scroll_ev.active)
2133	sel_scroll_ev.stop();	2097	sel_scroll_ev.stop();
2134	#endif	2098	#endif
2135		2099
2136	if (ev.window == vt)	2100	if (ev.window == vt)
2137	{	2101	{
		2102	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2103	return;
		2104
2138	#if ISO_14755	2105	#if ISO_14755
2139	// 5.4	2106	// 5.4
2140	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2107	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141	return;	2108	return;
2142	#endif	2109	#endif
		2110
2143	if (reportmode)	2111	if (reportmode)
2144	{	2112	{
2145	/* mouse report from vt window */	2113	/* mouse report from vt window */
2146	/* don't report release of wheel "buttons" */	2114	/* don't report release of wheel "buttons" */
2147	if (ev.button >= 4)	2115	if (ev.button >= 4)
…		…
2171	if (priv_modes & PrivMode_mouse_report	2139	if (priv_modes & PrivMode_mouse_report
2172	&& bypass_keystate	2140	&& bypass_keystate
2173	&& ev.button == Button1 && MEvent.clicks <= 1)	2141	&& ev.button == Button1 && MEvent.clicks <= 1)
2174	selection_extend (ev.x, ev.y, 0);	2142	selection_extend (ev.x, ev.y, 0);
2175		2143
2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177	return;
2178
2179	switch (ev.button)	2144	switch (ev.button)
2180	{	2145	{
2181	case Button1:	2146	case Button1:
2182	case Button3:	2147	case Button3:
2183	selection_make (ev.time);	2148	selection_make (ev.time);
2184	break;	2149	break;
		2150
2185	case Button2:	2151	case Button2:
2186	selection_request (ev.time, ev.x, ev.y);	2152	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2153	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2187	break;	2154	break;
		2155
2188	#ifdef MOUSE_WHEEL	2156	#ifdef MOUSE_WHEEL
2189	case Button4:	2157	case Button4:
2190	case Button5:	2158	case Button5:
2191	{	2159	{
2192	int i;	2160	int i;
…		…
2224	}	2192	}
2225	break;	2193	break;
2226	#endif	2194	#endif
2227	}	2195	}
2228	}	2196	}
2229	#ifdef MENUBAR
2230	else if (isMenuBarWindow (ev.window))
2231	menubar_control (ev);
2232	#endif
2233	}	2197	}
2234		2198
2235	#ifdef TRANSPARENT	2199	#ifdef TRANSPARENT
2236	#if TINTING	2200	#if TINTING
2237	/* taken from aterm-0.4.2 */	2201	/* taken from aterm-0.4.2 */
2238		2202
2239	typedef uint32_t RUINT32T;	2203	typedef uint32_t RUINT32T;
2240		2204
2241	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2205	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2242	{	2206	{
2243	int sh_r, sh_g, sh_b;	2207	int sh_r, sh_g, sh_b;
2244	RUINT32T mask_r, mask_g, mask_b;	2208	RUINT32T mask_r, mask_g, mask_b;
2245	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2209	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2210	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2211	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248	int i;	2212	int i;
2249		2213
2250	Visual *visual = display->visual;	2214	Visual *visual = term->visual;
2251		2215
2252	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2216	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253		2217
2254	/* for convenience */	2218	/* for convenience */
2255	mask_r = visual->red_mask;	2219	mask_r = visual->red_mask;
…		…
2476	Atom atype;	2440	Atom atype;
2477	unsigned char *prop = NULL;	2441	unsigned char *prop = NULL;
2478	Window root, oldp, *list;	2442	Window root, oldp, *list;
2479	Pixmap rootpixmap = None;	2443	Pixmap rootpixmap = None;
2480	XWindowAttributes wattr, wrootattr;	2444	XWindowAttributes wattr, wrootattr;
2481	dDisp;
2482		2445
2483	pchanged = 0;	2446	pchanged = 0;
2484		2447
2485	if (!OPTION (Opt_transparent))	2448	if (!OPTION (Opt_transparent))
2486	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2487		2450
2488	XGetWindowAttributes (disp, display->root, &wrootattr);	2451	XGetWindowAttributes (dpy, display->root, &wrootattr);
2489	rootdepth = wrootattr.depth;	2452	rootdepth = wrootattr.depth;
2490		2453
2491	XGetWindowAttributes (disp, parent[0], &wattr);	2454	XGetWindowAttributes (dpy, parent[0], &wattr);
2492		2455
2493	if (rootdepth != wattr.depth)	2456	if (rootdepth != wattr.depth)
2494	{	2457	{
2495	if (am_transparent)	2458	if (am_transparent)
2496	{	2459	{
2497	pchanged = 1;	2460	pchanged = 1;
2498	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2461	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2499	am_transparent = am_pixmap_trans = 0;	2462	am_transparent = am_pixmap_trans = 0;
2500	}	2463	}
2501		2464
2502	return pchanged; /* Don't try any more */	2465	return pchanged; /* Don't try any more */
2503	}	2466	}
2504		2467
2505	/* Get all X ops out of the queue so that our information is up-to-date. */	2468	/* Get all X ops out of the queue so that our information is up-to-date. */
2506	XSync (disp, False);	2469	XSync (dpy, False);
2507		2470
2508	/*	2471	/*
2509	* Make the frame window set by the window manager have	2472	* Make the frame window set by the window manager have
2510	* the root background. Some window managers put multiple nested frame	2473	* the root background. Some window managers put multiple nested frame
2511	* windows for each client, so we have to take care about that.	2474	* windows for each client, so we have to take care about that.
2512	*/	2475	*/
2513	i = (xa[XA_XROOTPMAP_ID]	2476	i = (xa[XA_XROOTPMAP_ID]
2514	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2477	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2515	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2478	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516	&nitems, &bytes_after, &prop) == Success);	2479	&nitems, &bytes_after, &prop) == Success);
2517		2480
2518	if (!i || prop == NULL)	2481	if (!i || prop == NULL)
2519	i = (xa[XA_ESETROOT_PMAP_ID]	2482	i = (xa[XA_ESETROOT_PMAP_ID]
2520	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2483	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2521	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522	&nitems, &bytes_after, &prop) == Success);	2485	&nitems, &bytes_after, &prop) == Success);
2523		2486
2524	if (!i || prop == NULL	2487	if (!i || prop == NULL
2525	#if TINTING	2488	#if TINTING
2526	|| !rs[Rs_color + Color_tint]	2489	|| !ISSET_PIXCOLOR (Color_tint)
2527	#endif	2490	#endif
2528	)	2491	)
2529	have_pixmap = 0;	2492	have_pixmap = 0;
2530	else	2493	else
2531	{	2494	{
…		…
2544	Window cr;	2507	Window cr;
2545	XImage *image;	2508	XImage *image;
2546	GC gc;	2509	GC gc;
2547	XGCValues gcvalue;	2510	XGCValues gcvalue;
2548		2511
2549	XTranslateCoordinates (disp, parent[0], display->root,	2512	XTranslateCoordinates (dpy, parent[0], display->root,
2550	0, 0, &sx, &sy, &cr);	2513	0, 0, &sx, &sy, &cr);
2551	nw = (unsigned int)szHint.width;	2514	nw = (unsigned int)szHint.width;
2552	nh = (unsigned int)szHint.height;	2515	nh = (unsigned int)szHint.height;
2553	nx = ny = 0;	2516	nx = ny = 0;
2554		2517
…		…
2567	}	2530	}
2568		2531
2569	min_it (nw, (unsigned int) (wrootattr.width - sx));	2532	min_it (nw, (unsigned int) (wrootattr.width - sx));
2570	min_it (nh, (unsigned int) (wrootattr.height - sy));	2533	min_it (nh, (unsigned int) (wrootattr.height - sy));
2571		2534
2572	XSync (disp, False);	2535	XSync (dpy, False);
2573	allowedxerror = -1;	2536	allowedxerror = -1;
2574	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2537	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575		2538
2576	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2539	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2577	/* XXX: may need a delay here? */	2540	/* XXX: may need a delay here? */
2578	allowedxerror = 0;	2541	allowedxerror = 0;
2579		2542
…		…
2582	if (am_transparent && am_pixmap_trans)	2545	if (am_transparent && am_pixmap_trans)
2583	{	2546	{
2584	pchanged = 1;	2547	pchanged = 1;
2585	if (pixmap != None)	2548	if (pixmap != None)
2586	{	2549	{
2587	XFreePixmap (disp, pixmap);	2550	XFreePixmap (dpy, pixmap);
2588	pixmap = None;	2551	pixmap = None;
2589	}	2552	}
2590	}	2553	}
2591		2554
2592	am_pixmap_trans = 0;	2555	am_pixmap_trans = 0;
2593	}	2556	}
2594	else	2557	else
2595	{	2558	{
2596	if (pixmap != None)	2559	if (pixmap != None)
2597	XFreePixmap (disp, pixmap);	2560	XFreePixmap (dpy, pixmap);
2598		2561
2599	#if TINTING	2562	#if TINTING
2600	if (ISSET_PIXCOLOR (Color_tint))	2563	if (ISSET_PIXCOLOR (Color_tint))
2601	{	2564	{
2602	unsigned short rm, gm, bm;
2603	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2565	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604		2566
		2567	rgba c;
2605	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2568	pix_colors_focused [Color_tint].get (c);
2606		2569
2607	ShadeXImage (display, image, shade, rm, gm, bm);	2570	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608	}	2571	}
2609	#endif	2572	#endif
2610		2573
2611	pixmap = XCreatePixmap (disp, vt,	2574	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2612	szHint.width, szHint.height, image->depth);
2613	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2575	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2614	XPutImage (disp, pixmap, gc, image, 0, 0,	2576	XPutImage (dpy, pixmap, gc, image, 0, 0,
2615	nx, ny, image->width, image->height);	2577	nx, ny, image->width, image->height);
2616	XFreeGC (disp, gc);	2578	XFreeGC (dpy, gc);
2617	XDestroyImage (image);	2579	XDestroyImage (image);
2618	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2580	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2619	XClearWindow (disp, parent[0]);	2581	XClearWindow (dpy, parent[0]);
2620		2582
2621	if (!am_transparent || !am_pixmap_trans)	2583	if (!am_transparent || !am_pixmap_trans)
2622	pchanged = 1;	2584	pchanged = 1;
2623		2585
2624	am_transparent = am_pixmap_trans = 1;	2586	am_transparent = am_pixmap_trans = 1;
2625	}	2587	}
2626	}	2588	}
2627		2589
2628	if (am_pixmap_trans)	2590	if (am_pixmap_trans)
2629	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2591	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2630	else	2592	else
2631	{	2593	{
2632	unsigned int n;	2594	unsigned int n;
2633	/*	2595	/*
2634	* InheritPixmap transparency	2596	* InheritPixmap transparency
2635	*/	2597	*/
2636	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2598	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	{	2599	{
2638	oldp = parent[i];	2600	oldp = parent[i];
2639	XQueryTree (disp, parent[i - 1], &root,	2601	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2640	&parent[i], &list, &n);
2641	XFree (list);	2602	XFree (list);
2642		2603
2643	if (parent[i] == display->root)	2604	if (parent[i] == display->root)
2644	{	2605	{
2645	if (oldp != None)	2606	if (oldp != None)
…		…
2653	}	2614	}
2654		2615
2655	n = 0;	2616	n = 0;
2656		2617
2657	if (pchanged)	2618	if (pchanged)
2658	{
2659	for (; n < (unsigned int)i; n++)	2619	for (; n < (unsigned int)i; n++)
2660	{	2620	{
2661	XGetWindowAttributes (disp, parent[n], &wattr);	2621	XGetWindowAttributes (dpy, parent[n], &wattr);
		2622
2662	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2623	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663	{	2624	{
2664	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2625	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665	break;	2626	break;
2666	}	2627	}
2667	}	2628	}
2668	}
2669		2629
2670	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2630	if (n > (sizeof (parent) / sizeof (parent[0])))
2671	{	2631	{
2672	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2632	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2673	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2633	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2674	am_transparent = 0;	2634	am_transparent = 0;
2675	/* XXX: also turn off Opt_transparent? */	2635	/* XXX: also turn off Opt_transparent? */
2676	}	2636	}
2677	else	2637	else
2678	{	2638	{
2679	#if WAIT_FOR_WM
2680	/* wait (an arbitrary period) for the WM to do its thing
2681	* needed for fvwm2.2.2 (and before?) */
2682	sleep (1);
2683	#endif
2684	for (n = 0; n < (unsigned int)i; n++)	2639	for (n = 0; n < (unsigned int)i; n++)
2685	{	2640	{
2686	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2641	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2687	XClearWindow (disp, parent[n]);	2642	XClearWindow (dpy, parent[n]);
2688	}	2643	}
2689		2644
2690	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2645	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2691	am_transparent = 1;	2646	am_transparent = 1;
2692	}	2647	}
2693		2648
2694	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2649	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695	parent[i] = None;	2650	parent[i] = None;
2696	}	2651	}
2697		2652
2698	if (scrollBar.win)	2653	if (scrollBar.win)
2699	{	2654	{
2700	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2655	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2701	scrollBar.setIdle ();	2656	scrollBar.setIdle ();
2702	scrollbar_show (0);	2657	scrollbar_show (0);
2703	}	2658	}
2704		2659
2705	if (am_transparent)	2660	if (am_transparent)
…		…
2823	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2778	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824	refresh_limit++;	2779	refresh_limit++;
2825	else	2780	else
2826	{	2781	{
2827	flag = true;	2782	flag = true;
		2783	//TODO: due to popular request, implement "skipscroll" option here
2828	scr_refresh (refresh_type);	2784	scr_refresh ();
2829	want_refresh = 1;	2785	want_refresh = 1;
2830	}	2786	}
2831	}	2787	}
2832		2788
2833	}	2789	}
…		…
2851	return flag;	2807	return flag;
2852	}	2808	}
2853		2809
2854	// read the next character	2810	// read the next character
2855	wchar_t	2811	wchar_t
2856	rxvt_term::next_char ()	2812	rxvt_term::next_char () NOTHROW
2857	{	2813	{
2858	while (cmdbuf_ptr < cmdbuf_endp)	2814	while (cmdbuf_ptr < cmdbuf_endp)
2859	{	2815	{
2860	// assume 7-bit to be ascii ALWAYS	2816	// assume 7-bit to be ascii ALWAYS
2861	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2817	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2882	return NOCHAR;	2838	return NOCHAR;
2883	}	2839	}
2884		2840
2885	// read the next octet	2841	// read the next octet
2886	uint32_t	2842	uint32_t
2887	rxvt_term::next_octet ()	2843	rxvt_term::next_octet () NOTHROW
2888	{	2844	{
2889	return cmdbuf_ptr < cmdbuf_endp	2845	return cmdbuf_ptr < cmdbuf_endp
2890	? (unsigned char)*cmdbuf_ptr++	2846	? (unsigned char)*cmdbuf_ptr++
2891	: NOCHAR;	2847	: NOCHAR;
2892	}	2848	}
		2849
		2850	static class out_of_input out_of_input;
2893		2851
2894	/* rxvt_cmd_getc () - Return next input character */	2852	/* rxvt_cmd_getc () - Return next input character */
2895	/*	2853	/*
2896	* Return the next input character after first passing any keyboard input	2854	* Return the next input character after first passing any keyboard input
2897	* to the command.	2855	* to the command.
2898	*/	2856	*/
2899	wchar_t	2857	wchar_t
2900	rxvt_term::cmd_getc ()	2858	rxvt_term::cmd_getc () THROW ((class out_of_input))
2901	{	2859	{
2902	wchar_t c = next_char ();	2860	wchar_t c = next_char ();
2903		2861
2904	if (c == NOCHAR)	2862	if (c == NOCHAR)
2905	throw out_of_input;	2863	throw out_of_input;
2906		2864
2907	return c;	2865	return c;
2908	}	2866	}
2909		2867
2910	uint32_t	2868	uint32_t
2911	rxvt_term::cmd_get8 ()	2869	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912	{	2870	{
2913	uint32_t c = next_octet ();	2871	uint32_t c = next_octet ();
2914		2872
2915	if (c == NOCHAR)	2873	if (c == NOCHAR)
2916	throw out_of_input;	2874	throw out_of_input;
…		…
3154	scr_charset_set (2, (unsigned int)cmd_getc ());	3112	scr_charset_set (2, (unsigned int)cmd_getc ());
3155	break;	3113	break;
3156	case '+':	3114	case '+':
3157	scr_charset_set (3, (unsigned int)cmd_getc ());	3115	scr_charset_set (3, (unsigned int)cmd_getc ());
3158	break;	3116	break;
3159	#if ENABLE_FRILLS	3117	#if !ENABLE_MINIMAL
3160	case '6':	3118	case '6':
3161	scr_backindex ();	3119	scr_backindex ();
3162	break;	3120	break;
3163	#endif	3121	#endif
3164	case '7':	3122	case '7':
3165	scr_cursor (SAVE);	3123	scr_cursor (SAVE);
3166	break;	3124	break;
3167	case '8':	3125	case '8':
3168	scr_cursor (RESTORE);	3126	scr_cursor (RESTORE);
3169	break;	3127	break;
3170	#if ENABLE_FRILLS	3128	#if !ENABLE_MINIMAL
3171	case '9':	3129	case '9':
3172	scr_forwardindex ();	3130	scr_forwardindex ();
3173	break;	3131	break;
3174	#endif	3132	#endif
3175	case '=':	3133	case '=':
…		…
3337	ndef = get_byte_array_bit (csi_defaults, i);	3295	ndef = get_byte_array_bit (csi_defaults, i);
3338	for (p = 0; p < nargs; p++)	3296	for (p = 0; p < nargs; p++)
3339	if (arg[p] == -1)	3297	if (arg[p] == -1)
3340	arg[p] = ndef;	3298	arg[p] = ndef;
3341		3299
3342	#ifdef DEBUG_CMD
3343	fprintf (stderr, "CSI ");
3344	for (p = 0; p < nargs; p++)
3345	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346	fprintf (stderr, "%c\n", ch);
3347	#endif
3348
3349	/*	3300	/*
3350	* private mode handling	3301	* private mode handling
3351	*/	3302	*/
3352	if (priv)	3303	if (priv)
3353	{	3304	{
3354	switch (priv)	3305	switch (priv)
3355	{	3306	{
3356	case '>':	3307	case '>':
3357	if (ch == CSI_DA) /* secondary device attributes */	3308	if (ch == CSI_DA) /* secondary device attributes */
3358	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3309	{
		3310	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3311	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3312	//
		3313	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3314	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3315	// that we do not support xterm mouse reporting (should be 95 when we do).
		3316	//
		3317	tt_printf ("\033[>%d;94;0c", 'U');
		3318	}
3359	break;	3319	break;
3360	case '?':	3320	case '?':
3361	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3321	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362	process_terminal_mode (ch, priv, nargs, arg);	3322	process_terminal_mode (ch, priv, nargs, arg);
3363	break;	3323	break;
…		…
3566	break;	3526	break;
3567	case CSI_75:	3527	case CSI_75:
3568	scr_cursor (RESTORE);	3528	scr_cursor (RESTORE);
3569	break;	3529	break;
3570		3530
3571	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3572	case CSI_74:	3532	case CSI_74:
3573	process_window_ops (arg, nargs);	3533	process_window_ops (arg, nargs);
3574	break;	3534	break;
3575	#endif	3535	#endif
3576		3536
…		…
3583	break;	3543	break;
3584	}	3544	}
3585	}	3545	}
3586	/*}}} */	3546	/*}}} */
3587		3547
3588	#if ENABLE_FRILLS	3548	#if !ENABLE_MINIMAL
3589	/* ARGSUSED */	3549	/* ARGSUSED */
3590	void	3550	void
3591	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3551	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592	{	3552	{
3593	int x, y;	3553	int x, y;
3594	XWindowAttributes wattr;	3554	XWindowAttributes wattr;
3595	Window wdummy;	3555	Window wdummy;
3596	dDisp;	3556
		3557	dLocal (Display *, dpy);
3597		3558
3598	if (nargs == 0)	3559	if (nargs == 0)
3599	return;	3560	return;
3600		3561
3601	switch (args[0])	3562	switch (args[0])
3602	{	3563	{
3603	/*	3564	/*
3604	* commands	3565	* commands
3605	*/	3566	*/
3606	case 1: /* deiconify window */	3567	case 1: /* deiconify window */
3607	XMapWindow (disp, parent[0]);	3568	XMapWindow (dpy, parent[0]);
3608	break;	3569	break;
3609	case 2: /* iconify window */	3570	case 2: /* iconify window */
3610	XIconifyWindow (disp, parent[0], display->screen);	3571	XIconifyWindow (dpy, parent[0], display->screen);
3611	break;	3572	break;
3612	case 3: /* set position (pixels) */	3573	case 3: /* set position (pixels) */
3613	XMoveWindow (disp, parent[0], args[1], args[2]);	3574	XMoveWindow (dpy, parent[0], args[1], args[2]);
3614	break;	3575	break;
3615	case 4: /* set size (pixels) */	3576	case 4: /* set size (pixels) */
3616	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3577	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617	break;	3578	break;
3618	case 5: /* raise window */	3579	case 5: /* raise window */
3619	XRaiseWindow (disp, parent[0]);	3580	XRaiseWindow (dpy, parent[0]);
3620	break;	3581	break;
3621	case 6: /* lower window */	3582	case 6: /* lower window */
3622	XLowerWindow (disp, parent[0]);	3583	XLowerWindow (dpy, parent[0]);
3623	break;	3584	break;
3624	case 7: /* refresh window */	3585	case 7: /* refresh window */
3625	scr_touch (true);	3586	scr_touch (true);
3626	break;	3587	break;
3627	case 8: /* set size (chars) */	3588	case 8: /* set size (chars) */
…		…
3634	if (args[0] >= 24) /* set height (chars) */	3595	if (args[0] >= 24) /* set height (chars) */
3635	set_widthheight ((unsigned int)width,	3596	set_widthheight ((unsigned int)width,
3636	(unsigned int) (args[1] * fheight));	3597	(unsigned int) (args[1] * fheight));
3637	break;	3598	break;
3638		3599
3639
3640	/*	3600	/*
3641	* reports - some output format copied from XTerm	3601	* reports - some output format copied from XTerm
3642	*/	3602	*/
3643	case 11: /* report window state */	3603	case 11: /* report window state */
3644	XGetWindowAttributes (disp, parent[0], &wattr);	3604	XGetWindowAttributes (dpy, parent[0], &wattr);
3645	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3605	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646	break;	3606	break;
3647	case 13: /* report window position */	3607	case 13: /* report window position */
3648	XGetWindowAttributes (disp, parent[0], &wattr);	3608	XGetWindowAttributes (dpy, parent[0], &wattr);
3649	XTranslateCoordinates (disp, parent[0], wattr.root,	3609	XTranslateCoordinates (dpy, parent[0], wattr.root,
3650	-wattr.border_width, -wattr.border_width,	3610	-wattr.border_width, -wattr.border_width,
3651	&x, &y, &wdummy);	3611	&x, &y, &wdummy);
3652	tt_printf ("\033[3;%d;%dt", x, y);	3612	tt_printf ("\033[3;%d;%dt", x, y);
3653	break;	3613	break;
3654	case 14: /* report window size (pixels) */	3614	case 14: /* report window size (pixels) */
3655	XGetWindowAttributes (disp, parent[0], &wattr);	3615	XGetWindowAttributes (dpy, parent[0], &wattr);
3656	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3616	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657	break;	3617	break;
3658	case 18: /* report text area size (chars) */	3618	case 18: /* report text area size (chars) */
3659	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3619	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660	break;	3620	break;
…		…
3662	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3622	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663	break;	3623	break;
3664	case 20: /* report icon label */	3624	case 20: /* report icon label */
3665	{	3625	{
3666	char *s;	3626	char *s;
3667	XGetIconName (disp, parent[0], &s);	3627	XGetIconName (dpy, parent[0], &s);
3668	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3628	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669	XFree (s);	3629	XFree (s);
3670	}	3630	}
3671	break;	3631	break;
3672	case 21: /* report window title */	3632	case 21: /* report window title */
3673	{	3633	{
3674	char *s;	3634	char *s;
3675	XFetchName (disp, parent[0], &s);	3635	XFetchName (dpy, parent[0], &s);
3676	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3636	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677	XFree (s);	3637	XFree (s);
3678	}	3638	}
3679	break;	3639	break;
3680	}	3640	}
…		…
3781	void	3741	void
3782	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3742	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783	{	3743	{
3784	if (str[0] == '?' && !str[1])	3744	if (str[0] == '?' && !str[1])
3785	{	3745	{
3786	unsigned short r, g, b;	3746	rgba c;
3787	pix_colors_focused[color].get (display, r, g, b);	3747	pix_colors_focused[color].get (c);
		3748
		3749	#if XFT
		3750	if (c.a != rgba::MAX_CC)
		3751	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3752	else
		3753	#endif
3788	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3754	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3789	}	3755	}
3790	else	3756	else
3791	set_window_color (color, str);	3757	set_window_color (color, str);
3792	}	3758	}
3793		3759
…		…
3795	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3761	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796	*/	3762	*/
3797	void	3763	void
3798	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3764	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799	{	3765	{
3800	int changed = 0;
3801	int color;	3766	int color;
3802	char *buf, *name;	3767	char *buf, *name;
3803	bool query = str[0] == '?' && !str[1];	3768	bool query = str[0] == '?' && !str[1];
3804	int saveop = op;	3769	int saveop = op;
3805	dDisp;	3770
		3771	dLocal (Display *, dpy);
3806		3772
3807	assert (str != NULL);	3773	assert (str != NULL);
		3774
		3775	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3776	return;
		3777
3808	switch (op)	3778	switch (op)
3809	{	3779	{
3810	case XTerm_name:	3780	case XTerm_name:
3811	set_title (str);	3781	set_title (str);
3812	/* FALLTHROUGH */	3782	/* FALLTHROUGH */
…		…
3826	unsigned long bytes_after;	3796	unsigned long bytes_after;
3827	unsigned char *value = 0;	3797	unsigned char *value = 0;
3828	const char *str = "";	3798	const char *str = "";
3829		3799
3830	if (prop	3800	if (prop
3831	&& XGetWindowProperty (disp, parent[0],	3801	&& XGetWindowProperty (dpy, parent[0],
3832	prop, 0, 1<<16, 0, AnyPropertyType,	3802	prop, 0, 1<<16, 0, AnyPropertyType,
3833	&actual_type, &actual_format,	3803	&actual_type, &actual_format,
3834	&nitems, &bytes_after, &value) == Success	3804	&nitems, &bytes_after, &value) == Success
3835	&& actual_type != None	3805	&& actual_type != None
3836	&& actual_format == 8)	3806	&& actual_format == 8)
3837	str = (const char *)(value);	3807	str = (const char *)(value);
3838		3808
3839	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3809	tt_printf ("\033]%d;%s%c", op, str, resp);
3840		3810
3841	XFree (value);	3811	XFree (value);
3842	}	3812	}
3843	else	3813	else
3844	{	3814	{
…		…
3848	{	3818	{
3849	*eq = 0;	3819	*eq = 0;
3850	set_utf8_property (display->atom (str), eq + 1);	3820	set_utf8_property (display->atom (str), eq + 1);
3851	}	3821	}
3852	else	3822	else
3853	XDeleteProperty (disp, parent[0],	3823	XDeleteProperty (dpy, parent[0],
3854	display->atom (str));	3824	display->atom (str));
3855	}	3825	}
3856	break;	3826	break;
3857		3827
3858	case XTerm_Color:	3828	case XTerm_Color:
…		…
3868	break;	3838	break;
3869		3839
3870	if ((buf = strchr (name, ';')) != NULL)	3840	if ((buf = strchr (name, ';')) != NULL)
3871	*buf++ = '\0';	3841	*buf++ = '\0';
3872		3842
3873	if (name[0] == '?' && !name[1])	3843	process_color_seq (op, color, name, resp);
3874	{
3875	unsigned short r, g, b;
3876	pix_colors_focused[color].get (display, r, g, b);
3877	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878	}
3879	else
3880	set_window_color (color, name);
3881	}	3844	}
3882	break;	3845	break;
3883	case XTerm_Color00:	3846	case XTerm_Color00:
3884	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3847	process_color_seq (op, Color_fg, str, resp);
3885	break;	3848	break;
3886	case XTerm_Color01:	3849	case XTerm_Color01:
3887	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3850	process_color_seq (op, Color_bg, str, resp);
3888	break;	3851	break;
3889	#ifndef NO_CURSORCOLOR	3852	#ifndef NO_CURSORCOLOR
3890	case XTerm_Color_cursor:	3853	case XTerm_Color_cursor:
3891	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3854	process_color_seq (op, Color_cursor, str, resp);
3892	break;	3855	break;
3893	#endif	3856	#endif
3894	case XTerm_Color_pointer_fg:	3857	case XTerm_Color_pointer_fg:
3895	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3858	process_color_seq (op, Color_pointer_fg, str, resp);
3896	break;	3859	break;
3897	case XTerm_Color_pointer_bg:	3860	case XTerm_Color_pointer_bg:
3898	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3861	process_color_seq (op, Color_pointer_bg, str, resp);
3899	break;	3862	break;
3900	#ifndef NO_BOLD_UNDERLINE_REVERSE	3863	#ifndef NO_BOLD_UNDERLINE_REVERSE
3901	case XTerm_Color_RV:	3864	case XTerm_Color_RV:
3902	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3865	process_color_seq (op, Color_RV, str, resp);
3903	break;	3866	break;
3904	case Rxvt_Color_BD:	3867	case Rxvt_Color_BD:
3905	case URxvt_Color_BD:	3868	case URxvt_Color_BD:
3906	process_color_seq (op, Color_BD, str, resp);	3869	process_color_seq (op, Color_BD, str, resp);
3907	break;	3870	break;
3908	case Rxvt_Color_UL:	3871	case Rxvt_Color_UL:
3909	case URxvt_Color_UL:	3872	case URxvt_Color_UL:
3910	process_color_seq (op, Color_UL, str, resp);	3873	process_color_seq (op, Color_UL, str, resp);
3911	break;	3874	break;
3912	case URxvt_Color_IT:	3875	case URxvt_Color_IT:
3913	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3876	process_color_seq (op, Color_IT, str, resp);
3914	break;	3877	break;
3915	#endif	3878	#endif
3916	#if TRANSPARENT && TINTING	3879	#if TRANSPARENT && TINTING
3917	case URxvt_Color_tint:	3880	case URxvt_Color_tint:
3918	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3881	process_color_seq (op, Color_tint, str, resp);
		3882
3919	check_our_parents ();	3883	check_our_parents ();
		3884
3920	if (am_transparent)	3885	if (am_transparent)
3921	want_full_refresh = want_refresh = 1;	3886	want_full_refresh = want_refresh = 1;
		3887
3922	break;	3888	break;
3923	#endif	3889	#endif
3924		3890
3925	case Rxvt_Pixmap:	3891	case Rxvt_Pixmap:
		3892	{
3926	if (*str != ';')	3893	if (*str != ';')
3927	{	3894	{
3928	#if XPM_BACKGROUND	3895	#if XPM_BACKGROUND
3929	scale_pixmap (""); /* reset to default scaling */	3896	scale_pixmap (""); /* reset to default scaling */
3930	set_bgPixmap (str); /* change pixmap */	3897	set_bgPixmap (str); /* change pixmap */
3931	scr_touch (true);	3898	scr_touch (true);
3932	#endif	3899	#endif
3933	}	3900	}
3934		3901
		3902	int changed = 0;
		3903
3935	while ((str = strchr (str, ';')) != NULL)	3904	while ((str = strchr (str, ';')) != NULL)
3936	{	3905	{
3937	str++;	3906	str++;
3938	#if XPM_BACKGROUND	3907	#if XPM_BACKGROUND
3939	changed += scale_pixmap (str);	3908	changed += scale_pixmap (str);
3940	#endif	3909	#endif
3941	}	3910	}
3942		3911
3943	if (changed)	3912	if (changed)
3944	{	3913	{
3945	#ifdef XPM_BACKGROUND	3914	#ifdef XPM_BACKGROUND
3946	resize_pixmap ();	3915	resize_pixmap ();
3947	scr_touch (true);	3916	scr_touch (true);
3948	#endif	3917	#endif
3949	}	3918	}
		3919	}
3950	break;	3920	break;
3951		3921
3952	case Rxvt_restoreFG:	3922	case Rxvt_restoreFG:
3953	set_window_color (Color_fg, str);	3923	set_window_color (Color_fg, str);
3954	break;	3924	break;
…		…
3958		3928
3959	case XTerm_logfile:	3929	case XTerm_logfile:
3960	// TODO, when secure mode?	3930	// TODO, when secure mode?
3961	break;	3931	break;
3962		3932
3963	#ifdef MENUBAR
3964	case URxvt_Menu:
3965	if (OPTION (Opt_insecure))
3966	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967	break;
3968	#endif
3969	#if 0	3933	#if 0
3970	case Rxvt_dumpscreen: /* no error notices */	3934	case Rxvt_dumpscreen: /* no error notices */
3971	{	3935	{
3972	int fd;	3936	int fd;
3973	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3937	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
…		…
3999	allocated.push_back ((void *)res);	3963	allocated.push_back ((void *)res);
4000	set_fonts ();	3964	set_fonts ();
4001	}	3965	}
4002	break;	3966	break;
4003		3967
4004	#if ENABLE_FRILLS	3968	case URxvt_version:
		3969	if (query)
		3970	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3971	op,
		3972	rs[Rs_name], VERSION[0], VERSION[2],
		3973	resp);
		3974	break;
		3975
		3976	#if !ENABLE_MINIMAL
4005	case URxvt_locale:	3977	case URxvt_locale:
4006	if (query)	3978	if (query)
4007	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3979	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4008	else	3980	else
4009	{	3981	{
4010	set_locale (str);	3982	set_locale (str);
4011	pty.set_utf8_mode (enc_utf8);	3983	pty->set_utf8_mode (enc_utf8);
4012	init_xlocale ();	3984	init_xlocale ();
4013	}	3985	}
4014	break;	3986	break;
4015		3987
4016	case URxvt_view_up:	3988	case URxvt_view_up:
…		…
4027	break;	3999	break;
4028	#endif	4000	#endif
4029		4001
4030	#if ENABLE_PERL	4002	#if ENABLE_PERL
4031	case URxvt_perl:	4003	case URxvt_perl:
4032	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4004	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4033	; // no responses yet	4005	; // no responses yet
4034	break;	4006	break;
4035	#endif	4007	#endif
4036	}	4008	}
4037	}	4009	}
…		…
4069	return state;	4041	return state;
4070	}	4042	}
4071		4043
4072	/* we're not using priv _yet_ */	4044	/* we're not using priv _yet_ */
4073	void	4045	void
4074	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4046	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4075	{	4047	{
4076	unsigned int i, j;	4048	unsigned int i, j;
4077	int state;	4049	int state;
4078		4050
4079	static const struct	4051	static const struct
…		…
4090	{ 5, PrivMode_rVideo },	4062	{ 5, PrivMode_rVideo },
4091	{ 6, PrivMode_relOrigin },	4063	{ 6, PrivMode_relOrigin },
4092	{ 7, PrivMode_Autowrap },	4064	{ 7, PrivMode_Autowrap },
4093	// 8, bi-directional support mode	4065	// 8, bi-directional support mode
4094	{ 9, PrivMode_MouseX10 },	4066	{ 9, PrivMode_MouseX10 },
4095	#ifdef menuBar_esc
4096	{ menuBar_esc, PrivMode_menuBar },
4097	#endif
4098	// 18, 19 printing-related	4067	// 18, 19 printing-related
4099	{ 25, PrivMode_VisibleCursor },	4068	{ 25, PrivMode_VisibleCursor },
4100	#ifdef scrollBar_esc	4069	#ifdef scrollBar_esc
4101	{ scrollBar_esc, PrivMode_scrollBar },	4070	{ scrollBar_esc, PrivMode_scrollBar },
4102	#endif	4071	#endif
…		…
4197	/* case 8: - auto repeat, can't do on a per window basis */	4166	/* case 8: - auto repeat, can't do on a per window basis */
4198	case 9: /* X10 mouse reporting */	4167	case 9: /* X10 mouse reporting */
4199	if (state) /* orthogonal */	4168	if (state) /* orthogonal */
4200	priv_modes &= ~PrivMode_MouseX11;	4169	priv_modes &= ~PrivMode_MouseX11;
4201	break;	4170	break;
4202	#ifdef menuBar_esc
4203	case menuBar_esc:
4204	#ifdef MENUBAR
4205	map_menuBar (state);
4206	#endif
4207	break;
4208	#endif
4209	#ifdef scrollBar_esc	4171	#ifdef scrollBar_esc
4210	case scrollBar_esc:	4172	case scrollBar_esc:
4211	if (scrollbar_mapping (state))	4173	if (scrollbar_mapping (state))
4212	{	4174	{
4213	resize_all_windows (0, 0, 0);	4175	resize_all_windows (0, 0, 0);
…		…
4383	scr_color (Color_bg, Color_bg);	4345	scr_color (Color_bg, Color_bg);
4384	break;	4346	break;
4385		4347
4386	//case 50: // not variable spacing	4348	//case 50: // not variable spacing
4387		4349
4388	#if ENABLE_FRILLS	4350	#if !ENABLE_MINIMAL
4389	case 90:	4351	case 90:
4390	case 91: /* set bright fg color */	4352	case 91: /* set bright fg color */
4391	case 92:	4353	case 92:
4392	case 93:	4354	case 93:
4393	case 94:	4355	case 94:
…		…
4458	rxvt_term::tt_write (const char *data, unsigned int len)	4420	rxvt_term::tt_write (const char *data, unsigned int len)
4459	{	4421	{
4460	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4422	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461	return;	4423	return;
4462		4424
4463	if (pty.pty < 0)	4425	if (pty->pty < 0)
4464	return;	4426	return;
4465		4427
4466	if (v_buflen == 0)	4428	if (v_buflen == 0)
4467	{	4429	{
4468	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4430	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469		4431
4470	if ((unsigned int)written == len)	4432	if ((unsigned int)written == len)
4471	return;	4433	return;
4472		4434
4473	data += written;	4435	data += written;
…		…
4482	pty_ev.set (EVENT_READ | EVENT_WRITE);	4444	pty_ev.set (EVENT_READ | EVENT_WRITE);
4483	}	4445	}
4484		4446
4485	void rxvt_term::pty_write ()	4447	void rxvt_term::pty_write ()
4486	{	4448	{
4487	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4449	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488		4450
4489	if (written > 0)	4451	if (written > 0)
4490	{	4452	{
4491	v_buflen -= written;	4453	v_buflen -= written;
4492		4454

Diff Legend

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