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

Diff Legend

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