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.247 by root, Sat Jan 7 20:23:52 2006 UTC vs.
Revision 1.296 by root, Tue Jan 31 14:16:59 2006 UTC

…		…
64		64
65	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS || ISO_14755	69	#if ENABLE_FRILLS || ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	144	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR || !x)	153	if (t != NOCHAR || !x)
157	{	154	{
…		…
230	# if !UNICODE3	227	# if !UNICODE3
231	if (ch >= 0x10000)	228	if (ch >= 0x10000)
232	ch = 0xfffd;	229	ch = 0xfffd;
233	# endif	230	# endif
234	scr_overlay_set (11, y, ch, r);	231	scr_overlay_set (11, y, ch, r);
		232
		233	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
236	}	235	}
237		236
		237	// {
		238	// char buf[4+4+3+1];
		239	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		240	// scr_overlay_set (0, 0, buf);
		241	// }
238	scr_overlay_set (0, len , attr);	242	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	243	scr_overlay_set (0, len + 1, fname);
240		244
241	free (fname);	245	free (fname);
242		246
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	306	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	307	{
304	int ctrl, meta, shft, len;	308	int ctrl, meta, shft, len;
305	unsigned int newlen;	309	unsigned int newlen;
306	KeySym keysym;	310	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	311	int valid_keysym;
311	char kbuf[KBUFSZ];	312	char kbuf[KBUFSZ];
312		313
313	/*	314	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	315	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	444	scr_move_to (0, 1);
444	return;	445	return;
445	}	446	}
446	else if (keysym == XK_End)	447	else if (keysym == XK_End)
447	{	448	{
448	scr_move_to (1, 0);	449	scr_move_to (1, 1);
449	return;	450	return;
450	}	451	}
451	}	452	}
452	#endif	453	#endif
453	}	454	}
…		…
464	{	465	{
465	switch (keysym)	466	switch (keysym)
466	{	467	{
467	/* normal XTerm key bindings */	468	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	469	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	470	selection_request (ev.time);
470	return;	471	return;
471	#if TODO	472	#if TODO
472	/* rxvt extras */	473	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	474	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	475	change_font (FONT_UP);
…		…
867	#endif	868	#endif
868	/* nil */ ;	869	/* nil */ ;
869	}	870	}
870	}	871	}
871		872
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	873	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	874	return;
874		875
875	if (len <= 0)	876	if (len <= 0)
876	return; /* not mapped */	877	return; /* not mapped */
877		878
…		…
905	{	906	{
906	const char ch = C0_ESC;	907	const char ch = C0_ESC;
907	tt_write (&ch, 1);	908	tt_write (&ch, 1);
908	}	909	}
909		910
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);	911	tt_write (kbuf, (unsigned int)len);
921	}	912	}
922	/*}}} */	913	/*}}} */
923		914
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	915	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	916	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	917	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	918	{
930	unsigned int n, s;	919	unsigned int n, s;
931		920
…		…
972		961
973	if (want_refresh)	962	if (want_refresh)
974	{	963	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	964	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	965	{
977	int row = -view_start;	966	int row = view_start;
		967	int end_row = row + nrow;
978		968
979	while (row > -nsaved && ROW (row - 1).is_longer ())	969	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	970	--row;
981		971
982	while (row < -view_start + nrow)	972	do
983	{	973	{
984	int start_row = row;	974	int start_row = row;
985	line_t *l;	975	line_t *l;
986		976
987	do	977	do
988	{	978	{
989	l = &ROW (row);	979	l = &ROW (row++);
990		980
991	if (!(l->f & LINE_FILTERED))	981	if (!(l->f & LINE_FILTERED))
992	{	982	{
993	// line not filtered, mark it as filtered	983	// line not filtered, mark it as filtered
994	l->f |= LINE_FILTERED;	984	l->f |= LINE_FILTERED;
995	while (l->is_longer ())	985	while (l->is_longer ())
996	{	986	{
997	l = &ROW (++row);	987	l = &ROW (row++);
998	l->f |= LINE_FILTERED;	988	l->f |= LINE_FILTERED;
999	}	989	}
1000		990
1001	// and filter it	991	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	992	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		993
1004	break;	994	break;
1005	}	995	}
1006	}	996	}
1007	while (l->is_longer ());	997	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	998	}
		999	while (row < end_row);
1011		1000	}
1012	}
1013		1001
1014	scr_refresh (refresh_type);	1002	scr_refresh ();
1015	scrollbar_show (1);	1003	scrollbar_show (1);
1016	#ifdef USE_XIM	1004	#ifdef USE_XIM
1017	IMSendSpot ();	1005	IMSendSpot ();
1018	#endif	1006	#endif
1019	}	1007	}
…		…
1022	}	1010	}
1023		1011
1024	void	1012	void
1025	rxvt_term::check_cb (check_watcher &w)	1013	rxvt_term::check_cb (check_watcher &w)
1026	{	1014	{
1027	SET_R (this);	1015	make_current ();
1028	SET_LOCALE (locale);
1029		1016
1030	display->flush ();	1017	display->flush ();
1031		1018
1032	if (want_refresh && !flush_ev.active)	1019	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1020	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1021	}
1035		1022
1036	void	1023	void
1037	rxvt_term::flush_cb (time_watcher &w)	1024	rxvt_term::flush_cb (time_watcher &w)
1038	{	1025	{
1039	SET_R (this);	1026	make_current ();
1040	SET_LOCALE (locale);
1041		1027
1042	refresh_limit = 1;	1028	refresh_limit = 1;
1043	refresh_count = 0;	1029	refresh_count = 0;
1044	flush ();	1030	flush ();
1045	}	1031	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1035	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1036	{
1051	hidden_cursor = !hidden_cursor;	1037	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1038	want_refresh = 1;
1053		1039
1054	w.start (w.at + BLINK_INTERVAL);	1040	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1041	}
1056	#endif	1042	#endif
1057		1043
1058	#ifdef TEXT_BLINK	1044	#ifdef TEXT_BLINK
1059	void	1045	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1059	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1060	{
1075	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1061	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1062	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1063	{
1078	refresh_type |= SMOOTH_REFRESH;
1079	want_refresh = 1;	1064	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1066	}
1082	}	1067	}
1083	#endif	1068	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1072	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1073	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1074	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1075	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1076	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type |= SMOOTH_REFRESH;
1093	want_refresh = 1;	1077	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1078	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1079	}
1096	}	1080	}
1097	#endif	1081	#endif
…		…
1102	{	1086	{
1103	if (mouse_slip_wheel_speed == 0	1087	if (mouse_slip_wheel_speed == 0
1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1088	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1089	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1090	{
1107	if (view_start == nsaved ||	1091	if (view_start == top_row || view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1092	mouse_slip_wheel_speed = 0;
1110		1093
1111	refresh_type |= SMOOTH_REFRESH;
1112	want_refresh = 1;	1094	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1096	}
1115	}	1097	}
1116	#endif	1098	#endif
…		…
1146		1128
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1129	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1130	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1131	cmdbuf_endp = cmdbuf_ptr + n;
1150		1132
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1133	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1134
1153	if (r > 0)	1135	if (r > 0)
1154	{	1136	{
1155	cmdbuf_endp += r;	1137	cmdbuf_endp += r;
1156	return true;	1138	return true;
…		…
1174	}	1156	}
1175		1157
1176	void	1158	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1159	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1160	{
1179	SET_R (this);	1161	make_current ();
1180	SET_LOCALE (locale);
1181		1162
1182	if (revents & EVENT_READ)	1163	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1164	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1165	while (pty_fill ())
1185	if (cmd_parse ())	1166	if (cmd_parse ())
…		…
1190	}	1171	}
1191		1172
1192	void	1173	void
1193	rxvt_term::pointer_unblank ()	1174	rxvt_term::pointer_unblank ()
1194	{	1175	{
1195	XDefineCursor (display->display, vt, TermWin_cursor);	1176	XDefineCursor (xdisp, vt, TermWin_cursor);
1196	recolour_cursor ();	1177	recolour_cursor ();
1197		1178
1198	#ifdef POINTER_BLANK	1179	#ifdef POINTER_BLANK
1199	hidden_pointer = 0;	1180	hidden_pointer = 0;
1200		1181
…		…
1208	rxvt_term::pointer_blank ()	1189	rxvt_term::pointer_blank ()
1209	{	1190	{
1210	if (!OPTION (Opt_pointerBlank))	1191	if (!OPTION (Opt_pointerBlank))
1211	return;	1192	return;
1212		1193
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1194	XDefineCursor (xdisp, vt, display->blank_cursor);
1214	XFlush (display->display);	1195	XFlush (xdisp);
1215		1196
1216	hidden_pointer = 1;	1197	hidden_pointer = 1;
1217	}	1198	}
1218		1199
1219	void	1200	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1201	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1202	{
1222	SET_R (this);	1203	make_current ();
1223	SET_LOCALE (locale);
1224		1204
1225	pointer_blank ();	1205	pointer_blank ();
1226	}	1206	}
1227	#endif	1207	#endif
1228		1208
…		…
1293	(32 + button_number + key_state),	1273	(32 + button_number + key_state),
1294	(32 + x + 1),	1274	(32 + x + 1),
1295	(32 + y + 1));	1275	(32 + y + 1));
1296	}	1276	}
1297		1277
1298	#ifdef USING_W11LIB
1299	void
1300	rxvt_W11_process_x_event (XEvent *ev)
1301	{
1302	rxvt_t *r = rxvt_get_r ();
1303
1304	x_cb (*ev);
1305	}
1306	#endif
1307
1308	/*{{{ process an X event */	1278	/*{{{ process an X event */
1309	void	1279	void
1310	rxvt_term::x_cb (XEvent &ev)	1280	rxvt_term::x_cb (XEvent &ev)
1311	{	1281	{
1312	dDisp;	1282	make_current ();
1313		1283
1314	SET_R (this);	1284	dLocal (Display *, xdisp);
1315	SET_LOCALE (locale);
1316		1285
1317	#if defined(CURSOR_BLINK)	1286	if (ev.xany.window == vt
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1287	&& SHOULD_INVOKE (HOOK_X_EVENT)
1319	{	1288	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320	if (hidden_cursor)	1289	return;
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325		1290
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1291	// for XQueryPointer
1327	}
1328	#endif
1329
1330	#if defined(POINTER_BLANK)
1331	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332	{
1333	if (ev.type == MotionNotify
1334	|| ev.type == ButtonPress
1335	|| ev.type == ButtonRelease)
1336	if (hidden_pointer)
1337	pointer_unblank ();
1338
1339	if (ev.type == KeyPress && hidden_pointer == 0)
1340	pointer_blank ();
1341	}
1342	#endif
1343
1344	Window unused_root, unused_child;	1292	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1293	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1294	unsigned int unused_mask;
1347		1295
1348	switch (ev.type)	1296	switch (ev.type)
…		…
1355		1303
1356	break;	1304	break;
1357		1305
1358	case KeyRelease:	1306	case KeyRelease:
1359	{	1307	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1308	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361	KeySym ks;	1309	KeySym keysym;
1362		1310
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1311	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1312	#endif
1365		1313
1366	#if ENABLE_FRILLS || ISO_14755	1314	#if ENABLE_FRILLS || ISO_14755
1367	// ISO 14755 support	1315	// ISO 14755 support
1368	if (iso14755buf)	1316	if (iso14755buf)
…		…
1373	# endif	1321	# endif
1374	# if ISO_14755	1322	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1323	// iso14755 part 5.2 handling: release time
1376	// first: controls	1324	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1325	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1326	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	|| (ks >= 0x61 && ks <= 0x7f)))	1327	|| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1328	{
1381	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1329	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382	commit_iso14755 ();	1330	commit_iso14755 ();
1383	return; // case-break;	1331	goto skip_switch;
1384	}	1332	}
1385		1333
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1334	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1335	if (i[0] == keysym)
1388	{	1336	{
1389	iso14755buf = ISO_14755_51 | i[1];	1337	iso14755buf = ISO_14755_51 | i[1];
1390	commit_iso14755 ();	1338	commit_iso14755 ();
1391	return; // case-break;	1339	goto skip_switch;
1392	}	1340	}
1393		1341
1394	scr_bell ();	1342	scr_bell ();
1395	# endif	1343	# endif
1396	iso14755buf = 0;	1344	iso14755buf = 0;
…		…
1416	iso14755buf = 0;	1364	iso14755buf = 0;
1417	}	1365	}
1418	#endif	1366	#endif
1419		1367
1420	if (ev.xany.window == vt	1368	if (ev.xany.window == vt
1421	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1369	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1422	break;	1370	break;
1423		1371
1424	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1372	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425	if (!(ev.xkey.state & ControlMask))	1373	if (!(ev.xkey.state & ControlMask))
1426	slip_wheel_ev.stop ();	1374	slip_wheel_ev.stop ();
1427	else if (ks == XK_Control_L || ks == XK_Control_R)	1375	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1428	mouse_slip_wheel_speed = 0;	1376	mouse_slip_wheel_speed = 0;
1429	#endif	1377	#endif
1430	break;	1378	break;
1431	}	1379	}
1432		1380
…		…
1438	button_release (ev.xbutton);	1386	button_release (ev.xbutton);
1439	break;	1387	break;
1440		1388
1441	case ClientMessage:	1389	case ClientMessage:
1442	if (ev.xclient.format == 32	1390	if (ev.xclient.format == 32
1443	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1391	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444	{	1392	{
		1393	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1394	{
		1395	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1396	{
1445	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1397	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1398	{
		1399	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446	destroy ();	1400	destroy ();
		1401	}
1447	#if ENABLE_EWMH	1402	#if ENABLE_EWMH
1448	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1403	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449	XSendEvent (disp, ev.xclient.window = display->root,	1404	XSendEvent (xdisp, ev.xclient.window = display->root,
1450	False, SubstructureRedirectMask | SubstructureNotifyMask,	1405	False, SubstructureRedirectMask | SubstructureNotifyMask,
1451	&ev);	1406	&ev);
		1407	#endif
		1408	}
		1409	}
		1410	#if ENABLE_XEMBED
		1411	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1412	{
		1413	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1414	focus_in ();
		1415	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1416	focus_out ();
		1417	}
1452	#endif	1418	#endif
1453	}	1419	}
1454	#if ENABLE_XEMBED
1455	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456	{
1457	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458	focus_in ();
1459	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460	focus_out ();
1461	}
1462	#endif
1463	#ifdef OFFIX_DND
1464	/* OffiX Dnd (drag 'n' drop) protocol */
1465	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466	&& (ev.xclient.data.l[0] == DndFile
1467	|| ev.xclient.data.l[0] == DndDir
1468	|| ev.xclient.data.l[0] == DndLink))
1469	{
1470	/* Get Dnd data */
1471	Atom ActualType;
1472	int ActualFormat;
1473	unsigned char *data;
1474	unsigned long Size, RemainingBytes;
1475
1476	XGetWindowProperty (disp, display->root,
1477	xa[XA_DNDSELECTION],
1478	0L, 1000000L,
1479	False, AnyPropertyType,
1480	&ActualType, &ActualFormat,
1481	&Size, &RemainingBytes,
1482	&data);
1483	set_string_property (XA_CUT_BUFFER0, data);
1484	XFree (data);
1485	selection_paste (display->root, XA_CUT_BUFFER0, true);
1486	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487	}
1488	#endif /* OFFIX_DND */
1489	break;	1420	break;
1490		1421
1491	case MappingNotify:	1422	case MappingNotify:
1492	XRefreshKeyboardMapping (&ev.xmapping);	1423	XRefreshKeyboardMapping (&ev.xmapping);
1493	break;	1424	break;
…		…
1526	break;	1457	break;
1527		1458
1528	case ConfigureNotify:	1459	case ConfigureNotify:
1529	if (ev.xconfigure.window == parent[0])	1460	if (ev.xconfigure.window == parent[0])
1530	{	1461	{
1531	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1462	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1532	;	1463	;
1533		1464
1534	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1465	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535	{	1466	{
1536	seen_resize = 1;	1467	seen_resize = 1;
1537	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1468	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538	}	1469	}
1539		1470
		1471	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1472
1540	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1473	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541	if (OPTION (Opt_transparent))	1474	if (OPTION (Opt_transparent))
1542	check_our_parents ();	1475	check_our_parents ();
1543	#endif	1476	#endif
1544	}	1477	}
1545	break;	1478	break;
1546		1479
1547	case PropertyNotify:	1480	case PropertyNotify:
		1481	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1482	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549	&& ev.xproperty.state == PropertyNewValue)	1483	&& ev.xproperty.state == PropertyNewValue)
1550	selection_property (ev.xproperty.window, ev.xproperty.atom);	1484	selection_property (ev.xproperty.window, ev.xproperty.atom);
1551		1485
1552	break;	1486	break;
1553		1487
1554	case SelectionClear:	1488	case SelectionClear:
1555	selection_clear ();	1489	selection_clear ();
…		…
1591	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1592	{	1526	{
1593	do	1527	do
1594	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1595	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1596	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1530	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1597		1531
1598	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1532	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1599		1533
1600	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1534	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1601	scr_expose (ev.xexpose.x, ev.xexpose.y,	1535	scr_expose (ev.xexpose.x, ev.xexpose.y,
1602	ev.xexpose.width, ev.xexpose.height, False);	1536	ev.xexpose.width, ev.xexpose.height, False);
1603		1537
1604	scr_refresh (refresh_type);	1538	want_refresh = 1;
1605	}	1539	}
1606	else	1540	else
1607	{	1541	{
1608	XEvent unused_event;	1542	XEvent unused_event;
1609		1543
1610	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1544	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1611	;	1545	;
1612	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1546	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1613	;	1547	;
1614		1548
1615	if (isScrollbarWindow (ev.xany.window))	1549	if (isScrollbarWindow (ev.xany.window))
1616	{	1550	{
1617	scrollBar.setIdle ();	1551	scrollBar.setIdle ();
1618	scrollbar_show (0);	1552	scrollbar_show (0);
1619	}	1553	}
1620	#ifdef MENUBAR
1621	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1622	menubar_expose ();
1623	#endif
1624		1554
1625	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1626	if (am_transparent && ev.xany.window == parent[0])	1556	if (am_transparent && ev.xany.window == parent[0])
1627	XClearWindow (disp, ev.xany.window);	1557	XClearWindow (xdisp, ev.xany.window);
1628	#endif	1558	#endif
1629	}	1559	}
1630	break;	1560	break;
1631		1561
1632	case MotionNotify:	1562	case MotionNotify:
1633	#ifdef POINTER_BLANK	1563	#ifdef POINTER_BLANK
1634	if (hidden_pointer)	1564	if (hidden_pointer)
1635	pointer_unblank ();	1565	pointer_unblank ();
1636	#endif	1566	#endif
1637	#if MENUBAR
1638	if (isMenuBarWindow (ev.xany.window))
1639	{
1640	menubar_control (ev.xbutton);
1641	break;
1642	}
1643	#endif
1644	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1567	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1645	break;	1568	break;
1646		1569
1647	if (ev.xany.window == vt)	1570	if (ev.xany.window == vt)
1648	{	1571	{
		1572	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1649	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1573	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650	; // nop	1574	; // nop
1651	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1575	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1652	{	1576	{
1653	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1577	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1654	;	1578	;
1655		1579
1656	XQueryPointer (disp, vt,	1580	XQueryPointer (xdisp, vt,
1657	&unused_root, &unused_child,	1581	&unused_root, &unused_child,
1658	&unused_root_x, &unused_root_y,	1582	&unused_root_x, &unused_root_y,
1659	&ev.xbutton.x, &ev.xbutton.y,	1583	&ev.xbutton.x, &ev.xbutton.y,
1660	&ev.xbutton.state);	1584	&ev.xbutton.state);
1661	#ifdef MOUSE_THRESHOLD	1585	#ifdef MOUSE_THRESHOLD
…		…
1725	#endif	1649	#endif
1726	}	1650	}
1727	}	1651	}
1728	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1652	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1729	{	1653	{
1730	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1654	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1731	MotionNotify, &ev))	1655	MotionNotify, &ev))
1732	;	1656	;
1733		1657
1734	XQueryPointer (disp, scrollBar.win,	1658	XQueryPointer (xdisp, scrollBar.win,
1735	&unused_root, &unused_child,	1659	&unused_root, &unused_child,
1736	&unused_root_x, &unused_root_y,	1660	&unused_root_x, &unused_root_y,
1737	&ev.xbutton.x, &ev.xbutton.y,	1661	&ev.xbutton.x, &ev.xbutton.y,
1738	&unused_mask);	1662	&unused_mask);
1739	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1663	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1740	scrollbar_size ());	1664	scrollbar_size ());
1741	scr_refresh (refresh_type);	1665	want_refresh = 1;
1742	refresh_limit = 0;	1666	refresh_limit = 0;
1743	scrollbar_show (1);	1667	scrollbar_show (1);
1744	}	1668	}
1745	break;	1669	break;
1746	}	1670	}
		1671
		1672	skip_switch: ;
		1673
		1674	#if defined(CURSOR_BLINK)
		1675	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1676	{
		1677	if (hidden_cursor)
		1678	{
		1679	hidden_cursor = 0;
		1680	want_refresh = 1;
		1681	}
		1682
		1683	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1684	}
		1685	#endif
		1686
		1687	#if defined(POINTER_BLANK)
		1688	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1689	{
		1690	if (ev.type == MotionNotify
		1691	|| ev.type == ButtonPress
		1692	|| ev.type == ButtonRelease)
		1693	if (hidden_pointer)
		1694	pointer_unblank ();
		1695
		1696	if (ev.type == KeyPress && hidden_pointer == 0)
		1697	pointer_blank ();
		1698	}
		1699	#endif
1747	}	1700	}
1748		1701
1749	void	1702	void
1750	rxvt_term::focus_in ()	1703	rxvt_term::focus_in ()
1751	{	1704	{
…		…
1763	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1764	}	1717	}
1765	#endif	1718	#endif
1766	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1767	if (OPTION (Opt_cursorBlink))	1720	if (OPTION (Opt_cursorBlink))
1768	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1721	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769	#endif	1722	#endif
1770	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1771	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1772	{	1725	{
1773	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1817		1770
1818	#if TRANSPARENT	1771	#if TRANSPARENT
1819	void	1772	void
1820	rxvt_term::rootwin_cb (XEvent &ev)	1773	rxvt_term::rootwin_cb (XEvent &ev)
1821	{	1774	{
1822	SET_R (this);	1775	make_current ();
1823	SET_LOCALE (locale);
1824		1776
1825	switch (ev.type)	1777	switch (ev.type)
1826	{	1778	{
1827	case PropertyNotify:	1779	case PropertyNotify:
1828	/*	1780	/*
…		…
1855	/*	1807	/*
1856	* VT window processing of button press	1808	* VT window processing of button press
1857	*/	1809	*/
1858	if (ev.window == vt)	1810	if (ev.window == vt)
1859	{	1811	{
		1812	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1813	return;
		1814
1860	#if ISO_14755	1815	#if ISO_14755
1861	// 5.4	1816	// 5.4
1862	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1817	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1863	{	1818	{
1864	iso14755_54 (ev.x, ev.y);	1819	iso14755_54 (ev.x, ev.y);
…		…
1906	else	1861	else
1907	{	1862	{
1908	if (ev.button != MEvent.button)	1863	if (ev.button != MEvent.button)
1909	MEvent.clicks = 0;	1864	MEvent.clicks = 0;
1910		1865
1911	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1912	switch (ev.button)	1866	switch (ev.button)
1913	{	1867	{
1914	case Button1:	1868	case Button1:
1915	/* allow meta + click to select rectangular areas */	1869	/* allow meta + click to select rectangular areas */
1916	/* should be done in screen.C */	1870	/* should be done in screen.C */
1917	#if ENABLE_FRILLS	1871	#if ENABLE_FRILLS
1918	selection.rect = !!(ev.state & ModMetaMask);	1872	selection.rect = !!(ev.state & ModMetaMask);
1919	#else	1873	#else
1920	selection.rect = false;	1874	selection.rect = false;
1921	#endif	1875	#endif
1922		1876
1923	/* allow shift+left click to extend selection */	1877	/* allow shift+left click to extend selection */
1924	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1878	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1925	{	1879	{
1926	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1927	selection_rotate (ev.x, ev.y);	1881	selection_rotate (ev.x, ev.y);
1928	else	1882	else
1929	selection_extend (ev.x, ev.y, 1);	1883	selection_extend (ev.x, ev.y, 1);
1930	}	1884	}
1931	else	1885	else
1932	{	1886	{
1933	if (MEvent.button == Button1 && clickintime)	1887	if (MEvent.button == Button1 && clickintime)
1934	MEvent.clicks++;	1888	MEvent.clicks++;
1935	else	1889	else
1936	MEvent.clicks = 1;	1890	MEvent.clicks = 1;
1937		1891
1938	selection_click (MEvent.clicks, ev.x, ev.y);	1892	selection_click (MEvent.clicks, ev.x, ev.y);
1939	}	1893	}
1940		1894
1941	MEvent.button = Button1;	1895	MEvent.button = Button1;
1942	break;	1896	break;
1943		1897
1944	case Button3:	1898	case Button3:
1945	if (MEvent.button == Button3 && clickintime)	1899	if (MEvent.button == Button3 && clickintime)
1946	selection_rotate (ev.x, ev.y);	1900	selection_rotate (ev.x, ev.y);
1947	else	1901	else
1948	selection_extend (ev.x, ev.y, 1);	1902	selection_extend (ev.x, ev.y, 1);
1949		1903
1950	MEvent.button = Button3;	1904	MEvent.button = Button3;
1951	break;	1905	break;
1952	}	1906	}
1953	}	1907	}
1954		1908
1955	MEvent.time = ev.time;	1909	MEvent.time = ev.time;
1956	return;	1910	return;
1957	}	1911	}
1958		1912
…		…
2097	}	2051	}
2098	}	2052	}
2099		2053
2100	return;	2054	return;
2101	}	2055	}
2102
2103	#if MENUBAR
2104	/*
2105	* Menubar window processing of button press
2106	*/
2107	if (isMenuBarWindow (ev.window))
2108	menubar_control (ev);
2109	#endif
2110	}	2056	}
2111		2057
2112	void	2058	void
2113	rxvt_term::button_release (XButtonEvent &ev)	2059	rxvt_term::button_release (XButtonEvent &ev)
2114	{	2060	{
…		…
2120		2066
2121	if (scrollbar_isUpDn ())	2067	if (scrollbar_isUpDn ())
2122	{	2068	{
2123	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2124	scrollbar_show (0);	2070	scrollbar_show (0);
2125	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2126	refresh_type &= ~SMOOTH_REFRESH;
2127	#endif
2128	}	2071	}
2129		2072
2130	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2131	if (sel_scroll_ev.active)	2074	if (sel_scroll_ev.active)
2132	sel_scroll_ev.stop();	2075	sel_scroll_ev.stop();
2133	#endif	2076	#endif
2134		2077
2135	if (ev.window == vt)	2078	if (ev.window == vt)
2136	{	2079	{
		2080	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2081	return;
		2082
2137	#if ISO_14755	2083	#if ISO_14755
2138	// 5.4	2084	// 5.4
2139	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2140	return;	2086	return;
2141	#endif	2087	#endif
		2088
2142	if (reportmode)	2089	if (reportmode)
2143	{	2090	{
2144	/* mouse report from vt window */	2091	/* mouse report from vt window */
2145	/* don't report release of wheel "buttons" */	2092	/* don't report release of wheel "buttons" */
2146	if (ev.button >= 4)	2093	if (ev.button >= 4)
…		…
2170	if (priv_modes & PrivMode_mouse_report	2117	if (priv_modes & PrivMode_mouse_report
2171	&& bypass_keystate	2118	&& bypass_keystate
2172	&& ev.button == Button1 && MEvent.clicks <= 1)	2119	&& ev.button == Button1 && MEvent.clicks <= 1)
2173	selection_extend (ev.x, ev.y, 0);	2120	selection_extend (ev.x, ev.y, 0);
2174		2121
2175	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176	return;
2177
2178	switch (ev.button)	2122	switch (ev.button)
2179	{	2123	{
2180	case Button1:	2124	case Button1:
2181	case Button3:	2125	case Button3:
2182	selection_make (ev.time);	2126	selection_make (ev.time);
2183	break;	2127	break;
		2128
2184	case Button2:	2129	case Button2:
2185	selection_request (ev.time, ev.x, ev.y);	2130	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2131	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2186	break;	2132	break;
		2133
2187	#ifdef MOUSE_WHEEL	2134	#ifdef MOUSE_WHEEL
2188	case Button4:	2135	case Button4:
2189	case Button5:	2136	case Button5:
2190	{	2137	{
2191	int i;	2138	int i;
…		…
2213	slip_wheel_ev.start ();	2160	slip_wheel_ev.start ();
2214	}	2161	}
2215	else	2162	else
2216	{	2163	{
2217	# endif	2164	# endif
2218	# ifdef JUMP_MOUSE_WHEEL
2219	scr_page (v, i);	2165	scr_page (v, i);
2220	scr_refresh (SMOOTH_REFRESH);
2221	scrollbar_show (1);	2166	scrollbar_show (1);
2222	# else
2223	while (i--)
2224	{
2225	scr_page (v, 1);
2226	scr_refresh (SMOOTH_REFRESH);
2227	scrollbar_show (1);
2228	}
2229	# endif
2230	# ifdef MOUSE_SLIP_WHEELING	2167	# ifdef MOUSE_SLIP_WHEELING
2231	}	2168	}
2232	#endif	2169	# endif
2233	}	2170	}
2234	break;	2171	break;
2235	#endif	2172	#endif
2236	}	2173	}
2237	}	2174	}
2238	#ifdef MENUBAR
2239	else if (isMenuBarWindow (ev.window))
2240	menubar_control (ev);
2241	#endif
2242	}	2175	}
2243		2176
2244	#ifdef TRANSPARENT	2177	#ifdef TRANSPARENT
2245	#if TINTING	2178	#if TINTING
2246	/* taken from aterm-0.4.2 */	2179	/* taken from aterm-0.4.2 */
2247		2180
2248	typedef uint32_t RUINT32T;	2181	typedef uint32_t RUINT32T;
2249		2182
2250	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2183	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2251	{	2184	{
2252	int sh_r, sh_g, sh_b;	2185	int sh_r, sh_g, sh_b;
2253	RUINT32T mask_r, mask_g, mask_b;	2186	RUINT32T mask_r, mask_g, mask_b;
2254	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2187	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2255	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2188	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2256	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2189	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2257	int i;	2190	int i;
2258		2191
2259	Visual *visual = display->visual;	2192	Visual *visual = term->visual;
2260		2193
2261	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2194	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2262		2195
2263	/* for convenience */	2196	/* for convenience */
2264	mask_r = visual->red_mask;	2197	mask_r = visual->red_mask;
…		…
2485	Atom atype;	2418	Atom atype;
2486	unsigned char *prop = NULL;	2419	unsigned char *prop = NULL;
2487	Window root, oldp, *list;	2420	Window root, oldp, *list;
2488	Pixmap rootpixmap = None;	2421	Pixmap rootpixmap = None;
2489	XWindowAttributes wattr, wrootattr;	2422	XWindowAttributes wattr, wrootattr;
2490	dDisp;
2491		2423
2492	pchanged = 0;	2424	pchanged = 0;
2493		2425
2494	if (!OPTION (Opt_transparent))	2426	if (!OPTION (Opt_transparent))
2495	return pchanged; /* Don't try any more */	2427	return pchanged; /* Don't try any more */
2496		2428
2497	XGetWindowAttributes (disp, display->root, &wrootattr);	2429	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2498	rootdepth = wrootattr.depth;	2430	rootdepth = wrootattr.depth;
2499		2431
2500	XGetWindowAttributes (disp, parent[0], &wattr);	2432	XGetWindowAttributes (xdisp, parent[0], &wattr);
2501		2433
2502	if (rootdepth != wattr.depth)	2434	if (rootdepth != wattr.depth)
2503	{	2435	{
2504	if (am_transparent)	2436	if (am_transparent)
2505	{	2437	{
2506	pchanged = 1;	2438	pchanged = 1;
2507	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2439	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2508	am_transparent = am_pixmap_trans = 0;	2440	am_transparent = am_pixmap_trans = 0;
2509	}	2441	}
2510		2442
2511	return pchanged; /* Don't try any more */	2443	return pchanged; /* Don't try any more */
2512	}	2444	}
2513		2445
2514	/* Get all X ops out of the queue so that our information is up-to-date. */	2446	/* Get all X ops out of the queue so that our information is up-to-date. */
2515	XSync (disp, False);	2447	XSync (xdisp, False);
2516		2448
2517	/*	2449	/*
2518	* Make the frame window set by the window manager have	2450	* Make the frame window set by the window manager have
2519	* the root background. Some window managers put multiple nested frame	2451	* the root background. Some window managers put multiple nested frame
2520	* windows for each client, so we have to take care about that.	2452	* windows for each client, so we have to take care about that.
2521	*/	2453	*/
2522	i = (xa[XA_XROOTPMAP_ID]	2454	i = (xa[XA_XROOTPMAP_ID]
2523	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2455	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2524	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2456	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525	&nitems, &bytes_after, &prop) == Success);	2457	&nitems, &bytes_after, &prop) == Success);
2526		2458
2527	if (!i || prop == NULL)	2459	if (!i || prop == NULL)
2528	i = (xa[XA_ESETROOT_PMAP_ID]	2460	i = (xa[XA_ESETROOT_PMAP_ID]
2529	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2461	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2530	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2531	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2532		2464
2533	if (!i || prop == NULL	2465	if (!i || prop == NULL
2534	#if TINTING	2466	#if TINTING
…		…
2553	Window cr;	2485	Window cr;
2554	XImage *image;	2486	XImage *image;
2555	GC gc;	2487	GC gc;
2556	XGCValues gcvalue;	2488	XGCValues gcvalue;
2557		2489
2558	XTranslateCoordinates (disp, parent[0], display->root,	2490	XTranslateCoordinates (xdisp, parent[0], display->root,
2559	0, 0, &sx, &sy, &cr);	2491	0, 0, &sx, &sy, &cr);
2560	nw = (unsigned int)szHint.width;	2492	nw = (unsigned int)szHint.width;
2561	nh = (unsigned int)szHint.height;	2493	nh = (unsigned int)szHint.height;
2562	nx = ny = 0;	2494	nx = ny = 0;
2563		2495
…		…
2576	}	2508	}
2577		2509
2578	min_it (nw, (unsigned int) (wrootattr.width - sx));	2510	min_it (nw, (unsigned int) (wrootattr.width - sx));
2579	min_it (nh, (unsigned int) (wrootattr.height - sy));	2511	min_it (nh, (unsigned int) (wrootattr.height - sy));
2580		2512
2581	XSync (disp, False);	2513	XSync (xdisp, False);
2582	allowedxerror = -1;	2514	allowedxerror = -1;
2583	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2515	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2584		2516
2585	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2517	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2586	/* XXX: may need a delay here? */	2518	/* XXX: may need a delay here? */
2587	allowedxerror = 0;	2519	allowedxerror = 0;
2588		2520
…		…
2591	if (am_transparent && am_pixmap_trans)	2523	if (am_transparent && am_pixmap_trans)
2592	{	2524	{
2593	pchanged = 1;	2525	pchanged = 1;
2594	if (pixmap != None)	2526	if (pixmap != None)
2595	{	2527	{
2596	XFreePixmap (disp, pixmap);	2528	XFreePixmap (xdisp, pixmap);
2597	pixmap = None;	2529	pixmap = None;
2598	}	2530	}
2599	}	2531	}
2600		2532
2601	am_pixmap_trans = 0;	2533	am_pixmap_trans = 0;
2602	}	2534	}
2603	else	2535	else
2604	{	2536	{
2605	if (pixmap != None)	2537	if (pixmap != None)
2606	XFreePixmap (disp, pixmap);	2538	XFreePixmap (xdisp, pixmap);
2607		2539
2608	#if TINTING	2540	#if TINTING
2609	if (ISSET_PIXCOLOR (Color_tint))	2541	if (ISSET_PIXCOLOR (Color_tint))
2610	{	2542	{
2611	unsigned short rm, gm, bm;
2612	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2543	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2613		2544
		2545	rxvt_rgba c;
2614	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2546	pix_colors_focused [Color_tint].get (this, c);
2615		2547
2616	ShadeXImage (display, image, shade, rm, gm, bm);	2548	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2617	}	2549	}
2618	#endif	2550	#endif
2619		2551
2620	pixmap = XCreatePixmap (disp, vt,	2552	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2621	szHint.width, szHint.height, image->depth);
2622	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2553	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2623	XPutImage (disp, pixmap, gc, image, 0, 0,	2554	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2624	nx, ny, image->width, image->height);	2555	nx, ny, image->width, image->height);
2625	XFreeGC (disp, gc);	2556	XFreeGC (xdisp, gc);
2626	XDestroyImage (image);	2557	XDestroyImage (image);
2627	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2558	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2628	XClearWindow (disp, parent[0]);	2559	XClearWindow (xdisp, parent[0]);
2629		2560
2630	if (!am_transparent || !am_pixmap_trans)	2561	if (!am_transparent || !am_pixmap_trans)
2631	pchanged = 1;	2562	pchanged = 1;
2632		2563
2633	am_transparent = am_pixmap_trans = 1;	2564	am_transparent = am_pixmap_trans = 1;
2634	}	2565	}
2635	}	2566	}
2636		2567
2637	if (am_pixmap_trans)	2568	if (am_pixmap_trans)
2638	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2569	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2639	else	2570	else
2640	{	2571	{
2641	unsigned int n;	2572	unsigned int n;
2642	/*	2573	/*
2643	* InheritPixmap transparency	2574	* InheritPixmap transparency
2644	*/	2575	*/
2645	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2576	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2646	{	2577	{
2647	oldp = parent[i];	2578	oldp = parent[i];
2648	XQueryTree (disp, parent[i - 1], &root,	2579	XQueryTree (xdisp, parent[i - 1], &root,
2649	&parent[i], &list, &n);	2580	&parent[i], &list, &n);
2650	XFree (list);	2581	XFree (list);
2651		2582
2652	if (parent[i] == display->root)	2583	if (parent[i] == display->root)
2653	{	2584	{
…		…
2665		2596
2666	if (pchanged)	2597	if (pchanged)
2667	{	2598	{
2668	for (; n < (unsigned int)i; n++)	2599	for (; n < (unsigned int)i; n++)
2669	{	2600	{
2670	XGetWindowAttributes (disp, parent[n], &wattr);	2601	XGetWindowAttributes (xdisp, parent[n], &wattr);
2671	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2602	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2672	{	2603	{
2673	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2604	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2674	break;	2605	break;
2675	}	2606	}
2676	}	2607	}
2677	}	2608	}
2678		2609
2679	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2610	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2680	{	2611	{
2681	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2612	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2682	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2613	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2683	am_transparent = 0;	2614	am_transparent = 0;
2684	/* XXX: also turn off Opt_transparent? */	2615	/* XXX: also turn off Opt_transparent? */
2685	}	2616	}
2686	else	2617	else
2687	{	2618	{
2688	#if WAIT_FOR_WM
2689	/* wait (an arbitrary period) for the WM to do its thing
2690	* needed for fvwm2.2.2 (and before?) */
2691	sleep (1);
2692	#endif
2693	for (n = 0; n < (unsigned int)i; n++)	2619	for (n = 0; n < (unsigned int)i; n++)
2694	{	2620	{
2695	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2621	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2696	XClearWindow (disp, parent[n]);	2622	XClearWindow (xdisp, parent[n]);
2697	}	2623	}
2698		2624
2699	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2625	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2700	am_transparent = 1;	2626	am_transparent = 1;
2701	}	2627	}
2702		2628
2703	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2629	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2704	parent[i] = None;	2630	parent[i] = None;
2705	}	2631	}
2706		2632
2707	if (scrollBar.win)	2633	if (scrollBar.win)
2708	{	2634	{
2709	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2635	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2710	scrollBar.setIdle ();	2636	scrollBar.setIdle ();
2711	scrollbar_show (0);	2637	scrollbar_show (0);
2712	}	2638	}
2713		2639
2714	if (am_transparent)	2640	if (am_transparent)
…		…
2789	}	2715	}
2790		2716
2791	// scr_add_lines only works for nlines <= nrow - 1.	2717	// scr_add_lines only works for nlines <= nrow - 1.
2792	if (nlines >= nrow - 1)	2718	if (nlines >= nrow - 1)
2793	{	2719	{
		2720	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2794	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2721	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2795	scr_add_lines (buf, str - buf, nlines);	2722	scr_add_lines (buf, str - buf, nlines);
2796		2723
2797	nlines = 0;	2724	nlines = 0;
2798	str = buf;	2725	str = buf;
2799	eol = str + min (ncol, UBUFSIZ);	2726	eol = str + min (ncol, UBUFSIZ);
…		…
2814		2741
2815	seq_begin = cmdbuf_ptr;	2742	seq_begin = cmdbuf_ptr;
2816	ch = next_char ();	2743	ch = next_char ();
2817	}	2744	}
2818		2745
		2746	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2819	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2747	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2820	scr_add_lines (buf, str - buf, nlines);	2748	scr_add_lines (buf, str - buf, nlines);
2821		2749
2822	/*	2750	/*
2823	* If there have been a lot of new lines, then update the screen	2751	* If there have been a lot of new lines, then update the screen
2824	* What the heck I'll cheat and only refresh less than every page-full.	2752	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2830	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2758	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2831	refresh_limit++;	2759	refresh_limit++;
2832	else	2760	else
2833	{	2761	{
2834	flag = true;	2762	flag = true;
2835	scr_refresh (refresh_type);	2763	scr_refresh ();
2836	flush_ev.stop ();	2764	want_refresh = 1;
2837	}	2765	}
2838	}	2766	}
2839		2767
2840	}	2768	}
2841	else	2769	else
…		…
2858	return flag;	2786	return flag;
2859	}	2787	}
2860		2788
2861	// read the next character	2789	// read the next character
2862	wchar_t	2790	wchar_t
2863	rxvt_term::next_char ()	2791	rxvt_term::next_char () NOTHROW
2864	{	2792	{
2865	while (cmdbuf_ptr < cmdbuf_endp)	2793	while (cmdbuf_ptr < cmdbuf_endp)
2866	{	2794	{
2867	// assume 7-bit to be ascii ALWAYS	2795	// assume 7-bit to be ascii ALWAYS
2868	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2796	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2889	return NOCHAR;	2817	return NOCHAR;
2890	}	2818	}
2891		2819
2892	// read the next octet	2820	// read the next octet
2893	uint32_t	2821	uint32_t
2894	rxvt_term::next_octet ()	2822	rxvt_term::next_octet () NOTHROW
2895	{	2823	{
2896	return cmdbuf_ptr < cmdbuf_endp	2824	return cmdbuf_ptr < cmdbuf_endp
2897	? (unsigned char)*cmdbuf_ptr++	2825	? (unsigned char)*cmdbuf_ptr++
2898	: NOCHAR;	2826	: NOCHAR;
2899	}	2827	}
		2828
		2829	static class out_of_input out_of_input;
2900		2830
2901	/* rxvt_cmd_getc () - Return next input character */	2831	/* rxvt_cmd_getc () - Return next input character */
2902	/*	2832	/*
2903	* Return the next input character after first passing any keyboard input	2833	* Return the next input character after first passing any keyboard input
2904	* to the command.	2834	* to the command.
2905	*/	2835	*/
2906	wchar_t	2836	wchar_t
2907	rxvt_term::cmd_getc ()	2837	rxvt_term::cmd_getc () THROW ((class out_of_input))
2908	{	2838	{
2909	wchar_t c = next_char ();	2839	wchar_t c = next_char ();
2910		2840
2911	if (c == NOCHAR)	2841	if (c == NOCHAR)
2912	throw out_of_input;	2842	throw out_of_input;
2913		2843
2914	return c;	2844	return c;
2915	}	2845	}
2916		2846
2917	uint32_t	2847	uint32_t
2918	rxvt_term::cmd_get8 ()	2848	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2919	{	2849	{
2920	uint32_t c = next_octet ();	2850	uint32_t c = next_octet ();
2921		2851
2922	if (c == NOCHAR)	2852	if (c == NOCHAR)
2923	throw out_of_input;	2853	throw out_of_input;
…		…
3161	scr_charset_set (2, (unsigned int)cmd_getc ());	3091	scr_charset_set (2, (unsigned int)cmd_getc ());
3162	break;	3092	break;
3163	case '+':	3093	case '+':
3164	scr_charset_set (3, (unsigned int)cmd_getc ());	3094	scr_charset_set (3, (unsigned int)cmd_getc ());
3165	break;	3095	break;
3166	#if ENABLE_FRILLS	3096	#if !ENABLE_MINIMAL
3167	case '6':	3097	case '6':
3168	scr_backindex ();	3098	scr_backindex ();
3169	break;	3099	break;
3170	#endif	3100	#endif
3171	case '7':	3101	case '7':
3172	scr_cursor (SAVE);	3102	scr_cursor (SAVE);
3173	break;	3103	break;
3174	case '8':	3104	case '8':
3175	scr_cursor (RESTORE);	3105	scr_cursor (RESTORE);
3176	break;	3106	break;
3177	#if ENABLE_FRILLS	3107	#if !ENABLE_MINIMAL
3178	case '9':	3108	case '9':
3179	scr_forwardindex ();	3109	scr_forwardindex ();
3180	break;	3110	break;
3181	#endif	3111	#endif
3182	case '=':	3112	case '=':
…		…
3344	ndef = get_byte_array_bit (csi_defaults, i);	3274	ndef = get_byte_array_bit (csi_defaults, i);
3345	for (p = 0; p < nargs; p++)	3275	for (p = 0; p < nargs; p++)
3346	if (arg[p] == -1)	3276	if (arg[p] == -1)
3347	arg[p] = ndef;	3277	arg[p] = ndef;
3348		3278
3349	#ifdef DEBUG_CMD
3350	fprintf (stderr, "CSI ");
3351	for (p = 0; p < nargs; p++)
3352	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3353	fprintf (stderr, "%c\n", ch);
3354	#endif
3355
3356	/*	3279	/*
3357	* private mode handling	3280	* private mode handling
3358	*/	3281	*/
3359	if (priv)	3282	if (priv)
3360	{	3283	{
3361	switch (priv)	3284	switch (priv)
3362	{	3285	{
3363	case '>':	3286	case '>':
3364	if (ch == CSI_DA) /* secondary device attributes */	3287	if (ch == CSI_DA) /* secondary device attributes */
3365	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3288	{
		3289	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3290	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3291	//
		3292	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3293	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3294	// that we do not support xterm mouse reporting (should be 95 when we do).
		3295	//
		3296	tt_printf ("\033[>%d;94;0c", 'U');
		3297	}
3366	break;	3298	break;
3367	case '?':	3299	case '?':
3368	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3300	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3369	process_terminal_mode (ch, priv, nargs, arg);	3301	process_terminal_mode (ch, priv, nargs, arg);
3370	break;	3302	break;
…		…
3573	break;	3505	break;
3574	case CSI_75:	3506	case CSI_75:
3575	scr_cursor (RESTORE);	3507	scr_cursor (RESTORE);
3576	break;	3508	break;
3577		3509
3578	#if ENABLE_FRILLS	3510	#if !ENABLE_MINIMAL
3579	case CSI_74:	3511	case CSI_74:
3580	process_window_ops (arg, nargs);	3512	process_window_ops (arg, nargs);
3581	break;	3513	break;
3582	#endif	3514	#endif
3583		3515
…		…
3590	break;	3522	break;
3591	}	3523	}
3592	}	3524	}
3593	/*}}} */	3525	/*}}} */
3594		3526
3595	#if ENABLE_FRILLS	3527	#if !ENABLE_MINIMAL
3596	/* ARGSUSED */	3528	/* ARGSUSED */
3597	void	3529	void
3598	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3530	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3599	{	3531	{
3600	int x, y;	3532	int x, y;
3601	XWindowAttributes wattr;	3533	XWindowAttributes wattr;
3602	Window wdummy;	3534	Window wdummy;
3603	dDisp;	3535
		3536	dLocal (Display *, xdisp);
3604		3537
3605	if (nargs == 0)	3538	if (nargs == 0)
3606	return;	3539	return;
3607		3540
3608	switch (args[0])	3541	switch (args[0])
3609	{	3542	{
3610	/*	3543	/*
3611	* commands	3544	* commands
3612	*/	3545	*/
3613	case 1: /* deiconify window */	3546	case 1: /* deiconify window */
3614	XMapWindow (disp, parent[0]);	3547	XMapWindow (xdisp, parent[0]);
3615	break;	3548	break;
3616	case 2: /* iconify window */	3549	case 2: /* iconify window */
3617	XIconifyWindow (disp, parent[0], display->screen);	3550	XIconifyWindow (xdisp, parent[0], display->screen);
3618	break;	3551	break;
3619	case 3: /* set position (pixels) */	3552	case 3: /* set position (pixels) */
3620	XMoveWindow (disp, parent[0], args[1], args[2]);	3553	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3621	break;	3554	break;
3622	case 4: /* set size (pixels) */	3555	case 4: /* set size (pixels) */
3623	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3556	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3624	break;	3557	break;
3625	case 5: /* raise window */	3558	case 5: /* raise window */
3626	XRaiseWindow (disp, parent[0]);	3559	XRaiseWindow (xdisp, parent[0]);
3627	break;	3560	break;
3628	case 6: /* lower window */	3561	case 6: /* lower window */
3629	XLowerWindow (disp, parent[0]);	3562	XLowerWindow (xdisp, parent[0]);
3630	break;	3563	break;
3631	case 7: /* refresh window */	3564	case 7: /* refresh window */
3632	scr_touch (true);	3565	scr_touch (true);
3633	break;	3566	break;
3634	case 8: /* set size (chars) */	3567	case 8: /* set size (chars) */
…		…
3646		3579
3647	/*	3580	/*
3648	* reports - some output format copied from XTerm	3581	* reports - some output format copied from XTerm
3649	*/	3582	*/
3650	case 11: /* report window state */	3583	case 11: /* report window state */
3651	XGetWindowAttributes (disp, parent[0], &wattr);	3584	XGetWindowAttributes (xdisp, parent[0], &wattr);
3652	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3585	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3653	break;	3586	break;
3654	case 13: /* report window position */	3587	case 13: /* report window position */
3655	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3656	XTranslateCoordinates (disp, parent[0], wattr.root,	3589	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3657	-wattr.border_width, -wattr.border_width,	3590	-wattr.border_width, -wattr.border_width,
3658	&x, &y, &wdummy);	3591	&x, &y, &wdummy);
3659	tt_printf ("\033[3;%d;%dt", x, y);	3592	tt_printf ("\033[3;%d;%dt", x, y);
3660	break;	3593	break;
3661	case 14: /* report window size (pixels) */	3594	case 14: /* report window size (pixels) */
3662	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (xdisp, parent[0], &wattr);
3663	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3596	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3664	break;	3597	break;
3665	case 18: /* report text area size (chars) */	3598	case 18: /* report text area size (chars) */
3666	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3599	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3667	break;	3600	break;
…		…
3669	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3670	break;	3603	break;
3671	case 20: /* report icon label */	3604	case 20: /* report icon label */
3672	{	3605	{
3673	char *s;	3606	char *s;
3674	XGetIconName (disp, parent[0], &s);	3607	XGetIconName (xdisp, parent[0], &s);
3675	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3608	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3676	XFree (s);	3609	XFree (s);
3677	}	3610	}
3678	break;	3611	break;
3679	case 21: /* report window title */	3612	case 21: /* report window title */
3680	{	3613	{
3681	char *s;	3614	char *s;
3682	XFetchName (disp, parent[0], &s);	3615	XFetchName (xdisp, parent[0], &s);
3683	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3616	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3684	XFree (s);	3617	XFree (s);
3685	}	3618	}
3686	break;	3619	break;
3687	}	3620	}
…		…
3788	void	3721	void
3789	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3722	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3790	{	3723	{
3791	if (str[0] == '?' && !str[1])	3724	if (str[0] == '?' && !str[1])
3792	{	3725	{
3793	unsigned short r, g, b;	3726	rxvt_rgba c;
3794	pix_colors_focused[color].get (display, r, g, b);	3727	pix_colors_focused[color].get (this, c);
		3728
		3729	#if XFT
		3730	if (c.a != rxvt_rgba::MAX_CC)
		3731	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3732	else
		3733	#endif
3795	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3734	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3796	}	3735	}
3797	else	3736	else
3798	set_window_color (color, str);	3737	set_window_color (color, str);
3799	}	3738	}
3800		3739
…		…
3802	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3741	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3803	*/	3742	*/
3804	void	3743	void
3805	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3744	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3806	{	3745	{
3807	int changed = 0;
3808	int color;	3746	int color;
3809	char *buf, *name;	3747	char *buf, *name;
3810	bool query = str[0] == '?' && !str[1];	3748	bool query = str[0] == '?' && !str[1];
3811	int saveop = op;	3749	int saveop = op;
3812	dDisp;	3750
		3751	dLocal (Display *, xdisp);
3813		3752
3814	assert (str != NULL);	3753	assert (str != NULL);
3815	switch (op)	3754	switch (op)
3816	{	3755	{
3817	case XTerm_name:	3756	case XTerm_name:
…		…
3833	unsigned long bytes_after;	3772	unsigned long bytes_after;
3834	unsigned char *value = 0;	3773	unsigned char *value = 0;
3835	const char *str = "";	3774	const char *str = "";
3836		3775
3837	if (prop	3776	if (prop
3838	&& XGetWindowProperty (disp, parent[0],	3777	&& XGetWindowProperty (xdisp, parent[0],
3839	prop, 0, 1<<16, 0, AnyPropertyType,	3778	prop, 0, 1<<16, 0, AnyPropertyType,
3840	&actual_type, &actual_format,	3779	&actual_type, &actual_format,
3841	&nitems, &bytes_after, &value) == Success	3780	&nitems, &bytes_after, &value) == Success
3842	&& actual_type != None	3781	&& actual_type != None
3843	&& actual_format == 8)	3782	&& actual_format == 8)
3844	str = (const char *)(value);	3783	str = (const char *)(value);
3845		3784
3846	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3785	tt_printf ("\033]%d;%s%c", op, str, resp);
3847		3786
3848	XFree (value);	3787	XFree (value);
3849	}	3788	}
3850	else	3789	else
3851	{	3790	{
…		…
3855	{	3794	{
3856	*eq = 0;	3795	*eq = 0;
3857	set_utf8_property (display->atom (str), eq + 1);	3796	set_utf8_property (display->atom (str), eq + 1);
3858	}	3797	}
3859	else	3798	else
3860	XDeleteProperty (disp, parent[0],	3799	XDeleteProperty (xdisp, parent[0],
3861	display->atom (str));	3800	display->atom (str));
3862	}	3801	}
3863	break;	3802	break;
3864		3803
3865	case XTerm_Color:	3804	case XTerm_Color:
…		…
3867	{	3806	{
3868	if ((name = strchr (buf, ';')) == NULL)	3807	if ((name = strchr (buf, ';')) == NULL)
3869	break;	3808	break;
3870		3809
3871	*name++ = '\0';	3810	*name++ = '\0';
3872	color = atoi (buf);	3811	color = atoi (buf) + minCOLOR;
3873		3812
3874	if (color < 0 || color >= TOTAL_COLORS)	3813	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3875	break;	3814	break;
3876		3815
3877	if ((buf = strchr (name, ';')) != NULL)	3816	if ((buf = strchr (name, ';')) != NULL)
3878	*buf++ = '\0';	3817	*buf++ = '\0';
3879		3818
3880	if (name[0] == '?' && !name[1])	3819	process_color_seq (op, color, name, resp);
3881	{
3882	unsigned short r, g, b;
3883	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3884	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3885	}
3886	else
3887	set_window_color (color + minCOLOR, name);
3888	}	3820	}
3889	break;	3821	break;
3890	case XTerm_Color00:	3822	case XTerm_Color00:
3891	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3823	process_color_seq (op, Color_fg, str, resp);
3892	break;	3824	break;
3893	case XTerm_Color01:	3825	case XTerm_Color01:
3894	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3826	process_color_seq (op, Color_bg, str, resp);
3895	break;	3827	break;
3896	#ifndef NO_CURSORCOLOR	3828	#ifndef NO_CURSORCOLOR
3897	case XTerm_Color_cursor:	3829	case XTerm_Color_cursor:
3898	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3830	process_color_seq (op, Color_cursor, str, resp);
3899	break;	3831	break;
3900	#endif	3832	#endif
3901	case XTerm_Color_pointer_fg:	3833	case XTerm_Color_pointer_fg:
3902	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3834	process_color_seq (op, Color_pointer_fg, str, resp);
3903	break;	3835	break;
3904	case XTerm_Color_pointer_bg:	3836	case XTerm_Color_pointer_bg:
3905	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3837	process_color_seq (op, Color_pointer_bg, str, resp);
3906	break;	3838	break;
3907	#ifndef NO_BOLD_UNDERLINE_REVERSE	3839	#ifndef NO_BOLD_UNDERLINE_REVERSE
3908	case XTerm_Color_BD:
3909	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3910	break;
3911	case XTerm_Color_UL:
3912	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3913	break;
3914	case XTerm_Color_RV:	3840	case XTerm_Color_RV:
3915	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3841	process_color_seq (op, Color_RV, str, resp);
		3842	break;
		3843	case Rxvt_Color_BD:
		3844	case URxvt_Color_BD:
		3845	process_color_seq (op, Color_BD, str, resp);
		3846	break;
		3847	case Rxvt_Color_UL:
		3848	case URxvt_Color_UL:
		3849	process_color_seq (op, Color_UL, str, resp);
3916	break;	3850	break;
3917	case URxvt_Color_IT:	3851	case URxvt_Color_IT:
3918	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3852	process_color_seq (op, Color_IT, str, resp);
3919	break;	3853	break;
3920	#endif	3854	#endif
3921	#if TRANSPARENT && TINTING	3855	#if TRANSPARENT && TINTING
3922	case URxvt_Color_tint:	3856	case URxvt_Color_tint:
3923	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3857	process_color_seq (op, Color_tint, str, resp);
3924	check_our_parents ();	3858	check_our_parents ();
3925	if (am_transparent)	3859	if (am_transparent)
3926	want_full_refresh = want_refresh = 1;	3860	want_full_refresh = want_refresh = 1;
3927	break;	3861	break;
3928	#endif	3862	#endif
3929		3863
3930	case XTerm_Pixmap:	3864	case Rxvt_Pixmap:
		3865	{
3931	if (*str != ';')	3866	if (*str != ';')
3932	{	3867	{
3933	#if XPM_BACKGROUND	3868	#if XPM_BACKGROUND
3934	scale_pixmap (""); /* reset to default scaling */	3869	scale_pixmap (""); /* reset to default scaling */
3935	set_bgPixmap (str); /* change pixmap */	3870	set_bgPixmap (str); /* change pixmap */
3936	#endif
3937	scr_touch (true);	3871	scr_touch (true);
		3872	#endif
3938	}	3873	}
		3874
		3875	int changed = 0;
		3876
3939	while ((str = strchr (str, ';')) != NULL)	3877	while ((str = strchr (str, ';')) != NULL)
3940	{	3878	{
3941	str++;	3879	str++;
3942	#if XPM_BACKGROUND	3880	#if XPM_BACKGROUND
3943	changed += scale_pixmap (str);	3881	changed += scale_pixmap (str);
3944	#endif	3882	#endif
3945	}	3883	}
3946		3884
3947	if (changed)	3885	if (changed)
3948	{	3886	{
3949	#ifdef XPM_BACKGROUND	3887	#ifdef XPM_BACKGROUND
3950	resize_pixmap ();	3888	resize_pixmap ();
3951	#endif
3952	scr_touch (true);	3889	scr_touch (true);
		3890	#endif
3953	}	3891	}
		3892	}
3954	break;	3893	break;
3955		3894
3956	case XTerm_restoreFG:	3895	case Rxvt_restoreFG:
3957	set_window_color (Color_fg, str);	3896	set_window_color (Color_fg, str);
3958	break;	3897	break;
3959	case XTerm_restoreBG:	3898	case Rxvt_restoreBG:
3960	set_window_color (Color_bg, str);	3899	set_window_color (Color_bg, str);
3961	break;	3900	break;
3962		3901
3963	case XTerm_logfile:	3902	case XTerm_logfile:
3964	// TODO, when secure mode?	3903	// TODO, when secure mode?
3965	break;	3904	break;
3966		3905
3967	#ifdef MENUBAR
3968	case URxvt_Menu:
3969	if (OPTION (Opt_insecure))
3970	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971	break;
3972	#endif
3973	#if 0	3906	#if 0
3974	case XTerm_dumpscreen: /* no error notices */	3907	case Rxvt_dumpscreen: /* no error notices */
3975	{	3908	{
3976	int fd;	3909	int fd;
3977	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3910	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3978	{	3911	{
3979	scr_dump (fd);	3912	scr_dump (fd);
…		…
4003	allocated.push_back ((void *)res);	3936	allocated.push_back ((void *)res);
4004	set_fonts ();	3937	set_fonts ();
4005	}	3938	}
4006	break;	3939	break;
4007		3940
4008	#if ENABLE_FRILLS	3941	case URxvt_version:
		3942	if (query)
		3943	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3944	op,
		3945	rs[Rs_name], VERSION[0], VERSION[2],
		3946	resp);
		3947	break;
		3948
		3949	#if !ENABLE_MINIMAL
4009	case URxvt_locale:	3950	case URxvt_locale:
4010	if (query)	3951	if (query)
4011	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3952	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4012	else	3953	else
4013	{	3954	{
4014	set_locale (str);	3955	set_locale (str);
4015	pty.set_utf8_mode (enc_utf8);	3956	pty->set_utf8_mode (enc_utf8);
4016	init_xlocale ();	3957	init_xlocale ();
4017	}	3958	}
4018	break;	3959	break;
4019		3960
4020	case URxvt_view_up:	3961	case URxvt_view_up:
…		…
4073	return state;	4014	return state;
4074	}	4015	}
4075		4016
4076	/* we're not using priv _yet_ */	4017	/* we're not using priv _yet_ */
4077	void	4018	void
4078	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4019	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4079	{	4020	{
4080	unsigned int i, j;	4021	unsigned int i, j;
4081	int state;	4022	int state;
4082		4023
4083	static const struct	4024	static const struct
…		…
4094	{ 5, PrivMode_rVideo },	4035	{ 5, PrivMode_rVideo },
4095	{ 6, PrivMode_relOrigin },	4036	{ 6, PrivMode_relOrigin },
4096	{ 7, PrivMode_Autowrap },	4037	{ 7, PrivMode_Autowrap },
4097	// 8, bi-directional support mode	4038	// 8, bi-directional support mode
4098	{ 9, PrivMode_MouseX10 },	4039	{ 9, PrivMode_MouseX10 },
4099	#ifdef menuBar_esc
4100	{ menuBar_esc, PrivMode_menuBar },
4101	#endif
4102	// 18, 19 printing-related	4040	// 18, 19 printing-related
4103	{ 25, PrivMode_VisibleCursor },	4041	{ 25, PrivMode_VisibleCursor },
4104	#ifdef scrollBar_esc	4042	#ifdef scrollBar_esc
4105	{ scrollBar_esc, PrivMode_scrollBar },	4043	{ scrollBar_esc, PrivMode_scrollBar },
4106	#endif	4044	#endif
…		…
4153	/* extra handling for values with state unkept */	4091	/* extra handling for values with state unkept */
4154	switch (arg[i])	4092	switch (arg[i])
4155	{	4093	{
4156	#if ENABLE_STYLES	4094	#if ENABLE_STYLES
4157	case 1021:	4095	case 1021:
4158	if (mode)	4096	set_option (Opt_intensityStyles, mode);
4159	SET_OPTION (Opt_intensityStyles);
4160	else
4161	CLR_OPTION (Opt_intensityStyles);
4162		4097
4163	scr_touch (true);	4098	scr_touch (true);
4164	break;	4099	break;
4165	#endif	4100	#endif
4166	case 1048: /* alternative cursor save */	4101	case 1048: /* alternative cursor save */
…		…
4188	case 3: /* 80/132 */	4123	case 3: /* 80/132 */
4189	if (priv_modes & PrivMode_132OK)	4124	if (priv_modes & PrivMode_132OK)
4190	set_widthheight (((state ? 132 : 80) * fwidth), height);	4125	set_widthheight (((state ? 132 : 80) * fwidth), height);
4191	break;	4126	break;
4192	case 4: /* smooth scrolling */	4127	case 4: /* smooth scrolling */
4193	if (!state)	4128	set_option (Opt_jumpScroll, !state);
4194	SET_OPTION (Opt_jumpScroll);
4195	else
4196	CLR_OPTION (Opt_jumpScroll);
4197	break;	4129	break;
4198	case 5: /* reverse video */	4130	case 5: /* reverse video */
4199	scr_rvideo_mode (state);	4131	scr_rvideo_mode (state);
4200	break;	4132	break;
4201	case 6: /* relative/absolute origins */	4133	case 6: /* relative/absolute origins */
…		…
4207	/* case 8: - auto repeat, can't do on a per window basis */	4139	/* case 8: - auto repeat, can't do on a per window basis */
4208	case 9: /* X10 mouse reporting */	4140	case 9: /* X10 mouse reporting */
4209	if (state) /* orthogonal */	4141	if (state) /* orthogonal */
4210	priv_modes &= ~PrivMode_MouseX11;	4142	priv_modes &= ~PrivMode_MouseX11;
4211	break;	4143	break;
4212	#ifdef menuBar_esc
4213	case menuBar_esc:
4214	#ifdef MENUBAR
4215	map_menuBar (state);
4216	#endif
4217	break;
4218	#endif
4219	#ifdef scrollBar_esc	4144	#ifdef scrollBar_esc
4220	case scrollBar_esc:	4145	case scrollBar_esc:
4221	if (scrollbar_mapping (state))	4146	if (scrollbar_mapping (state))
4222	{	4147	{
4223	resize_all_windows (0, 0, 0);	4148	resize_all_windows (0, 0, 0);
…		…
4242	#if 0	4167	#if 0
4243	case 1001:	4168	case 1001:
4244	break; /* X11 mouse highlighting */	4169	break; /* X11 mouse highlighting */
4245	#endif	4170	#endif
4246	case 1010: /* scroll to bottom on TTY output inhibit */	4171	case 1010: /* scroll to bottom on TTY output inhibit */
4247	if (!state)	4172	set_option (Opt_scrollTtyOutput, !state);
4248	SET_OPTION (Opt_scrollTtyOutput);
4249	else
4250	CLR_OPTION (Opt_scrollTtyOutput);
4251	break;	4173	break;
4252	case 1011: /* scroll to bottom on key press */	4174	case 1011: /* scroll to bottom on key press */
4253	if (state)	4175	set_option (Opt_scrollTtyKeypress, state);
4254	SET_OPTION (Opt_scrollTtyKeypress);
4255	else
4256	CLR_OPTION (Opt_scrollTtyKeypress);
4257	break;	4176	break;
4258	case 1047: /* secondary screen w/ clearing last */	4177	case 1047: /* secondary screen w/ clearing last */
4259	if (OPTION (Opt_secondaryScreen))	4178	if (OPTION (Opt_secondaryScreen))
4260	if (current_screen != PRIMARY)	4179	if (current_screen != PRIMARY)
4261	scr_erase_screen (2);	4180	scr_erase_screen (2);
…		…
4399	scr_color (Color_bg, Color_bg);	4318	scr_color (Color_bg, Color_bg);
4400	break;	4319	break;
4401		4320
4402	//case 50: // not variable spacing	4321	//case 50: // not variable spacing
4403		4322
4404	#if ENABLE_FRILLS	4323	#if !ENABLE_MINIMAL
4405	case 90:	4324	case 90:
4406	case 91: /* set bright fg color */	4325	case 91: /* set bright fg color */
4407	case 92:	4326	case 92:
4408	case 93:	4327	case 93:
4409	case 94:	4328	case 94:
…		…
4471	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4390	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472		4391
4473	void	4392	void
4474	rxvt_term::tt_write (const char *data, unsigned int len)	4393	rxvt_term::tt_write (const char *data, unsigned int len)
4475	{	4394	{
4476	if (pty.pty < 0)	4395	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4477	return;	4396	return;
4478		4397
		4398	if (pty->pty < 0)
		4399	return;
		4400
4479	if (v_buflen == 0)	4401	if (v_buflen == 0)
4480	{	4402	{
4481	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4403	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4482		4404
4483	if ((unsigned int)written == len)	4405	if ((unsigned int)written == len)
4484	return;	4406	return;
4485		4407
4486	data += written;	4408	data += written;
…		…
4495	pty_ev.set (EVENT_READ | EVENT_WRITE);	4417	pty_ev.set (EVENT_READ | EVENT_WRITE);
4496	}	4418	}
4497		4419
4498	void rxvt_term::pty_write ()	4420	void rxvt_term::pty_write ()
4499	{	4421	{
4500	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4422	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4501		4423
4502	if (written > 0)	4424	if (written > 0)
4503	{	4425	{
4504	v_buflen -= written;	4426	v_buflen -= written;
4505		4427

Diff Legend

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