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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.242 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC

…		…
147	\|\| !IN_RANGE_EXC (y, 0, nrow))	147	\|\| !IN_RANGE_EXC (y, 0, nrow))
148	return;	148	return;
149		149
150	for (;;)	150	for (;;)
151	{	151	{
152	const line_t &l = ROW(y - view_start);	152	const line_t &l = ROW(y + view_start);
153		153
154	text_t t = l.t[x];	154	text_t t = l.t[x];
155		155
156	if (t != NOCHAR \|\| !x)	156	if (t != NOCHAR \|\| !x)
157	{	157	{
…		…
443	scr_move_to (0, 1);	443	scr_move_to (0, 1);
444	return;	444	return;
445	}	445	}
446	else if (keysym == XK_End)	446	else if (keysym == XK_End)
447	{	447	{
448	scr_move_to (1, 0);	448	scr_move_to (1, 1);
449	return;	449	return;
450	}	450	}
451	}	451	}
452	#endif	452	#endif
453	}	453	}
…		…
867	#endif	867	#endif
868	/* nil */ ;	868	/* nil */ ;
869	}	869	}
870	}	870	}
871		871
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))	872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	873	return;
874		874
875	if (len <= 0)	875	if (len <= 0)
876	return; /* not mapped */	876	return; /* not mapped */
877		877
…		…
972		972
973	if (want_refresh)	973	if (want_refresh)
974	{	974	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	976	{
977	int row = -view_start;	977	int row = view_start;
		978	int end_row = row + nrow;
978		979
979	while (row > -nsaved && ROW (row - 1).is_longer ())	980	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	981	--row;
981		982
982	while (row < -view_start + nrow)	983	do
983	{	984	{
984	int start_row = row;	985	int start_row = row;
985	line_t *l;	986	line_t *l;
986		987
987	do	988	do
988	{	989	{
989	l = &ROW (row);	990	l = &ROW (row++);
990		991
991	if (!(l->f & LINE_FILTERED))	992	if (!(l->f & LINE_FILTERED))
992	{	993	{
993	// line not filtered, mark it as filtered	994	// line not filtered, mark it as filtered
994	l->f \|= LINE_FILTERED;	995	l->f \|= LINE_FILTERED;
995	while (l->is_longer ())	996	while (l->is_longer ())
996	{	997	{
997	l = &ROW (++row);	998	l = &ROW (row++);
998	l->f \|= LINE_FILTERED;	999	l->f \|= LINE_FILTERED;
999	}	1000	}
1000		1001
1001	// and filter it	1002	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	1003	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		1004
1004	break;	1005	break;
1005	}	1006	}
1006	}	1007	}
1007	while (l->is_longer ());	1008	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	1009	}
1011		1010	while (row < end_row);
1012	}	1011	}
1013		1012
1014	scr_refresh (refresh_type);	1013	scr_refresh (refresh_type);
1015	scrollbar_show (1);	1014	scrollbar_show (1);
1016	#ifdef USE_XIM	1015	#ifdef USE_XIM
…		…
1022	}	1021	}
1023		1022
1024	void	1023	void
1025	rxvt_term::check_cb (check_watcher &w)	1024	rxvt_term::check_cb (check_watcher &w)
1026	{	1025	{
1027	SET_R (this);	1026	make_current ();
1028	SET_LOCALE (locale);
1029		1027
1030	display->flush ();	1028	display->flush ();
1031		1029
1032	if (want_refresh && !flush_ev.active)	1030	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1031	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1032	}
1035		1033
1036	void	1034	void
1037	rxvt_term::flush_cb (time_watcher &w)	1035	rxvt_term::flush_cb (time_watcher &w)
1038	{	1036	{
1039	SET_R (this);	1037	make_current ();
1040	SET_LOCALE (locale);
1041		1038
1042	refresh_limit = 1;	1039	refresh_limit = 1;
1043	refresh_count = 0;	1040	refresh_count = 0;
1044	flush ();	1041	flush ();
1045	}	1042	}
…		…
1102	{	1099	{
1103	if (mouse_slip_wheel_speed == 0	1100	if (mouse_slip_wheel_speed == 0
1104	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1101	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1102	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1103	{
1107	if (view_start == nsaved \|\|	1104	if (view_start == top_row \|\| view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1105	mouse_slip_wheel_speed = 0;
1110		1106
1111	refresh_type \|= SMOOTH_REFRESH;	1107	refresh_type \|= SMOOTH_REFRESH;
1112	want_refresh = 1;	1108	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1174	}	1170	}
1175		1171
1176	void	1172	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1173	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1174	{
1179	SET_R (this);	1175	make_current ();
1180	SET_LOCALE (locale);
1181		1176
1182	if (revents & EVENT_READ)	1177	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1178	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1179	while (pty_fill ())
1185	if (cmd_parse ())	1180	if (cmd_parse ())
…		…
1217	}	1212	}
1218		1213
1219	void	1214	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1215	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1216	{
1222	SET_R (this);	1217	make_current ();
1223	SET_LOCALE (locale);
1224		1218
1225	pointer_blank ();	1219	pointer_blank ();
1226	}	1220	}
1227	#endif	1221	#endif
1228		1222
…		…
1307		1301
1308	/{{{ process an X event /	1302	/{{{ process an X event /
1309	void	1303	void
1310	rxvt_term::x_cb (XEvent &ev)	1304	rxvt_term::x_cb (XEvent &ev)
1311	{	1305	{
		1306	make_current ();
		1307
1312	dDisp;	1308	dDisp;
1313		1309
1314	SET_R (this);	1310	if (ev.xany.window == vt
1315	SET_LOCALE (locale);	1311	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1312	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1313	return;
1316		1314
1317	#if defined(CURSOR_BLINK)	1315	// for XQueryPointer
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1319	{
1320	if (hidden_cursor)
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1327	}
1328	#endif
1329
1330	#if defined(POINTER_BLANK)
1331	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332	{
1333	if (ev.type == MotionNotify
1334	\|\| ev.type == ButtonPress
1335	\|\| ev.type == ButtonRelease)
1336	if (hidden_pointer)
1337	pointer_unblank ();
1338
1339	if (ev.type == KeyPress && hidden_pointer == 0)
1340	pointer_blank ();
1341	}
1342	#endif
1343
1344	Window unused_root, unused_child;	1316	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1317	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1318	unsigned int unused_mask;
1347		1319
1348	switch (ev.type)	1320	switch (ev.type)
…		…
1355		1327
1356	break;	1328	break;
1357		1329
1358	case KeyRelease:	1330	case KeyRelease:
1359	{	1331	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1332	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1361	KeySym ks;	1333	KeySym keysym;
1362		1334
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1335	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1336	#endif
1365		1337
1366	#if ENABLE_FRILLS \|\| ISO_14755	1338	#if ENABLE_FRILLS \|\| ISO_14755
1367	// ISO 14755 support	1339	// ISO 14755 support
1368	if (iso14755buf)	1340	if (iso14755buf)
…		…
1373	# endif	1345	# endif
1374	# if ISO_14755	1346	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1347	// iso14755 part 5.2 handling: release time
1376	// first: controls	1348	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1349	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1350	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	\|\| (ks >= 0x61 && ks <= 0x7f)))	1351	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1352	{
1381	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1353	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1382	commit_iso14755 ();	1354	commit_iso14755 ();
1383	return; // case-break;	1355	goto skip_switch;
1384	}	1356	}
1385		1357
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1358	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1359	if (i[0] == keysym)
1388	{	1360	{
1389	iso14755buf = ISO_14755_51 \| i[1];	1361	iso14755buf = ISO_14755_51 \| i[1];
1390	commit_iso14755 ();	1362	commit_iso14755 ();
1391	return; // case-break;	1363	goto skip_switch;
1392	}	1364	}
1393		1365
1394	scr_bell ();	1366	scr_bell ();
1395	# endif	1367	# endif
1396	iso14755buf = 0;	1368	iso14755buf = 0;
…		…
1415	else	1387	else
1416	iso14755buf = 0;	1388	iso14755buf = 0;
1417	}	1389	}
1418	#endif	1390	#endif
1419		1391
		1392	if (ev.xany.window == vt
1420	if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1393	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421	break;	1394	break;
1422		1395
1423	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1396	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424	if (!(ev.xkey.state & ControlMask))	1397	if (!(ev.xkey.state & ControlMask))
1425	slip_wheel_ev.stop ();	1398	slip_wheel_ev.stop ();
1426	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1399	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1427	mouse_slip_wheel_speed = 0;	1400	mouse_slip_wheel_speed = 0;
1428	#endif	1401	#endif
1429	break;	1402	break;
1430	}	1403	}
1431		1404
…		…
1561		1534
1562	case SelectionRequest:	1535	case SelectionRequest:
1563	selection_send (ev.xselectionrequest);	1536	selection_send (ev.xselectionrequest);
1564	break;	1537	break;
1565		1538
		1539	case MapNotify:
		1540	mapped = 1;
		1541	#ifdef TEXT_BLINK
		1542	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1543	#endif
		1544	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1545	break;
		1546
1566	case UnmapNotify:	1547	case UnmapNotify:
1567	mapped = 0;	1548	mapped = 0;
1568	#ifdef TEXT_BLINK	1549	#ifdef TEXT_BLINK
1569	text_blink_ev.stop ();	1550	text_blink_ev.stop ();
1570	#endif	1551	#endif
1571	break;	1552	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573	case MapNotify:
1574	mapped = 1;
1575	#ifdef TEXT_BLINK
1576	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577	#endif
1578	break;	1553	break;
1579		1554
1580	#ifdef TRANSPARENT	1555	#ifdef TRANSPARENT
1581	case ReparentNotify:	1556	case ReparentNotify:
1582	rootwin_cb (ev);	1557	rootwin_cb (ev);
…		…
1596		1571
1597	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1598	scr_expose (ev.xexpose.x, ev.xexpose.y,	1573	scr_expose (ev.xexpose.x, ev.xexpose.y,
1599	ev.xexpose.width, ev.xexpose.height, False);	1574	ev.xexpose.width, ev.xexpose.height, False);
1600		1575
1601	scr_refresh (refresh_type);	1576	want_refresh = 1;
1602	}	1577	}
1603	else	1578	else
1604	{	1579	{
1605	XEvent unused_event;	1580	XEvent unused_event;
1606		1581
…		…
1641	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642	break;	1617	break;
1643		1618
1644	if (ev.xany.window == vt)	1619	if (ev.xany.window == vt)
1645	{	1620	{
		1621	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1622	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647	; // nop	1623	; // nop
1648	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1624	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1649	{	1625	{
1650	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1651	;	1627	;
…		…
1733	&unused_root_x, &unused_root_y,	1709	&unused_root_x, &unused_root_y,
1734	&ev.xbutton.x, &ev.xbutton.y,	1710	&ev.xbutton.x, &ev.xbutton.y,
1735	&unused_mask);	1711	&unused_mask);
1736	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737	scrollbar_size ());	1713	scrollbar_size ());
1738	scr_refresh (refresh_type);	1714	want_refresh = 1;
1739	refresh_limit = 0;	1715	refresh_limit = 0;
1740	scrollbar_show (1);	1716	scrollbar_show (1);
1741	}	1717	}
1742	break;	1718	break;
1743	}	1719	}
		1720
		1721	skip_switch: ;
		1722
		1723	#if defined(CURSOR_BLINK)
		1724	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1725	{
		1726	if (hidden_cursor)
		1727	{
		1728	hidden_cursor = 0;
		1729	want_refresh = 1;
		1730	}
		1731
		1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1733	}
		1734	#endif
		1735
		1736	#if defined(POINTER_BLANK)
		1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1738	{
		1739	if (ev.type == MotionNotify
		1740	\|\| ev.type == ButtonPress
		1741	\|\| ev.type == ButtonRelease)
		1742	if (hidden_pointer)
		1743	pointer_unblank ();
		1744
		1745	if (ev.type == KeyPress && hidden_pointer == 0)
		1746	pointer_blank ();
		1747	}
		1748	#endif
1744	}	1749	}
1745		1750
1746	void	1751	void
1747	rxvt_term::focus_in ()	1752	rxvt_term::focus_in ()
1748	{	1753	{
…		…
1814		1819
1815	#if TRANSPARENT	1820	#if TRANSPARENT
1816	void	1821	void
1817	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1818	{	1823	{
1819	SET_R (this);	1824	make_current ();
1820	SET_LOCALE (locale);
1821		1825
1822	switch (ev.type)	1826	switch (ev.type)
1823	{	1827	{
1824	case PropertyNotify:	1828	case PropertyNotify:
1825	/*	1829	/*
…		…
1873	#ifdef MOUSE_REPORT_DOUBLECLICK	1877	#ifdef MOUSE_REPORT_DOUBLECLICK
1874	if (ev.button == MEvent.button && clickintime)	1878	if (ev.button == MEvent.button && clickintime)
1875	{	1879	{
1876	/* same button, within alloted time */	1880	/* same button, within alloted time */
1877	MEvent.clicks++;	1881	MEvent.clicks++;
		1882
1878	if (MEvent.clicks > 1)	1883	if (MEvent.clicks > 1)
1879	{	1884	{
1880	/* only report double clicks */	1885	/* only report double clicks */
1881	MEvent.clicks = 2;	1886	MEvent.clicks = 2;
1882	mouse_report (ev);	1887	mouse_report (ev);
…		…
1915	#else	1920	#else
1916	selection.rect = false;	1921	selection.rect = false;
1917	#endif	1922	#endif
1918		1923
1919	/* allow shift+left click to extend selection */	1924	/* allow shift+left click to extend selection */
1920	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921	{	1926	{
1922	if (MEvent.button == Button1 && clickintime)	1927	if (MEvent.button == Button1 && clickintime)
1923	selection_rotate (ev.x, ev.y);	1928	selection_rotate (ev.x, ev.y);
1924	else	1929	else
1925	selection_extend (ev.x, ev.y, 1);	1930	selection_extend (ev.x, ev.y, 1);
…		…
2090	}	2095	}
2091		2096
2092	break;	2097	break;
2093	}	2098	}
2094	}	2099	}
		2100
2095	return;	2101	return;
2096	}	2102	}
		2103
2097	#if MENUBAR	2104	#if MENUBAR
2098	/*	2105	/*
2099	* Menubar window processing of button press	2106	* Menubar window processing of button press
2100	*/	2107	*/
2101	if (isMenuBarWindow (ev.window))	2108	if (isMenuBarWindow (ev.window))
…		…
2164	if (priv_modes & PrivMode_mouse_report	2171	if (priv_modes & PrivMode_mouse_report
2165	&& bypass_keystate	2172	&& bypass_keystate
2166	&& ev.button == Button1 && MEvent.clicks <= 1)	2173	&& ev.button == Button1 && MEvent.clicks <= 1)
2167	selection_extend (ev.x, ev.y, 0);	2174	selection_extend (ev.x, ev.y, 0);
2168		2175
2169	if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170	return;	2177	return;
2171		2178
2172	switch (ev.button)	2179	switch (ev.button)
2173	{	2180	{
2174	case Button1:	2181	case Button1:
…		…
2207	slip_wheel_ev.start ();	2214	slip_wheel_ev.start ();
2208	}	2215	}
2209	else	2216	else
2210	{	2217	{
2211	# endif	2218	# endif
2212	# ifdef JUMP_MOUSE_WHEEL
2213	scr_page (v, i);	2219	scr_page (v, i);
2214	scr_refresh (SMOOTH_REFRESH);
2215	scrollbar_show (1);	2220	scrollbar_show (1);
2216	# else
2217	while (i--)
2218	{
2219	scr_page (v, 1);
2220	scr_refresh (SMOOTH_REFRESH);
2221	scrollbar_show (1);
2222	}
2223	# endif
2224	# ifdef MOUSE_SLIP_WHEELING	2221	# ifdef MOUSE_SLIP_WHEELING
2225	}	2222	}
2226	#endif	2223	# endif
2227	}	2224	}
2228	break;	2225	break;
2229	#endif	2226	#endif
2230	}	2227	}
2231	}	2228	}
…		…
2720		2717
2721	bool	2718	bool
2722	rxvt_term::cmd_parse ()	2719	rxvt_term::cmd_parse ()
2723	{	2720	{
2724	bool flag = false;	2721	bool flag = false;
2725	unicode_t ch = NOCHAR;	2722	wchar_t ch = NOCHAR;
2726	char *seq_begin; // remember start of esc-sequence here	2723	char *seq_begin; // remember start of esc-sequence here
2727		2724
2728	for (;;)	2725	for (;;)
2729	{	2726	{
2730	if (ch == NOCHAR)	2727	if (ch == NOCHAR)
…		…
2751	if (seen_resize && cmd_pid)	2748	if (seen_resize && cmd_pid)
2752	kill (-cmd_pid, SIGWINCH);	2749	kill (-cmd_pid, SIGWINCH);
2753	}	2750	}
2754		2751
2755	/* Read a text string from the input buffer */	2752	/* Read a text string from the input buffer */
2756	unicode_t buf[UBUFSIZ];	2753	wchar_t buf[UBUFSIZ];
2757	bool refreshnow = false;	2754	bool refreshnow = false;
2758	int nlines = 0;	2755	int nlines = 0;
2759	unicode_t *str = buf;	2756	wchar_t *str = buf;
2760	unicode_t *eol = str + min (ncol, UBUFSIZ);	2757	wchar_t *eol = str + min (ncol, UBUFSIZ);
2761		2758
2762	for (;;)	2759	for (;;)
2763	{	2760	{
2764	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2761	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765	break;	2762	break;
…		…
2783	}	2780	}
2784		2781
2785	// scr_add_lines only works for nlines <= nrow - 1.	2782	// scr_add_lines only works for nlines <= nrow - 1.
2786	if (nlines >= nrow - 1)	2783	if (nlines >= nrow - 1)
2787	{	2784	{
		2785	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2786	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789	scr_add_lines (buf, nlines, str - buf);	2787	scr_add_lines (buf, str - buf, nlines);
2790		2788
2791	nlines = 0;	2789	nlines = 0;
2792	str = buf;	2790	str = buf;
2793	eol = str + min (ncol, UBUFSIZ);	2791	eol = str + min (ncol, UBUFSIZ);
2794	}	2792	}
…		…
2808		2806
2809	seq_begin = cmdbuf_ptr;	2807	seq_begin = cmdbuf_ptr;
2810	ch = next_char ();	2808	ch = next_char ();
2811	}	2809	}
2812		2810
		2811	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2812	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814	scr_add_lines (buf, nlines, str - buf);	2813	scr_add_lines (buf, str - buf, nlines);
2815		2814
2816	/*	2815	/*
2817	* If there have been a lot of new lines, then update the screen	2816	* If there have been a lot of new lines, then update the screen
2818	* What the heck I'll cheat and only refresh less than every page-full.	2817	* What the heck I'll cheat and only refresh less than every page-full.
2819	* the number of pages between refreshes is refresh_limit, which	2818	* the number of pages between refreshes is refresh_limit, which
…		…
2825	refresh_limit++;	2824	refresh_limit++;
2826	else	2825	else
2827	{	2826	{
2828	flag = true;	2827	flag = true;
2829	scr_refresh (refresh_type);	2828	scr_refresh (refresh_type);
2830	flush_ev.stop ();	2829	want_refresh = 1;
2831	}	2830	}
2832	}	2831	}
2833		2832
2834	}	2833	}
2835	else	2834	else
…		…
2850	}	2849	}
2851		2850
2852	return flag;	2851	return flag;
2853	}	2852	}
2854		2853
2855	// read the next octet
2856	unicode_t
2857	rxvt_term::next_octet ()
2858	{
2859	return cmdbuf_ptr < cmdbuf_endp
2860	? *cmdbuf_ptr++
2861	: NOCHAR;
2862	}
2863
2864	// read the next character	2854	// read the next character
2865	unicode_t	2855	wchar_t
2866	rxvt_term::next_char ()	2856	rxvt_term::next_char ()
2867	{	2857	{
2868	while (cmdbuf_ptr < cmdbuf_endp)	2858	while (cmdbuf_ptr < cmdbuf_endp)
2869	{	2859	{
2870	// assume 7-bit to be ascii ALWAYS	2860	// assume 7-bit to be ascii ALWAYS
…		…
2880	cmdbuf_ptr = cmdbuf_endp;	2870	cmdbuf_ptr = cmdbuf_endp;
2881	break;	2871	break;
2882	}	2872	}
2883		2873
2884	if (len == (size_t)-1)	2874	if (len == (size_t)-1)
2885	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2875	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886		2876
2887	// assume wchar == unicode	2877	// assume wchar == unicode
2888	cmdbuf_ptr += len;	2878	cmdbuf_ptr += len;
2889	return wc & UNICODE_MASK;	2879	return wc & UNICODE_MASK;
2890	}	2880	}
2891		2881
2892	return NOCHAR;	2882	return NOCHAR;
		2883	}
		2884
		2885	// read the next octet
		2886	uint32_t
		2887	rxvt_term::next_octet ()
		2888	{
		2889	return cmdbuf_ptr < cmdbuf_endp
		2890	? (unsigned char)*cmdbuf_ptr++
		2891	: NOCHAR;
2893	}	2892	}
2894		2893
2895	/* rxvt_cmd_getc () - Return next input character */	2894	/* rxvt_cmd_getc () - Return next input character */
2896	/*	2895	/*
2897	* Return the next input character after first passing any keyboard input	2896	* Return the next input character after first passing any keyboard input
2898	* to the command.	2897	* to the command.
2899	*/	2898	*/
2900	unicode_t	2899	wchar_t
2901	rxvt_term::cmd_getc ()	2900	rxvt_term::cmd_getc ()
2902	{	2901	{
2903	unicode_t c = next_char ();	2902	wchar_t c = next_char ();
2904		2903
2905	if (c == NOCHAR)	2904	if (c == NOCHAR)
2906	throw out_of_input;	2905	throw out_of_input;
2907		2906
2908	return c;	2907	return c;
2909	}	2908	}
2910		2909
2911	unicode_t	2910	uint32_t
2912	rxvt_term::cmd_get8 ()	2911	rxvt_term::cmd_get8 ()
2913	{	2912	{
2914	unicode_t c = next_octet ();	2913	uint32_t c = next_octet ();
2915		2914
2916	if (c == NOCHAR)	2915	if (c == NOCHAR)
2917	throw out_of_input;	2916	throw out_of_input;
2918		2917
2919	return c;	2918	return c;
…		…
3186	break;	3185	break;
3187		3186
3188	/* 8.3.87: NEXT LINE */	3187	/* 8.3.87: NEXT LINE */
3189	case C1_NEL: /* ESC E */	3188	case C1_NEL: /* ESC E */
3190	{	3189	{
3191	unicode_t nlcr[] = { C0_LF, C0_CR };	3190	wchar_t nlcr[] = { C0_LF, C0_CR };
3192	scr_add_lines (nlcr, 1, 2);	3191	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193	}	3192	}
3194	break;	3193	break;
3195		3194
3196	/* kidnapped escape sequence: Should be 8.3.48 */	3195	/* kidnapped escape sequence: Should be 8.3.48 */
3197	case C1_ESA: /* ESC G */	3196	case C1_ESA: /* ESC G */
…		…
3861	{	3860	{
3862	if ((name = strchr (buf, ';')) == NULL)	3861	if ((name = strchr (buf, ';')) == NULL)
3863	break;	3862	break;
3864		3863
3865	*name++ = '\0';	3864	*name++ = '\0';
3866	color = atoi (buf);	3865	color = atoi (buf) + minCOLOR;
3867		3866
3868	if (color < 0 \|\| color >= TOTAL_COLORS)	3867	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869	break;	3868	break;
3870		3869
3871	if ((buf = strchr (name, ';')) != NULL)	3870	if ((buf = strchr (name, ';')) != NULL)
3872	*buf++ = '\0';	3871	*buf++ = '\0';
3873		3872
3874	if (name[0] == '?' && !name[1])	3873	if (name[0] == '?' && !name[1])
3875	{	3874	{
3876	unsigned short r, g, b;	3875	unsigned short r, g, b;
3877	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3876	pix_colors_focused[color].get (display, r, g, b);
3878	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3877	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879	}	3878	}
3880	else	3879	else
3881	set_window_color (color + minCOLOR, name);	3880	set_window_color (color, name);
3882	}	3881	}
3883	break;	3882	break;
3884	case XTerm_Color00:	3883	case XTerm_Color00:
3885	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3884	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3886	break;	3885	break;
3887	case XTerm_Color01:	3886	case XTerm_Color01:
3888	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3887	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3889	break;	3888	break;
3890	#ifndef NO_CURSORCOLOR	3889	#ifndef NO_CURSORCOLOR
3891	case XTerm_Color_cursor:	3890	case XTerm_Color_cursor:
3892	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3891	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3893	break;	3892	break;
…		…
3897	break;	3896	break;
3898	case XTerm_Color_pointer_bg:	3897	case XTerm_Color_pointer_bg:
3899	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3898	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3900	break;	3899	break;
3901	#ifndef NO_BOLD_UNDERLINE_REVERSE	3900	#ifndef NO_BOLD_UNDERLINE_REVERSE
3902	case XTerm_Color_BD:
3903	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904	break;
3905	case XTerm_Color_UL:
3906	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907	break;
3908	case XTerm_Color_RV:	3901	case XTerm_Color_RV:
3909	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3902	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3903	break;
		3904	case Rxvt_Color_BD:
		3905	case URxvt_Color_BD:
		3906	process_color_seq (op, Color_BD, str, resp);
		3907	break;
		3908	case Rxvt_Color_UL:
		3909	case URxvt_Color_UL:
		3910	process_color_seq (op, Color_UL, str, resp);
3910	break;	3911	break;
3911	case URxvt_Color_IT:	3912	case URxvt_Color_IT:
3912	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3913	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3913	break;	3914	break;
3914	#endif	3915	#endif
…		…
3919	if (am_transparent)	3920	if (am_transparent)
3920	want_full_refresh = want_refresh = 1;	3921	want_full_refresh = want_refresh = 1;
3921	break;	3922	break;
3922	#endif	3923	#endif
3923		3924
3924	case XTerm_Pixmap:	3925	case Rxvt_Pixmap:
3925	if (*str != ';')	3926	if (*str != ';')
3926	{	3927	{
3927	#if XPM_BACKGROUND	3928	#if XPM_BACKGROUND
3928	scale_pixmap (""); /* reset to default scaling */	3929	scale_pixmap (""); /* reset to default scaling */
3929	set_bgPixmap (str); /* change pixmap */	3930	set_bgPixmap (str); /* change pixmap */
3930	#endif
3931	scr_touch (true);	3931	scr_touch (true);
		3932	#endif
3932	}	3933	}
		3934
3933	while ((str = strchr (str, ';')) != NULL)	3935	while ((str = strchr (str, ';')) != NULL)
3934	{	3936	{
3935	str++;	3937	str++;
3936	#if XPM_BACKGROUND	3938	#if XPM_BACKGROUND
3937	changed += scale_pixmap (str);	3939	changed += scale_pixmap (str);
…		…
3940		3942
3941	if (changed)	3943	if (changed)
3942	{	3944	{
3943	#ifdef XPM_BACKGROUND	3945	#ifdef XPM_BACKGROUND
3944	resize_pixmap ();	3946	resize_pixmap ();
3945	#endif
3946	scr_touch (true);	3947	scr_touch (true);
		3948	#endif
3947	}	3949	}
3948	break;	3950	break;
3949		3951
3950	case XTerm_restoreFG:	3952	case Rxvt_restoreFG:
3951	set_window_color (Color_fg, str);	3953	set_window_color (Color_fg, str);
3952	break;	3954	break;
3953	case XTerm_restoreBG:	3955	case Rxvt_restoreBG:
3954	set_window_color (Color_bg, str);	3956	set_window_color (Color_bg, str);
3955	break;	3957	break;
3956		3958
3957	case XTerm_logfile:	3959	case XTerm_logfile:
3958	// TODO, when secure mode?	3960	// TODO, when secure mode?
…		…
3963	if (OPTION (Opt_insecure))	3965	if (OPTION (Opt_insecure))
3964	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3966	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965	break;	3967	break;
3966	#endif	3968	#endif
3967	#if 0	3969	#if 0
3968	case XTerm_dumpscreen: /* no error notices */	3970	case Rxvt_dumpscreen: /* no error notices */
3969	{	3971	{
3970	int fd;	3972	int fd;
3971	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3973	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3972	{	3974	{
3973	scr_dump (fd);	3975	scr_dump (fd);
…		…
4025	break;	4027	break;
4026	#endif	4028	#endif
4027		4029
4028	#if ENABLE_PERL	4030	#if ENABLE_PERL
4029	case URxvt_perl:	4031	case URxvt_perl:
4030	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4032	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031	; // no responses yet	4033	; // no responses yet
4032	break;	4034	break;
4033	#endif	4035	#endif
4034	}	4036	}
4035	}	4037	}
…		…
4147	/* extra handling for values with state unkept */	4149	/* extra handling for values with state unkept */
4148	switch (arg[i])	4150	switch (arg[i])
4149	{	4151	{
4150	#if ENABLE_STYLES	4152	#if ENABLE_STYLES
4151	case 1021:	4153	case 1021:
4152	if (mode)	4154	set_option (Opt_intensityStyles, mode);
4153	SET_OPTION (Opt_intensityStyles);
4154	else
4155	CLR_OPTION (Opt_intensityStyles);
4156		4155
4157	scr_touch (true);	4156	scr_touch (true);
4158	break;	4157	break;
4159	#endif	4158	#endif
4160	case 1048: /* alternative cursor save */	4159	case 1048: /* alternative cursor save */
…		…
4182	case 3: /* 80/132 */	4181	case 3: /* 80/132 */
4183	if (priv_modes & PrivMode_132OK)	4182	if (priv_modes & PrivMode_132OK)
4184	set_widthheight (((state ? 132 : 80) * fwidth), height);	4183	set_widthheight (((state ? 132 : 80) * fwidth), height);
4185	break;	4184	break;
4186	case 4: /* smooth scrolling */	4185	case 4: /* smooth scrolling */
4187	if (!state)	4186	set_option (Opt_jumpScroll, !state);
4188	SET_OPTION (Opt_jumpScroll);
4189	else
4190	CLR_OPTION (Opt_jumpScroll);
4191	break;	4187	break;
4192	case 5: /* reverse video */	4188	case 5: /* reverse video */
4193	scr_rvideo_mode (state);	4189	scr_rvideo_mode (state);
4194	break;	4190	break;
4195	case 6: /* relative/absolute origins */	4191	case 6: /* relative/absolute origins */
…		…
4236	#if 0	4232	#if 0
4237	case 1001:	4233	case 1001:
4238	break; /* X11 mouse highlighting */	4234	break; /* X11 mouse highlighting */
4239	#endif	4235	#endif
4240	case 1010: /* scroll to bottom on TTY output inhibit */	4236	case 1010: /* scroll to bottom on TTY output inhibit */
4241	if (!state)	4237	set_option (Opt_scrollTtyOutput, !state);
4242	SET_OPTION (Opt_scrollTtyOutput);
4243	else
4244	CLR_OPTION (Opt_scrollTtyOutput);
4245	break;	4238	break;
4246	case 1011: /* scroll to bottom on key press */	4239	case 1011: /* scroll to bottom on key press */
4247	if (state)	4240	set_option (Opt_scrollTtyKeypress, state);
4248	SET_OPTION (Opt_scrollTtyKeypress);
4249	else
4250	CLR_OPTION (Opt_scrollTtyKeypress);
4251	break;	4241	break;
4252	case 1047: /* secondary screen w/ clearing last */	4242	case 1047: /* secondary screen w/ clearing last */
4253	if (OPTION (Opt_secondaryScreen))	4243	if (OPTION (Opt_secondaryScreen))
4254	if (current_screen != PRIMARY)	4244	if (current_screen != PRIMARY)
4255	scr_erase_screen (2);	4245	scr_erase_screen (2);
…		…
4465	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4455	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466		4456
4467	void	4457	void
4468	rxvt_term::tt_write (const char *data, unsigned int len)	4458	rxvt_term::tt_write (const char *data, unsigned int len)
4469	{	4459	{
		4460	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4461	return;
		4462
4470	if (pty.pty < 0)	4463	if (pty.pty < 0)
4471	return;	4464	return;
4472		4465
4473	if (v_buflen == 0)	4466	if (v_buflen == 0)
4474	{	4467	{

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.242 by root, Fri Jan 6 05:37:59 2006 UTC vs. Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.242 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC