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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.277 by root, Fri Jan 20 12:16:28 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.
…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	\|\| !IN_RANGE_EXC (y, 0, nrow))	144	\|\| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR \|\| !x)	153	if (t != NOCHAR \|\| !x)
157	{	154	{
…		…
443	scr_move_to (0, 1);	440	scr_move_to (0, 1);
444	return;	441	return;
445	}	442	}
446	else if (keysym == XK_End)	443	else if (keysym == XK_End)
447	{	444	{
448	scr_move_to (1, 0);	445	scr_move_to (1, 1);
449	return;	446	return;
450	}	447	}
451	}	448	}
452	#endif	449	#endif
453	}	450	}
…		…
464	{	461	{
465	switch (keysym)	462	switch (keysym)
466	{	463	{
467	/* normal XTerm key bindings */	464	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	465	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	466	selection_request (ev.time);
470	return;	467	return;
471	#if TODO	468	#if TODO
472	/* rxvt extras */	469	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	470	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	471	change_font (FONT_UP);
…		…
867	#endif	864	#endif
868	/* nil */ ;	865	/* nil */ ;
869	}	866	}
870	}	867	}
871		868
		869	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		870	return;
		871
872	if (len <= 0)	872	if (len <= 0)
873	return; /* not mapped */	873	return; /* not mapped */
874		874
875	if (OPTION (Opt_scrollTtyKeypress))	875	if (OPTION (Opt_scrollTtyKeypress))
876	if (view_start)	876	if (view_start)
…		…
916	#endif /* DEBUG_CMD */	916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	917	tt_write (kbuf, (unsigned int)len);
918	}	918	}
919	/}}} /	919	/}}} /
920		920
921	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	921	#if defined (KEYSYM_RESOURCE)
922	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
923	/* attempt to `write' count to the input buffer */
924	unsigned int	922	unsigned int
925	rxvt_term::cmd_write (const char *str, unsigned int count)	923	rxvt_term::cmd_write (const char *str, unsigned int count)
926	{	924	{
927	unsigned int n, s;	925	unsigned int n, s;
928		926
…		…
969		967
970	if (want_refresh)	968	if (want_refresh)
971	{	969	{
972	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	970	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973	{	971	{
974	int row = -view_start;	972	int row = view_start;
		973	int end_row = row + nrow;
975		974
976	while (row > -nsaved && ROW (row - 1).is_longer ())	975	while (row > top_row && ROW (row - 1).is_longer ())
977	--row;	976	--row;
978		977
979	while (row < -view_start + nrow)	978	do
980	{	979	{
981	int start_row = row;	980	int start_row = row;
982	line_t *l;	981	line_t *l;
983		982
984	do	983	do
985	{	984	{
986	l = &ROW (row);	985	l = &ROW (row++);
987		986
988	if (!(l->f & LINE_FILTERED))	987	if (!(l->f & LINE_FILTERED))
989	{	988	{
990	// line not filtered, mark it as filtered	989	// line not filtered, mark it as filtered
991	l->f \|= LINE_FILTERED;	990	l->f \|= LINE_FILTERED;
992	while (l->is_longer ())	991	while (l->is_longer ())
993	{	992	{
994	l = &ROW (++row);	993	l = &ROW (row++);
995	l->f \|= LINE_FILTERED;	994	l->f \|= LINE_FILTERED;
996	}	995	}
997		996
998	// and filter it	997	// and filter it
999	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	998	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000		999
1001	break;	1000	break;
1002	}	1001	}
1003	}	1002	}
1004	while (l->is_longer ());	1003	while (l->is_longer () && row < end_row);
1005
1006	row++;
1007	}	1004	}
		1005	while (row < end_row);
1008		1006	}
1009	}
1010		1007
1011	scr_refresh (refresh_type);	1008	scr_refresh ();
1012	scrollbar_show (1);	1009	scrollbar_show (1);
1013	#ifdef USE_XIM	1010	#ifdef USE_XIM
1014	IMSendSpot ();	1011	IMSendSpot ();
1015	#endif	1012	#endif
1016	}	1013	}
…		…
1019	}	1016	}
1020		1017
1021	void	1018	void
1022	rxvt_term::check_cb (check_watcher &w)	1019	rxvt_term::check_cb (check_watcher &w)
1023	{	1020	{
1024	SET_R (this);	1021	make_current ();
1025	SET_LOCALE (locale);
1026		1022
1027	display->flush ();	1023	display->flush ();
1028		1024
1029	if (want_refresh && !flush_ev.active)	1025	if (want_refresh && !flush_ev.active)
1030	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1026	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1031	}	1027	}
1032		1028
1033	void	1029	void
1034	rxvt_term::flush_cb (time_watcher &w)	1030	rxvt_term::flush_cb (time_watcher &w)
1035	{	1031	{
1036	SET_R (this);	1032	make_current ();
1037	SET_LOCALE (locale);
1038		1033
1039	refresh_limit = 1;	1034	refresh_limit = 1;
1040	refresh_count = 0;	1035	refresh_count = 0;
1041	flush ();	1036	flush ();
1042	}	1037	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1041	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1042	{
1048	hidden_cursor = !hidden_cursor;	1043	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1044	want_refresh = 1;
1050		1045
1051	w.start (w.at + BLINK_INTERVAL);	1046	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1047	}
1053	#endif	1048	#endif
1054		1049
1055	#ifdef TEXT_BLINK	1050	#ifdef TEXT_BLINK
1056	void	1051	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1065	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1066	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1067	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1068	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1069	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1070	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1072	}
1079	}	1073	}
1080	#endif	1074	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1078	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1079	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1080	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1081	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1082	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1083	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1084	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1085	}
1093	}	1086	}
1094	#endif	1087	#endif
…		…
1099	{	1092	{
1100	if (mouse_slip_wheel_speed == 0	1093	if (mouse_slip_wheel_speed == 0
1101	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1094	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102	: scr_page (UP, mouse_slip_wheel_speed))	1095	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1096	{
1104	if (view_start == nsaved \|\|	1097	if (view_start == top_row \|\| view_start == 0)
1105	view_start == 0)
1106	mouse_slip_wheel_speed = 0;	1098	mouse_slip_wheel_speed = 0;
1107		1099
1108	refresh_type \|= SMOOTH_REFRESH;
1109	want_refresh = 1;	1100	want_refresh = 1;
1110	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111	}	1102	}
1112	}	1103	}
1113	#endif	1104	#endif
…		…
1143		1134
1144	memmove (cmdbuf_base, cmdbuf_ptr, n);	1135	memmove (cmdbuf_base, cmdbuf_ptr, n);
1145	cmdbuf_ptr = cmdbuf_base;	1136	cmdbuf_ptr = cmdbuf_base;
1146	cmdbuf_endp = cmdbuf_ptr + n;	1137	cmdbuf_endp = cmdbuf_ptr + n;
1147		1138
1148	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1139	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149		1140
1150	if (r > 0)	1141	if (r > 0)
1151	{	1142	{
1152	cmdbuf_endp += r;	1143	cmdbuf_endp += r;
1153	return true;	1144	return true;
…		…
1171	}	1162	}
1172		1163
1173	void	1164	void
1174	rxvt_term::pty_cb (io_watcher &w, short revents)	1165	rxvt_term::pty_cb (io_watcher &w, short revents)
1175	{	1166	{
1176	SET_R (this);	1167	make_current ();
1177	SET_LOCALE (locale);
1178		1168
1179	if (revents & EVENT_READ)	1169	if (revents & EVENT_READ)
1180	// loop, but don't allow a single term to monopolize us	1170	// loop, but don't allow a single term to monopolize us
1181	while (pty_fill ())	1171	while (pty_fill ())
1182	if (cmd_parse ())	1172	if (cmd_parse ())
…		…
1202		1192
1203	#ifdef POINTER_BLANK	1193	#ifdef POINTER_BLANK
1204	void	1194	void
1205	rxvt_term::pointer_blank ()	1195	rxvt_term::pointer_blank ()
1206	{	1196	{
1207	if (! OPTION (Opt_pointerBlank))	1197	if (!OPTION (Opt_pointerBlank))
1208	return;	1198	return;
1209		1199
1210	XDefineCursor (display->display, vt, display->blank_cursor);	1200	XDefineCursor (display->display, vt, display->blank_cursor);
1211	XFlush (display->display);	1201	XFlush (display->display);
1212		1202
…		…
1214	}	1204	}
1215		1205
1216	void	1206	void
1217	rxvt_term::pointer_cb (time_watcher &w)	1207	rxvt_term::pointer_cb (time_watcher &w)
1218	{	1208	{
1219	SET_R (this);	1209	make_current ();
1220	SET_LOCALE (locale);
1221		1210
1222	pointer_blank ();	1211	pointer_blank ();
1223	}	1212	}
1224	#endif	1213	#endif
1225		1214
…		…
1304		1293
1305	/{{{ process an X event /	1294	/{{{ process an X event /
1306	void	1295	void
1307	rxvt_term::x_cb (XEvent &ev)	1296	rxvt_term::x_cb (XEvent &ev)
1308	{	1297	{
		1298	make_current ();
		1299
1309	dDisp;	1300	dDisp;
1310		1301
1311	SET_R (this);	1302	if (ev.xany.window == vt
1312	SET_LOCALE (locale);	1303	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1305	return;
1313		1306
1314	#if defined(CURSOR_BLINK)	1307	// for XQueryPointer
1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1316	{
1317	if (hidden_cursor)
1318	{
1319	hidden_cursor = 0;
1320	want_refresh = 1;
1321	}
1322
1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
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;	1308	Window unused_root, unused_child;
1342	int unused_root_x, unused_root_y;	1309	int unused_root_x, unused_root_y;
1343	unsigned int unused_mask;	1310	unsigned int unused_mask;
1344		1311
1345	switch (ev.type)	1312	switch (ev.type)
…		…
1352		1319
1353	break;	1320	break;
1354		1321
1355	case KeyRelease:	1322	case KeyRelease:
1356	{	1323	{
1357	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1324	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1358	KeySym ks;	1325	KeySym keysym;
1359		1326
1360	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1327	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361	#endif	1328	#endif
1362		1329
1363	#if ENABLE_FRILLS \|\| ISO_14755	1330	#if ENABLE_FRILLS \|\| ISO_14755
1364	// ISO 14755 support	1331	// ISO 14755 support
1365	if (iso14755buf)	1332	if (iso14755buf)
…		…
1370	# endif	1337	# endif
1371	# if ISO_14755	1338	# if ISO_14755
1372	// iso14755 part 5.2 handling: release time	1339	// iso14755 part 5.2 handling: release time
1373	// first: controls	1340	// first: controls
1374	if ((ev.xkey.state & ControlMask)	1341	if ((ev.xkey.state & ControlMask)
1375	&& ((ks >= 0x40 && ks <= 0x5f)	1342	&& ((keysym >= 0x40 && keysym <= 0x5f)
1376	\|\| (ks >= 0x61 && ks <= 0x7f)))	1343	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1377	{	1344	{
1378	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1345	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1379	commit_iso14755 ();	1346	commit_iso14755 ();
1380	return; // case-break;	1347	goto skip_switch;
1381	}	1348	}
1382		1349
1383	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1350	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384	if (i[0] == ks)	1351	if (i[0] == keysym)
1385	{	1352	{
1386	iso14755buf = ISO_14755_51 \| i[1];	1353	iso14755buf = ISO_14755_51 \| i[1];
1387	commit_iso14755 ();	1354	commit_iso14755 ();
1388	return; // case-break;	1355	goto skip_switch;
1389	}	1356	}
1390		1357
1391	scr_bell ();	1358	scr_bell ();
1392	# endif	1359	# endif
1393	iso14755buf = 0;	1360	iso14755buf = 0;
…		…
1412	else	1379	else
1413	iso14755buf = 0;	1380	iso14755buf = 0;
1414	}	1381	}
1415	#endif	1382	#endif
1416		1383
		1384	if (ev.xany.window == vt
		1385	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1386	break;
		1387
1417	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1388	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418	if (!(ev.xkey.state & ControlMask))	1389	if (!(ev.xkey.state & ControlMask))
1419	slip_wheel_ev.stop ();	1390	slip_wheel_ev.stop ();
1420	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1391	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1421	mouse_slip_wheel_speed = 0;	1392	mouse_slip_wheel_speed = 0;
1422	#endif	1393	#endif
1423	break;	1394	break;
1424	}	1395	}
1425		1396
…		…
1431	button_release (ev.xbutton);	1402	button_release (ev.xbutton);
1432	break;	1403	break;
1433		1404
1434	case ClientMessage:	1405	case ClientMessage:
1435	if (ev.xclient.format == 32	1406	if (ev.xclient.format == 32
1436	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1407	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437	{	1408	{
		1409	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1410	{
		1411	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1412	{
1438	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1413	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1414	{
		1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1439	destroy ();	1416	destroy ();
		1417	}
1440	#if ENABLE_EWMH	1418	#if ENABLE_EWMH
1441	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1419	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442	XSendEvent (disp, ev.xclient.window = display->root,	1420	XSendEvent (disp, ev.xclient.window = display->root,
1443	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1444	&ev);	1422	&ev);
		1423	#endif
		1424	}
		1425	}
		1426	#if ENABLE_XEMBED
		1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1428	{
		1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1430	focus_in ();
		1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1432	focus_out ();
		1433	}
1445	#endif	1434	#endif
1446	}	1435	}
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;	1436	break;
1483		1437
1484	case MappingNotify:	1438	case MappingNotify:
1485	XRefreshKeyboardMapping (&ev.xmapping);	1439	XRefreshKeyboardMapping (&ev.xmapping);
1486	break;	1440	break;
…		…
1528	{	1482	{
1529	seen_resize = 1;	1483	seen_resize = 1;
1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1484	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531	}	1485	}
1532		1486
		1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1488
1533	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1489	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534	if (OPTION (Opt_transparent))	1490	if (OPTION (Opt_transparent))
1535	check_our_parents ();	1491	check_our_parents ();
1536	#endif	1492	#endif
1537	}	1493	}
…		…
1555		1511
1556	case SelectionRequest:	1512	case SelectionRequest:
1557	selection_send (ev.xselectionrequest);	1513	selection_send (ev.xselectionrequest);
1558	break;	1514	break;
1559		1515
		1516	case MapNotify:
		1517	mapped = 1;
		1518	#ifdef TEXT_BLINK
		1519	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1520	#endif
		1521	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1522	break;
		1523
1560	case UnmapNotify:	1524	case UnmapNotify:
1561	mapped = 0;	1525	mapped = 0;
1562	#ifdef TEXT_BLINK	1526	#ifdef TEXT_BLINK
1563	text_blink_ev.stop ();	1527	text_blink_ev.stop ();
1564	#endif	1528	#endif
1565	break;	1529	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;	1530	break;
1573		1531
1574	#ifdef TRANSPARENT	1532	#ifdef TRANSPARENT
1575	case ReparentNotify:	1533	case ReparentNotify:
1576	rootwin_cb (ev);	1534	rootwin_cb (ev);
…		…
1590		1548
1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1549	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1550	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1551	ev.xexpose.width, ev.xexpose.height, False);
1594		1552
1595	scr_refresh (refresh_type);	1553	want_refresh = 1;
1596	}	1554	}
1597	else	1555	else
1598	{	1556	{
1599	XEvent unused_event;	1557	XEvent unused_event;
1600		1558
…		…
1606	if (isScrollbarWindow (ev.xany.window))	1564	if (isScrollbarWindow (ev.xany.window))
1607	{	1565	{
1608	scrollBar.setIdle ();	1566	scrollBar.setIdle ();
1609	scrollbar_show (0);	1567	scrollbar_show (0);
1610	}	1568	}
1611	#ifdef MENUBAR
1612	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613	menubar_expose ();
1614	#endif
1615		1569
1616	#ifdef TRANSPARENT	1570	#ifdef TRANSPARENT
1617	if (am_transparent && ev.xany.window == parent[0])	1571	if (am_transparent && ev.xany.window == parent[0])
1618	XClearWindow (disp, ev.xany.window);	1572	XClearWindow (disp, ev.xany.window);
1619	#endif	1573	#endif
…		…
1623	case MotionNotify:	1577	case MotionNotify:
1624	#ifdef POINTER_BLANK	1578	#ifdef POINTER_BLANK
1625	if (hidden_pointer)	1579	if (hidden_pointer)
1626	pointer_unblank ();	1580	pointer_unblank ();
1627	#endif	1581	#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)	1582	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636	break;	1583	break;
1637		1584
1638	if (ev.xany.window == vt)	1585	if (ev.xany.window == vt)
1639	{	1586	{
		1587	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
		1588	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1589	; // nop
1640	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1590	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1641	{	1591	{
1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1592	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643	;	1593	;
1644		1594
1645	XQueryPointer (disp, vt,	1595	XQueryPointer (disp, vt,
…		…
1725	&unused_root_x, &unused_root_y,	1675	&unused_root_x, &unused_root_y,
1726	&ev.xbutton.x, &ev.xbutton.y,	1676	&ev.xbutton.x, &ev.xbutton.y,
1727	&unused_mask);	1677	&unused_mask);
1728	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729	scrollbar_size ());	1679	scrollbar_size ());
1730	scr_refresh (refresh_type);	1680	want_refresh = 1;
1731	refresh_limit = 0;	1681	refresh_limit = 0;
1732	scrollbar_show (1);	1682	scrollbar_show (1);
1733	}	1683	}
1734	break;	1684	break;
1735	}	1685	}
		1686
		1687	skip_switch: ;
		1688
		1689	#if defined(CURSOR_BLINK)
		1690	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1691	{
		1692	if (hidden_cursor)
		1693	{
		1694	hidden_cursor = 0;
		1695	want_refresh = 1;
		1696	}
		1697
		1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1699	}
		1700	#endif
		1701
		1702	#if defined(POINTER_BLANK)
		1703	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1704	{
		1705	if (ev.type == MotionNotify
		1706	\|\| ev.type == ButtonPress
		1707	\|\| ev.type == ButtonRelease)
		1708	if (hidden_pointer)
		1709	pointer_unblank ();
		1710
		1711	if (ev.type == KeyPress && hidden_pointer == 0)
		1712	pointer_blank ();
		1713	}
		1714	#endif
1736	}	1715	}
1737		1716
1738	void	1717	void
1739	rxvt_term::focus_in ()	1718	rxvt_term::focus_in ()
1740	{	1719	{
…		…
1752	XSetICFocus (Input_Context);	1731	XSetICFocus (Input_Context);
1753	}	1732	}
1754	#endif	1733	#endif
1755	#if CURSOR_BLINK	1734	#if CURSOR_BLINK
1756	if (OPTION (Opt_cursorBlink))	1735	if (OPTION (Opt_cursorBlink))
1757	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758	#endif	1737	#endif
1759	#if OFF_FOCUS_FADING	1738	#if OFF_FOCUS_FADING
1760	if (rs[Rs_fade])	1739	if (rs[Rs_fade])
1761	{	1740	{
1762	pix_colors = pix_colors_focused;	1741	pix_colors = pix_colors_focused;
…		…
1806		1785
1807	#if TRANSPARENT	1786	#if TRANSPARENT
1808	void	1787	void
1809	rxvt_term::rootwin_cb (XEvent &ev)	1788	rxvt_term::rootwin_cb (XEvent &ev)
1810	{	1789	{
1811	SET_R (this);	1790	make_current ();
1812	SET_LOCALE (locale);
1813		1791
1814	switch (ev.type)	1792	switch (ev.type)
1815	{	1793	{
1816	case PropertyNotify:	1794	case PropertyNotify:
1817	/*	1795	/*
…		…
1865	#ifdef MOUSE_REPORT_DOUBLECLICK	1843	#ifdef MOUSE_REPORT_DOUBLECLICK
1866	if (ev.button == MEvent.button && clickintime)	1844	if (ev.button == MEvent.button && clickintime)
1867	{	1845	{
1868	/* same button, within alloted time */	1846	/* same button, within alloted time */
1869	MEvent.clicks++;	1847	MEvent.clicks++;
		1848
1870	if (MEvent.clicks > 1)	1849	if (MEvent.clicks > 1)
1871	{	1850	{
1872	/* only report double clicks */	1851	/* only report double clicks */
1873	MEvent.clicks = 2;	1852	MEvent.clicks = 2;
1874	mouse_report (ev);	1853	mouse_report (ev);
…		…
1894	else	1873	else
1895	{	1874	{
1896	if (ev.button != MEvent.button)	1875	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1876	MEvent.clicks = 0;
1898		1877
1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))	1878	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1879	switch (ev.button)
1901	{	1880	{
1902	case Button1:	1881	case Button1:
1903	/* allow meta + click to select rectangular areas */	1882	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1883	/* should be done in screen.C */
…		…
1907	#else	1886	#else
1908	selection.rect = false;	1887	selection.rect = false;
1909	#endif	1888	#endif
1910		1889
1911	/* allow shift+left click to extend selection */	1890	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1891	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1892	{
1914	if (MEvent.button == Button1 && clickintime)	1893	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1894	selection_rotate (ev.x, ev.y);
1916	else	1895	else
1917	selection_extend (ev.x, ev.y, 1);	1896	selection_extend (ev.x, ev.y, 1);
…		…
2082	}	2061	}
2083		2062
2084	break;	2063	break;
2085	}	2064	}
2086	}	2065	}
		2066
2087	return;	2067	return;
2088	}	2068	}
2089	#if MENUBAR
2090	/*
2091	* Menubar window processing of button press
2092	*/
2093	if (isMenuBarWindow (ev.window))
2094	menubar_control (ev);
2095	#endif
2096	}	2069	}
2097		2070
2098	void	2071	void
2099	rxvt_term::button_release (XButtonEvent &ev)	2072	rxvt_term::button_release (XButtonEvent &ev)
2100	{	2073	{
…		…
2106		2079
2107	if (scrollbar_isUpDn ())	2080	if (scrollbar_isUpDn ())
2108	{	2081	{
2109	scrollBar.setIdle ();	2082	scrollBar.setIdle ();
2110	scrollbar_show (0);	2083	scrollbar_show (0);
2111	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112	refresh_type &= ~SMOOTH_REFRESH;
2113	#endif
2114	}	2084	}
2115		2085
2116	#ifdef SELECTION_SCROLLING	2086	#ifdef SELECTION_SCROLLING
2117	if (sel_scroll_ev.active)	2087	if (sel_scroll_ev.active)
2118	sel_scroll_ev.stop();	2088	sel_scroll_ev.stop();
…		…
2156	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2157	&& bypass_keystate	2127	&& bypass_keystate
2158	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2159	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2160		2130
		2131	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2132	return;
		2133
2161	switch (ev.button)	2134	switch (ev.button)
2162	{	2135	{
2163	case Button1:	2136	case Button1:
2164	case Button3:	2137	case Button3:
2165	selection_make (ev.time);	2138	selection_make (ev.time);
2166	break;	2139	break;
		2140
2167	case Button2:	2141	case Button2:
2168	selection_request (ev.time, ev.x, ev.y);	2142	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2143	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2169	break;	2144	break;
		2145
2170	#ifdef MOUSE_WHEEL	2146	#ifdef MOUSE_WHEEL
2171	case Button4:	2147	case Button4:
2172	case Button5:	2148	case Button5:
2173	{	2149	{
2174	int i;	2150	int i;
…		…
2196	slip_wheel_ev.start ();	2172	slip_wheel_ev.start ();
2197	}	2173	}
2198	else	2174	else
2199	{	2175	{
2200	# endif	2176	# endif
2201	# ifdef JUMP_MOUSE_WHEEL
2202	scr_page (v, i);	2177	scr_page (v, i);
2203	scr_refresh (SMOOTH_REFRESH);
2204	scrollbar_show (1);	2178	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	2179	# ifdef MOUSE_SLIP_WHEELING
2214	}	2180	}
2215	#endif	2181	# endif
2216	}	2182	}
2217	break;	2183	break;
2218	#endif	2184	#endif
2219	}	2185	}
2220	}	2186	}
2221	#ifdef MENUBAR
2222	else if (isMenuBarWindow (ev.window))
2223	menubar_control (ev);
2224	#endif
2225	}	2187	}
2226		2188
2227	#ifdef TRANSPARENT	2189	#ifdef TRANSPARENT
2228	#if TINTING	2190	#if TINTING
2229	/* taken from aterm-0.4.2 */	2191	/* taken from aterm-0.4.2 */
…		…
2709		2671
2710	bool	2672	bool
2711	rxvt_term::cmd_parse ()	2673	rxvt_term::cmd_parse ()
2712	{	2674	{
2713	bool flag = false;	2675	bool flag = false;
2714	unicode_t ch = NOCHAR;	2676	wchar_t ch = NOCHAR;
2715	char *seq_begin; // remember start of esc-sequence here	2677	char *seq_begin; // remember start of esc-sequence here
2716		2678
2717	for (;;)	2679	for (;;)
2718	{	2680	{
2719	if (ch == NOCHAR)	2681	if (ch == NOCHAR)
2720	{	2682	{
2721	seq_begin = cmdbuf_ptr;	2683	seq_begin = cmdbuf_ptr;
2722	ch = next_char ();	2684	ch = next_char ();
2723	}
2724		2685
2725	if (ch == NOCHAR) // TODO: improve	2686	if (ch == NOCHAR)
2726	break;	2687	break;
		2688	}
2727		2689
2728	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2690	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)
2729	{	2691	{
2730	if (!seen_input)	2692	if (!seen_input)
2731	{	2693	{
…		…
2740	if (seen_resize && cmd_pid)	2702	if (seen_resize && cmd_pid)
2741	kill (-cmd_pid, SIGWINCH);	2703	kill (-cmd_pid, SIGWINCH);
2742	}	2704	}
2743		2705
2744	/* Read a text string from the input buffer */	2706	/* Read a text string from the input buffer */
2745	unicode_t buf[UBUFSIZ];	2707	wchar_t buf[UBUFSIZ];
2746	bool refreshnow = false;	2708	bool refreshnow = false;
2747	int nlines = 0;	2709	int nlines = 0;
2748	unicode_t *str = buf;	2710	wchar_t *str = buf;
2749	unicode_t *eol = str + min (ncol, UBUFSIZ);	2711	wchar_t *eol = str + min (ncol, UBUFSIZ);
2750		2712
2751	for (;;)	2713	for (;;)
2752	{	2714	{
2753	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2715	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754	break;	2716	break;
…		…
2772	}	2734	}
2773		2735
2774	// scr_add_lines only works for nlines <= nrow - 1.	2736	// scr_add_lines only works for nlines <= nrow - 1.
2775	if (nlines >= nrow - 1)	2737	if (nlines >= nrow - 1)
2776	{	2738	{
		2739	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2740	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778	scr_add_lines (buf, nlines, str - buf);	2741	scr_add_lines (buf, str - buf, nlines);
2779		2742
2780	nlines = 0;	2743	nlines = 0;
2781	str = buf;	2744	str = buf;
2782	eol = str + min (ncol, UBUFSIZ);	2745	eol = str + min (ncol, UBUFSIZ);
2783	}	2746	}
…		…
2797		2760
2798	seq_begin = cmdbuf_ptr;	2761	seq_begin = cmdbuf_ptr;
2799	ch = next_char ();	2762	ch = next_char ();
2800	}	2763	}
2801		2764
		2765	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2766	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2803	scr_add_lines (buf, nlines, str - buf);	2767	scr_add_lines (buf, str - buf, nlines);
2804		2768
2805	/*	2769	/*
2806	* If there have been a lot of new lines, then update the screen	2770	* 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.	2771	* 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	2772	* the number of pages between refreshes is refresh_limit, which
…		…
2813	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2777	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814	refresh_limit++;	2778	refresh_limit++;
2815	else	2779	else
2816	{	2780	{
2817	flag = true;	2781	flag = true;
2818	scr_refresh (refresh_type);	2782	scr_refresh ();
2819	flush_ev.stop ();	2783	want_refresh = 1;
2820	}	2784	}
2821	}	2785	}
2822		2786
2823	}	2787	}
2824	else	2788	else
…		…
2839	}	2803	}
2840		2804
2841	return flag;	2805	return flag;
2842	}	2806	}
2843		2807
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	2808	// read the next character
2854	unicode_t	2809	wchar_t
2855	rxvt_term::next_char ()	2810	rxvt_term::next_char () NOTHROW
2856	{	2811	{
2857	while (cmdbuf_ptr < cmdbuf_endp)	2812	while (cmdbuf_ptr < cmdbuf_endp)
2858	{	2813	{
2859	// assume 7-bit to be ascii ALWAYS	2814	// assume 7-bit to be ascii ALWAYS
2860	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2815	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2869	cmdbuf_ptr = cmdbuf_endp;	2824	cmdbuf_ptr = cmdbuf_endp;
2870	break;	2825	break;
2871	}	2826	}
2872		2827
2873	if (len == (size_t)-1)	2828	if (len == (size_t)-1)
2874	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2829	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875		2830
2876	// assume wchar == unicode	2831	// assume wchar == unicode
2877	cmdbuf_ptr += len;	2832	cmdbuf_ptr += len;
2878	return wc & UNICODE_MASK;	2833	return wc & UNICODE_MASK;
2879	}	2834	}
2880		2835
2881	return NOCHAR;	2836	return NOCHAR;
2882	}	2837	}
		2838
		2839	// read the next octet
		2840	uint32_t
		2841	rxvt_term::next_octet () NOTHROW
		2842	{
		2843	return cmdbuf_ptr < cmdbuf_endp
		2844	? (unsigned char)*cmdbuf_ptr++
		2845	: NOCHAR;
		2846	}
		2847
		2848	static class out_of_input out_of_input;
2883		2849
2884	/* rxvt_cmd_getc () - Return next input character */	2850	/* rxvt_cmd_getc () - Return next input character */
2885	/*	2851	/*
2886	* Return the next input character after first passing any keyboard input	2852	* Return the next input character after first passing any keyboard input
2887	* to the command.	2853	* to the command.
2888	*/	2854	*/
2889	unicode_t	2855	wchar_t
2890	rxvt_term::cmd_getc ()	2856	rxvt_term::cmd_getc () THROW ((class out_of_input))
2891	{	2857	{
2892	unicode_t c = next_char ();	2858	wchar_t c = next_char ();
2893		2859
2894	if (c == NOCHAR)	2860	if (c == NOCHAR)
2895	throw out_of_input;	2861	throw out_of_input;
2896		2862
2897	return c;	2863	return c;
2898	}	2864	}
2899		2865
2900	unicode_t	2866	uint32_t
2901	rxvt_term::cmd_get8 ()	2867	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902	{	2868	{
2903	unicode_t c = next_octet ();	2869	uint32_t c = next_octet ();
2904		2870
2905	if (c == NOCHAR)	2871	if (c == NOCHAR)
2906	throw out_of_input;	2872	throw out_of_input;
2907		2873
2908	return c;	2874	return c;
…		…
3175	break;	3141	break;
3176		3142
3177	/* 8.3.87: NEXT LINE */	3143	/* 8.3.87: NEXT LINE */
3178	case C1_NEL: /* ESC E */	3144	case C1_NEL: /* ESC E */
3179	{	3145	{
3180	unicode_t nlcr[] = { C0_LF, C0_CR };	3146	wchar_t nlcr[] = { C0_LF, C0_CR };
3181	scr_add_lines (nlcr, 1, 2);	3147	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182	}	3148	}
3183	break;	3149	break;
3184		3150
3185	/* kidnapped escape sequence: Should be 8.3.48 */	3151	/* kidnapped escape sequence: Should be 8.3.48 */
3186	case C1_ESA: /* ESC G */	3152	case C1_ESA: /* ESC G */
…		…
3785	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3751	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3786	*/	3752	*/
3787	void	3753	void
3788	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3754	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789	{	3755	{
3790	int changed = 0;
3791	int color;	3756	int color;
3792	char buf, name;	3757	char buf, name;
3793	bool query = str[0] == '?' && !str[1];	3758	bool query = str[0] == '?' && !str[1];
3794	int saveop = op;	3759	int saveop = op;
3795	dDisp;	3760	dDisp;
…		…
3850	{	3815	{
3851	if ((name = strchr (buf, ';')) == NULL)	3816	if ((name = strchr (buf, ';')) == NULL)
3852	break;	3817	break;
3853		3818
3854	*name++ = '\0';	3819	*name++ = '\0';
3855	color = atoi (buf);	3820	color = atoi (buf) + minCOLOR;
3856		3821
3857	if (color < 0 \|\| color >= TOTAL_COLORS)	3822	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858	break;	3823	break;
3859		3824
3860	if ((buf = strchr (name, ';')) != NULL)	3825	if ((buf = strchr (name, ';')) != NULL)
3861	*buf++ = '\0';	3826	*buf++ = '\0';
3862		3827
3863	if (name[0] == '?' && !name[1])	3828	if (name[0] == '?' && !name[1])
3864	{	3829	{
3865	unsigned short r, g, b;	3830	unsigned short r, g, b;
3866	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3831	pix_colors_focused[color].get (display, r, g, b);
3867	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3832	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868	}	3833	}
3869	else	3834	else
3870	set_window_color (color + minCOLOR, name);	3835	set_window_color (color, name);
3871	}	3836	}
3872	break;	3837	break;
3873	case XTerm_Color00:	3838	case XTerm_Color00:
3874	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3839	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3875	break;	3840	break;
3876	case XTerm_Color01:	3841	case XTerm_Color01:
3877	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3842	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3878	break;	3843	break;
3879	#ifndef NO_CURSORCOLOR	3844	#ifndef NO_CURSORCOLOR
3880	case XTerm_Color_cursor:	3845	case XTerm_Color_cursor:
3881	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3846	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3882	break;	3847	break;
…		…
3886	break;	3851	break;
3887	case XTerm_Color_pointer_bg:	3852	case XTerm_Color_pointer_bg:
3888	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3853	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3889	break;	3854	break;
3890	#ifndef NO_BOLD_UNDERLINE_REVERSE	3855	#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:	3856	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3857	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3858	break;
		3859	case Rxvt_Color_BD:
		3860	case URxvt_Color_BD:
		3861	process_color_seq (op, Color_BD, str, resp);
		3862	break;
		3863	case Rxvt_Color_UL:
		3864	case URxvt_Color_UL:
		3865	process_color_seq (op, Color_UL, str, resp);
3899	break;	3866	break;
3900	case URxvt_Color_IT:	3867	case URxvt_Color_IT:
3901	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3868	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902	break;	3869	break;
3903	#endif	3870	#endif
…		…
3908	if (am_transparent)	3875	if (am_transparent)
3909	want_full_refresh = want_refresh = 1;	3876	want_full_refresh = want_refresh = 1;
3910	break;	3877	break;
3911	#endif	3878	#endif
3912		3879
3913	case XTerm_Pixmap:	3880	case Rxvt_Pixmap:
		3881	{
3914	if (*str != ';')	3882	if (*str != ';')
3915	{	3883	{
3916	#if XPM_BACKGROUND	3884	#if XPM_BACKGROUND
3917	scale_pixmap (""); /* reset to default scaling */	3885	scale_pixmap (""); /* reset to default scaling */
3918	set_bgPixmap (str); /* change pixmap */	3886	set_bgPixmap (str); /* change pixmap */
3919	#endif
3920	scr_touch (true);	3887	scr_touch (true);
		3888	#endif
3921	}	3889	}
		3890
		3891	int changed = 0;
		3892
3922	while ((str = strchr (str, ';')) != NULL)	3893	while ((str = strchr (str, ';')) != NULL)
3923	{	3894	{
3924	str++;	3895	str++;
3925	#if XPM_BACKGROUND	3896	#if XPM_BACKGROUND
3926	changed += scale_pixmap (str);	3897	changed += scale_pixmap (str);
3927	#endif	3898	#endif
3928	}	3899	}
3929		3900
3930	if (changed)	3901	if (changed)
3931	{	3902	{
3932	#ifdef XPM_BACKGROUND	3903	#ifdef XPM_BACKGROUND
3933	resize_pixmap ();	3904	resize_pixmap ();
3934	#endif
3935	scr_touch (true);	3905	scr_touch (true);
		3906	#endif
3936	}	3907	}
		3908	}
3937	break;	3909	break;
3938		3910
3939	case XTerm_restoreFG:	3911	case Rxvt_restoreFG:
3940	set_window_color (Color_fg, str);	3912	set_window_color (Color_fg, str);
3941	break;	3913	break;
3942	case XTerm_restoreBG:	3914	case Rxvt_restoreBG:
3943	set_window_color (Color_bg, str);	3915	set_window_color (Color_bg, str);
3944	break;	3916	break;
3945		3917
3946	case XTerm_logfile:	3918	case XTerm_logfile:
3947	// TODO, when secure mode?	3919	// TODO, when secure mode?
3948	break;	3920	break;
3949		3921
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	3922	#if 0
3957	case XTerm_dumpscreen: /* no error notices */	3923	case Rxvt_dumpscreen: /* no error notices */
3958	{	3924	{
3959	int fd;	3925	int fd;
3960	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3926	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3961	{	3927	{
3962	scr_dump (fd);	3928	scr_dump (fd);
…		…
3993	if (query)	3959	if (query)
3994	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3960	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3995	else	3961	else
3996	{	3962	{
3997	set_locale (str);	3963	set_locale (str);
3998	pty.set_utf8_mode (enc_utf8);	3964	pty->set_utf8_mode (enc_utf8);
3999	init_xlocale ();	3965	init_xlocale ();
4000	}	3966	}
4001	break;	3967	break;
4002		3968
4003	case URxvt_view_up:	3969	case URxvt_view_up:
…		…
4014	break;	3980	break;
4015	#endif	3981	#endif
4016		3982
4017	#if ENABLE_PERL	3983	#if ENABLE_PERL
4018	case URxvt_perl:	3984	case URxvt_perl:
4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	3985	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020	; // no responses yet	3986	; // no responses yet
4021	break;	3987	break;
4022	#endif	3988	#endif
4023	}	3989	}
4024	}	3990	}
…		…
4056	return state;	4022	return state;
4057	}	4023	}
4058		4024
4059	/* we're not using priv _yet_ */	4025	/* we're not using priv _yet_ */
4060	void	4026	void
4061	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4027	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4062	{	4028	{
4063	unsigned int i, j;	4029	unsigned int i, j;
4064	int state;	4030	int state;
4065		4031
4066	static const struct	4032	static const struct
…		…
4077	{ 5, PrivMode_rVideo },	4043	{ 5, PrivMode_rVideo },
4078	{ 6, PrivMode_relOrigin },	4044	{ 6, PrivMode_relOrigin },
4079	{ 7, PrivMode_Autowrap },	4045	{ 7, PrivMode_Autowrap },
4080	// 8, bi-directional support mode	4046	// 8, bi-directional support mode
4081	{ 9, PrivMode_MouseX10 },	4047	{ 9, PrivMode_MouseX10 },
4082	#ifdef menuBar_esc
4083	{ menuBar_esc, PrivMode_menuBar },
4084	#endif
4085	// 18, 19 printing-related	4048	// 18, 19 printing-related
4086	{ 25, PrivMode_VisibleCursor },	4049	{ 25, PrivMode_VisibleCursor },
4087	#ifdef scrollBar_esc	4050	#ifdef scrollBar_esc
4088	{ scrollBar_esc, PrivMode_scrollBar },	4051	{ scrollBar_esc, PrivMode_scrollBar },
4089	#endif	4052	#endif
…		…
4136	/* extra handling for values with state unkept */	4099	/* extra handling for values with state unkept */
4137	switch (arg[i])	4100	switch (arg[i])
4138	{	4101	{
4139	#if ENABLE_STYLES	4102	#if ENABLE_STYLES
4140	case 1021:	4103	case 1021:
4141	if (mode)	4104	set_option (Opt_intensityStyles, mode);
4142	SET_OPTION (Opt_intensityStyles);
4143	else
4144	CLR_OPTION (Opt_intensityStyles);
4145		4105
4146	scr_touch (true);	4106	scr_touch (true);
4147	break;	4107	break;
4148	#endif	4108	#endif
4149	case 1048: /* alternative cursor save */	4109	case 1048: /* alternative cursor save */
…		…
4171	case 3: /* 80/132 */	4131	case 3: /* 80/132 */
4172	if (priv_modes & PrivMode_132OK)	4132	if (priv_modes & PrivMode_132OK)
4173	set_widthheight (((state ? 132 : 80) * fwidth), height);	4133	set_widthheight (((state ? 132 : 80) * fwidth), height);
4174	break;	4134	break;
4175	case 4: /* smooth scrolling */	4135	case 4: /* smooth scrolling */
4176	if (!state)	4136	set_option (Opt_jumpScroll, !state);
4177	SET_OPTION (Opt_jumpScroll);
4178	else
4179	CLR_OPTION (Opt_jumpScroll);
4180	break;	4137	break;
4181	case 5: /* reverse video */	4138	case 5: /* reverse video */
4182	scr_rvideo_mode (state);	4139	scr_rvideo_mode (state);
4183	break;	4140	break;
4184	case 6: /* relative/absolute origins */	4141	case 6: /* relative/absolute origins */
…		…
4190	/* case 8: - auto repeat, can't do on a per window basis */	4147	/* case 8: - auto repeat, can't do on a per window basis */
4191	case 9: /* X10 mouse reporting */	4148	case 9: /* X10 mouse reporting */
4192	if (state) /* orthogonal */	4149	if (state) /* orthogonal */
4193	priv_modes &= ~PrivMode_MouseX11;	4150	priv_modes &= ~PrivMode_MouseX11;
4194	break;	4151	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	4152	#ifdef scrollBar_esc
4203	case scrollBar_esc:	4153	case scrollBar_esc:
4204	if (scrollbar_mapping (state))	4154	if (scrollbar_mapping (state))
4205	{	4155	{
4206	resize_all_windows (0, 0, 0);	4156	resize_all_windows (0, 0, 0);
…		…
4225	#if 0	4175	#if 0
4226	case 1001:	4176	case 1001:
4227	break; /* X11 mouse highlighting */	4177	break; /* X11 mouse highlighting */
4228	#endif	4178	#endif
4229	case 1010: /* scroll to bottom on TTY output inhibit */	4179	case 1010: /* scroll to bottom on TTY output inhibit */
4230	if (!state)	4180	set_option (Opt_scrollTtyOutput, !state);
4231	SET_OPTION (Opt_scrollTtyOutput);
4232	else
4233	CLR_OPTION (Opt_scrollTtyOutput);
4234	break;	4181	break;
4235	case 1011: /* scroll to bottom on key press */	4182	case 1011: /* scroll to bottom on key press */
4236	if (state)	4183	set_option (Opt_scrollTtyKeypress, state);
4237	SET_OPTION (Opt_scrollTtyKeypress);
4238	else
4239	CLR_OPTION (Opt_scrollTtyKeypress);
4240	break;	4184	break;
4241	case 1047: /* secondary screen w/ clearing last */	4185	case 1047: /* secondary screen w/ clearing last */
4242	if (OPTION (Opt_secondaryScreen))	4186	if (OPTION (Opt_secondaryScreen))
4243	if (current_screen != PRIMARY)	4187	if (current_screen != PRIMARY)
4244	scr_erase_screen (2);	4188	scr_erase_screen (2);
…		…
4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4398	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455		4399
4456	void	4400	void
4457	rxvt_term::tt_write (const char *data, unsigned int len)	4401	rxvt_term::tt_write (const char *data, unsigned int len)
4458	{	4402	{
		4403	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4404	return;
		4405
		4406	if (pty->pty < 0)
		4407	return;
		4408
4459	if (v_buflen == 0)	4409	if (v_buflen == 0)
4460	{	4410	{
4461	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4411	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4462		4412
4463	if ((unsigned int)written == len)	4413	if ((unsigned int)written == len)
4464	return;	4414	return;
4465		4415
4466	data += written;	4416	data += written;
…		…
4475	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4425	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4476	}	4426	}
4477		4427
4478	void rxvt_term::pty_write ()	4428	void rxvt_term::pty_write ()
4479	{	4429	{
4480	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4430	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4481		4431
4482	if (written > 0)	4432	if (written > 0)
4483	{	4433	{
4484	v_buflen -= written;	4434	v_buflen -= written;
4485		4435

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs. Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC