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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 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.
…		…
43	* along with this program; if not, write to the Free Software	43	* along with this program; if not, write to the Free Software
44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45	----------------------------------------------------------------------/	45	----------------------------------------------------------------------/
46		46
47	/{{{ includes: /	47	/{{{ includes: /
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h"
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h"
		50	#include "rxvtperl.h"
50	#include "version.h"	51	#include "version.h"
51	#include "command.h"	52	#include "command.h"
		53
		54	#if HAVE_SCHED_YIELD
		55	#undef HAVE_SCHED_YIELD // disabled for the time being
		56	//# include <sched.h>
		57	#endif
52		58
53	#ifdef KEYSYM_RESOURCE	59	#ifdef KEYSYM_RESOURCE
54	# include "keyboard.h"	60	# include "keyboard.h"
55	#endif	61	#endif
56		62
…		…
262	mb[0] = ch[0];	268	mb[0] = ch[0];
263	len = 1;	269	len = 1;
264	}	270	}
265		271
266	if (len > 0)	272	if (len > 0)
267	tt_write ((unsigned char *)mb, len);	273	tt_write (mb, len);
268	else	274	else
269	scr_bell ();	275	scr_bell ();
270	}	276	}
271		277
272	iso14755buf = 0;	278	iso14755buf = 0;
…		…
300	KeySym keysym;	306	KeySym keysym;
301	#ifdef DEBUG_CMD	307	#ifdef DEBUG_CMD
302	static int debug_key = 1; /* accessible by a debugger only */	308	static int debug_key = 1; /* accessible by a debugger only */
303	#endif	309	#endif
304	int valid_keysym;	310	int valid_keysym;
305	unsigned char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
306		312
307	/*	313	/*
308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309	* escape sequence to toggle the Keypad.	315	* escape sequence to toggle the Keypad.
310	*	316	*
…		…
328	Status status_return;	334	Status status_return;
329		335
330	#if 0	336	#if 0
331	#ifdef X_HAVE_UTF8_STRING	337	#ifdef X_HAVE_UTF8_STRING
332	if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful	338	if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
333	len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,	339	len = Xutf8LookupString (Input_Context, &ev, kbuf,
334	KBUFSZ, &keysym, &status_return);	340	KBUFSZ, &keysym, &status_return);
335	else	341	else
336	#endif	342	#endif
337	#endif	343	#endif
338	{	344	{
…		…
375	\|\| status_return == XLookupBoth;	381	\|\| status_return == XLookupBoth;
376	}	382	}
377	else	383	else
378	#endif	384	#endif
379	{	385	{
380	len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);	386	len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381	valid_keysym = keysym != NoSymbol;	387	valid_keysym = keysym != NoSymbol;
382	}	388	}
383		389
384	if (valid_keysym)	390	if (valid_keysym)
385	{	391	{
…		…
849	{	855	{
850	#ifdef META8_OPTION	856	#ifdef META8_OPTION
851	/* set 8-bit on */	857	/* set 8-bit on */
852	if (meta && (meta_char == 0x80))	858	if (meta && (meta_char == 0x80))
853	{	859	{
854	unsigned char *ch;	860	char *ch;
855		861
856	for (ch = kbuf; ch < kbuf + len; ch++)	862	for (ch = kbuf; ch < kbuf + len; ch++)
857	*ch \|= 0x80;	863	*ch \|= 0x80;
858		864
859	meta = 0;	865	meta = 0;
860	}	866	}
861	#endif	867	#endif
862	/* nil */ ;	868	/* nil */ ;
863	}	869	}
864	}	870	}
		871
		872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		873	return;
865		874
866	if (len <= 0)	875	if (len <= 0)
867	return; /* not mapped */	876	return; /* not mapped */
868		877
869	if (OPTION (Opt_scrollTtyKeypress))	878	if (OPTION (Opt_scrollTtyKeypress))
…		…
892	#ifdef META8_OPTION	901	#ifdef META8_OPTION
893	&& meta_char == C0_ESC	902	&& meta_char == C0_ESC
894	#endif	903	#endif
895	)	904	)
896	{	905	{
897	const unsigned char ch = C0_ESC;	906	const char ch = C0_ESC;
898	tt_write (&ch, 1);	907	tt_write (&ch, 1);
899	}	908	}
900		909
901	#if defined(DEBUG_CMD)	910	#if defined(DEBUG_CMD)
902	/* Display keyboard buffer contents */	911	/* Display keyboard buffer contents */
…		…
914		923
915	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
916	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
917	/* attempt to `write' count to the input buffer */	926	/* attempt to `write' count to the input buffer */
918	unsigned int	927	unsigned int
919	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	928	rxvt_term::cmd_write (const char *str, unsigned int count)
920	{	929	{
921	unsigned int n, s;	930	unsigned int n, s;
922		931
923	n = cmdbuf_ptr - cmdbuf_base;	932	n = cmdbuf_ptr - cmdbuf_base;
924	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;	933	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
…		…
961	}	970	}
962	#endif	971	#endif
963		972
964	if (want_refresh)	973	if (want_refresh)
965	{	974	{
		975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
		976	{
		977	int row = -view_start;
		978	int end_row = row + nrow;
		979
		980	while (row > -nsaved && ROW (row - 1).is_longer ())
		981	--row;
		982
		983	do
		984	{
		985	int start_row = row;
		986	line_t *l;
		987
		988	do
		989	{
		990	l = &ROW (row++);
		991
		992	if (!(l->f & LINE_FILTERED))
		993	{
		994	// line not filtered, mark it as filtered
		995	l->f \|= LINE_FILTERED;
		996	while (l->is_longer ())
		997	{
		998	l = &ROW (row++);
		999	l->f \|= LINE_FILTERED;
		1000	}
		1001
		1002	// and filter it
		1003	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
		1004
		1005	break;
		1006	}
		1007	}
		1008	while (l->is_longer () && row < end_row);
		1009	}
		1010	while (row < end_row);
		1011	}
		1012
966	scr_refresh (refresh_type);	1013	scr_refresh (refresh_type);
967	scrollbar_show (1);	1014	scrollbar_show (1);
968	#ifdef USE_XIM	1015	#ifdef USE_XIM
969	IMSendSpot ();	1016	IMSendSpot ();
970	#endif	1017	#endif
…		…
980	SET_LOCALE (locale);	1027	SET_LOCALE (locale);
981		1028
982	display->flush ();	1029	display->flush ();
983		1030
984	if (want_refresh && !flush_ev.active)	1031	if (want_refresh && !flush_ev.active)
985	flush_ev.start (NOW + 0.01);	1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986	}	1033	}
987		1034
988	void	1035	void
989	rxvt_term::flush_cb (time_watcher &w)	1036	rxvt_term::flush_cb (time_watcher &w)
990	{	1037	{
…		…
1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1112	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066	}	1113	}
1067	}	1114	}
1068	#endif	1115	#endif
1069		1116
		1117	#if HAVE_SCHED_YIELD
		1118	static struct event_handler
		1119	{
		1120	check_watcher cw_yield;
		1121
		1122	void yield (check_watcher &w)
		1123	{
		1124	sched_yield ();
		1125	w.stop ();
		1126	}
		1127
		1128	event_handler ()
		1129	: cw_yield (this, &event_handler::yield)
		1130	{
		1131	}
		1132	} event_handler;
		1133	#endif
		1134
1070	bool	1135	bool
1071	rxvt_term::pty_fill ()	1136	rxvt_term::pty_fill ()
1072	{	1137	{
1073	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1138	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074		1139
1075	if (CBUFSIZ == n)	1140	if (CBUFSIZ == n)
1076	{	1141	{
1077	rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");	1142	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078	n = 0;	1143	n = 0;
1079	}	1144	}
1080		1145
1081	memmove (cmdbuf_base, cmdbuf_ptr, n);	1146	memmove (cmdbuf_base, cmdbuf_ptr, n);
1082	cmdbuf_ptr = cmdbuf_base;	1147	cmdbuf_ptr = cmdbuf_base;
1083	cmdbuf_endp = cmdbuf_ptr + n;	1148	cmdbuf_endp = cmdbuf_ptr + n;
1084		1149
1085	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1150	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1086		1151
1087	if (n > 0)	1152	if (r > 0)
1088	{	1153	{
1089	cmdbuf_endp += n;	1154	cmdbuf_endp += r;
1090	return true;	1155	return true;
1091	}	1156	}
1092	else if ((n < 0 && errno != EAGAIN && errno != EINTR) \|\| n == 0)	1157	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
		1158	{
		1159	#if HAVE_SCHED_YIELD
		1160	if (display->is_local)
		1161	event_handler.cw_yield.start ();
		1162	#endif
		1163	}
		1164	else
1093	{	1165	{
1094	pty_ev.stop ();	1166	pty_ev.stop ();
1095		1167
1096	if (!OPTION (Opt_hold))	1168	if (!OPTION (Opt_hold))
1097	destroy ();	1169	destroy ();
…		…
1132		1204
1133	#ifdef POINTER_BLANK	1205	#ifdef POINTER_BLANK
1134	void	1206	void
1135	rxvt_term::pointer_blank ()	1207	rxvt_term::pointer_blank ()
1136	{	1208	{
1137	if (! OPTION (Opt_pointerBlank))	1209	if (!OPTION (Opt_pointerBlank))
1138	return;	1210	return;
1139		1211
1140	XDefineCursor (display->display, vt, display->blank_cursor);	1212	XDefineCursor (display->display, vt, display->blank_cursor);
1141	XFlush (display->display);	1213	XFlush (display->display);
1142		1214
…		…
1239	dDisp;	1311	dDisp;
1240		1312
1241	SET_R (this);	1313	SET_R (this);
1242	SET_LOCALE (locale);	1314	SET_LOCALE (locale);
1243		1315
1244	#if defined(CURSOR_BLINK)	1316	if (ev.xany.window == vt
1245	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1317	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1246	{	1318	return;
1247	if (hidden_cursor)
1248	{
1249	hidden_cursor = 0;
1250	want_refresh = 1;
1251	}
1252		1319
1253	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1320	// for XQueryPointer
1254	}
1255	#endif
1256
1257	#if defined(POINTER_BLANK)
1258	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259	{
1260	if (ev.type == MotionNotify
1261	\|\| ev.type == ButtonPress
1262	\|\| ev.type == ButtonRelease)
1263	if (hidden_pointer)
1264	pointer_unblank ();
1265
1266	if (ev.type == KeyPress && hidden_pointer == 0)
1267	pointer_blank ();
1268	}
1269	#endif
1270
1271	Window unused_root, unused_child;	1321	Window unused_root, unused_child;
1272	int unused_root_x, unused_root_y;	1322	int unused_root_x, unused_root_y;
1273	unsigned int unused_mask;	1323	unsigned int unused_mask;
1274		1324
1275	switch (ev.type)	1325	switch (ev.type)
…		…
1282		1332
1283	break;	1333	break;
1284		1334
1285	case KeyRelease:	1335	case KeyRelease:
1286	{	1336	{
1287	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1337	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1288	KeySym ks;	1338	KeySym keysym;
1289		1339
1290	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1340	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291	#endif	1341	#endif
1292		1342
1293	#if ENABLE_FRILLS \|\| ISO_14755	1343	#if ENABLE_FRILLS \|\| ISO_14755
1294	// ISO 14755 support	1344	// ISO 14755 support
1295	if (iso14755buf)	1345	if (iso14755buf)
…		…
1300	# endif	1350	# endif
1301	# if ISO_14755	1351	# if ISO_14755
1302	// iso14755 part 5.2 handling: release time	1352	// iso14755 part 5.2 handling: release time
1303	// first: controls	1353	// first: controls
1304	if ((ev.xkey.state & ControlMask)	1354	if ((ev.xkey.state & ControlMask)
1305	&& ((ks >= 0x40 && ks <= 0x5f)	1355	&& ((keysym >= 0x40 && keysym <= 0x5f)
1306	\|\| (ks >= 0x61 && ks <= 0x7f)))	1356	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1307	{	1357	{
1308	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1358	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1309	commit_iso14755 ();	1359	commit_iso14755 ();
1310	return; // case-break;	1360	goto skip_switch;
1311	}	1361	}
1312		1362
1313	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1363	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314	if (i[0] == ks)	1364	if (i[0] == keysym)
1315	{	1365	{
1316	iso14755buf = ISO_14755_51 \| i[1];	1366	iso14755buf = ISO_14755_51 \| i[1];
1317	commit_iso14755 ();	1367	commit_iso14755 ();
1318	return; // case-break;	1368	goto skip_switch;
1319	}	1369	}
1320		1370
1321	scr_bell ();	1371	scr_bell ();
1322	# endif	1372	# endif
1323	iso14755buf = 0;	1373	iso14755buf = 0;
…		…
1342	else	1392	else
1343	iso14755buf = 0;	1393	iso14755buf = 0;
1344	}	1394	}
1345	#endif	1395	#endif
1346		1396
		1397	if (ev.xany.window == vt
		1398	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1399	break;
		1400
1347	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1401	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348	if (!(ev.xkey.state & ControlMask))	1402	if (!(ev.xkey.state & ControlMask))
1349	slip_wheel_ev.stop ();	1403	slip_wheel_ev.stop ();
1350	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1404	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1351	mouse_slip_wheel_speed = 0;	1405	mouse_slip_wheel_speed = 0;
1352	#endif	1406	#endif
1353	break;	1407	break;
1354	}	1408	}
1355		1409
…		…
1485		1539
1486	case SelectionRequest:	1540	case SelectionRequest:
1487	selection_send (ev.xselectionrequest);	1541	selection_send (ev.xselectionrequest);
1488	break;	1542	break;
1489		1543
		1544	case MapNotify:
		1545	mapped = 1;
		1546	#ifdef TEXT_BLINK
		1547	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1548	#endif
		1549	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1550	break;
		1551
1490	case UnmapNotify:	1552	case UnmapNotify:
1491	mapped = 0;	1553	mapped = 0;
1492	#ifdef TEXT_BLINK	1554	#ifdef TEXT_BLINK
1493	text_blink_ev.stop ();	1555	text_blink_ev.stop ();
1494	#endif	1556	#endif
1495	break;	1557	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497	case MapNotify:
1498	mapped = 1;
1499	#ifdef TEXT_BLINK
1500	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501	#endif
1502	break;	1558	break;
1503		1559
1504	#ifdef TRANSPARENT	1560	#ifdef TRANSPARENT
1505	case ReparentNotify:	1561	case ReparentNotify:
1506	rootwin_cb (ev);	1562	rootwin_cb (ev);
…		…
1520		1576
1521	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1577	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1578	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1579	ev.xexpose.width, ev.xexpose.height, False);
1524		1580
1525	scr_refresh (refresh_type);	1581	want_refresh = 1;
1526	}	1582	}
1527	else	1583	else
1528	{	1584	{
1529	XEvent unused_event;	1585	XEvent unused_event;
1530		1586
…		…
1549	#endif	1605	#endif
1550	}	1606	}
1551	break;	1607	break;
1552		1608
1553	case MotionNotify:	1609	case MotionNotify:
		1610	printf ("motion notify\n");//D
1554	#ifdef POINTER_BLANK	1611	#ifdef POINTER_BLANK
1555	if (hidden_pointer)	1612	if (hidden_pointer)
1556	pointer_unblank ();	1613	pointer_unblank ();
1557	#endif	1614	#endif
1558	#if MENUBAR	1615	#if MENUBAR
…		…
1565	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1622	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566	break;	1623	break;
1567		1624
1568	if (ev.xany.window == vt)	1625	if (ev.xany.window == vt)
1569	{	1626	{
		1627	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1628	; // nop
1570	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1629	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1571	{	1630	{
1572	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1631	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573	;	1632	;
1574		1633
1575	XQueryPointer (disp, vt,	1634	XQueryPointer (disp, vt,
…		…
1655	&unused_root_x, &unused_root_y,	1714	&unused_root_x, &unused_root_y,
1656	&ev.xbutton.x, &ev.xbutton.y,	1715	&ev.xbutton.x, &ev.xbutton.y,
1657	&unused_mask);	1716	&unused_mask);
1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1717	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659	scrollbar_size ());	1718	scrollbar_size ());
1660	scr_refresh (refresh_type);	1719	want_refresh = 1;
1661	refresh_limit = 0;	1720	refresh_limit = 0;
1662	scrollbar_show (1);	1721	scrollbar_show (1);
1663	}	1722	}
1664	break;	1723	break;
1665	}	1724	}
		1725
		1726	skip_switch: ;
		1727
		1728	#if defined(CURSOR_BLINK)
		1729	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1730	{
		1731	if (hidden_cursor)
		1732	{
		1733	hidden_cursor = 0;
		1734	want_refresh = 1;
		1735	}
		1736
		1737	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1738	}
		1739	#endif
		1740
		1741	#if defined(POINTER_BLANK)
		1742	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1743	{
		1744	if (ev.type == MotionNotify
		1745	\|\| ev.type == ButtonPress
		1746	\|\| ev.type == ButtonRelease)
		1747	if (hidden_pointer)
		1748	pointer_unblank ();
		1749
		1750	if (ev.type == KeyPress && hidden_pointer == 0)
		1751	pointer_blank ();
		1752	}
		1753	#endif
1666	}	1754	}
1667		1755
1668	void	1756	void
1669	rxvt_term::focus_in ()	1757	rxvt_term::focus_in ()
1670	{	1758	{
1671	if (!focus)	1759	if (!focus)
1672	{	1760	{
1673	focus = 1;	1761	focus = 1;
1674	want_refresh = 1;	1762	want_refresh = 1;
		1763
		1764	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1765
1675	#if USE_XIM	1766	#if USE_XIM
1676	if (Input_Context != NULL)	1767	if (Input_Context != NULL)
1677	{	1768	{
1678	IMSetStatusPosition ();	1769	IMSetStatusPosition ();
1679	XSetICFocus (Input_Context);	1770	XSetICFocus (Input_Context);
…		…
1699	if (focus)	1790	if (focus)
1700	{	1791	{
1701	focus = 0;	1792	focus = 0;
1702	want_refresh = 1;	1793	want_refresh = 1;
1703		1794
		1795	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1796
1704	#if ENABLE_FRILLS \|\| ISO_14755	1797	#if ENABLE_FRILLS \|\| ISO_14755
		1798	if (iso14755buf)
		1799	{
1705	iso14755buf = 0;	1800	iso14755buf = 0;
1706	#endif
1707	#if ENABLE_OVERLAY	1801	# if ENABLE_OVERLAY
1708	scr_overlay_off ();	1802	scr_overlay_off ();
		1803	# endif
		1804	}
1709	#endif	1805	#endif
1710	#if USE_XIM	1806	#if USE_XIM
1711	if (Input_Context != NULL)	1807	if (Input_Context != NULL)
1712	XUnsetICFocus (Input_Context);	1808	XUnsetICFocus (Input_Context);
1713	#endif	1809	#endif
…		…
1757	rxvt_term::button_press (XButtonEvent &ev)	1853	rxvt_term::button_press (XButtonEvent &ev)
1758	{	1854	{
1759	int reportmode = 0, clickintime;	1855	int reportmode = 0, clickintime;
1760		1856
1761	bypass_keystate = ev.state & (ModMetaMask \| ShiftMask);	1857	bypass_keystate = ev.state & (ModMetaMask \| ShiftMask);
		1858
1762	if (!bypass_keystate)	1859	if (!bypass_keystate)
1763	reportmode = !! (priv_modes & PrivMode_mouse_report);	1860	reportmode = !! (priv_modes & PrivMode_mouse_report);
1764		1861
1765	/*	1862	/*
1766	* VT window processing of button press	1863	* VT window processing of button press
…		…
1786	#ifdef MOUSE_REPORT_DOUBLECLICK	1883	#ifdef MOUSE_REPORT_DOUBLECLICK
1787	if (ev.button == MEvent.button && clickintime)	1884	if (ev.button == MEvent.button && clickintime)
1788	{	1885	{
1789	/* same button, within alloted time */	1886	/* same button, within alloted time */
1790	MEvent.clicks++;	1887	MEvent.clicks++;
		1888
1791	if (MEvent.clicks > 1)	1889	if (MEvent.clicks > 1)
1792	{	1890	{
1793	/* only report double clicks */	1891	/* only report double clicks */
1794	MEvent.clicks = 2;	1892	MEvent.clicks = 2;
1795	mouse_report (ev);	1893	mouse_report (ev);
…		…
1815	else	1913	else
1816	{	1914	{
1817	if (ev.button != MEvent.button)	1915	if (ev.button != MEvent.button)
1818	MEvent.clicks = 0;	1916	MEvent.clicks = 0;
1819		1917
		1918	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820	switch (ev.button)	1919	switch (ev.button)
1821	{	1920	{
1822	case Button1:	1921	case Button1:
1823	/* allow meta + click to select rectangular areas */	1922	/* allow meta + click to select rectangular areas */
1824	/* should be done in screen.C */	1923	/* should be done in screen.C */
1825	#if ENABLE_FRILLS	1924	#if ENABLE_FRILLS
1826	selection.rect = !!(ev.state & ModMetaMask);	1925	selection.rect = !!(ev.state & ModMetaMask);
1827	#else	1926	#else
1828	selection.rect = false;	1927	selection.rect = false;
1829	#endif	1928	#endif
1830		1929
1831	/* allow shift+left click to extend selection */	1930	/* allow shift+left click to extend selection */
1832	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1931	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833	{	1932	{
1834	if (MEvent.button == Button1 && clickintime)	1933	if (MEvent.button == Button1 && clickintime)
1835	selection_rotate (ev.x, ev.y);	1934	selection_rotate (ev.x, ev.y);
1836	else	1935	else
1837	selection_extend (ev.x, ev.y, 1);	1936	selection_extend (ev.x, ev.y, 1);
1838	}	1937	}
1839	else	1938	else
1840	{	1939	{
1841	if (MEvent.button == Button1 && clickintime)	1940	if (MEvent.button == Button1 && clickintime)
1842	MEvent.clicks++;	1941	MEvent.clicks++;
1843	else	1942	else
1844	MEvent.clicks = 1;	1943	MEvent.clicks = 1;
1845		1944
1846	selection_click (MEvent.clicks, ev.x, ev.y);	1945	selection_click (MEvent.clicks, ev.x, ev.y);
1847	}	1946	}
1848		1947
1849	MEvent.button = Button1;	1948	MEvent.button = Button1;
1850	break;	1949	break;
1851		1950
1852	case Button3:	1951	case Button3:
1853	if (MEvent.button == Button3 && clickintime)	1952	if (MEvent.button == Button3 && clickintime)
1854	selection_rotate (ev.x, ev.y);	1953	selection_rotate (ev.x, ev.y);
1855	else	1954	else
1856	selection_extend (ev.x, ev.y, 1);	1955	selection_extend (ev.x, ev.y, 1);
1857		1956
1858	MEvent.button = Button3;	1957	MEvent.button = Button3;
1859	break;	1958	break;
1860	}	1959	}
1861	}	1960	}
1862		1961
1863	MEvent.time = ev.time;	1962	MEvent.time = ev.time;
1864	return;	1963	return;
1865	}	1964	}
1866		1965
…		…
2002	}	2101	}
2003		2102
2004	break;	2103	break;
2005	}	2104	}
2006	}	2105	}
		2106
2007	return;	2107	return;
2008	}	2108	}
		2109
2009	#if MENUBAR	2110	#if MENUBAR
2010	/*	2111	/*
2011	* Menubar window processing of button press	2112	* Menubar window processing of button press
2012	*/	2113	*/
2013	if (isMenuBarWindow (ev.window))	2114	if (isMenuBarWindow (ev.window))
…		…
2076	if (priv_modes & PrivMode_mouse_report	2177	if (priv_modes & PrivMode_mouse_report
2077	&& bypass_keystate	2178	&& bypass_keystate
2078	&& ev.button == Button1 && MEvent.clicks <= 1)	2179	&& ev.button == Button1 && MEvent.clicks <= 1)
2079	selection_extend (ev.x, ev.y, 0);	2180	selection_extend (ev.x, ev.y, 0);
2080		2181
		2182	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2183	return;
		2184
2081	switch (ev.button)	2185	switch (ev.button)
2082	{	2186	{
2083	case Button1:	2187	case Button1:
2084	case Button3:	2188	case Button3:
2085	selection_make (ev.time);	2189	selection_make (ev.time);
…		…
2116	slip_wheel_ev.start ();	2220	slip_wheel_ev.start ();
2117	}	2221	}
2118	else	2222	else
2119	{	2223	{
2120	# endif	2224	# endif
2121	# ifdef JUMP_MOUSE_WHEEL
2122	scr_page (v, i);	2225	scr_page (v, i);
2123	scr_refresh (SMOOTH_REFRESH);
2124	scrollbar_show (1);	2226	scrollbar_show (1);
2125	# else
2126	while (i--)
2127	{
2128	scr_page (v, 1);
2129	scr_refresh (SMOOTH_REFRESH);
2130	scrollbar_show (1);
2131	}
2132	# endif
2133	# ifdef MOUSE_SLIP_WHEELING	2227	# ifdef MOUSE_SLIP_WHEELING
2134	}	2228	}
2135	#endif	2229	# endif
2136	}	2230	}
2137	break;	2231	break;
2138	#endif	2232	#endif
2139	}	2233	}
2140	}	2234	}
…		…
2629		2723
2630	bool	2724	bool
2631	rxvt_term::cmd_parse ()	2725	rxvt_term::cmd_parse ()
2632	{	2726	{
2633	bool flag = false;	2727	bool flag = false;
2634	unicode_t ch = NOCHAR;	2728	wchar_t ch = NOCHAR;
2635	unsigned char *seq_begin; // remember start of esc-sequence here	2729	char *seq_begin; // remember start of esc-sequence here
2636		2730
2637	for (;;)	2731	for (;;)
2638	{	2732	{
2639	if (ch == NOCHAR)	2733	if (ch == NOCHAR)
2640	{	2734	{
2641	seq_begin = cmdbuf_ptr;	2735	seq_begin = cmdbuf_ptr;
2642	ch = next_char ();	2736	ch = next_char ();
2643	}
2644		2737
2645	if (ch == NOCHAR) // TODO: improve	2738	if (ch == NOCHAR)
2646	break;	2739	break;
		2740	}
2647		2741
2648	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2742	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)
2649	{	2743	{
2650	if (!seen_input)	2744	if (!seen_input)
2651	{	2745	{
…		…
2660	if (seen_resize && cmd_pid)	2754	if (seen_resize && cmd_pid)
2661	kill (-cmd_pid, SIGWINCH);	2755	kill (-cmd_pid, SIGWINCH);
2662	}	2756	}
2663		2757
2664	/* Read a text string from the input buffer */	2758	/* Read a text string from the input buffer */
2665	unicode_t buf[UBUFSIZ];	2759	wchar_t buf[UBUFSIZ];
2666	bool refreshnow = false;	2760	bool refreshnow = false;
2667	int nlines = 0;	2761	int nlines = 0;
2668	unicode_t *str = buf;	2762	wchar_t *str = buf;
2669	unicode_t *eol = str + min (ncol, UBUFSIZ);	2763	wchar_t *eol = str + min (ncol, UBUFSIZ);
2670		2764
2671	for (;;)	2765	for (;;)
2672	{	2766	{
2673	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2767	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674	break;	2768	break;
…		…
2684		2778
2685	if (!OPTION (Opt_jumpScroll)	2779	if (!OPTION (Opt_jumpScroll)
2686	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2780	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2687	{	2781	{
2688	refreshnow = true;	2782	refreshnow = true;
		2783	refresh_count = 0;
2689	ch = NOCHAR;	2784	ch = NOCHAR;
2690	break;	2785	break;
2691	}	2786	}
2692		2787
2693	// scr_add_lines only works for nlines <= nrow - 1.	2788	// scr_add_lines only works for nlines <= nrow - 1.
2694	if (nlines >= nrow - 1)	2789	if (nlines >= nrow - 1)
2695	{	2790	{
		2791	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2696	scr_add_lines (buf, nlines, str - buf);	2792	scr_add_lines (buf, str - buf, nlines);
		2793
2697	nlines = 0;	2794	nlines = 0;
2698	str = buf;	2795	str = buf;
2699	eol = str + min (ncol, UBUFSIZ);	2796	eol = str + min (ncol, UBUFSIZ);
2700	}	2797	}
2701		2798
…		…
2714		2811
2715	seq_begin = cmdbuf_ptr;	2812	seq_begin = cmdbuf_ptr;
2716	ch = next_char ();	2813	ch = next_char ();
2717	}	2814	}
2718		2815
		2816	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2719	scr_add_lines (buf, nlines, str - buf);	2817	scr_add_lines (buf, str - buf, nlines);
2720		2818
2721	/*	2819	/*
2722	* If there have been a lot of new lines, then update the screen	2820	* If there have been a lot of new lines, then update the screen
2723	* What the heck I'll cheat and only refresh less than every page-full.	2821	* What the heck I'll cheat and only refresh less than every page-full.
2724	* the number of pages between refreshes is refresh_limit, which	2822	* the number of pages between refreshes is refresh_limit, which
…		…
2730	refresh_limit++;	2828	refresh_limit++;
2731	else	2829	else
2732	{	2830	{
2733	flag = true;	2831	flag = true;
2734	scr_refresh (refresh_type);	2832	scr_refresh (refresh_type);
		2833	want_refresh = 1;
2735	}	2834	}
2736	}	2835	}
2737		2836
2738	}	2837	}
2739	else	2838	else
…		…
2754	}	2853	}
2755		2854
2756	return flag;	2855	return flag;
2757	}	2856	}
2758		2857
2759	// read the next octet
2760	unicode_t
2761	rxvt_term::next_octet ()
2762	{
2763	return cmdbuf_ptr < cmdbuf_endp
2764	? *cmdbuf_ptr++
2765	: NOCHAR;
2766	}
2767
2768	// read the next character	2858	// read the next character
2769	unicode_t	2859	wchar_t
2770	rxvt_term::next_char ()	2860	rxvt_term::next_char ()
2771	{	2861	{
2772	while (cmdbuf_ptr < cmdbuf_endp)	2862	while (cmdbuf_ptr < cmdbuf_endp)
2773	{	2863	{
2774	// assume 7-bit to be ascii ALWAYS	2864	// assume 7-bit to be ascii ALWAYS
2775	if (cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2865	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
2776	return *cmdbuf_ptr++;	2866	return *cmdbuf_ptr++;
2777		2867
2778	wchar_t wc;	2868	wchar_t wc;
2779	size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2869	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780		2870
2781	if (len == (size_t)-2)	2871	if (len == (size_t)-2)
2782	{	2872	{
2783	// the mbstate stores incomplete sequences. didn't know this :/	2873	// the mbstate stores incomplete sequences. didn't know this :/
2784	cmdbuf_ptr = cmdbuf_endp;	2874	cmdbuf_ptr = cmdbuf_endp;
2785	break;	2875	break;
2786	}	2876	}
2787		2877
2788	if (len == (size_t)-1)	2878	if (len == (size_t)-1)
2789	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2879	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790		2880
2791	// assume wchar == unicode	2881	// assume wchar == unicode
2792	cmdbuf_ptr += len;	2882	cmdbuf_ptr += len;
2793	return wc & UNICODE_MASK;	2883	return wc & UNICODE_MASK;
2794	}	2884	}
2795		2885
2796	return NOCHAR;	2886	return NOCHAR;
		2887	}
		2888
		2889	// read the next octet
		2890	uint32_t
		2891	rxvt_term::next_octet ()
		2892	{
		2893	return cmdbuf_ptr < cmdbuf_endp
		2894	? (unsigned char)*cmdbuf_ptr++
		2895	: NOCHAR;
2797	}	2896	}
2798		2897
2799	/* rxvt_cmd_getc () - Return next input character */	2898	/* rxvt_cmd_getc () - Return next input character */
2800	/*	2899	/*
2801	* Return the next input character after first passing any keyboard input	2900	* Return the next input character after first passing any keyboard input
2802	* to the command.	2901	* to the command.
2803	*/	2902	*/
2804	unicode_t	2903	wchar_t
2805	rxvt_term::cmd_getc ()	2904	rxvt_term::cmd_getc ()
2806	{	2905	{
2807	unicode_t c = next_char ();	2906	wchar_t c = next_char ();
2808		2907
2809	if (c == NOCHAR)	2908	if (c == NOCHAR)
2810	throw out_of_input;	2909	throw out_of_input;
2811		2910
2812	return c;	2911	return c;
2813	}	2912	}
2814		2913
2815	unicode_t	2914	uint32_t
2816	rxvt_term::cmd_get8 ()	2915	rxvt_term::cmd_get8 ()
2817	{	2916	{
2818	unicode_t c = next_octet ();	2917	uint32_t c = next_octet ();
2819		2918
2820	if (c == NOCHAR)	2919	if (c == NOCHAR)
2821	throw out_of_input;	2920	throw out_of_input;
2822		2921
2823	return c;	2922	return c;
…		…
2923	case C0_ESC:	3022	case C0_ESC:
2924	process_escape_seq ();	3023	process_escape_seq ();
2925	break;	3024	break;
2926	case C0_ENQ: /* terminal Status */	3025	case C0_ENQ: /* terminal Status */
2927	if (rs[Rs_answerbackstring])	3026	if (rs[Rs_answerbackstring])
2928	tt_write ((const unsigned char *)rs[Rs_answerbackstring],	3027	tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929	(unsigned int)strlen (rs[Rs_answerbackstring]));
2930	else	3028	else
2931	tt_write ((unsigned char *)VT100_ANS,	3029	tt_write (VT100_ANS, strlen (VT100_ANS));
2932	(unsigned int)strlen (VT100_ANS));
2933	break;	3030	break;
2934	case C0_BEL: /* bell */	3031	case C0_BEL: /* bell */
2935	scr_bell ();	3032	scr_bell ();
2936	break;	3033	break;
2937	case C0_BS: /* backspace */	3034	case C0_BS: /* backspace */
…		…
3092	break;	3189	break;
3093		3190
3094	/* 8.3.87: NEXT LINE */	3191	/* 8.3.87: NEXT LINE */
3095	case C1_NEL: /* ESC E */	3192	case C1_NEL: /* ESC E */
3096	{	3193	{
3097	unicode_t nlcr[] = { C0_LF, C0_CR };	3194	wchar_t nlcr[] = { C0_LF, C0_CR };
3098	scr_add_lines (nlcr, 1, 2);	3195	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099	}	3196	}
3100	break;	3197	break;
3101		3198
3102	/* kidnapped escape sequence: Should be 8.3.48 */	3199	/* kidnapped escape sequence: Should be 8.3.48 */
3103	case C1_ESA: /* ESC G */	3200	case C1_ESA: /* ESC G */
…		…
3125	process_dcs_seq ();	3222	process_dcs_seq ();
3126	break;	3223	break;
3127		3224
3128	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	3225	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129	case C1_SCI: /* ESC Z */	3226	case C1_SCI: /* ESC Z */
3130	tt_write ((const unsigned char *)ESCZ_ANSWER,	3227	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131	(unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132	break; /* steal obsolete ESC [ c */	3228	break; /* steal obsolete ESC [ c */
3133		3229
3134	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	3230	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135	case C1_CSI: /* ESC [ */	3231	case C1_CSI: /* ESC [ */
3136	process_csi_seq ();	3232	process_csi_seq ();
…		…
3380	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3476	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);	3477	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382	break;	3478	break;
3383		3479
3384	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3480	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385	tt_write ((const unsigned char *)VT100_ANS,	3481	tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386	(unsigned int) (sizeof (VT100_ANS) - 1));
3387	break;	3482	break;
3388		3483
3389	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	3484	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390	process_sgr_mode (nargs, arg);	3485	process_sgr_mode (nargs, arg);
3391	break;	3486	break;
…		…
3593	/----------------------------------------------------------------------/	3688	/----------------------------------------------------------------------/
3594	/*	3689	/*
3595	* get input up until STRING TERMINATOR (or BEL)	3690	* get input up until STRING TERMINATOR (or BEL)
3596	* ends_how is terminator used. returned input must be free()'d	3691	* ends_how is terminator used. returned input must be free()'d
3597	*/	3692	*/
3598	unsigned char *	3693	char *
3599	rxvt_term::get_to_st (unicode_t &ends_how)	3694	rxvt_term::get_to_st (unicode_t &ends_how)
3600	{	3695	{
3601	unicode_t ch;	3696	unicode_t ch;
3602	bool seen_esc = false;	3697	bool seen_esc = false;
3603	unsigned int n = 0;	3698	unsigned int n = 0;
…		…
3636		3731
3637	string[n++] = '\0';	3732	string[n++] = '\0';
3638		3733
3639	ends_how = (ch == 0x5c ? C0_ESC : ch);	3734	ends_how = (ch == 0x5c ? C0_ESC : ch);
3640		3735
3641	return (unsigned char *)rxvt_wcstombs (string);	3736	return rxvt_wcstombs (string);
3642	}	3737	}
3643		3738
3644	/----------------------------------------------------------------------/	3739	/----------------------------------------------------------------------/
3645	/*	3740	/*
3646	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3741	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3647	*/	3742	*/
3648	void	3743	void
3649	rxvt_term::process_dcs_seq ()	3744	rxvt_term::process_dcs_seq ()
3650	{	3745	{
3651	unsigned char *s;	3746	char *s;
3652	unicode_t eh;	3747	unicode_t eh;
3653		3748
3654	/*	3749	/*
3655	* Not handled yet	3750	* Not handled yet
3656	*/	3751	*/
…		…
3675	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3770	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676	arg = arg * 10 + (ch - '0');	3771	arg = arg * 10 + (ch - '0');
3677		3772
3678	if (ch == ';')	3773	if (ch == ';')
3679	{	3774	{
3680	unsigned char *s = get_to_st (eh);	3775	char *s = get_to_st (eh);
3681		3776
3682	if (s)	3777	if (s)
3683	{	3778	{
3684	process_xterm_seq (arg, (char *)s, eh);	3779	process_xterm_seq (arg, s, eh);
3685	free (s);	3780	free (s);
3686	}	3781	}
3687	}	3782	}
3688	}	3783	}
3689		3784
3690	void	3785	void
3691	rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)	3786	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692	{	3787	{
3693	if (str[0] == '?' && !str[1])	3788	if (str[0] == '?' && !str[1])
3694	{	3789	{
3695	unsigned short r, g, b;	3790	unsigned short r, g, b;
3696	pix_colors_focused[color].get (display, r, g, b);	3791	pix_colors_focused[color].get (display, r, g, b);
…		…
3702		3797
3703	/*	3798	/*
3704	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3799	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3705	*/	3800	*/
3706	void	3801	void
3707	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3802	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708	{	3803	{
3709	int changed = 0;	3804	int changed = 0;
3710	int color;	3805	int color;
3711	char buf, name;	3806	char buf, name;
3712	bool query = str[0] == '?' && !str[1];	3807	bool query = str[0] == '?' && !str[1];
…		…
3769	{	3864	{
3770	if ((name = strchr (buf, ';')) == NULL)	3865	if ((name = strchr (buf, ';')) == NULL)
3771	break;	3866	break;
3772		3867
3773	*name++ = '\0';	3868	*name++ = '\0';
3774	color = atoi (buf);	3869	color = atoi (buf) + minCOLOR;
3775		3870
3776	if (color < 0 \|\| color >= TOTAL_COLORS)	3871	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777	break;	3872	break;
3778		3873
3779	if ((buf = strchr (name, ';')) != NULL)	3874	if ((buf = strchr (name, ';')) != NULL)
3780	*buf++ = '\0';	3875	*buf++ = '\0';
3781		3876
3782	if (name[0] == '?' && !name[1])	3877	if (name[0] == '?' && !name[1])
3783	{	3878	{
3784	unsigned short r, g, b;	3879	unsigned short r, g, b;
3785	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3880	pix_colors_focused[color].get (display, r, g, b);
3786	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3881	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787	}	3882	}
3788	else	3883	else
3789	set_window_color (color + minCOLOR, name);	3884	set_window_color (color, name);
3790	}	3885	}
3791	break;	3886	break;
3792	case XTerm_Color00:	3887	case XTerm_Color00:
3793	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3888	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3794	break;	3889	break;
3795	case XTerm_Color01:	3890	case XTerm_Color01:
3796	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3891	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3797	break;	3892	break;
3798	#ifndef NO_CURSORCOLOR	3893	#ifndef NO_CURSORCOLOR
3799	case XTerm_Color_cursor:	3894	case XTerm_Color_cursor:
3800	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3895	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3801	break;	3896	break;
…		…
3805	break;	3900	break;
3806	case XTerm_Color_pointer_bg:	3901	case XTerm_Color_pointer_bg:
3807	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3902	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3808	break;	3903	break;
3809	#ifndef NO_BOLD_UNDERLINE_REVERSE	3904	#ifndef NO_BOLD_UNDERLINE_REVERSE
3810	case XTerm_Color_BD:
3811	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812	break;
3813	case XTerm_Color_UL:
3814	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815	break;
3816	case XTerm_Color_RV:	3905	case XTerm_Color_RV:
3817	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3906	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3907	break;
		3908	case Rxvt_Color_BD:
		3909	case URxvt_Color_BD:
		3910	process_color_seq (op, Color_BD, str, resp);
		3911	break;
		3912	case Rxvt_Color_UL:
		3913	case URxvt_Color_UL:
		3914	process_color_seq (op, Color_UL, str, resp);
3818	break;	3915	break;
3819	case URxvt_Color_IT:	3916	case URxvt_Color_IT:
3820	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3917	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821	break;	3918	break;
3822	#endif	3919	#endif
…		…
3827	if (am_transparent)	3924	if (am_transparent)
3828	want_full_refresh = want_refresh = 1;	3925	want_full_refresh = want_refresh = 1;
3829	break;	3926	break;
3830	#endif	3927	#endif
3831		3928
3832	case XTerm_Pixmap:	3929	case Rxvt_Pixmap:
3833	if (*str != ';')	3930	if (*str != ';')
3834	{	3931	{
3835	#if XPM_BACKGROUND	3932	#if XPM_BACKGROUND
3836	scale_pixmap (""); /* reset to default scaling */	3933	scale_pixmap (""); /* reset to default scaling */
3837	set_bgPixmap (str); /* change pixmap */	3934	set_bgPixmap (str); /* change pixmap */
3838	#endif
3839	scr_touch (true);	3935	scr_touch (true);
		3936	#endif
3840	}	3937	}
		3938
3841	while ((str = strchr (str, ';')) != NULL)	3939	while ((str = strchr (str, ';')) != NULL)
3842	{	3940	{
3843	str++;	3941	str++;
3844	#if XPM_BACKGROUND	3942	#if XPM_BACKGROUND
3845	changed += scale_pixmap (str);	3943	changed += scale_pixmap (str);
…		…
3848		3946
3849	if (changed)	3947	if (changed)
3850	{	3948	{
3851	#ifdef XPM_BACKGROUND	3949	#ifdef XPM_BACKGROUND
3852	resize_pixmap ();	3950	resize_pixmap ();
3853	#endif
3854	scr_touch (true);	3951	scr_touch (true);
		3952	#endif
3855	}	3953	}
3856	break;	3954	break;
3857		3955
3858	case XTerm_restoreFG:	3956	case Rxvt_restoreFG:
3859	set_window_color (Color_fg, str);	3957	set_window_color (Color_fg, str);
3860	break;	3958	break;
3861	case XTerm_restoreBG:	3959	case Rxvt_restoreBG:
3862	set_window_color (Color_bg, str);	3960	set_window_color (Color_bg, str);
3863	break;	3961	break;
3864		3962
3865	case XTerm_logfile:	3963	case XTerm_logfile:
3866	// TODO, when secure mode?	3964	// TODO, when secure mode?
…		…
3871	if (OPTION (Opt_insecure))	3969	if (OPTION (Opt_insecure))
3872	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3970	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873	break;	3971	break;
3874	#endif	3972	#endif
3875	#if 0	3973	#if 0
3876	case XTerm_dumpscreen: /* no error notices */	3974	case Rxvt_dumpscreen: /* no error notices */
3877	{	3975	{
3878	int fd;	3976	int fd;
3879	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3977	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3880	{	3978	{
3881	scr_dump (fd);	3979	scr_dump (fd);
…		…
3919	}	4017	}
3920	break;	4018	break;
3921		4019
3922	case URxvt_view_up:	4020	case URxvt_view_up:
3923	case URxvt_view_down:	4021	case URxvt_view_down:
		4022	{
3924	int lines = atoi (str);	4023	int lines = atoi (str);
3925		4024
3926	if (lines)	4025	if (lines)
3927	scr_page (op == URxvt_view_up ? UP : DN, lines);	4026	scr_page (op == URxvt_view_up ? UP : DN, lines);
3928	else	4027	else
3929	{
3930	scr_erase_savelines ();	4028	scr_erase_savelines ();
3931	}	4029	}
3932		4030
		4031	break;
		4032	#endif
		4033
		4034	#if ENABLE_PERL
		4035	case URxvt_perl:
		4036	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
		4037	; // no responses yet
3933	break;	4038	break;
3934	#endif	4039	#endif
3935	}	4040	}
3936	}	4041	}
3937	/----------------------------------------------------------------------/	4042	/----------------------------------------------------------------------/
…		…
4048	/* extra handling for values with state unkept */	4153	/* extra handling for values with state unkept */
4049	switch (arg[i])	4154	switch (arg[i])
4050	{	4155	{
4051	#if ENABLE_STYLES	4156	#if ENABLE_STYLES
4052	case 1021:	4157	case 1021:
4053	if (mode)	4158	set_option (Opt_intensityStyles, mode);
4054	SET_OPTION (Opt_intensityStyles);	4159
		4160	scr_touch (true);
4055	else	4161	break;
4056	CLR_OPTION (Opt_intensityStyles);
4057	#endif	4162	#endif
4058	case 1048: /* alternative cursor save */	4163	case 1048: /* alternative cursor save */
4059	case 1049:	4164	case 1049:
4060	if (OPTION (Opt_secondaryScreen))	4165	if (OPTION (Opt_secondaryScreen))
4061	if (mode == 0)	4166	if (mode == 0)
…		…
4080	case 3: /* 80/132 */	4185	case 3: /* 80/132 */
4081	if (priv_modes & PrivMode_132OK)	4186	if (priv_modes & PrivMode_132OK)
4082	set_widthheight (((state ? 132 : 80) * fwidth), height);	4187	set_widthheight (((state ? 132 : 80) * fwidth), height);
4083	break;	4188	break;
4084	case 4: /* smooth scrolling */	4189	case 4: /* smooth scrolling */
4085	if (!state)	4190	set_option (Opt_jumpScroll, !state);
4086	SET_OPTION (Opt_jumpScroll);
4087	else
4088	CLR_OPTION (Opt_jumpScroll);
4089	break;	4191	break;
4090	case 5: /* reverse video */	4192	case 5: /* reverse video */
4091	scr_rvideo_mode (state);	4193	scr_rvideo_mode (state);
4092	break;	4194	break;
4093	case 6: /* relative/absolute origins */	4195	case 6: /* relative/absolute origins */
…		…
4134	#if 0	4236	#if 0
4135	case 1001:	4237	case 1001:
4136	break; /* X11 mouse highlighting */	4238	break; /* X11 mouse highlighting */
4137	#endif	4239	#endif
4138	case 1010: /* scroll to bottom on TTY output inhibit */	4240	case 1010: /* scroll to bottom on TTY output inhibit */
4139	if (!state)	4241	set_option (Opt_scrollTtyOutput, !state);
4140	SET_OPTION (Opt_scrollTtyOutput);
4141	else
4142	CLR_OPTION (Opt_scrollTtyOutput);
4143	break;	4242	break;
4144	case 1011: /* scroll to bottom on key press */	4243	case 1011: /* scroll to bottom on key press */
4145	if (state)	4244	set_option (Opt_scrollTtyKeypress, state);
4146	SET_OPTION (Opt_scrollTtyKeypress);
4147	else
4148	CLR_OPTION (Opt_scrollTtyKeypress);
4149	break;	4245	break;
4150	case 1047: /* secondary screen w/ clearing last */	4246	case 1047: /* secondary screen w/ clearing last */
4151	if (OPTION (Opt_secondaryScreen))	4247	if (OPTION (Opt_secondaryScreen))
4152	if (current_screen != PRIMARY)	4248	if (current_screen != PRIMARY)
4153	scr_erase_screen (2);	4249	scr_erase_screen (2);
…		…
4291	scr_color (Color_bg, Color_bg);	4387	scr_color (Color_bg, Color_bg);
4292	break;	4388	break;
4293		4389
4294	//case 50: // not variable spacing	4390	//case 50: // not variable spacing
4295		4391
4296	#ifndef NO_BRIGHTCOLOR	4392	#if ENABLE_FRILLS
4297	case 90:	4393	case 90:
4298	case 91: /* set bright fg color */	4394	case 91: /* set bright fg color */
4299	case 92:	4395	case 92:
4300	case 93:	4396	case 93:
4301	case 94:	4397	case 94:
…		…
4313	case 106:	4409	case 106:
4314	case 107:	4410	case 107:
4315	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4411	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4316	break;	4412	break;
4317	#endif	4413	#endif
4318
4319	}	4414	}
4320	}	4415	}
4321	}	4416	}
4322	/}}} /	4417	/}}} /
4323		4418
…		…
4347	*/	4442	*/
4348	void	4443	void
4349	rxvt_term::tt_printf (const char *fmt,...)	4444	rxvt_term::tt_printf (const char *fmt,...)
4350	{	4445	{
4351	va_list arg_ptr;	4446	va_list arg_ptr;
4352	unsigned char buf[256];	4447	char buf[256];
4353		4448
4354	va_start (arg_ptr, fmt);	4449	va_start (arg_ptr, fmt);
4355	vsnprintf ((char *)buf, 256, fmt, arg_ptr);	4450	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4356	va_end (arg_ptr);	4451	va_end (arg_ptr);
4357	tt_write (buf, strlen (buf));	4452	tt_write (buf, strlen (buf));
…		…
4362	* or generated by us in response to a query ESC sequence.	4457	* or generated by us in response to a query ESC sequence.
4363	*/	4458	*/
4364	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4459	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4365		4460
4366	void	4461	void
4367	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4462	rxvt_term::tt_write (const char *data, unsigned int len)
4368	{	4463	{
		4464	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4465	return;
		4466
		4467	if (pty.pty < 0)
		4468	return;
		4469
4369	if (v_buflen == 0)	4470	if (v_buflen == 0)
4370	{	4471	{
4371	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4472	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4372		4473
4373	if ((unsigned int)written == len)	4474	if ((unsigned int)written == len)
…		…
4375		4476
4376	data += written;	4477	data += written;
4377	len -= written;	4478	len -= written;
4378	}	4479	}
4379		4480
4380	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);	4481	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4381		4482
4382	memcpy (v_buffer + v_buflen, data, len);	4483	memcpy (v_buffer + v_buflen, data, len);
4383	v_buflen += len;	4484	v_buflen += len;
4384		4485
4385	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4486	pty_ev.set (EVENT_READ \| EVENT_WRITE);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC vs. Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC