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.245 by root, Fri Jan 6 18:33:30 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)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	143	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	144	return;
149		145
150	for (;;)	146	for (;;)
151	{	147	{
152	const line_t &l = ROW(y - view_start);	148	const line_t &l = ROW(y + view_start);
153		149
154	text_t t = l.t[x];	150	text_t t = l.t[x];
155		151
156	if (t != NOCHAR || !x)	152	if (t != NOCHAR || !x)
157	{	153	{
…		…
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	*
…		…
443	scr_move_to (0, 1);	447	scr_move_to (0, 1);
444	return;	448	return;
445	}	449	}
446	else if (keysym == XK_End)	450	else if (keysym == XK_End)
447	{	451	{
448	scr_move_to (1, 0);	452	scr_move_to (1, 1);
449	return;	453	return;
450	}	454	}
451	}	455	}
452	#endif	456	#endif
453	}	457	}
…		…
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);
…		…
867	#endif	871	#endif
868	/* nil */ ;	872	/* nil */ ;
869	}	873	}
870	}	874	}
871		875
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	876	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	877	return;
874		878
875	if (len <= 0)	879	if (len <= 0)
876	return; /* not mapped */	880	return; /* not mapped */
877		881
…		…
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
…		…
972		1040
973	if (want_refresh)	1041	if (want_refresh)
974	{	1042	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	1043	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	1044	{
977	int row = -view_start;	1045	int row = view_start;
		1046	int end_row = row + nrow;
978		1047
979	while (row > -nsaved && ROW (row - 1).is_longer ())	1048	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	1049	--row;
981		1050
982	while (row < -view_start + nrow)	1051	do
983	{	1052	{
984	int start_row = row;	1053	int start_row = row;
985	line_t *l;	1054	line_t *l;
986		1055
987	do	1056	do
988	{	1057	{
989	l = &ROW (row);	1058	l = &ROW (row++);
990		1059
991	if (!(l->f & LINE_FILTERED))	1060	if (!(l->f & LINE_FILTERED))
992	{	1061	{
993	// line not filtered, mark it as filtered	1062	// line not filtered, mark it as filtered
994	l->f |= LINE_FILTERED;	1063	l->f |= LINE_FILTERED;
995	while (l->is_longer ())	1064	while (l->is_longer ())
996	{	1065	{
997	l = &ROW (++row);	1066	l = &ROW (row++);
998	l->f |= LINE_FILTERED;	1067	l->f |= LINE_FILTERED;
999	}	1068	}
1000		1069
1001	// and filter it	1070	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	1071	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		1072
1004	break;	1073	break;
1005	}	1074	}
1006	}	1075	}
1007	while (l->is_longer ());	1076	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	1077	}
		1078	while (row < end_row);
1011		1079	}
1012	}
1013		1080
1014	scr_refresh (refresh_type);	1081	scr_refresh ();
1015	scrollbar_show (1);	1082	scrollbar_show (1);
1016	#ifdef USE_XIM	1083	#ifdef USE_XIM
1017	IMSendSpot ();	1084	IMSendSpot ();
1018	#endif	1085	#endif
1019	}	1086	}
…		…
1022	}	1089	}
1023		1090
1024	void	1091	void
1025	rxvt_term::check_cb (check_watcher &w)	1092	rxvt_term::check_cb (check_watcher &w)
1026	{	1093	{
1027	SET_R (this);	1094	make_current ();
1028	SET_LOCALE (locale);
1029		1095
1030	display->flush ();	1096	display->flush ();
1031		1097
1032	if (want_refresh && !flush_ev.active)	1098	if (want_refresh && !flush_ev.active)
1033	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
1034	}	1100	}
1035		1101
1036	void	1102	void
1037	rxvt_term::flush_cb (time_watcher &w)	1103	rxvt_term::flush_cb (time_watcher &w)
1038	{	1104	{
1039	SET_R (this);	1105	make_current ();
1040	SET_LOCALE (locale);
1041		1106
1042	refresh_limit = 1;	1107	refresh_limit = 1;
1043	refresh_count = 0;	1108	refresh_count = 0;
1044	flush ();	1109	flush ();
1045	}	1110	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1114	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1115	{
1051	hidden_cursor = !hidden_cursor;	1116	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1117	want_refresh = 1;
1053		1118
1054	w.start (w.at + BLINK_INTERVAL);	1119	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1120	}
1056	#endif	1121	#endif
1057		1122
1058	#ifdef TEXT_BLINK	1123	#ifdef TEXT_BLINK
1059	void	1124	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1138	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1139	{
1075	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1140	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1141	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1142	{
1078	refresh_type |= SMOOTH_REFRESH;
1079	want_refresh = 1;	1143	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1144	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1145	}
1082	}	1146	}
1083	#endif	1147	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1151	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1152	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1153	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1154	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1155	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type |= SMOOTH_REFRESH;
1093	want_refresh = 1;	1156	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1157	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1158	}
1096	}	1159	}
1097	#endif	1160	#endif
…		…
1102	{	1165	{
1103	if (mouse_slip_wheel_speed == 0	1166	if (mouse_slip_wheel_speed == 0
1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1167	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1168	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1169	{
1107	if (view_start == nsaved ||	1170	if (view_start == top_row || view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1171	mouse_slip_wheel_speed = 0;
1110		1172
1111	refresh_type |= SMOOTH_REFRESH;
1112	want_refresh = 1;	1173	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1175	}
1115	}	1176	}
1116	#endif	1177	#endif
1117		1178
1118	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1119	static struct event_handler	1180	static struct event_handler
1120	{	1181	{
1121	check_watcher cw_yield;	1182	check_watcher yield_ev;
1122		1183
1123	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1124	{	1185	{
1125	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
1126	w.stop ();	1194	w.stop ();
1127	}	1195	}
1128		1196
1129	event_handler ()	1197	event_handler ()
1130	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1131	{	1199	{
1132	}	1200	}
1133	} event_handler;	1201	} event_handler;
1134	#endif	1202	#endif
1135		1203
…		…
1146		1214
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1215	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1216	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1217	cmdbuf_endp = cmdbuf_ptr + n;
1150		1218
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1219	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1220
1153	if (r > 0)	1221	if (r > 0)
1154	{	1222	{
1155	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1156	return true;	1224	return true;
1157	}	1225	}
1158	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159	{	1227	{
1160	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1161	if (display->is_local)	1229	if (display->is_local)
1162	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1163	#endif	1231	#endif
1164	}	1232	}
1165	else	1233	else
1166	{	1234	{
1167	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1174	}	1242	}
1175		1243
1176	void	1244	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1245	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1246	{
1179	SET_R (this);	1247	make_current ();
1180	SET_LOCALE (locale);
1181		1248
1182	if (revents & EVENT_READ)	1249	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1250	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1251	while (pty_fill ())
1185	if (cmd_parse ())	1252	if (cmd_parse ())
…		…
1190	}	1257	}
1191		1258
1192	void	1259	void
1193	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1194	{	1261	{
1195	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1196	recolour_cursor ();	1263	recolour_cursor ();
1197		1264
1198	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1199	hidden_pointer = 0;	1266	hidden_pointer = 0;
1200		1267
…		…
1208	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1209	{	1276	{
1210	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1211	return;	1278	return;
1212		1279
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1214	XFlush (display->display);	1281	XFlush (dpy);
1215		1282
1216	hidden_pointer = 1;	1283	hidden_pointer = 1;
1217	}	1284	}
1218		1285
1219	void	1286	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1287	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1288	{
1222	SET_R (this);	1289	make_current ();
1223	SET_LOCALE (locale);
1224		1290
1225	pointer_blank ();	1291	pointer_blank ();
1226	}	1292	}
1227	#endif	1293	#endif
1228		1294
…		…
1293	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1294	(32 + x + 1),	1360	(32 + x + 1),
1295	(32 + y + 1));	1361	(32 + y + 1));
1296	}	1362	}
1297		1363
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 */	1364	/*{{{ process an X event */
1309	void	1365	void
1310	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1311	{	1367	{
1312	dDisp;	1368	make_current ();
1313		1369
1314	SET_R (this);	1370	dLocal (Display *, dpy);
1315	SET_LOCALE (locale);
1316		1371
1317	#if defined(CURSOR_BLINK)	1372	if (ev.xany.window == vt
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1319	{	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320	if (hidden_cursor)	1375	return;
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325		1376
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1377	// 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;	1378	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1379	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1380	unsigned int unused_mask;
1347		1381
1348	switch (ev.type)	1382	switch (ev.type)
1349	{	1383	{
1350	case KeyPress:	1384	case KeyPress:
1351	#if ISO_14755	1385	key_press (ev.xkey);
1352	if (!(iso14755buf & ISO_14755_52))
1353	#endif
1354	lookup_key (ev.xkey);
1355
1356	break;	1386	break;
1357		1387
1358	case KeyRelease:	1388	case KeyRelease:
1359	{	1389	key_release (ev.xkey);
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361	KeySym ks;
1362
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif
1365
1366	#if ENABLE_FRILLS || ISO_14755
1367	// ISO 14755 support
1368	if (iso14755buf)
1369	if (iso14755buf & ISO_14755_52)
1370	{
1371	# if ENABLE_OVERLAY
1372	scr_overlay_off ();
1373	# endif
1374	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time
1376	// first: controls
1377	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)
1379	|| (ks >= 0x61 && ks <= 0x7f)))
1380	{
1381	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382	commit_iso14755 ();
1383	return; // case-break;
1384	}
1385
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)
1388	{
1389	iso14755buf = ISO_14755_51 | i[1];
1390	commit_iso14755 ();
1391	return; // case-break;
1392	}
1393
1394	scr_bell ();
1395	# endif
1396	iso14755buf = 0;
1397	break;
1398	}
1399	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400	{
1401	# if ENABLE_OVERLAY
1402	scr_overlay_off ();
1403	# endif
1404	if (iso14755buf & ISO_14755_51)
1405	commit_iso14755 ();
1406	#if ISO_14755
1407	else if (iso14755buf & ISO_14755_STARTED)
1408	{
1409	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413	}
1414	# endif
1415	else
1416	iso14755buf = 0;
1417	}
1418	#endif
1419
1420	if (ev.xany.window == vt
1421	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422	break;
1423
1424	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425	if (!(ev.xkey.state & ControlMask))
1426	slip_wheel_ev.stop ();
1427	else if (ks == XK_Control_L || ks == XK_Control_R)
1428	mouse_slip_wheel_speed = 0;
1429	#endif
1430	break;	1390	break;
1431	}
1432		1391
1433	case ButtonPress:	1392	case ButtonPress:
1434	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1435	break;	1394	break;
1436		1395
…		…
1438	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1439	break;	1398	break;
1440		1399
1441	case ClientMessage:	1400	case ClientMessage:
1442	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1443	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444	{	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	{
1445	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)))
1446	destroy ();	1411	destroy ();
		1412	}
1447	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1448	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])
1449	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1450	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1451	&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	}
1452	#endif	1429	#endif
1453	}	1430	}
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;	1431	break;
1490		1432
1491	case MappingNotify:	1433	case MappingNotify:
1492	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1493	break;	1435	break;
…		…
1526	break;	1468	break;
1527		1469
1528	case ConfigureNotify:	1470	case ConfigureNotify:
1529	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1530	{	1472	{
1531	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532	;	1474	;
1533		1475
1534	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535	{	1477	{
1536	seen_resize = 1;	1478	seen_resize = 1;
1537	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538	}	1480	}
1539		1481
		1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1483
1540	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541	if (OPTION (Opt_transparent))	1485	if (OPTION (Opt_transparent))
1542	check_our_parents ();	1486	check_our_parents ();
1543	#endif	1487	#endif
1544	}	1488	}
1545	break;	1489	break;
1546		1490
1547	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1550	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1551		1496
1552	break;	1497	break;
1553		1498
1554	case SelectionClear:	1499	case SelectionClear:
1555	selection_clear ();	1500	selection_clear ();
…		…
1560	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1505	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561	break;	1506	break;
1562		1507
1563	case SelectionRequest:	1508	case SelectionRequest:
1564	selection_send (ev.xselectionrequest);	1509	selection_send (ev.xselectionrequest);
		1510	break;
		1511
		1512	case MapNotify:
		1513	mapped = 1;
		1514	#ifdef TEXT_BLINK
		1515	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1516	#endif
		1517	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565	break;	1518	break;
1566		1519
1567	case UnmapNotify:	1520	case UnmapNotify:
1568	mapped = 0;	1521	mapped = 0;
1569	#ifdef TEXT_BLINK	1522	#ifdef TEXT_BLINK
1570	text_blink_ev.stop ();	1523	text_blink_ev.stop ();
1571	#endif	1524	#endif
1572	break;	1525	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574	case MapNotify:
1575	mapped = 1;
1576	#ifdef TEXT_BLINK
1577	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578	#endif
1579	break;	1526	break;
1580		1527
1581	#ifdef TRANSPARENT	1528	#ifdef TRANSPARENT
1582	case ReparentNotify:	1529	case ReparentNotify:
1583	rootwin_cb (ev);	1530	rootwin_cb (ev);
…		…
1589	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1590	{	1537	{
1591	do	1538	do
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1594	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1595		1542
1596	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597		1544
1598	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1599	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1600	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1601		1548
1602	scr_refresh (refresh_type);	1549	want_refresh = 1;
1603	}	1550	}
1604	else	1551	else
1605	{	1552	{
1606	XEvent unused_event;	1553	XEvent unused_event;
1607		1554
1608	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1609	;	1556	;
1610	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1611	;	1558	;
1612		1559
1613	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1614	{	1561	{
1615	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1616	scrollbar_show (0);	1563	scrollbar_show (0);
1617	}	1564	}
1618	#ifdef MENUBAR
1619	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620	menubar_expose ();
1621	#endif
1622		1565
1623	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1624	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1625	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1626	#endif	1569	#endif
1627	}	1570	}
1628	break;	1571	break;
1629		1572
1630	case MotionNotify:	1573	case MotionNotify:
1631	#ifdef POINTER_BLANK	1574	#ifdef POINTER_BLANK
1632	if (hidden_pointer)	1575	if (hidden_pointer)
1633	pointer_unblank ();	1576	pointer_unblank ();
1634	#endif	1577	#endif
1635	#if MENUBAR
1636	if (isMenuBarWindow (ev.xany.window))
1637	{
1638	menubar_control (ev.xbutton);
1639	break;
1640	}
1641	#endif
1642	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1578	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643	break;	1579	break;
1644		1580
1645	if (ev.xany.window == vt)	1581	if (ev.xany.window == vt)
1646	{	1582	{
		1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648	; // nop	1585	; // nop
1649	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650	{	1587	{
1651	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1652	;	1589	;
1653		1590
1654	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1655	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1656	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1657	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1658	&ev.xbutton.state);	1595	&ev.xbutton.state);
1659	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1723	#endif	1660	#endif
1724	}	1661	}
1725	}	1662	}
1726	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727	{	1664	{
1728	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1729	MotionNotify, &ev))	1666	MotionNotify, &ev))
1730	;	1667	;
1731		1668
1732	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1733	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1734	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1735	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1736	&unused_mask);	1673	&unused_mask);
1737	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738	scrollbar_size ());	1675	scrollbar_size ());
1739	scr_refresh (refresh_type);	1676	want_refresh = 1;
1740	refresh_limit = 0;	1677	refresh_limit = 0;
1741	scrollbar_show (1);	1678	scrollbar_show (1);
1742	}	1679	}
1743	break;	1680	break;
1744	}	1681	}
		1682
		1683	#if defined(CURSOR_BLINK)
		1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1685	{
		1686	if (hidden_cursor)
		1687	{
		1688	hidden_cursor = 0;
		1689	want_refresh = 1;
		1690	}
		1691
		1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1693	}
		1694	#endif
		1695
		1696	#if defined(POINTER_BLANK)
		1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1698	{
		1699	if (ev.type == MotionNotify
		1700	|| ev.type == ButtonPress
		1701	|| ev.type == ButtonRelease)
		1702	if (hidden_pointer)
		1703	pointer_unblank ();
		1704
		1705	if (ev.type == KeyPress && hidden_pointer == 0)
		1706	pointer_blank ();
		1707	}
		1708	#endif
1745	}	1709	}
1746		1710
1747	void	1711	void
1748	rxvt_term::focus_in ()	1712	rxvt_term::focus_in ()
1749	{	1713	{
…		…
1755	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756		1720
1757	#if USE_XIM	1721	#if USE_XIM
1758	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1759	{	1723	{
1760	IMSetStatusPosition ();	1724	IMSetPosition ();
1761	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1762	}	1726	}
1763	#endif	1727	#endif
1764	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1765	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1766	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767	#endif	1731	#endif
1768	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1769	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1770	{	1734	{
1771	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1815		1779
1816	#if TRANSPARENT	1780	#if TRANSPARENT
1817	void	1781	void
1818	rxvt_term::rootwin_cb (XEvent &ev)	1782	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1783	{
1820	SET_R (this);	1784	make_current ();
1821	SET_LOCALE (locale);
1822		1785
1823	switch (ev.type)	1786	switch (ev.type)
1824	{	1787	{
1825	case PropertyNotify:	1788	case PropertyNotify:
1826	/*	1789	/*
…		…
1853	/*	1816	/*
1854	* VT window processing of button press	1817	* VT window processing of button press
1855	*/	1818	*/
1856	if (ev.window == vt)	1819	if (ev.window == vt)
1857	{	1820	{
		1821	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1822	return;
		1823
1858	#if ISO_14755	1824	#if ISO_14755
1859	// 5.4	1825	// 5.4
1860	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1826	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861	{	1827	{
1862	iso14755_54 (ev.x, ev.y);	1828	iso14755_54 (ev.x, ev.y);
…		…
1904	else	1870	else
1905	{	1871	{
1906	if (ev.button != MEvent.button)	1872	if (ev.button != MEvent.button)
1907	MEvent.clicks = 0;	1873	MEvent.clicks = 0;
1908		1874
1909	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910	switch (ev.button)	1875	switch (ev.button)
1911	{	1876	{
1912	case Button1:	1877	case Button1:
1913	/* allow meta + click to select rectangular areas */	1878	/* allow meta + click to select rectangular areas */
1914	/* should be done in screen.C */	1879	/* should be done in screen.C */
1915	#if ENABLE_FRILLS	1880	#if ENABLE_FRILLS
1916	selection.rect = !!(ev.state & ModMetaMask);	1881	selection.rect = !!(ev.state & ModMetaMask);
1917	#else	1882	#else
1918	selection.rect = false;	1883	selection.rect = false;
1919	#endif	1884	#endif
1920		1885
1921	/* allow shift+left click to extend selection */	1886	/* allow shift+left click to extend selection */
1922	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923	{	1888	{
1924	if (MEvent.button == Button1 && clickintime)	1889	if (MEvent.button == Button1 && clickintime)
1925	selection_rotate (ev.x, ev.y);	1890	selection_rotate (ev.x, ev.y);
1926	else	1891	else
1927	selection_extend (ev.x, ev.y, 1);	1892	selection_extend (ev.x, ev.y, 1);
1928	}	1893	}
1929	else	1894	else
1930	{	1895	{
1931	if (MEvent.button == Button1 && clickintime)	1896	if (MEvent.button == Button1 && clickintime)
1932	MEvent.clicks++;	1897	MEvent.clicks++;
1933	else	1898	else
1934	MEvent.clicks = 1;	1899	MEvent.clicks = 1;
1935		1900
1936	selection_click (MEvent.clicks, ev.x, ev.y);	1901	selection_click (MEvent.clicks, ev.x, ev.y);
1937	}	1902	}
1938		1903
1939	MEvent.button = Button1;	1904	MEvent.button = Button1;
1940	break;	1905	break;
1941		1906
1942	case Button3:	1907	case Button3:
1943	if (MEvent.button == Button3 && clickintime)	1908	if (MEvent.button == Button3 && clickintime)
1944	selection_rotate (ev.x, ev.y);	1909	selection_rotate (ev.x, ev.y);
1945	else	1910	else
1946	selection_extend (ev.x, ev.y, 1);	1911	selection_extend (ev.x, ev.y, 1);
1947		1912
1948	MEvent.button = Button3;	1913	MEvent.button = Button3;
1949	break;	1914	break;
1950	}	1915	}
1951	}	1916	}
1952		1917
1953	MEvent.time = ev.time;	1918	MEvent.time = ev.time;
1954	return;	1919	return;
1955	}	1920	}
1956		1921
…		…
2095	}	2060	}
2096	}	2061	}
2097		2062
2098	return;	2063	return;
2099	}	2064	}
2100
2101	#if MENUBAR
2102	/*
2103	* Menubar window processing of button press
2104	*/
2105	if (isMenuBarWindow (ev.window))
2106	menubar_control (ev);
2107	#endif
2108	}	2065	}
2109		2066
2110	void	2067	void
2111	rxvt_term::button_release (XButtonEvent &ev)	2068	rxvt_term::button_release (XButtonEvent &ev)
2112	{	2069	{
…		…
2118		2075
2119	if (scrollbar_isUpDn ())	2076	if (scrollbar_isUpDn ())
2120	{	2077	{
2121	scrollBar.setIdle ();	2078	scrollBar.setIdle ();
2122	scrollbar_show (0);	2079	scrollbar_show (0);
2123	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124	refresh_type &= ~SMOOTH_REFRESH;
2125	#endif
2126	}	2080	}
2127		2081
2128	#ifdef SELECTION_SCROLLING	2082	#ifdef SELECTION_SCROLLING
2129	if (sel_scroll_ev.active)	2083	if (sel_scroll_ev.active)
2130	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2131	#endif	2085	#endif
2132		2086
2133	if (ev.window == vt)	2087	if (ev.window == vt)
2134	{	2088	{
		2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2090	return;
		2091
2135	#if ISO_14755	2092	#if ISO_14755
2136	// 5.4	2093	// 5.4
2137	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2094	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138	return;	2095	return;
2139	#endif	2096	#endif
		2097
2140	if (reportmode)	2098	if (reportmode)
2141	{	2099	{
2142	/* mouse report from vt window */	2100	/* mouse report from vt window */
2143	/* don't report release of wheel "buttons" */	2101	/* don't report release of wheel "buttons" */
2144	if (ev.button >= 4)	2102	if (ev.button >= 4)
…		…
2168	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2169	&& bypass_keystate	2127	&& bypass_keystate
2170	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2171	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2172		2130
2173	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174	return;
2175
2176	switch (ev.button)	2131	switch (ev.button)
2177	{	2132	{
2178	case Button1:	2133	case Button1:
2179	case Button3:	2134	case Button3:
2180	selection_make (ev.time);	2135	selection_make (ev.time);
2181	break;	2136	break;
		2137
2182	case Button2:	2138	case Button2:
2183	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);
2184	break;	2141	break;
		2142
2185	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2186	case Button4:	2144	case Button4:
2187	case Button5:	2145	case Button5:
2188	{	2146	{
2189	int i;	2147	int i;
…		…
2211	slip_wheel_ev.start ();	2169	slip_wheel_ev.start ();
2212	}	2170	}
2213	else	2171	else
2214	{	2172	{
2215	# endif	2173	# endif
2216	# ifdef JUMP_MOUSE_WHEEL
2217	scr_page (v, i);	2174	scr_page (v, i);
2218	scr_refresh (SMOOTH_REFRESH);
2219	scrollbar_show (1);	2175	scrollbar_show (1);
2220	# else
2221	while (i--)
2222	{
2223	scr_page (v, 1);
2224	scr_refresh (SMOOTH_REFRESH);
2225	scrollbar_show (1);
2226	}
2227	# endif
2228	# ifdef MOUSE_SLIP_WHEELING	2176	# ifdef MOUSE_SLIP_WHEELING
2229	}	2177	}
2230	#endif	2178	# endif
2231	}	2179	}
2232	break;	2180	break;
2233	#endif	2181	#endif
2234	}	2182	}
2235	}	2183	}
2236	#ifdef MENUBAR
2237	else if (isMenuBarWindow (ev.window))
2238	menubar_control (ev);
2239	#endif
2240	}	2184	}
2241		2185
2242	#ifdef TRANSPARENT	2186	#ifdef TRANSPARENT
2243	#if TINTING	2187	#if TINTING
2244	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2245		2189
2246	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2247		2191
2248	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)
2249	{	2193	{
2250	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2251	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2252	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2196	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255	int i;	2199	int i;
2256		2200
2257	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2258		2202
2259	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260		2204
2261	/* for convenience */	2205	/* for convenience */
2262	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2483	Atom atype;	2427	Atom atype;
2484	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2485	Window root, oldp, *list;	2429	Window root, oldp, *list;
2486	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2487	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2488	dDisp;
2489		2432
2490	pchanged = 0;	2433	pchanged = 0;
2491		2434
2492	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2493	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2494		2437
2495	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2496	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2497		2440
2498	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2499		2442
2500	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2501	{	2444	{
2502	if (am_transparent)	2445	if (am_transparent)
2503	{	2446	{
2504	pchanged = 1;	2447	pchanged = 1;
2505	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2506	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2507	}	2450	}
2508		2451
2509	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2510	}	2453	}
2511		2454
2512	/* 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. */
2513	XSync (disp, False);	2456	XSync (dpy, False);
2514		2457
2515	/*	2458	/*
2516	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2517	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2518	* 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.
2519	*/	2462	*/
2520	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2521	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2522	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2524		2467
2525	if (!i || prop == NULL)	2468	if (!i || prop == NULL)
2526	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2527	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2528	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2530		2473
2531	if (!i || prop == NULL	2474	if (!i || prop == NULL
2532	#if TINTING	2475	#if TINTING
2533	|| !rs[Rs_color + Color_tint]	2476	|| !ISSET_PIXCOLOR (Color_tint)
2534	#endif	2477	#endif
2535	)	2478	)
2536	have_pixmap = 0;	2479	have_pixmap = 0;
2537	else	2480	else
2538	{	2481	{
…		…
2551	Window cr;	2494	Window cr;
2552	XImage *image;	2495	XImage *image;
2553	GC gc;	2496	GC gc;
2554	XGCValues gcvalue;	2497	XGCValues gcvalue;
2555		2498
2556	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2557	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2558	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2559	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2560	nx = ny = 0;	2503	nx = ny = 0;
2561		2504
…		…
2574	}	2517	}
2575		2518
2576	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2577	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2578		2521
2579	XSync (disp, False);	2522	XSync (dpy, False);
2580	allowedxerror = -1;	2523	allowedxerror = -1;
2581	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582		2525
2583	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2584	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2585	allowedxerror = 0;	2528	allowedxerror = 0;
2586		2529
…		…
2589	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2590	{	2533	{
2591	pchanged = 1;	2534	pchanged = 1;
2592	if (pixmap != None)	2535	if (pixmap != None)
2593	{	2536	{
2594	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2595	pixmap = None;	2538	pixmap = None;
2596	}	2539	}
2597	}	2540	}
2598		2541
2599	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2600	}	2543	}
2601	else	2544	else
2602	{	2545	{
2603	if (pixmap != None)	2546	if (pixmap != None)
2604	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2605		2548
2606	#if TINTING	2549	#if TINTING
2607	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2608	{	2551	{
2609	unsigned short rm, gm, bm;
2610	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611		2553
		2554	rgba c;
2612	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2613		2556
2614	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2615	}	2558	}
2616	#endif	2559	#endif
2617		2560
2618	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2619	szHint.width, szHint.height, image->depth);
2620	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2621	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2622	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2623	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2624	XDestroyImage (image);	2566	XDestroyImage (image);
2625	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2626	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2627		2569
2628	if (!am_transparent || !am_pixmap_trans)	2570	if (!am_transparent || !am_pixmap_trans)
2629	pchanged = 1;	2571	pchanged = 1;
2630		2572
2631	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2632	}	2574	}
2633	}	2575	}
2634		2576
2635	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2636	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2637	else	2579	else
2638	{	2580	{
2639	unsigned int n;	2581	unsigned int n;
2640	/*	2582	/*
2641	* InheritPixmap transparency	2583	* InheritPixmap transparency
2642	*/	2584	*/
2643	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644	{	2586	{
2645	oldp = parent[i];	2587	oldp = parent[i];
2646	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2647	&parent[i], &list, &n);
2648	XFree (list);	2589	XFree (list);
2649		2590
2650	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2651	{	2592	{
2652	if (oldp != None)	2593	if (oldp != None)
…		…
2660	}	2601	}
2661		2602
2662	n = 0;	2603	n = 0;
2663		2604
2664	if (pchanged)	2605	if (pchanged)
2665	{
2666	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2667	{	2607	{
2668	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2669	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670	{	2611	{
2671	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672	break;	2613	break;
2673	}	2614	}
2674	}	2615	}
2675	}
2676		2616
2677	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2678	{	2618	{
2679	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2680	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2681	am_transparent = 0;	2621	am_transparent = 0;
2682	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2683	}	2623	}
2684	else	2624	else
2685	{	2625	{
2686	#if WAIT_FOR_WM
2687	/* wait (an arbitrary period) for the WM to do its thing
2688	* needed for fvwm2.2.2 (and before?) */
2689	sleep (1);
2690	#endif
2691	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2692	{	2627	{
2693	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2694	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2695	}	2630	}
2696		2631
2697	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2698	am_transparent = 1;	2633	am_transparent = 1;
2699	}	2634	}
2700		2635
2701	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702	parent[i] = None;	2637	parent[i] = None;
2703	}	2638	}
2704		2639
2705	if (scrollBar.win)	2640	if (scrollBar.win)
2706	{	2641	{
2707	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2708	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2709	scrollbar_show (0);	2644	scrollbar_show (0);
2710	}	2645	}
2711		2646
2712	if (am_transparent)	2647	if (am_transparent)
…		…
2787	}	2722	}
2788		2723
2789	// scr_add_lines only works for nlines <= nrow - 1.	2724	// scr_add_lines only works for nlines <= nrow - 1.
2790	if (nlines >= nrow - 1)	2725	if (nlines >= nrow - 1)
2791	{	2726	{
		2727	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792	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))))
2793	scr_add_lines (buf, str - buf, nlines);	2729	scr_add_lines (buf, str - buf, nlines);
2794		2730
2795	nlines = 0;	2731	nlines = 0;
2796	str = buf;	2732	str = buf;
2797	eol = str + min (ncol, UBUFSIZ);	2733	eol = str + min (ncol, UBUFSIZ);
…		…
2812		2748
2813	seq_begin = cmdbuf_ptr;	2749	seq_begin = cmdbuf_ptr;
2814	ch = next_char ();	2750	ch = next_char ();
2815	}	2751	}
2816		2752
		2753	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817	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))))
2818	scr_add_lines (buf, str - buf, nlines);	2755	scr_add_lines (buf, str - buf, nlines);
2819		2756
2820	/*	2757	/*
2821	* 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
2822	* 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.
…		…
2828	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829	refresh_limit++;	2766	refresh_limit++;
2830	else	2767	else
2831	{	2768	{
2832	flag = true;	2769	flag = true;
2833	scr_refresh (refresh_type);	2770	scr_refresh ();
2834	flush_ev.stop ();	2771	want_refresh = 1;
2835	}	2772	}
2836	}	2773	}
2837		2774
2838	}	2775	}
2839	else	2776	else
…		…
2856	return flag;	2793	return flag;
2857	}	2794	}
2858		2795
2859	// read the next character	2796	// read the next character
2860	wchar_t	2797	wchar_t
2861	rxvt_term::next_char ()	2798	rxvt_term::next_char () NOTHROW
2862	{	2799	{
2863	while (cmdbuf_ptr < cmdbuf_endp)	2800	while (cmdbuf_ptr < cmdbuf_endp)
2864	{	2801	{
2865	// assume 7-bit to be ascii ALWAYS	2802	// assume 7-bit to be ascii ALWAYS
2866	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2803	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2887	return NOCHAR;	2824	return NOCHAR;
2888	}	2825	}
2889		2826
2890	// read the next octet	2827	// read the next octet
2891	uint32_t	2828	uint32_t
2892	rxvt_term::next_octet ()	2829	rxvt_term::next_octet () NOTHROW
2893	{	2830	{
2894	return cmdbuf_ptr < cmdbuf_endp	2831	return cmdbuf_ptr < cmdbuf_endp
2895	? *cmdbuf_ptr++	2832	? (unsigned char)*cmdbuf_ptr++
2896	: NOCHAR;	2833	: NOCHAR;
2897	}	2834	}
		2835
		2836	static class out_of_input out_of_input;
2898		2837
2899	/* rxvt_cmd_getc () - Return next input character */	2838	/* rxvt_cmd_getc () - Return next input character */
2900	/*	2839	/*
2901	* Return the next input character after first passing any keyboard input	2840	* Return the next input character after first passing any keyboard input
2902	* to the command.	2841	* to the command.
2903	*/	2842	*/
2904	wchar_t	2843	wchar_t
2905	rxvt_term::cmd_getc ()	2844	rxvt_term::cmd_getc () THROW ((class out_of_input))
2906	{	2845	{
2907	wchar_t c = next_char ();	2846	wchar_t c = next_char ();
2908		2847
2909	if (c == NOCHAR)	2848	if (c == NOCHAR)
2910	throw out_of_input;	2849	throw out_of_input;
2911		2850
2912	return c;	2851	return c;
2913	}	2852	}
2914		2853
2915	uint32_t	2854	uint32_t
2916	rxvt_term::cmd_get8 ()	2855	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917	{	2856	{
2918	uint32_t c = next_octet ();	2857	uint32_t c = next_octet ();
2919		2858
2920	if (c == NOCHAR)	2859	if (c == NOCHAR)
2921	throw out_of_input;	2860	throw out_of_input;
…		…
3159	scr_charset_set (2, (unsigned int)cmd_getc ());	3098	scr_charset_set (2, (unsigned int)cmd_getc ());
3160	break;	3099	break;
3161	case '+':	3100	case '+':
3162	scr_charset_set (3, (unsigned int)cmd_getc ());	3101	scr_charset_set (3, (unsigned int)cmd_getc ());
3163	break;	3102	break;
3164	#if ENABLE_FRILLS	3103	#if !ENABLE_MINIMAL
3165	case '6':	3104	case '6':
3166	scr_backindex ();	3105	scr_backindex ();
3167	break;	3106	break;
3168	#endif	3107	#endif
3169	case '7':	3108	case '7':
3170	scr_cursor (SAVE);	3109	scr_cursor (SAVE);
3171	break;	3110	break;
3172	case '8':	3111	case '8':
3173	scr_cursor (RESTORE);	3112	scr_cursor (RESTORE);
3174	break;	3113	break;
3175	#if ENABLE_FRILLS	3114	#if !ENABLE_MINIMAL
3176	case '9':	3115	case '9':
3177	scr_forwardindex ();	3116	scr_forwardindex ();
3178	break;	3117	break;
3179	#endif	3118	#endif
3180	case '=':	3119	case '=':
…		…
3342	ndef = get_byte_array_bit (csi_defaults, i);	3281	ndef = get_byte_array_bit (csi_defaults, i);
3343	for (p = 0; p < nargs; p++)	3282	for (p = 0; p < nargs; p++)
3344	if (arg[p] == -1)	3283	if (arg[p] == -1)
3345	arg[p] = ndef;	3284	arg[p] = ndef;
3346		3285
3347	#ifdef DEBUG_CMD
3348	fprintf (stderr, "CSI ");
3349	for (p = 0; p < nargs; p++)
3350	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351	fprintf (stderr, "%c\n", ch);
3352	#endif
3353
3354	/*	3286	/*
3355	* private mode handling	3287	* private mode handling
3356	*/	3288	*/
3357	if (priv)	3289	if (priv)
3358	{	3290	{
3359	switch (priv)	3291	switch (priv)
3360	{	3292	{
3361	case '>':	3293	case '>':
3362	if (ch == CSI_DA) /* secondary device attributes */	3294	if (ch == CSI_DA) /* secondary device attributes */
3363	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	}
3364	break;	3305	break;
3365	case '?':	3306	case '?':
3366	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3307	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367	process_terminal_mode (ch, priv, nargs, arg);	3308	process_terminal_mode (ch, priv, nargs, arg);
3368	break;	3309	break;
…		…
3571	break;	3512	break;
3572	case CSI_75:	3513	case CSI_75:
3573	scr_cursor (RESTORE);	3514	scr_cursor (RESTORE);
3574	break;	3515	break;
3575		3516
3576	#if ENABLE_FRILLS	3517	#if !ENABLE_MINIMAL
3577	case CSI_74:	3518	case CSI_74:
3578	process_window_ops (arg, nargs);	3519	process_window_ops (arg, nargs);
3579	break;	3520	break;
3580	#endif	3521	#endif
3581		3522
…		…
3588	break;	3529	break;
3589	}	3530	}
3590	}	3531	}
3591	/*}}} */	3532	/*}}} */
3592		3533
3593	#if ENABLE_FRILLS	3534	#if !ENABLE_MINIMAL
3594	/* ARGSUSED */	3535	/* ARGSUSED */
3595	void	3536	void
3596	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3537	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597	{	3538	{
3598	int x, y;	3539	int x, y;
3599	XWindowAttributes wattr;	3540	XWindowAttributes wattr;
3600	Window wdummy;	3541	Window wdummy;
3601	dDisp;	3542
		3543	dLocal (Display *, dpy);
3602		3544
3603	if (nargs == 0)	3545	if (nargs == 0)
3604	return;	3546	return;
3605		3547
3606	switch (args[0])	3548	switch (args[0])
3607	{	3549	{
3608	/*	3550	/*
3609	* commands	3551	* commands
3610	*/	3552	*/
3611	case 1: /* deiconify window */	3553	case 1: /* deiconify window */
3612	XMapWindow (disp, parent[0]);	3554	XMapWindow (dpy, parent[0]);
3613	break;	3555	break;
3614	case 2: /* iconify window */	3556	case 2: /* iconify window */
3615	XIconifyWindow (disp, parent[0], display->screen);	3557	XIconifyWindow (dpy, parent[0], display->screen);
3616	break;	3558	break;
3617	case 3: /* set position (pixels) */	3559	case 3: /* set position (pixels) */
3618	XMoveWindow (disp, parent[0], args[1], args[2]);	3560	XMoveWindow (dpy, parent[0], args[1], args[2]);
3619	break;	3561	break;
3620	case 4: /* set size (pixels) */	3562	case 4: /* set size (pixels) */
3621	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3563	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622	break;	3564	break;
3623	case 5: /* raise window */	3565	case 5: /* raise window */
3624	XRaiseWindow (disp, parent[0]);	3566	XRaiseWindow (dpy, parent[0]);
3625	break;	3567	break;
3626	case 6: /* lower window */	3568	case 6: /* lower window */
3627	XLowerWindow (disp, parent[0]);	3569	XLowerWindow (dpy, parent[0]);
3628	break;	3570	break;
3629	case 7: /* refresh window */	3571	case 7: /* refresh window */
3630	scr_touch (true);	3572	scr_touch (true);
3631	break;	3573	break;
3632	case 8: /* set size (chars) */	3574	case 8: /* set size (chars) */
…		…
3639	if (args[0] >= 24) /* set height (chars) */	3581	if (args[0] >= 24) /* set height (chars) */
3640	set_widthheight ((unsigned int)width,	3582	set_widthheight ((unsigned int)width,
3641	(unsigned int) (args[1] * fheight));	3583	(unsigned int) (args[1] * fheight));
3642	break;	3584	break;
3643		3585
3644
3645	/*	3586	/*
3646	* reports - some output format copied from XTerm	3587	* reports - some output format copied from XTerm
3647	*/	3588	*/
3648	case 11: /* report window state */	3589	case 11: /* report window state */
3649	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (dpy, parent[0], &wattr);
3650	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3591	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651	break;	3592	break;
3652	case 13: /* report window position */	3593	case 13: /* report window position */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3594	XGetWindowAttributes (dpy, parent[0], &wattr);
3654	XTranslateCoordinates (disp, parent[0], wattr.root,	3595	XTranslateCoordinates (dpy, parent[0], wattr.root,
3655	-wattr.border_width, -wattr.border_width,	3596	-wattr.border_width, -wattr.border_width,
3656	&x, &y, &wdummy);	3597	&x, &y, &wdummy);
3657	tt_printf ("\033[3;%d;%dt", x, y);	3598	tt_printf ("\033[3;%d;%dt", x, y);
3658	break;	3599	break;
3659	case 14: /* report window size (pixels) */	3600	case 14: /* report window size (pixels) */
3660	XGetWindowAttributes (disp, parent[0], &wattr);	3601	XGetWindowAttributes (dpy, parent[0], &wattr);
3661	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3602	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662	break;	3603	break;
3663	case 18: /* report text area size (chars) */	3604	case 18: /* report text area size (chars) */
3664	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665	break;	3606	break;
…		…
3667	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3608	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668	break;	3609	break;
3669	case 20: /* report icon label */	3610	case 20: /* report icon label */
3670	{	3611	{
3671	char *s;	3612	char *s;
3672	XGetIconName (disp, parent[0], &s);	3613	XGetIconName (dpy, parent[0], &s);
3673	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 */
3674	XFree (s);	3615	XFree (s);
3675	}	3616	}
3676	break;	3617	break;
3677	case 21: /* report window title */	3618	case 21: /* report window title */
3678	{	3619	{
3679	char *s;	3620	char *s;
3680	XFetchName (disp, parent[0], &s);	3621	XFetchName (dpy, parent[0], &s);
3681	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 */
3682	XFree (s);	3623	XFree (s);
3683	}	3624	}
3684	break;	3625	break;
3685	}	3626	}
…		…
3786	void	3727	void
3787	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)
3788	{	3729	{
3789	if (str[0] == '?' && !str[1])	3730	if (str[0] == '?' && !str[1])
3790	{	3731	{
3791	unsigned short r, g, b;	3732	rgba c;
3792	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
3793	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);
3794	}	3741	}
3795	else	3742	else
3796	set_window_color (color, str);	3743	set_window_color (color, str);
3797	}	3744	}
3798		3745
…		…
3800	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3747	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801	*/	3748	*/
3802	void	3749	void
3803	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)
3804	{	3751	{
3805	int changed = 0;
3806	int color;	3752	int color;
3807	char *buf, *name;	3753	char *buf, *name;
3808	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3809	int saveop = op;	3755	int saveop = op;
3810	dDisp;	3756
		3757	dLocal (Display *, dpy);
3811		3758
3812	assert (str != NULL);	3759	assert (str != NULL);
3813	switch (op)	3760	switch (op)
3814	{	3761	{
3815	case XTerm_name:	3762	case XTerm_name:
…		…
3831	unsigned long bytes_after;	3778	unsigned long bytes_after;
3832	unsigned char *value = 0;	3779	unsigned char *value = 0;
3833	const char *str = "";	3780	const char *str = "";
3834		3781
3835	if (prop	3782	if (prop
3836	&& XGetWindowProperty (disp, parent[0],	3783	&& XGetWindowProperty (dpy, parent[0],
3837	prop, 0, 1<<16, 0, AnyPropertyType,	3784	prop, 0, 1<<16, 0, AnyPropertyType,
3838	&actual_type, &actual_format,	3785	&actual_type, &actual_format,
3839	&nitems, &bytes_after, &value) == Success	3786	&nitems, &bytes_after, &value) == Success
3840	&& actual_type != None	3787	&& actual_type != None
3841	&& actual_format == 8)	3788	&& actual_format == 8)
3842	str = (const char *)(value);	3789	str = (const char *)(value);
3843		3790
3844	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3791	tt_printf ("\033]%d;%s%c", op, str, resp);
3845		3792
3846	XFree (value);	3793	XFree (value);
3847	}	3794	}
3848	else	3795	else
3849	{	3796	{
…		…
3853	{	3800	{
3854	*eq = 0;	3801	*eq = 0;
3855	set_utf8_property (display->atom (str), eq + 1);	3802	set_utf8_property (display->atom (str), eq + 1);
3856	}	3803	}
3857	else	3804	else
3858	XDeleteProperty (disp, parent[0],	3805	XDeleteProperty (dpy, parent[0],
3859	display->atom (str));	3806	display->atom (str));
3860	}	3807	}
3861	break;	3808	break;
3862		3809
3863	case XTerm_Color:	3810	case XTerm_Color:
…		…
3865	{	3812	{
3866	if ((name = strchr (buf, ';')) == NULL)	3813	if ((name = strchr (buf, ';')) == NULL)
3867	break;	3814	break;
3868		3815
3869	*name++ = '\0';	3816	*name++ = '\0';
3870	color = atoi (buf);	3817	color = atoi (buf) + minCOLOR;
3871		3818
3872	if (color < 0 || color >= TOTAL_COLORS)	3819	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873	break;	3820	break;
3874		3821
3875	if ((buf = strchr (name, ';')) != NULL)	3822	if ((buf = strchr (name, ';')) != NULL)
3876	*buf++ = '\0';	3823	*buf++ = '\0';
3877		3824
3878	if (name[0] == '?' && !name[1])	3825	process_color_seq (op, color, name, resp);
3879	{
3880	unsigned short r, g, b;
3881	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883	}
3884	else
3885	set_window_color (color + minCOLOR, name);
3886	}	3826	}
3887	break;	3827	break;
3888	case XTerm_Color00:	3828	case XTerm_Color00:
3889	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3829	process_color_seq (op, Color_fg, str, resp);
3890	break;	3830	break;
3891	case XTerm_Color01:	3831	case XTerm_Color01:
3892	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3832	process_color_seq (op, Color_bg, str, resp);
3893	break;	3833	break;
3894	#ifndef NO_CURSORCOLOR	3834	#ifndef NO_CURSORCOLOR
3895	case XTerm_Color_cursor:	3835	case XTerm_Color_cursor:
3896	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3836	process_color_seq (op, Color_cursor, str, resp);
3897	break;	3837	break;
3898	#endif	3838	#endif
3899	case XTerm_Color_pointer_fg:	3839	case XTerm_Color_pointer_fg:
3900	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3840	process_color_seq (op, Color_pointer_fg, str, resp);
3901	break;	3841	break;
3902	case XTerm_Color_pointer_bg:	3842	case XTerm_Color_pointer_bg:
3903	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3843	process_color_seq (op, Color_pointer_bg, str, resp);
3904	break;	3844	break;
3905	#ifndef NO_BOLD_UNDERLINE_REVERSE	3845	#ifndef NO_BOLD_UNDERLINE_REVERSE
3906	case XTerm_Color_BD:
3907	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908	break;
3909	case XTerm_Color_UL:
3910	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911	break;
3912	case XTerm_Color_RV:	3846	case XTerm_Color_RV:
3913	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3847	process_color_seq (op, Color_RV, str, resp);
		3848	break;
		3849	case Rxvt_Color_BD:
		3850	case URxvt_Color_BD:
		3851	process_color_seq (op, Color_BD, str, resp);
		3852	break;
		3853	case Rxvt_Color_UL:
		3854	case URxvt_Color_UL:
		3855	process_color_seq (op, Color_UL, str, resp);
3914	break;	3856	break;
3915	case URxvt_Color_IT:	3857	case URxvt_Color_IT:
3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3858	process_color_seq (op, Color_IT, str, resp);
3917	break;	3859	break;
3918	#endif	3860	#endif
3919	#if TRANSPARENT && TINTING	3861	#if TRANSPARENT && TINTING
3920	case URxvt_Color_tint:	3862	case URxvt_Color_tint:
3921	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3863	process_color_seq (op, Color_tint, str, resp);
		3864
3922	check_our_parents ();	3865	check_our_parents ();
		3866
3923	if (am_transparent)	3867	if (am_transparent)
3924	want_full_refresh = want_refresh = 1;	3868	want_full_refresh = want_refresh = 1;
3925	break;
3926	#endif
3927		3869
		3870	break;
		3871	#endif
		3872
3928	case XTerm_Pixmap:	3873	case Rxvt_Pixmap:
		3874	{
3929	if (*str != ';')	3875	if (*str != ';')
3930	{	3876	{
3931	#if XPM_BACKGROUND	3877	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3878	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3879	set_bgPixmap (str); /* change pixmap */
3934	#endif
3935	scr_touch (true);	3880	scr_touch (true);
		3881	#endif
3936	}	3882	}
		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	#endif
3950	scr_touch (true);	3898	scr_touch (true);
		3899	#endif
3951	}	3900	}
		3901	}
3952	break;	3902	break;
3953		3903
3954	case XTerm_restoreFG:	3904	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3905	set_window_color (Color_fg, str);
3956	break;	3906	break;
3957	case XTerm_restoreBG:	3907	case Rxvt_restoreBG:
3958	set_window_color (Color_bg, str);	3908	set_window_color (Color_bg, str);
3959	break;	3909	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 XTerm_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)
3976	{	3920	{
3977	scr_dump (fd);	3921	scr_dump (fd);
…		…
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
…		…
4151	/* extra handling for values with state unkept */	4100	/* extra handling for values with state unkept */
4152	switch (arg[i])	4101	switch (arg[i])
4153	{	4102	{
4154	#if ENABLE_STYLES	4103	#if ENABLE_STYLES
4155	case 1021:	4104	case 1021:
4156	if (mode)	4105	set_option (Opt_intensityStyles, mode);
4157	SET_OPTION (Opt_intensityStyles);
4158	else
4159	CLR_OPTION (Opt_intensityStyles);
4160		4106
4161	scr_touch (true);	4107	scr_touch (true);
4162	break;	4108	break;
4163	#endif	4109	#endif
4164	case 1048: /* alternative cursor save */	4110	case 1048: /* alternative cursor save */
…		…
4186	case 3: /* 80/132 */	4132	case 3: /* 80/132 */
4187	if (priv_modes & PrivMode_132OK)	4133	if (priv_modes & PrivMode_132OK)
4188	set_widthheight (((state ? 132 : 80) * fwidth), height);	4134	set_widthheight (((state ? 132 : 80) * fwidth), height);
4189	break;	4135	break;
4190	case 4: /* smooth scrolling */	4136	case 4: /* smooth scrolling */
4191	if (!state)	4137	set_option (Opt_jumpScroll, !state);
4192	SET_OPTION (Opt_jumpScroll);
4193	else
4194	CLR_OPTION (Opt_jumpScroll);
4195	break;	4138	break;
4196	case 5: /* reverse video */	4139	case 5: /* reverse video */
4197	scr_rvideo_mode (state);	4140	scr_rvideo_mode (state);
4198	break;	4141	break;
4199	case 6: /* relative/absolute origins */	4142	case 6: /* relative/absolute origins */
…		…
4205	/* 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 */
4206	case 9: /* X10 mouse reporting */	4149	case 9: /* X10 mouse reporting */
4207	if (state) /* orthogonal */	4150	if (state) /* orthogonal */
4208	priv_modes &= ~PrivMode_MouseX11;	4151	priv_modes &= ~PrivMode_MouseX11;
4209	break;	4152	break;
4210	#ifdef menuBar_esc
4211	case menuBar_esc:
4212	#ifdef MENUBAR
4213	map_menuBar (state);
4214	#endif
4215	break;
4216	#endif
4217	#ifdef scrollBar_esc	4153	#ifdef scrollBar_esc
4218	case scrollBar_esc:	4154	case scrollBar_esc:
4219	if (scrollbar_mapping (state))	4155	if (scrollbar_mapping (state))
4220	{	4156	{
4221	resize_all_windows (0, 0, 0);	4157	resize_all_windows (0, 0, 0);
…		…
4240	#if 0	4176	#if 0
4241	case 1001:	4177	case 1001:
4242	break; /* X11 mouse highlighting */	4178	break; /* X11 mouse highlighting */
4243	#endif	4179	#endif
4244	case 1010: /* scroll to bottom on TTY output inhibit */	4180	case 1010: /* scroll to bottom on TTY output inhibit */
4245	if (!state)	4181	set_option (Opt_scrollTtyOutput, !state);
4246	SET_OPTION (Opt_scrollTtyOutput);
4247	else
4248	CLR_OPTION (Opt_scrollTtyOutput);
4249	break;	4182	break;
4250	case 1011: /* scroll to bottom on key press */	4183	case 1011: /* scroll to bottom on key press */
4251	if (state)	4184	set_option (Opt_scrollTtyKeypress, state);
4252	SET_OPTION (Opt_scrollTtyKeypress);
4253	else
4254	CLR_OPTION (Opt_scrollTtyKeypress);
4255	break;	4185	break;
4256	case 1047: /* secondary screen w/ clearing last */	4186	case 1047: /* secondary screen w/ clearing last */
4257	if (OPTION (Opt_secondaryScreen))	4187	if (OPTION (Opt_secondaryScreen))
4258	if (current_screen != PRIMARY)	4188	if (current_screen != PRIMARY)
4259	scr_erase_screen (2);	4189	scr_erase_screen (2);
…		…
4397	scr_color (Color_bg, Color_bg);	4327	scr_color (Color_bg, Color_bg);
4398	break;	4328	break;
4399		4329
4400	//case 50: // not variable spacing	4330	//case 50: // not variable spacing
4401		4331
4402	#if ENABLE_FRILLS	4332	#if !ENABLE_MINIMAL
4403	case 90:	4333	case 90:
4404	case 91: /* set bright fg color */	4334	case 91: /* set bright fg color */
4405	case 92:	4335	case 92:
4406	case 93:	4336	case 93:
4407	case 94:	4337	case 94:
…		…
4469	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4399	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470		4400
4471	void	4401	void
4472	rxvt_term::tt_write (const char *data, unsigned int len)	4402	rxvt_term::tt_write (const char *data, unsigned int len)
4473	{	4403	{
4474	if (pty.pty < 0)	4404	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475	return;	4405	return;
4476		4406
		4407	if (pty->pty < 0)
		4408	return;
		4409
4477	if (v_buflen == 0)	4410	if (v_buflen == 0)
4478	{	4411	{
4479	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));
4480		4413
4481	if ((unsigned int)written == len)	4414	if ((unsigned int)written == len)
4482	return;	4415	return;
4483		4416
4484	data += written;	4417	data += written;
…		…
4493	pty_ev.set (EVENT_READ | EVENT_WRITE);	4426	pty_ev.set (EVENT_READ | EVENT_WRITE);
4494	}	4427	}
4495		4428
4496	void rxvt_term::pty_write ()	4429	void rxvt_term::pty_write ()
4497	{	4430	{
4498	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));
4499		4432
4500	if (written > 0)	4433	if (written > 0)
4501	{	4434	{
4502	v_buflen -= written;	4435	v_buflen -= written;
4503		4436

Diff Legend

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