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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.238 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.263 by root, Sun Jan 15 16:48:17 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.
…		…
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_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		873	return;
		874
872	if (len <= 0)	875	if (len <= 0)
873	return; /* not mapped */	876	return; /* not mapped */
874		877
875	if (OPTION (Opt_scrollTtyKeypress))	878	if (OPTION (Opt_scrollTtyKeypress))
876	if (view_start)	879	if (view_start)
…		…
969		972
970	if (want_refresh)	973	if (want_refresh)
971	{	974	{
972	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973	{	976	{
974	int row = -view_start;	977	int row = view_start;
		978	int end_row = row + nrow;
975		979
976	while (row > -nsaved && ROW (row - 1).is_longer ())	980	while (row > top_row && ROW (row - 1).is_longer ())
977	--row;	981	--row;
978		982
979	while (row < -view_start + nrow)	983	do
980	{	984	{
981	int start_row = row;	985	int start_row = row;
982	line_t *l;	986	line_t *l;
983		987
984	do	988	do
985	{	989	{
986	l = &ROW (row);	990	l = &ROW (row++);
987		991
988	if (!(l->f & LINE_FILTERED))	992	if (!(l->f & LINE_FILTERED))
989	{	993	{
990	// line not filtered, mark it as filtered	994	// line not filtered, mark it as filtered
991	l->f \|= LINE_FILTERED;	995	l->f \|= LINE_FILTERED;
992	while (l->is_longer ())	996	while (l->is_longer ())
993	{	997	{
994	l = &ROW (++row);	998	l = &ROW (row++);
995	l->f \|= LINE_FILTERED;	999	l->f \|= LINE_FILTERED;
996	}	1000	}
997		1001
998	// and filter it	1002	// and filter it
999	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));
1000		1004
1001	break;	1005	break;
1002	}	1006	}
1003	}	1007	}
1004	while (l->is_longer ());	1008	while (l->is_longer () && row < end_row);
1005
1006	row++;
1007	}	1009	}
1008		1010	while (row < end_row);
1009	}	1011	}
1010		1012
1011	scr_refresh (refresh_type);	1013	scr_refresh (refresh_type);
1012	scrollbar_show (1);	1014	scrollbar_show (1);
1013	#ifdef USE_XIM	1015	#ifdef USE_XIM
…		…
1099	{	1101	{
1100	if (mouse_slip_wheel_speed == 0	1102	if (mouse_slip_wheel_speed == 0
1101	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1103	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102	: scr_page (UP, mouse_slip_wheel_speed))	1104	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1105	{
1104	if (view_start == nsaved \|\|	1106	if (view_start == top_row \|\| view_start == 0)
1105	view_start == 0)
1106	mouse_slip_wheel_speed = 0;	1107	mouse_slip_wheel_speed = 0;
1107		1108
1108	refresh_type \|= SMOOTH_REFRESH;	1109	refresh_type \|= SMOOTH_REFRESH;
1109	want_refresh = 1;	1110	want_refresh = 1;
1110	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
…		…
1202		1203
1203	#ifdef POINTER_BLANK	1204	#ifdef POINTER_BLANK
1204	void	1205	void
1205	rxvt_term::pointer_blank ()	1206	rxvt_term::pointer_blank ()
1206	{	1207	{
1207	if (! OPTION (Opt_pointerBlank))	1208	if (!OPTION (Opt_pointerBlank))
1208	return;	1209	return;
1209		1210
1210	XDefineCursor (display->display, vt, display->blank_cursor);	1211	XDefineCursor (display->display, vt, display->blank_cursor);
1211	XFlush (display->display);	1212	XFlush (display->display);
1212		1213
…		…
1309	dDisp;	1310	dDisp;
1310		1311
1311	SET_R (this);	1312	SET_R (this);
1312	SET_LOCALE (locale);	1313	SET_LOCALE (locale);
1313		1314
1314	#if defined(CURSOR_BLINK)	1315	if (ev.xany.window == vt
1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1316	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1316	{	1317	return;
1317	if (hidden_cursor)
1318	{
1319	hidden_cursor = 0;
1320	want_refresh = 1;
1321	}
1322		1318
1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1319	// for XQueryPointer
1324	}
1325	#endif
1326
1327	#if defined(POINTER_BLANK)
1328	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329	{
1330	if (ev.type == MotionNotify
1331	\|\| ev.type == ButtonPress
1332	\|\| ev.type == ButtonRelease)
1333	if (hidden_pointer)
1334	pointer_unblank ();
1335
1336	if (ev.type == KeyPress && hidden_pointer == 0)
1337	pointer_blank ();
1338	}
1339	#endif
1340
1341	Window unused_root, unused_child;	1320	Window unused_root, unused_child;
1342	int unused_root_x, unused_root_y;	1321	int unused_root_x, unused_root_y;
1343	unsigned int unused_mask;	1322	unsigned int unused_mask;
1344		1323
1345	switch (ev.type)	1324	switch (ev.type)
…		…
1352		1331
1353	break;	1332	break;
1354		1333
1355	case KeyRelease:	1334	case KeyRelease:
1356	{	1335	{
1357	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1336	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1358	KeySym ks;	1337	KeySym keysym;
1359		1338
1360	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1339	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361	#endif	1340	#endif
1362		1341
1363	#if ENABLE_FRILLS \|\| ISO_14755	1342	#if ENABLE_FRILLS \|\| ISO_14755
1364	// ISO 14755 support	1343	// ISO 14755 support
1365	if (iso14755buf)	1344	if (iso14755buf)
…		…
1370	# endif	1349	# endif
1371	# if ISO_14755	1350	# if ISO_14755
1372	// iso14755 part 5.2 handling: release time	1351	// iso14755 part 5.2 handling: release time
1373	// first: controls	1352	// first: controls
1374	if ((ev.xkey.state & ControlMask)	1353	if ((ev.xkey.state & ControlMask)
1375	&& ((ks >= 0x40 && ks <= 0x5f)	1354	&& ((keysym >= 0x40 && keysym <= 0x5f)
1376	\|\| (ks >= 0x61 && ks <= 0x7f)))	1355	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1377	{	1356	{
1378	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1357	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1379	commit_iso14755 ();	1358	commit_iso14755 ();
1380	return; // case-break;	1359	goto skip_switch;
1381	}	1360	}
1382		1361
1383	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1362	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384	if (i[0] == ks)	1363	if (i[0] == keysym)
1385	{	1364	{
1386	iso14755buf = ISO_14755_51 \| i[1];	1365	iso14755buf = ISO_14755_51 \| i[1];
1387	commit_iso14755 ();	1366	commit_iso14755 ();
1388	return; // case-break;	1367	goto skip_switch;
1389	}	1368	}
1390		1369
1391	scr_bell ();	1370	scr_bell ();
1392	# endif	1371	# endif
1393	iso14755buf = 0;	1372	iso14755buf = 0;
…		…
1412	else	1391	else
1413	iso14755buf = 0;	1392	iso14755buf = 0;
1414	}	1393	}
1415	#endif	1394	#endif
1416		1395
		1396	if (ev.xany.window == vt
		1397	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1398	break;
		1399
1417	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1400	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418	if (!(ev.xkey.state & ControlMask))	1401	if (!(ev.xkey.state & ControlMask))
1419	slip_wheel_ev.stop ();	1402	slip_wheel_ev.stop ();
1420	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1403	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1421	mouse_slip_wheel_speed = 0;	1404	mouse_slip_wheel_speed = 0;
1422	#endif	1405	#endif
1423	break;	1406	break;
1424	}	1407	}
1425		1408
…		…
1555		1538
1556	case SelectionRequest:	1539	case SelectionRequest:
1557	selection_send (ev.xselectionrequest);	1540	selection_send (ev.xselectionrequest);
1558	break;	1541	break;
1559		1542
		1543	case MapNotify:
		1544	mapped = 1;
		1545	#ifdef TEXT_BLINK
		1546	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1547	#endif
		1548	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1549	break;
		1550
1560	case UnmapNotify:	1551	case UnmapNotify:
1561	mapped = 0;	1552	mapped = 0;
1562	#ifdef TEXT_BLINK	1553	#ifdef TEXT_BLINK
1563	text_blink_ev.stop ();	1554	text_blink_ev.stop ();
1564	#endif	1555	#endif
1565	break;	1556	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;	1557	break;
1573		1558
1574	#ifdef TRANSPARENT	1559	#ifdef TRANSPARENT
1575	case ReparentNotify:	1560	case ReparentNotify:
1576	rootwin_cb (ev);	1561	rootwin_cb (ev);
…		…
1590		1575
1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1576	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1577	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1578	ev.xexpose.width, ev.xexpose.height, False);
1594		1579
1595	scr_refresh (refresh_type);	1580	want_refresh = 1;
1596	}	1581	}
1597	else	1582	else
1598	{	1583	{
1599	XEvent unused_event;	1584	XEvent unused_event;
1600		1585
…		…
1635	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1620	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636	break;	1621	break;
1637		1622
1638	if (ev.xany.window == vt)	1623	if (ev.xany.window == vt)
1639	{	1624	{
		1625	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1626	; // nop
1640	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1627	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1641	{	1628	{
1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1629	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643	;	1630	;
1644		1631
1645	XQueryPointer (disp, vt,	1632	XQueryPointer (disp, vt,
…		…
1725	&unused_root_x, &unused_root_y,	1712	&unused_root_x, &unused_root_y,
1726	&ev.xbutton.x, &ev.xbutton.y,	1713	&ev.xbutton.x, &ev.xbutton.y,
1727	&unused_mask);	1714	&unused_mask);
1728	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1715	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729	scrollbar_size ());	1716	scrollbar_size ());
1730	scr_refresh (refresh_type);	1717	want_refresh = 1;
1731	refresh_limit = 0;	1718	refresh_limit = 0;
1732	scrollbar_show (1);	1719	scrollbar_show (1);
1733	}	1720	}
1734	break;	1721	break;
1735	}	1722	}
		1723
		1724	skip_switch: ;
		1725
		1726	#if defined(CURSOR_BLINK)
		1727	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1728	{
		1729	if (hidden_cursor)
		1730	{
		1731	hidden_cursor = 0;
		1732	want_refresh = 1;
		1733	}
		1734
		1735	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1736	}
		1737	#endif
		1738
		1739	#if defined(POINTER_BLANK)
		1740	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1741	{
		1742	if (ev.type == MotionNotify
		1743	\|\| ev.type == ButtonPress
		1744	\|\| ev.type == ButtonRelease)
		1745	if (hidden_pointer)
		1746	pointer_unblank ();
		1747
		1748	if (ev.type == KeyPress && hidden_pointer == 0)
		1749	pointer_blank ();
		1750	}
		1751	#endif
1736	}	1752	}
1737		1753
1738	void	1754	void
1739	rxvt_term::focus_in ()	1755	rxvt_term::focus_in ()
1740	{	1756	{
…		…
1865	#ifdef MOUSE_REPORT_DOUBLECLICK	1881	#ifdef MOUSE_REPORT_DOUBLECLICK
1866	if (ev.button == MEvent.button && clickintime)	1882	if (ev.button == MEvent.button && clickintime)
1867	{	1883	{
1868	/* same button, within alloted time */	1884	/* same button, within alloted time */
1869	MEvent.clicks++;	1885	MEvent.clicks++;
		1886
1870	if (MEvent.clicks > 1)	1887	if (MEvent.clicks > 1)
1871	{	1888	{
1872	/* only report double clicks */	1889	/* only report double clicks */
1873	MEvent.clicks = 2;	1890	MEvent.clicks = 2;
1874	mouse_report (ev);	1891	mouse_report (ev);
…		…
1894	else	1911	else
1895	{	1912	{
1896	if (ev.button != MEvent.button)	1913	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1914	MEvent.clicks = 0;
1898		1915
1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))	1916	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1917	switch (ev.button)
1901	{	1918	{
1902	case Button1:	1919	case Button1:
1903	/* allow meta + click to select rectangular areas */	1920	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1921	/* should be done in screen.C */
…		…
1907	#else	1924	#else
1908	selection.rect = false;	1925	selection.rect = false;
1909	#endif	1926	#endif
1910		1927
1911	/* allow shift+left click to extend selection */	1928	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1929	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1930	{
1914	if (MEvent.button == Button1 && clickintime)	1931	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1932	selection_rotate (ev.x, ev.y);
1916	else	1933	else
1917	selection_extend (ev.x, ev.y, 1);	1934	selection_extend (ev.x, ev.y, 1);
…		…
2082	}	2099	}
2083		2100
2084	break;	2101	break;
2085	}	2102	}
2086	}	2103	}
		2104
2087	return;	2105	return;
2088	}	2106	}
		2107
2089	#if MENUBAR	2108	#if MENUBAR
2090	/*	2109	/*
2091	* Menubar window processing of button press	2110	* Menubar window processing of button press
2092	*/	2111	*/
2093	if (isMenuBarWindow (ev.window))	2112	if (isMenuBarWindow (ev.window))
…		…
2156	if (priv_modes & PrivMode_mouse_report	2175	if (priv_modes & PrivMode_mouse_report
2157	&& bypass_keystate	2176	&& bypass_keystate
2158	&& ev.button == Button1 && MEvent.clicks <= 1)	2177	&& ev.button == Button1 && MEvent.clicks <= 1)
2159	selection_extend (ev.x, ev.y, 0);	2178	selection_extend (ev.x, ev.y, 0);
2160		2179
		2180	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2181	return;
		2182
2161	switch (ev.button)	2183	switch (ev.button)
2162	{	2184	{
2163	case Button1:	2185	case Button1:
2164	case Button3:	2186	case Button3:
2165	selection_make (ev.time);	2187	selection_make (ev.time);
…		…
2196	slip_wheel_ev.start ();	2218	slip_wheel_ev.start ();
2197	}	2219	}
2198	else	2220	else
2199	{	2221	{
2200	# endif	2222	# endif
2201	# ifdef JUMP_MOUSE_WHEEL
2202	scr_page (v, i);	2223	scr_page (v, i);
2203	scr_refresh (SMOOTH_REFRESH);
2204	scrollbar_show (1);	2224	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	2225	# ifdef MOUSE_SLIP_WHEELING
2214	}	2226	}
2215	#endif	2227	# endif
2216	}	2228	}
2217	break;	2229	break;
2218	#endif	2230	#endif
2219	}	2231	}
2220	}	2232	}
…		…
2709		2721
2710	bool	2722	bool
2711	rxvt_term::cmd_parse ()	2723	rxvt_term::cmd_parse ()
2712	{	2724	{
2713	bool flag = false;	2725	bool flag = false;
2714	unicode_t ch = NOCHAR;	2726	wchar_t ch = NOCHAR;
2715	char *seq_begin; // remember start of esc-sequence here	2727	char *seq_begin; // remember start of esc-sequence here
2716		2728
2717	for (;;)	2729	for (;;)
2718	{	2730	{
2719	if (ch == NOCHAR)	2731	if (ch == NOCHAR)
…		…
2740	if (seen_resize && cmd_pid)	2752	if (seen_resize && cmd_pid)
2741	kill (-cmd_pid, SIGWINCH);	2753	kill (-cmd_pid, SIGWINCH);
2742	}	2754	}
2743		2755
2744	/* Read a text string from the input buffer */	2756	/* Read a text string from the input buffer */
2745	unicode_t buf[UBUFSIZ];	2757	wchar_t buf[UBUFSIZ];
2746	bool refreshnow = false;	2758	bool refreshnow = false;
2747	int nlines = 0;	2759	int nlines = 0;
2748	unicode_t *str = buf;	2760	wchar_t *str = buf;
2749	unicode_t *eol = str + min (ncol, UBUFSIZ);	2761	wchar_t *eol = str + min (ncol, UBUFSIZ);
2750		2762
2751	for (;;)	2763	for (;;)
2752	{	2764	{
2753	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2765	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754	break;	2766	break;
…		…
2772	}	2784	}
2773		2785
2774	// scr_add_lines only works for nlines <= nrow - 1.	2786	// scr_add_lines only works for nlines <= nrow - 1.
2775	if (nlines >= nrow - 1)	2787	if (nlines >= nrow - 1)
2776	{	2788	{
2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2789	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2778	scr_add_lines (buf, nlines, str - buf);	2790	scr_add_lines (buf, str - buf, nlines);
2779		2791
2780	nlines = 0;	2792	nlines = 0;
2781	str = buf;	2793	str = buf;
2782	eol = str + min (ncol, UBUFSIZ);	2794	eol = str + min (ncol, UBUFSIZ);
2783	}	2795	}
…		…
2797		2809
2798	seq_begin = cmdbuf_ptr;	2810	seq_begin = cmdbuf_ptr;
2799	ch = next_char ();	2811	ch = next_char ();
2800	}	2812	}
2801		2813
2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2814	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2803	scr_add_lines (buf, nlines, str - buf);	2815	scr_add_lines (buf, str - buf, nlines);
2804		2816
2805	/*	2817	/*
2806	* If there have been a lot of new lines, then update the screen	2818	* 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.	2819	* 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	2820	* the number of pages between refreshes is refresh_limit, which
…		…
2814	refresh_limit++;	2826	refresh_limit++;
2815	else	2827	else
2816	{	2828	{
2817	flag = true;	2829	flag = true;
2818	scr_refresh (refresh_type);	2830	scr_refresh (refresh_type);
2819	flush_ev.stop ();	2831	want_refresh = 1;
2820	}	2832	}
2821	}	2833	}
2822		2834
2823	}	2835	}
2824	else	2836	else
…		…
2839	}	2851	}
2840		2852
2841	return flag;	2853	return flag;
2842	}	2854	}
2843		2855
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	2856	// read the next character
2854	unicode_t	2857	wchar_t
2855	rxvt_term::next_char ()	2858	rxvt_term::next_char ()
2856	{	2859	{
2857	while (cmdbuf_ptr < cmdbuf_endp)	2860	while (cmdbuf_ptr < cmdbuf_endp)
2858	{	2861	{
2859	// assume 7-bit to be ascii ALWAYS	2862	// assume 7-bit to be ascii ALWAYS
…		…
2869	cmdbuf_ptr = cmdbuf_endp;	2872	cmdbuf_ptr = cmdbuf_endp;
2870	break;	2873	break;
2871	}	2874	}
2872		2875
2873	if (len == (size_t)-1)	2876	if (len == (size_t)-1)
2874	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2877	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875		2878
2876	// assume wchar == unicode	2879	// assume wchar == unicode
2877	cmdbuf_ptr += len;	2880	cmdbuf_ptr += len;
2878	return wc & UNICODE_MASK;	2881	return wc & UNICODE_MASK;
2879	}	2882	}
2880		2883
2881	return NOCHAR;	2884	return NOCHAR;
		2885	}
		2886
		2887	// read the next octet
		2888	uint32_t
		2889	rxvt_term::next_octet ()
		2890	{
		2891	return cmdbuf_ptr < cmdbuf_endp
		2892	? (unsigned char)*cmdbuf_ptr++
		2893	: NOCHAR;
2882	}	2894	}
2883		2895
2884	/* rxvt_cmd_getc () - Return next input character */	2896	/* rxvt_cmd_getc () - Return next input character */
2885	/*	2897	/*
2886	* Return the next input character after first passing any keyboard input	2898	* Return the next input character after first passing any keyboard input
2887	* to the command.	2899	* to the command.
2888	*/	2900	*/
2889	unicode_t	2901	wchar_t
2890	rxvt_term::cmd_getc ()	2902	rxvt_term::cmd_getc ()
2891	{	2903	{
2892	unicode_t c = next_char ();	2904	wchar_t c = next_char ();
2893		2905
2894	if (c == NOCHAR)	2906	if (c == NOCHAR)
2895	throw out_of_input;	2907	throw out_of_input;
2896		2908
2897	return c;	2909	return c;
2898	}	2910	}
2899		2911
2900	unicode_t	2912	uint32_t
2901	rxvt_term::cmd_get8 ()	2913	rxvt_term::cmd_get8 ()
2902	{	2914	{
2903	unicode_t c = next_octet ();	2915	uint32_t c = next_octet ();
2904		2916
2905	if (c == NOCHAR)	2917	if (c == NOCHAR)
2906	throw out_of_input;	2918	throw out_of_input;
2907		2919
2908	return c;	2920	return c;
…		…
3175	break;	3187	break;
3176		3188
3177	/* 8.3.87: NEXT LINE */	3189	/* 8.3.87: NEXT LINE */
3178	case C1_NEL: /* ESC E */	3190	case C1_NEL: /* ESC E */
3179	{	3191	{
3180	unicode_t nlcr[] = { C0_LF, C0_CR };	3192	wchar_t nlcr[] = { C0_LF, C0_CR };
3181	scr_add_lines (nlcr, 1, 2);	3193	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182	}	3194	}
3183	break;	3195	break;
3184		3196
3185	/* kidnapped escape sequence: Should be 8.3.48 */	3197	/* kidnapped escape sequence: Should be 8.3.48 */
3186	case C1_ESA: /* ESC G */	3198	case C1_ESA: /* ESC G */
…		…
3850	{	3862	{
3851	if ((name = strchr (buf, ';')) == NULL)	3863	if ((name = strchr (buf, ';')) == NULL)
3852	break;	3864	break;
3853		3865
3854	*name++ = '\0';	3866	*name++ = '\0';
3855	color = atoi (buf);	3867	color = atoi (buf) + minCOLOR;
3856		3868
3857	if (color < 0 \|\| color >= TOTAL_COLORS)	3869	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858	break;	3870	break;
3859		3871
3860	if ((buf = strchr (name, ';')) != NULL)	3872	if ((buf = strchr (name, ';')) != NULL)
3861	*buf++ = '\0';	3873	*buf++ = '\0';
3862		3874
3863	if (name[0] == '?' && !name[1])	3875	if (name[0] == '?' && !name[1])
3864	{	3876	{
3865	unsigned short r, g, b;	3877	unsigned short r, g, b;
3866	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3878	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);	3879	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868	}	3880	}
3869	else	3881	else
3870	set_window_color (color + minCOLOR, name);	3882	set_window_color (color, name);
3871	}	3883	}
3872	break;	3884	break;
3873	case XTerm_Color00:	3885	case XTerm_Color00:
3874	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3886	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3875	break;	3887	break;
3876	case XTerm_Color01:	3888	case XTerm_Color01:
3877	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3889	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3878	break;	3890	break;
3879	#ifndef NO_CURSORCOLOR	3891	#ifndef NO_CURSORCOLOR
3880	case XTerm_Color_cursor:	3892	case XTerm_Color_cursor:
3881	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3893	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3882	break;	3894	break;
…		…
3886	break;	3898	break;
3887	case XTerm_Color_pointer_bg:	3899	case XTerm_Color_pointer_bg:
3888	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3900	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3889	break;	3901	break;
3890	#ifndef NO_BOLD_UNDERLINE_REVERSE	3902	#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:	3903	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3904	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3905	break;
		3906	case Rxvt_Color_BD:
		3907	case URxvt_Color_BD:
		3908	process_color_seq (op, Color_BD, str, resp);
		3909	break;
		3910	case Rxvt_Color_UL:
		3911	case URxvt_Color_UL:
		3912	process_color_seq (op, Color_UL, str, resp);
3899	break;	3913	break;
3900	case URxvt_Color_IT:	3914	case URxvt_Color_IT:
3901	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902	break;	3916	break;
3903	#endif	3917	#endif
…		…
3908	if (am_transparent)	3922	if (am_transparent)
3909	want_full_refresh = want_refresh = 1;	3923	want_full_refresh = want_refresh = 1;
3910	break;	3924	break;
3911	#endif	3925	#endif
3912		3926
3913	case XTerm_Pixmap:	3927	case Rxvt_Pixmap:
3914	if (*str != ';')	3928	if (*str != ';')
3915	{	3929	{
3916	#if XPM_BACKGROUND	3930	#if XPM_BACKGROUND
3917	scale_pixmap (""); /* reset to default scaling */	3931	scale_pixmap (""); /* reset to default scaling */
3918	set_bgPixmap (str); /* change pixmap */	3932	set_bgPixmap (str); /* change pixmap */
3919	#endif
3920	scr_touch (true);	3933	scr_touch (true);
		3934	#endif
3921	}	3935	}
		3936
3922	while ((str = strchr (str, ';')) != NULL)	3937	while ((str = strchr (str, ';')) != NULL)
3923	{	3938	{
3924	str++;	3939	str++;
3925	#if XPM_BACKGROUND	3940	#if XPM_BACKGROUND
3926	changed += scale_pixmap (str);	3941	changed += scale_pixmap (str);
…		…
3929		3944
3930	if (changed)	3945	if (changed)
3931	{	3946	{
3932	#ifdef XPM_BACKGROUND	3947	#ifdef XPM_BACKGROUND
3933	resize_pixmap ();	3948	resize_pixmap ();
3934	#endif
3935	scr_touch (true);	3949	scr_touch (true);
		3950	#endif
3936	}	3951	}
3937	break;	3952	break;
3938		3953
3939	case XTerm_restoreFG:	3954	case Rxvt_restoreFG:
3940	set_window_color (Color_fg, str);	3955	set_window_color (Color_fg, str);
3941	break;	3956	break;
3942	case XTerm_restoreBG:	3957	case Rxvt_restoreBG:
3943	set_window_color (Color_bg, str);	3958	set_window_color (Color_bg, str);
3944	break;	3959	break;
3945		3960
3946	case XTerm_logfile:	3961	case XTerm_logfile:
3947	// TODO, when secure mode?	3962	// TODO, when secure mode?
…		…
3952	if (OPTION (Opt_insecure))	3967	if (OPTION (Opt_insecure))
3953	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954	break;	3969	break;
3955	#endif	3970	#endif
3956	#if 0	3971	#if 0
3957	case XTerm_dumpscreen: /* no error notices */	3972	case Rxvt_dumpscreen: /* no error notices */
3958	{	3973	{
3959	int fd;	3974	int fd;
3960	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3975	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3961	{	3976	{
3962	scr_dump (fd);	3977	scr_dump (fd);
…		…
4014	break;	4029	break;
4015	#endif	4030	#endif
4016		4031
4017	#if ENABLE_PERL	4032	#if ENABLE_PERL
4018	case URxvt_perl:	4033	case URxvt_perl:
4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	4034	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020	; // no responses yet	4035	; // no responses yet
4021	break;	4036	break;
4022	#endif	4037	#endif
4023	}	4038	}
4024	}	4039	}
…		…
4136	/* extra handling for values with state unkept */	4151	/* extra handling for values with state unkept */
4137	switch (arg[i])	4152	switch (arg[i])
4138	{	4153	{
4139	#if ENABLE_STYLES	4154	#if ENABLE_STYLES
4140	case 1021:	4155	case 1021:
4141	if (mode)	4156	set_option (Opt_intensityStyles, mode);
4142	SET_OPTION (Opt_intensityStyles);
4143	else
4144	CLR_OPTION (Opt_intensityStyles);
4145		4157
4146	scr_touch (true);	4158	scr_touch (true);
4147	break;	4159	break;
4148	#endif	4160	#endif
4149	case 1048: /* alternative cursor save */	4161	case 1048: /* alternative cursor save */
…		…
4171	case 3: /* 80/132 */	4183	case 3: /* 80/132 */
4172	if (priv_modes & PrivMode_132OK)	4184	if (priv_modes & PrivMode_132OK)
4173	set_widthheight (((state ? 132 : 80) * fwidth), height);	4185	set_widthheight (((state ? 132 : 80) * fwidth), height);
4174	break;	4186	break;
4175	case 4: /* smooth scrolling */	4187	case 4: /* smooth scrolling */
4176	if (!state)	4188	set_option (Opt_jumpScroll, !state);
4177	SET_OPTION (Opt_jumpScroll);
4178	else
4179	CLR_OPTION (Opt_jumpScroll);
4180	break;	4189	break;
4181	case 5: /* reverse video */	4190	case 5: /* reverse video */
4182	scr_rvideo_mode (state);	4191	scr_rvideo_mode (state);
4183	break;	4192	break;
4184	case 6: /* relative/absolute origins */	4193	case 6: /* relative/absolute origins */
…		…
4225	#if 0	4234	#if 0
4226	case 1001:	4235	case 1001:
4227	break; /* X11 mouse highlighting */	4236	break; /* X11 mouse highlighting */
4228	#endif	4237	#endif
4229	case 1010: /* scroll to bottom on TTY output inhibit */	4238	case 1010: /* scroll to bottom on TTY output inhibit */
4230	if (!state)	4239	set_option (Opt_scrollTtyOutput, !state);
4231	SET_OPTION (Opt_scrollTtyOutput);
4232	else
4233	CLR_OPTION (Opt_scrollTtyOutput);
4234	break;	4240	break;
4235	case 1011: /* scroll to bottom on key press */	4241	case 1011: /* scroll to bottom on key press */
4236	if (state)	4242	set_option (Opt_scrollTtyKeypress, state);
4237	SET_OPTION (Opt_scrollTtyKeypress);
4238	else
4239	CLR_OPTION (Opt_scrollTtyKeypress);
4240	break;	4243	break;
4241	case 1047: /* secondary screen w/ clearing last */	4244	case 1047: /* secondary screen w/ clearing last */
4242	if (OPTION (Opt_secondaryScreen))	4245	if (OPTION (Opt_secondaryScreen))
4243	if (current_screen != PRIMARY)	4246	if (current_screen != PRIMARY)
4244	scr_erase_screen (2);	4247	scr_erase_screen (2);
…		…
4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4457	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455		4458
4456	void	4459	void
4457	rxvt_term::tt_write (const char *data, unsigned int len)	4460	rxvt_term::tt_write (const char *data, unsigned int len)
4458	{	4461	{
		4462	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4463	return;
		4464
		4465	if (pty.pty < 0)
		4466	return;
		4467
4459	if (v_buflen == 0)	4468	if (v_buflen == 0)
4460	{	4469	{
4461	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4470	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4462		4471
4463	if ((unsigned int)written == len)	4472	if ((unsigned int)written == len)

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.238 by root, Fri Jan 6 02:58:02 2006 UTC vs. Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.238 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC