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.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.307 by root, Sat Feb 11 10:53:37 2006 UTC

…		…
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	}
…		…
1021	}	1089	}
1022		1090
1023	void	1091	void
1024	rxvt_term::check_cb (check_watcher &w)	1092	rxvt_term::check_cb (check_watcher &w)
1025	{	1093	{
1026	SET_R (this);	1094	make_current ();
1027	SET_LOCALE (locale);
1028		1095
1029	display->flush ();	1096	display->flush ();
1030		1097
1031	if (want_refresh && !flush_ev.active)	1098	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1099	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1100	}
1034		1101
1035	void	1102	void
1036	rxvt_term::flush_cb (time_watcher &w)	1103	rxvt_term::flush_cb (time_watcher &w)
1037	{	1104	{
1038	SET_R (this);	1105	make_current ();
1039	SET_LOCALE (locale);
1040		1106
1041	refresh_limit = 1;	1107	refresh_limit = 1;
1042	refresh_count = 0;	1108	refresh_count = 0;
1043	flush ();	1109	flush ();
1044	}	1110	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1114	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1115	{
1050	hidden_cursor = !hidden_cursor;	1116	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1117	want_refresh = 1;
1052		1118
1053	w.start (w.at + BLINK_INTERVAL);	1119	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1120	}
1055	#endif	1121	#endif
1056		1122
1057	#ifdef TEXT_BLINK	1123	#ifdef TEXT_BLINK
1058	void	1124	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1138	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1139	{
1074	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1140	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1141	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1142	{
1077	refresh_type |= SMOOTH_REFRESH;
1078	want_refresh = 1;	1143	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1144	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1145	}
1081	}	1146	}
1082	#endif	1147	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1151	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1152	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1153	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1154	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1155	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type |= SMOOTH_REFRESH;
1092	want_refresh = 1;	1156	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1157	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1158	}
1095	}	1159	}
1096	#endif	1160	#endif
…		…
1104	: scr_page (UP, mouse_slip_wheel_speed))	1168	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1169	{
1106	if (view_start == top_row || view_start == 0)	1170	if (view_start == top_row || view_start == 0)
1107	mouse_slip_wheel_speed = 0;	1171	mouse_slip_wheel_speed = 0;
1108		1172
1109	refresh_type |= SMOOTH_REFRESH;
1110	want_refresh = 1;	1173	want_refresh = 1;
1111	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112	}	1175	}
1113	}	1176	}
1114	#endif	1177	#endif
1115		1178
1116	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1117	static struct event_handler	1180	static struct event_handler
1118	{	1181	{
1119	check_watcher cw_yield;	1182	check_watcher yield_ev;
1120		1183
1121	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1122	{	1185	{
1123	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
1124	w.stop ();	1194	w.stop ();
1125	}	1195	}
1126		1196
1127	event_handler ()	1197	event_handler ()
1128	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1129	{	1199	{
1130	}	1200	}
1131	} event_handler;	1201	} event_handler;
1132	#endif	1202	#endif
1133		1203
…		…
1144		1214
1145	memmove (cmdbuf_base, cmdbuf_ptr, n);	1215	memmove (cmdbuf_base, cmdbuf_ptr, n);
1146	cmdbuf_ptr = cmdbuf_base;	1216	cmdbuf_ptr = cmdbuf_base;
1147	cmdbuf_endp = cmdbuf_ptr + n;	1217	cmdbuf_endp = cmdbuf_ptr + n;
1148		1218
1149	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1219	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150		1220
1151	if (r > 0)	1221	if (r > 0)
1152	{	1222	{
1153	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1154	return true;	1224	return true;
1155	}	1225	}
1156	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157	{	1227	{
1158	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1159	if (display->is_local)	1229	if (display->is_local)
1160	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1161	#endif	1231	#endif
1162	}	1232	}
1163	else	1233	else
1164	{	1234	{
1165	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1172	}	1242	}
1173		1243
1174	void	1244	void
1175	rxvt_term::pty_cb (io_watcher &w, short revents)	1245	rxvt_term::pty_cb (io_watcher &w, short revents)
1176	{	1246	{
1177	SET_R (this);	1247	make_current ();
1178	SET_LOCALE (locale);
1179		1248
1180	if (revents & EVENT_READ)	1249	if (revents & EVENT_READ)
1181	// loop, but don't allow a single term to monopolize us	1250	// loop, but don't allow a single term to monopolize us
1182	while (pty_fill ())	1251	while (pty_fill ())
1183	if (cmd_parse ())	1252	if (cmd_parse ())
…		…
1188	}	1257	}
1189		1258
1190	void	1259	void
1191	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1192	{	1261	{
1193	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1194	recolour_cursor ();	1263	recolour_cursor ();
1195		1264
1196	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1197	hidden_pointer = 0;	1266	hidden_pointer = 0;
1198		1267
…		…
1206	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1207	{	1276	{
1208	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1209	return;	1278	return;
1210		1279
1211	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1212	XFlush (display->display);	1281	XFlush (dpy);
1213		1282
1214	hidden_pointer = 1;	1283	hidden_pointer = 1;
1215	}	1284	}
1216		1285
1217	void	1286	void
1218	rxvt_term::pointer_cb (time_watcher &w)	1287	rxvt_term::pointer_cb (time_watcher &w)
1219	{	1288	{
1220	SET_R (this);	1289	make_current ();
1221	SET_LOCALE (locale);
1222		1290
1223	pointer_blank ();	1291	pointer_blank ();
1224	}	1292	}
1225	#endif	1293	#endif
1226		1294
…		…
1291	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1292	(32 + x + 1),	1360	(32 + x + 1),
1293	(32 + y + 1));	1361	(32 + y + 1));
1294	}	1362	}
1295		1363
1296	#ifdef USING_W11LIB
1297	void
1298	rxvt_W11_process_x_event (XEvent *ev)
1299	{
1300	rxvt_t *r = rxvt_get_r ();
1301
1302	x_cb (*ev);
1303	}
1304	#endif
1305
1306	/*{{{ process an X event */	1364	/*{{{ process an X event */
1307	void	1365	void
1308	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1309	{	1367	{
1310	dDisp;	1368	make_current ();
1311		1369
1312	SET_R (this);	1370	dLocal (Display *, dpy);
1313	SET_LOCALE (locale);
1314		1371
1315	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
		1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1316	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317	return;	1375	return;
1318		1376
1319	// for XQueryPointer	1377	// for XQueryPointer
1320	Window unused_root, unused_child;	1378	Window unused_root, unused_child;
…		…
1322	unsigned int unused_mask;	1380	unsigned int unused_mask;
1323		1381
1324	switch (ev.type)	1382	switch (ev.type)
1325	{	1383	{
1326	case KeyPress:	1384	case KeyPress:
1327	#if ISO_14755	1385	key_press (ev.xkey);
1328	if (!(iso14755buf & ISO_14755_52))
1329	#endif
1330	lookup_key (ev.xkey);
1331
1332	break;	1386	break;
1333		1387
1334	case KeyRelease:	1388	case KeyRelease:
1335	{	1389	key_release (ev.xkey);
1336	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337	KeySym keysym;
1338
1339	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340	#endif
1341
1342	#if ENABLE_FRILLS || ISO_14755
1343	// ISO 14755 support
1344	if (iso14755buf)
1345	if (iso14755buf & ISO_14755_52)
1346	{
1347	# if ENABLE_OVERLAY
1348	scr_overlay_off ();
1349	# endif
1350	# if ISO_14755
1351	// iso14755 part 5.2 handling: release time
1352	// first: controls
1353	if ((ev.xkey.state & ControlMask)
1354	&& ((keysym >= 0x40 && keysym <= 0x5f)
1355	|| (keysym >= 0x61 && keysym <= 0x7f)))
1356	{
1357	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358	commit_iso14755 ();
1359	goto skip_switch;
1360	}
1361
1362	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363	if (i[0] == keysym)
1364	{
1365	iso14755buf = ISO_14755_51 | i[1];
1366	commit_iso14755 ();
1367	goto skip_switch;
1368	}
1369
1370	scr_bell ();
1371	# endif
1372	iso14755buf = 0;
1373	break;
1374	}
1375	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376	{
1377	# if ENABLE_OVERLAY
1378	scr_overlay_off ();
1379	# endif
1380	if (iso14755buf & ISO_14755_51)
1381	commit_iso14755 ();
1382	#if ISO_14755
1383	else if (iso14755buf & ISO_14755_STARTED)
1384	{
1385	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389	}
1390	# endif
1391	else
1392	iso14755buf = 0;
1393	}
1394	#endif
1395
1396	if (ev.xany.window == vt
1397	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398	break;
1399
1400	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401	if (!(ev.xkey.state & ControlMask))
1402	slip_wheel_ev.stop ();
1403	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404	mouse_slip_wheel_speed = 0;
1405	#endif
1406	break;	1390	break;
1407	}
1408		1391
1409	case ButtonPress:	1392	case ButtonPress:
1410	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1411	break;	1394	break;
1412		1395
…		…
1414	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1415	break;	1398	break;
1416		1399
1417	case ClientMessage:	1400	case ClientMessage:
1418	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1419	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420	{	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	{
1421	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)))
1422	destroy ();	1411	destroy ();
		1412	}
1423	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1424	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])
1425	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1426	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1427	&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	}
1428	#endif	1429	#endif
1429	}	1430	}
1430	#if ENABLE_XEMBED
1431	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432	{
1433	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434	focus_in ();
1435	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436	focus_out ();
1437	}
1438	#endif
1439	#ifdef OFFIX_DND
1440	/* OffiX Dnd (drag 'n' drop) protocol */
1441	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442	&& (ev.xclient.data.l[0] == DndFile
1443	|| ev.xclient.data.l[0] == DndDir
1444	|| ev.xclient.data.l[0] == DndLink))
1445	{
1446	/* Get Dnd data */
1447	Atom ActualType;
1448	int ActualFormat;
1449	unsigned char *data;
1450	unsigned long Size, RemainingBytes;
1451
1452	XGetWindowProperty (disp, display->root,
1453	xa[XA_DNDSELECTION],
1454	0L, 1000000L,
1455	False, AnyPropertyType,
1456	&ActualType, &ActualFormat,
1457	&Size, &RemainingBytes,
1458	&data);
1459	set_string_property (XA_CUT_BUFFER0, data);
1460	XFree (data);
1461	selection_paste (display->root, XA_CUT_BUFFER0, true);
1462	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463	}
1464	#endif /* OFFIX_DND */
1465	break;	1431	break;
1466		1432
1467	case MappingNotify:	1433	case MappingNotify:
1468	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1469	break;	1435	break;
…		…
1502	break;	1468	break;
1503		1469
1504	case ConfigureNotify:	1470	case ConfigureNotify:
1505	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1506	{	1472	{
1507	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508	;	1474	;
1509		1475
1510	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511	{	1477	{
1512	seen_resize = 1;	1478	seen_resize = 1;
1513	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514	}	1480	}
1515		1481
		1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1483
1516	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517	if (OPTION (Opt_transparent))	1485	if (OPTION (Opt_transparent))
1518	check_our_parents ();	1486	check_our_parents ();
1519	#endif	1487	#endif
1520	}	1488	}
1521	break;	1489	break;
1522		1490
1523	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1526	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1527		1496
1528	break;	1497	break;
1529		1498
1530	case SelectionClear:	1499	case SelectionClear:
1531	selection_clear ();	1500	selection_clear ();
…		…
1567	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1568	{	1537	{
1569	do	1538	do
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573		1542
1574	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575		1544
1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1577	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1578	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1579		1548
1580	want_refresh = 1;	1549	want_refresh = 1;
1581	}	1550	}
1582	else	1551	else
1583	{	1552	{
1584	XEvent unused_event;	1553	XEvent unused_event;
1585		1554
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587	;	1556	;
1588	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589	;	1558	;
1590		1559
1591	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1592	{	1561	{
1593	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1594	scrollbar_show (0);	1563	scrollbar_show (0);
1595	}	1564	}
1596	#ifdef MENUBAR
1597	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598	menubar_expose ();
1599	#endif
1600		1565
1601	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1602	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1603	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1604	#endif	1569	#endif
1605	}	1570	}
1606	break;	1571	break;
1607		1572
1608	case MotionNotify:	1573	case MotionNotify:
1609	#ifdef POINTER_BLANK	1574	#ifdef POINTER_BLANK
1610	if (hidden_pointer)	1575	if (hidden_pointer)
1611	pointer_unblank ();	1576	pointer_unblank ();
1612	#endif	1577	#endif
1613	#if MENUBAR
1614	if (isMenuBarWindow (ev.xany.window))
1615	{
1616	menubar_control (ev.xbutton);
1617	break;
1618	}
1619	#endif
1620	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1578	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621	break;	1579	break;
1622		1580
1623	if (ev.xany.window == vt)	1581	if (ev.xany.window == vt)
1624	{	1582	{
		1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626	; // nop	1585	; // nop
1627	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628	{	1587	{
1629	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1630	;	1589	;
1631		1590
1632	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1633	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1634	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1635	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1636	&ev.xbutton.state);	1595	&ev.xbutton.state);
1637	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1701	#endif	1660	#endif
1702	}	1661	}
1703	}	1662	}
1704	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1705	{	1664	{
1706	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1707	MotionNotify, &ev))	1666	MotionNotify, &ev))
1708	;	1667	;
1709		1668
1710	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1711	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1712	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1713	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1714	&unused_mask);	1673	&unused_mask);
1715	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1719	scrollbar_show (1);	1678	scrollbar_show (1);
1720	}	1679	}
1721	break;	1680	break;
1722	}	1681	}
1723		1682
1724	skip_switch: ;
1725
1726	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1727	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1728	{	1685	{
1729	if (hidden_cursor)	1686	if (hidden_cursor)
1730	{	1687	{
1731	hidden_cursor = 0;	1688	hidden_cursor = 0;
1732	want_refresh = 1;	1689	want_refresh = 1;
1733	}	1690	}
1734		1691
1735	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736	}	1693	}
1737	#endif	1694	#endif
1738		1695
1739	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1740	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1762	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1763		1720
1764	#if USE_XIM	1721	#if USE_XIM
1765	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1766	{	1723	{
1767	IMSetStatusPosition ();	1724	IMSetPosition ();
1768	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1769	}	1726	}
1770	#endif	1727	#endif
1771	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1772	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1773	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774	#endif	1731	#endif
1775	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1776	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1777	{	1734	{
1778	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1822		1779
1823	#if TRANSPARENT	1780	#if TRANSPARENT
1824	void	1781	void
1825	rxvt_term::rootwin_cb (XEvent &ev)	1782	rxvt_term::rootwin_cb (XEvent &ev)
1826	{	1783	{
1827	SET_R (this);	1784	make_current ();
1828	SET_LOCALE (locale);
1829		1785
1830	switch (ev.type)	1786	switch (ev.type)
1831	{	1787	{
1832	case PropertyNotify:	1788	case PropertyNotify:
1833	/*	1789	/*
…		…
1860	/*	1816	/*
1861	* VT window processing of button press	1817	* VT window processing of button press
1862	*/	1818	*/
1863	if (ev.window == vt)	1819	if (ev.window == vt)
1864	{	1820	{
		1821	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1822	return;
		1823
1865	#if ISO_14755	1824	#if ISO_14755
1866	// 5.4	1825	// 5.4
1867	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1826	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1868	{	1827	{
1869	iso14755_54 (ev.x, ev.y);	1828	iso14755_54 (ev.x, ev.y);
…		…
1911	else	1870	else
1912	{	1871	{
1913	if (ev.button != MEvent.button)	1872	if (ev.button != MEvent.button)
1914	MEvent.clicks = 0;	1873	MEvent.clicks = 0;
1915		1874
1916	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917	switch (ev.button)	1875	switch (ev.button)
1918	{	1876	{
1919	case Button1:	1877	case Button1:
1920	/* allow meta + click to select rectangular areas */	1878	/* allow meta + click to select rectangular areas */
1921	/* should be done in screen.C */	1879	/* should be done in screen.C */
1922	#if ENABLE_FRILLS	1880	#if ENABLE_FRILLS
1923	selection.rect = !!(ev.state & ModMetaMask);	1881	selection.rect = !!(ev.state & ModMetaMask);
1924	#else	1882	#else
1925	selection.rect = false;	1883	selection.rect = false;
1926	#endif	1884	#endif
1927		1885
1928	/* allow shift+left click to extend selection */	1886	/* allow shift+left click to extend selection */
1929	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930	{	1888	{
1931	if (MEvent.button == Button1 && clickintime)	1889	if (MEvent.button == Button1 && clickintime)
1932	selection_rotate (ev.x, ev.y);	1890	selection_rotate (ev.x, ev.y);
1933	else	1891	else
1934	selection_extend (ev.x, ev.y, 1);	1892	selection_extend (ev.x, ev.y, 1);
1935	}	1893	}
1936	else	1894	else
1937	{	1895	{
1938	if (MEvent.button == Button1 && clickintime)	1896	if (MEvent.button == Button1 && clickintime)
1939	MEvent.clicks++;	1897	MEvent.clicks++;
1940	else	1898	else
1941	MEvent.clicks = 1;	1899	MEvent.clicks = 1;
1942		1900
1943	selection_click (MEvent.clicks, ev.x, ev.y);	1901	selection_click (MEvent.clicks, ev.x, ev.y);
1944	}	1902	}
1945		1903
1946	MEvent.button = Button1;	1904	MEvent.button = Button1;
1947	break;	1905	break;
1948		1906
1949	case Button3:	1907	case Button3:
1950	if (MEvent.button == Button3 && clickintime)	1908	if (MEvent.button == Button3 && clickintime)
1951	selection_rotate (ev.x, ev.y);	1909	selection_rotate (ev.x, ev.y);
1952	else	1910	else
1953	selection_extend (ev.x, ev.y, 1);	1911	selection_extend (ev.x, ev.y, 1);
1954		1912
1955	MEvent.button = Button3;	1913	MEvent.button = Button3;
1956	break;	1914	break;
1957	}	1915	}
1958	}	1916	}
1959		1917
1960	MEvent.time = ev.time;	1918	MEvent.time = ev.time;
1961	return;	1919	return;
1962	}	1920	}
1963		1921
…		…
2102	}	2060	}
2103	}	2061	}
2104		2062
2105	return;	2063	return;
2106	}	2064	}
2107
2108	#if MENUBAR
2109	/*
2110	* Menubar window processing of button press
2111	*/
2112	if (isMenuBarWindow (ev.window))
2113	menubar_control (ev);
2114	#endif
2115	}	2065	}
2116		2066
2117	void	2067	void
2118	rxvt_term::button_release (XButtonEvent &ev)	2068	rxvt_term::button_release (XButtonEvent &ev)
2119	{	2069	{
…		…
2125		2075
2126	if (scrollbar_isUpDn ())	2076	if (scrollbar_isUpDn ())
2127	{	2077	{
2128	scrollBar.setIdle ();	2078	scrollBar.setIdle ();
2129	scrollbar_show (0);	2079	scrollbar_show (0);
2130	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131	refresh_type &= ~SMOOTH_REFRESH;
2132	#endif
2133	}	2080	}
2134		2081
2135	#ifdef SELECTION_SCROLLING	2082	#ifdef SELECTION_SCROLLING
2136	if (sel_scroll_ev.active)	2083	if (sel_scroll_ev.active)
2137	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2138	#endif	2085	#endif
2139		2086
2140	if (ev.window == vt)	2087	if (ev.window == vt)
2141	{	2088	{
		2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2090	return;
		2091
2142	#if ISO_14755	2092	#if ISO_14755
2143	// 5.4	2093	// 5.4
2144	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2094	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2145	return;	2095	return;
2146	#endif	2096	#endif
		2097
2147	if (reportmode)	2098	if (reportmode)
2148	{	2099	{
2149	/* mouse report from vt window */	2100	/* mouse report from vt window */
2150	/* don't report release of wheel "buttons" */	2101	/* don't report release of wheel "buttons" */
2151	if (ev.button >= 4)	2102	if (ev.button >= 4)
…		…
2175	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2176	&& bypass_keystate	2127	&& bypass_keystate
2177	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2178	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2179		2130
2180	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181	return;
2182
2183	switch (ev.button)	2131	switch (ev.button)
2184	{	2132	{
2185	case Button1:	2133	case Button1:
2186	case Button3:	2134	case Button3:
2187	selection_make (ev.time);	2135	selection_make (ev.time);
2188	break;	2136	break;
		2137
2189	case Button2:	2138	case Button2:
2190	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);
2191	break;	2141	break;
		2142
2192	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2193	case Button4:	2144	case Button4:
2194	case Button5:	2145	case Button5:
2195	{	2146	{
2196	int i;	2147	int i;
…		…
2228	}	2179	}
2229	break;	2180	break;
2230	#endif	2181	#endif
2231	}	2182	}
2232	}	2183	}
2233	#ifdef MENUBAR
2234	else if (isMenuBarWindow (ev.window))
2235	menubar_control (ev);
2236	#endif
2237	}	2184	}
2238		2185
2239	#ifdef TRANSPARENT	2186	#ifdef TRANSPARENT
2240	#if TINTING	2187	#if TINTING
2241	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2242		2189
2243	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2244		2191
2245	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)
2246	{	2193	{
2247	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2248	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2249	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2196	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252	int i;	2199	int i;
2253		2200
2254	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2255		2202
2256	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257		2204
2258	/* for convenience */	2205	/* for convenience */
2259	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2480	Atom atype;	2427	Atom atype;
2481	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2482	Window root, oldp, *list;	2429	Window root, oldp, *list;
2483	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2484	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2485	dDisp;
2486		2432
2487	pchanged = 0;	2433	pchanged = 0;
2488		2434
2489	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2490	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2491		2437
2492	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2493	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2494		2440
2495	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2496		2442
2497	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2498	{	2444	{
2499	if (am_transparent)	2445	if (am_transparent)
2500	{	2446	{
2501	pchanged = 1;	2447	pchanged = 1;
2502	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2503	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2504	}	2450	}
2505		2451
2506	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2507	}	2453	}
2508		2454
2509	/* 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. */
2510	XSync (disp, False);	2456	XSync (dpy, False);
2511		2457
2512	/*	2458	/*
2513	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2514	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2515	* 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.
2516	*/	2462	*/
2517	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2518	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2519	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2521		2467
2522	if (!i || prop == NULL)	2468	if (!i || prop == NULL)
2523	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2524	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2525	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2527		2473
2528	if (!i || prop == NULL	2474	if (!i || prop == NULL
2529	#if TINTING	2475	#if TINTING
2530	|| !rs[Rs_color + Color_tint]	2476	|| !ISSET_PIXCOLOR (Color_tint)
2531	#endif	2477	#endif
2532	)	2478	)
2533	have_pixmap = 0;	2479	have_pixmap = 0;
2534	else	2480	else
2535	{	2481	{
…		…
2548	Window cr;	2494	Window cr;
2549	XImage *image;	2495	XImage *image;
2550	GC gc;	2496	GC gc;
2551	XGCValues gcvalue;	2497	XGCValues gcvalue;
2552		2498
2553	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2554	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2555	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2556	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2557	nx = ny = 0;	2503	nx = ny = 0;
2558		2504
…		…
2571	}	2517	}
2572		2518
2573	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2574	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2575		2521
2576	XSync (disp, False);	2522	XSync (dpy, False);
2577	allowedxerror = -1;	2523	allowedxerror = -1;
2578	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579		2525
2580	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2581	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2582	allowedxerror = 0;	2528	allowedxerror = 0;
2583		2529
…		…
2586	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2587	{	2533	{
2588	pchanged = 1;	2534	pchanged = 1;
2589	if (pixmap != None)	2535	if (pixmap != None)
2590	{	2536	{
2591	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2592	pixmap = None;	2538	pixmap = None;
2593	}	2539	}
2594	}	2540	}
2595		2541
2596	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2597	}	2543	}
2598	else	2544	else
2599	{	2545	{
2600	if (pixmap != None)	2546	if (pixmap != None)
2601	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2602		2548
2603	#if TINTING	2549	#if TINTING
2604	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2605	{	2551	{
2606	unsigned short rm, gm, bm;
2607	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608		2553
		2554	rgba c;
2609	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2610		2556
2611	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2612	}	2558	}
2613	#endif	2559	#endif
2614		2560
2615	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2616	szHint.width, szHint.height, image->depth);
2617	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2618	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2619	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2620	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2621	XDestroyImage (image);	2566	XDestroyImage (image);
2622	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2623	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2624		2569
2625	if (!am_transparent || !am_pixmap_trans)	2570	if (!am_transparent || !am_pixmap_trans)
2626	pchanged = 1;	2571	pchanged = 1;
2627		2572
2628	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2629	}	2574	}
2630	}	2575	}
2631		2576
2632	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2633	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2634	else	2579	else
2635	{	2580	{
2636	unsigned int n;	2581	unsigned int n;
2637	/*	2582	/*
2638	* InheritPixmap transparency	2583	* InheritPixmap transparency
2639	*/	2584	*/
2640	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641	{	2586	{
2642	oldp = parent[i];	2587	oldp = parent[i];
2643	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2644	&parent[i], &list, &n);
2645	XFree (list);	2589	XFree (list);
2646		2590
2647	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2648	{	2592	{
2649	if (oldp != None)	2593	if (oldp != None)
…		…
2657	}	2601	}
2658		2602
2659	n = 0;	2603	n = 0;
2660		2604
2661	if (pchanged)	2605	if (pchanged)
2662	{
2663	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2664	{	2607	{
2665	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2666	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2667	{	2611	{
2668	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669	break;	2613	break;
2670	}	2614	}
2671	}	2615	}
2672	}
2673		2616
2674	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2675	{	2618	{
2676	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2677	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2678	am_transparent = 0;	2621	am_transparent = 0;
2679	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2680	}	2623	}
2681	else	2624	else
2682	{	2625	{
2683	#if WAIT_FOR_WM
2684	/* wait (an arbitrary period) for the WM to do its thing
2685	* needed for fvwm2.2.2 (and before?) */
2686	sleep (1);
2687	#endif
2688	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2689	{	2627	{
2690	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2691	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2692	}	2630	}
2693		2631
2694	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2695	am_transparent = 1;	2633	am_transparent = 1;
2696	}	2634	}
2697		2635
2698	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699	parent[i] = None;	2637	parent[i] = None;
2700	}	2638	}
2701		2639
2702	if (scrollBar.win)	2640	if (scrollBar.win)
2703	{	2641	{
2704	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2705	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2706	scrollbar_show (0);	2644	scrollbar_show (0);
2707	}	2645	}
2708		2646
2709	if (am_transparent)	2647	if (am_transparent)
…		…
2784	}	2722	}
2785		2723
2786	// scr_add_lines only works for nlines <= nrow - 1.	2724	// scr_add_lines only works for nlines <= nrow - 1.
2787	if (nlines >= nrow - 1)	2725	if (nlines >= nrow - 1)
2788	{	2726	{
		2727	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789	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))))
2790	scr_add_lines (buf, str - buf, nlines);	2729	scr_add_lines (buf, str - buf, nlines);
2791		2730
2792	nlines = 0;	2731	nlines = 0;
2793	str = buf;	2732	str = buf;
2794	eol = str + min (ncol, UBUFSIZ);	2733	eol = str + min (ncol, UBUFSIZ);
…		…
2809		2748
2810	seq_begin = cmdbuf_ptr;	2749	seq_begin = cmdbuf_ptr;
2811	ch = next_char ();	2750	ch = next_char ();
2812	}	2751	}
2813		2752
		2753	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814	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))))
2815	scr_add_lines (buf, str - buf, nlines);	2755	scr_add_lines (buf, str - buf, nlines);
2816		2756
2817	/*	2757	/*
2818	* 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
2819	* 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.
…		…
2825	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826	refresh_limit++;	2766	refresh_limit++;
2827	else	2767	else
2828	{	2768	{
2829	flag = true;	2769	flag = true;
2830	scr_refresh (refresh_type);	2770	scr_refresh ();
2831	want_refresh = 1;	2771	want_refresh = 1;
2832	}	2772	}
2833	}	2773	}
2834		2774
2835	}	2775	}
…		…
2853	return flag;	2793	return flag;
2854	}	2794	}
2855		2795
2856	// read the next character	2796	// read the next character
2857	wchar_t	2797	wchar_t
2858	rxvt_term::next_char ()	2798	rxvt_term::next_char () NOTHROW
2859	{	2799	{
2860	while (cmdbuf_ptr < cmdbuf_endp)	2800	while (cmdbuf_ptr < cmdbuf_endp)
2861	{	2801	{
2862	// assume 7-bit to be ascii ALWAYS	2802	// assume 7-bit to be ascii ALWAYS
2863	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2803	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2884	return NOCHAR;	2824	return NOCHAR;
2885	}	2825	}
2886		2826
2887	// read the next octet	2827	// read the next octet
2888	uint32_t	2828	uint32_t
2889	rxvt_term::next_octet ()	2829	rxvt_term::next_octet () NOTHROW
2890	{	2830	{
2891	return cmdbuf_ptr < cmdbuf_endp	2831	return cmdbuf_ptr < cmdbuf_endp
2892	? (unsigned char)*cmdbuf_ptr++	2832	? (unsigned char)*cmdbuf_ptr++
2893	: NOCHAR;	2833	: NOCHAR;
2894	}	2834	}
		2835
		2836	static class out_of_input out_of_input;
2895		2837
2896	/* rxvt_cmd_getc () - Return next input character */	2838	/* rxvt_cmd_getc () - Return next input character */
2897	/*	2839	/*
2898	* Return the next input character after first passing any keyboard input	2840	* Return the next input character after first passing any keyboard input
2899	* to the command.	2841	* to the command.
2900	*/	2842	*/
2901	wchar_t	2843	wchar_t
2902	rxvt_term::cmd_getc ()	2844	rxvt_term::cmd_getc () THROW ((class out_of_input))
2903	{	2845	{
2904	wchar_t c = next_char ();	2846	wchar_t c = next_char ();
2905		2847
2906	if (c == NOCHAR)	2848	if (c == NOCHAR)
2907	throw out_of_input;	2849	throw out_of_input;
2908		2850
2909	return c;	2851	return c;
2910	}	2852	}
2911		2853
2912	uint32_t	2854	uint32_t
2913	rxvt_term::cmd_get8 ()	2855	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914	{	2856	{
2915	uint32_t c = next_octet ();	2857	uint32_t c = next_octet ();
2916		2858
2917	if (c == NOCHAR)	2859	if (c == NOCHAR)
2918	throw out_of_input;	2860	throw out_of_input;
…		…
3156	scr_charset_set (2, (unsigned int)cmd_getc ());	3098	scr_charset_set (2, (unsigned int)cmd_getc ());
3157	break;	3099	break;
3158	case '+':	3100	case '+':
3159	scr_charset_set (3, (unsigned int)cmd_getc ());	3101	scr_charset_set (3, (unsigned int)cmd_getc ());
3160	break;	3102	break;
3161	#if ENABLE_FRILLS	3103	#if !ENABLE_MINIMAL
3162	case '6':	3104	case '6':
3163	scr_backindex ();	3105	scr_backindex ();
3164	break;	3106	break;
3165	#endif	3107	#endif
3166	case '7':	3108	case '7':
3167	scr_cursor (SAVE);	3109	scr_cursor (SAVE);
3168	break;	3110	break;
3169	case '8':	3111	case '8':
3170	scr_cursor (RESTORE);	3112	scr_cursor (RESTORE);
3171	break;	3113	break;
3172	#if ENABLE_FRILLS	3114	#if !ENABLE_MINIMAL
3173	case '9':	3115	case '9':
3174	scr_forwardindex ();	3116	scr_forwardindex ();
3175	break;	3117	break;
3176	#endif	3118	#endif
3177	case '=':	3119	case '=':
…		…
3339	ndef = get_byte_array_bit (csi_defaults, i);	3281	ndef = get_byte_array_bit (csi_defaults, i);
3340	for (p = 0; p < nargs; p++)	3282	for (p = 0; p < nargs; p++)
3341	if (arg[p] == -1)	3283	if (arg[p] == -1)
3342	arg[p] = ndef;	3284	arg[p] = ndef;
3343		3285
3344	#ifdef DEBUG_CMD
3345	fprintf (stderr, "CSI ");
3346	for (p = 0; p < nargs; p++)
3347	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348	fprintf (stderr, "%c\n", ch);
3349	#endif
3350
3351	/*	3286	/*
3352	* private mode handling	3287	* private mode handling
3353	*/	3288	*/
3354	if (priv)	3289	if (priv)
3355	{	3290	{
3356	switch (priv)	3291	switch (priv)
3357	{	3292	{
3358	case '>':	3293	case '>':
3359	if (ch == CSI_DA) /* secondary device attributes */	3294	if (ch == CSI_DA) /* secondary device attributes */
3360	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3295	{
		3296	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3297	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3298	//
		3299	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3300	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3301	// that we do not support xterm mouse reporting (should be 95 when we do).
		3302	//
		3303	tt_printf ("\033[>%d;94;0c", 'U');
		3304	}
3361	break;	3305	break;
3362	case '?':	3306	case '?':
3363	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3307	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3364	process_terminal_mode (ch, priv, nargs, arg);	3308	process_terminal_mode (ch, priv, nargs, arg);
3365	break;	3309	break;
…		…
3568	break;	3512	break;
3569	case CSI_75:	3513	case CSI_75:
3570	scr_cursor (RESTORE);	3514	scr_cursor (RESTORE);
3571	break;	3515	break;
3572		3516
3573	#if ENABLE_FRILLS	3517	#if !ENABLE_MINIMAL
3574	case CSI_74:	3518	case CSI_74:
3575	process_window_ops (arg, nargs);	3519	process_window_ops (arg, nargs);
3576	break;	3520	break;
3577	#endif	3521	#endif
3578		3522
…		…
3585	break;	3529	break;
3586	}	3530	}
3587	}	3531	}
3588	/*}}} */	3532	/*}}} */
3589		3533
3590	#if ENABLE_FRILLS	3534	#if !ENABLE_MINIMAL
3591	/* ARGSUSED */	3535	/* ARGSUSED */
3592	void	3536	void
3593	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3537	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594	{	3538	{
3595	int x, y;	3539	int x, y;
3596	XWindowAttributes wattr;	3540	XWindowAttributes wattr;
3597	Window wdummy;	3541	Window wdummy;
3598	dDisp;	3542
		3543	dLocal (Display *, dpy);
3599		3544
3600	if (nargs == 0)	3545	if (nargs == 0)
3601	return;	3546	return;
3602		3547
3603	switch (args[0])	3548	switch (args[0])
3604	{	3549	{
3605	/*	3550	/*
3606	* commands	3551	* commands
3607	*/	3552	*/
3608	case 1: /* deiconify window */	3553	case 1: /* deiconify window */
3609	XMapWindow (disp, parent[0]);	3554	XMapWindow (dpy, parent[0]);
3610	break;	3555	break;
3611	case 2: /* iconify window */	3556	case 2: /* iconify window */
3612	XIconifyWindow (disp, parent[0], display->screen);	3557	XIconifyWindow (dpy, parent[0], display->screen);
3613	break;	3558	break;
3614	case 3: /* set position (pixels) */	3559	case 3: /* set position (pixels) */
3615	XMoveWindow (disp, parent[0], args[1], args[2]);	3560	XMoveWindow (dpy, parent[0], args[1], args[2]);
3616	break;	3561	break;
3617	case 4: /* set size (pixels) */	3562	case 4: /* set size (pixels) */
3618	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3563	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619	break;	3564	break;
3620	case 5: /* raise window */	3565	case 5: /* raise window */
3621	XRaiseWindow (disp, parent[0]);	3566	XRaiseWindow (dpy, parent[0]);
3622	break;	3567	break;
3623	case 6: /* lower window */	3568	case 6: /* lower window */
3624	XLowerWindow (disp, parent[0]);	3569	XLowerWindow (dpy, parent[0]);
3625	break;	3570	break;
3626	case 7: /* refresh window */	3571	case 7: /* refresh window */
3627	scr_touch (true);	3572	scr_touch (true);
3628	break;	3573	break;
3629	case 8: /* set size (chars) */	3574	case 8: /* set size (chars) */
…		…
3636	if (args[0] >= 24) /* set height (chars) */	3581	if (args[0] >= 24) /* set height (chars) */
3637	set_widthheight ((unsigned int)width,	3582	set_widthheight ((unsigned int)width,
3638	(unsigned int) (args[1] * fheight));	3583	(unsigned int) (args[1] * fheight));
3639	break;	3584	break;
3640		3585
3641
3642	/*	3586	/*
3643	* reports - some output format copied from XTerm	3587	* reports - some output format copied from XTerm
3644	*/	3588	*/
3645	case 11: /* report window state */	3589	case 11: /* report window state */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (dpy, parent[0], &wattr);
3647	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3591	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648	break;	3592	break;
3649	case 13: /* report window position */	3593	case 13: /* report window position */
3650	XGetWindowAttributes (disp, parent[0], &wattr);	3594	XGetWindowAttributes (dpy, parent[0], &wattr);
3651	XTranslateCoordinates (disp, parent[0], wattr.root,	3595	XTranslateCoordinates (dpy, parent[0], wattr.root,
3652	-wattr.border_width, -wattr.border_width,	3596	-wattr.border_width, -wattr.border_width,
3653	&x, &y, &wdummy);	3597	&x, &y, &wdummy);
3654	tt_printf ("\033[3;%d;%dt", x, y);	3598	tt_printf ("\033[3;%d;%dt", x, y);
3655	break;	3599	break;
3656	case 14: /* report window size (pixels) */	3600	case 14: /* report window size (pixels) */
3657	XGetWindowAttributes (disp, parent[0], &wattr);	3601	XGetWindowAttributes (dpy, parent[0], &wattr);
3658	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3602	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659	break;	3603	break;
3660	case 18: /* report text area size (chars) */	3604	case 18: /* report text area size (chars) */
3661	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662	break;	3606	break;
…		…
3664	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3608	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665	break;	3609	break;
3666	case 20: /* report icon label */	3610	case 20: /* report icon label */
3667	{	3611	{
3668	char *s;	3612	char *s;
3669	XGetIconName (disp, parent[0], &s);	3613	XGetIconName (dpy, parent[0], &s);
3670	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3614	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671	XFree (s);	3615	XFree (s);
3672	}	3616	}
3673	break;	3617	break;
3674	case 21: /* report window title */	3618	case 21: /* report window title */
3675	{	3619	{
3676	char *s;	3620	char *s;
3677	XFetchName (disp, parent[0], &s);	3621	XFetchName (dpy, parent[0], &s);
3678	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3622	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679	XFree (s);	3623	XFree (s);
3680	}	3624	}
3681	break;	3625	break;
3682	}	3626	}
…		…
3783	void	3727	void
3784	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3728	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785	{	3729	{
3786	if (str[0] == '?' && !str[1])	3730	if (str[0] == '?' && !str[1])
3787	{	3731	{
3788	unsigned short r, g, b;	3732	rgba c;
3789	pix_colors_focused[color].get (display, r, g, b);	3733	pix_colors_focused[color].get (c);
		3734
		3735	#if XFT
		3736	if (c.a != rgba::MAX_CC)
		3737	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3738	else
		3739	#endif
3790	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3740	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3791	}	3741	}
3792	else	3742	else
3793	set_window_color (color, str);	3743	set_window_color (color, str);
3794	}	3744	}
3795		3745
…		…
3797	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3747	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3798	*/	3748	*/
3799	void	3749	void
3800	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3750	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801	{	3751	{
3802	int changed = 0;
3803	int color;	3752	int color;
3804	char *buf, *name;	3753	char *buf, *name;
3805	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3806	int saveop = op;	3755	int saveop = op;
3807	dDisp;	3756
		3757	dLocal (Display *, dpy);
3808		3758
3809	assert (str != NULL);	3759	assert (str != NULL);
3810	switch (op)	3760	switch (op)
3811	{	3761	{
3812	case XTerm_name:	3762	case XTerm_name:
…		…
3828	unsigned long bytes_after;	3778	unsigned long bytes_after;
3829	unsigned char *value = 0;	3779	unsigned char *value = 0;
3830	const char *str = "";	3780	const char *str = "";
3831		3781
3832	if (prop	3782	if (prop
3833	&& XGetWindowProperty (disp, parent[0],	3783	&& XGetWindowProperty (dpy, parent[0],
3834	prop, 0, 1<<16, 0, AnyPropertyType,	3784	prop, 0, 1<<16, 0, AnyPropertyType,
3835	&actual_type, &actual_format,	3785	&actual_type, &actual_format,
3836	&nitems, &bytes_after, &value) == Success	3786	&nitems, &bytes_after, &value) == Success
3837	&& actual_type != None	3787	&& actual_type != None
3838	&& actual_format == 8)	3788	&& actual_format == 8)
3839	str = (const char *)(value);	3789	str = (const char *)(value);
3840		3790
3841	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3791	tt_printf ("\033]%d;%s%c", op, str, resp);
3842		3792
3843	XFree (value);	3793	XFree (value);
3844	}	3794	}
3845	else	3795	else
3846	{	3796	{
…		…
3850	{	3800	{
3851	*eq = 0;	3801	*eq = 0;
3852	set_utf8_property (display->atom (str), eq + 1);	3802	set_utf8_property (display->atom (str), eq + 1);
3853	}	3803	}
3854	else	3804	else
3855	XDeleteProperty (disp, parent[0],	3805	XDeleteProperty (dpy, parent[0],
3856	display->atom (str));	3806	display->atom (str));
3857	}	3807	}
3858	break;	3808	break;
3859		3809
3860	case XTerm_Color:	3810	case XTerm_Color:
…		…
3870	break;	3820	break;
3871		3821
3872	if ((buf = strchr (name, ';')) != NULL)	3822	if ((buf = strchr (name, ';')) != NULL)
3873	*buf++ = '\0';	3823	*buf++ = '\0';
3874		3824
3875	if (name[0] == '?' && !name[1])	3825	process_color_seq (op, color, name, resp);
3876	{
3877	unsigned short r, g, b;
3878	pix_colors_focused[color].get (display, r, g, b);
3879	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880	}
3881	else
3882	set_window_color (color, name);
3883	}	3826	}
3884	break;	3827	break;
3885	case XTerm_Color00:	3828	case XTerm_Color00:
3886	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3829	process_color_seq (op, Color_fg, str, resp);
3887	break;	3830	break;
3888	case XTerm_Color01:	3831	case XTerm_Color01:
3889	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3832	process_color_seq (op, Color_bg, str, resp);
3890	break;	3833	break;
3891	#ifndef NO_CURSORCOLOR	3834	#ifndef NO_CURSORCOLOR
3892	case XTerm_Color_cursor:	3835	case XTerm_Color_cursor:
3893	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3836	process_color_seq (op, Color_cursor, str, resp);
3894	break;	3837	break;
3895	#endif	3838	#endif
3896	case XTerm_Color_pointer_fg:	3839	case XTerm_Color_pointer_fg:
3897	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3840	process_color_seq (op, Color_pointer_fg, str, resp);
3898	break;	3841	break;
3899	case XTerm_Color_pointer_bg:	3842	case XTerm_Color_pointer_bg:
3900	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3843	process_color_seq (op, Color_pointer_bg, str, resp);
3901	break;	3844	break;
3902	#ifndef NO_BOLD_UNDERLINE_REVERSE	3845	#ifndef NO_BOLD_UNDERLINE_REVERSE
3903	case XTerm_Color_RV:	3846	case XTerm_Color_RV:
3904	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3847	process_color_seq (op, Color_RV, str, resp);
3905	break;	3848	break;
3906	case Rxvt_Color_BD:	3849	case Rxvt_Color_BD:
3907	case URxvt_Color_BD:	3850	case URxvt_Color_BD:
3908	process_color_seq (op, Color_BD, str, resp);	3851	process_color_seq (op, Color_BD, str, resp);
3909	break;	3852	break;
3910	case Rxvt_Color_UL:	3853	case Rxvt_Color_UL:
3911	case URxvt_Color_UL:	3854	case URxvt_Color_UL:
3912	process_color_seq (op, Color_UL, str, resp);	3855	process_color_seq (op, Color_UL, str, resp);
3913	break;	3856	break;
3914	case URxvt_Color_IT:	3857	case URxvt_Color_IT:
3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3858	process_color_seq (op, Color_IT, str, resp);
3916	break;	3859	break;
3917	#endif	3860	#endif
3918	#if TRANSPARENT && TINTING	3861	#if TRANSPARENT && TINTING
3919	case URxvt_Color_tint:	3862	case URxvt_Color_tint:
3920	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3863	process_color_seq (op, Color_tint, str, resp);
		3864
3921	check_our_parents ();	3865	check_our_parents ();
		3866
3922	if (am_transparent)	3867	if (am_transparent)
3923	want_full_refresh = want_refresh = 1;	3868	want_full_refresh = want_refresh = 1;
		3869
3924	break;	3870	break;
3925	#endif	3871	#endif
3926		3872
3927	case Rxvt_Pixmap:	3873	case Rxvt_Pixmap:
		3874	{
3928	if (*str != ';')	3875	if (*str != ';')
3929	{	3876	{
3930	#if XPM_BACKGROUND	3877	#if XPM_BACKGROUND
3931	scale_pixmap (""); /* reset to default scaling */	3878	scale_pixmap (""); /* reset to default scaling */
3932	set_bgPixmap (str); /* change pixmap */	3879	set_bgPixmap (str); /* change pixmap */
3933	scr_touch (true);	3880	scr_touch (true);
3934	#endif	3881	#endif
3935	}	3882	}
3936		3883
		3884	int changed = 0;
		3885
3937	while ((str = strchr (str, ';')) != NULL)	3886	while ((str = strchr (str, ';')) != NULL)
3938	{	3887	{
3939	str++;	3888	str++;
3940	#if XPM_BACKGROUND	3889	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3890	changed += scale_pixmap (str);
3942	#endif	3891	#endif
3943	}	3892	}
3944		3893
3945	if (changed)	3894	if (changed)
3946	{	3895	{
3947	#ifdef XPM_BACKGROUND	3896	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3897	resize_pixmap ();
3949	scr_touch (true);	3898	scr_touch (true);
3950	#endif	3899	#endif
3951	}	3900	}
		3901	}
3952	break;	3902	break;
3953		3903
3954	case Rxvt_restoreFG:	3904	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3905	set_window_color (Color_fg, str);
3956	break;	3906	break;
…		…
3960		3910
3961	case XTerm_logfile:	3911	case XTerm_logfile:
3962	// TODO, when secure mode?	3912	// TODO, when secure mode?
3963	break;	3913	break;
3964		3914
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3915	#if 0
3972	case Rxvt_dumpscreen: /* no error notices */	3916	case Rxvt_dumpscreen: /* no error notices */
3973	{	3917	{
3974	int fd;	3918	int fd;
3975	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3919	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
…		…
4001	allocated.push_back ((void *)res);	3945	allocated.push_back ((void *)res);
4002	set_fonts ();	3946	set_fonts ();
4003	}	3947	}
4004	break;	3948	break;
4005		3949
4006	#if ENABLE_FRILLS	3950	case URxvt_version:
		3951	if (query)
		3952	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3953	op,
		3954	rs[Rs_name], VERSION[0], VERSION[2],
		3955	resp);
		3956	break;
		3957
		3958	#if !ENABLE_MINIMAL
4007	case URxvt_locale:	3959	case URxvt_locale:
4008	if (query)	3960	if (query)
4009	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3961	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010	else	3962	else
4011	{	3963	{
4012	set_locale (str);	3964	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3965	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3966	init_xlocale ();
4015	}	3967	}
4016	break;	3968	break;
4017		3969
4018	case URxvt_view_up:	3970	case URxvt_view_up:
…		…
4071	return state;	4023	return state;
4072	}	4024	}
4073		4025
4074	/* we're not using priv _yet_ */	4026	/* we're not using priv _yet_ */
4075	void	4027	void
4076	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4028	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077	{	4029	{
4078	unsigned int i, j;	4030	unsigned int i, j;
4079	int state;	4031	int state;
4080		4032
4081	static const struct	4033	static const struct
…		…
4092	{ 5, PrivMode_rVideo },	4044	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4045	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4046	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4047	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4048	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4049	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4050	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4051	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4052	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4053	#endif
…		…
4199	/* case 8: - auto repeat, can't do on a per window basis */	4148	/* case 8: - auto repeat, can't do on a per window basis */
4200	case 9: /* X10 mouse reporting */	4149	case 9: /* X10 mouse reporting */
4201	if (state) /* orthogonal */	4150	if (state) /* orthogonal */
4202	priv_modes &= ~PrivMode_MouseX11;	4151	priv_modes &= ~PrivMode_MouseX11;
4203	break;	4152	break;
4204	#ifdef menuBar_esc
4205	case menuBar_esc:
4206	#ifdef MENUBAR
4207	map_menuBar (state);
4208	#endif
4209	break;
4210	#endif
4211	#ifdef scrollBar_esc	4153	#ifdef scrollBar_esc
4212	case scrollBar_esc:	4154	case scrollBar_esc:
4213	if (scrollbar_mapping (state))	4155	if (scrollbar_mapping (state))
4214	{	4156	{
4215	resize_all_windows (0, 0, 0);	4157	resize_all_windows (0, 0, 0);
…		…
4385	scr_color (Color_bg, Color_bg);	4327	scr_color (Color_bg, Color_bg);
4386	break;	4328	break;
4387		4329
4388	//case 50: // not variable spacing	4330	//case 50: // not variable spacing
4389		4331
4390	#if ENABLE_FRILLS	4332	#if !ENABLE_MINIMAL
4391	case 90:	4333	case 90:
4392	case 91: /* set bright fg color */	4334	case 91: /* set bright fg color */
4393	case 92:	4335	case 92:
4394	case 93:	4336	case 93:
4395	case 94:	4337	case 94:
…		…
4460	rxvt_term::tt_write (const char *data, unsigned int len)	4402	rxvt_term::tt_write (const char *data, unsigned int len)
4461	{	4403	{
4462	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4404	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463	return;	4405	return;
4464		4406
4465	if (pty.pty < 0)	4407	if (pty->pty < 0)
4466	return;	4408	return;
4467		4409
4468	if (v_buflen == 0)	4410	if (v_buflen == 0)
4469	{	4411	{
4470	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4412	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471		4413
4472	if ((unsigned int)written == len)	4414	if ((unsigned int)written == len)
4473	return;	4415	return;
4474		4416
4475	data += written;	4417	data += written;
…		…
4484	pty_ev.set (EVENT_READ | EVENT_WRITE);	4426	pty_ev.set (EVENT_READ | EVENT_WRITE);
4485	}	4427	}
4486		4428
4487	void rxvt_term::pty_write ()	4429	void rxvt_term::pty_write ()
4488	{	4430	{
4489	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4431	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490		4432
4491	if (written > 0)	4433	if (written > 0)
4492	{	4434	{
4493	v_buflen -= written;	4435	v_buflen -= written;
4494		4436

Diff Legend

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