[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
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
		868	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		869	return;
		870
872	if (len <= 0)	871	if (len <= 0)
873	return; /* not mapped */	872	return; /* not mapped */
874		873
875	if (OPTION (Opt_scrollTtyKeypress))	874	if (OPTION (Opt_scrollTtyKeypress))
876	if (view_start)	875	if (view_start)
…		…
902	{	901	{
903	const char ch = C0_ESC;	902	const char ch = C0_ESC;
904	tt_write (&ch, 1);	903	tt_write (&ch, 1);
905	}	904	}
906		905
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	906	tt_write (kbuf, (unsigned int)len);
918	}	907	}
919	/}}} /	908	/}}} /
920		909
921	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	910	#if defined (KEYSYM_RESOURCE)
922	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
923	/* attempt to `write' count to the input buffer */
924	unsigned int	911	unsigned int
925	rxvt_term::cmd_write (const char *str, unsigned int count)	912	rxvt_term::cmd_write (const char *str, unsigned int count)
926	{	913	{
927	unsigned int n, s;	914	unsigned int n, s;
928		915
…		…
969		956
970	if (want_refresh)	957	if (want_refresh)
971	{	958	{
972	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	959	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973	{	960	{
974	int row = -view_start;	961	int row = view_start;
		962	int end_row = row + nrow;
975		963
976	while (row > -nsaved && ROW (row - 1).is_longer ())	964	while (row > top_row && ROW (row - 1).is_longer ())
977	--row;	965	--row;
978		966
979	while (row < -view_start + nrow)	967	do
980	{	968	{
981	int start_row = row;	969	int start_row = row;
982	line_t *l;	970	line_t *l;
983		971
984	do	972	do
985	{	973	{
986	l = &ROW (row);	974	l = &ROW (row++);
987		975
988	if (!(l->f & LINE_FILTERED))	976	if (!(l->f & LINE_FILTERED))
989	{	977	{
990	// line not filtered, mark it as filtered	978	// line not filtered, mark it as filtered
991	l->f \|= LINE_FILTERED;	979	l->f \|= LINE_FILTERED;
992	while (l->is_longer ())	980	while (l->is_longer ())
993	{	981	{
994	l = &ROW (++row);	982	l = &ROW (row++);
995	l->f \|= LINE_FILTERED;	983	l->f \|= LINE_FILTERED;
996	}	984	}
997		985
998	// and filter it	986	// and filter it
999	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));
1000		988
1001	break;	989	break;
1002	}	990	}
1003	}	991	}
1004	while (l->is_longer ());	992	while (l->is_longer () && row < end_row);
1005
1006	row++;
1007	}	993	}
		994	while (row < end_row);
1008		995	}
1009	}
1010		996
1011	scr_refresh (refresh_type);	997	scr_refresh ();
1012	scrollbar_show (1);	998	scrollbar_show (1);
1013	#ifdef USE_XIM	999	#ifdef USE_XIM
1014	IMSendSpot ();	1000	IMSendSpot ();
1015	#endif	1001	#endif
1016	}	1002	}
…		…
1019	}	1005	}
1020		1006
1021	void	1007	void
1022	rxvt_term::check_cb (check_watcher &w)	1008	rxvt_term::check_cb (check_watcher &w)
1023	{	1009	{
1024	SET_R (this);	1010	make_current ();
1025	SET_LOCALE (locale);
1026		1011
1027	display->flush ();	1012	display->flush ();
1028		1013
1029	if (want_refresh && !flush_ev.active)	1014	if (want_refresh && !flush_ev.active)
1030	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
1031	}	1016	}
1032		1017
1033	void	1018	void
1034	rxvt_term::flush_cb (time_watcher &w)	1019	rxvt_term::flush_cb (time_watcher &w)
1035	{	1020	{
1036	SET_R (this);	1021	make_current ();
1037	SET_LOCALE (locale);
1038		1022
1039	refresh_limit = 1;	1023	refresh_limit = 1;
1040	refresh_count = 0;	1024	refresh_count = 0;
1041	flush ();	1025	flush ();
1042	}	1026	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1030	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1031	{
1048	hidden_cursor = !hidden_cursor;	1032	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1033	want_refresh = 1;
1050		1034
1051	w.start (w.at + BLINK_INTERVAL);	1035	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1036	}
1053	#endif	1037	#endif
1054		1038
1055	#ifdef TEXT_BLINK	1039	#ifdef TEXT_BLINK
1056	void	1040	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1054	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1055	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1056	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1057	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1058	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1059	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1060	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1061	}
1079	}	1062	}
1080	#endif	1063	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1067	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1068	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1069	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1070	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1071	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1072	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1073	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1074	}
1093	}	1075	}
1094	#endif	1076	#endif
…		…
1099	{	1081	{
1100	if (mouse_slip_wheel_speed == 0	1082	if (mouse_slip_wheel_speed == 0
1101	\|\| 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)
1102	: scr_page (UP, mouse_slip_wheel_speed))	1084	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1085	{
1104	if (view_start == nsaved \|\|	1086	if (view_start == top_row \|\| view_start == 0)
1105	view_start == 0)
1106	mouse_slip_wheel_speed = 0;	1087	mouse_slip_wheel_speed = 0;
1107		1088
1108	refresh_type \|= SMOOTH_REFRESH;
1109	want_refresh = 1;	1089	want_refresh = 1;
1110	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111	}	1091	}
1112	}	1092	}
1113	#endif
1114
1115	#if HAVE_SCHED_YIELD
1116	static struct event_handler
1117	{
1118	check_watcher cw_yield;
1119
1120	void yield (check_watcher &w)
1121	{
1122	sched_yield ();
1123	w.stop ();
1124	}
1125
1126	event_handler ()
1127	: cw_yield (this, &event_handler::yield)
1128	{
1129	}
1130	} event_handler;
1131	#endif	1093	#endif
1132		1094
1133	bool	1095	bool
1134	rxvt_term::pty_fill ()	1096	rxvt_term::pty_fill ()
1135	{	1097	{
…		…
1143		1105
1144	memmove (cmdbuf_base, cmdbuf_ptr, n);	1106	memmove (cmdbuf_base, cmdbuf_ptr, n);
1145	cmdbuf_ptr = cmdbuf_base;	1107	cmdbuf_ptr = cmdbuf_base;
1146	cmdbuf_endp = cmdbuf_ptr + n;	1108	cmdbuf_endp = cmdbuf_ptr + n;
1147		1109
1148	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1110	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149		1111
1150	if (r > 0)	1112	if (r > 0)
1151	{	1113	{
1152	cmdbuf_endp += r;	1114	cmdbuf_endp += r;
1153	return true;	1115	return true;
…		…
1171	}	1133	}
1172		1134
1173	void	1135	void
1174	rxvt_term::pty_cb (io_watcher &w, short revents)	1136	rxvt_term::pty_cb (io_watcher &w, short revents)
1175	{	1137	{
1176	SET_R (this);	1138	make_current ();
1177	SET_LOCALE (locale);
1178		1139
1179	if (revents & EVENT_READ)	1140	if (revents & EVENT_READ)
1180	// loop, but don't allow a single term to monopolize us	1141	// loop, but don't allow a single term to monopolize us
1181	while (pty_fill ())	1142	while (pty_fill ())
1182	if (cmd_parse ())	1143	if (cmd_parse ())
…		…
1187	}	1148	}
1188		1149
1189	void	1150	void
1190	rxvt_term::pointer_unblank ()	1151	rxvt_term::pointer_unblank ()
1191	{	1152	{
1192	XDefineCursor (display->display, vt, TermWin_cursor);	1153	XDefineCursor (xdisp, vt, TermWin_cursor);
1193	recolour_cursor ();	1154	recolour_cursor ();
1194		1155
1195	#ifdef POINTER_BLANK	1156	#ifdef POINTER_BLANK
1196	hidden_pointer = 0;	1157	hidden_pointer = 0;
1197		1158
…		…
1202		1163
1203	#ifdef POINTER_BLANK	1164	#ifdef POINTER_BLANK
1204	void	1165	void
1205	rxvt_term::pointer_blank ()	1166	rxvt_term::pointer_blank ()
1206	{	1167	{
1207	if (! OPTION (Opt_pointerBlank))	1168	if (!OPTION (Opt_pointerBlank))
1208	return;	1169	return;
1209		1170
1210	XDefineCursor (display->display, vt, display->blank_cursor);	1171	XDefineCursor (xdisp, vt, display->blank_cursor);
1211	XFlush (display->display);	1172	XFlush (xdisp);
1212		1173
1213	hidden_pointer = 1;	1174	hidden_pointer = 1;
1214	}	1175	}
1215		1176
1216	void	1177	void
1217	rxvt_term::pointer_cb (time_watcher &w)	1178	rxvt_term::pointer_cb (time_watcher &w)
1218	{	1179	{
1219	SET_R (this);	1180	make_current ();
1220	SET_LOCALE (locale);
1221		1181
1222	pointer_blank ();	1182	pointer_blank ();
1223	}	1183	}
1224	#endif	1184	#endif
1225		1185
…		…
1290	(32 + button_number + key_state),	1250	(32 + button_number + key_state),
1291	(32 + x + 1),	1251	(32 + x + 1),
1292	(32 + y + 1));	1252	(32 + y + 1));
1293	}	1253	}
1294		1254
1295	#ifdef USING_W11LIB
1296	void
1297	rxvt_W11_process_x_event (XEvent *ev)
1298	{
1299	rxvt_t *r = rxvt_get_r ();
1300
1301	x_cb (*ev);
1302	}
1303	#endif
1304
1305	/{{{ process an X event /	1255	/{{{ process an X event /
1306	void	1256	void
1307	rxvt_term::x_cb (XEvent &ev)	1257	rxvt_term::x_cb (XEvent &ev)
1308	{	1258	{
1309	dDisp;	1259	make_current ();
1310		1260
1311	SET_R (this);	1261	dLocal (Display *, xdisp);
1312	SET_LOCALE (locale);
1313		1262
1314	#if defined(CURSOR_BLINK)	1263	if (ev.xany.window == vt
1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1264	&& SHOULD_INVOKE (HOOK_X_EVENT)
1316	{	1265	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317	if (hidden_cursor)	1266	return;
1318	{
1319	hidden_cursor = 0;
1320	want_refresh = 1;
1321	}
1322		1267
1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1268	// for XQueryPointer
1324	}
1325	#endif
1326
1327	#if defined(POINTER_BLANK)
1328	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329	{
1330	if (ev.type == MotionNotify
1331	\|\| ev.type == ButtonPress
1332	\|\| ev.type == ButtonRelease)
1333	if (hidden_pointer)
1334	pointer_unblank ();
1335
1336	if (ev.type == KeyPress && hidden_pointer == 0)
1337	pointer_blank ();
1338	}
1339	#endif
1340
1341	Window unused_root, unused_child;	1269	Window unused_root, unused_child;
1342	int unused_root_x, unused_root_y;	1270	int unused_root_x, unused_root_y;
1343	unsigned int unused_mask;	1271	unsigned int unused_mask;
1344		1272
1345	switch (ev.type)	1273	switch (ev.type)
…		…
1352		1280
1353	break;	1281	break;
1354		1282
1355	case KeyRelease:	1283	case KeyRelease:
1356	{	1284	{
1357	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1285	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1358	KeySym ks;	1286	KeySym keysym;
1359		1287
1360	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1288	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361	#endif	1289	#endif
1362		1290
1363	#if ENABLE_FRILLS \|\| ISO_14755	1291	#if ENABLE_FRILLS \|\| ISO_14755
1364	// ISO 14755 support	1292	// ISO 14755 support
1365	if (iso14755buf)	1293	if (iso14755buf)
…		…
1370	# endif	1298	# endif
1371	# if ISO_14755	1299	# if ISO_14755
1372	// iso14755 part 5.2 handling: release time	1300	// iso14755 part 5.2 handling: release time
1373	// first: controls	1301	// first: controls
1374	if ((ev.xkey.state & ControlMask)	1302	if ((ev.xkey.state & ControlMask)
1375	&& ((ks >= 0x40 && ks <= 0x5f)	1303	&& ((keysym >= 0x40 && keysym <= 0x5f)
1376	\|\| (ks >= 0x61 && ks <= 0x7f)))	1304	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1377	{	1305	{
1378	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1306	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1379	commit_iso14755 ();	1307	commit_iso14755 ();
1380	return; // case-break;	1308	goto skip_switch;
1381	}	1309	}
1382		1310
1383	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1311	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384	if (i[0] == ks)	1312	if (i[0] == keysym)
1385	{	1313	{
1386	iso14755buf = ISO_14755_51 \| i[1];	1314	iso14755buf = ISO_14755_51 \| i[1];
1387	commit_iso14755 ();	1315	commit_iso14755 ();
1388	return; // case-break;	1316	goto skip_switch;
1389	}	1317	}
1390		1318
1391	scr_bell ();	1319	scr_bell ();
1392	# endif	1320	# endif
1393	iso14755buf = 0;	1321	iso14755buf = 0;
…		…
1412	else	1340	else
1413	iso14755buf = 0;	1341	iso14755buf = 0;
1414	}	1342	}
1415	#endif	1343	#endif
1416		1344
		1345	if (ev.xany.window == vt
		1346	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1347	break;
		1348
1417	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1349	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418	if (!(ev.xkey.state & ControlMask))	1350	if (!(ev.xkey.state & ControlMask))
1419	slip_wheel_ev.stop ();	1351	slip_wheel_ev.stop ();
1420	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1352	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1421	mouse_slip_wheel_speed = 0;	1353	mouse_slip_wheel_speed = 0;
1422	#endif	1354	#endif
1423	break;	1355	break;
1424	}	1356	}
1425		1357
…		…
1431	button_release (ev.xbutton);	1363	button_release (ev.xbutton);
1432	break;	1364	break;
1433		1365
1434	case ClientMessage:	1366	case ClientMessage:
1435	if (ev.xclient.format == 32	1367	if (ev.xclient.format == 32
1436	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1368	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437	{	1369	{
		1370	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1371	{
		1372	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1373	{
1438	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1374	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1375	{
		1376	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1439	destroy ();	1377	destroy ();
		1378	}
1440	#if ENABLE_EWMH	1379	#if ENABLE_EWMH
1441	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1380	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442	XSendEvent (disp, ev.xclient.window = display->root,	1381	XSendEvent (xdisp, ev.xclient.window = display->root,
1443	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1382	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1444	&ev);	1383	&ev);
		1384	#endif
		1385	}
		1386	}
		1387	#if ENABLE_XEMBED
		1388	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1389	{
		1390	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1391	focus_in ();
		1392	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1393	focus_out ();
		1394	}
1445	#endif	1395	#endif
1446	}	1396	}
1447	#if ENABLE_XEMBED
1448	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449	{
1450	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451	focus_in ();
1452	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453	focus_out ();
1454	}
1455	#endif
1456	#ifdef OFFIX_DND
1457	/* OffiX Dnd (drag 'n' drop) protocol */
1458	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1459	&& (ev.xclient.data.l[0] == DndFile
1460	\|\| ev.xclient.data.l[0] == DndDir
1461	\|\| ev.xclient.data.l[0] == DndLink))
1462	{
1463	/* Get Dnd data */
1464	Atom ActualType;
1465	int ActualFormat;
1466	unsigned char *data;
1467	unsigned long Size, RemainingBytes;
1468
1469	XGetWindowProperty (disp, display->root,
1470	xa[XA_DNDSELECTION],
1471	0L, 1000000L,
1472	False, AnyPropertyType,
1473	&ActualType, &ActualFormat,
1474	&Size, &RemainingBytes,
1475	&data);
1476	set_string_property (XA_CUT_BUFFER0, data);
1477	XFree (data);
1478	selection_paste (display->root, XA_CUT_BUFFER0, true);
1479	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1480	}
1481	#endif /* OFFIX_DND */
1482	break;	1397	break;
1483		1398
1484	case MappingNotify:	1399	case MappingNotify:
1485	XRefreshKeyboardMapping (&ev.xmapping);	1400	XRefreshKeyboardMapping (&ev.xmapping);
1486	break;	1401	break;
…		…
1519	break;	1434	break;
1520		1435
1521	case ConfigureNotify:	1436	case ConfigureNotify:
1522	if (ev.xconfigure.window == parent[0])	1437	if (ev.xconfigure.window == parent[0])
1523	{	1438	{
1524	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1439	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1525	;	1440	;
1526		1441
1527	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1442	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1528	{	1443	{
1529	seen_resize = 1;	1444	seen_resize = 1;
1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1445	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531	}	1446	}
1532		1447
		1448	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1449
1533	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534	if (OPTION (Opt_transparent))	1451	if (OPTION (Opt_transparent))
1535	check_our_parents ();	1452	check_our_parents ();
1536	#endif	1453	#endif
1537	}	1454	}
1538	break;	1455	break;
1539		1456
1540	case PropertyNotify:	1457	case PropertyNotify:
		1458	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1541	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1459	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1542	&& ev.xproperty.state == PropertyNewValue)	1460	&& ev.xproperty.state == PropertyNewValue)
1543	selection_property (ev.xproperty.window, ev.xproperty.atom);	1461	selection_property (ev.xproperty.window, ev.xproperty.atom);
1544		1462
1545	break;	1463	break;
1546		1464
1547	case SelectionClear:	1465	case SelectionClear:
1548	selection_clear ();	1466	selection_clear ();
…		…
1553	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1471	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554	break;	1472	break;
1555		1473
1556	case SelectionRequest:	1474	case SelectionRequest:
1557	selection_send (ev.xselectionrequest);	1475	selection_send (ev.xselectionrequest);
		1476	break;
		1477
		1478	case MapNotify:
		1479	mapped = 1;
		1480	#ifdef TEXT_BLINK
		1481	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1482	#endif
		1483	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1558	break;	1484	break;
1559		1485
1560	case UnmapNotify:	1486	case UnmapNotify:
1561	mapped = 0;	1487	mapped = 0;
1562	#ifdef TEXT_BLINK	1488	#ifdef TEXT_BLINK
1563	text_blink_ev.stop ();	1489	text_blink_ev.stop ();
1564	#endif	1490	#endif
1565	break;	1491	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567	case MapNotify:
1568	mapped = 1;
1569	#ifdef TEXT_BLINK
1570	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571	#endif
1572	break;	1492	break;
1573		1493
1574	#ifdef TRANSPARENT	1494	#ifdef TRANSPARENT
1575	case ReparentNotify:	1495	case ReparentNotify:
1576	rootwin_cb (ev);	1496	rootwin_cb (ev);
…		…
1582	if (ev.xany.window == vt)	1502	if (ev.xany.window == vt)
1583	{	1503	{
1584	do	1504	do
1585	scr_expose (ev.xexpose.x, ev.xexpose.y,	1505	scr_expose (ev.xexpose.x, ev.xexpose.y,
1586	ev.xexpose.width, ev.xexpose.height, False);	1506	ev.xexpose.width, ev.xexpose.height, False);
1587	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1507	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1588		1508
1589	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1590		1510
1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1511	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1512	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1513	ev.xexpose.width, ev.xexpose.height, False);
1594		1514
1595	scr_refresh (refresh_type);	1515	want_refresh = 1;
1596	}	1516	}
1597	else	1517	else
1598	{	1518	{
1599	XEvent unused_event;	1519	XEvent unused_event;
1600		1520
1601	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1521	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1602	;	1522	;
1603	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1523	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1604	;	1524	;
1605		1525
1606	if (isScrollbarWindow (ev.xany.window))	1526	if (isScrollbarWindow (ev.xany.window))
1607	{	1527	{
1608	scrollBar.setIdle ();	1528	scrollBar.setIdle ();
1609	scrollbar_show (0);	1529	scrollbar_show (0);
1610	}	1530	}
1611	#ifdef MENUBAR
1612	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613	menubar_expose ();
1614	#endif
1615		1531
1616	#ifdef TRANSPARENT	1532	#ifdef TRANSPARENT
1617	if (am_transparent && ev.xany.window == parent[0])	1533	if (am_transparent && ev.xany.window == parent[0])
1618	XClearWindow (disp, ev.xany.window);	1534	XClearWindow (xdisp, ev.xany.window);
1619	#endif	1535	#endif
1620	}	1536	}
1621	break;	1537	break;
1622		1538
1623	case MotionNotify:	1539	case MotionNotify:
1624	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1625	if (hidden_pointer)	1541	if (hidden_pointer)
1626	pointer_unblank ();	1542	pointer_unblank ();
1627	#endif	1543	#endif
1628	#if MENUBAR
1629	if (isMenuBarWindow (ev.xany.window))
1630	{
1631	menubar_control (ev.xbutton);
1632	break;
1633	}
1634	#endif
1635	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1544	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636	break;	1545	break;
1637		1546
1638	if (ev.xany.window == vt)	1547	if (ev.xany.window == vt)
1639	{	1548	{
		1549	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
		1550	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1551	; // nop
1640	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1552	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1641	{	1553	{
1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1554	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1643	;	1555	;
1644		1556
1645	XQueryPointer (disp, vt,	1557	XQueryPointer (xdisp, vt,
1646	&unused_root, &unused_child,	1558	&unused_root, &unused_child,
1647	&unused_root_x, &unused_root_y,	1559	&unused_root_x, &unused_root_y,
1648	&ev.xbutton.x, &ev.xbutton.y,	1560	&ev.xbutton.x, &ev.xbutton.y,
1649	&ev.xbutton.state);	1561	&ev.xbutton.state);
1650	#ifdef MOUSE_THRESHOLD	1562	#ifdef MOUSE_THRESHOLD
…		…
1714	#endif	1626	#endif
1715	}	1627	}
1716	}	1628	}
1717	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1629	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1718	{	1630	{
1719	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1631	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1720	MotionNotify, &ev))	1632	MotionNotify, &ev))
1721	;	1633	;
1722		1634
1723	XQueryPointer (disp, scrollBar.win,	1635	XQueryPointer (xdisp, scrollBar.win,
1724	&unused_root, &unused_child,	1636	&unused_root, &unused_child,
1725	&unused_root_x, &unused_root_y,	1637	&unused_root_x, &unused_root_y,
1726	&ev.xbutton.x, &ev.xbutton.y,	1638	&ev.xbutton.x, &ev.xbutton.y,
1727	&unused_mask);	1639	&unused_mask);
1728	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1640	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729	scrollbar_size ());	1641	scrollbar_size ());
1730	scr_refresh (refresh_type);	1642	want_refresh = 1;
1731	refresh_limit = 0;	1643	refresh_limit = 0;
1732	scrollbar_show (1);	1644	scrollbar_show (1);
1733	}	1645	}
1734	break;	1646	break;
1735	}	1647	}
		1648
		1649	skip_switch: ;
		1650
		1651	#if defined(CURSOR_BLINK)
		1652	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1653	{
		1654	if (hidden_cursor)
		1655	{
		1656	hidden_cursor = 0;
		1657	want_refresh = 1;
		1658	}
		1659
		1660	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1661	}
		1662	#endif
		1663
		1664	#if defined(POINTER_BLANK)
		1665	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1666	{
		1667	if (ev.type == MotionNotify
		1668	\|\| ev.type == ButtonPress
		1669	\|\| ev.type == ButtonRelease)
		1670	if (hidden_pointer)
		1671	pointer_unblank ();
		1672
		1673	if (ev.type == KeyPress && hidden_pointer == 0)
		1674	pointer_blank ();
		1675	}
		1676	#endif
1736	}	1677	}
1737		1678
1738	void	1679	void
1739	rxvt_term::focus_in ()	1680	rxvt_term::focus_in ()
1740	{	1681	{
…		…
1752	XSetICFocus (Input_Context);	1693	XSetICFocus (Input_Context);
1753	}	1694	}
1754	#endif	1695	#endif
1755	#if CURSOR_BLINK	1696	#if CURSOR_BLINK
1756	if (OPTION (Opt_cursorBlink))	1697	if (OPTION (Opt_cursorBlink))
1757	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758	#endif	1699	#endif
1759	#if OFF_FOCUS_FADING	1700	#if OFF_FOCUS_FADING
1760	if (rs[Rs_fade])	1701	if (rs[Rs_fade])
1761	{	1702	{
1762	pix_colors = pix_colors_focused;	1703	pix_colors = pix_colors_focused;
…		…
1806		1747
1807	#if TRANSPARENT	1748	#if TRANSPARENT
1808	void	1749	void
1809	rxvt_term::rootwin_cb (XEvent &ev)	1750	rxvt_term::rootwin_cb (XEvent &ev)
1810	{	1751	{
1811	SET_R (this);	1752	make_current ();
1812	SET_LOCALE (locale);
1813		1753
1814	switch (ev.type)	1754	switch (ev.type)
1815	{	1755	{
1816	case PropertyNotify:	1756	case PropertyNotify:
1817	/*	1757	/*
…		…
1844	/*	1784	/*
1845	* VT window processing of button press	1785	* VT window processing of button press
1846	*/	1786	*/
1847	if (ev.window == vt)	1787	if (ev.window == vt)
1848	{	1788	{
		1789	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1790	return;
		1791
1849	#if ISO_14755	1792	#if ISO_14755
1850	// 5.4	1793	// 5.4
1851	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1794	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1852	{	1795	{
1853	iso14755_54 (ev.x, ev.y);	1796	iso14755_54 (ev.x, ev.y);
…		…
1865	#ifdef MOUSE_REPORT_DOUBLECLICK	1808	#ifdef MOUSE_REPORT_DOUBLECLICK
1866	if (ev.button == MEvent.button && clickintime)	1809	if (ev.button == MEvent.button && clickintime)
1867	{	1810	{
1868	/* same button, within alloted time */	1811	/* same button, within alloted time */
1869	MEvent.clicks++;	1812	MEvent.clicks++;
		1813
1870	if (MEvent.clicks > 1)	1814	if (MEvent.clicks > 1)
1871	{	1815	{
1872	/* only report double clicks */	1816	/* only report double clicks */
1873	MEvent.clicks = 2;	1817	MEvent.clicks = 2;
1874	mouse_report (ev);	1818	mouse_report (ev);
…		…
1894	else	1838	else
1895	{	1839	{
1896	if (ev.button != MEvent.button)	1840	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1841	MEvent.clicks = 0;
1898		1842
1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1843	switch (ev.button)
1901	{	1844	{
1902	case Button1:	1845	case Button1:
1903	/* allow meta + click to select rectangular areas */	1846	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1847	/* should be done in screen.C */
1905	#if ENABLE_FRILLS	1848	#if ENABLE_FRILLS
1906	selection.rect = !!(ev.state & ModMetaMask);	1849	selection.rect = !!(ev.state & ModMetaMask);
1907	#else	1850	#else
1908	selection.rect = false;	1851	selection.rect = false;
1909	#endif	1852	#endif
1910		1853
1911	/* allow shift+left click to extend selection */	1854	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1855	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1856	{
1914	if (MEvent.button == Button1 && clickintime)	1857	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1858	selection_rotate (ev.x, ev.y);
1916	else	1859	else
1917	selection_extend (ev.x, ev.y, 1);	1860	selection_extend (ev.x, ev.y, 1);
1918	}	1861	}
1919	else	1862	else
1920	{	1863	{
1921	if (MEvent.button == Button1 && clickintime)	1864	if (MEvent.button == Button1 && clickintime)
1922	MEvent.clicks++;	1865	MEvent.clicks++;
1923	else	1866	else
1924	MEvent.clicks = 1;	1867	MEvent.clicks = 1;
1925		1868
1926	selection_click (MEvent.clicks, ev.x, ev.y);	1869	selection_click (MEvent.clicks, ev.x, ev.y);
1927	}	1870	}
1928		1871
1929	MEvent.button = Button1;	1872	MEvent.button = Button1;
1930	break;	1873	break;
1931		1874
1932	case Button3:	1875	case Button3:
1933	if (MEvent.button == Button3 && clickintime)	1876	if (MEvent.button == Button3 && clickintime)
1934	selection_rotate (ev.x, ev.y);	1877	selection_rotate (ev.x, ev.y);
1935	else	1878	else
1936	selection_extend (ev.x, ev.y, 1);	1879	selection_extend (ev.x, ev.y, 1);
1937		1880
1938	MEvent.button = Button3;	1881	MEvent.button = Button3;
1939	break;	1882	break;
1940	}	1883	}
1941	}	1884	}
1942		1885
1943	MEvent.time = ev.time;	1886	MEvent.time = ev.time;
1944	return;	1887	return;
1945	}	1888	}
1946		1889
…		…
2082	}	2025	}
2083		2026
2084	break;	2027	break;
2085	}	2028	}
2086	}	2029	}
		2030
2087	return;	2031	return;
2088	}	2032	}
2089	#if MENUBAR
2090	/*
2091	* Menubar window processing of button press
2092	*/
2093	if (isMenuBarWindow (ev.window))
2094	menubar_control (ev);
2095	#endif
2096	}	2033	}
2097		2034
2098	void	2035	void
2099	rxvt_term::button_release (XButtonEvent &ev)	2036	rxvt_term::button_release (XButtonEvent &ev)
2100	{	2037	{
…		…
2106		2043
2107	if (scrollbar_isUpDn ())	2044	if (scrollbar_isUpDn ())
2108	{	2045	{
2109	scrollBar.setIdle ();	2046	scrollBar.setIdle ();
2110	scrollbar_show (0);	2047	scrollbar_show (0);
2111	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112	refresh_type &= ~SMOOTH_REFRESH;
2113	#endif
2114	}	2048	}
2115		2049
2116	#ifdef SELECTION_SCROLLING	2050	#ifdef SELECTION_SCROLLING
2117	if (sel_scroll_ev.active)	2051	if (sel_scroll_ev.active)
2118	sel_scroll_ev.stop();	2052	sel_scroll_ev.stop();
2119	#endif	2053	#endif
2120		2054
2121	if (ev.window == vt)	2055	if (ev.window == vt)
2122	{	2056	{
		2057	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2058	return;
		2059
2123	#if ISO_14755	2060	#if ISO_14755
2124	// 5.4	2061	// 5.4
2125	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2062	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2126	return;	2063	return;
2127	#endif	2064	#endif
		2065
2128	if (reportmode)	2066	if (reportmode)
2129	{	2067	{
2130	/* mouse report from vt window */	2068	/* mouse report from vt window */
2131	/* don't report release of wheel "buttons" */	2069	/* don't report release of wheel "buttons" */
2132	if (ev.button >= 4)	2070	if (ev.button >= 4)
…		…
2162	{	2100	{
2163	case Button1:	2101	case Button1:
2164	case Button3:	2102	case Button3:
2165	selection_make (ev.time);	2103	selection_make (ev.time);
2166	break;	2104	break;
		2105
2167	case Button2:	2106	case Button2:
2168	selection_request (ev.time, ev.x, ev.y);	2107	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2108	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2169	break;	2109	break;
		2110
2170	#ifdef MOUSE_WHEEL	2111	#ifdef MOUSE_WHEEL
2171	case Button4:	2112	case Button4:
2172	case Button5:	2113	case Button5:
2173	{	2114	{
2174	int i;	2115	int i;
…		…
2196	slip_wheel_ev.start ();	2137	slip_wheel_ev.start ();
2197	}	2138	}
2198	else	2139	else
2199	{	2140	{
2200	# endif	2141	# endif
2201	# ifdef JUMP_MOUSE_WHEEL
2202	scr_page (v, i);	2142	scr_page (v, i);
2203	scr_refresh (SMOOTH_REFRESH);
2204	scrollbar_show (1);	2143	scrollbar_show (1);
2205	# else
2206	while (i--)
2207	{
2208	scr_page (v, 1);
2209	scr_refresh (SMOOTH_REFRESH);
2210	scrollbar_show (1);
2211	}
2212	# endif
2213	# ifdef MOUSE_SLIP_WHEELING	2144	# ifdef MOUSE_SLIP_WHEELING
2214	}	2145	}
2215	#endif	2146	# endif
2216	}	2147	}
2217	break;	2148	break;
2218	#endif	2149	#endif
2219	}	2150	}
2220	}	2151	}
2221	#ifdef MENUBAR
2222	else if (isMenuBarWindow (ev.window))
2223	menubar_control (ev);
2224	#endif
2225	}	2152	}
2226		2153
2227	#ifdef TRANSPARENT	2154	#ifdef TRANSPARENT
2228	#if TINTING	2155	#if TINTING
2229	/* taken from aterm-0.4.2 */	2156	/* taken from aterm-0.4.2 */
2230		2157
2231	typedef uint32_t RUINT32T;	2158	typedef uint32_t RUINT32T;
2232		2159
2233	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2160	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2234	{	2161	{
2235	int sh_r, sh_g, sh_b;	2162	int sh_r, sh_g, sh_b;
2236	RUINT32T mask_r, mask_g, mask_b;	2163	RUINT32T mask_r, mask_g, mask_b;
2237	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2164	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2238	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2165	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2239	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2166	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2240	int i;	2167	int i;
2241		2168
2242	Visual *visual = display->visual;	2169	Visual *visual = term->visual;
2243		2170
2244	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2171	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2245		2172
2246	/* for convenience */	2173	/* for convenience */
2247	mask_r = visual->red_mask;	2174	mask_r = visual->red_mask;
…		…
2468	Atom atype;	2395	Atom atype;
2469	unsigned char *prop = NULL;	2396	unsigned char *prop = NULL;
2470	Window root, oldp, *list;	2397	Window root, oldp, *list;
2471	Pixmap rootpixmap = None;	2398	Pixmap rootpixmap = None;
2472	XWindowAttributes wattr, wrootattr;	2399	XWindowAttributes wattr, wrootattr;
2473	dDisp;
2474		2400
2475	pchanged = 0;	2401	pchanged = 0;
2476		2402
2477	if (!OPTION (Opt_transparent))	2403	if (!OPTION (Opt_transparent))
2478	return pchanged; /* Don't try any more */	2404	return pchanged; /* Don't try any more */
2479		2405
2480	XGetWindowAttributes (disp, display->root, &wrootattr);	2406	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2481	rootdepth = wrootattr.depth;	2407	rootdepth = wrootattr.depth;
2482		2408
2483	XGetWindowAttributes (disp, parent[0], &wattr);	2409	XGetWindowAttributes (xdisp, parent[0], &wattr);
2484		2410
2485	if (rootdepth != wattr.depth)	2411	if (rootdepth != wattr.depth)
2486	{	2412	{
2487	if (am_transparent)	2413	if (am_transparent)
2488	{	2414	{
2489	pchanged = 1;	2415	pchanged = 1;
2490	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2416	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2491	am_transparent = am_pixmap_trans = 0;	2417	am_transparent = am_pixmap_trans = 0;
2492	}	2418	}
2493		2419
2494	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2495	}	2421	}
2496		2422
2497	/* Get all X ops out of the queue so that our information is up-to-date. */	2423	/* Get all X ops out of the queue so that our information is up-to-date. */
2498	XSync (disp, False);	2424	XSync (xdisp, False);
2499		2425
2500	/*	2426	/*
2501	* Make the frame window set by the window manager have	2427	* Make the frame window set by the window manager have
2502	* the root background. Some window managers put multiple nested frame	2428	* the root background. Some window managers put multiple nested frame
2503	* windows for each client, so we have to take care about that.	2429	* windows for each client, so we have to take care about that.
2504	*/	2430	*/
2505	i = (xa[XA_XROOTPMAP_ID]	2431	i = (xa[XA_XROOTPMAP_ID]
2506	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2432	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2507	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2508	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2509		2435
2510	if (!i \|\| prop == NULL)	2436	if (!i \|\| prop == NULL)
2511	i = (xa[XA_ESETROOT_PMAP_ID]	2437	i = (xa[XA_ESETROOT_PMAP_ID]
2512	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2438	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2513	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2439	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514	&nitems, &bytes_after, &prop) == Success);	2440	&nitems, &bytes_after, &prop) == Success);
2515		2441
2516	if (!i \|\| prop == NULL	2442	if (!i \|\| prop == NULL
2517	#if TINTING	2443	#if TINTING
2518	\|\| !rs[Rs_color + Color_tint]	2444	\|\| !ISSET_PIXCOLOR (Color_tint)
2519	#endif	2445	#endif
2520	)	2446	)
2521	have_pixmap = 0;	2447	have_pixmap = 0;
2522	else	2448	else
2523	{	2449	{
…		…
2536	Window cr;	2462	Window cr;
2537	XImage *image;	2463	XImage *image;
2538	GC gc;	2464	GC gc;
2539	XGCValues gcvalue;	2465	XGCValues gcvalue;
2540		2466
2541	XTranslateCoordinates (disp, parent[0], display->root,	2467	XTranslateCoordinates (xdisp, parent[0], display->root,
2542	0, 0, &sx, &sy, &cr);	2468	0, 0, &sx, &sy, &cr);
2543	nw = (unsigned int)szHint.width;	2469	nw = (unsigned int)szHint.width;
2544	nh = (unsigned int)szHint.height;	2470	nh = (unsigned int)szHint.height;
2545	nx = ny = 0;	2471	nx = ny = 0;
2546		2472
…		…
2559	}	2485	}
2560		2486
2561	min_it (nw, (unsigned int) (wrootattr.width - sx));	2487	min_it (nw, (unsigned int) (wrootattr.width - sx));
2562	min_it (nh, (unsigned int) (wrootattr.height - sy));	2488	min_it (nh, (unsigned int) (wrootattr.height - sy));
2563		2489
2564	XSync (disp, False);	2490	XSync (xdisp, False);
2565	allowedxerror = -1;	2491	allowedxerror = -1;
2566	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2492	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2567		2493
2568	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2494	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2569	/* XXX: may need a delay here? */	2495	/* XXX: may need a delay here? */
2570	allowedxerror = 0;	2496	allowedxerror = 0;
2571		2497
…		…
2574	if (am_transparent && am_pixmap_trans)	2500	if (am_transparent && am_pixmap_trans)
2575	{	2501	{
2576	pchanged = 1;	2502	pchanged = 1;
2577	if (pixmap != None)	2503	if (pixmap != None)
2578	{	2504	{
2579	XFreePixmap (disp, pixmap);	2505	XFreePixmap (xdisp, pixmap);
2580	pixmap = None;	2506	pixmap = None;
2581	}	2507	}
2582	}	2508	}
2583		2509
2584	am_pixmap_trans = 0;	2510	am_pixmap_trans = 0;
2585	}	2511	}
2586	else	2512	else
2587	{	2513	{
2588	if (pixmap != None)	2514	if (pixmap != None)
2589	XFreePixmap (disp, pixmap);	2515	XFreePixmap (xdisp, pixmap);
2590		2516
2591	#if TINTING	2517	#if TINTING
2592	if (ISSET_PIXCOLOR (Color_tint))	2518	if (ISSET_PIXCOLOR (Color_tint))
2593	{	2519	{
2594	unsigned short rm, gm, bm;
2595	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2520	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2596		2521
		2522	rgba c;
2597	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2523	pix_colors_focused [Color_tint].get (c);
2598		2524
2599	ShadeXImage (display, image, shade, rm, gm, bm);	2525	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2600	}	2526	}
2601	#endif	2527	#endif
2602		2528
2603	pixmap = XCreatePixmap (disp, vt,	2529	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2604	szHint.width, szHint.height, image->depth);
2605	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2530	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2606	XPutImage (disp, pixmap, gc, image, 0, 0,	2531	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2607	nx, ny, image->width, image->height);	2532	nx, ny, image->width, image->height);
2608	XFreeGC (disp, gc);	2533	XFreeGC (xdisp, gc);
2609	XDestroyImage (image);	2534	XDestroyImage (image);
2610	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2535	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2611	XClearWindow (disp, parent[0]);	2536	XClearWindow (xdisp, parent[0]);
2612		2537
2613	if (!am_transparent \|\| !am_pixmap_trans)	2538	if (!am_transparent \|\| !am_pixmap_trans)
2614	pchanged = 1;	2539	pchanged = 1;
2615		2540
2616	am_transparent = am_pixmap_trans = 1;	2541	am_transparent = am_pixmap_trans = 1;
2617	}	2542	}
2618	}	2543	}
2619		2544
2620	if (am_pixmap_trans)	2545	if (am_pixmap_trans)
2621	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2546	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2622	else	2547	else
2623	{	2548	{
2624	unsigned int n;	2549	unsigned int n;
2625	/*	2550	/*
2626	* InheritPixmap transparency	2551	* InheritPixmap transparency
2627	*/	2552	*/
2628	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2553	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2629	{	2554	{
2630	oldp = parent[i];	2555	oldp = parent[i];
2631	XQueryTree (disp, parent[i - 1], &root,	2556	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2632	&parent[i], &list, &n);
2633	XFree (list);	2557	XFree (list);
2634		2558
2635	if (parent[i] == display->root)	2559	if (parent[i] == display->root)
2636	{	2560	{
2637	if (oldp != None)	2561	if (oldp != None)
…		…
2645	}	2569	}
2646		2570
2647	n = 0;	2571	n = 0;
2648		2572
2649	if (pchanged)	2573	if (pchanged)
2650	{
2651	for (; n < (unsigned int)i; n++)	2574	for (; n < (unsigned int)i; n++)
2652	{	2575	{
2653	XGetWindowAttributes (disp, parent[n], &wattr);	2576	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2577
2654	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2578	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2655	{	2579	{
2656	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2580	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2657	break;	2581	break;
2658	}	2582	}
2659	}	2583	}
2660	}
2661		2584
2662	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2585	if (n > (sizeof (parent) / sizeof (parent[0])))
2663	{	2586	{
2664	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2587	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2665	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2588	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2666	am_transparent = 0;	2589	am_transparent = 0;
2667	/* XXX: also turn off Opt_transparent? */	2590	/* XXX: also turn off Opt_transparent? */
2668	}	2591	}
2669	else	2592	else
2670	{	2593	{
2671	#if WAIT_FOR_WM
2672	/* wait (an arbitrary period) for the WM to do its thing
2673	* needed for fvwm2.2.2 (and before?) */
2674	sleep (1);
2675	#endif
2676	for (n = 0; n < (unsigned int)i; n++)	2594	for (n = 0; n < (unsigned int)i; n++)
2677	{	2595	{
2678	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2596	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2679	XClearWindow (disp, parent[n]);	2597	XClearWindow (xdisp, parent[n]);
2680	}	2598	}
2681		2599
2682	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2600	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2683	am_transparent = 1;	2601	am_transparent = 1;
2684	}	2602	}
2685		2603
2686	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2604	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2687	parent[i] = None;	2605	parent[i] = None;
2688	}	2606	}
2689		2607
2690	if (scrollBar.win)	2608	if (scrollBar.win)
2691	{	2609	{
2692	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2610	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2693	scrollBar.setIdle ();	2611	scrollBar.setIdle ();
2694	scrollbar_show (0);	2612	scrollbar_show (0);
2695	}	2613	}
2696		2614
2697	if (am_transparent)	2615	if (am_transparent)
…		…
2709		2627
2710	bool	2628	bool
2711	rxvt_term::cmd_parse ()	2629	rxvt_term::cmd_parse ()
2712	{	2630	{
2713	bool flag = false;	2631	bool flag = false;
2714	unicode_t ch = NOCHAR;	2632	wchar_t ch = NOCHAR;
2715	char *seq_begin; // remember start of esc-sequence here	2633	char *seq_begin; // remember start of esc-sequence here
2716		2634
2717	for (;;)	2635	for (;;)
2718	{	2636	{
2719	if (ch == NOCHAR)	2637	if (ch == NOCHAR)
…		…
2740	if (seen_resize && cmd_pid)	2658	if (seen_resize && cmd_pid)
2741	kill (-cmd_pid, SIGWINCH);	2659	kill (-cmd_pid, SIGWINCH);
2742	}	2660	}
2743		2661
2744	/* Read a text string from the input buffer */	2662	/* Read a text string from the input buffer */
2745	unicode_t buf[UBUFSIZ];	2663	wchar_t buf[UBUFSIZ];
2746	bool refreshnow = false;	2664	bool refreshnow = false;
2747	int nlines = 0;	2665	int nlines = 0;
2748	unicode_t *str = buf;	2666	wchar_t *str = buf;
2749	unicode_t *eol = str + min (ncol, UBUFSIZ);	2667	wchar_t *eol = str + min (ncol, UBUFSIZ);
2750		2668
2751	for (;;)	2669	for (;;)
2752	{	2670	{
2753	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2671	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754	break;	2672	break;
…		…
2772	}	2690	}
2773		2691
2774	// scr_add_lines only works for nlines <= nrow - 1.	2692	// scr_add_lines only works for nlines <= nrow - 1.
2775	if (nlines >= nrow - 1)	2693	if (nlines >= nrow - 1)
2776	{	2694	{
		2695	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2696	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778	scr_add_lines (buf, nlines, str - buf);	2697	scr_add_lines (buf, str - buf, nlines);
2779		2698
2780	nlines = 0;	2699	nlines = 0;
2781	str = buf;	2700	str = buf;
2782	eol = str + min (ncol, UBUFSIZ);	2701	eol = str + min (ncol, UBUFSIZ);
2783	}	2702	}
…		…
2797		2716
2798	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2799	ch = next_char ();	2718	ch = next_char ();
2800	}	2719	}
2801		2720
		2721	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2722	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2803	scr_add_lines (buf, nlines, str - buf);	2723	scr_add_lines (buf, str - buf, nlines);
2804		2724
2805	/*	2725	/*
2806	* If there have been a lot of new lines, then update the screen	2726	* If there have been a lot of new lines, then update the screen
2807	* What the heck I'll cheat and only refresh less than every page-full.	2727	* What the heck I'll cheat and only refresh less than every page-full.
2808	* the number of pages between refreshes is refresh_limit, which	2728	* the number of pages between refreshes is refresh_limit, which
…		…
2813	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2733	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814	refresh_limit++;	2734	refresh_limit++;
2815	else	2735	else
2816	{	2736	{
2817	flag = true;	2737	flag = true;
2818	scr_refresh (refresh_type);	2738	scr_refresh ();
2819	flush_ev.stop ();	2739	want_refresh = 1;
2820	}	2740	}
2821	}	2741	}
2822		2742
2823	}	2743	}
2824	else	2744	else
…		…
2839	}	2759	}
2840		2760
2841	return flag;	2761	return flag;
2842	}	2762	}
2843		2763
2844	// read the next octet
2845	unicode_t
2846	rxvt_term::next_octet ()
2847	{
2848	return cmdbuf_ptr < cmdbuf_endp
2849	? *cmdbuf_ptr++
2850	: NOCHAR;
2851	}
2852
2853	// read the next character	2764	// read the next character
2854	unicode_t	2765	wchar_t
2855	rxvt_term::next_char ()	2766	rxvt_term::next_char () NOTHROW
2856	{	2767	{
2857	while (cmdbuf_ptr < cmdbuf_endp)	2768	while (cmdbuf_ptr < cmdbuf_endp)
2858	{	2769	{
2859	// assume 7-bit to be ascii ALWAYS	2770	// assume 7-bit to be ascii ALWAYS
2860	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2771	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2869	cmdbuf_ptr = cmdbuf_endp;	2780	cmdbuf_ptr = cmdbuf_endp;
2870	break;	2781	break;
2871	}	2782	}
2872		2783
2873	if (len == (size_t)-1)	2784	if (len == (size_t)-1)
2874	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2785	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875		2786
2876	// assume wchar == unicode	2787	// assume wchar == unicode
2877	cmdbuf_ptr += len;	2788	cmdbuf_ptr += len;
2878	return wc & UNICODE_MASK;	2789	return wc & UNICODE_MASK;
2879	}	2790	}
2880		2791
2881	return NOCHAR;	2792	return NOCHAR;
2882	}	2793	}
		2794
		2795	// read the next octet
		2796	uint32_t
		2797	rxvt_term::next_octet () NOTHROW
		2798	{
		2799	return cmdbuf_ptr < cmdbuf_endp
		2800	? (unsigned char)*cmdbuf_ptr++
		2801	: NOCHAR;
		2802	}
		2803
		2804	static class out_of_input out_of_input;
2883		2805
2884	/* rxvt_cmd_getc () - Return next input character */	2806	/* rxvt_cmd_getc () - Return next input character */
2885	/*	2807	/*
2886	* Return the next input character after first passing any keyboard input	2808	* Return the next input character after first passing any keyboard input
2887	* to the command.	2809	* to the command.
2888	*/	2810	*/
2889	unicode_t	2811	wchar_t
2890	rxvt_term::cmd_getc ()	2812	rxvt_term::cmd_getc () THROW ((class out_of_input))
2891	{	2813	{
2892	unicode_t c = next_char ();	2814	wchar_t c = next_char ();
2893		2815
2894	if (c == NOCHAR)	2816	if (c == NOCHAR)
2895	throw out_of_input;	2817	throw out_of_input;
2896		2818
2897	return c;	2819	return c;
2898	}	2820	}
2899		2821
2900	unicode_t	2822	uint32_t
2901	rxvt_term::cmd_get8 ()	2823	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902	{	2824	{
2903	unicode_t c = next_octet ();	2825	uint32_t c = next_octet ();
2904		2826
2905	if (c == NOCHAR)	2827	if (c == NOCHAR)
2906	throw out_of_input;	2828	throw out_of_input;
2907		2829
2908	return c;	2830	return c;
…		…
3144	scr_charset_set (2, (unsigned int)cmd_getc ());	3066	scr_charset_set (2, (unsigned int)cmd_getc ());
3145	break;	3067	break;
3146	case '+':	3068	case '+':
3147	scr_charset_set (3, (unsigned int)cmd_getc ());	3069	scr_charset_set (3, (unsigned int)cmd_getc ());
3148	break;	3070	break;
3149	#if ENABLE_FRILLS	3071	#if !ENABLE_MINIMAL
3150	case '6':	3072	case '6':
3151	scr_backindex ();	3073	scr_backindex ();
3152	break;	3074	break;
3153	#endif	3075	#endif
3154	case '7':	3076	case '7':
3155	scr_cursor (SAVE);	3077	scr_cursor (SAVE);
3156	break;	3078	break;
3157	case '8':	3079	case '8':
3158	scr_cursor (RESTORE);	3080	scr_cursor (RESTORE);
3159	break;	3081	break;
3160	#if ENABLE_FRILLS	3082	#if !ENABLE_MINIMAL
3161	case '9':	3083	case '9':
3162	scr_forwardindex ();	3084	scr_forwardindex ();
3163	break;	3085	break;
3164	#endif	3086	#endif
3165	case '=':	3087	case '=':
…		…
3175	break;	3097	break;
3176		3098
3177	/* 8.3.87: NEXT LINE */	3099	/* 8.3.87: NEXT LINE */
3178	case C1_NEL: /* ESC E */	3100	case C1_NEL: /* ESC E */
3179	{	3101	{
3180	unicode_t nlcr[] = { C0_LF, C0_CR };	3102	wchar_t nlcr[] = { C0_LF, C0_CR };
3181	scr_add_lines (nlcr, 1, 2);	3103	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182	}	3104	}
3183	break;	3105	break;
3184		3106
3185	/* kidnapped escape sequence: Should be 8.3.48 */	3107	/* kidnapped escape sequence: Should be 8.3.48 */
3186	case C1_ESA: /* ESC G */	3108	case C1_ESA: /* ESC G */
…		…
3327	ndef = get_byte_array_bit (csi_defaults, i);	3249	ndef = get_byte_array_bit (csi_defaults, i);
3328	for (p = 0; p < nargs; p++)	3250	for (p = 0; p < nargs; p++)
3329	if (arg[p] == -1)	3251	if (arg[p] == -1)
3330	arg[p] = ndef;	3252	arg[p] = ndef;
3331		3253
3332	#ifdef DEBUG_CMD
3333	fprintf (stderr, "CSI ");
3334	for (p = 0; p < nargs; p++)
3335	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3336	fprintf (stderr, "%c\n", ch);
3337	#endif
3338
3339	/*	3254	/*
3340	* private mode handling	3255	* private mode handling
3341	*/	3256	*/
3342	if (priv)	3257	if (priv)
3343	{	3258	{
3344	switch (priv)	3259	switch (priv)
3345	{	3260	{
3346	case '>':	3261	case '>':
3347	if (ch == CSI_DA) /* secondary device attributes */	3262	if (ch == CSI_DA) /* secondary device attributes */
3348	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3263	{
		3264	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3265	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3266	//
		3267	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3268	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3269	// that we do not support xterm mouse reporting (should be 95 when we do).
		3270	//
		3271	tt_printf ("\033[>%d;94;0c", 'U');
		3272	}
3349	break;	3273	break;
3350	case '?':	3274	case '?':
3351	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3275	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3352	process_terminal_mode (ch, priv, nargs, arg);	3276	process_terminal_mode (ch, priv, nargs, arg);
3353	break;	3277	break;
…		…
3556	break;	3480	break;
3557	case CSI_75:	3481	case CSI_75:
3558	scr_cursor (RESTORE);	3482	scr_cursor (RESTORE);
3559	break;	3483	break;
3560		3484
3561	#if ENABLE_FRILLS	3485	#if !ENABLE_MINIMAL
3562	case CSI_74:	3486	case CSI_74:
3563	process_window_ops (arg, nargs);	3487	process_window_ops (arg, nargs);
3564	break;	3488	break;
3565	#endif	3489	#endif
3566		3490
…		…
3573	break;	3497	break;
3574	}	3498	}
3575	}	3499	}
3576	/}}} /	3500	/}}} /
3577		3501
3578	#if ENABLE_FRILLS	3502	#if !ENABLE_MINIMAL
3579	/* ARGSUSED */	3503	/* ARGSUSED */
3580	void	3504	void
3581	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3505	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3582	{	3506	{
3583	int x, y;	3507	int x, y;
3584	XWindowAttributes wattr;	3508	XWindowAttributes wattr;
3585	Window wdummy;	3509	Window wdummy;
3586	dDisp;	3510
		3511	dLocal (Display *, xdisp);
3587		3512
3588	if (nargs == 0)	3513	if (nargs == 0)
3589	return;	3514	return;
3590		3515
3591	switch (args[0])	3516	switch (args[0])
3592	{	3517	{
3593	/*	3518	/*
3594	* commands	3519	* commands
3595	*/	3520	*/
3596	case 1: /* deiconify window */	3521	case 1: /* deiconify window */
3597	XMapWindow (disp, parent[0]);	3522	XMapWindow (xdisp, parent[0]);
3598	break;	3523	break;
3599	case 2: /* iconify window */	3524	case 2: /* iconify window */
3600	XIconifyWindow (disp, parent[0], display->screen);	3525	XIconifyWindow (xdisp, parent[0], display->screen);
3601	break;	3526	break;
3602	case 3: /* set position (pixels) */	3527	case 3: /* set position (pixels) */
3603	XMoveWindow (disp, parent[0], args[1], args[2]);	3528	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3604	break;	3529	break;
3605	case 4: /* set size (pixels) */	3530	case 4: /* set size (pixels) */
3606	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3531	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3607	break;	3532	break;
3608	case 5: /* raise window */	3533	case 5: /* raise window */
3609	XRaiseWindow (disp, parent[0]);	3534	XRaiseWindow (xdisp, parent[0]);
3610	break;	3535	break;
3611	case 6: /* lower window */	3536	case 6: /* lower window */
3612	XLowerWindow (disp, parent[0]);	3537	XLowerWindow (xdisp, parent[0]);
3613	break;	3538	break;
3614	case 7: /* refresh window */	3539	case 7: /* refresh window */
3615	scr_touch (true);	3540	scr_touch (true);
3616	break;	3541	break;
3617	case 8: /* set size (chars) */	3542	case 8: /* set size (chars) */
…		…
3624	if (args[0] >= 24) /* set height (chars) */	3549	if (args[0] >= 24) /* set height (chars) */
3625	set_widthheight ((unsigned int)width,	3550	set_widthheight ((unsigned int)width,
3626	(unsigned int) (args[1] * fheight));	3551	(unsigned int) (args[1] * fheight));
3627	break;	3552	break;
3628		3553
3629
3630	/*	3554	/*
3631	* reports - some output format copied from XTerm	3555	* reports - some output format copied from XTerm
3632	*/	3556	*/
3633	case 11: /* report window state */	3557	case 11: /* report window state */
3634	XGetWindowAttributes (disp, parent[0], &wattr);	3558	XGetWindowAttributes (xdisp, parent[0], &wattr);
3635	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3559	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3636	break;	3560	break;
3637	case 13: /* report window position */	3561	case 13: /* report window position */
3638	XGetWindowAttributes (disp, parent[0], &wattr);	3562	XGetWindowAttributes (xdisp, parent[0], &wattr);
3639	XTranslateCoordinates (disp, parent[0], wattr.root,	3563	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3640	-wattr.border_width, -wattr.border_width,	3564	-wattr.border_width, -wattr.border_width,
3641	&x, &y, &wdummy);	3565	&x, &y, &wdummy);
3642	tt_printf ("\033[3;%d;%dt", x, y);	3566	tt_printf ("\033[3;%d;%dt", x, y);
3643	break;	3567	break;
3644	case 14: /* report window size (pixels) */	3568	case 14: /* report window size (pixels) */
3645	XGetWindowAttributes (disp, parent[0], &wattr);	3569	XGetWindowAttributes (xdisp, parent[0], &wattr);
3646	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3570	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3647	break;	3571	break;
3648	case 18: /* report text area size (chars) */	3572	case 18: /* report text area size (chars) */
3649	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3573	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3650	break;	3574	break;
…		…
3652	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3576	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3653	break;	3577	break;
3654	case 20: /* report icon label */	3578	case 20: /* report icon label */
3655	{	3579	{
3656	char *s;	3580	char *s;
3657	XGetIconName (disp, parent[0], &s);	3581	XGetIconName (xdisp, parent[0], &s);
3658	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3582	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3659	XFree (s);	3583	XFree (s);
3660	}	3584	}
3661	break;	3585	break;
3662	case 21: /* report window title */	3586	case 21: /* report window title */
3663	{	3587	{
3664	char *s;	3588	char *s;
3665	XFetchName (disp, parent[0], &s);	3589	XFetchName (xdisp, parent[0], &s);
3666	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3590	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667	XFree (s);	3591	XFree (s);
3668	}	3592	}
3669	break;	3593	break;
3670	}	3594	}
…		…
3771	void	3695	void
3772	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3696	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3773	{	3697	{
3774	if (str[0] == '?' && !str[1])	3698	if (str[0] == '?' && !str[1])
3775	{	3699	{
3776	unsigned short r, g, b;	3700	rgba c;
3777	pix_colors_focused[color].get (display, r, g, b);	3701	pix_colors_focused[color].get (c);
		3702
		3703	#if XFT
		3704	if (c.a != rgba::MAX_CC)
		3705	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3706	else
		3707	#endif
3778	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3708	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3779	}	3709	}
3780	else	3710	else
3781	set_window_color (color, str);	3711	set_window_color (color, str);
3782	}	3712	}
3783		3713
…		…
3785	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3715	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3786	*/	3716	*/
3787	void	3717	void
3788	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3718	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789	{	3719	{
3790	int changed = 0;
3791	int color;	3720	int color;
3792	char buf, name;	3721	char buf, name;
3793	bool query = str[0] == '?' && !str[1];	3722	bool query = str[0] == '?' && !str[1];
3794	int saveop = op;	3723	int saveop = op;
3795	dDisp;	3724
		3725	dLocal (Display *, xdisp);
3796		3726
3797	assert (str != NULL);	3727	assert (str != NULL);
3798	switch (op)	3728	switch (op)
3799	{	3729	{
3800	case XTerm_name:	3730	case XTerm_name:
…		…
3816	unsigned long bytes_after;	3746	unsigned long bytes_after;
3817	unsigned char *value = 0;	3747	unsigned char *value = 0;
3818	const char *str = "";	3748	const char *str = "";
3819		3749
3820	if (prop	3750	if (prop
3821	&& XGetWindowProperty (disp, parent[0],	3751	&& XGetWindowProperty (xdisp, parent[0],
3822	prop, 0, 1<<16, 0, AnyPropertyType,	3752	prop, 0, 1<<16, 0, AnyPropertyType,
3823	&actual_type, &actual_format,	3753	&actual_type, &actual_format,
3824	&nitems, &bytes_after, &value) == Success	3754	&nitems, &bytes_after, &value) == Success
3825	&& actual_type != None	3755	&& actual_type != None
3826	&& actual_format == 8)	3756	&& actual_format == 8)
3827	str = (const char *)(value);	3757	str = (const char *)(value);
3828		3758
3829	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3759	tt_printf ("\033]%d;%s%c", op, str, resp);
3830		3760
3831	XFree (value);	3761	XFree (value);
3832	}	3762	}
3833	else	3763	else
3834	{	3764	{
…		…
3838	{	3768	{
3839	*eq = 0;	3769	*eq = 0;
3840	set_utf8_property (display->atom (str), eq + 1);	3770	set_utf8_property (display->atom (str), eq + 1);
3841	}	3771	}
3842	else	3772	else
3843	XDeleteProperty (disp, parent[0],	3773	XDeleteProperty (xdisp, parent[0],
3844	display->atom (str));	3774	display->atom (str));
3845	}	3775	}
3846	break;	3776	break;
3847		3777
3848	case XTerm_Color:	3778	case XTerm_Color:
…		…
3850	{	3780	{
3851	if ((name = strchr (buf, ';')) == NULL)	3781	if ((name = strchr (buf, ';')) == NULL)
3852	break;	3782	break;
3853		3783
3854	*name++ = '\0';	3784	*name++ = '\0';
3855	color = atoi (buf);	3785	color = atoi (buf) + minCOLOR;
3856		3786
3857	if (color < 0 \|\| color >= TOTAL_COLORS)	3787	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858	break;	3788	break;
3859		3789
3860	if ((buf = strchr (name, ';')) != NULL)	3790	if ((buf = strchr (name, ';')) != NULL)
3861	*buf++ = '\0';	3791	*buf++ = '\0';
3862		3792
3863	if (name[0] == '?' && !name[1])	3793	process_color_seq (op, color, name, resp);
3864	{
3865	unsigned short r, g, b;
3866	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3867	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868	}
3869	else
3870	set_window_color (color + minCOLOR, name);
3871	}	3794	}
3872	break;	3795	break;
3873	case XTerm_Color00:	3796	case XTerm_Color00:
3874	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3797	process_color_seq (op, Color_fg, str, resp);
3875	break;	3798	break;
3876	case XTerm_Color01:	3799	case XTerm_Color01:
3877	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3800	process_color_seq (op, Color_bg, str, resp);
3878	break;	3801	break;
3879	#ifndef NO_CURSORCOLOR	3802	#ifndef NO_CURSORCOLOR
3880	case XTerm_Color_cursor:	3803	case XTerm_Color_cursor:
3881	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3804	process_color_seq (op, Color_cursor, str, resp);
3882	break;	3805	break;
3883	#endif	3806	#endif
3884	case XTerm_Color_pointer_fg:	3807	case XTerm_Color_pointer_fg:
3885	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3808	process_color_seq (op, Color_pointer_fg, str, resp);
3886	break;	3809	break;
3887	case XTerm_Color_pointer_bg:	3810	case XTerm_Color_pointer_bg:
3888	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3811	process_color_seq (op, Color_pointer_bg, str, resp);
3889	break;	3812	break;
3890	#ifndef NO_BOLD_UNDERLINE_REVERSE	3813	#ifndef NO_BOLD_UNDERLINE_REVERSE
3891	case XTerm_Color_BD:
3892	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893	break;
3894	case XTerm_Color_UL:
3895	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896	break;
3897	case XTerm_Color_RV:	3814	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3815	process_color_seq (op, Color_RV, str, resp);
		3816	break;
		3817	case Rxvt_Color_BD:
		3818	case URxvt_Color_BD:
		3819	process_color_seq (op, Color_BD, str, resp);
		3820	break;
		3821	case Rxvt_Color_UL:
		3822	case URxvt_Color_UL:
		3823	process_color_seq (op, Color_UL, str, resp);
3899	break;	3824	break;
3900	case URxvt_Color_IT:	3825	case URxvt_Color_IT:
3901	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3826	process_color_seq (op, Color_IT, str, resp);
3902	break;	3827	break;
3903	#endif	3828	#endif
3904	#if TRANSPARENT && TINTING	3829	#if TRANSPARENT && TINTING
3905	case URxvt_Color_tint:	3830	case URxvt_Color_tint:
3906	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3831	process_color_seq (op, Color_tint, str, resp);
		3832
3907	check_our_parents ();	3833	check_our_parents ();
		3834
3908	if (am_transparent)	3835	if (am_transparent)
3909	want_full_refresh = want_refresh = 1;	3836	want_full_refresh = want_refresh = 1;
3910	break;
3911	#endif
3912		3837
		3838	break;
		3839	#endif
		3840
3913	case XTerm_Pixmap:	3841	case Rxvt_Pixmap:
		3842	{
3914	if (*str != ';')	3843	if (*str != ';')
3915	{	3844	{
3916	#if XPM_BACKGROUND	3845	#if XPM_BACKGROUND
3917	scale_pixmap (""); /* reset to default scaling */	3846	scale_pixmap (""); /* reset to default scaling */
3918	set_bgPixmap (str); /* change pixmap */	3847	set_bgPixmap (str); /* change pixmap */
3919	#endif
3920	scr_touch (true);	3848	scr_touch (true);
		3849	#endif
3921	}	3850	}
		3851
		3852	int changed = 0;
		3853
3922	while ((str = strchr (str, ';')) != NULL)	3854	while ((str = strchr (str, ';')) != NULL)
3923	{	3855	{
3924	str++;	3856	str++;
3925	#if XPM_BACKGROUND	3857	#if XPM_BACKGROUND
3926	changed += scale_pixmap (str);	3858	changed += scale_pixmap (str);
3927	#endif	3859	#endif
3928	}	3860	}
3929		3861
3930	if (changed)	3862	if (changed)
3931	{	3863	{
3932	#ifdef XPM_BACKGROUND	3864	#ifdef XPM_BACKGROUND
3933	resize_pixmap ();	3865	resize_pixmap ();
3934	#endif
3935	scr_touch (true);	3866	scr_touch (true);
		3867	#endif
3936	}	3868	}
		3869	}
3937	break;	3870	break;
3938		3871
3939	case XTerm_restoreFG:	3872	case Rxvt_restoreFG:
3940	set_window_color (Color_fg, str);	3873	set_window_color (Color_fg, str);
3941	break;	3874	break;
3942	case XTerm_restoreBG:	3875	case Rxvt_restoreBG:
3943	set_window_color (Color_bg, str);	3876	set_window_color (Color_bg, str);
3944	break;	3877	break;
3945		3878
3946	case XTerm_logfile:	3879	case XTerm_logfile:
3947	// TODO, when secure mode?	3880	// TODO, when secure mode?
3948	break;	3881	break;
3949		3882
3950	#ifdef MENUBAR
3951	case URxvt_Menu:
3952	if (OPTION (Opt_insecure))
3953	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954	break;
3955	#endif
3956	#if 0	3883	#if 0
3957	case XTerm_dumpscreen: /* no error notices */	3884	case Rxvt_dumpscreen: /* no error notices */
3958	{	3885	{
3959	int fd;	3886	int fd;
3960	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3887	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3961	{	3888	{
3962	scr_dump (fd);	3889	scr_dump (fd);
…		…
3986	allocated.push_back ((void *)res);	3913	allocated.push_back ((void *)res);
3987	set_fonts ();	3914	set_fonts ();
3988	}	3915	}
3989	break;	3916	break;
3990		3917
3991	#if ENABLE_FRILLS	3918	case URxvt_version:
		3919	if (query)
		3920	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3921	op,
		3922	rs[Rs_name], VERSION[0], VERSION[2],
		3923	resp);
		3924	break;
		3925
		3926	#if !ENABLE_MINIMAL
3992	case URxvt_locale:	3927	case URxvt_locale:
3993	if (query)	3928	if (query)
3994	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3929	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3995	else	3930	else
3996	{	3931	{
3997	set_locale (str);	3932	set_locale (str);
3998	pty.set_utf8_mode (enc_utf8);	3933	pty->set_utf8_mode (enc_utf8);
3999	init_xlocale ();	3934	init_xlocale ();
4000	}	3935	}
4001	break;	3936	break;
4002		3937
4003	case URxvt_view_up:	3938	case URxvt_view_up:
…		…
4014	break;	3949	break;
4015	#endif	3950	#endif
4016		3951
4017	#if ENABLE_PERL	3952	#if ENABLE_PERL
4018	case URxvt_perl:	3953	case URxvt_perl:
4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	3954	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020	; // no responses yet	3955	; // no responses yet
4021	break;	3956	break;
4022	#endif	3957	#endif
4023	}	3958	}
4024	}	3959	}
…		…
4056	return state;	3991	return state;
4057	}	3992	}
4058		3993
4059	/* we're not using priv _yet_ */	3994	/* we're not using priv _yet_ */
4060	void	3995	void
4061	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	3996	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4062	{	3997	{
4063	unsigned int i, j;	3998	unsigned int i, j;
4064	int state;	3999	int state;
4065		4000
4066	static const struct	4001	static const struct
…		…
4077	{ 5, PrivMode_rVideo },	4012	{ 5, PrivMode_rVideo },
4078	{ 6, PrivMode_relOrigin },	4013	{ 6, PrivMode_relOrigin },
4079	{ 7, PrivMode_Autowrap },	4014	{ 7, PrivMode_Autowrap },
4080	// 8, bi-directional support mode	4015	// 8, bi-directional support mode
4081	{ 9, PrivMode_MouseX10 },	4016	{ 9, PrivMode_MouseX10 },
4082	#ifdef menuBar_esc
4083	{ menuBar_esc, PrivMode_menuBar },
4084	#endif
4085	// 18, 19 printing-related	4017	// 18, 19 printing-related
4086	{ 25, PrivMode_VisibleCursor },	4018	{ 25, PrivMode_VisibleCursor },
4087	#ifdef scrollBar_esc	4019	#ifdef scrollBar_esc
4088	{ scrollBar_esc, PrivMode_scrollBar },	4020	{ scrollBar_esc, PrivMode_scrollBar },
4089	#endif	4021	#endif
…		…
4136	/* extra handling for values with state unkept */	4068	/* extra handling for values with state unkept */
4137	switch (arg[i])	4069	switch (arg[i])
4138	{	4070	{
4139	#if ENABLE_STYLES	4071	#if ENABLE_STYLES
4140	case 1021:	4072	case 1021:
4141	if (mode)	4073	set_option (Opt_intensityStyles, mode);
4142	SET_OPTION (Opt_intensityStyles);
4143	else
4144	CLR_OPTION (Opt_intensityStyles);
4145		4074
4146	scr_touch (true);	4075	scr_touch (true);
4147	break;	4076	break;
4148	#endif	4077	#endif
4149	case 1048: /* alternative cursor save */	4078	case 1048: /* alternative cursor save */
…		…
4171	case 3: /* 80/132 */	4100	case 3: /* 80/132 */
4172	if (priv_modes & PrivMode_132OK)	4101	if (priv_modes & PrivMode_132OK)
4173	set_widthheight (((state ? 132 : 80) * fwidth), height);	4102	set_widthheight (((state ? 132 : 80) * fwidth), height);
4174	break;	4103	break;
4175	case 4: /* smooth scrolling */	4104	case 4: /* smooth scrolling */
4176	if (!state)	4105	set_option (Opt_jumpScroll, !state);
4177	SET_OPTION (Opt_jumpScroll);
4178	else
4179	CLR_OPTION (Opt_jumpScroll);
4180	break;	4106	break;
4181	case 5: /* reverse video */	4107	case 5: /* reverse video */
4182	scr_rvideo_mode (state);	4108	scr_rvideo_mode (state);
4183	break;	4109	break;
4184	case 6: /* relative/absolute origins */	4110	case 6: /* relative/absolute origins */
…		…
4190	/* case 8: - auto repeat, can't do on a per window basis */	4116	/* case 8: - auto repeat, can't do on a per window basis */
4191	case 9: /* X10 mouse reporting */	4117	case 9: /* X10 mouse reporting */
4192	if (state) /* orthogonal */	4118	if (state) /* orthogonal */
4193	priv_modes &= ~PrivMode_MouseX11;	4119	priv_modes &= ~PrivMode_MouseX11;
4194	break;	4120	break;
4195	#ifdef menuBar_esc
4196	case menuBar_esc:
4197	#ifdef MENUBAR
4198	map_menuBar (state);
4199	#endif
4200	break;
4201	#endif
4202	#ifdef scrollBar_esc	4121	#ifdef scrollBar_esc
4203	case scrollBar_esc:	4122	case scrollBar_esc:
4204	if (scrollbar_mapping (state))	4123	if (scrollbar_mapping (state))
4205	{	4124	{
4206	resize_all_windows (0, 0, 0);	4125	resize_all_windows (0, 0, 0);
…		…
4225	#if 0	4144	#if 0
4226	case 1001:	4145	case 1001:
4227	break; /* X11 mouse highlighting */	4146	break; /* X11 mouse highlighting */
4228	#endif	4147	#endif
4229	case 1010: /* scroll to bottom on TTY output inhibit */	4148	case 1010: /* scroll to bottom on TTY output inhibit */
4230	if (!state)	4149	set_option (Opt_scrollTtyOutput, !state);
4231	SET_OPTION (Opt_scrollTtyOutput);
4232	else
4233	CLR_OPTION (Opt_scrollTtyOutput);
4234	break;	4150	break;
4235	case 1011: /* scroll to bottom on key press */	4151	case 1011: /* scroll to bottom on key press */
4236	if (state)	4152	set_option (Opt_scrollTtyKeypress, state);
4237	SET_OPTION (Opt_scrollTtyKeypress);
4238	else
4239	CLR_OPTION (Opt_scrollTtyKeypress);
4240	break;	4153	break;
4241	case 1047: /* secondary screen w/ clearing last */	4154	case 1047: /* secondary screen w/ clearing last */
4242	if (OPTION (Opt_secondaryScreen))	4155	if (OPTION (Opt_secondaryScreen))
4243	if (current_screen != PRIMARY)	4156	if (current_screen != PRIMARY)
4244	scr_erase_screen (2);	4157	scr_erase_screen (2);
…		…
4382	scr_color (Color_bg, Color_bg);	4295	scr_color (Color_bg, Color_bg);
4383	break;	4296	break;
4384		4297
4385	//case 50: // not variable spacing	4298	//case 50: // not variable spacing
4386		4299
4387	#if ENABLE_FRILLS	4300	#if !ENABLE_MINIMAL
4388	case 90:	4301	case 90:
4389	case 91: /* set bright fg color */	4302	case 91: /* set bright fg color */
4390	case 92:	4303	case 92:
4391	case 93:	4304	case 93:
4392	case 94:	4305	case 94:
…		…
4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4367	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455		4368
4456	void	4369	void
4457	rxvt_term::tt_write (const char *data, unsigned int len)	4370	rxvt_term::tt_write (const char *data, unsigned int len)
4458	{	4371	{
4459	if (pty.pty < 0)	4372	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4460	return;	4373	return;
4461		4374
		4375	if (pty->pty < 0)
		4376	return;
		4377
4462	if (v_buflen == 0)	4378	if (v_buflen == 0)
4463	{	4379	{
4464	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4380	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465		4381
4466	if ((unsigned int)written == len)	4382	if ((unsigned int)written == len)
4467	return;	4383	return;
4468		4384
4469	data += written;	4385	data += written;
…		…
4478	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4394	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4479	}	4395	}
4480		4396
4481	void rxvt_term::pty_write ()	4397	void rxvt_term::pty_write ()
4482	{	4398	{
4483	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4399	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484		4400
4485	if (written > 0)	4401	if (written > 0)
4486	{	4402	{
4487	v_buflen -= written;	4403	v_buflen -= written;
4488		4404

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC vs. Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.239 by root, Fri Jan 6 03:02:22 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC