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.264 by root, Mon Jan 16 06:37:51 2006 UTC vs.
Revision 1.310 by root, Thu Feb 23 19:26:56 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
		1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1311	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312	return;	1375	return;
1313		1376
1314	// for XQueryPointer	1377	// for XQueryPointer
1315	Window unused_root, unused_child;	1378	Window unused_root, unused_child;
…		…
1317	unsigned int unused_mask;	1380	unsigned int unused_mask;
1318		1381
1319	switch (ev.type)	1382	switch (ev.type)
1320	{	1383	{
1321	case KeyPress:	1384	case KeyPress:
1322	#if ISO_14755	1385	key_press (ev.xkey);
1323	if (!(iso14755buf & ISO_14755_52))
1324	#endif
1325	lookup_key (ev.xkey);
1326
1327	break;	1386	break;
1328		1387
1329	case KeyRelease:	1388	case KeyRelease:
1330	{	1389	key_release (ev.xkey);
1331	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1332	KeySym keysym;
1333
1334	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1335	#endif
1336
1337	#if ENABLE_FRILLS || ISO_14755
1338	// ISO 14755 support
1339	if (iso14755buf)
1340	if (iso14755buf & ISO_14755_52)
1341	{
1342	# if ENABLE_OVERLAY
1343	scr_overlay_off ();
1344	# endif
1345	# if ISO_14755
1346	// iso14755 part 5.2 handling: release time
1347	// first: controls
1348	if ((ev.xkey.state & ControlMask)
1349	&& ((keysym >= 0x40 && keysym <= 0x5f)
1350	|| (keysym >= 0x61 && keysym <= 0x7f)))
1351	{
1352	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1353	commit_iso14755 ();
1354	goto skip_switch;
1355	}
1356
1357	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1358	if (i[0] == keysym)
1359	{
1360	iso14755buf = ISO_14755_51 | i[1];
1361	commit_iso14755 ();
1362	goto skip_switch;
1363	}
1364
1365	scr_bell ();
1366	# endif
1367	iso14755buf = 0;
1368	break;
1369	}
1370	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1371	{
1372	# if ENABLE_OVERLAY
1373	scr_overlay_off ();
1374	# endif
1375	if (iso14755buf & ISO_14755_51)
1376	commit_iso14755 ();
1377	#if ISO_14755
1378	else if (iso14755buf & ISO_14755_STARTED)
1379	{
1380	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1381
1382	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1383	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1384	}
1385	# endif
1386	else
1387	iso14755buf = 0;
1388	}
1389	#endif
1390
1391	if (ev.xany.window == vt
1392	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1393	break;
1394
1395	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1396	if (!(ev.xkey.state & ControlMask))
1397	slip_wheel_ev.stop ();
1398	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1399	mouse_slip_wheel_speed = 0;
1400	#endif
1401	break;	1390	break;
1402	}
1403		1391
1404	case ButtonPress:	1392	case ButtonPress:
1405	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1406	break;	1394	break;
1407		1395
…		…
1409	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1410	break;	1398	break;
1411		1399
1412	case ClientMessage:	1400	case ClientMessage:
1413	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1414	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415	{	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	{
1416	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)))
1417	destroy ();	1411	destroy ();
		1412	}
1418	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1419	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])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1422	&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	}
1423	#endif	1429	#endif
1424	}	1430	}
1425	#if ENABLE_XEMBED
1426	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427	{
1428	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429	focus_in ();
1430	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431	focus_out ();
1432	}
1433	#endif
1434	#ifdef OFFIX_DND
1435	/* OffiX Dnd (drag 'n' drop) protocol */
1436	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1437	&& (ev.xclient.data.l[0] == DndFile
1438	|| ev.xclient.data.l[0] == DndDir
1439	|| ev.xclient.data.l[0] == DndLink))
1440	{
1441	/* Get Dnd data */
1442	Atom ActualType;
1443	int ActualFormat;
1444	unsigned char *data;
1445	unsigned long Size, RemainingBytes;
1446
1447	XGetWindowProperty (disp, display->root,
1448	xa[XA_DNDSELECTION],
1449	0L, 1000000L,
1450	False, AnyPropertyType,
1451	&ActualType, &ActualFormat,
1452	&Size, &RemainingBytes,
1453	&data);
1454	set_string_property (XA_CUT_BUFFER0, data);
1455	XFree (data);
1456	selection_paste (display->root, XA_CUT_BUFFER0, true);
1457	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1458	}
1459	#endif /* OFFIX_DND */
1460	break;	1431	break;
1461		1432
1462	case MappingNotify:	1433	case MappingNotify:
1463	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1464	break;	1435	break;
…		…
1497	break;	1468	break;
1498		1469
1499	case ConfigureNotify:	1470	case ConfigureNotify:
1500	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1501	{	1472	{
1502	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1503	;	1474	;
1504		1475
1505	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1506	{	1477	{
1507	seen_resize = 1;	1478	seen_resize = 1;
1508	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509	}	1480	}
1510		1481
		1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1483
1511	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1512	if (OPTION (Opt_transparent))	1485	if (OPTION (Opt_transparent))
1513	check_our_parents ();	1486	check_our_parents ();
1514	#endif	1487	#endif
1515	}	1488	}
1516	break;	1489	break;
1517		1490
1518	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1521	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1522		1496
1523	break;	1497	break;
1524		1498
1525	case SelectionClear:	1499	case SelectionClear:
1526	selection_clear ();	1500	selection_clear ();
…		…
1562	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1563	{	1537	{
1564	do	1538	do
1565	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1566	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1568		1542
1569	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570		1544
1571	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1572	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1573	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1574		1548
1575	want_refresh = 1;	1549	want_refresh = 1;
1576	}	1550	}
1577	else	1551	else
1578	{	1552	{
1579	XEvent unused_event;	1553	XEvent unused_event;
1580		1554
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1582	;	1556	;
1583	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1584	;	1558	;
1585		1559
1586	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1587	{	1561	{
1588	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1589	scrollbar_show (0);	1563	scrollbar_show (0);
1590	}	1564	}
1591	#ifdef MENUBAR
1592	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593	menubar_expose ();
1594	#endif
1595		1565
1596	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1597	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1598	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1599	#endif	1569	#endif
1600	}	1570	}
1601	break;	1571	break;
1602		1572
1603	case MotionNotify:	1573	case MotionNotify:
1604	#ifdef POINTER_BLANK	1574	#ifdef POINTER_BLANK
1605	if (hidden_pointer)	1575	if (hidden_pointer)
1606	pointer_unblank ();	1576	pointer_unblank ();
1607	#endif	1577	#endif
1608	#if MENUBAR
1609	if (isMenuBarWindow (ev.xany.window))
1610	{
1611	menubar_control (ev.xbutton);
1612	break;
1613	}
1614	#endif
1615	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1578	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616	break;	1579	break;
1617		1580
1618	if (ev.xany.window == vt)	1581	if (ev.xany.window == vt)
1619	{	1582	{
		1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621	; // nop	1585	; // nop
1622	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623	{	1587	{
1624	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1625	;	1589	;
1626		1590
1627	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1628	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1629	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1630	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1631	&ev.xbutton.state);	1595	&ev.xbutton.state);
1632	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1696	#endif	1660	#endif
1697	}	1661	}
1698	}	1662	}
1699	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1700	{	1664	{
1701	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1702	MotionNotify, &ev))	1666	MotionNotify, &ev))
1703	;	1667	;
1704		1668
1705	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1706	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1707	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1708	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1709	&unused_mask);	1673	&unused_mask);
1710	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1714	scrollbar_show (1);	1678	scrollbar_show (1);
1715	}	1679	}
1716	break;	1680	break;
1717	}	1681	}
1718		1682
1719	skip_switch: ;
1720
1721	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1722	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1723	{	1685	{
1724	if (hidden_cursor)	1686	if (hidden_cursor)
1725	{	1687	{
1726	hidden_cursor = 0;	1688	hidden_cursor = 0;
1727	want_refresh = 1;	1689	want_refresh = 1;
1728	}	1690	}
1729		1691
1730	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731	}	1693	}
1732	#endif	1694	#endif
1733		1695
1734	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1735	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1752	if (!focus)	1714	if (!focus)
1753	{	1715	{
1754	focus = 1;	1716	focus = 1;
1755	want_refresh = 1;	1717	want_refresh = 1;
1756		1718
1757	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758		1720
1759	#if USE_XIM	1721	#if USE_XIM
1760	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1761	{	1723	{
1762	IMSetStatusPosition ();	1724	IMSetPosition ();
1763	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1764	}	1726	}
1765	#endif	1727	#endif
1766	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1767	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1768	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769	#endif	1731	#endif
1770	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1771	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1772	{	1734	{
1773	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1854	/*	1816	/*
1855	* VT window processing of button press	1817	* VT window processing of button press
1856	*/	1818	*/
1857	if (ev.window == vt)	1819	if (ev.window == vt)
1858	{	1820	{
		1821	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1822	return;
		1823
1859	#if ISO_14755	1824	#if ISO_14755
1860	// 5.4	1825	// 5.4
1861	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1826	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862	{	1827	{
1863	iso14755_54 (ev.x, ev.y);	1828	iso14755_54 (ev.x, ev.y);
…		…
1905	else	1870	else
1906	{	1871	{
1907	if (ev.button != MEvent.button)	1872	if (ev.button != MEvent.button)
1908	MEvent.clicks = 0;	1873	MEvent.clicks = 0;
1909		1874
1910	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911	switch (ev.button)	1875	switch (ev.button)
1912	{	1876	{
1913	case Button1:	1877	case Button1:
1914	/* allow meta + click to select rectangular areas */	1878	/* allow meta + click to select rectangular areas */
1915	/* should be done in screen.C */	1879	/* should be done in screen.C */
1916	#if ENABLE_FRILLS	1880	#if ENABLE_FRILLS
1917	selection.rect = !!(ev.state & ModMetaMask);	1881	selection.rect = !!(ev.state & ModMetaMask);
1918	#else	1882	#else
1919	selection.rect = false;	1883	selection.rect = false;
1920	#endif	1884	#endif
1921		1885
1922	/* allow shift+left click to extend selection */	1886	/* allow shift+left click to extend selection */
1923	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924	{	1888	{
1925	if (MEvent.button == Button1 && clickintime)	1889	if (MEvent.button == Button1 && clickintime)
1926	selection_rotate (ev.x, ev.y);	1890	selection_rotate (ev.x, ev.y);
1927	else	1891	else
1928	selection_extend (ev.x, ev.y, 1);	1892	selection_extend (ev.x, ev.y, 1);
1929	}	1893	}
1930	else	1894	else
1931	{	1895	{
1932	if (MEvent.button == Button1 && clickintime)	1896	if (MEvent.button == Button1 && clickintime)
1933	MEvent.clicks++;	1897	MEvent.clicks++;
1934	else	1898	else
1935	MEvent.clicks = 1;	1899	MEvent.clicks = 1;
1936		1900
1937	selection_click (MEvent.clicks, ev.x, ev.y);	1901	selection_click (MEvent.clicks, ev.x, ev.y);
1938	}	1902	}
1939		1903
1940	MEvent.button = Button1;	1904	MEvent.button = Button1;
1941	break;	1905	break;
1942		1906
1943	case Button3:	1907	case Button3:
1944	if (MEvent.button == Button3 && clickintime)	1908	if (MEvent.button == Button3 && clickintime)
1945	selection_rotate (ev.x, ev.y);	1909	selection_rotate (ev.x, ev.y);
1946	else	1910	else
1947	selection_extend (ev.x, ev.y, 1);	1911	selection_extend (ev.x, ev.y, 1);
1948		1912
1949	MEvent.button = Button3;	1913	MEvent.button = Button3;
1950	break;	1914	break;
1951	}	1915	}
1952	}	1916	}
1953		1917
1954	MEvent.time = ev.time;	1918	MEvent.time = ev.time;
1955	return;	1919	return;
1956	}	1920	}
1957		1921
…		…
2096	}	2060	}
2097	}	2061	}
2098		2062
2099	return;	2063	return;
2100	}	2064	}
2101
2102	#if MENUBAR
2103	/*
2104	* Menubar window processing of button press
2105	*/
2106	if (isMenuBarWindow (ev.window))
2107	menubar_control (ev);
2108	#endif
2109	}	2065	}
2110		2066
2111	void	2067	void
2112	rxvt_term::button_release (XButtonEvent &ev)	2068	rxvt_term::button_release (XButtonEvent &ev)
2113	{	2069	{
…		…
2119		2075
2120	if (scrollbar_isUpDn ())	2076	if (scrollbar_isUpDn ())
2121	{	2077	{
2122	scrollBar.setIdle ();	2078	scrollBar.setIdle ();
2123	scrollbar_show (0);	2079	scrollbar_show (0);
2124	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125	refresh_type &= ~SMOOTH_REFRESH;
2126	#endif
2127	}	2080	}
2128		2081
2129	#ifdef SELECTION_SCROLLING	2082	#ifdef SELECTION_SCROLLING
2130	if (sel_scroll_ev.active)	2083	if (sel_scroll_ev.active)
2131	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2132	#endif	2085	#endif
2133		2086
2134	if (ev.window == vt)	2087	if (ev.window == vt)
2135	{	2088	{
		2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2090	return;
		2091
2136	#if ISO_14755	2092	#if ISO_14755
2137	// 5.4	2093	// 5.4
2138	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2094	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139	return;	2095	return;
2140	#endif	2096	#endif
		2097
2141	if (reportmode)	2098	if (reportmode)
2142	{	2099	{
2143	/* mouse report from vt window */	2100	/* mouse report from vt window */
2144	/* don't report release of wheel "buttons" */	2101	/* don't report release of wheel "buttons" */
2145	if (ev.button >= 4)	2102	if (ev.button >= 4)
…		…
2169	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2170	&& bypass_keystate	2127	&& bypass_keystate
2171	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2172	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2173		2130
2174	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175	return;
2176
2177	switch (ev.button)	2131	switch (ev.button)
2178	{	2132	{
2179	case Button1:	2133	case Button1:
2180	case Button3:	2134	case Button3:
2181	selection_make (ev.time);	2135	selection_make (ev.time);
2182	break;	2136	break;
		2137
2183	case Button2:	2138	case Button2:
2184	selection_request (ev.time, ev.x, ev.y);	2139	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2140	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2185	break;	2141	break;
		2142
2186	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2187	case Button4:	2144	case Button4:
2188	case Button5:	2145	case Button5:
2189	{	2146	{
2190	int i;	2147	int i;
…		…
2222	}	2179	}
2223	break;	2180	break;
2224	#endif	2181	#endif
2225	}	2182	}
2226	}	2183	}
2227	#ifdef MENUBAR
2228	else if (isMenuBarWindow (ev.window))
2229	menubar_control (ev);
2230	#endif
2231	}	2184	}
2232		2185
2233	#ifdef TRANSPARENT	2186	#ifdef TRANSPARENT
2234	#if TINTING	2187	#if TINTING
2235	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2236		2189
2237	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2238		2191
2239	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2192	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2240	{	2193	{
2241	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2242	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2243	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2196	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2244	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246	int i;	2199	int i;
2247		2200
2248	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2249		2202
2250	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2251		2204
2252	/* for convenience */	2205	/* for convenience */
2253	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2474	Atom atype;	2427	Atom atype;
2475	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2476	Window root, oldp, *list;	2429	Window root, oldp, *list;
2477	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2478	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2479	dDisp;
2480		2432
2481	pchanged = 0;	2433	pchanged = 0;
2482		2434
2483	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2484	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2485		2437
2486	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2487	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2488		2440
2489	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2490		2442
2491	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2492	{	2444	{
2493	if (am_transparent)	2445	if (am_transparent)
2494	{	2446	{
2495	pchanged = 1;	2447	pchanged = 1;
2496	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2497	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2498	}	2450	}
2499		2451
2500	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2501	}	2453	}
2502		2454
2503	/* Get all X ops out of the queue so that our information is up-to-date. */	2455	/* Get all X ops out of the queue so that our information is up-to-date. */
2504	XSync (disp, False);	2456	XSync (dpy, False);
2505		2457
2506	/*	2458	/*
2507	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2508	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2509	* windows for each client, so we have to take care about that.	2461	* windows for each client, so we have to take care about that.
2510	*/	2462	*/
2511	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2512	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2513	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2515		2467
2516	if (!i || prop == NULL)	2468	if (!i || prop == NULL)
2517	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2518	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2519	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2521		2473
2522	if (!i || prop == NULL	2474	if (!i || prop == NULL
2523	#if TINTING	2475	#if TINTING
2524	|| !rs[Rs_color + Color_tint]	2476	|| !ISSET_PIXCOLOR (Color_tint)
2525	#endif	2477	#endif
2526	)	2478	)
2527	have_pixmap = 0;	2479	have_pixmap = 0;
2528	else	2480	else
2529	{	2481	{
…		…
2542	Window cr;	2494	Window cr;
2543	XImage *image;	2495	XImage *image;
2544	GC gc;	2496	GC gc;
2545	XGCValues gcvalue;	2497	XGCValues gcvalue;
2546		2498
2547	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2548	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2549	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2550	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2551	nx = ny = 0;	2503	nx = ny = 0;
2552		2504
…		…
2565	}	2517	}
2566		2518
2567	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2568	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2569		2521
2570	XSync (disp, False);	2522	XSync (dpy, False);
2571	allowedxerror = -1;	2523	allowedxerror = -1;
2572	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2573		2525
2574	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2575	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2576	allowedxerror = 0;	2528	allowedxerror = 0;
2577		2529
…		…
2580	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2581	{	2533	{
2582	pchanged = 1;	2534	pchanged = 1;
2583	if (pixmap != None)	2535	if (pixmap != None)
2584	{	2536	{
2585	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2586	pixmap = None;	2538	pixmap = None;
2587	}	2539	}
2588	}	2540	}
2589		2541
2590	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2591	}	2543	}
2592	else	2544	else
2593	{	2545	{
2594	if (pixmap != None)	2546	if (pixmap != None)
2595	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2596		2548
2597	#if TINTING	2549	#if TINTING
2598	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2599	{	2551	{
2600	unsigned short rm, gm, bm;
2601	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602		2553
		2554	rgba c;
2603	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2604		2556
2605	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2606	}	2558	}
2607	#endif	2559	#endif
2608		2560
2609	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2610	szHint.width, szHint.height, image->depth);
2611	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2612	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2613	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2614	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2615	XDestroyImage (image);	2566	XDestroyImage (image);
2616	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2617	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2618		2569
2619	if (!am_transparent || !am_pixmap_trans)	2570	if (!am_transparent || !am_pixmap_trans)
2620	pchanged = 1;	2571	pchanged = 1;
2621		2572
2622	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2623	}	2574	}
2624	}	2575	}
2625		2576
2626	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2627	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2628	else	2579	else
2629	{	2580	{
2630	unsigned int n;	2581	unsigned int n;
2631	/*	2582	/*
2632	* InheritPixmap transparency	2583	* InheritPixmap transparency
2633	*/	2584	*/
2634	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635	{	2586	{
2636	oldp = parent[i];	2587	oldp = parent[i];
2637	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2638	&parent[i], &list, &n);
2639	XFree (list);	2589	XFree (list);
2640		2590
2641	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2642	{	2592	{
2643	if (oldp != None)	2593	if (oldp != None)
…		…
2651	}	2601	}
2652		2602
2653	n = 0;	2603	n = 0;
2654		2604
2655	if (pchanged)	2605	if (pchanged)
2656	{
2657	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2658	{	2607	{
2659	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2660	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2661	{	2611	{
2662	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2663	break;	2613	break;
2664	}	2614	}
2665	}	2615	}
2666	}
2667		2616
2668	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2669	{	2618	{
2670	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2671	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2672	am_transparent = 0;	2621	am_transparent = 0;
2673	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2674	}	2623	}
2675	else	2624	else
2676	{	2625	{
2677	#if WAIT_FOR_WM
2678	/* wait (an arbitrary period) for the WM to do its thing
2679	* needed for fvwm2.2.2 (and before?) */
2680	sleep (1);
2681	#endif
2682	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2683	{	2627	{
2684	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2685	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2686	}	2630	}
2687		2631
2688	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2689	am_transparent = 1;	2633	am_transparent = 1;
2690	}	2634	}
2691		2635
2692	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2693	parent[i] = None;	2637	parent[i] = None;
2694	}	2638	}
2695		2639
2696	if (scrollBar.win)	2640	if (scrollBar.win)
2697	{	2641	{
2698	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2699	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2700	scrollbar_show (0);	2644	scrollbar_show (0);
2701	}	2645	}
2702		2646
2703	if (am_transparent)	2647	if (am_transparent)
…		…
2778	}	2722	}
2779		2723
2780	// scr_add_lines only works for nlines <= nrow - 1.	2724	// scr_add_lines only works for nlines <= nrow - 1.
2781	if (nlines >= nrow - 1)	2725	if (nlines >= nrow - 1)
2782	{	2726	{
		2727	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2728	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784	scr_add_lines (buf, str - buf, nlines);	2729	scr_add_lines (buf, str - buf, nlines);
2785		2730
2786	nlines = 0;	2731	nlines = 0;
2787	str = buf;	2732	str = buf;
2788	eol = str + min (ncol, UBUFSIZ);	2733	eol = str + min (ncol, UBUFSIZ);
…		…
2803		2748
2804	seq_begin = cmdbuf_ptr;	2749	seq_begin = cmdbuf_ptr;
2805	ch = next_char ();	2750	ch = next_char ();
2806	}	2751	}
2807		2752
		2753	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2754	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2809	scr_add_lines (buf, str - buf, nlines);	2755	scr_add_lines (buf, str - buf, nlines);
2810		2756
2811	/*	2757	/*
2812	* If there have been a lot of new lines, then update the screen	2758	* If there have been a lot of new lines, then update the screen
2813	* What the heck I'll cheat and only refresh less than every page-full.	2759	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2819	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820	refresh_limit++;	2766	refresh_limit++;
2821	else	2767	else
2822	{	2768	{
2823	flag = true;	2769	flag = true;
		2770	//TODO: due to popular request, implement "skipscroll" option here
2824	scr_refresh (refresh_type);	2771	scr_refresh ();
2825	want_refresh = 1;	2772	want_refresh = 1;
2826	}	2773	}
2827	}	2774	}
2828		2775
2829	}	2776	}
…		…
2847	return flag;	2794	return flag;
2848	}	2795	}
2849		2796
2850	// read the next character	2797	// read the next character
2851	wchar_t	2798	wchar_t
2852	rxvt_term::next_char ()	2799	rxvt_term::next_char () NOTHROW
2853	{	2800	{
2854	while (cmdbuf_ptr < cmdbuf_endp)	2801	while (cmdbuf_ptr < cmdbuf_endp)
2855	{	2802	{
2856	// assume 7-bit to be ascii ALWAYS	2803	// assume 7-bit to be ascii ALWAYS
2857	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2804	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2878	return NOCHAR;	2825	return NOCHAR;
2879	}	2826	}
2880		2827
2881	// read the next octet	2828	// read the next octet
2882	uint32_t	2829	uint32_t
2883	rxvt_term::next_octet ()	2830	rxvt_term::next_octet () NOTHROW
2884	{	2831	{
2885	return cmdbuf_ptr < cmdbuf_endp	2832	return cmdbuf_ptr < cmdbuf_endp
2886	? (unsigned char)*cmdbuf_ptr++	2833	? (unsigned char)*cmdbuf_ptr++
2887	: NOCHAR;	2834	: NOCHAR;
2888	}	2835	}
		2836
		2837	static class out_of_input out_of_input;
2889		2838
2890	/* rxvt_cmd_getc () - Return next input character */	2839	/* rxvt_cmd_getc () - Return next input character */
2891	/*	2840	/*
2892	* Return the next input character after first passing any keyboard input	2841	* Return the next input character after first passing any keyboard input
2893	* to the command.	2842	* to the command.
2894	*/	2843	*/
2895	wchar_t	2844	wchar_t
2896	rxvt_term::cmd_getc ()	2845	rxvt_term::cmd_getc () THROW ((class out_of_input))
2897	{	2846	{
2898	wchar_t c = next_char ();	2847	wchar_t c = next_char ();
2899		2848
2900	if (c == NOCHAR)	2849	if (c == NOCHAR)
2901	throw out_of_input;	2850	throw out_of_input;
2902		2851
2903	return c;	2852	return c;
2904	}	2853	}
2905		2854
2906	uint32_t	2855	uint32_t
2907	rxvt_term::cmd_get8 ()	2856	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908	{	2857	{
2909	uint32_t c = next_octet ();	2858	uint32_t c = next_octet ();
2910		2859
2911	if (c == NOCHAR)	2860	if (c == NOCHAR)
2912	throw out_of_input;	2861	throw out_of_input;
…		…
3150	scr_charset_set (2, (unsigned int)cmd_getc ());	3099	scr_charset_set (2, (unsigned int)cmd_getc ());
3151	break;	3100	break;
3152	case '+':	3101	case '+':
3153	scr_charset_set (3, (unsigned int)cmd_getc ());	3102	scr_charset_set (3, (unsigned int)cmd_getc ());
3154	break;	3103	break;
3155	#if ENABLE_FRILLS	3104	#if !ENABLE_MINIMAL
3156	case '6':	3105	case '6':
3157	scr_backindex ();	3106	scr_backindex ();
3158	break;	3107	break;
3159	#endif	3108	#endif
3160	case '7':	3109	case '7':
3161	scr_cursor (SAVE);	3110	scr_cursor (SAVE);
3162	break;	3111	break;
3163	case '8':	3112	case '8':
3164	scr_cursor (RESTORE);	3113	scr_cursor (RESTORE);
3165	break;	3114	break;
3166	#if ENABLE_FRILLS	3115	#if !ENABLE_MINIMAL
3167	case '9':	3116	case '9':
3168	scr_forwardindex ();	3117	scr_forwardindex ();
3169	break;	3118	break;
3170	#endif	3119	#endif
3171	case '=':	3120	case '=':
…		…
3333	ndef = get_byte_array_bit (csi_defaults, i);	3282	ndef = get_byte_array_bit (csi_defaults, i);
3334	for (p = 0; p < nargs; p++)	3283	for (p = 0; p < nargs; p++)
3335	if (arg[p] == -1)	3284	if (arg[p] == -1)
3336	arg[p] = ndef;	3285	arg[p] = ndef;
3337		3286
3338	#ifdef DEBUG_CMD
3339	fprintf (stderr, "CSI ");
3340	for (p = 0; p < nargs; p++)
3341	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3342	fprintf (stderr, "%c\n", ch);
3343	#endif
3344
3345	/*	3287	/*
3346	* private mode handling	3288	* private mode handling
3347	*/	3289	*/
3348	if (priv)	3290	if (priv)
3349	{	3291	{
3350	switch (priv)	3292	switch (priv)
3351	{	3293	{
3352	case '>':	3294	case '>':
3353	if (ch == CSI_DA) /* secondary device attributes */	3295	if (ch == CSI_DA) /* secondary device attributes */
3354	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3296	{
		3297	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3298	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3299	//
		3300	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3301	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3302	// that we do not support xterm mouse reporting (should be 95 when we do).
		3303	//
		3304	tt_printf ("\033[>%d;94;0c", 'U');
		3305	}
3355	break;	3306	break;
3356	case '?':	3307	case '?':
3357	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3308	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3358	process_terminal_mode (ch, priv, nargs, arg);	3309	process_terminal_mode (ch, priv, nargs, arg);
3359	break;	3310	break;
…		…
3562	break;	3513	break;
3563	case CSI_75:	3514	case CSI_75:
3564	scr_cursor (RESTORE);	3515	scr_cursor (RESTORE);
3565	break;	3516	break;
3566		3517
3567	#if ENABLE_FRILLS	3518	#if !ENABLE_MINIMAL
3568	case CSI_74:	3519	case CSI_74:
3569	process_window_ops (arg, nargs);	3520	process_window_ops (arg, nargs);
3570	break;	3521	break;
3571	#endif	3522	#endif
3572		3523
…		…
3579	break;	3530	break;
3580	}	3531	}
3581	}	3532	}
3582	/*}}} */	3533	/*}}} */
3583		3534
3584	#if ENABLE_FRILLS	3535	#if !ENABLE_MINIMAL
3585	/* ARGSUSED */	3536	/* ARGSUSED */
3586	void	3537	void
3587	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3538	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3588	{	3539	{
3589	int x, y;	3540	int x, y;
3590	XWindowAttributes wattr;	3541	XWindowAttributes wattr;
3591	Window wdummy;	3542	Window wdummy;
3592	dDisp;	3543
		3544	dLocal (Display *, dpy);
3593		3545
3594	if (nargs == 0)	3546	if (nargs == 0)
3595	return;	3547	return;
3596		3548
3597	switch (args[0])	3549	switch (args[0])
3598	{	3550	{
3599	/*	3551	/*
3600	* commands	3552	* commands
3601	*/	3553	*/
3602	case 1: /* deiconify window */	3554	case 1: /* deiconify window */
3603	XMapWindow (disp, parent[0]);	3555	XMapWindow (dpy, parent[0]);
3604	break;	3556	break;
3605	case 2: /* iconify window */	3557	case 2: /* iconify window */
3606	XIconifyWindow (disp, parent[0], display->screen);	3558	XIconifyWindow (dpy, parent[0], display->screen);
3607	break;	3559	break;
3608	case 3: /* set position (pixels) */	3560	case 3: /* set position (pixels) */
3609	XMoveWindow (disp, parent[0], args[1], args[2]);	3561	XMoveWindow (dpy, parent[0], args[1], args[2]);
3610	break;	3562	break;
3611	case 4: /* set size (pixels) */	3563	case 4: /* set size (pixels) */
3612	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3564	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3613	break;	3565	break;
3614	case 5: /* raise window */	3566	case 5: /* raise window */
3615	XRaiseWindow (disp, parent[0]);	3567	XRaiseWindow (dpy, parent[0]);
3616	break;	3568	break;
3617	case 6: /* lower window */	3569	case 6: /* lower window */
3618	XLowerWindow (disp, parent[0]);	3570	XLowerWindow (dpy, parent[0]);
3619	break;	3571	break;
3620	case 7: /* refresh window */	3572	case 7: /* refresh window */
3621	scr_touch (true);	3573	scr_touch (true);
3622	break;	3574	break;
3623	case 8: /* set size (chars) */	3575	case 8: /* set size (chars) */
…		…
3630	if (args[0] >= 24) /* set height (chars) */	3582	if (args[0] >= 24) /* set height (chars) */
3631	set_widthheight ((unsigned int)width,	3583	set_widthheight ((unsigned int)width,
3632	(unsigned int) (args[1] * fheight));	3584	(unsigned int) (args[1] * fheight));
3633	break;	3585	break;
3634		3586
3635
3636	/*	3587	/*
3637	* reports - some output format copied from XTerm	3588	* reports - some output format copied from XTerm
3638	*/	3589	*/
3639	case 11: /* report window state */	3590	case 11: /* report window state */
3640	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (dpy, parent[0], &wattr);
3641	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3592	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3642	break;	3593	break;
3643	case 13: /* report window position */	3594	case 13: /* report window position */
3644	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (dpy, parent[0], &wattr);
3645	XTranslateCoordinates (disp, parent[0], wattr.root,	3596	XTranslateCoordinates (dpy, parent[0], wattr.root,
3646	-wattr.border_width, -wattr.border_width,	3597	-wattr.border_width, -wattr.border_width,
3647	&x, &y, &wdummy);	3598	&x, &y, &wdummy);
3648	tt_printf ("\033[3;%d;%dt", x, y);	3599	tt_printf ("\033[3;%d;%dt", x, y);
3649	break;	3600	break;
3650	case 14: /* report window size (pixels) */	3601	case 14: /* report window size (pixels) */
3651	XGetWindowAttributes (disp, parent[0], &wattr);	3602	XGetWindowAttributes (dpy, parent[0], &wattr);
3652	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3603	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3653	break;	3604	break;
3654	case 18: /* report text area size (chars) */	3605	case 18: /* report text area size (chars) */
3655	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3606	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656	break;	3607	break;
…		…
3658	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3609	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3659	break;	3610	break;
3660	case 20: /* report icon label */	3611	case 20: /* report icon label */
3661	{	3612	{
3662	char *s;	3613	char *s;
3663	XGetIconName (disp, parent[0], &s);	3614	XGetIconName (dpy, parent[0], &s);
3664	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3615	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3665	XFree (s);	3616	XFree (s);
3666	}	3617	}
3667	break;	3618	break;
3668	case 21: /* report window title */	3619	case 21: /* report window title */
3669	{	3620	{
3670	char *s;	3621	char *s;
3671	XFetchName (disp, parent[0], &s);	3622	XFetchName (dpy, parent[0], &s);
3672	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3623	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673	XFree (s);	3624	XFree (s);
3674	}	3625	}
3675	break;	3626	break;
3676	}	3627	}
…		…
3777	void	3728	void
3778	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3729	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3779	{	3730	{
3780	if (str[0] == '?' && !str[1])	3731	if (str[0] == '?' && !str[1])
3781	{	3732	{
3782	unsigned short r, g, b;	3733	rgba c;
3783	pix_colors_focused[color].get (display, r, g, b);	3734	pix_colors_focused[color].get (c);
		3735
		3736	#if XFT
		3737	if (c.a != rgba::MAX_CC)
		3738	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3739	else
		3740	#endif
3784	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3741	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3785	}	3742	}
3786	else	3743	else
3787	set_window_color (color, str);	3744	set_window_color (color, str);
3788	}	3745	}
3789		3746
…		…
3791	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3748	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792	*/	3749	*/
3793	void	3750	void
3794	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3751	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795	{	3752	{
3796	int changed = 0;
3797	int color;	3753	int color;
3798	char *buf, *name;	3754	char *buf, *name;
3799	bool query = str[0] == '?' && !str[1];	3755	bool query = str[0] == '?' && !str[1];
3800	int saveop = op;	3756	int saveop = op;
3801	dDisp;	3757
		3758	dLocal (Display *, dpy);
3802		3759
3803	assert (str != NULL);	3760	assert (str != NULL);
3804	switch (op)	3761	switch (op)
3805	{	3762	{
3806	case XTerm_name:	3763	case XTerm_name:
…		…
3822	unsigned long bytes_after;	3779	unsigned long bytes_after;
3823	unsigned char *value = 0;	3780	unsigned char *value = 0;
3824	const char *str = "";	3781	const char *str = "";
3825		3782
3826	if (prop	3783	if (prop
3827	&& XGetWindowProperty (disp, parent[0],	3784	&& XGetWindowProperty (dpy, parent[0],
3828	prop, 0, 1<<16, 0, AnyPropertyType,	3785	prop, 0, 1<<16, 0, AnyPropertyType,
3829	&actual_type, &actual_format,	3786	&actual_type, &actual_format,
3830	&nitems, &bytes_after, &value) == Success	3787	&nitems, &bytes_after, &value) == Success
3831	&& actual_type != None	3788	&& actual_type != None
3832	&& actual_format == 8)	3789	&& actual_format == 8)
3833	str = (const char *)(value);	3790	str = (const char *)(value);
3834		3791
3835	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3792	tt_printf ("\033]%d;%s%c", op, str, resp);
3836		3793
3837	XFree (value);	3794	XFree (value);
3838	}	3795	}
3839	else	3796	else
3840	{	3797	{
…		…
3844	{	3801	{
3845	*eq = 0;	3802	*eq = 0;
3846	set_utf8_property (display->atom (str), eq + 1);	3803	set_utf8_property (display->atom (str), eq + 1);
3847	}	3804	}
3848	else	3805	else
3849	XDeleteProperty (disp, parent[0],	3806	XDeleteProperty (dpy, parent[0],
3850	display->atom (str));	3807	display->atom (str));
3851	}	3808	}
3852	break;	3809	break;
3853		3810
3854	case XTerm_Color:	3811	case XTerm_Color:
…		…
3864	break;	3821	break;
3865		3822
3866	if ((buf = strchr (name, ';')) != NULL)	3823	if ((buf = strchr (name, ';')) != NULL)
3867	*buf++ = '\0';	3824	*buf++ = '\0';
3868		3825
3869	if (name[0] == '?' && !name[1])	3826	process_color_seq (op, color, name, resp);
3870	{
3871	unsigned short r, g, b;
3872	pix_colors_focused[color].get (display, r, g, b);
3873	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3874	}
3875	else
3876	set_window_color (color, name);
3877	}	3827	}
3878	break;	3828	break;
3879	case XTerm_Color00:	3829	case XTerm_Color00:
3880	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3830	process_color_seq (op, Color_fg, str, resp);
3881	break;	3831	break;
3882	case XTerm_Color01:	3832	case XTerm_Color01:
3883	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3833	process_color_seq (op, Color_bg, str, resp);
3884	break;	3834	break;
3885	#ifndef NO_CURSORCOLOR	3835	#ifndef NO_CURSORCOLOR
3886	case XTerm_Color_cursor:	3836	case XTerm_Color_cursor:
3887	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3837	process_color_seq (op, Color_cursor, str, resp);
3888	break;	3838	break;
3889	#endif	3839	#endif
3890	case XTerm_Color_pointer_fg:	3840	case XTerm_Color_pointer_fg:
3891	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3841	process_color_seq (op, Color_pointer_fg, str, resp);
3892	break;	3842	break;
3893	case XTerm_Color_pointer_bg:	3843	case XTerm_Color_pointer_bg:
3894	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3844	process_color_seq (op, Color_pointer_bg, str, resp);
3895	break;	3845	break;
3896	#ifndef NO_BOLD_UNDERLINE_REVERSE	3846	#ifndef NO_BOLD_UNDERLINE_REVERSE
3897	case XTerm_Color_RV:	3847	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3848	process_color_seq (op, Color_RV, str, resp);
3899	break;	3849	break;
3900	case Rxvt_Color_BD:	3850	case Rxvt_Color_BD:
3901	case URxvt_Color_BD:	3851	case URxvt_Color_BD:
3902	process_color_seq (op, Color_BD, str, resp);	3852	process_color_seq (op, Color_BD, str, resp);
3903	break;	3853	break;
3904	case Rxvt_Color_UL:	3854	case Rxvt_Color_UL:
3905	case URxvt_Color_UL:	3855	case URxvt_Color_UL:
3906	process_color_seq (op, Color_UL, str, resp);	3856	process_color_seq (op, Color_UL, str, resp);
3907	break;	3857	break;
3908	case URxvt_Color_IT:	3858	case URxvt_Color_IT:
3909	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3859	process_color_seq (op, Color_IT, str, resp);
3910	break;	3860	break;
3911	#endif	3861	#endif
3912	#if TRANSPARENT && TINTING	3862	#if TRANSPARENT && TINTING
3913	case URxvt_Color_tint:	3863	case URxvt_Color_tint:
3914	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3864	process_color_seq (op, Color_tint, str, resp);
		3865
3915	check_our_parents ();	3866	check_our_parents ();
		3867
3916	if (am_transparent)	3868	if (am_transparent)
3917	want_full_refresh = want_refresh = 1;	3869	want_full_refresh = want_refresh = 1;
		3870
3918	break;	3871	break;
3919	#endif	3872	#endif
3920		3873
3921	case Rxvt_Pixmap:	3874	case Rxvt_Pixmap:
		3875	{
3922	if (*str != ';')	3876	if (*str != ';')
3923	{	3877	{
3924	#if XPM_BACKGROUND	3878	#if XPM_BACKGROUND
3925	scale_pixmap (""); /* reset to default scaling */	3879	scale_pixmap (""); /* reset to default scaling */
3926	set_bgPixmap (str); /* change pixmap */	3880	set_bgPixmap (str); /* change pixmap */
3927	scr_touch (true);	3881	scr_touch (true);
3928	#endif	3882	#endif
3929	}	3883	}
3930		3884
		3885	int changed = 0;
		3886
3931	while ((str = strchr (str, ';')) != NULL)	3887	while ((str = strchr (str, ';')) != NULL)
3932	{	3888	{
3933	str++;	3889	str++;
3934	#if XPM_BACKGROUND	3890	#if XPM_BACKGROUND
3935	changed += scale_pixmap (str);	3891	changed += scale_pixmap (str);
3936	#endif	3892	#endif
3937	}	3893	}
3938		3894
3939	if (changed)	3895	if (changed)
3940	{	3896	{
3941	#ifdef XPM_BACKGROUND	3897	#ifdef XPM_BACKGROUND
3942	resize_pixmap ();	3898	resize_pixmap ();
3943	scr_touch (true);	3899	scr_touch (true);
3944	#endif	3900	#endif
3945	}	3901	}
		3902	}
3946	break;	3903	break;
3947		3904
3948	case Rxvt_restoreFG:	3905	case Rxvt_restoreFG:
3949	set_window_color (Color_fg, str);	3906	set_window_color (Color_fg, str);
3950	break;	3907	break;
…		…
3954		3911
3955	case XTerm_logfile:	3912	case XTerm_logfile:
3956	// TODO, when secure mode?	3913	// TODO, when secure mode?
3957	break;	3914	break;
3958		3915
3959	#ifdef MENUBAR
3960	case URxvt_Menu:
3961	if (OPTION (Opt_insecure))
3962	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963	break;
3964	#endif
3965	#if 0	3916	#if 0
3966	case Rxvt_dumpscreen: /* no error notices */	3917	case Rxvt_dumpscreen: /* no error notices */
3967	{	3918	{
3968	int fd;	3919	int fd;
3969	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3920	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
…		…
3995	allocated.push_back ((void *)res);	3946	allocated.push_back ((void *)res);
3996	set_fonts ();	3947	set_fonts ();
3997	}	3948	}
3998	break;	3949	break;
3999		3950
4000	#if ENABLE_FRILLS	3951	case URxvt_version:
		3952	if (query)
		3953	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3954	op,
		3955	rs[Rs_name], VERSION[0], VERSION[2],
		3956	resp);
		3957	break;
		3958
		3959	#if !ENABLE_MINIMAL
4001	case URxvt_locale:	3960	case URxvt_locale:
4002	if (query)	3961	if (query)
4003	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3962	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4004	else	3963	else
4005	{	3964	{
4006	set_locale (str);	3965	set_locale (str);
4007	pty.set_utf8_mode (enc_utf8);	3966	pty->set_utf8_mode (enc_utf8);
4008	init_xlocale ();	3967	init_xlocale ();
4009	}	3968	}
4010	break;	3969	break;
4011		3970
4012	case URxvt_view_up:	3971	case URxvt_view_up:
…		…
4065	return state;	4024	return state;
4066	}	4025	}
4067		4026
4068	/* we're not using priv _yet_ */	4027	/* we're not using priv _yet_ */
4069	void	4028	void
4070	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4029	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4071	{	4030	{
4072	unsigned int i, j;	4031	unsigned int i, j;
4073	int state;	4032	int state;
4074		4033
4075	static const struct	4034	static const struct
…		…
4086	{ 5, PrivMode_rVideo },	4045	{ 5, PrivMode_rVideo },
4087	{ 6, PrivMode_relOrigin },	4046	{ 6, PrivMode_relOrigin },
4088	{ 7, PrivMode_Autowrap },	4047	{ 7, PrivMode_Autowrap },
4089	// 8, bi-directional support mode	4048	// 8, bi-directional support mode
4090	{ 9, PrivMode_MouseX10 },	4049	{ 9, PrivMode_MouseX10 },
4091	#ifdef menuBar_esc
4092	{ menuBar_esc, PrivMode_menuBar },
4093	#endif
4094	// 18, 19 printing-related	4050	// 18, 19 printing-related
4095	{ 25, PrivMode_VisibleCursor },	4051	{ 25, PrivMode_VisibleCursor },
4096	#ifdef scrollBar_esc	4052	#ifdef scrollBar_esc
4097	{ scrollBar_esc, PrivMode_scrollBar },	4053	{ scrollBar_esc, PrivMode_scrollBar },
4098	#endif	4054	#endif
…		…
4193	/* case 8: - auto repeat, can't do on a per window basis */	4149	/* case 8: - auto repeat, can't do on a per window basis */
4194	case 9: /* X10 mouse reporting */	4150	case 9: /* X10 mouse reporting */
4195	if (state) /* orthogonal */	4151	if (state) /* orthogonal */
4196	priv_modes &= ~PrivMode_MouseX11;	4152	priv_modes &= ~PrivMode_MouseX11;
4197	break;	4153	break;
4198	#ifdef menuBar_esc
4199	case menuBar_esc:
4200	#ifdef MENUBAR
4201	map_menuBar (state);
4202	#endif
4203	break;
4204	#endif
4205	#ifdef scrollBar_esc	4154	#ifdef scrollBar_esc
4206	case scrollBar_esc:	4155	case scrollBar_esc:
4207	if (scrollbar_mapping (state))	4156	if (scrollbar_mapping (state))
4208	{	4157	{
4209	resize_all_windows (0, 0, 0);	4158	resize_all_windows (0, 0, 0);
…		…
4379	scr_color (Color_bg, Color_bg);	4328	scr_color (Color_bg, Color_bg);
4380	break;	4329	break;
4381		4330
4382	//case 50: // not variable spacing	4331	//case 50: // not variable spacing
4383		4332
4384	#if ENABLE_FRILLS	4333	#if !ENABLE_MINIMAL
4385	case 90:	4334	case 90:
4386	case 91: /* set bright fg color */	4335	case 91: /* set bright fg color */
4387	case 92:	4336	case 92:
4388	case 93:	4337	case 93:
4389	case 94:	4338	case 94:
…		…
4454	rxvt_term::tt_write (const char *data, unsigned int len)	4403	rxvt_term::tt_write (const char *data, unsigned int len)
4455	{	4404	{
4456	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4405	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457	return;	4406	return;
4458		4407
4459	if (pty.pty < 0)	4408	if (pty->pty < 0)
4460	return;	4409	return;
4461		4410
4462	if (v_buflen == 0)	4411	if (v_buflen == 0)
4463	{	4412	{
4464	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4413	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465		4414
4466	if ((unsigned int)written == len)	4415	if ((unsigned int)written == len)
4467	return;	4416	return;
4468		4417
4469	data += written;	4418	data += written;
…		…
4478	pty_ev.set (EVENT_READ | EVENT_WRITE);	4427	pty_ev.set (EVENT_READ | EVENT_WRITE);
4479	}	4428	}
4480		4429
4481	void rxvt_term::pty_write ()	4430	void rxvt_term::pty_write ()
4482	{	4431	{
4483	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4432	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484		4433
4485	if (written > 0)	4434	if (written > 0)
4486	{	4435	{
4487	v_buflen -= written;	4436	v_buflen -= written;
4488		4437

Diff Legend

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